diff --git a/locale/ar_SA/LC_MESSAGES/messages.mo b/locale/ar_SA/LC_MESSAGES/messages.mo
index 581053aa6..734fa63bd 100755
Binary files a/locale/ar_SA/LC_MESSAGES/messages.mo and b/locale/ar_SA/LC_MESSAGES/messages.mo differ
diff --git a/locale/ar_SA/LC_MESSAGES/messages.po b/locale/ar_SA/LC_MESSAGES/messages.po
index 2d459fd32..ac5227d95 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: 2018-10-10 08:24+0300\n"
+"POT-Creation-Date: 2018-12-01 12:59+0300\n"
 "PO-Revision-Date: 2014-08-13 19:15+0300\n"
 "Last-Translator: عبد الناصر سعيد الثبيتي <abdunnasir@althobaity.com>\n"
 "Language-Team: Arabic <abdunnasir@althobaity.com>\n"
@@ -96,8 +96,8 @@ msgid "Weekly"
 msgstr "أسبوعياً"
 
 #: backend.php:103
-#: classes/pref/users.php:47
 #: classes/pref/system.php:51
+#: classes/pref/users.php:47
 msgid "User"
 msgstr "المستخدم"
 
@@ -169,33 +169,33 @@ msgstr "مستخدم غير موجود"
 
 #: index.php:151
 #: index.php:167
-#: index.php:285
+#: index.php:282
 #: prefs.php:120
 #: classes/backend.php:5
 #: classes/pref/labels.php:294
-#: classes/pref/feeds.php:1230
 #: classes/pref/filters.php:822
-#: js/feedlist.js:148
-#: js/feedlist.js:491
-#: js/feedlist.js:539
-#: js/functions.js:314
-#: js/functions.js:1336
-#: js/prefs.js:562
-#: js/prefs.js:754
-#: js/prefs.js:1488
-#: js/prefs.js:1503
-#: js/tt-rss.js:547
-#: js/viewfeed.js:1180
+#: classes/pref/feeds.php:1229
+#: js/feedlist.js:118
+#: js/feedlist.js:446
+#: js/feedlist.js:487
+#: js/functions.js:328
+#: js/functions.js:551
+#: js/functions.js:1286
+#: js/prefs.js:477
+#: js/prefs.js:617
+#: js/prefs.js:956
+#: js/prefs.js:1000
+#: js/prefs.js:1028
+#: js/prefs.js:1037
+#: js/prefs.js:1045
+#: js/prefs.js:1057
+#: js/tt-rss.js:497
+#: js/viewfeed.js:509
+#: js/viewfeed.js:928
 #: plugins/import_export/import_export.js:17
-#: js/functions.js:565
-#: js/prefs.js:1200
-#: js/prefs.js:1253
-#: js/prefs.js:1292
-#: js/prefs.js:1305
-#: js/prefs.js:1316
-#: js/prefs.js:1331
-#: js/tt-rss.js:564
-#: js/viewfeed.js:760
+#: js/prefs.js:1192
+#: js/prefs.js:1205
+#: js/tt-rss.js:510
 msgid "Loading, please wait..."
 msgstr "التحميل جارٍ.  فضلاً انتظر..."
 
@@ -212,13 +212,13 @@ msgid "All Articles"
 msgstr "كل البنود"
 
 #: index.php:194
-#: include/functions.php:1227
+#: include/functions.php:1172
 #: classes/feeds.php:110
 msgid "Starred"
 msgstr "معلَّم بنجمة"
 
 #: index.php:195
-#: include/functions.php:1228
+#: include/functions.php:1173
 #: classes/feeds.php:111
 msgid "Published"
 msgstr "منشور"
@@ -258,11 +258,11 @@ msgid "Title"
 msgstr "العنوان"
 
 #: index.php:211
-#: index.php:251
-#: include/functions.php:1215
+#: index.php:250
+#: include/functions.php:1160
 #: classes/feeds.php:115
-#: js/FeedTree.js:41
-#: js/FeedTree.js:69
+#: js/FeedTree.js:42
+#: js/FeedTree.js:70
 msgid "Mark as read"
 msgstr "ضع علامة مقروء"
 
@@ -299,7 +299,7 @@ msgid "Feed actions:"
 msgstr "إجراءات الخلاصة:"
 
 #: index.php:246
-#: classes/handler/public.php:551
+#: classes/handler/public.php:575
 msgid "Subscribe to feed..."
 msgstr "إشترك في الخلاصة..."
 
@@ -308,56 +308,44 @@ msgid "Edit this feed..."
 msgstr "تحرير هذه الخلاصة..."
 
 #: index.php:248
-msgid "Rescore feed"
-msgstr "إعادة حساب نقاط الخلاصة"
-
-#: index.php:249
-#: classes/pref/feeds.php:770
-#: classes/pref/feeds.php:1203
-#: js/PrefFeedTree.js:61
+#: classes/pref/feeds.php:769
+#: classes/pref/feeds.php:1202
+#: js/PrefFeedTree.js:62
 msgid "Unsubscribe"
 msgstr "إلغاء الاشتراك"
 
-#: index.php:250
+#: index.php:249
 msgid "All feeds:"
 msgstr "كل الخلاصات:"
 
-#: index.php:252
+#: index.php:251
 msgid "(Un)hide read feeds"
 msgstr "إظهار/إخفاء الخلاصات المقروءة"
 
-#: index.php:253
+#: index.php:252
 msgid "Other actions:"
 msgstr "إجراءات أخرى:"
 
-#: index.php:254
-#: include/functions.php:1201
+#: index.php:253
+#: include/functions.php:1146
 msgid "Toggle widescreen mode"
 msgstr "بدِّل وضع الشاشة العريضة"
 
-#: index.php:255
-msgid "Create label..."
-msgstr "أنشئ تسميةً..."
-
-#: index.php:256
-msgid "Create filter..."
-msgstr "أنشئ مرشحاً..."
-
-#: index.php:257
+#: index.php:254
 msgid "Keyboard shortcuts help"
 msgstr "مساعدة اختصارات لوحة المفاتيح"
 
-#: index.php:266
+#: index.php:263
 msgid "Logout"
 msgstr "الخروج"
 
-#: index.php:272
+#: index.php:269
 msgid "Updates are available from Git."
 msgstr ""
 
 #: prefs.php:33
 #: prefs.php:138
-#: include/functions.php:1230
+#: include/functions.php:1175
 #: classes/pref/prefs.php:425
 msgid "Preferences"
 msgstr "خيارات"
@@ -372,8 +360,8 @@ msgstr "أخرج من الخيارات"
 
 #: prefs.php:141
 #: classes/pref/feeds.php:114
-#: classes/pref/feeds.php:1138
-#: classes/pref/feeds.php:1192
+#: classes/pref/feeds.php:1137
+#: classes/pref/feeds.php:1191
 msgid "Feeds"
 msgstr "الخلاصات"
 
@@ -383,8 +371,8 @@ msgid "Filters"
 msgstr "المرشِّحات"
 
 #: prefs.php:147
+#: classes/feeds.php:1696
 #: classes/pref/labels.php:94
-#: classes/feeds.php:1710
 msgid "Labels"
 msgstr "الأسماء"
 
@@ -396,80 +384,80 @@ msgstr "المستخدمون"
 msgid "System"
 msgstr "النظام"
 
-#: register.php:186
+#: register.php:185
 #: include/login_form.php:162
 msgid "Create new account"
 msgstr "أنشئ حساباً جديداً"
 
-#: register.php:192
+#: register.php:191
 msgid "New user registrations are administratively disabled."
 msgstr "عطَّل المسؤول إنشاء حسابات مستخدمين جدد"
 
-#: register.php:196
-#: register.php:241
-#: register.php:254
-#: register.php:269
-#: register.php:288
-#: register.php:336
-#: register.php:346
-#: register.php:358
-#: classes/handler/public.php:623
-#: classes/handler/public.php:697
-#: classes/handler/public.php:798
-#: classes/handler/public.php:877
-#: classes/handler/public.php:891
-#: classes/handler/public.php:898
-#: classes/handler/public.php:923
+#: register.php:195
+#: register.php:240
+#: register.php:253
+#: register.php:268
+#: register.php:287
+#: register.php:334
+#: register.php:344
+#: register.php:356
+#: classes/handler/public.php:647
+#: classes/handler/public.php:721
+#: 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"
 
-#: register.php:217
+#: register.php:216
 msgid "Your temporary password will be sent to the specified email. Accounts, which were not logged in once, are erased automatically 24 hours after temporary password is sent."
 msgstr "كلمة المرور المؤقتة الخاصة بك ستُرسل إلى البريد المحدَّد.  الحسابات التي لم يُدخَل إليها و لا مرة واحدة يتم حذفها آليّاً بعد ٢٤ ساعة من إرسال كلمة المرور المؤقتة."
 
-#: register.php:223
+#: register.php:222
 msgid "Desired login:"
 msgstr "اسم الدخول المرغوب:"
 
-#: register.php:226
+#: register.php:225
 msgid "Check availability"
 msgstr "تحقق من التوفُّر"
 
-#: register.php:228
-#: classes/handler/public.php:713
+#: register.php:227
+#: classes/handler/public.php:737
 msgid "Email:"
 msgstr "بريد إلكتروني:"
 
-#: register.php:231
-#: classes/handler/public.php:718
+#: register.php:230
+#: classes/handler/public.php:742
 msgid "How much is two plus two:"
 msgstr "كم حاصل إثنان زائد إثنان:"
 
-#: register.php:234
+#: register.php:233
 msgid "Submit registration"
 msgstr "أرسل التسجيل"
 
-#: register.php:252
+#: register.php:251
 msgid "Your registration information is incomplete."
 msgstr "معلومات تسجيلك غير مكتملة."
 
-#: register.php:267
+#: register.php:266
 msgid "Sorry, this username is already taken."
 msgstr "آسف.  اسم المستخدم هذا تم تسجيله مسبقاً."
 
-#: register.php:286
+#: register.php:285
 msgid "Registration failed."
 msgstr "فشِل التسجيل."
 
-#: register.php:333
+#: register.php:331
 msgid "Account created successfully."
 msgstr "نجح إنشاء الحساب."
 
-#: register.php:355
+#: register.php:353
 msgid "New user registrations are currently closed."
 msgstr "تسجيل المستخدمين الجدد مقفل حالياً."
 
-#: update.php:66
+#: update.php:67
 msgid "Tiny Tiny RSS data update script."
 msgstr "برنامج تحديث بيانات Tiny Tiny RSS"
 
@@ -482,10 +470,10 @@ msgstr "كل الخلاصات"
 
 #: include/controls.php:138
 #: include/controls.php:230
-#: classes/opml.php:512
-#: classes/digest.php:120
+#: classes/digest.php:124
+#: classes/feeds.php:1708
 #: classes/pref/feeds.php:233
-#: classes/feeds.php:1722
+#: classes/opml.php:512
 msgid "Uncategorized"
 msgstr "غير مصنَّفة"
 
@@ -500,287 +488,287 @@ msgstr[1] "%d بنود محفوظة"
 msgid "No feeds found."
 msgstr "لم أجد خلاصة."
 
-#: include/functions.php:983
+#: include/functions.php:928
 #, php-format
 msgid "%d min"
 msgstr ""
 
-#: include/functions.php:1177
+#: include/functions.php:1122
 msgid "Navigation"
 msgstr "التنقُّل"
 
-#: include/functions.php:1178
+#: include/functions.php:1123
 msgid "Open next feed"
 msgstr "إفتح الخلاصة التالية"
 
-#: include/functions.php:1179
+#: include/functions.php:1124
 msgid "Open previous feed"
 msgstr "إفتح الخلاصة السابقة"
 
-#: include/functions.php:1180
+#: include/functions.php:1125
 msgid "Open next article"
 msgstr "إفتح البند التالي"
 
-#: include/functions.php:1181
+#: include/functions.php:1126
 msgid "Open previous article"
 msgstr "إفتح البند السابق"
 
-#: include/functions.php:1182
+#: include/functions.php:1127
 msgid "Open next article (don't scroll long articles)"
 msgstr "إفتح البند التالي (لاتمرِّر البنود الطويلة)"
 
-#: include/functions.php:1183
+#: include/functions.php:1128
 msgid "Open previous article (don't scroll long articles)"
 msgstr "إفتح البند السابق (لاتمرِّر البنود الطويلة)"
 
-#: include/functions.php:1184
+#: include/functions.php:1129
 msgid "Move to next article (don't expand or mark read)"
 msgstr "إنتقل للبند التالي (لاتوسِّعه أو تعلمه مقروءاً)"
 
-#: include/functions.php:1185
+#: include/functions.php:1130
 msgid "Move to previous article (don't expand or mark read)"
 msgstr "إنتقل للبند السابق (لاتوسِّعه أو تعلمه مقروءاً)"
 
-#: include/functions.php:1186
+#: include/functions.php:1131
 msgid "Show search dialog"
 msgstr "إعرض مربَّع البحث"
 
-#: include/functions.php:1187
+#: include/functions.php:1132
 msgid "Article"
 msgstr "بَنْد"
 
-#: include/functions.php:1188
-#: js/viewfeed.js:1695
+#: include/functions.php:1133
+#: js/viewfeed.js:1341
 msgid "Toggle starred"
 msgstr "إقلب المعلَّم بنجمة"
 
-#: include/functions.php:1189
-#: js/viewfeed.js:1707
+#: include/functions.php:1134
+#: js/viewfeed.js:1353
 msgid "Toggle published"
 msgstr "إقلب المنشور"
 
-#: include/functions.php:1190
-#: js/viewfeed.js:1682
+#: include/functions.php:1135
+#: js/viewfeed.js:1328
 msgid "Toggle unread"
 msgstr "إقلب غير المقروء"
 
-#: include/functions.php:1191
+#: include/functions.php:1136
 msgid "Edit tags"
 msgstr "حرِّر العلامات"
 
-#: include/functions.php:1192
+#: include/functions.php:1137
 msgid "Open in new window"
 msgstr "فتح في نافذة جديدة"
 
-#: include/functions.php:1193
-#: js/viewfeed.js:1728
+#: include/functions.php:1138
+#: js/viewfeed.js:1374
 msgid "Mark below as read"
 msgstr "علِّم أسفله مقروءاً"
 
-#: include/functions.php:1194
-#: js/viewfeed.js:1721
+#: include/functions.php:1139
+#: js/viewfeed.js:1367
 msgid "Mark above as read"
 msgstr "علِّم أعلاه مقروءاً"
 
-#: include/functions.php:1195
+#: include/functions.php:1140
 msgid "Scroll down"
 msgstr "تمرير نازل"
 
-#: include/functions.php:1196
+#: include/functions.php:1141
 msgid "Scroll up"
 msgstr "تمرير طالع"
 
-#: include/functions.php:1197
+#: include/functions.php:1142
 msgid "Select article under cursor"
 msgstr "إختر البند تحت المؤشِّر"
 
-#: include/functions.php:1198
+#: include/functions.php:1143
 msgid "Email article"
 msgstr "أرسل البند بالبريد"
 
-#: include/functions.php:1199
+#: include/functions.php:1144
 msgid "Close/collapse article"
 msgstr "أغلق/إطوِ البند"
 
-#: include/functions.php:1200
+#: include/functions.php:1145
 msgid "Toggle article expansion (combined mode)"
 msgstr "بدّل توسيع البند (وضع المجموع)"
 
-#: include/functions.php:1202
+#: include/functions.php:1147
 #: plugins/embed_original/init.php:33
 msgid "Toggle embed original"
 msgstr "بدِّل تضمين الأصل"
 
-#: include/functions.php:1203
+#: include/functions.php:1148
 msgid "Article selection"
 msgstr "إختيار البند"
 
-#: include/functions.php:1204
+#: include/functions.php:1149
 msgid "Select all articles"
 msgstr "إختر كل البنود"
 
-#: include/functions.php:1205
+#: include/functions.php:1150
 msgid "Select unread"
 msgstr "إختر غير المقروء"
 
-#: include/functions.php:1206
+#: include/functions.php:1151
 msgid "Select starred"
 msgstr "إختر المعلَّم بنجمة"
 
-#: include/functions.php:1207
+#: include/functions.php:1152
 msgid "Select published"
 msgstr "إختر المنشور"
 
-#: include/functions.php:1208
+#: include/functions.php:1153
 msgid "Invert selection"
 msgstr "إعكس الاختيار"
 
-#: include/functions.php:1209
+#: include/functions.php:1154
 msgid "Deselect everything"
 msgstr "ألغ اختيار الكل"
 
-#: include/functions.php:1210
-#: classes/pref/feeds.php:522
-#: classes/pref/feeds.php:794
+#: include/functions.php:1155
+#: classes/pref/feeds.php:521
+#: classes/pref/feeds.php:793
 msgid "Feed"
 msgstr "الخلاصة"
 
-#: include/functions.php:1211
+#: include/functions.php:1156
 msgid "Refresh current feed"
 msgstr "تحديث الخلاصة الحاليَّة"
 
-#: include/functions.php:1212
+#: include/functions.php:1157
 msgid "Un/hide read feeds"
 msgstr "إعرض/أخفِ الخلاصات المقروءة"
 
-#: include/functions.php:1213
-#: classes/pref/feeds.php:1195
+#: include/functions.php:1158
+#: classes/pref/feeds.php:1194
 msgid "Subscribe to feed"
 msgstr "إشترك في خلاصة"
 
-#: include/functions.php:1214
-#: js/FeedTree.js:48
-#: js/PrefFeedTree.js:55
-#: js/viewfeed.js:1846
+#: include/functions.php:1159
+#: js/FeedTree.js:49
+#: js/PrefFeedTree.js:56
+#: js/viewfeed.js:1492
 msgid "Edit feed"
 msgstr "حرِّر خلاصة"
 
-#: include/functions.php:1216
+#: include/functions.php:1161
 msgid "Reverse headlines"
 msgstr "إقلب العناوين"
 
-#: include/functions.php:1217
+#: include/functions.php:1162
 msgid "Toggle headline grouping"
 msgstr ""
 
-#: include/functions.php:1218
+#: include/functions.php:1163
 msgid "Debug feed update"
 msgstr "تصحيح أخطاء تحديث الخلاصة"
 
-#: include/functions.php:1219
+#: include/functions.php:1164
 #, fuzzy
 msgid "Debug viewfeed()"
 msgstr "تصحيح أخطاء تحديث الخلاصة"
 
-#: include/functions.php:1220
-#: js/FeedTree.js:97
+#: include/functions.php:1165
+#: js/FeedTree.js:98
 msgid "Mark all feeds as read"
 msgstr "علِّم كل الخلاصات مقروءة"
 
-#: include/functions.php:1221
+#: include/functions.php:1166
 msgid "Un/collapse current category"
 msgstr "طيّ/بسط التصنيف الحالي"
 
-#: include/functions.php:1222
-msgid "Toggle combined mode"
-msgstr "تبديل وضع التجميع"
-
-#: include/functions.php:1223
+#: include/functions.php:1167
 msgid "Toggle auto expand in combined mode"
 msgstr "إقلب حالة التوسيع التلقائي في وضع التجميع"
 
-#: include/functions.php:1224
+#: include/functions.php:1168
+msgid "Toggle combined mode"
+msgstr "تبديل وضع التجميع"
+
+#: include/functions.php:1169
 msgid "Go to"
 msgstr "إذهب إلى"
 
-#: include/functions.php:1225
-#: classes/feeds.php:1583
+#: include/functions.php:1170
+#: classes/feeds.php:1569
 msgid "All articles"
 msgstr "كل البنود"
 
-#: include/functions.php:1226
+#: include/functions.php:1171
 msgid "Fresh"
 msgstr "طازج"
 
-#: include/functions.php:1229
-#: js/tt-rss.js:491
-#: js/tt-rss.js:660
+#: include/functions.php:1174
+#: js/tt-rss.js:439
+#: js/tt-rss.js:599
 msgid "Tag cloud"
 msgstr "سحابة العلامات"
 
-#: include/functions.php:1231
+#: include/functions.php:1176
 msgid "Other"
 msgstr "أخرى"
 
-#: include/functions.php:1232
+#: include/functions.php:1177
 #: classes/pref/labels.php:279
 msgid "Create label"
 msgstr "أنشئ تسمية"
 
-#: include/functions.php:1233
+#: include/functions.php:1178
 #: classes/pref/filters.php:801
 msgid "Create filter"
 msgstr "أنشئ مرشِّح"
 
-#: include/functions.php:1234
+#: include/functions.php:1179
 msgid "Un/collapse sidebar"
 msgstr "طيّ/بَسْط الشريط الجانبي"
 
-#: include/functions.php:1235
+#: include/functions.php:1180
 msgid "Show help dialog"
 msgstr "إعرض نافذة المساعدة"
 
-#: include/functions.php:2582
+#: include/functions.php:2529
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: include/functions.php:2583
+#: include/functions.php:2530
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: include/functions.php:2584
+#: include/functions.php:2531
 msgid "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form"
 msgstr ""
 
-#: include/functions.php:2585
+#: include/functions.php:2532
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: include/functions.php:2586
+#: include/functions.php:2533
 #, fuzzy
 msgid "No file was uploaded"
 msgstr "لم يتم تحميل أي ملف."
 
-#: include/functions.php:2587
+#: include/functions.php:2534
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: include/functions.php:2588
+#: include/functions.php:2535
 msgid "Failed to write file to disk."
 msgstr ""
 
-#: include/functions.php:2589
+#: include/functions.php:2536
 msgid "A PHP extension stopped the file upload."
 msgstr ""
 
 #: include/login_form.php:107
-#: classes/handler/public.php:446
-#: classes/handler/public.php:708
+#: classes/handler/public.php:466
+#: classes/handler/public.php:732
 msgid "Login:"
 msgstr "الدخول:"
 
 #: include/login_form.php:117
-#: classes/handler/public.php:449
+#: classes/handler/public.php:469
 msgid "Password:"
 msgstr "كلمة المرور:"
 
@@ -793,9 +781,9 @@ msgid "Profile:"
 msgstr "الملف الشخصي:"
 
 #: include/login_form.php:133
-#: classes/handler/public.php:252
 #: classes/pref/prefs.php:1037
 #: classes/rpc.php:69
+#: classes/handler/public.php:272
 msgid "Default profile"
 msgstr "الملف الشخصي الافتراضي"
 
@@ -812,207 +800,27 @@ msgid "Remember me"
 msgstr "تذكَّرني"
 
 #: include/login_form.php:159
-#: classes/handler/public.php:454
+#: classes/handler/public.php:474
 msgid "Log in"
 msgstr "الدخول"
 
-#: include/sessions.php:46
+#: include/sessions.php:45
 msgid "Session failed to validate (schema version changed)"
 msgstr "فشل تحقق الجلسة (تغير إصدار مختطة قاعدة البيانات)"
 
-#: include/sessions.php:62
+#: include/sessions.php:53
+#, fuzzy
+msgid "Session failed to validate (UA changed)."
+msgstr "فشل تحقق الجلسة (تغير كلمة المرور)"
+
+#: include/sessions.php:67
 msgid "Session failed to validate (password changed)"
 msgstr "فشل تحقق الجلسة (تغير كلمة المرور)"
 
-#: include/sessions.php:69
+#: include/sessions.php:74
 msgid "Session failed to validate (user not found)"
 msgstr "فشل تحقق الجلسة (المستخدم غير موجود)"
 
-#: classes/article.php:26
-msgid "Article not found."
-msgstr "البند غير موجود"
-
-#: classes/article.php:211
-msgid "Tags for this article (separated by commas):"
-msgstr "العلامات لهذا البند (مفصولة بفواصل)"
-
-#: classes/article.php:236
-#: classes/pref/labels.php:82
-#: classes/pref/users.php:103
-#: classes/pref/feeds.php:774
-#: classes/pref/feeds.php:914
-#: classes/pref/filters.php:525
-#: classes/pref/prefs.php:982
-#: plugins/nsfw/init.php:85
-#: plugins/note/init.php:58
-#: plugins/af_readability/init.php:80
-#: plugins/af_redditimgur/init.php:66
-#: plugins/af_psql_trgm/init.php:188
-#: plugins/mail/init.php:65
-#: plugins/af_zz_imgproxy/init.php:238
-msgid "Save"
-msgstr "إحفظ"
-
-#: classes/article.php:238
-#: classes/handler/public.php:423
-#: classes/handler/public.php:457
-#: classes/pref/labels.php:84
-#: classes/pref/users.php:105
-#: classes/pref/feeds.php:775
-#: classes/pref/feeds.php:917
-#: classes/pref/feeds.php:1672
-#: classes/pref/filters.php:528
-#: classes/pref/filters.php:945
-#: classes/pref/filters.php:1022
-#: classes/pref/filters.php:1115
-#: classes/pref/prefs.php:984
-#: classes/feeds.php:1037
-#: classes/feeds.php:1089
-#: classes/feeds.php:1128
-#: plugins/note/init.php:60
-#: plugins/mail/init.php:179
-msgid "Cancel"
-msgstr "ألغ"
-
-#: classes/article.php:337
-#: classes/article.php:720
-#: classes/article.php:875
-msgid "no tags"
-msgstr "لا علامات"
-
-#: classes/article.php:448
-msgid "unknown type"
-msgstr "نوع غير معروف"
-
-#: classes/article.php:525
-msgid "Attachments"
-msgstr "مرفقات"
-
-#: classes/article.php:626
-#: classes/feeds.php:661
-msgid "comment"
-msgid_plural "comments"
-msgstr[0] "تعليق"
-msgstr[1] "تعليقات"
-
-#: classes/article.php:630
-#: classes/feeds.php:665
-msgid "comments"
-msgstr "تعليقات"
-
-#: classes/article.php:689
-msgid " - "
-msgstr " - "
-
-#: classes/article.php:730
-#: classes/feeds.php:647
-msgid "Edit tags for this article"
-msgstr "حرِّر علامات هذا البند"
-
-#: classes/article.php:763
-#: classes/feeds.php:602
-msgid "Originally from:"
-msgstr "أصله من:"
-
-#: classes/article.php:774
-#: classes/pref/feeds.php:539
-#: classes/feeds.php:613
-msgid "Feed URL"
-msgstr "عنوان URL للخلاصة"
-
-#: classes/article.php:811
-#: classes/backend.php:103
-#: classes/dlg.php:33
-#: classes/dlg.php:56
-#: classes/dlg.php:89
-#: classes/dlg.php:154
-#: classes/dlg.php:181
-#: classes/dlg.php:197
-#: classes/pref/feeds.php:1466
-#: classes/pref/feeds.php:1533
-#: classes/pref/filters.php:208
-#: classes/pref/prefs.php:1099
-#: plugins/af_psql_trgm/init.php:109
-#: plugins/import_export/init.php:446
-#: plugins/import_export/init.php:490
-#: plugins/share/init.php:128
-msgid "Close this window"
-msgstr "أغلق هذه النافذة"
-
-#: classes/article.php:913
-msgid "(edit note)"
-msgstr "(حرِّر ملاحظة)"
-
-#: classes/opml.php:31
-#: classes/opml.php:36
-msgid "OPML Utility"
-msgstr "أداة OPML"
-
-#: classes/opml.php:40
-msgid "Importing OPML..."
-msgstr "إستيراد OPML..."
-
-#: classes/opml.php:45
-msgid "Return to preferences"
-msgstr "العودة للتفضيلات"
-
-#: classes/opml.php:301
-#, php-format
-msgid "Adding feed: %s"
-msgstr "إضافة الخلاصة: %s"
-
-#: classes/opml.php:312
-#, php-format
-msgid "Duplicate feed: %s"
-msgstr "خلاصة مكرَّرة: %s"
-
-#: classes/opml.php:326
-#, php-format
-msgid "Adding label %s"
-msgstr "إضافة التسمية %s"
-
-#: classes/opml.php:329
-#, php-format
-msgid "Duplicate label: %s"
-msgstr "تسمية مكرَّرة: %s"
-
-#: classes/opml.php:341
-#, php-format
-msgid "Setting preference key %s to %s"
-msgstr "ضبط مفتاح التفضيل %s ليصبح %s"
-
-#: classes/opml.php:377
-msgid "Adding filter..."
-msgstr "تجري إضافة المرشِّح..."
-
-#: classes/opml.php:512
-#, php-format
-msgid "Processing category: %s"
-msgstr "معالجة التصنيف: %s"
-
-#: classes/opml.php:558
-#, php-format
-msgid "Upload failed with error code %d"
-msgstr "فشِل الرفع و ظهر رمز الخطأ %d"
-
-#: classes/opml.php:570
-#: plugins/import_export/init.php:471
-msgid "Unable to move uploaded file."
-msgstr "لم أتمكن من نقل الملف المرفوع."
-
-#: classes/opml.php:574
-#: plugins/import_export/init.php:475
-msgid "Error: please upload OPML file."
-msgstr "خطأ: فضلاً إرفع (حمِّل) ملف OPML."
-
-#: classes/opml.php:585
-msgid "Error: unable to find moved OPML file."
-msgstr "خطأ: لم أعثر على ملف الـ OPML المنقول."
-
-#: classes/opml.php:594
-msgid "Error while parsing document."
-msgstr "خطأ أثناء تفسير المستند."
-
 #: classes/backend.php:31
 msgid "Other interface tips are available in the Tiny Tiny RSS wiki."
 msgstr "توجد تلميحات أخرى عن الواجهة على ويكي Tiny Tiny RSS."
@@ -1033,162 +841,354 @@ msgstr "مفتاح تحكم"
 msgid "Help topic not found."
 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/backend.php:103
+#: classes/pref/filters.php:208
+#: classes/pref/feeds.php:1465
+#: classes/pref/feeds.php:1532
+#: classes/pref/prefs.php:1099
+#: classes/dlg.php:33
+#: classes/dlg.php:56
+#: classes/dlg.php:89
+#: classes/dlg.php:154
+#: classes/dlg.php:181
+#: classes/dlg.php:197
+#: classes/article.php:810
+#: plugins/af_psql_trgm/init.php:109
+#: plugins/import_export/init.php:446
+#: plugins/import_export/init.php:490
+#: plugins/share/init.php:128
+msgid "Close this window"
+msgstr "أغلق هذه النافذة"
 
-#: classes/dlg.php:44
-msgid "Your Public OPML URL is:"
-msgstr "عنوان URL الظاهر للـ OPML هو :"
+#: classes/feeds.php:53
+msgid "View as RSS feed"
+msgstr "إعرض كخلاصة RSS"
 
-#: classes/dlg.php:53
-#: classes/dlg.php:178
-#: plugins/share/init.php:125
-msgid "Generate new URL"
-msgstr "توليد عنوان URL جديد"
+#: classes/feeds.php:54
+#: classes/feeds.php:140
+#: classes/pref/feeds.php:1326
+msgid "View as RSS"
+msgstr "إعرض كـ RSS"
 
-#: classes/dlg.php:67
-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/feeds.php:62
+#, php-format
+msgid "Last updated: %s"
+msgstr "آخر تحديث : %s"
 
-#: classes/dlg.php:71
-#: classes/dlg.php:80
-msgid "Last update:"
-msgstr "آخر تحديث:"
+#: classes/feeds.php:100
+#, fuzzy
+msgid "Select..."
+msgstr "إختر"
 
-#: classes/dlg.php:76
-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/feeds.php:102
+#: classes/pref/labels.php:273
+#: classes/pref/filters.php:391
+#: classes/pref/filters.php:449
+#: classes/pref/filters.php:795
+#: classes/pref/filters.php:878
+#: classes/pref/filters.php:905
+#: classes/pref/feeds.php:1185
+#: classes/pref/feeds.php:1416
+#: classes/pref/feeds.php:1481
+#: classes/pref/users.php:358
+#: classes/pref/prefs.php:996
+msgid "All"
+msgstr "الكل"
 
-#: classes/dlg.php:169
-msgid "You can view this feed as RSS using the following URL:"
-msgstr "يمكنك عرض هذه الخلاصة كـ RSS باستخدام عنوان URL التالي:"
+#: classes/feeds.php:104
+msgid "Invert"
+msgstr "إعكس"
 
-#: classes/dlg.php:190
-msgid "You are using default tt-rss password. Please change it in the Preferences (Personal data / Authentication)."
+#: classes/feeds.php:105
+#: classes/pref/labels.php:275
+#: classes/pref/filters.php:393
+#: classes/pref/filters.php:451
+#: classes/pref/filters.php:797
+#: classes/pref/filters.php:880
+#: classes/pref/filters.php:907
+#: classes/pref/feeds.php:1187
+#: classes/pref/feeds.php:1418
+#: classes/pref/feeds.php:1483
+#: classes/pref/users.php:360
+#: classes/pref/prefs.php:998
+msgid "None"
+msgstr "لاشيء"
+
+#: classes/feeds.php:107
+msgid "Selection toggle:"
+msgstr "تبديل الاختيار:"
+
+#: classes/feeds.php:113
+msgid "Selection:"
+msgstr "الاختيار:"
+
+#: classes/feeds.php:116
+msgid "Set score"
+msgstr "حدِّد نقطة"
+
+#: classes/feeds.php:119
+msgid "Archive"
+msgstr "محفوظات"
+
+#: classes/feeds.php:121
+msgid "Move back"
+msgstr "العودة للخلف"
+
+#: classes/feeds.php:122
+#: classes/pref/filters.php:400
+#: classes/pref/filters.php:458
+#: classes/pref/filters.php:887
+#: classes/pref/filters.php:914
+msgid "Delete"
+msgstr "إحذف"
+
+#: classes/feeds.php:127
+#: classes/feeds.php:132
+#: plugins/mailto/init.php:25
+#: plugins/mail/init.php:76
+msgid "Forward by email"
+msgstr "أعد التوجيه بالبريد"
+
+#: classes/feeds.php:136
+msgid "Feed:"
+msgstr "خلاصة:"
+
+#: classes/feeds.php:193
+#: classes/feeds.php:802
+msgid "Feed not found."
+msgstr "لم أجد الخلاصة."
+
+#: classes/feeds.php:255
+msgid "Never"
+msgstr "أبداً"
+
+#: classes/feeds.php:341
+#, php-format
+msgid "Imported at %s"
+msgstr "تم استيراده في %s"
+
+#: classes/feeds.php:391
+#: classes/feeds.php:484
+msgid "mark feed as read"
+msgstr "علِّم الخلاصة مقروءة"
+
+#: classes/feeds.php:540
+msgid "Collapse article"
+msgstr "طيّ البند"
+
+#: classes/feeds.php:592
+#: classes/article.php:762
+msgid "Originally from:"
+msgstr "أصله من:"
+
+#: classes/feeds.php:603
+#: classes/pref/feeds.php:538
+#: classes/article.php:773
+msgid "Feed URL"
+msgstr "عنوان URL للخلاصة"
+
+#: classes/feeds.php:630
+#: classes/article.php:729
+msgid "Edit tags for this article"
+msgstr "حرِّر علامات هذا البند"
+
+#: classes/feeds.php:644
+#: classes/article.php:625
+msgid "comment"
+msgid_plural "comments"
+msgstr[0] "تعليق"
+msgstr[1] "تعليقات"
+
+#: classes/feeds.php:648
+#: classes/article.php:629
+msgid "comments"
+msgstr "تعليقات"
+
+#: classes/feeds.php:686
+msgid "No unread articles found to display."
+msgstr "لم أجد بنوداً غير مقروءة لأعرضها."
+
+#: classes/feeds.php:689
+msgid "No updated articles found to display."
+msgstr "لم أجد بنوداً محدَّثة لأعرضها."
+
+#: classes/feeds.php:692
+msgid "No starred articles found to display."
+msgstr "لم أجد بنوداً معلَّمة بنجمة لأعرضها."
+
+#: classes/feeds.php:696
+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:698
+msgid "No articles found to display."
+msgstr "لم أجد بنوداًلأعرضها."
+
+#: classes/feeds.php:714
+#: classes/feeds.php:905
+#, php-format
+msgid "Feeds last updated at %s"
+msgstr "آخر تحديث للخلاصات في %s"
+
+#: classes/feeds.php:726
+#: classes/feeds.php:917
+msgid "Some feeds have update errors (click for details)"
+msgstr "توجد أخطاء في تحديث بعض الخلاصات (أنقر للتفاصيل)"
+
+#: classes/feeds.php:894
+msgid "No feed selected."
+msgstr "لم تختر خلاصة."
+
+#: classes/feeds.php:958
+#: classes/feeds.php:966
+msgid "Feed or site URL"
+msgstr "عنوان URL للخلاصة أو الموقع"
+
+#: classes/feeds.php:972
+#: classes/pref/feeds.php:559
+#: classes/pref/feeds.php:800
+#: classes/pref/feeds.php:1632
+msgid "Place in category:"
+msgstr "ضعه في التصنيف:"
+
+#: classes/feeds.php:980
+msgid "Available feeds"
+msgstr "الخلاصات المتوفّرة"
+
+#: classes/feeds.php:992
+#: classes/pref/feeds.php:621
+#: classes/pref/feeds.php:848
+#: classes/pref/users.php:61
+msgid "Authentication"
+msgstr "الإستيثاق"
+
+#: classes/feeds.php:996
+#: classes/pref/feeds.php:625
+#: classes/pref/feeds.php:852
+#: classes/pref/feeds.php:1646
+#: classes/pref/users.php:403
+msgid "Login"
+msgstr "الدخول"
+
+#: classes/feeds.php:1000
+#: classes/pref/feeds.php:631
+#: classes/pref/feeds.php:860
+#: classes/pref/feeds.php:1649
+#: classes/pref/prefs.php:243
+msgid "Password"
+msgstr "كلمة المرور"
+
+#: classes/feeds.php:1011
+#: classes/pref/feeds.php:645
+msgid "This feed requires authentication."
+msgstr "هذه الخلاصة تتطلب الإستيثاق."
+
+#: classes/feeds.php:1014
+#: classes/feeds.php:1070
+#: classes/pref/feeds.php:1668
+msgid "Subscribe"
+msgstr "إشترك"
+
+#: classes/feeds.php:1017
+msgid "More feeds"
+msgstr "المزيد من الخلاصات"
+
+#: classes/feeds.php:1020
+#: classes/feeds.php:1072
+#: classes/feeds.php:1111
+#: classes/pref/labels.php:84
+#: classes/pref/filters.php:528
+#: classes/pref/filters.php:945
+#: classes/pref/filters.php:1022
+#: classes/pref/filters.php:1115
+#: classes/pref/feeds.php:774
+#: classes/pref/feeds.php:916
+#: classes/pref/feeds.php:1669
+#: classes/pref/users.php:105
+#: classes/pref/prefs.php:984
+#: classes/article.php:238
+#: classes/handler/public.php:443
+#: classes/handler/public.php:477
+#: plugins/mail/init.php:179
+#: plugins/note/init.php:60
+msgid "Cancel"
+msgstr "ألغ"
+
+#: classes/feeds.php:1042
+#: classes/feeds.php:1110
+#: classes/pref/filters.php:788
+#: classes/pref/feeds.php:1178
+#: classes/pref/users.php:345
+#: js/tt-rss.js:152
+msgid "Search"
+msgstr "إبحث"
+
+#: classes/feeds.php:1046
+msgid "Popular feeds"
+msgstr "الخلاصات الشعبيَّة"
+
+#: classes/feeds.php:1047
+msgid "Feed archive"
+msgstr "محفوظات الخلاصة"
+
+#: classes/feeds.php:1050
+msgid "limit:"
+msgstr "حدّ:"
+
+#: classes/feeds.php:1071
+#: classes/pref/labels.php:282
+#: classes/pref/filters.php:518
+#: classes/pref/filters.php:814
+#: classes/pref/feeds.php:751
+#: classes/pref/users.php:369
+msgid "Remove"
+msgstr "إحذف"
+
+#: classes/feeds.php:1084
+msgid "Look for"
+msgstr "إبحث عن"
+
+#: classes/feeds.php:1092
+#, php-format
+msgid "in %s"
 msgstr ""
 
-#: classes/dlg.php:194
-#, fuzzy
-msgid "Open Preferences"
-msgstr "خيارات"
+#: classes/feeds.php:1097
+msgid "Used for word stemming"
+msgstr ""
 
-#: classes/handler/public.php:387
-#: plugins/bookmarklets/init.php:40
-msgid "Share with Tiny Tiny RSS"
-msgstr "شارك مع/عبر Tiny Tiny RSS"
+#: classes/feeds.php:1106
+msgid "Search syntax"
+msgstr "نحو البحث"
 
-#: classes/handler/public.php:395
-msgid "Title:"
-msgstr "العنوان:"
+#: classes/feeds.php:1563
+msgid "Starred articles"
+msgstr "البنود بنجمة"
 
-#: classes/handler/public.php:397
-#: classes/pref/feeds.php:537
-msgid "URL:"
-msgstr "عنوان URL:"
+#: classes/feeds.php:1565
+msgid "Published articles"
+msgstr "البنود المنشورة"
 
-#: classes/handler/public.php:399
-msgid "Content:"
-msgstr "المحتوى:"
+#: classes/feeds.php:1567
+msgid "Fresh articles"
+msgstr "البنود الطازجة"
 
-#: classes/handler/public.php:401
-msgid "Labels:"
-msgstr "الأسماء:"
+#: classes/feeds.php:1571
+msgid "Archived articles"
+msgstr "البنود المحفوظة"
 
-#: classes/handler/public.php:420
-msgid "Shared article will appear in the Published feed."
-msgstr "سيظهر البند الذي شاركت في خلاصة \"منشور\""
+#: classes/feeds.php:1573
+msgid "Recently read"
+msgstr "قُرِأَت حديثاً"
 
-#: classes/handler/public.php:422
-msgid "Share"
-msgstr "شارِك"
+#: classes/feeds.php:1694
+msgid "Special"
+msgstr "خاص"
 
-#: classes/handler/public.php:444
-msgid "Not logged in"
-msgstr "لم يسجِّل الدخول"
-
-#: classes/handler/public.php:504
-msgid "Incorrect username or password"
-msgstr "خطأ في اسم المستخدم أو كلمة المرور"
-
-#: classes/handler/public.php:557
+#: classes/feeds.php:1951
 #, php-format
-msgid "Already subscribed to <b>%s</b>."
-msgstr "الإشتراك في <b>%s</b> موجود مسبقاً."
-
-#: classes/handler/public.php:560
-#, php-format
-msgid "Subscribed to <b>%s</b>."
-msgstr "مشترِك في <b>%s</b>."
-
-#: classes/handler/public.php:563
-#, php-format
-msgid "Could not subscribe to <b>%s</b>."
-msgstr "لم أتمكن من الإشتراك في <b>%s</b>."
-
-#: classes/handler/public.php:566
-#, php-format
-msgid "No feeds found in <b>%s</b>."
-msgstr "لم أجد خلاصات في <b>%s</b>."
-
-#: classes/handler/public.php:569
-msgid "Multiple feed URLs found."
-msgstr "وجدت عدة عناوين URL للخلاصة."
-
-#: classes/handler/public.php:573
-#, 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:591
-msgid "Subscribe to selected feed"
-msgstr "إشترك في الخلاصة المختارة"
-
-#: classes/handler/public.php:618
-msgid "Edit subscription options"
-msgstr "عدّل خيارات الإشتراك"
-
-#: classes/handler/public.php:656
-msgid "Password recovery"
-msgstr "إستعادة كلمة المرور"
-
-#: classes/handler/public.php:701
-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:723
-#: classes/pref/users.php:372
-msgid "Reset password"
-msgstr "إعادة تعيين كلمة المرور"
-
-#: classes/handler/public.php:733
-msgid "Some of the required form parameters are missing or incorrect."
-msgstr "بعض وسائط النموذج اللازمة مفقودة أو غير صحيحة."
-
-#: classes/handler/public.php:737
-#: classes/handler/public.php:806
-msgid "Go back"
-msgstr "الرجوع للخلف"
-
-#: classes/handler/public.php:775
-msgid "[tt-rss] Password reset request"
-msgstr "[tt-rss] طلب إعادة تعيين كلمة المرور"
-
-#: classes/handler/public.php:802
-msgid "Sorry, login and email combination not found."
-msgstr "آسف ، هذا المستخدم والبريد معاً غير موجودين."
-
-#: classes/handler/public.php:824
-msgid "Your access level is insufficient to run this script."
-msgstr "مستوى الوصول الخاص بك غير كافٍ لتشغيل هذا البرنامج."
-
-#: classes/handler/public.php:850
-msgid "Database Updater"
-msgstr "محدِّث قاعدة البيانات"
-
-#: classes/handler/public.php:915
-msgid "Perform updates"
-msgstr "ثبِّت التحديثات"
+msgid "Search results: %s"
+msgstr "نتائج البحث: %s"
 
 #: classes/pref/labels.php:25
 #: classes/pref/filters.php:377
@@ -1208,201 +1208,194 @@ msgstr "العرض في الأمام:"
 msgid "Background:"
 msgstr "العرض في الخلفيَّة:"
 
+#: classes/pref/labels.php:82
+#: classes/pref/filters.php:525
+#: classes/pref/feeds.php:773
+#: classes/pref/feeds.php:913
+#: classes/pref/users.php:103
+#: classes/pref/prefs.php:982
+#: classes/article.php:236
+#: plugins/af_zz_imgproxy/init.php:238
+#: plugins/af_redditimgur/init.php:66
+#: plugins/af_psql_trgm/init.php:188
+#: plugins/af_readability/init.php:80
+#: plugins/nsfw/init.php:85
+#: plugins/mail/init.php:65
+#: plugins/note/init.php:58
+msgid "Save"
+msgstr "إحفظ"
+
 #: classes/pref/labels.php:244
 #, php-format
 msgid "Created label <b>%s</b>"
 msgstr "تم إنشاء التسمية <b>%s</b>"
 
 #: classes/pref/labels.php:270
-#: classes/pref/users.php:356
-#: classes/pref/feeds.php:1183
-#: classes/pref/feeds.php:1414
-#: classes/pref/feeds.php:1479
 #: classes/pref/filters.php:388
 #: classes/pref/filters.php:446
 #: classes/pref/filters.php:792
 #: classes/pref/filters.php:875
 #: classes/pref/filters.php:902
+#: classes/pref/feeds.php:1182
+#: classes/pref/feeds.php:1413
+#: classes/pref/feeds.php:1478
+#: classes/pref/users.php:355
 #: classes/pref/prefs.php:993
 msgid "Select"
 msgstr "إختر"
 
-#: classes/pref/labels.php:273
-#: classes/pref/users.php:359
-#: classes/pref/feeds.php:1186
-#: classes/pref/feeds.php:1417
-#: classes/pref/feeds.php:1482
-#: classes/pref/filters.php:391
-#: classes/pref/filters.php:449
-#: classes/pref/filters.php:795
-#: classes/pref/filters.php:878
-#: classes/pref/filters.php:905
-#: classes/pref/prefs.php:996
-#: classes/feeds.php:102
-msgid "All"
-msgstr "الكل"
-
-#: classes/pref/labels.php:275
-#: classes/pref/users.php:361
-#: classes/pref/feeds.php:1188
-#: classes/pref/feeds.php:1419
-#: classes/pref/feeds.php:1484
-#: classes/pref/filters.php:393
-#: classes/pref/filters.php:451
-#: classes/pref/filters.php:797
-#: classes/pref/filters.php:880
-#: classes/pref/filters.php:907
-#: classes/pref/prefs.php:998
-#: classes/feeds.php:105
-msgid "None"
-msgstr "لاشيء"
-
-#: classes/pref/labels.php:282
-#: classes/pref/users.php:370
-#: classes/pref/feeds.php:752
-#: classes/pref/filters.php:518
-#: classes/pref/filters.php:814
-#: classes/feeds.php:1088
-msgid "Remove"
-msgstr "إحذف"
-
 #: classes/pref/labels.php:285
 msgid "Clear colors"
 msgstr "إمسح الألوان"
 
-#: classes/pref/users.php:6
-#: classes/pref/system.php:8
-msgid "Your access level is insufficient to open this tab."
-msgstr "مستوى الوصول الخاص بك غير كافٍ لفتح هذا التبويب."
-
-#: classes/pref/users.php:26
+#: classes/pref/filters.php:155
 #, fuzzy
-msgid "Edit user"
-msgstr "تحرير القاعدة"
+msgid "Preview article"
+msgstr "البنود الطازجة"
 
-#: classes/pref/users.php:61
-#: classes/pref/feeds.php:622
-#: classes/pref/feeds.php:849
-#: classes/feeds.php:1009
-msgid "Authentication"
-msgstr "الإستيثاق"
+#: classes/pref/filters.php:267
+#: classes/pref/filters.php:573
+msgid "(inverse)"
+msgstr "(إعكس)"
 
-#: classes/pref/users.php:64
-msgid "Access level: "
-msgstr "مستوى الوصول:"
-
-#: classes/pref/users.php:82
-#: classes/pref/feeds.php:648
-#: classes/pref/feeds.php:867
-msgid "Options"
-msgstr "خيارات"
-
-#: classes/pref/users.php:96
-#: js/prefs.js:479
-msgid "User details"
-msgstr "تفاصيل المستخدم"
-
-#: classes/pref/users.php:136
-#: classes/pref/users.php:407
-msgid "Registered"
-msgstr "مسجَّل"
-
-#: classes/pref/users.php:137
-msgid "Last logged in"
-msgstr "آخر دخول للنظام"
-
-#: classes/pref/users.php:145
-msgid "Subscribed feeds count"
-msgstr "عدد الخلاصات المشتَرَك بها"
-
-#: classes/pref/users.php:146
-#, fuzzy
-msgid "Stored articles"
-msgstr "البنود بنجمة"
-
-#: classes/pref/users.php:150
-#: classes/pref/users.php:406
-msgid "Subscribed feeds"
-msgstr "الخلاصات المشتَرَك بها"
-
-#: classes/pref/users.php:176
-msgid "User not found"
-msgstr "مستخدم غير موجود"
-
-#: classes/pref/users.php:246
+#: classes/pref/filters.php:263
+#: classes/pref/filters.php:572
 #, php-format
-msgid "Added user <b>%s</b> with password <b>%s</b>"
-msgstr "تمت إضافة المستخدم <b>%s</b> بكلمة المرور <b>%s</b>"
+msgid "%s on %s in %s %s"
+msgstr "%s على %s في %s %s"
 
-#: classes/pref/users.php:253
-#, php-format
-msgid "Could not create user <b>%s</b>"
-msgstr "لم أتمكن من إنشاء المستخدم <b>%s</b>"
+#: classes/pref/filters.php:383
+#: classes/pref/filters.php:870
+#: classes/pref/filters.php:977
+msgid "Match"
+msgstr "يُطابِق"
 
-#: classes/pref/users.php:257
-#, php-format
-msgid "User <b>%s</b> already exists."
-msgstr "المستخدم <b>%s</b> موجود مسبقاً."
+#: classes/pref/filters.php:397
+#: classes/pref/filters.php:455
+#: classes/pref/filters.php:884
+#: classes/pref/filters.php:911
+msgid "Add"
+msgstr "أضِف"
 
-#: classes/pref/users.php:285
-#, php-format
-msgid "Changed password of user <b>%s</b> to <b>%s</b>"
-msgstr "تم تغيير كلمة مرور المستخدم <b>%s</b> إلى <b>%s</b>"
+#: classes/pref/filters.php:441
+#: classes/pref/filters.php:897
+msgid "Apply actions"
+msgstr "تطبيق الإجراءات"
 
-#: classes/pref/users.php:287
-#, php-format
-msgid "Sending new password of user <b>%s</b> to <b>%s</b>"
-msgstr "يجري إرسال كلمة المرور الجديدة للمستخدم <b>%s</b> إلى العنوان <b>%s</b>"
+#: classes/pref/filters.php:492
+#: classes/pref/filters.php:926
+msgid "Enabled"
+msgstr "ممكَّن"
 
-#: classes/pref/users.php:311
-msgid "[tt-rss] Password change notification"
-msgstr "[tt-rss] إشعار تغيُّر كلمة المرور"
+#: classes/pref/filters.php:501
+#: classes/pref/filters.php:929
+msgid "Match any rule"
+msgstr "طابق أي قاعدة"
 
-#: classes/pref/users.php:346
-#: classes/pref/feeds.php:1179
-#: classes/pref/filters.php:788
-#: classes/feeds.php:1059
-#: classes/feeds.php:1127
-#: js/tt-rss.js:165
-msgid "Search"
-msgstr "إبحث"
+#: classes/pref/filters.php:510
+#: classes/pref/filters.php:932
+msgid "Inverse matching"
+msgstr "مطابقة عكسيَّة"
 
-#: classes/pref/users.php:364
-msgid "Create user"
-msgstr "أنشئ مستخدم"
+#: classes/pref/filters.php:522
+#: classes/pref/filters.php:939
+msgid "Test"
+msgstr "إختبر"
+
+#: classes/pref/filters.php:804
+msgid "Combine"
+msgstr "جمِّع"
 
-#: classes/pref/users.php:368
 #: classes/pref/filters.php:807
+#: classes/pref/users.php:367
 msgid "Edit"
 msgstr "حرِّر"
 
-#: classes/pref/users.php:404
-#: classes/pref/feeds.php:626
-#: classes/pref/feeds.php:853
-#: classes/pref/feeds.php:1649
-#: classes/feeds.php:1013
-msgid "Login"
-msgstr "الدخول"
+#: classes/pref/filters.php:810
+#: classes/pref/feeds.php:1198
+#: classes/pref/feeds.php:1212
+msgid "Reset sort order"
+msgstr "أعد تعيين ترتيب الفرز"
 
-#: classes/pref/users.php:405
-msgid "Access Level"
-msgstr "مستوى الوصول"
+#: classes/pref/filters.php:942
+msgid "Create"
+msgstr "أنشئ"
 
-#: classes/pref/users.php:408
-msgid "Last login"
-msgstr "آخر دخول"
+#: classes/pref/filters.php:987
+msgid "Regular expression, without outer delimiters (i.e. slashes)"
+msgstr ""
 
-#: classes/pref/users.php:427
-msgid "Click to edit"
-msgstr "أنقر للتحرير"
+#: classes/pref/filters.php:993
+msgid "Inverse regular expression matching"
+msgstr "إعكس مطابقة التعبير العادي"
 
-#: classes/pref/users.php:447
-msgid "No users defined."
-msgstr "لايوجد مستخدمين معرَّفين."
+#: classes/pref/filters.php:995
+msgid "on field"
+msgstr "في الحقل"
 
-#: classes/pref/users.php:449
-msgid "No matching users found."
-msgstr "لم يتم العثور على مستخدمين مطابقين"
+#: classes/pref/filters.php:1001
+#: js/PrefFilterTree.js:44
+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:764
+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:786
+msgid "Add action"
+msgstr "أضف إجراء"
+
+#: classes/pref/filters.php:1139
+msgid "[No caption]"
+msgstr "[دون تسمية توضيحية]"
+
+#: classes/pref/filters.php:1141
+#, php-format
+msgid "%s (%d rule)"
+msgid_plural "%s (%d rules)"
+msgstr[0] "%s (القاعدة %d)"
+msgstr[1] "%s (القواعد %d)"
+
+#: classes/pref/filters.php:1155
+#, fuzzy
+msgid "matches any rule"
+msgstr "طابق أي قاعدة"
+
+#: classes/pref/filters.php:1158
+#, php-format
+msgid "%s (+%d action)"
+msgid_plural "%s (+%d actions)"
+msgstr[0] "%s (+%d إجراء)"
+msgstr[1] "%s (+%d إجراءات)"
+
+#: classes/pref/system.php:8
+#: classes/pref/users.php:6
+msgid "Your access level is insufficient to open this tab."
+msgstr "مستوى الوصول الخاص بك غير كافٍ لفتح هذا التبويب."
 
 #: classes/pref/system.php:29
 msgid "Error Log"
@@ -1447,385 +1440,316 @@ msgid_plural "(%d feeds)"
 msgstr[0] "(الخلاصة %d)"
 msgstr[1] "(الخلاصات %d)"
 
-#: classes/pref/feeds.php:514
+#: classes/pref/feeds.php:513
 #: classes/pref/prefs.php:18
 msgid "General"
 msgstr "عام"
 
-#: classes/pref/feeds.php:528
+#: classes/pref/feeds.php:527
 msgid "Feed Title"
 msgstr "عنوان الخلاصة"
 
-#: classes/pref/feeds.php:560
-#: classes/pref/feeds.php:801
-#: classes/pref/feeds.php:1635
-#: classes/feeds.php:989
-msgid "Place in category:"
-msgstr "ضعه في التصنيف:"
+#: classes/pref/feeds.php:536
+#: classes/handler/public.php:417
+msgid "URL:"
+msgstr "عنوان URL:"
 
-#: classes/pref/feeds.php:572
+#: classes/pref/feeds.php:571
 #, fuzzy
 msgid "Site URL:"
 msgstr "عنوان URL للبند:"
 
-#: classes/pref/feeds.php:574
+#: classes/pref/feeds.php:573
 #, fuzzy
 msgid "Site URL"
 msgstr "عنوان URL للخلاصة"
 
-#: classes/pref/feeds.php:585
-#: classes/pref/feeds.php:815
+#: classes/pref/feeds.php:584
+#: classes/pref/feeds.php:814
 #, fuzzy
 msgid "Language:"
 msgstr "اللغة"
 
-#: classes/pref/feeds.php:592
-#: classes/pref/feeds.php:824
+#: classes/pref/feeds.php:591
+#: classes/pref/feeds.php:823
 msgid "Update"
 msgstr "تحديث"
 
-#: classes/pref/feeds.php:607
-#: classes/pref/feeds.php:840
+#: classes/pref/feeds.php:606
+#: classes/pref/feeds.php:839
 msgid "Article purging:"
 msgstr "تنظيف البند:"
 
-#: classes/pref/feeds.php:632
-#: classes/pref/feeds.php:861
-#: classes/pref/feeds.php:1652
-#: classes/pref/prefs.php:243
-#: classes/feeds.php:1017
-msgid "Password"
-msgstr "كلمة المرور"
-
-#: classes/pref/feeds.php:636
+#: classes/pref/feeds.php:635
 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:646
-#: classes/feeds.php:1028
-msgid "This feed requires authentication."
-msgstr "هذه الخلاصة تتطلب الإستيثاق."
+#: classes/pref/feeds.php:647
+#: classes/pref/feeds.php:866
+#: classes/pref/users.php:82
+msgid "Options"
+msgstr "خيارات"
 
-#: classes/pref/feeds.php:662
-#: classes/pref/feeds.php:871
+#: classes/pref/feeds.php:661
+#: classes/pref/feeds.php:870
 msgid "Hide from Popular feeds"
 msgstr "خبئها من بين الخلاصات الشَّعبية"
 
-#: classes/pref/feeds.php:674
-#: classes/pref/feeds.php:877
+#: classes/pref/feeds.php:673
+#: classes/pref/feeds.php:876
 msgid "Include in e-mail digest"
 msgstr "ضمِّن هذا في رسالة الموجز"
 
-#: classes/pref/feeds.php:687
-#: classes/pref/feeds.php:883
+#: classes/pref/feeds.php:686
+#: classes/pref/feeds.php:882
 msgid "Always display image attachments"
 msgstr "إعرض الصور المرفقة دائماً"
 
-#: classes/pref/feeds.php:700
-#: classes/pref/feeds.php:891
+#: classes/pref/feeds.php:699
+#: classes/pref/feeds.php:890
 #, fuzzy
 msgid "Do not embed media"
 msgstr "لا تضمِّن الصور"
 
-#: classes/pref/feeds.php:713
-#: classes/pref/feeds.php:899
+#: classes/pref/feeds.php:712
+#: classes/pref/feeds.php:898
 msgid "Cache media"
 msgstr ""
 
-#: classes/pref/feeds.php:725
-#: classes/pref/feeds.php:905
+#: classes/pref/feeds.php:724
+#: classes/pref/feeds.php:904
 msgid "Mark updated articles as unread"
 msgstr "علِّم البنود المحدَّثة بـ غير مقروءة"
 
-#: classes/pref/feeds.php:729
+#: classes/pref/feeds.php:728
 msgid "Icon"
 msgstr "أيقونة"
 
-#: classes/pref/feeds.php:743
-#: classes/pref/feeds.php:1284
+#: classes/pref/feeds.php:742
+#: classes/pref/feeds.php:1283
 #: plugins/import_export/init.php:71
 #, fuzzy
 msgid "Choose file..."
 msgstr "أنشئ مرشحاً..."
 
-#: classes/pref/feeds.php:750
+#: classes/pref/feeds.php:749
 msgid "Replace"
 msgstr "إستبدال"
 
-#: classes/pref/feeds.php:757
+#: classes/pref/feeds.php:756
 #: classes/pref/prefs.php:679
 msgid "Plugins"
 msgstr "إضافات"
 
-#: classes/pref/feeds.php:1154
+#: classes/pref/feeds.php:1153
 msgid "Feeds with errors"
 msgstr "الخلاصات ذات الأخطاء"
 
-#: classes/pref/feeds.php:1161
+#: classes/pref/feeds.php:1160
 msgid "Inactive feeds"
 msgstr "الخلاصات الخاملة"
 
-#: classes/pref/feeds.php:1197
+#: classes/pref/feeds.php:1196
 msgid "Edit selected feeds"
 msgstr "حرّر الخلاصات المختارة"
 
-#: classes/pref/feeds.php:1199
-#: classes/pref/feeds.php:1213
-#: classes/pref/filters.php:810
-msgid "Reset sort order"
-msgstr "أعد تعيين ترتيب الفرز"
-
-#: classes/pref/feeds.php:1201
-#: js/prefs.js:1462
+#: classes/pref/feeds.php:1200
+#: js/prefs.js:1171
 msgid "Batch subscribe"
 msgstr "إشتراك بالجملة"
 
-#: classes/pref/feeds.php:1208
+#: classes/pref/feeds.php:1207
 msgid "Categories"
 msgstr "التصنيفات"
 
-#: classes/pref/feeds.php:1211
+#: classes/pref/feeds.php:1210
 msgid "Add category"
 msgstr "أضف تصنيفاً"
 
-#: classes/pref/feeds.php:1215
+#: classes/pref/feeds.php:1214
 msgid "Remove selected"
 msgstr "إحذف المختارة"
 
-#: classes/pref/feeds.php:1272
+#: classes/pref/feeds.php:1271
 msgid "OPML"
 msgstr "OPML"
 
-#: classes/pref/feeds.php:1274
+#: classes/pref/feeds.php:1273
 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:1275
+#: classes/pref/feeds.php:1274
 msgid "Only main settings profile can be migrated using OPML."
 msgstr "الملف الشخصي الأساسي للإعدادات فقط هو الذي يمكن ترحيله باستخدام OPML."
 
-#: classes/pref/feeds.php:1290
+#: classes/pref/feeds.php:1289
 msgid "Import my OPML"
 msgstr "إستورد OMPL الخاصة بي"
 
-#: classes/pref/feeds.php:1296
+#: classes/pref/feeds.php:1295
 msgid "Filename:"
 msgstr "اسم الملف:"
 
-#: classes/pref/feeds.php:1298
+#: classes/pref/feeds.php:1297
 msgid "Include settings"
 msgstr "ضمِّن الإعدادات"
 
-#: classes/pref/feeds.php:1302
+#: classes/pref/feeds.php:1301
 msgid "Export OPML"
 msgstr "تصدير OPML"
 
-#: classes/pref/feeds.php:1306
+#: classes/pref/feeds.php:1305
 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:1310
+#: classes/pref/feeds.php:1309
 msgid "Public OPML URL"
 msgstr "عنوان URL لـ OPML المتاح للعامة "
 
-#: classes/pref/feeds.php:1311
+#: classes/pref/feeds.php:1310
 msgid "Display published OPML URL"
 msgstr "إعرض عنوان URL المنشور لـ OPML"
 
-#: classes/pref/feeds.php:1318
+#: classes/pref/feeds.php:1317
 msgid "Published & shared articles / Generated feeds"
 msgstr "البنود المنشورة والمشارَكة / الخلاصات المولَّدة"
 
-#: classes/pref/feeds.php:1320
+#: classes/pref/feeds.php:1319
 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:1327
-#: classes/feeds.php:54
-#: classes/feeds.php:140
-msgid "View as RSS"
-msgstr "إعرض كـ RSS"
-
-#: classes/pref/feeds.php:1328
 msgid "Display URL"
 msgstr "إعرض عنوان URL"
 
-#: classes/pref/feeds.php:1331
+#: classes/pref/feeds.php:1330
 msgid "Clear all generated URLs"
 msgstr "مسح كل عناوين URL المولَّدة"
 
-#: classes/pref/feeds.php:1410
+#: classes/pref/feeds.php:1409
 msgid "These feeds have not been updated with new content for 3 months (oldest first):"
 msgstr "هذه الخلاصات لم تحدَّث بمحتوى جديد منذ ٣ أشهر (الأقدم أولاً):"
 
-#: classes/pref/feeds.php:1444
-#: classes/pref/feeds.php:1509
+#: classes/pref/feeds.php:1443
+#: classes/pref/feeds.php:1508
 msgid "Click to edit feed"
 msgstr "أنقر لتحرير الخلاصة"
 
-#: classes/pref/feeds.php:1462
-#: classes/pref/feeds.php:1529
+#: classes/pref/feeds.php:1461
+#: classes/pref/feeds.php:1528
 msgid "Unsubscribe from selected feeds"
 msgstr "إلغاء الإشتراك في الخلاصات المختارة"
 
-#: classes/pref/feeds.php:1632
+#: classes/pref/feeds.php:1629
 msgid "Add one valid RSS feed per line (no feed detection is done)"
 msgstr "ضع خلاصة RSS واحدة صحيحة على السطر (لن يجري اكتشاف الخلاصة)"
 
-#: classes/pref/feeds.php:1641
+#: classes/pref/feeds.php:1638
 msgid "Feeds to subscribe, One per line"
 msgstr "الخلاصات المرغوب الاشتراك فيها ، واحدة لكل سطر"
 
-#: classes/pref/feeds.php:1664
+#: classes/pref/feeds.php:1661
 msgid "Feeds require authentication."
 msgstr "الخلاصات تتطلب الاستيثاق."
 
-#: classes/pref/feeds.php:1671
-#: classes/feeds.php:1031
-#: classes/feeds.php:1087
-msgid "Subscribe"
-msgstr "إشترك"
-
-#: classes/pref/filters.php:155
+#: classes/pref/users.php:26
 #, fuzzy
-msgid "Preview article"
-msgstr "البنود الطازجة"
+msgid "Edit user"
+msgstr "تحرير القاعدة"
 
-#: classes/pref/filters.php:267
-#: classes/pref/filters.php:573
-msgid "(inverse)"
-msgstr "(إعكس)"
+#: classes/pref/users.php:64
+msgid "Access level: "
+msgstr "مستوى الوصول:"
 
-#: classes/pref/filters.php:263
-#: classes/pref/filters.php:572
-#, php-format
-msgid "%s on %s in %s %s"
-msgstr "%s على %s في %s %s"
+#: classes/pref/users.php:96
+#: js/prefs.js:403
+msgid "User details"
+msgstr "تفاصيل المستخدم"
 
-#: classes/pref/filters.php:383
-#: classes/pref/filters.php:870
-#: classes/pref/filters.php:977
-msgid "Match"
-msgstr "يُطابِق"
+#: classes/pref/users.php:136
+#: classes/pref/users.php:406
+msgid "Registered"
+msgstr "مسجَّل"
 
-#: classes/pref/filters.php:397
-#: classes/pref/filters.php:455
-#: classes/pref/filters.php:884
-#: classes/pref/filters.php:911
-msgid "Add"
-msgstr "أضِف"
+#: classes/pref/users.php:137
+msgid "Last logged in"
+msgstr "آخر دخول للنظام"
 
-#: classes/pref/filters.php:400
-#: classes/pref/filters.php:458
-#: classes/pref/filters.php:887
-#: classes/pref/filters.php:914
-#: classes/feeds.php:122
-msgid "Delete"
-msgstr "إحذف"
+#: classes/pref/users.php:145
+msgid "Subscribed feeds count"
+msgstr "عدد الخلاصات المشتَرَك بها"
 
-#: classes/pref/filters.php:441
-#: classes/pref/filters.php:897
-msgid "Apply actions"
-msgstr "تطبيق الإجراءات"
-
-#: classes/pref/filters.php:492
-#: classes/pref/filters.php:926
-msgid "Enabled"
-msgstr "ممكَّن"
-
-#: classes/pref/filters.php:501
-#: classes/pref/filters.php:929
-msgid "Match any rule"
-msgstr "طابق أي قاعدة"
-
-#: classes/pref/filters.php:510
-#: classes/pref/filters.php:932
-msgid "Inverse matching"
-msgstr "مطابقة عكسيَّة"
-
-#: classes/pref/filters.php:522
-#: classes/pref/filters.php:939
-msgid "Test"
-msgstr "إختبر"
-
-#: classes/pref/filters.php:804
-msgid "Combine"
-msgstr "جمِّع"
-
-#: classes/pref/filters.php:942
-msgid "Create"
-msgstr "أنشئ"
-
-#: classes/pref/filters.php:987
-msgid "Regular expression, without outer delimiters (i.e. slashes)"
-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:43
-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:797
-msgid "Add rule"
-msgstr "أضف قاعدة"
-
-#: classes/pref/filters.php:1042
-msgid "Perform Action"
-msgstr "القيام بإجراء"
-
-#: classes/pref/filters.php:1093
+#: classes/pref/users.php:146
 #, fuzzy
-msgid "No actions available"
-msgstr "يتوفر إصدار جديد!"
+msgid "Stored articles"
+msgstr "البنود بنجمة"
 
-#: classes/pref/filters.php:1112
-msgid "Save action"
-msgstr "إحفظ الإجراء"
+#: classes/pref/users.php:150
+#: classes/pref/users.php:405
+msgid "Subscribed feeds"
+msgstr "الخلاصات المشتَرَك بها"
 
-#: classes/pref/filters.php:1112
-#: js/functions.js:819
-msgid "Add action"
-msgstr "أضف إجراء"
+#: classes/pref/users.php:176
+msgid "User not found"
+msgstr "مستخدم غير موجود"
 
-#: classes/pref/filters.php:1139
-msgid "[No caption]"
-msgstr "[دون تسمية توضيحية]"
-
-#: classes/pref/filters.php:1141
+#: classes/pref/users.php:246
 #, php-format
-msgid "%s (%d rule)"
-msgid_plural "%s (%d rules)"
-msgstr[0] "%s (القاعدة %d)"
-msgstr[1] "%s (القواعد %d)"
+msgid "Added user <b>%s</b> with password <b>%s</b>"
+msgstr "تمت إضافة المستخدم <b>%s</b> بكلمة المرور <b>%s</b>"
 
-#: classes/pref/filters.php:1155
-#, fuzzy
-msgid "matches any rule"
-msgstr "طابق أي قاعدة"
-
-#: classes/pref/filters.php:1158
+#: classes/pref/users.php:253
 #, php-format
-msgid "%s (+%d action)"
-msgid_plural "%s (+%d actions)"
-msgstr[0] "%s (+%d إجراء)"
-msgstr[1] "%s (+%d إجراءات)"
+msgid "Could not create user <b>%s</b>"
+msgstr "لم أتمكن من إنشاء المستخدم <b>%s</b>"
+
+#: classes/pref/users.php:257
+#, php-format
+msgid "User <b>%s</b> already exists."
+msgstr "المستخدم <b>%s</b> موجود مسبقاً."
+
+#: classes/pref/users.php:285
+#, 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:287
+#, 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:310
+msgid "[tt-rss] Password change notification"
+msgstr "[tt-rss] إشعار تغيُّر كلمة المرور"
+
+#: classes/pref/users.php:363
+msgid "Create user"
+msgstr "أنشئ مستخدم"
+
+#: classes/pref/users.php:371
+#: classes/handler/public.php:747
+msgid "Reset password"
+msgstr "إعادة تعيين كلمة المرور"
+
+#: classes/pref/users.php:404
+msgid "Access Level"
+msgstr "مستوى الوصول"
+
+#: classes/pref/users.php:407
+msgid "Last login"
+msgstr "آخر دخول"
+
+#: classes/pref/users.php:426
+msgid "Click to edit"
+msgstr "أنقر للتحرير"
+
+#: classes/pref/users.php:446
+msgid "No users defined."
+msgstr "لايوجد مستخدمين معرَّفين."
+
+#: classes/pref/users.php:448
+msgid "No matching users found."
+msgstr "لم يتم العثور على مستخدمين مطابقين"
 
 #: classes/pref/prefs.php:19
 msgid "Interface"
@@ -2001,7 +1925,7 @@ msgid "Strip all but most common HTML tags when reading articles."
 msgstr "نزع كل وسوم HTML عدا الشائع منها عند قراءة البنود."
 
 #: classes/pref/prefs.php:53
-#: js/prefs.js:1424
+#: js/prefs.js:1136
 msgid "Customize stylesheet"
 msgstr "تخصيص صفحات الطُّرُز"
 
@@ -2244,254 +2168,298 @@ msgstr "حذف الملفات الشخصية المحدَّدة"
 msgid "Activate profile"
 msgstr "تنشيط الملف الشخصي"
 
-#: classes/feeds.php:53
-msgid "View as RSS feed"
-msgstr "إعرض كخلاصة RSS"
+#: 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/feeds.php:62
-#, php-format
-msgid "Last updated: %s"
-msgstr "آخر تحديث : %s"
+#: classes/dlg.php:44
+msgid "Your Public OPML URL is:"
+msgstr "عنوان URL الظاهر للـ OPML هو :"
 
-#: classes/feeds.php:100
+#: classes/dlg.php:53
+#: classes/dlg.php:178
+#: plugins/share/init.php:125
+msgid "Generate new URL"
+msgstr "توليد عنوان URL جديد"
+
+#: classes/dlg.php:67
+msgid "Update daemon is enabled in configuration, but daemon process is not running, which prevents all feeds from updating. Please start the daemon process or contact instance owner."
+msgstr "ناطر التحديث مفعَّل في الإعدادات إلا أن مهمته ليست جارية ، وهذا يمنع تحديث جميع الخلاصات.  فضلاً إبدأ عملية الناطر أو اتصل بمالك المثيلة (البرنامج)."
+
+#: classes/dlg.php:71
+#: classes/dlg.php:80
+msgid "Last update:"
+msgstr "آخر تحديث:"
+
+#: classes/dlg.php:76
+msgid "Update daemon is taking too long to perform a feed update. This could indicate a problem like crash or a hang. Please check the daemon process or contact instance owner."
+msgstr "ناطر التحديث يستغرق وقتاً طويلا جداً للقيام بتحديث الخلاصة.  هذا قد يشير لمشكلة انهيار أو تعليق.  فضلاً إفحص عملية الناطر أو اتصل بمالك المثيلة(البرنامج)."
+
+#: classes/dlg.php:169
+msgid "You can view this feed as RSS using the following URL:"
+msgstr "يمكنك عرض هذه الخلاصة كـ RSS باستخدام عنوان URL التالي:"
+
+#: classes/dlg.php:190
+msgid "You are using default tt-rss password. Please change it in the Preferences (Personal data / Authentication)."
+msgstr ""
+
+#: classes/dlg.php:194
 #, fuzzy
-msgid "Select..."
-msgstr "إختر"
+msgid "Open Preferences"
+msgstr "خيارات"
 
-#: classes/feeds.php:104
-msgid "Invert"
-msgstr "إعكس"
+#: classes/opml.php:31
+#: classes/opml.php:36
+msgid "OPML Utility"
+msgstr "أداة OPML"
 
-#: classes/feeds.php:107
-msgid "Selection toggle:"
-msgstr "تبديل الاختيار:"
+#: classes/opml.php:40
+msgid "Importing OPML..."
+msgstr "إستيراد OPML..."
 
-#: classes/feeds.php:113
-msgid "Selection:"
-msgstr "الاختيار:"
+#: classes/opml.php:45
+msgid "Return to preferences"
+msgstr "العودة للتفضيلات"
 
-#: classes/feeds.php:116
-msgid "Set score"
-msgstr "حدِّد نقطة"
-
-#: classes/feeds.php:119
-msgid "Archive"
-msgstr "محفوظات"
-
-#: classes/feeds.php:121
-msgid "Move back"
-msgstr "العودة للخلف"
-
-#: classes/feeds.php:127
-#: classes/feeds.php:132
-#: plugins/mail/init.php:76
-#: plugins/mailto/init.php:25
-msgid "Forward by email"
-msgstr "أعد التوجيه بالبريد"
-
-#: classes/feeds.php:136
-msgid "Feed:"
-msgstr "خلاصة:"
-
-#: classes/feeds.php:193
-#: classes/feeds.php:819
-msgid "Feed not found."
-msgstr "لم أجد الخلاصة."
-
-#: classes/feeds.php:255
-msgid "Never"
-msgstr "أبداً"
-
-#: classes/feeds.php:342
+#: classes/opml.php:301
 #, php-format
-msgid "Imported at %s"
-msgstr "تم استيراده في %s"
+msgid "Adding feed: %s"
+msgstr "إضافة الخلاصة: %s"
 
-#: classes/feeds.php:394
-#: classes/feeds.php:487
-msgid "mark feed as read"
-msgstr "علِّم الخلاصة مقروءة"
-
-#: classes/feeds.php:542
-msgid "Collapse article"
-msgstr "طيّ البند"
-
-#: classes/feeds.php:703
-msgid "No unread articles found to display."
-msgstr "لم أجد بنوداً غير مقروءة لأعرضها."
-
-#: classes/feeds.php:706
-msgid "No updated articles found to display."
-msgstr "لم أجد بنوداً محدَّثة لأعرضها."
-
-#: classes/feeds.php:709
-msgid "No starred articles found to display."
-msgstr "لم أجد بنوداً معلَّمة بنجمة لأعرضها."
-
-#: classes/feeds.php:713
-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:715
-msgid "No articles found to display."
-msgstr "لم أجد بنوداًلأعرضها."
-
-#: classes/feeds.php:731
-#: classes/feeds.php:922
+#: classes/opml.php:312
 #, php-format
-msgid "Feeds last updated at %s"
-msgstr "آخر تحديث للخلاصات في %s"
+msgid "Duplicate feed: %s"
+msgstr "خلاصة مكرَّرة: %s"
 
-#: classes/feeds.php:743
-#: classes/feeds.php:934
-msgid "Some feeds have update errors (click for details)"
-msgstr "توجد أخطاء في تحديث بعض الخلاصات (أنقر للتفاصيل)"
-
-#: classes/feeds.php:911
-msgid "No feed selected."
-msgstr "لم تختر خلاصة."
-
-#: classes/feeds.php:975
-#: classes/feeds.php:983
-msgid "Feed or site URL"
-msgstr "عنوان URL للخلاصة أو الموقع"
-
-#: classes/feeds.php:997
-msgid "Available feeds"
-msgstr "الخلاصات المتوفّرة"
-
-#: classes/feeds.php:1034
-msgid "More feeds"
-msgstr "المزيد من الخلاصات"
-
-#: classes/feeds.php:1063
-msgid "Popular feeds"
-msgstr "الخلاصات الشعبيَّة"
-
-#: classes/feeds.php:1064
-msgid "Feed archive"
-msgstr "محفوظات الخلاصة"
-
-#: classes/feeds.php:1067
-msgid "limit:"
-msgstr "حدّ:"
-
-#: classes/feeds.php:1101
-msgid "Look for"
-msgstr "إبحث عن"
-
-#: classes/feeds.php:1109
+#: classes/opml.php:326
 #, php-format
-msgid "in %s"
+msgid "Adding label %s"
+msgstr "إضافة التسمية %s"
+
+#: classes/opml.php:329
+#, php-format
+msgid "Duplicate label: %s"
+msgstr "تسمية مكرَّرة: %s"
+
+#: classes/opml.php:341
+#, php-format
+msgid "Setting preference key %s to %s"
+msgstr "ضبط مفتاح التفضيل %s ليصبح %s"
+
+#: classes/opml.php:377
+msgid "Adding filter..."
+msgstr "تجري إضافة المرشِّح..."
+
+#: classes/opml.php:512
+#, php-format
+msgid "Processing category: %s"
+msgstr "معالجة التصنيف: %s"
+
+#: classes/opml.php:558
+#, php-format
+msgid "Upload failed with error code %d"
+msgstr "فشِل الرفع و ظهر رمز الخطأ %d"
+
+#: classes/opml.php:570
+#: plugins/import_export/init.php:471
+msgid "Unable to move uploaded file."
+msgstr "لم أتمكن من نقل الملف المرفوع."
+
+#: classes/opml.php:574
+#: plugins/import_export/init.php:475
+msgid "Error: please upload OPML file."
+msgstr "خطأ: فضلاً إرفع (حمِّل) ملف OPML."
+
+#: classes/opml.php:585
+msgid "Error: unable to find moved OPML file."
+msgstr "خطأ: لم أعثر على ملف الـ OPML المنقول."
+
+#: classes/opml.php:594
+msgid "Error while parsing document."
+msgstr "خطأ أثناء تفسير المستند."
+
+#: classes/article.php:26
+msgid "Article not found."
+msgstr "البند غير موجود"
+
+#: classes/article.php:211
+msgid "Tags for this article (separated by commas):"
+msgstr "العلامات لهذا البند (مفصولة بفواصل)"
+
+#: classes/article.php:337
+#: classes/article.php:719
+#: classes/article.php:874
+msgid "no tags"
+msgstr "لا علامات"
+
+#: classes/article.php:447
+msgid "unknown type"
+msgstr "نوع غير معروف"
+
+#: classes/article.php:524
+msgid "Attachments"
+msgstr "مرفقات"
+
+#: classes/article.php:688
+msgid " - "
+msgstr " - "
+
+#: classes/article.php:912
+msgid "(edit note)"
+msgstr "(حرِّر ملاحظة)"
+
+#: classes/handler/public.php:407
+#: plugins/bookmarklets/init.php:40
+msgid "Share with Tiny Tiny RSS"
+msgstr "شارك مع/عبر Tiny Tiny RSS"
+
+#: classes/handler/public.php:415
+msgid "Title:"
+msgstr "العنوان:"
+
+#: classes/handler/public.php:419
+msgid "Content:"
+msgstr "المحتوى:"
+
+#: classes/handler/public.php:421
+msgid "Labels:"
+msgstr "الأسماء:"
+
+#: classes/handler/public.php:440
+msgid "Shared article will appear in the Published feed."
+msgstr "سيظهر البند الذي شاركت في خلاصة \"منشور\""
+
+#: classes/handler/public.php:442
+msgid "Share"
+msgstr "شارِك"
+
+#: classes/handler/public.php:464
+msgid "Not logged in"
+msgstr "لم يسجِّل الدخول"
+
+#: classes/handler/public.php:527
+msgid "Incorrect username or password"
+msgstr "خطأ في اسم المستخدم أو كلمة المرور"
+
+#: classes/handler/public.php:581
+#, php-format
+msgid "Already subscribed to <b>%s</b>."
+msgstr "الإشتراك في <b>%s</b> موجود مسبقاً."
+
+#: classes/handler/public.php:584
+#, php-format
+msgid "Subscribed to <b>%s</b>."
+msgstr "مشترِك في <b>%s</b>."
+
+#: classes/handler/public.php:587
+#, php-format
+msgid "Could not subscribe to <b>%s</b>."
+msgstr "لم أتمكن من الإشتراك في <b>%s</b>."
+
+#: classes/handler/public.php:590
+#, php-format
+msgid "No feeds found in <b>%s</b>."
+msgstr "لم أجد خلاصات في <b>%s</b>."
+
+#: classes/handler/public.php:593
+msgid "Multiple feed URLs found."
+msgstr "وجدت عدة عناوين URL للخلاصة."
+
+#: classes/handler/public.php:597
+#, 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:615
+msgid "Subscribe to selected feed"
+msgstr "إشترك في الخلاصة المختارة"
+
+#: classes/handler/public.php:642
+msgid "Edit subscription options"
+msgstr "عدّل خيارات الإشتراك"
+
+#: classes/handler/public.php:680
+msgid "Password recovery"
+msgstr "إستعادة كلمة المرور"
+
+#: classes/handler/public.php:725
+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:757
+msgid "Some of the required form parameters are missing or incorrect."
+msgstr "بعض وسائط النموذج اللازمة مفقودة أو غير صحيحة."
+
+#: classes/handler/public.php:761
+#: classes/handler/public.php:830
+msgid "Go back"
+msgstr "الرجوع للخلف"
+
+#: classes/handler/public.php:799
+msgid "[tt-rss] Password reset request"
+msgstr "[tt-rss] طلب إعادة تعيين كلمة المرور"
+
+#: classes/handler/public.php:826
+msgid "Sorry, login and email combination not found."
+msgstr "آسف ، هذا المستخدم والبريد معاً غير موجودين."
+
+#: classes/handler/public.php:848
+msgid "Your access level is insufficient to run this script."
+msgstr "مستوى الوصول الخاص بك غير كافٍ لتشغيل هذا البرنامج."
+
+#: classes/handler/public.php:874
+msgid "Database Updater"
+msgstr "محدِّث قاعدة البيانات"
+
+#: classes/handler/public.php:939
+msgid "Perform updates"
+msgstr "ثبِّت التحديثات"
+
+#: plugins/af_zz_imgproxy/init.php:208
+msgid "Image proxy settings (af_zz_imgproxy)"
 msgstr ""
 
-#: classes/feeds.php:1114
-msgid "Used for word stemming"
-msgstr ""
+#: plugins/af_zz_imgproxy/init.php:232
+#, fuzzy
+msgid "Enable proxy for all remote images."
+msgstr "تمكين تصنيفات الخلاصات"
 
-#: classes/feeds.php:1123
-msgid "Search syntax"
-msgstr "نحو البحث"
+#: plugins/af_zz_imgproxy/init.php:236
+#, fuzzy
+msgid "Don't cache files locally."
+msgstr "خبئ الصور محلياً"
 
-#: classes/feeds.php:1577
-msgid "Starred articles"
-msgstr "البنود بنجمة"
-
-#: classes/feeds.php:1579
-msgid "Published articles"
-msgstr "البنود المنشورة"
-
-#: classes/feeds.php:1581
-msgid "Fresh articles"
-msgstr "البنود الطازجة"
-
-#: classes/feeds.php:1585
-msgid "Archived articles"
-msgstr "البنود المحفوظة"
-
-#: classes/feeds.php:1587
-msgid "Recently read"
-msgstr "قُرِأَت حديثاً"
-
-#: classes/feeds.php:1708
-msgid "Special"
-msgstr "خاص"
-
-#: classes/feeds.php:1965
-#, php-format
-msgid "Search results: %s"
-msgstr "نتائج البحث: %s"
-
-#: 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."
+#: plugins/af_zz_imgproxy/init.php:252
+#: plugins/af_redditimgur/init.php:79
+#, fuzzy
+msgid "Configuration saved"
 msgstr "حُفظت الإعدادات."
 
-#: plugins/note/init.php:28
-#: plugins/note/note.js:11
-msgid "Edit article note"
-msgstr "حرّر ملاحظة للبند"
-
 #: plugins/vf_shared/init.php:17
 #: plugins/vf_shared/init.php:73
 msgid "Shared articles"
 msgstr "البنود المشارَكة"
 
-#: plugins/auth_internal/init.php:67
-msgid "Please enter your one time password:"
-msgstr "فضلاً أدخل كلمة المرور ذات الاستخدام الواحد:"
+#: plugins/bookmarklets/init.php:20
+msgid "Bookmarklets"
+msgstr "علامات مرجعية"
 
-#: plugins/auth_internal/init.php:208
-msgid "Password has been changed."
-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/auth_internal/init.php:210
-msgid "Old password is incorrect."
-msgstr "كلمة المرور القديمة غير صحيحة."
+#: plugins/bookmarklets/init.php:26
+#, php-format
+msgid "Subscribe to %s in Tiny Tiny RSS?"
+msgstr "أترغب الإشتراك في %s عبر Tiny Tiny RSS ؟"
 
-#: plugins/af_readability/init.php:25
-msgid "Data saved."
-msgstr ""
+#: plugins/bookmarklets/init.php:31
+msgid "Subscribe in Tiny Tiny RSS"
+msgstr "إشترك في Tiny Tiny RSS"
 
-#: plugins/af_readability/init.php:41
-#, fuzzy
-msgid "Inline content"
-msgstr "حرّر ملاحظة للبند"
-
-#: plugins/af_readability/init.php:47
-msgid "Readability settings (af_readability)"
-msgstr ""
-
-#: plugins/af_readability/init.php:78
-msgid "Use Readability for pages shared via bookmarklet."
-msgstr ""
-
-#: plugins/af_readability/init.php:90
-#: plugins/af_psql_trgm/init.php:198
-msgid "Currently enabled for (click to edit):"
-msgstr ""
-
-#: plugins/af_readability/init.php:107
-#, fuzzy
-msgid "Readability"
-msgstr "تحقق من التوفُّر"
-
-#: plugins/af_readability/init.php:118
-#, fuzzy
-msgid "Inline article content"
-msgstr "حرّر ملاحظة للبند"
+#: plugins/bookmarklets/init.php:34
+msgid "Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS"
+msgstr "استخدم العلامة المرجعية التالية لتنشر صفحات عشوائية باستخدام Tiny Tiny RSS"
 
 #: plugins/af_redditimgur/init.php:30
 msgid "Reddit content settings (af_redditimgur)"
@@ -2505,11 +2473,21 @@ msgstr ""
 msgid "Enable additional duplicate checking"
 msgstr ""
 
-#: plugins/af_redditimgur/init.php:79
-#: plugins/af_zz_imgproxy/init.php:252
-#, fuzzy
-msgid "Configuration saved"
-msgstr "حُفظت الإعدادات."
+#: plugins/af_comics/init.php:49
+msgid "Feeds supported by af_comics"
+msgstr "الخلاصات التي تدعمها af_comics"
+
+#: plugins/af_comics/init.php:51
+msgid "The following comics are currently supported:"
+msgstr "الرسوم الهزلية التالية مدعومة حالياً :"
+
+#: plugins/af_comics/init.php:69
+msgid "To subscribe to GoComics use the comic's regular web page as the feed URL (e.g. for the <em>Garfield</em> comic use <code>http://www.gocomics.com/garfield</code>)."
+msgstr ""
+
+#: plugins/af_comics/init.php:71
+msgid "Drop any updated filters into <code>filters.local</code> in plugin directory."
+msgstr ""
 
 #: plugins/af_psql_trgm/init.php:29
 #, php-format
@@ -2549,26 +2527,87 @@ msgstr ""
 msgid "Enable for all feeds:"
 msgstr "تمكين تصنيفات الخلاصات"
 
+#: plugins/af_psql_trgm/init.php:198
+#: plugins/af_readability/init.php:90
+msgid "Currently enabled for (click to edit):"
+msgstr ""
+
 #: plugins/af_psql_trgm/init.php:216
 msgid "Similarity (pg_trgm)"
 msgstr ""
 
-#: plugins/af_comics/init.php:49
-msgid "Feeds supported by af_comics"
-msgstr "الخلاصات التي تدعمها af_comics"
-
-#: plugins/af_comics/init.php:51
-msgid "The following comics are currently supported:"
-msgstr "الرسوم الهزلية التالية مدعومة حالياً :"
-
-#: plugins/af_comics/init.php:69
-msgid "To subscribe to GoComics use the comic's regular web page as the feed URL (e.g. for the <em>Garfield</em> comic use <code>http://www.gocomics.com/garfield</code>)."
+#: plugins/af_readability/init.php:25
+msgid "Data saved."
 msgstr ""
 
-#: plugins/af_comics/init.php:71
-msgid "Drop any updated filters into <code>filters.local</code> in plugin directory."
+#: plugins/af_readability/init.php:41
+#, fuzzy
+msgid "Inline content"
+msgstr "حرّر ملاحظة للبند"
+
+#: plugins/af_readability/init.php:47
+msgid "Readability settings (af_readability)"
 msgstr ""
 
+#: plugins/af_readability/init.php:78
+msgid "Use Readability for pages shared via bookmarklet."
+msgstr ""
+
+#: plugins/af_readability/init.php:107
+#, fuzzy
+msgid "Readability"
+msgstr "تحقق من التوفُّر"
+
+#: plugins/af_readability/init.php:118
+#, fuzzy
+msgid "Inline article content"
+msgstr "حرّر ملاحظة للبند"
+
+#: plugins/mailto/init.php:50
+#: plugins/mailto/init.php:58
+#: plugins/mail/init.php:118
+#: plugins/mail/init.php:124
+msgid "[Forwarded]"
+msgstr "[إعادة توجيه]"
+
+#: plugins/mailto/init.php:50
+#: plugins/mail/init.php:118
+msgid "Multiple articles"
+msgstr "بنود متعددة"
+
+#: plugins/mailto/init.php:74
+msgid "Clicking the following link to invoke your mail client:"
+msgstr "النقر على الرابط التالي لاستدعاء برنامج البريد الإلكتروني لديك:"
+
+#: plugins/mailto/init.php:78
+msgid "Forward selected article(s) by email."
+msgstr "إعادة توجيه البنود المختارة عبر البريد."
+
+#: plugins/mailto/init.php:81
+msgid "You should be able to edit the message before sending in your mail client."
+msgstr "ستتمكن من تحرير الرسالة في برنامج البريد لديك قبل إرسالها."
+
+#: plugins/mailto/init.php:86
+msgid "Close this dialog"
+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/import_export/init.php:53
 msgid "Import and export"
 msgstr "إستيراد وتصدير"
@@ -2635,101 +2674,6 @@ msgstr "فشِل الرفع و ظهر رمز الخطأ %d"
 msgid "No file uploaded."
 msgstr "لم يتم تحميل أي ملف."
 
-#: plugins/mail/init.php:29
-msgid "Mail addresses saved."
-msgstr "تم حفظ عنوان البريد."
-
-#: plugins/mail/init.php:35
-msgid "Mail plugin"
-msgstr "إضافة البريد"
-
-#: plugins/mail/init.php:37
-msgid "You can set predefined email addressed here (comma-separated list):"
-msgstr "يمكنك تحديد عناوين بريد معرَّف مسبقاً هنا (قائمة مفصولة بفواصل):"
-
-#: plugins/mail/init.php:118
-#: plugins/mail/init.php:124
-#: plugins/mailto/init.php:50
-#: plugins/mailto/init.php:58
-msgid "[Forwarded]"
-msgstr "[إعادة توجيه]"
-
-#: plugins/mail/init.php:118
-#: plugins/mailto/init.php:50
-msgid "Multiple articles"
-msgstr "بنود متعددة"
-
-#: plugins/mail/init.php:146
-msgid "To:"
-msgstr "إلى:"
-
-#: plugins/mail/init.php:161
-msgid "Subject:"
-msgstr "الموضوع:"
-
-#: plugins/mail/init.php:178
-msgid "Send e-mail"
-msgstr "أرسل بريد إلكتروني"
-
-#: plugins/close_button/init.php:25
-msgid "Close article"
-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 "أترغب الإشتراك في %s عبر Tiny Tiny RSS ؟"
-
-#: 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 "استخدم العلامة المرجعية التالية لتنشر صفحات عشوائية باستخدام Tiny Tiny RSS"
-
-#: plugins/toggle_sidebar/init.php:23
-msgid "Collapse feedlist"
-msgstr "طيّ قائمة الخلاصات"
-
-#: plugins/af_zz_imgproxy/init.php:208
-msgid "Image proxy settings (af_zz_imgproxy)"
-msgstr ""
-
-#: plugins/af_zz_imgproxy/init.php:232
-#, fuzzy
-msgid "Enable proxy for all remote images."
-msgstr "تمكين تصنيفات الخلاصات"
-
-#: plugins/af_zz_imgproxy/init.php:236
-#, fuzzy
-msgid "Don't cache files locally."
-msgstr "خبئ الصور محلياً"
-
-#: plugins/mailto/init.php:74
-msgid "Clicking the following link to invoke your mail client:"
-msgstr "النقر على الرابط التالي لاستدعاء برنامج البريد الإلكتروني لديك:"
-
-#: plugins/mailto/init.php:78
-msgid "Forward selected article(s) by email."
-msgstr "إعادة توجيه البنود المختارة عبر البريد."
-
-#: plugins/mailto/init.php:81
-msgid "You should be able to edit the message before sending in your mail client."
-msgstr "ستتمكن من تحرير الرسالة في برنامج البريد لديك قبل إرسالها."
-
-#: plugins/mailto/init.php:86
-msgid "Close this dialog"
-msgstr "أغلق مربع الحوار هذا"
-
 #: plugins/share/init.php:41
 msgid "You can disable all articles shared by unique URLs here."
 msgstr "يمكنك هنا تعطيل جميع البنود المشارَكة بعناوين URL فريدة."
@@ -2750,451 +2694,600 @@ msgstr "يمكنك مشاركة هذا البند بعنوان URL الفريد
 msgid "Unshare article"
 msgstr "إلغاء مشاركة البند"
 
-#: js/FeedTree.js:75
+#: plugins/toggle_sidebar/init.php:23
+msgid "Collapse feedlist"
+msgstr "طيّ قائمة الخلاصات"
+
+#: plugins/close_button/init.php:25
+msgid "Close article"
+msgstr "أغلق البند"
+
+#: plugins/mail/init.php:29
+msgid "Mail addresses saved."
+msgstr "تم حفظ عنوان البريد."
+
+#: plugins/mail/init.php:35
+msgid "Mail plugin"
+msgstr "إضافة البريد"
+
+#: plugins/mail/init.php:37
+msgid "You can set predefined email addressed here (comma-separated list):"
+msgstr "يمكنك تحديد عناوين بريد معرَّف مسبقاً هنا (قائمة مفصولة بفواصل):"
+
+#: plugins/mail/init.php:146
+msgid "To:"
+msgstr "إلى:"
+
+#: plugins/mail/init.php:161
+msgid "Subject:"
+msgstr "الموضوع:"
+
+#: plugins/mail/init.php:178
+msgid "Send e-mail"
+msgstr "أرسل بريد إلكتروني"
+
+#: plugins/note/init.php:28
+#: plugins/note/note.js:11
+msgid "Edit article note"
+msgstr "حرّر ملاحظة للبند"
+
+#: plugins/auth_internal/init.php:67
+msgid "Please enter your one time password:"
+msgstr "فضلاً أدخل كلمة المرور ذات الاستخدام الواحد:"
+
+#: plugins/auth_internal/init.php:208
+msgid "Password has been changed."
+msgstr "تم تغيير كلمة المرور."
+
+#: plugins/auth_internal/init.php:210
+msgid "Old password is incorrect."
+msgstr "كلمة المرور القديمة غير صحيحة."
+
+#: js/FeedTree.js:76
 #, fuzzy
 msgid "(Un)collapse"
 msgstr "طيّ/بَسْط الشريط الجانبي"
 
-#: js/PrefFeedTree.js:35
+#: js/PrefFeedTree.js:36
 msgid "Edit category"
 msgstr "حرِّر التصنيف"
 
-#: js/PrefFeedTree.js:42
+#: js/PrefFeedTree.js:43
 msgid "Remove category"
 msgstr "إحذف التصنيف"
 
-#: js/PrefFilterTree.js:46
+#: js/PrefFilterTree.js:47
 msgid "Inverse"
 msgstr "العكس"
 
-#: js/feedlist.js:511
+#: js/feedlist.js:461
 #, fuzzy
 msgid "Mark %w in %s older than 1 day as read?"
 msgstr "تعليم جميع البنود في %s الأقدم من يوم واحد مقروءة؟"
 
-#: js/feedlist.js:514
+#: js/feedlist.js:464
 #, fuzzy
 msgid "Mark %w in %s older than 1 week as read?"
 msgstr "تعليم جميع البنود في %s الأقدم من أسبوع مقروءة؟"
 
-#: js/feedlist.js:517
+#: js/feedlist.js:467
 #, fuzzy
 msgid "Mark %w in %s older than 2 weeks as read?"
 msgstr "تعليم جميع البنود في %s الأقدم من أسبوعين مقروءة؟"
 
-#: js/feedlist.js:520
+#: js/feedlist.js:470
 #, fuzzy
 msgid "Mark %w in %s as read?"
 msgstr "تعليم جميع البنود في %s مقروءة؟"
 
-#: js/feedlist.js:523
+#: js/feedlist.js:473
 #, fuzzy
 msgid "search results"
 msgstr "نتائج البحث: %s"
 
-#: js/feedlist.js:523
+#: js/feedlist.js:473
 #, fuzzy
 msgid "all articles"
 msgstr "كل البنود"
 
-#: js/functions.js:74
+#: js/functions.js:100
 msgid "Close"
 msgstr ""
 
-#: js/functions.js:141
+#: js/functions.js:167
 msgid "Click to close"
 msgstr "أنقر للإغلاق"
 
-#: js/functions.js:448
+#: js/functions.js:456
 msgid "Error explained"
 msgstr "شرح الخطأ"
 
-#: js/functions.js:592
+#: js/functions.js:490
+msgid "Upload complete."
+msgstr "إكتمل التحميل."
+
+#: js/functions.js:508
+msgid "Remove stored feed icon?"
+msgstr "أحذف رمز الخلاصة المخزَّن؟"
+
+#: js/functions.js:510
+msgid "Removing feed icon..."
+msgstr "جارٍ حذف رمز الخلاصة..."
+
+#: js/functions.js:515
+msgid "Feed icon removed."
+msgstr "حذف رمز الخلاصة."
+
+#: js/functions.js:532
+msgid "Please select an image file to upload."
+msgstr "فضلاً إختر ملف صورة للتحميل."
+
+#: js/functions.js:533
+msgid "Upload new icon for this feed?"
+msgstr "تحميل رمز جديد لهذه الخلاصة؟"
+
+#: js/functions.js:534
+msgid "Uploading, please wait..."
+msgstr "التحميل جارٍ،فضلاً إنتظر..."
+
+#: js/functions.js:542
+msgid "Please enter label caption:"
+msgstr "فضلاً أدخل عنوان التسمية:"
+
+#: js/functions.js:575
 msgid "Subscribe to Feed"
 msgstr "إشترك في الخلاصة"
 
-#: js/functions.js:621
+#: js/functions.js:602
 msgid "Failed to parse output. This can indicate server timeout and/or network issues. Backend output was logged to browser console."
 msgstr "فشل تفسير الخَرج.  قد يشير هذا إلى انتهاء مهلة الخادم و/أو مشكلة في الشبكة.  تم تسجيل خرج برنامج الخلفية في وحدة تحكّم المستعرض ( التفضيلات-> النظام -> سجل الأخطاء )."
 
-#: js/functions.js:636
+#: js/functions.js:617
 #, perl-format
 msgid "Subscribed to %s"
 msgstr "تم الإشتراك في %s"
 
-#: js/functions.js:641
+#: js/functions.js:622
 msgid "Specified URL seems to be invalid."
 msgstr "يبدو أن عنوان URL المعطى غير صحيح."
 
-#: js/functions.js:644
+#: js/functions.js:625
 msgid "Specified URL doesn't seem to contain any feeds."
 msgstr "يبدو أن عنوان URL المعطى لايحوي أي خلاصة."
 
-#: js/functions.js:656
+#: js/functions.js:637
 msgid "Expand to select feed"
 msgstr "وسِّع لتختار الخلاصة"
 
-#: js/functions.js:668
+#: js/functions.js:649
 #, fuzzy, perl-format
 msgid "Couldn't download the specified URL: %s"
 msgstr "لم أتمكن من تنزيل عنوان URL المحدد: s"
 
-#: js/functions.js:672
+#: js/functions.js:653
 #, perl-format
 msgid "XML validation failed: %s"
 msgstr "فشل اختبار صحة XML: %s"
 
-#: js/functions.js:676
+#: js/functions.js:657
 msgid "You are already subscribed to this feed."
 msgstr "أنت مشترك بالفعل في هذه الخلاصة."
 
-#: js/functions.js:1136
+#: js/functions.js:1098
 msgid "Generate new syndication address for this feed?"
 msgstr "توليد عنوان "
 
-#: js/functions.js:1140
-#: js/prefs.js:1095
+#: js/functions.js:1100
+#: js/prefs.js:870
 msgid "Trying to change address..."
 msgstr "محاولة تغيير العنوان..."
 
-#: js/functions.js:1245
-#: js/tt-rss.js:446
-#: js/tt-rss.js:673
+#: js/functions.js:1199
+#: js/tt-rss.js:399
+#: js/tt-rss.js:612
 msgid "You can't edit this kind of feed."
 msgstr "لايمكنك تحرير هذا النوع من الخلاصات."
 
-#: js/functions.js:1260
+#: js/functions.js:1213
 msgid "Edit Feed"
 msgstr "حرِّر الخلاصة"
 
-#: js/functions.js:1266
-#: js/prefs.js:100
-#: js/prefs.js:209
-#: js/prefs.js:647
+#: js/functions.js:1217
+#: js/prefs.js:176
+#: js/prefs.js:523
+#: js/prefs.js:1139
+#: js/prefs.js:78
 msgid "Saving data..."
 msgstr "أحفظُ البيانات..."
 
-#: js/functions.js:1293
+#: js/functions.js:1243
 msgid "More Feeds"
 msgstr "خلاصات أكثر"
 
-#: js/functions.js:1355
-#: js/functions.js:1464
-#: js/prefs.js:398
-#: js/prefs.js:540
-#: js/prefs.js:558
-#: js/prefs.js:1077
+#: js/functions.js:1297
+#: js/functions.js:1383
+#: js/prefs.js:332
+#: js/prefs.js:455
+#: js/prefs.js:473
+#: js/prefs.js:855
 msgid "No feeds are selected."
 msgstr "لم يتم اختيار خلاصة"
 
-#: js/functions.js:1398
+#: js/functions.js:1329
 msgid "Remove selected feeds from the archive? Feeds with stored articles will not be removed."
 msgstr "هل ترغب حذف الخلاصات المختارة من المحفوظات ؟ لن تحذف الخلاصات ذات البنود المخزَّنة."
 
-#: js/functions.js:1435
+#: js/functions.js:1360
 msgid "Feeds with update errors"
 msgstr "الخلاصات التي حصلت أخطاء أثناء تحديثها"
 
-#: js/functions.js:1446
-#: js/prefs.js:1058
+#: js/functions.js:1369
+#: js/prefs.js:841
 msgid "Remove selected feeds?"
 msgstr "أحذف الخلاصات المختارة؟"
 
-#: js/functions.js:1449
-#: js/prefs.js:1061
+#: js/functions.js:1370
+#: js/prefs.js:842
 msgid "Removing selected feeds..."
 msgstr "يجري حذف الخلاصات المختارة..."
 
-#: js/prefs.js:60
-msgid "Please enter login:"
-msgstr "فضلاً أدخل اسم المستخدم:"
-
-#: js/prefs.js:67
-msgid "Can't create user: no login specified."
-msgstr "لايمكن إنشاء مستخدم:لم يتم تحديد اسم الدخول"
-
-#: js/prefs.js:71
-msgid "Adding user..."
-msgstr "تتم إضافة المستخدم..."
-
-#: js/prefs.js:96
-msgid "User Editor"
-msgstr "محرِّر المستخدم"
-
-#: js/prefs.js:131
-msgid "Edit Filter"
-msgstr "حرِّر المرشِّح"
-
-#: js/prefs.js:170
+#: js/prefs.js:143
 msgid "Remove filter?"
 msgstr "أحذف المرشِّح؟"
 
-#: js/prefs.js:175
+#: js/prefs.js:148
 msgid "Removing filter..."
 msgstr "يجري حذف المرشِّح..."
 
-#: js/prefs.js:292
+#: js/prefs.js:251
 msgid "Remove selected labels?"
 msgstr "أحذِف الأسماء المختارة؟"
 
-#: js/prefs.js:295
+#: js/prefs.js:252
 msgid "Removing selected labels..."
 msgstr "يجري حذف الأسماء المختارة..."
 
-#: js/prefs.js:308
-#: js/prefs.js:1144
+#: js/prefs.js:262
+#: js/prefs.js:909
 msgid "No labels are selected."
 msgstr "لم يتم اختيار أسماء."
 
-#: js/prefs.js:320
+#: js/prefs.js:274
 msgid "Remove selected users? Neither default admin nor your account will be removed."
 msgstr "أحذف المستخدمين المختارين؟ لن يُحذَف المسؤول الافتراضي ولا حسابك."
 
-#: js/prefs.js:323
+#: js/prefs.js:275
 msgid "Removing selected users..."
 msgstr "يجري حذف المستخدمين المختارين..."
 
-#: js/prefs.js:338
-#: js/prefs.js:408
-#: js/prefs.js:427
-#: js/prefs.js:461
+#: js/prefs.js:286
+#: js/prefs.js:342
+#: js/prefs.js:361
+#: js/prefs.js:387
 msgid "No users are selected."
 msgstr "لم يتم اختيار مستخدمين."
 
-#: js/prefs.js:350
+#: js/prefs.js:297
 msgid "Remove selected filters?"
 msgstr "أحذِف المرشِّحات المختارة؟"
 
-#: js/prefs.js:353
+#: js/prefs.js:298
 msgid "Removing selected filters..."
 msgstr "يجري حذف المرشِّحات المختارة..."
 
-#: js/prefs.js:366
-#: js/prefs.js:495
-#: js/prefs.js:514
+#: js/prefs.js:308
+#: js/prefs.js:419
+#: js/prefs.js:438
 msgid "No filters are selected."
 msgstr "لم يتم اختيار مرشِّحات."
 
-#: js/prefs.js:378
+#: js/prefs.js:319
 msgid "Unsubscribe from selected feeds?"
 msgstr "ألغي الإشتراك في الخلاصات المختارة؟"
 
-#: js/prefs.js:382
+#: js/prefs.js:321
 msgid "Unsubscribing from selected feeds..."
 msgstr "يجري إلغاء الاشتراك في الخلاصات المختارة..."
 
-#: js/prefs.js:413
-#: js/prefs.js:432
-#: js/prefs.js:466
+#: js/prefs.js:347
+#: js/prefs.js:366
+#: js/prefs.js:392
 msgid "Please select only one user."
 msgstr "فضلاً إختر مستخدماً واحداً فقط."
 
-#: js/prefs.js:436
+#: js/prefs.js:370
 msgid "Reset password of selected user?"
 msgstr "أعيد ضبط كلمة مرور المستخدم الذي اخترت؟"
 
-#: js/prefs.js:439
+#: js/prefs.js:371
 msgid "Resetting password for selected user..."
 msgstr "تجري إعادة ضبط كلمة مرور المستخدم الذي اخترت..."
 
-#: js/prefs.js:500
+#: js/prefs.js:424
 msgid "Please select only one filter."
 msgstr "فضلاً إختر مرشِّحاً واحداً فقط."
 
-#: js/prefs.js:518
+#: js/prefs.js:442
 msgid "Combine selected filters?"
 msgstr "أجمع المرشِّحات المختارة؟"
 
-#: js/prefs.js:521
+#: js/prefs.js:443
 msgid "Joining filters..."
 msgstr "يجري دمج المرشِّحات..."
 
-#: js/prefs.js:580
+#: js/prefs.js:487
 msgid "Edit Multiple Feeds"
 msgstr "تحرير عدة خلاصات"
 
-#: js/prefs.js:604
+#: js/prefs.js:511
 msgid "Save changes to selected feeds?"
 msgstr "أحفظ التغييرات في الخلاصات المختارة؟"
 
-#: js/prefs.js:681
+#: js/prefs.js:552
 msgid "OPML Import"
 msgstr "إستيراد OPML"
 
-#: js/prefs.js:700
+#: js/prefs.js:571
 msgid "Please choose an OPML file first."
 msgstr "فضلاً إختر ملف OPML أولاً."
 
-#: js/prefs.js:703
+#: js/prefs.js:574
 #: plugins/import_export/import_export.js:115
 msgid "Importing, please wait..."
 msgstr "الإستيراد جارٍ ، يرجى الإنتظار..."
 
-#: js/prefs.js:869
+#: js/prefs.js:737
 msgid "Reset to defaults?"
 msgstr "إعادة التعيين إلى الإعدادات الافتراضية؟"
 
-#: js/prefs.js:1468
-msgid "Subscribing to feeds..."
-msgstr "يجري الاشتراك في الخلاصات..."
+#: js/prefs.js:777
+#, perl-format
+msgid "Remove category %s? Any nested feeds would be placed into Uncategorized."
+msgstr "أحذف التصنيف %s ؟ ستوضع أي خلاصة ضمن هذا التصنيف في \"غير مصنَّف\""
 
-#: js/prefs.js:1487
-msgid "Clear stored data for this plugin?"
-msgstr "أمسح البيانات المخزنة لهذه الإضافة؟"
+#: js/prefs.js:778
+msgid "Removing category..."
+msgstr "يجري حذف التصنيف..."
 
-#: js/prefs.js:1501
-msgid "Clear all messages in the error log?"
-msgstr "أمسح كل الرسائل في سجل الأخطاء؟"
+#: js/prefs.js:794
+msgid "Remove selected categories?"
+msgstr "أحذف التصنيفات المختارة؟"
 
-#: js/tt-rss.js:118
+#: js/prefs.js:795
+msgid "Removing selected categories..."
+msgstr "يجري حذف التصنيفات المختارة..."
+
+#: js/prefs.js:805
+msgid "No categories are selected."
+msgstr "لم يتم اختيار أي تصنيف."
+
+#: js/prefs.js:812
+msgid "Category title:"
+msgstr "عنوان التصنيف:"
+
+#: js/prefs.js:815
+msgid "Creating category..."
+msgstr "إنشاء التصنيف..."
+
+#: js/prefs.js:832
+msgid "Feeds without recent updates"
+msgstr "الخلاصات بلا تحديثات مؤخراً"
+
+#: js/prefs.js:869
+msgid "Replace current OPML publishing address with a new one?"
+msgstr "أستبدل عنوان النشر الحالي للـ OPML بعنوان جديد؟"
+
+#: js/prefs.js:898
+msgid "Reset selected labels to default colors?"
+msgstr "أعيد تعيين الألوان الافتراضية للأسماء المختارة ؟"
+
+#: js/prefs.js:926
+msgid "Settings Profiles"
+msgstr "ملفات شخصية للضبط"
+
+#: js/prefs.js:935
+msgid "Remove selected profiles? Active and default profiles will not be removed."
+msgstr "هل ترغب حذف الملفات الشخصية المختارة ؟ الملفات الفعالة والافتراضية لن تحذف."
+
+#: js/prefs.js:936
+msgid "Removing selected profiles..."
+msgstr "حذف الملفات الشخصية المختارة..."
+
+#: js/prefs.js:948
+msgid "No profiles are selected."
+msgstr "لم تخترملفاً شخصياً."
+
+#: js/prefs.js:955
+#: js/prefs.js:997
+msgid "Activate selected profile?"
+msgstr "تفعيل الملف الشخصي المختار ؟"
+
+#: js/prefs.js:964
+#: js/prefs.js:1008
+msgid "Please choose a profile to activate."
+msgstr "فضلاً إختر الملف الشخصي للتفعيل."
+
+#: js/prefs.js:969
+msgid "Creating profile..."
+msgstr "إنشاء الملف الشخصي..."
+
+#: js/prefs.js:1016
+msgid "This will invalidate all previously generated feed URLs. Continue?"
+msgstr "هذا سيُبطل كل عناوين URL للخلاصات المشارَكة سابقاً.  إستمرار ؟"
+
+#: js/prefs.js:1017
+#: plugins/share/share_prefs.js:3
+msgid "Clearing URLs..."
+msgstr "يجري مسح عناوين URL..."
+
+#: js/prefs.js:1020
+msgid "Generated URLs cleared."
+msgstr "تم مسح عناوين الـ URL المولَّدة."
+
+#: js/prefs.js:1053
+#, fuzzy
+msgid "Rename category to:"
+msgstr "إحذف التصنيف"
+
+#: js/prefs.js:1074
+msgid "Label Editor"
+msgstr "محرر التسميات"
+
+#: js/tt-rss.js:111
 msgid "Mark all articles as read?"
 msgstr "أعلّم جميع البنود بـ مقروءة؟"
 
-#: js/tt-rss.js:124
+#: js/tt-rss.js:115
 msgid "Marking all feeds as read..."
 msgstr "يجري تعليم جميع البنود مقروءة..."
 
-#: js/tt-rss.js:398
+#: js/tt-rss.js:351
 msgid "Please enable mail plugin first."
 msgstr "فضلاً فعِّل إضافة البريد قبل البدء."
 
-#: js/tt-rss.js:527
+#: js/tt-rss.js:477
 msgid "Please enable embed_original plugin first."
 msgstr "فضلاً فعِّل إضافة تضمين الأصل قبل البدء."
 
-#: js/tt-rss.js:540
-#: js/tt-rss.js:723
+#: js/tt-rss.js:490
+#: js/tt-rss.js:653
 msgid "Widescreen is not available in combined mode."
 msgstr ""
 
-#: js/tt-rss.js:821
-msgid "You can't rescore this kind of feed."
-msgstr "لا يمكنك إعادة حساب نقاط هذا النوع من الخلاصات."
-
-#: js/tt-rss.js:826
-#: js/tt-rss.js:686
-msgid "Please select some feed first."
-msgstr "فضلاً إختر أي خلاصة في البداية."
-
-#: js/tt-rss.js:831
-#, perl-format
-msgid "Rescore articles in %s?"
-msgstr "إعادة حساب نقاط البنود في %s؟"
-
-#: js/tt-rss.js:834
-msgid "Rescoring articles..."
-msgstr "إعادة حساب نقاط البنود..."
-
-#: js/viewfeed.js:917
-#: js/viewfeed.js:955
-#: js/viewfeed.js:1003
-#: js/viewfeed.js:1924
-#: plugins/mail/mail.js:7
+#: js/viewfeed.js:444
+#: js/viewfeed.js:461
+#: js/viewfeed.js:484
+#: js/viewfeed.js:521
+#: js/viewfeed.js:542
+#: js/viewfeed.js:651
+#: js/viewfeed.js:685
+#: js/viewfeed.js:727
+#: js/viewfeed.js:1564
 #: plugins/mailto/init.js:7
-#: js/viewfeed.js:675
-#: js/viewfeed.js:697
-#: js/viewfeed.js:718
-#: js/viewfeed.js:777
-#: js/viewfeed.js:805
+#: plugins/mail/mail.js:7
 msgid "No articles are selected."
 msgstr "لم يتم اختيار أي بند."
 
-#: js/viewfeed.js:925
+#: js/viewfeed.js:659
 #, 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:927
+#: js/viewfeed.js:661
 #, perl-format
 msgid "Delete %d selected article?"
 msgid_plural "Delete %d selected articles?"
 msgstr[0] "حذف البند %d المختار ؟"
 msgstr[1] "حذف البنود %d المختارة ؟"
 
-#: js/viewfeed.js:964
+#: js/viewfeed.js:694
 #, 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:967
+#: js/viewfeed.js:697
 #, perl-format
 msgid "Move %d archived article back?"
 msgid_plural "Move %d archived articles back?"
 msgstr[0] "استعادة البند المحفوظ  %d ؟"
 msgstr[1] "استعادة البنود المحفوظة  %d ؟"
 
-#: js/viewfeed.js:969
+#: js/viewfeed.js:698
 msgid "Please note that unstarred articles might get purged on next feed update."
 msgstr "يرجى ملاحظة أن البنود غير المعلّمة بنجمة قد يتم تنظيفها في تحديث الخلاصات القادم."
 
-#: js/viewfeed.js:1009
+#: js/viewfeed.js:733
 #, 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:1029
+#: js/viewfeed.js:753
 msgid "Edit article Tags"
 msgstr "حرِّر علامات البند"
 
-#: js/viewfeed.js:1035
+#: js/viewfeed.js:757
 msgid "Saving article tags..."
 msgstr "يجري حفظ علامات البند..."
 
-#: js/viewfeed.js:1666
+#: js/viewfeed.js:1015
+msgid "No article is selected."
+msgstr "لم يتم اختيار بند."
+
+#: js/viewfeed.js:1050
+msgid "No articles found to mark"
+msgstr "لاتوجد بنود لأعلمها"
+
+#: js/viewfeed.js:1052
+#, perl-format
+msgid "Mark %d article as read?"
+msgid_plural "Mark %d articles as read?"
+msgstr[0] "تعليم البند %d مقروءاً ؟"
+msgstr[1] "تعليم البنود %d مقروءة ؟"
+
+#: js/viewfeed.js:1312
 msgid "Open original article"
 msgstr "فتح البند الأصلي"
 
-#: js/viewfeed.js:1673
+#: js/viewfeed.js:1319
 msgid "Display article URL"
 msgstr "إعرض عنوان URL للبند"
 
-#: js/viewfeed.js:1780
+#: js/viewfeed.js:1426
 msgid "Assign label"
 msgstr "أسند تسمية"
 
-#: js/viewfeed.js:1785
+#: js/viewfeed.js:1431
 msgid "Remove label"
 msgstr "إحذف التسمية"
 
-#: js/viewfeed.js:1817
+#: js/viewfeed.js:1463
 msgid "Select articles in group"
 msgstr "إختر البنود في مجموعة"
 
-#: js/viewfeed.js:1827
+#: js/viewfeed.js:1473
 msgid "Mark group as read"
 msgstr "تعليم المجموعة مقروءة"
 
-#: js/viewfeed.js:1839
+#: js/viewfeed.js:1485
 msgid "Mark feed as read"
 msgstr "علِّم الخلاصة مقروءة"
 
-#: js/viewfeed.js:1892
+#: js/viewfeed.js:1538
 msgid "Please enter new score for selected articles:"
 msgstr "فضلاً أدخل نقطة جديدة للبنود المختارة:"
 
-#: js/viewfeed.js:1955
+#: js/viewfeed.js:1571
 msgid "Please enter new score for this article:"
 msgstr "فضلاً أدخل نقطة جديدة لهذا البند:"
 
-#: js/viewfeed.js:1986
+#: js/viewfeed.js:1591
 msgid "Article URL:"
 msgstr "عنوان URL للبند:"
 
-#: plugins/note/note.js:17
-msgid "Saving article note..."
-msgstr "جارٍ حفظ البند..."
+#: plugins/embed_original/init.js:6
+msgid "Sorry, your browser does not support sandboxed iframes."
+msgstr "آسف، مستعرضك لايدعم إطارات iframe في صندوق الرمل."
 
 #: plugins/af_psql_trgm/init.js:11
 #, fuzzy
 msgid "Related articles"
 msgstr "البنود المشارَكة"
 
+#: plugins/mailto/init.js:21
+#: plugins/mail/mail.js:21
+msgid "Forward article by email"
+msgstr "أعد توجيه البند بالبريد"
+
+#: plugins/shorten_expanded/init.js:43
+msgid "Click to expand article"
+msgstr "أنقر لتوسيع البند"
+
 #: plugins/import_export/import_export.js:13
 msgid "Export Data"
 msgstr "صدِّر البيانات"
@@ -3214,261 +3307,172 @@ msgstr "إستيراد البيانات"
 msgid "Please choose the file first."
 msgstr "فضلاً إختر الملف أولاً."
 
-#: plugins/mail/mail.js:21
-#: plugins/mailto/init.js:21
-msgid "Forward article by email"
-msgstr "أعد توجيه البند بالبريد"
+#: plugins/share/share_prefs.js:2
+msgid "This will invalidate all previously shared article URLs. Continue?"
+msgstr "هذا سيُبطل كل عناوين URL للبنود المشارَكة سابقاً.  إستمرار ؟"
 
-#: plugins/mail/mail.js:36
-msgid "Error sending email:"
-msgstr ""
-
-#: plugins/mail/mail.js:38
-#, fuzzy
-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:45
-msgid "Click to expand article"
-msgstr "أنقر لتوسيع البند"
+#: plugins/share/share_prefs.js:8
+msgid "Shared URLs cleared."
+msgstr "تم مسح عناوين URL المشارَكة."
 
 #: plugins/share/share.js:10
 msgid "Share article by URL"
 msgstr "شارك البند عبر عنوان URL"
 
-#: plugins/share/share.js:14
+#: plugins/share/share.js:13
 msgid "Generate new share URL for this article?"
 msgstr "إنشاء عنوان URL مشاركة جديد لهذا البند؟"
 
-#: plugins/share/share.js:18
+#: plugins/share/share.js:15
 msgid "Trying to change URL..."
 msgstr "المحاولة جارية لتغيير العنوان..."
 
-#: plugins/share/share.js:55
+#: plugins/share/share.js:48
 msgid "Remove sharing for this article?"
 msgstr "حذف مشاركة هذا البند؟"
 
-#: plugins/share/share.js:59
+#: plugins/share/share.js:50
 msgid "Trying to unshare..."
 msgstr "أحاول إلغاء المشاركة..."
 
-#: plugins/share/share_prefs.js:3
-msgid "This will invalidate all previously shared article URLs. Continue?"
-msgstr "هذا سيُبطل كل عناوين URL للبنود المشارَكة سابقاً.  إستمرار ؟"
+#: plugins/mail/mail.js:30
+msgid "Error sending email:"
+msgstr ""
 
-#: plugins/share/share_prefs.js:6
-#: js/prefs.js:1277
-msgid "Clearing URLs..."
-msgstr "يجري مسح عناوين URL..."
+#: plugins/mail/mail.js:32
+#, fuzzy
+msgid "Your message has been sent."
+msgstr "تم حفظ بياناتك الشخصية."
 
-#: plugins/share/share_prefs.js:13
-msgid "Shared URLs cleared."
-msgstr "تم مسح عناوين URL المشارَكة."
+#: plugins/note/note.js:15
+msgid "Saving article note..."
+msgstr "جارٍ حفظ البند..."
 
-#: js/feedlist.js:204
+#: js/feedlist.js:168
 #, fuzzy
 msgid "Your password is at default value"
 msgstr "كلمة المرور لديك على قيمتها الإفتراضية ، فضلاً غيّرها."
 
-#: js/feedlist.js:453
+#: js/feedlist.js:413
 msgid "Mark all articles in %s as read?"
 msgstr "تعليم جميع البنود في %s مقروءة؟"
 
-#: js/functions.js:494
-msgid "Upload complete."
-msgstr "إكتمل التحميل."
-
-#: js/functions.js:511
-msgid "Remove stored feed icon?"
-msgstr "أحذف رمز الخلاصة المخزَّن؟"
-
-#: js/functions.js:516
-msgid "Removing feed icon..."
-msgstr "جارٍ حذف رمز الخلاصة..."
-
-#: js/functions.js:521
-msgid "Feed icon removed."
-msgstr "حذف رمز الخلاصة."
-
-#: js/functions.js:537
-msgid "Please select an image file to upload."
-msgstr "فضلاً إختر ملف صورة للتحميل."
-
-#: js/functions.js:539
-msgid "Upload new icon for this feed?"
-msgstr "تحميل رمز جديد لهذه الخلاصة؟"
-
-#: js/functions.js:540
-msgid "Uploading, please wait..."
-msgstr "التحميل جارٍ،فضلاً إنتظر..."
-
-#: js/functions.js:550
-msgid "Please enter label caption:"
-msgstr "فضلاً أدخل عنوان التسمية:"
-
-#: js/functions.js:555
-msgid "Can't create label: missing caption."
-msgstr "لم أتمكن من إنشاء التسمية: التسمية التوضيحية مفقودة."
-
-#: js/functions.js:797
+#: js/functions.js:764
 msgid "Edit rule"
 msgstr "تحرير القاعدة"
 
-#: js/functions.js:819
+#: js/functions.js:786
 msgid "Edit action"
 msgstr "تحرير الإجراء"
 
-#: js/functions.js:860
+#: js/functions.js:825
 msgid "Looking for articles (%d processed, %f found)..."
 msgstr ""
 
-#: js/functions.js:890
+#: js/functions.js:855
 #, fuzzy
 msgid "Found %d articles matching this filter:"
 msgstr "البنود المطابقة لهذا المرشِّح:"
 
-#: js/functions.js:942
+#: js/functions.js:907
 msgid "Create Filter"
 msgstr "إنشاء مرشِّح"
 
-#: js/functions.js:1060
-#: js/tt-rss.js:692
+#: js/functions.js:1016
+#: js/tt-rss.js:631
 msgid "Unsubscribe from %s?"
 msgstr "إلغاء الإشتراك في %s ؟"
 
-#: js/functions.js:1063
+#: js/functions.js:1019
 msgid "Removing feed..."
 msgstr "جارٍ حذف الخلاصة..."
 
-#: js/functions.js:1489
+#: js/functions.js:1410
 msgid "Help"
 msgstr "مساعدة"
 
-#: js/prefs.js:973
-msgid "Remove category %s? Any nested feeds would be placed into Uncategorized."
-msgstr "أحذف التصنيف %s ؟ ستوضع أي خلاصة ضمن هذا التصنيف في \"غير مصنَّف\""
+#: js/prefs.js:44
+msgid "Please enter login:"
+msgstr "فضلاً أدخل اسم المستخدم:"
 
-#: js/prefs.js:979
-msgid "Removing category..."
-msgstr "يجري حذف التصنيف..."
+#: js/prefs.js:51
+msgid "Can't create user: no login specified."
+msgstr "لايمكن إنشاء مستخدم:لم يتم تحديد اسم الدخول"
 
-#: js/prefs.js:997
-msgid "Remove selected categories?"
-msgstr "أحذف التصنيفات المختارة؟"
+#: js/prefs.js:55
+msgid "Adding user..."
+msgstr "تتم إضافة المستخدم..."
 
-#: js/prefs.js:1000
-msgid "Removing selected categories..."
-msgstr "يجري حذف التصنيفات المختارة..."
+#: js/prefs.js:74
+msgid "User Editor"
+msgstr "محرِّر المستخدم"
 
-#: js/prefs.js:1013
-msgid "No categories are selected."
-msgstr "لم يتم اختيار أي تصنيف."
+#: js/prefs.js:104
+msgid "Edit Filter"
+msgstr "حرِّر المرشِّح"
 
-#: js/prefs.js:1020
-msgid "Category title:"
-msgstr "عنوان التصنيف:"
+#: js/prefs.js:1175
+msgid "Subscribing to feeds..."
+msgstr "يجري الاشتراك في الخلاصات..."
 
-#: js/prefs.js:1024
-msgid "Creating category..."
-msgstr "إنشاء التصنيف..."
+#: js/prefs.js:1191
+msgid "Clear stored data for this plugin?"
+msgstr "أمسح البيانات المخزنة لهذه الإضافة؟"
 
-#: js/prefs.js:1047
-msgid "Feeds without recent updates"
-msgstr "الخلاصات بلا تحديثات مؤخراً"
+#: js/prefs.js:1203
+msgid "Clear all messages in the error log?"
+msgstr "أمسح كل الرسائل في سجل الأخطاء؟"
 
-#: js/prefs.js:1091
-msgid "Replace current OPML publishing address with a new one?"
-msgstr "أستبدل عنوان النشر الحالي للـ OPML بعنوان جديد؟"
-
-#: js/prefs.js:1129
-msgid "Reset selected labels to default colors?"
-msgstr "أعيد تعيين الألوان الافتراضية للأسماء المختارة ؟"
-
-#: js/prefs.js:1161
-msgid "Settings Profiles"
-msgstr "ملفات شخصية للضبط"
-
-#: js/prefs.js:1170
-msgid "Remove selected profiles? Active and default profiles will not be removed."
-msgstr "هل ترغب حذف الملفات الشخصية المختارة ؟ الملفات الفعالة والافتراضية لن تحذف."
-
-#: js/prefs.js:1173
-msgid "Removing selected profiles..."
-msgstr "حذف الملفات الشخصية المختارة..."
-
-#: js/prefs.js:1189
-msgid "No profiles are selected."
-msgstr "لم تخترملفاً شخصياً."
-
-#: js/prefs.js:1197
-#: js/prefs.js:1250
-msgid "Activate selected profile?"
-msgstr "تفعيل الملف الشخصي المختار ؟"
-
-#: js/prefs.js:1214
-#: js/prefs.js:1266
-msgid "Please choose a profile to activate."
-msgstr "فضلاً إختر الملف الشخصي للتفعيل."
-
-#: js/prefs.js:1219
-msgid "Creating profile..."
-msgstr "إنشاء الملف الشخصي..."
-
-#: js/prefs.js:1274
-msgid "This will invalidate all previously generated feed URLs. Continue?"
-msgstr "هذا سيُبطل كل عناوين URL للخلاصات المشارَكة سابقاً.  إستمرار ؟"
-
-#: js/prefs.js:1284
-msgid "Generated URLs cleared."
-msgstr "تم مسح عناوين الـ URL المولَّدة."
-
-#: js/prefs.js:1356
-msgid "Label Editor"
-msgstr "محرر التسميات"
-
-#: js/tt-rss.js:681
+#: js/tt-rss.js:620
 msgid "You can't unsubscribe from the category."
 msgstr "لايمكنك إلغاء الإشتراك من التصنيف."
 
-#: js/viewfeed.js:127
-#: js/viewfeed.js:177
-#: js/viewfeed.js:194
+#: js/tt-rss.js:625
+msgid "Please select some feed first."
+msgstr "فضلاً إختر أي خلاصة في البداية."
+
+#: js/viewfeed.js:89
+#: js/viewfeed.js:135
+#: js/viewfeed.js:152
 #, fuzzy
 msgid "Click to open next unread feed."
 msgstr "أنقر لتحرير الخلاصة"
 
-#: js/viewfeed.js:131
+#: js/viewfeed.js:93
 msgid "Cancel search"
 msgstr "ألغ البحث"
 
-#: js/viewfeed.js:191
+#: js/viewfeed.js:149
 #, fuzzy
 msgid "New articles found, reload feed to continue."
 msgstr "لم أجد بنوداًلأعرضها."
 
-#: js/viewfeed.js:620
+#: js/viewfeed.js:405
 msgid "%d article selected"
 msgid_plural "%d articles selected"
 msgstr[0] "%d بند مختار"
 msgstr[1] "%d بنود مختارة"
 
-#: js/viewfeed.js:1284
-msgid "No article is selected."
-msgstr "لم يتم اختيار بند."
+#~ msgid "Rescore feed"
+#~ msgstr "إعادة حساب نقاط الخلاصة"
 
-#: js/viewfeed.js:1319
-msgid "No articles found to mark"
-msgstr "لاتوجد بنود لأعلمها"
+#~ msgid "Create label..."
+#~ msgstr "أنشئ تسميةً..."
 
-#: js/viewfeed.js:1321
-msgid "Mark %d article as read?"
-msgid_plural "Mark %d articles as read?"
-msgstr[0] "تعليم البند %d مقروءاً ؟"
-msgstr[1] "تعليم البنود %d مقروءة ؟"
+#~ msgid "Create filter..."
+#~ msgstr "أنشئ مرشحاً..."
+
+#~ msgid "You can't rescore this kind of feed."
+#~ msgstr "لا يمكنك إعادة حساب نقاط هذا النوع من الخلاصات."
+
+#~ msgid "Rescore articles in %s?"
+#~ msgstr "إعادة حساب نقاط البنود في %s؟"
+
+#~ msgid "Rescoring articles..."
+#~ msgstr "إعادة حساب نقاط البنود..."
+
+#~ msgid "Can't create label: missing caption."
+#~ msgstr "لم أتمكن من إنشاء التسمية: التسمية التوضيحية مفقودة."
 
 #~ msgid "Firefox integration"
 #~ msgstr "التكامل مع فيرفوكس"
diff --git a/locale/bg_BG/LC_MESSAGES/messages.mo b/locale/bg_BG/LC_MESSAGES/messages.mo
index 12dc6f7af..2d2412183 100644
Binary files a/locale/bg_BG/LC_MESSAGES/messages.mo and b/locale/bg_BG/LC_MESSAGES/messages.mo differ
diff --git a/locale/bg_BG/LC_MESSAGES/messages.po b/locale/bg_BG/LC_MESSAGES/messages.po
index 6385aa753..6a006878b 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: 2018-10-10 08:24+0300\n"
+"POT-Creation-Date: 2018-12-01 12:59+0300\n"
 "PO-Revision-Date: 2015-03-09 17:43+0200\n"
 "Last-Translator: Neter <neter@moyat.net>\n"
 "Language-Team: Bulgarian <>\n"
@@ -94,8 +94,8 @@ msgid "Weekly"
 msgstr "Ежеседмично"
 
 #: backend.php:103
-#: classes/pref/users.php:47
 #: classes/pref/system.php:51
+#: classes/pref/users.php:47
 msgid "User"
 msgstr "Потребител"
 
@@ -167,33 +167,33 @@ msgstr "Потребителят не е намерен"
 
 #: index.php:151
 #: index.php:167
-#: index.php:285
+#: index.php:282
 #: prefs.php:120
 #: classes/backend.php:5
 #: classes/pref/labels.php:294
-#: classes/pref/feeds.php:1230
 #: classes/pref/filters.php:822
-#: js/feedlist.js:148
-#: js/feedlist.js:491
-#: js/feedlist.js:539
-#: js/functions.js:314
-#: js/functions.js:1336
-#: js/prefs.js:562
-#: js/prefs.js:754
-#: js/prefs.js:1488
-#: js/prefs.js:1503
-#: js/tt-rss.js:547
-#: js/viewfeed.js:1180
+#: classes/pref/feeds.php:1229
+#: js/feedlist.js:118
+#: js/feedlist.js:446
+#: js/feedlist.js:487
+#: js/functions.js:328
+#: js/functions.js:551
+#: js/functions.js:1286
+#: js/prefs.js:477
+#: js/prefs.js:617
+#: js/prefs.js:956
+#: js/prefs.js:1000
+#: js/prefs.js:1028
+#: js/prefs.js:1037
+#: js/prefs.js:1045
+#: js/prefs.js:1057
+#: js/tt-rss.js:497
+#: js/viewfeed.js:509
+#: js/viewfeed.js:928
 #: plugins/import_export/import_export.js:17
-#: js/functions.js:565
-#: js/prefs.js:1200
-#: js/prefs.js:1253
-#: js/prefs.js:1292
-#: js/prefs.js:1305
-#: js/prefs.js:1316
-#: js/prefs.js:1331
-#: js/tt-rss.js:564
-#: js/viewfeed.js:760
+#: js/prefs.js:1192
+#: js/prefs.js:1205
+#: js/tt-rss.js:510
 msgid "Loading, please wait..."
 msgstr "Зареждане. Моля, изчакайте..."
 
@@ -210,13 +210,13 @@ msgid "All Articles"
 msgstr "Всички статии"
 
 #: index.php:194
-#: include/functions.php:1227
+#: include/functions.php:1172
 #: classes/feeds.php:110
 msgid "Starred"
 msgstr "Със звезда"
 
 #: index.php:195
-#: include/functions.php:1228
+#: include/functions.php:1173
 #: classes/feeds.php:111
 msgid "Published"
 msgstr "Публикувани"
@@ -256,11 +256,11 @@ msgid "Title"
 msgstr "По заглавие"
 
 #: index.php:211
-#: index.php:251
-#: include/functions.php:1215
+#: index.php:250
+#: include/functions.php:1160
 #: classes/feeds.php:115
-#: js/FeedTree.js:41
-#: js/FeedTree.js:69
+#: js/FeedTree.js:42
+#: js/FeedTree.js:70
 msgid "Mark as read"
 msgstr "Прочетени"
 
@@ -297,7 +297,7 @@ msgid "Feed actions:"
 msgstr "Действия с хранилки:"
 
 #: index.php:246
-#: classes/handler/public.php:551
+#: classes/handler/public.php:575
 msgid "Subscribe to feed..."
 msgstr "Абониране за хранилка..."
 
@@ -306,56 +306,44 @@ msgid "Edit this feed..."
 msgstr "Редактиране на тази хранилка..."
 
 #: index.php:248
-msgid "Rescore feed"
-msgstr "Преточкуване на хранилка"
-
-#: index.php:249
-#: classes/pref/feeds.php:770
-#: classes/pref/feeds.php:1203
-#: js/PrefFeedTree.js:61
+#: classes/pref/feeds.php:769
+#: classes/pref/feeds.php:1202
+#: js/PrefFeedTree.js:62
 msgid "Unsubscribe"
 msgstr "Отписване"
 
-#: index.php:250
+#: index.php:249
 msgid "All feeds:"
 msgstr "Всички хранилки:"
 
-#: index.php:252
+#: index.php:251
 msgid "(Un)hide read feeds"
 msgstr "Показване/скриване на прочетените хранилки"
 
-#: index.php:253
+#: index.php:252
 msgid "Other actions:"
 msgstr "Други действия:"
 
-#: index.php:254
-#: include/functions.php:1201
+#: index.php:253
+#: include/functions.php:1146
 msgid "Toggle widescreen mode"
 msgstr "Превключване на широкоекранен режим"
 
-#: index.php:255
-msgid "Create label..."
-msgstr "Създаване на етикет..."
-
-#: index.php:256
-msgid "Create filter..."
-msgstr "Създаване на филтър..."
-
-#: index.php:257
+#: index.php:254
 msgid "Keyboard shortcuts help"
 msgstr "Помощ за клавишни препратки"
 
-#: index.php:266
+#: index.php:263
 msgid "Logout"
 msgstr "Изход"
 
-#: index.php:272
+#: index.php:269
 msgid "Updates are available from Git."
 msgstr "Налични са обновления от Git."
 
 #: prefs.php:33
 #: prefs.php:138
-#: include/functions.php:1230
+#: include/functions.php:1175
 #: classes/pref/prefs.php:425
 msgid "Preferences"
 msgstr "Предпочитания"
@@ -370,8 +358,8 @@ msgstr "Изход от предпочитания"
 
 #: prefs.php:141
 #: classes/pref/feeds.php:114
-#: classes/pref/feeds.php:1138
-#: classes/pref/feeds.php:1192
+#: classes/pref/feeds.php:1137
+#: classes/pref/feeds.php:1191
 msgid "Feeds"
 msgstr "Хранилки"
 
@@ -381,8 +369,8 @@ msgid "Filters"
 msgstr "Филтри"
 
 #: prefs.php:147
+#: classes/feeds.php:1696
 #: classes/pref/labels.php:94
-#: classes/feeds.php:1710
 msgid "Labels"
 msgstr "Етикети"
 
@@ -394,80 +382,80 @@ msgstr "Потребители"
 msgid "System"
 msgstr "Система"
 
-#: register.php:186
+#: register.php:185
 #: include/login_form.php:162
 msgid "Create new account"
 msgstr "Създаване на нов акаунт"
 
-#: register.php:192
+#: register.php:191
 msgid "New user registrations are administratively disabled."
 msgstr "Новите потребителски регистрации са забранени административно."
 
-#: register.php:196
-#: register.php:241
-#: register.php:254
-#: register.php:269
-#: register.php:288
-#: register.php:336
-#: register.php:346
-#: register.php:358
-#: classes/handler/public.php:623
-#: classes/handler/public.php:697
-#: classes/handler/public.php:798
-#: classes/handler/public.php:877
-#: classes/handler/public.php:891
-#: classes/handler/public.php:898
-#: classes/handler/public.php:923
+#: register.php:195
+#: register.php:240
+#: register.php:253
+#: register.php:268
+#: register.php:287
+#: register.php:334
+#: register.php:344
+#: register.php:356
+#: classes/handler/public.php:647
+#: classes/handler/public.php:721
+#: 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"
 
-#: register.php:217
+#: register.php:216
 msgid "Your temporary password will be sent to the specified email. Accounts, which were not logged in once, are erased automatically 24 hours after temporary password is sent."
 msgstr "Временната ви парола ще бъде изпратена на указания e-mail. Акаунти, в които не е влизано нито веднъж, се изтриват автоматично 24 часа след изпращане на временната парола."
 
-#: register.php:223
+#: register.php:222
 msgid "Desired login:"
 msgstr "Потребител:"
 
-#: register.php:226
+#: register.php:225
 msgid "Check availability"
 msgstr "Проверка за наличност"
 
-#: register.php:228
-#: classes/handler/public.php:713
+#: register.php:227
+#: classes/handler/public.php:737
 msgid "Email:"
 msgstr "E-mail:"
 
-#: register.php:231
-#: classes/handler/public.php:718
+#: register.php:230
+#: classes/handler/public.php:742
 msgid "How much is two plus two:"
 msgstr "Колко е две плюс две:"
 
-#: register.php:234
+#: register.php:233
 msgid "Submit registration"
 msgstr "Изпращане на регистрацията"
 
-#: register.php:252
+#: register.php:251
 msgid "Your registration information is incomplete."
 msgstr "Регистрационната Ви информация е непълна."
 
-#: register.php:267
+#: register.php:266
 msgid "Sorry, this username is already taken."
 msgstr "Съжалявам, това потребителско име е заето."
 
-#: register.php:286
+#: register.php:285
 msgid "Registration failed."
 msgstr "Регистрацията се провали."
 
-#: register.php:333
+#: register.php:331
 msgid "Account created successfully."
 msgstr "Акаунтът е създаден успешно."
 
-#: register.php:355
+#: register.php:353
 msgid "New user registrations are currently closed."
 msgstr "Текущо новите потребителски регистрации са затворени."
 
-#: update.php:66
+#: update.php:67
 msgid "Tiny Tiny RSS data update script."
 msgstr "Tiny Tiny RSS скрипт за обновяване на данните."
 
@@ -480,10 +468,10 @@ msgstr "Всички хранилки"
 
 #: include/controls.php:138
 #: include/controls.php:230
-#: classes/opml.php:512
-#: classes/digest.php:120
+#: classes/digest.php:124
+#: classes/feeds.php:1708
 #: classes/pref/feeds.php:233
-#: classes/feeds.php:1722
+#: classes/opml.php:512
 msgid "Uncategorized"
 msgstr "Без категория"
 
@@ -498,287 +486,287 @@ msgstr[1] "%d архивирани статии"
 msgid "No feeds found."
 msgstr "Няма намерени хранилки."
 
-#: include/functions.php:983
+#: include/functions.php:928
 #, php-format
 msgid "%d min"
 msgstr ""
 
-#: include/functions.php:1177
+#: include/functions.php:1122
 msgid "Navigation"
 msgstr "Навигация"
 
-#: include/functions.php:1178
+#: include/functions.php:1123
 msgid "Open next feed"
 msgstr "Отваряне на следваща хранилка"
 
-#: include/functions.php:1179
+#: include/functions.php:1124
 msgid "Open previous feed"
 msgstr "Отваряне на предходна хранилка"
 
-#: include/functions.php:1180
+#: include/functions.php:1125
 msgid "Open next article"
 msgstr "Отваряне на следваща статия"
 
-#: include/functions.php:1181
+#: include/functions.php:1126
 msgid "Open previous article"
 msgstr "Отваряне на предходна статия"
 
-#: include/functions.php:1182
+#: include/functions.php:1127
 msgid "Open next article (don't scroll long articles)"
 msgstr "Отваряне на следваща статия (без скролиране на дълги статии)"
 
-#: include/functions.php:1183
+#: include/functions.php:1128
 msgid "Open previous article (don't scroll long articles)"
 msgstr "Отваряне на предходна статия (без скролиране на дълги статии)"
 
-#: include/functions.php:1184
+#: include/functions.php:1129
 msgid "Move to next article (don't expand or mark read)"
 msgstr "Преместване към следваща статия (без разгръщане или отбелязване като прочетено)"
 
-#: include/functions.php:1185
+#: include/functions.php:1130
 msgid "Move to previous article (don't expand or mark read)"
 msgstr "Преместване към предходна статия (без разгръщане или отбелязване като прочетено)"
 
-#: include/functions.php:1186
+#: include/functions.php:1131
 msgid "Show search dialog"
 msgstr "Показване на диалога за търсене"
 
-#: include/functions.php:1187
+#: include/functions.php:1132
 msgid "Article"
 msgstr "Статия"
 
-#: include/functions.php:1188
-#: js/viewfeed.js:1695
+#: include/functions.php:1133
+#: js/viewfeed.js:1341
 msgid "Toggle starred"
 msgstr "Превключване със/без звезда"
 
-#: include/functions.php:1189
-#: js/viewfeed.js:1707
+#: include/functions.php:1134
+#: js/viewfeed.js:1353
 msgid "Toggle published"
 msgstr "Превключване (не)публикувано"
 
-#: include/functions.php:1190
-#: js/viewfeed.js:1682
+#: include/functions.php:1135
+#: js/viewfeed.js:1328
 msgid "Toggle unread"
 msgstr "Превключване четено/нечетено"
 
-#: include/functions.php:1191
+#: include/functions.php:1136
 msgid "Edit tags"
 msgstr "Редактиране на тагове"
 
-#: include/functions.php:1192
+#: include/functions.php:1137
 msgid "Open in new window"
 msgstr "Отваряне в нов прозорец"
 
-#: include/functions.php:1193
-#: js/viewfeed.js:1728
+#: include/functions.php:1138
+#: js/viewfeed.js:1374
 msgid "Mark below as read"
 msgstr "Отбелязване на по-долните като прочетени"
 
-#: include/functions.php:1194
-#: js/viewfeed.js:1721
+#: include/functions.php:1139
+#: js/viewfeed.js:1367
 msgid "Mark above as read"
 msgstr "Отбелязване на по-горните като прочетени"
 
-#: include/functions.php:1195
+#: include/functions.php:1140
 msgid "Scroll down"
 msgstr "Скролиране надолу"
 
-#: include/functions.php:1196
+#: include/functions.php:1141
 msgid "Scroll up"
 msgstr "Скролиране нагоре"
 
-#: include/functions.php:1197
+#: include/functions.php:1142
 msgid "Select article under cursor"
 msgstr "Избиране на статията под курсора"
 
-#: include/functions.php:1198
+#: include/functions.php:1143
 msgid "Email article"
 msgstr "Изпращане на статия по e-mail"
 
-#: include/functions.php:1199
+#: include/functions.php:1144
 msgid "Close/collapse article"
 msgstr "Затваряне/свиване на статия"
 
-#: include/functions.php:1200
+#: include/functions.php:1145
 msgid "Toggle article expansion (combined mode)"
 msgstr "Превключване разгръщането на статия (комбиниран режим)"
 
-#: include/functions.php:1202
+#: include/functions.php:1147
 #: plugins/embed_original/init.php:33
 msgid "Toggle embed original"
 msgstr "Превключване на вложен оригинал"
 
-#: include/functions.php:1203
+#: include/functions.php:1148
 msgid "Article selection"
 msgstr "Избор на статия"
 
-#: include/functions.php:1204
+#: include/functions.php:1149
 msgid "Select all articles"
 msgstr "Избор на всички статии"
 
-#: include/functions.php:1205
+#: include/functions.php:1150
 msgid "Select unread"
 msgstr "Избор на нечетени"
 
-#: include/functions.php:1206
+#: include/functions.php:1151
 msgid "Select starred"
 msgstr "Избор на тези със звезда"
 
-#: include/functions.php:1207
+#: include/functions.php:1152
 msgid "Select published"
 msgstr "Избор на публикувани"
 
-#: include/functions.php:1208
+#: include/functions.php:1153
 msgid "Invert selection"
 msgstr "Обръщане на избора"
 
-#: include/functions.php:1209
+#: include/functions.php:1154
 msgid "Deselect everything"
 msgstr "Изчистване на избора"
 
-#: include/functions.php:1210
-#: classes/pref/feeds.php:522
-#: classes/pref/feeds.php:794
+#: include/functions.php:1155
+#: classes/pref/feeds.php:521
+#: classes/pref/feeds.php:793
 msgid "Feed"
 msgstr "Хранилка"
 
-#: include/functions.php:1211
+#: include/functions.php:1156
 msgid "Refresh current feed"
 msgstr "Опресняване на текущата хранилка"
 
-#: include/functions.php:1212
+#: include/functions.php:1157
 msgid "Un/hide read feeds"
 msgstr "Показване/скриване на прочетените хранилки"
 
-#: include/functions.php:1213
-#: classes/pref/feeds.php:1195
+#: include/functions.php:1158
+#: classes/pref/feeds.php:1194
 msgid "Subscribe to feed"
 msgstr "Абониране за хранилка"
 
-#: include/functions.php:1214
-#: js/FeedTree.js:48
-#: js/PrefFeedTree.js:55
-#: js/viewfeed.js:1846
+#: include/functions.php:1159
+#: js/FeedTree.js:49
+#: js/PrefFeedTree.js:56
+#: js/viewfeed.js:1492
 msgid "Edit feed"
 msgstr "Редактиране на хранилка"
 
-#: include/functions.php:1216
+#: include/functions.php:1161
 msgid "Reverse headlines"
 msgstr "Обръщане на подредбата"
 
-#: include/functions.php:1217
+#: include/functions.php:1162
 msgid "Toggle headline grouping"
 msgstr ""
 
-#: include/functions.php:1218
+#: include/functions.php:1163
 msgid "Debug feed update"
 msgstr "Дебъгване обновяването на хранилка"
 
-#: include/functions.php:1219
+#: include/functions.php:1164
 #, fuzzy
 msgid "Debug viewfeed()"
 msgstr "Дебъгване обновяването на хранилка"
 
-#: include/functions.php:1220
-#: js/FeedTree.js:97
+#: include/functions.php:1165
+#: js/FeedTree.js:98
 msgid "Mark all feeds as read"
 msgstr "Отбелязване на всички хранилки като прочетени"
 
-#: include/functions.php:1221
+#: include/functions.php:1166
 msgid "Un/collapse current category"
 msgstr "Свиване/разгъване на текущата категория"
 
-#: include/functions.php:1222
-msgid "Toggle combined mode"
-msgstr "Превключване на комбиниран режим"
-
-#: include/functions.php:1223
+#: include/functions.php:1167
 msgid "Toggle auto expand in combined mode"
 msgstr "Превключване авто разтягане в комбиниран режим"
 
-#: include/functions.php:1224
+#: include/functions.php:1168
+msgid "Toggle combined mode"
+msgstr "Превключване на комбиниран режим"
+
+#: include/functions.php:1169
 msgid "Go to"
 msgstr "Отиди до"
 
-#: include/functions.php:1225
-#: classes/feeds.php:1583
+#: include/functions.php:1170
+#: classes/feeds.php:1569
 msgid "All articles"
 msgstr "Всички статии"
 
-#: include/functions.php:1226
+#: include/functions.php:1171
 msgid "Fresh"
 msgstr "Опресняване"
 
-#: include/functions.php:1229
-#: js/tt-rss.js:491
-#: js/tt-rss.js:660
+#: include/functions.php:1174
+#: js/tt-rss.js:439
+#: js/tt-rss.js:599
 msgid "Tag cloud"
 msgstr "Облак с тагове"
 
-#: include/functions.php:1231
+#: include/functions.php:1176
 msgid "Other"
 msgstr "Други"
 
-#: include/functions.php:1232
+#: include/functions.php:1177
 #: classes/pref/labels.php:279
 msgid "Create label"
 msgstr "Създаване на етикет"
 
-#: include/functions.php:1233
+#: include/functions.php:1178
 #: classes/pref/filters.php:801
 msgid "Create filter"
 msgstr "Създаване на филтър"
 
-#: include/functions.php:1234
+#: include/functions.php:1179
 msgid "Un/collapse sidebar"
 msgstr "Прибиране/изваждане на страничния панел"
 
-#: include/functions.php:1235
+#: include/functions.php:1180
 msgid "Show help dialog"
 msgstr "Показване на помощен диалог"
 
-#: include/functions.php:2582
+#: include/functions.php:2529
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: include/functions.php:2583
+#: include/functions.php:2530
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: include/functions.php:2584
+#: include/functions.php:2531
 msgid "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form"
 msgstr ""
 
-#: include/functions.php:2585
+#: include/functions.php:2532
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: include/functions.php:2586
+#: include/functions.php:2533
 #, fuzzy
 msgid "No file was uploaded"
 msgstr "Няма качени файлове."
 
-#: include/functions.php:2587
+#: include/functions.php:2534
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: include/functions.php:2588
+#: include/functions.php:2535
 msgid "Failed to write file to disk."
 msgstr ""
 
-#: include/functions.php:2589
+#: include/functions.php:2536
 msgid "A PHP extension stopped the file upload."
 msgstr ""
 
 #: include/login_form.php:107
-#: classes/handler/public.php:446
-#: classes/handler/public.php:708
+#: classes/handler/public.php:466
+#: classes/handler/public.php:732
 msgid "Login:"
 msgstr "Потребител:"
 
 #: include/login_form.php:117
-#: classes/handler/public.php:449
+#: classes/handler/public.php:469
 msgid "Password:"
 msgstr "Парола:"
 
@@ -791,9 +779,9 @@ msgid "Profile:"
 msgstr "Профил:"
 
 #: include/login_form.php:133
-#: classes/handler/public.php:252
 #: classes/pref/prefs.php:1037
 #: classes/rpc.php:69
+#: classes/handler/public.php:272
 msgid "Default profile"
 msgstr "Профил по подразбиране"
 
@@ -810,207 +798,27 @@ msgid "Remember me"
 msgstr "Запомни ме"
 
 #: include/login_form.php:159
-#: classes/handler/public.php:454
+#: classes/handler/public.php:474
 msgid "Log in"
 msgstr "Вход"
 
-#: include/sessions.php:46
+#: include/sessions.php:45
 msgid "Session failed to validate (schema version changed)"
 msgstr "Валидацията на сесията се провали (версията на схемата е променена)"
 
-#: include/sessions.php:62
+#: include/sessions.php:53
+#, fuzzy
+msgid "Session failed to validate (UA changed)."
+msgstr "Валидацията на сесията се провали (паролата е променена)"
+
+#: include/sessions.php:67
 msgid "Session failed to validate (password changed)"
 msgstr "Валидацията на сесията се провали (паролата е променена)"
 
-#: include/sessions.php:69
+#: include/sessions.php:74
 msgid "Session failed to validate (user not found)"
 msgstr "Валидацията на сесията се провали (потребителят не е намерен)"
 
-#: classes/article.php:26
-msgid "Article not found."
-msgstr "Статията не е намерена."
-
-#: classes/article.php:211
-msgid "Tags for this article (separated by commas):"
-msgstr "Тагове за тази статия (разделени със запетаи):"
-
-#: classes/article.php:236
-#: classes/pref/labels.php:82
-#: classes/pref/users.php:103
-#: classes/pref/feeds.php:774
-#: classes/pref/feeds.php:914
-#: classes/pref/filters.php:525
-#: classes/pref/prefs.php:982
-#: plugins/nsfw/init.php:85
-#: plugins/note/init.php:58
-#: plugins/af_readability/init.php:80
-#: plugins/af_redditimgur/init.php:66
-#: plugins/af_psql_trgm/init.php:188
-#: plugins/mail/init.php:65
-#: plugins/af_zz_imgproxy/init.php:238
-msgid "Save"
-msgstr "Запазване"
-
-#: classes/article.php:238
-#: classes/handler/public.php:423
-#: classes/handler/public.php:457
-#: classes/pref/labels.php:84
-#: classes/pref/users.php:105
-#: classes/pref/feeds.php:775
-#: classes/pref/feeds.php:917
-#: classes/pref/feeds.php:1672
-#: classes/pref/filters.php:528
-#: classes/pref/filters.php:945
-#: classes/pref/filters.php:1022
-#: classes/pref/filters.php:1115
-#: classes/pref/prefs.php:984
-#: classes/feeds.php:1037
-#: classes/feeds.php:1089
-#: classes/feeds.php:1128
-#: plugins/note/init.php:60
-#: plugins/mail/init.php:179
-msgid "Cancel"
-msgstr "Отказ"
-
-#: classes/article.php:337
-#: classes/article.php:720
-#: classes/article.php:875
-msgid "no tags"
-msgstr "няма тагове"
-
-#: classes/article.php:448
-msgid "unknown type"
-msgstr "незнаен вид"
-
-#: classes/article.php:525
-msgid "Attachments"
-msgstr "Прикачени"
-
-#: classes/article.php:626
-#: classes/feeds.php:661
-msgid "comment"
-msgid_plural "comments"
-msgstr[0] "коментар"
-msgstr[1] "коментара"
-
-#: classes/article.php:630
-#: classes/feeds.php:665
-msgid "comments"
-msgstr "коментари"
-
-#: classes/article.php:689
-msgid " - "
-msgstr " - "
-
-#: classes/article.php:730
-#: classes/feeds.php:647
-msgid "Edit tags for this article"
-msgstr "Редактиране на таговете за тази статия"
-
-#: classes/article.php:763
-#: classes/feeds.php:602
-msgid "Originally from:"
-msgstr "Оригинално от:"
-
-#: classes/article.php:774
-#: classes/pref/feeds.php:539
-#: classes/feeds.php:613
-msgid "Feed URL"
-msgstr "URL на хранилка"
-
-#: classes/article.php:811
-#: classes/backend.php:103
-#: classes/dlg.php:33
-#: classes/dlg.php:56
-#: classes/dlg.php:89
-#: classes/dlg.php:154
-#: classes/dlg.php:181
-#: classes/dlg.php:197
-#: classes/pref/feeds.php:1466
-#: classes/pref/feeds.php:1533
-#: classes/pref/filters.php:208
-#: classes/pref/prefs.php:1099
-#: plugins/af_psql_trgm/init.php:109
-#: plugins/import_export/init.php:446
-#: plugins/import_export/init.php:490
-#: plugins/share/init.php:128
-msgid "Close this window"
-msgstr "Затваряне на този прозорец"
-
-#: classes/article.php:913
-msgid "(edit note)"
-msgstr "(редактиране на бележка)"
-
-#: classes/opml.php:31
-#: classes/opml.php:36
-msgid "OPML Utility"
-msgstr "OPML инструмент"
-
-#: classes/opml.php:40
-msgid "Importing OPML..."
-msgstr "Внасяне на OPML..."
-
-#: classes/opml.php:45
-msgid "Return to preferences"
-msgstr "Връщане към предпочитания"
-
-#: classes/opml.php:301
-#, php-format
-msgid "Adding feed: %s"
-msgstr "Добавяне на хранилка: %s"
-
-#: classes/opml.php:312
-#, php-format
-msgid "Duplicate feed: %s"
-msgstr "Дублирана хранилка: %s"
-
-#: classes/opml.php:326
-#, php-format
-msgid "Adding label %s"
-msgstr "Добавяне на етикет \"%s\""
-
-#: classes/opml.php:329
-#, php-format
-msgid "Duplicate label: %s"
-msgstr "Дублиран етикет: %s"
-
-#: classes/opml.php:341
-#, php-format
-msgid "Setting preference key %s to %s"
-msgstr "Задаване на ключ за предпочитания \"%s\" към \"%s\""
-
-#: classes/opml.php:377
-msgid "Adding filter..."
-msgstr "Добавяне на филтър..."
-
-#: classes/opml.php:512
-#, php-format
-msgid "Processing category: %s"
-msgstr "Обработка на категория: %s"
-
-#: classes/opml.php:558
-#, php-format
-msgid "Upload failed with error code %d"
-msgstr "Качването се провали с код за грешка \"%d\""
-
-#: classes/opml.php:570
-#: plugins/import_export/init.php:471
-msgid "Unable to move uploaded file."
-msgstr "Невъзможност за преместване на качения файл."
-
-#: classes/opml.php:574
-#: plugins/import_export/init.php:475
-msgid "Error: please upload OPML file."
-msgstr "Грешка: моля, качете OPML файл!"
-
-#: classes/opml.php:585
-msgid "Error: unable to find moved OPML file."
-msgstr "Грешка: не може да се намери преместеният OPML файл."
-
-#: classes/opml.php:594
-msgid "Error while parsing document."
-msgstr "Грешка при разбора на документа."
-
 #: classes/backend.php:31
 msgid "Other interface tips are available in the Tiny Tiny RSS wiki."
 msgstr "Още такива съвети има в Tiny Tiny RSS wiki."
@@ -1031,162 +839,354 @@ msgstr "Ctrl"
 msgid "Help topic not found."
 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/backend.php:103
+#: classes/pref/filters.php:208
+#: classes/pref/feeds.php:1465
+#: classes/pref/feeds.php:1532
+#: classes/pref/prefs.php:1099
+#: classes/dlg.php:33
+#: classes/dlg.php:56
+#: classes/dlg.php:89
+#: classes/dlg.php:154
+#: classes/dlg.php:181
+#: classes/dlg.php:197
+#: classes/article.php:810
+#: plugins/af_psql_trgm/init.php:109
+#: plugins/import_export/init.php:446
+#: plugins/import_export/init.php:490
+#: plugins/share/init.php:128
+msgid "Close this window"
+msgstr "Затваряне на този прозорец"
 
-#: classes/dlg.php:44
-msgid "Your Public OPML URL is:"
-msgstr "Вашият публичен OPML URL е:"
+#: classes/feeds.php:53
+msgid "View as RSS feed"
+msgstr "Преглед като RSS хранилка"
 
-#: classes/dlg.php:53
-#: classes/dlg.php:178
-#: plugins/share/init.php:125
-msgid "Generate new URL"
-msgstr "Генериране на нов URL"
+#: classes/feeds.php:54
+#: classes/feeds.php:140
+#: classes/pref/feeds.php:1326
+msgid "View as RSS"
+msgstr "Преглед като RSS"
 
-#: classes/dlg.php:67
-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/feeds.php:62
+#, php-format
+msgid "Last updated: %s"
+msgstr "Последно обновяване: %s"
 
-#: classes/dlg.php:71
-#: classes/dlg.php:80
-msgid "Last update:"
-msgstr "Последно обновяване:"
-
-#: classes/dlg.php:76
-msgid "Update daemon is taking too long to perform a feed update. This could indicate a problem like crash or a hang. Please check the daemon process or contact instance owner."
-msgstr "Обновяващият демон изисква твърде много време за обновяване на хранилките. Това може да е знак за проблем като срив или забиване. Моля, проверете процеса на демона или се свържете със собственика на инсталацията!"
-
-#: classes/dlg.php:169
-msgid "You can view this feed as RSS using the following URL:"
-msgstr "Можете да видите тази хранилка като RSS на следния URL:"
-
-#: classes/dlg.php:190
-msgid "You are using default tt-rss password. Please change it in the Preferences (Personal data / Authentication)."
-msgstr ""
-
-#: classes/dlg.php:194
+#: classes/feeds.php:100
 #, fuzzy
-msgid "Open Preferences"
-msgstr "Предпочитания"
+msgid "Select..."
+msgstr "Избиране"
 
-#: classes/handler/public.php:387
-#: plugins/bookmarklets/init.php:40
-msgid "Share with Tiny Tiny RSS"
-msgstr "Споделяне с Tiny Tiny RSS"
+#: classes/feeds.php:102
+#: classes/pref/labels.php:273
+#: classes/pref/filters.php:391
+#: classes/pref/filters.php:449
+#: classes/pref/filters.php:795
+#: classes/pref/filters.php:878
+#: classes/pref/filters.php:905
+#: classes/pref/feeds.php:1185
+#: classes/pref/feeds.php:1416
+#: classes/pref/feeds.php:1481
+#: classes/pref/users.php:358
+#: classes/pref/prefs.php:996
+msgid "All"
+msgstr "Всички"
 
-#: classes/handler/public.php:395
-msgid "Title:"
-msgstr "Заглавие:"
+#: classes/feeds.php:104
+msgid "Invert"
+msgstr "Обръщане"
 
-#: classes/handler/public.php:397
-#: classes/pref/feeds.php:537
-msgid "URL:"
-msgstr "URL:"
+#: classes/feeds.php:105
+#: classes/pref/labels.php:275
+#: classes/pref/filters.php:393
+#: classes/pref/filters.php:451
+#: classes/pref/filters.php:797
+#: classes/pref/filters.php:880
+#: classes/pref/filters.php:907
+#: classes/pref/feeds.php:1187
+#: classes/pref/feeds.php:1418
+#: classes/pref/feeds.php:1483
+#: classes/pref/users.php:360
+#: classes/pref/prefs.php:998
+msgid "None"
+msgstr "Нищо"
 
-#: classes/handler/public.php:399
-msgid "Content:"
-msgstr "Съдържание:"
+#: classes/feeds.php:107
+msgid "Selection toggle:"
+msgstr "Превключване на избора:"
 
-#: classes/handler/public.php:401
-msgid "Labels:"
-msgstr "Етикети:"
+#: classes/feeds.php:113
+msgid "Selection:"
+msgstr "Избрани:"
 
-#: classes/handler/public.php:420
-msgid "Shared article will appear in the Published feed."
-msgstr "Споделените статии ще се появят в \"Публикувани статии\"."
+#: classes/feeds.php:116
+msgid "Set score"
+msgstr "Задаване на точки"
 
-#: classes/handler/public.php:422
-msgid "Share"
-msgstr "Споделяне"
+#: classes/feeds.php:119
+msgid "Archive"
+msgstr "Архивиране"
 
-#: classes/handler/public.php:444
-msgid "Not logged in"
-msgstr "Не сте влезли"
-
-#: classes/handler/public.php:504
-msgid "Incorrect username or password"
-msgstr "Грешен потребител или парола"
-
-#: classes/handler/public.php:557
-#, php-format
-msgid "Already subscribed to <b>%s</b>."
-msgstr "Вече сте абонирани за <b>%s</b>."
-
-#: classes/handler/public.php:560
-#, php-format
-msgid "Subscribed to <b>%s</b>."
-msgstr "Абонирани сте за <b>%s</b>."
-
-#: classes/handler/public.php:563
-#, php-format
-msgid "Could not subscribe to <b>%s</b>."
-msgstr "Невъзможно абониране за <b>%s</b>."
-
-#: classes/handler/public.php:566
-#, php-format
-msgid "No feeds found in <b>%s</b>."
-msgstr "Няма намерени хранилки в <b>%s</b>."
-
-#: classes/handler/public.php:569
-msgid "Multiple feed URLs found."
-msgstr "Намерени са множество URL-и на хранилки."
-
-#: classes/handler/public.php:573
-#, 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:591
-msgid "Subscribe to selected feed"
-msgstr "Абониране за избраната хранилка"
-
-#: classes/handler/public.php:618
-msgid "Edit subscription options"
-msgstr "Редактиране на абонаментните опции"
-
-#: classes/handler/public.php:656
-msgid "Password recovery"
-msgstr "Възстановяване на парола"
-
-#: classes/handler/public.php:701
-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:723
-#: classes/pref/users.php:372
-msgid "Reset password"
-msgstr "Смяна на парола"
-
-#: classes/handler/public.php:733
-msgid "Some of the required form parameters are missing or incorrect."
-msgstr "Някои от задължителните параметри на формата липсват или са грешни."
-
-#: classes/handler/public.php:737
-#: classes/handler/public.php:806
-msgid "Go back"
+#: classes/feeds.php:121
+msgid "Move back"
 msgstr "Назад"
 
-#: classes/handler/public.php:775
-msgid "[tt-rss] Password reset request"
-msgstr "[tt-rss] Заявка за смяна на парола"
+#: classes/feeds.php:122
+#: classes/pref/filters.php:400
+#: classes/pref/filters.php:458
+#: classes/pref/filters.php:887
+#: classes/pref/filters.php:914
+msgid "Delete"
+msgstr "Изтриване"
 
-#: classes/handler/public.php:802
-msgid "Sorry, login and email combination not found."
-msgstr "Съжалявам, комбинацията от потребител и e-mail не е намерена."
+#: classes/feeds.php:127
+#: classes/feeds.php:132
+#: plugins/mailto/init.php:25
+#: plugins/mail/init.php:76
+msgid "Forward by email"
+msgstr "Препращане по e-mail"
 
-#: classes/handler/public.php:824
-msgid "Your access level is insufficient to run this script."
-msgstr "Вашето ниво на достъп е недостатъчно за изпълнението на този скрипт."
+#: classes/feeds.php:136
+msgid "Feed:"
+msgstr "Хранилка:"
 
-#: classes/handler/public.php:850
-msgid "Database Updater"
-msgstr "Обновяване на базата данни"
+#: classes/feeds.php:193
+#: classes/feeds.php:802
+msgid "Feed not found."
+msgstr "Хранилката не е намерена."
 
-#: classes/handler/public.php:915
-msgid "Perform updates"
-msgstr "Извършване на обновявания"
+#: classes/feeds.php:255
+msgid "Never"
+msgstr "Никога"
+
+#: classes/feeds.php:341
+#, php-format
+msgid "Imported at %s"
+msgstr "Внесено в \"%s\""
+
+#: classes/feeds.php:391
+#: classes/feeds.php:484
+msgid "mark feed as read"
+msgstr "отбелязване на хранилката като прочетена"
+
+#: classes/feeds.php:540
+msgid "Collapse article"
+msgstr "Свиване на статия"
+
+#: classes/feeds.php:592
+#: classes/article.php:762
+msgid "Originally from:"
+msgstr "Оригинално от:"
+
+#: classes/feeds.php:603
+#: classes/pref/feeds.php:538
+#: classes/article.php:773
+msgid "Feed URL"
+msgstr "URL на хранилка"
+
+#: classes/feeds.php:630
+#: classes/article.php:729
+msgid "Edit tags for this article"
+msgstr "Редактиране на таговете за тази статия"
+
+#: classes/feeds.php:644
+#: classes/article.php:625
+msgid "comment"
+msgid_plural "comments"
+msgstr[0] "коментар"
+msgstr[1] "коментара"
+
+#: classes/feeds.php:648
+#: classes/article.php:629
+msgid "comments"
+msgstr "коментари"
+
+#: classes/feeds.php:686
+msgid "No unread articles found to display."
+msgstr "Не са намерени нечетени статии за показване."
+
+#: classes/feeds.php:689
+msgid "No updated articles found to display."
+msgstr "Не са намерени обновени статии за показване."
+
+#: classes/feeds.php:692
+msgid "No starred articles found to display."
+msgstr "Не са намерени статии със звезда за показване."
+
+#: classes/feeds.php:696
+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:698
+msgid "No articles found to display."
+msgstr "Не са намерени статии за показване."
+
+#: classes/feeds.php:714
+#: classes/feeds.php:905
+#, php-format
+msgid "Feeds last updated at %s"
+msgstr "Хранилките са обновени за последно в %s"
+
+#: classes/feeds.php:726
+#: classes/feeds.php:917
+msgid "Some feeds have update errors (click for details)"
+msgstr "Някои хранилки имат грешки при обновяването (клик за детайли)"
+
+#: classes/feeds.php:894
+msgid "No feed selected."
+msgstr "Не е избрана хранилка."
+
+#: classes/feeds.php:958
+#: classes/feeds.php:966
+msgid "Feed or site URL"
+msgstr "URL на хранилка/сайт"
+
+#: classes/feeds.php:972
+#: classes/pref/feeds.php:559
+#: classes/pref/feeds.php:800
+#: classes/pref/feeds.php:1632
+msgid "Place in category:"
+msgstr "Поставяне в категория:"
+
+#: classes/feeds.php:980
+msgid "Available feeds"
+msgstr "Налични хранилки"
+
+#: classes/feeds.php:992
+#: classes/pref/feeds.php:621
+#: classes/pref/feeds.php:848
+#: classes/pref/users.php:61
+msgid "Authentication"
+msgstr "Автентикация"
+
+#: classes/feeds.php:996
+#: classes/pref/feeds.php:625
+#: classes/pref/feeds.php:852
+#: classes/pref/feeds.php:1646
+#: classes/pref/users.php:403
+msgid "Login"
+msgstr "Потребител"
+
+#: classes/feeds.php:1000
+#: classes/pref/feeds.php:631
+#: classes/pref/feeds.php:860
+#: classes/pref/feeds.php:1649
+#: classes/pref/prefs.php:243
+msgid "Password"
+msgstr "Парола"
+
+#: classes/feeds.php:1011
+#: classes/pref/feeds.php:645
+msgid "This feed requires authentication."
+msgstr "Тази хранилка изисква автентикация."
+
+#: classes/feeds.php:1014
+#: classes/feeds.php:1070
+#: classes/pref/feeds.php:1668
+msgid "Subscribe"
+msgstr "Абониране"
+
+#: classes/feeds.php:1017
+msgid "More feeds"
+msgstr "Още хранилки"
+
+#: classes/feeds.php:1020
+#: classes/feeds.php:1072
+#: classes/feeds.php:1111
+#: classes/pref/labels.php:84
+#: classes/pref/filters.php:528
+#: classes/pref/filters.php:945
+#: classes/pref/filters.php:1022
+#: classes/pref/filters.php:1115
+#: classes/pref/feeds.php:774
+#: classes/pref/feeds.php:916
+#: classes/pref/feeds.php:1669
+#: classes/pref/users.php:105
+#: classes/pref/prefs.php:984
+#: classes/article.php:238
+#: classes/handler/public.php:443
+#: classes/handler/public.php:477
+#: plugins/mail/init.php:179
+#: plugins/note/init.php:60
+msgid "Cancel"
+msgstr "Отказ"
+
+#: classes/feeds.php:1042
+#: classes/feeds.php:1110
+#: classes/pref/filters.php:788
+#: classes/pref/feeds.php:1178
+#: classes/pref/users.php:345
+#: js/tt-rss.js:152
+msgid "Search"
+msgstr "Търсене"
+
+#: classes/feeds.php:1046
+msgid "Popular feeds"
+msgstr "Популярни хранилки"
+
+#: classes/feeds.php:1047
+msgid "Feed archive"
+msgstr "Архив с хранилки"
+
+#: classes/feeds.php:1050
+msgid "limit:"
+msgstr "лимит"
+
+#: classes/feeds.php:1071
+#: classes/pref/labels.php:282
+#: classes/pref/filters.php:518
+#: classes/pref/filters.php:814
+#: classes/pref/feeds.php:751
+#: classes/pref/users.php:369
+msgid "Remove"
+msgstr "Премахване"
+
+#: classes/feeds.php:1084
+msgid "Look for"
+msgstr "Търсене за"
+
+#: classes/feeds.php:1092
+#, php-format
+msgid "in %s"
+msgstr ""
+
+#: classes/feeds.php:1097
+msgid "Used for word stemming"
+msgstr ""
+
+#: classes/feeds.php:1106
+msgid "Search syntax"
+msgstr "Синтаксис на търсенето"
+
+#: classes/feeds.php:1563
+msgid "Starred articles"
+msgstr "Статии със звезда"
+
+#: classes/feeds.php:1565
+msgid "Published articles"
+msgstr "Публикувани статии"
+
+#: classes/feeds.php:1567
+msgid "Fresh articles"
+msgstr "Пресни статии"
+
+#: classes/feeds.php:1571
+msgid "Archived articles"
+msgstr "Архивирани статии"
+
+#: classes/feeds.php:1573
+msgid "Recently read"
+msgstr "Наскоро четени"
+
+#: classes/feeds.php:1694
+msgid "Special"
+msgstr "Специални"
+
+#: classes/feeds.php:1951
+#, php-format
+msgid "Search results: %s"
+msgstr "Резултати от търсенето: %s"
 
 #: classes/pref/labels.php:25
 #: classes/pref/filters.php:377
@@ -1206,201 +1206,193 @@ msgstr "Преден план:"
 msgid "Background:"
 msgstr "Фон:"
 
+#: classes/pref/labels.php:82
+#: classes/pref/filters.php:525
+#: classes/pref/feeds.php:773
+#: classes/pref/feeds.php:913
+#: classes/pref/users.php:103
+#: classes/pref/prefs.php:982
+#: classes/article.php:236
+#: plugins/af_zz_imgproxy/init.php:238
+#: plugins/af_redditimgur/init.php:66
+#: plugins/af_psql_trgm/init.php:188
+#: plugins/af_readability/init.php:80
+#: plugins/nsfw/init.php:85
+#: plugins/mail/init.php:65
+#: plugins/note/init.php:58
+msgid "Save"
+msgstr "Запазване"
+
 #: classes/pref/labels.php:244
 #, php-format
 msgid "Created label <b>%s</b>"
 msgstr "Създаден етикет <b>%s</b>"
 
 #: classes/pref/labels.php:270
-#: classes/pref/users.php:356
-#: classes/pref/feeds.php:1183
-#: classes/pref/feeds.php:1414
-#: classes/pref/feeds.php:1479
 #: classes/pref/filters.php:388
 #: classes/pref/filters.php:446
 #: classes/pref/filters.php:792
 #: classes/pref/filters.php:875
 #: classes/pref/filters.php:902
+#: classes/pref/feeds.php:1182
+#: classes/pref/feeds.php:1413
+#: classes/pref/feeds.php:1478
+#: classes/pref/users.php:355
 #: classes/pref/prefs.php:993
 msgid "Select"
 msgstr "Избиране"
 
-#: classes/pref/labels.php:273
-#: classes/pref/users.php:359
-#: classes/pref/feeds.php:1186
-#: classes/pref/feeds.php:1417
-#: classes/pref/feeds.php:1482
-#: classes/pref/filters.php:391
-#: classes/pref/filters.php:449
-#: classes/pref/filters.php:795
-#: classes/pref/filters.php:878
-#: classes/pref/filters.php:905
-#: classes/pref/prefs.php:996
-#: classes/feeds.php:102
-msgid "All"
-msgstr "Всички"
-
-#: classes/pref/labels.php:275
-#: classes/pref/users.php:361
-#: classes/pref/feeds.php:1188
-#: classes/pref/feeds.php:1419
-#: classes/pref/feeds.php:1484
-#: classes/pref/filters.php:393
-#: classes/pref/filters.php:451
-#: classes/pref/filters.php:797
-#: classes/pref/filters.php:880
-#: classes/pref/filters.php:907
-#: classes/pref/prefs.php:998
-#: classes/feeds.php:105
-msgid "None"
-msgstr "Нищо"
-
-#: classes/pref/labels.php:282
-#: classes/pref/users.php:370
-#: classes/pref/feeds.php:752
-#: classes/pref/filters.php:518
-#: classes/pref/filters.php:814
-#: classes/feeds.php:1088
-msgid "Remove"
-msgstr "Премахване"
-
 #: classes/pref/labels.php:285
 msgid "Clear colors"
 msgstr "Изчистване на цветове"
 
-#: classes/pref/users.php:6
-#: classes/pref/system.php:8
-msgid "Your access level is insufficient to open this tab."
-msgstr "Вашето ниво на достъп е недостатъчно, за да отворите този раздел."
-
-#: classes/pref/users.php:26
+#: classes/pref/filters.php:155
 #, fuzzy
-msgid "Edit user"
-msgstr "Редактиране на правило"
+msgid "Preview article"
+msgstr "Пресни статии"
 
-#: classes/pref/users.php:61
-#: classes/pref/feeds.php:622
-#: classes/pref/feeds.php:849
-#: classes/feeds.php:1009
-msgid "Authentication"
-msgstr "Автентикация"
+#: classes/pref/filters.php:267
+#: classes/pref/filters.php:573
+msgid "(inverse)"
+msgstr "(обратно)"
 
-#: classes/pref/users.php:64
-msgid "Access level: "
-msgstr "Ниво на достъп:"
-
-#: classes/pref/users.php:82
-#: classes/pref/feeds.php:648
-#: classes/pref/feeds.php:867
-msgid "Options"
-msgstr "Опции"
-
-#: classes/pref/users.php:96
-#: js/prefs.js:479
-msgid "User details"
-msgstr "Детайли на потребител"
-
-#: classes/pref/users.php:136
-#: classes/pref/users.php:407
-msgid "Registered"
-msgstr "Регистриран"
-
-#: classes/pref/users.php:137
-msgid "Last logged in"
-msgstr "Последно влязъл"
-
-#: classes/pref/users.php:145
-msgid "Subscribed feeds count"
-msgstr "Бройка на абонираните хранилки"
-
-#: classes/pref/users.php:146
-#, fuzzy
-msgid "Stored articles"
-msgstr "Статии със звезда"
-
-#: classes/pref/users.php:150
-#: classes/pref/users.php:406
-msgid "Subscribed feeds"
-msgstr "Абонирани хранилки"
-
-#: classes/pref/users.php:176
-msgid "User not found"
-msgstr "Потребителят не е намерен"
-
-#: classes/pref/users.php:246
+#: classes/pref/filters.php:263
+#: classes/pref/filters.php:572
 #, php-format
-msgid "Added user <b>%s</b> with password <b>%s</b>"
-msgstr "Добавен потребител <b>%s</b> с парола <b>%s</b>"
+msgid "%s on %s in %s %s"
+msgstr "%s на %s в %s %s"
 
-#: classes/pref/users.php:253
-#, php-format
-msgid "Could not create user <b>%s</b>"
-msgstr "Не може да се създаде потребител <b>%s</b>"
+#: classes/pref/filters.php:383
+#: classes/pref/filters.php:870
+#: classes/pref/filters.php:977
+msgid "Match"
+msgstr "Съвпадение"
 
-#: classes/pref/users.php:257
-#, php-format
-msgid "User <b>%s</b> already exists."
-msgstr "Потребителят <b>%s</b> вече съществува."
+#: classes/pref/filters.php:397
+#: classes/pref/filters.php:455
+#: classes/pref/filters.php:884
+#: classes/pref/filters.php:911
+msgid "Add"
+msgstr "Добавяне"
 
-#: classes/pref/users.php:285
-#, php-format
-msgid "Changed password of user <b>%s</b> to <b>%s</b>"
-msgstr "Промяна паролата на потребител <b>%s</b> към <b>%s</b>"
+#: classes/pref/filters.php:441
+#: classes/pref/filters.php:897
+msgid "Apply actions"
+msgstr "Прилагане на действията"
 
-#: classes/pref/users.php:287
-#, php-format
-msgid "Sending new password of user <b>%s</b> to <b>%s</b>"
-msgstr "Изпращане на нова парола на потребител <b>%s</b> към <b>%s</b>"
+#: classes/pref/filters.php:492
+#: classes/pref/filters.php:926
+msgid "Enabled"
+msgstr "Активирано"
 
-#: classes/pref/users.php:311
-msgid "[tt-rss] Password change notification"
-msgstr "[tt-rss] Известие за смяна на парола"
+#: classes/pref/filters.php:501
+#: classes/pref/filters.php:929
+msgid "Match any rule"
+msgstr "Съвпадение с някое правило"
 
-#: classes/pref/users.php:346
-#: classes/pref/feeds.php:1179
-#: classes/pref/filters.php:788
-#: classes/feeds.php:1059
-#: classes/feeds.php:1127
-#: js/tt-rss.js:165
-msgid "Search"
-msgstr "Търсене"
+#: classes/pref/filters.php:510
+#: classes/pref/filters.php:932
+msgid "Inverse matching"
+msgstr "Обратно съвпадение"
 
-#: classes/pref/users.php:364
-msgid "Create user"
-msgstr "Създаване на потребител"
+#: classes/pref/filters.php:522
+#: classes/pref/filters.php:939
+msgid "Test"
+msgstr "Проба"
+
+#: classes/pref/filters.php:804
+msgid "Combine"
+msgstr "Комбиниране"
 
-#: classes/pref/users.php:368
 #: classes/pref/filters.php:807
+#: classes/pref/users.php:367
 msgid "Edit"
 msgstr "Редактиране"
 
-#: classes/pref/users.php:404
-#: classes/pref/feeds.php:626
-#: classes/pref/feeds.php:853
-#: classes/pref/feeds.php:1649
-#: classes/feeds.php:1013
-msgid "Login"
-msgstr "Потребител"
+#: classes/pref/filters.php:810
+#: classes/pref/feeds.php:1198
+#: classes/pref/feeds.php:1212
+msgid "Reset sort order"
+msgstr "Нулиране на подредбата"
 
-#: classes/pref/users.php:405
-msgid "Access Level"
-msgstr "Ниво на достъп"
+#: classes/pref/filters.php:942
+msgid "Create"
+msgstr "Създаване"
 
-#: classes/pref/users.php:408
-msgid "Last login"
-msgstr "Последен вход"
+#: classes/pref/filters.php:987
+msgid "Regular expression, without outer delimiters (i.e. slashes)"
+msgstr ""
 
-#: classes/pref/users.php:427
-msgid "Click to edit"
-msgstr "Клик за редактиране"
+#: classes/pref/filters.php:993
+msgid "Inverse regular expression matching"
+msgstr "Обръщане на съвпадението от регулярното условие"
 
-#: classes/pref/users.php:447
-msgid "No users defined."
-msgstr "Не е указан потребител."
+#: classes/pref/filters.php:995
+msgid "on field"
+msgstr "върху поле"
 
-#: classes/pref/users.php:449
-msgid "No matching users found."
-msgstr "Не са намерени съвпадащи потребители."
+#: classes/pref/filters.php:1001
+#: js/PrefFilterTree.js:44
+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:764
+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:786
+msgid "Add action"
+msgstr "Добавяне на действие"
+
+#: classes/pref/filters.php:1139
+msgid "[No caption]"
+msgstr "[Без надпис]"
+
+#: classes/pref/filters.php:1141
+#, php-format
+msgid "%s (%d rule)"
+msgid_plural "%s (%d rules)"
+msgstr[0] "%s (%d правило)"
+msgstr[1] "%s (%d правила)"
+
+#: classes/pref/filters.php:1155
+#, fuzzy
+msgid "matches any rule"
+msgstr "Съвпадение с някое правило"
+
+#: classes/pref/filters.php:1158
+#, php-format
+msgid "%s (+%d action)"
+msgid_plural "%s (+%d actions)"
+msgstr[0] "%s (+%d действие)"
+msgstr[1] "%s (+%d действия)"
+
+#: classes/pref/system.php:8
+#: classes/pref/users.php:6
+msgid "Your access level is insufficient to open this tab."
+msgstr "Вашето ниво на достъп е недостатъчно, за да отворите този раздел."
 
 #: classes/pref/system.php:29
 msgid "Error Log"
@@ -1445,384 +1437,316 @@ msgid_plural "(%d feeds)"
 msgstr[0] "(%d хранилка)"
 msgstr[1] "(%d хранилки)"
 
-#: classes/pref/feeds.php:514
+#: classes/pref/feeds.php:513
 #: classes/pref/prefs.php:18
 msgid "General"
 msgstr "Основни"
 
-#: classes/pref/feeds.php:528
+#: classes/pref/feeds.php:527
 msgid "Feed Title"
 msgstr "Заглавие на хранилка"
 
-#: classes/pref/feeds.php:560
-#: classes/pref/feeds.php:801
-#: classes/pref/feeds.php:1635
-#: classes/feeds.php:989
-msgid "Place in category:"
-msgstr "Поставяне в категория:"
+#: classes/pref/feeds.php:536
+#: classes/handler/public.php:417
+msgid "URL:"
+msgstr "URL:"
 
-#: classes/pref/feeds.php:572
+#: classes/pref/feeds.php:571
 #, fuzzy
 msgid "Site URL:"
 msgstr "URL на статията:"
 
-#: classes/pref/feeds.php:574
+#: classes/pref/feeds.php:573
 #, fuzzy
 msgid "Site URL"
 msgstr "URL на хранилка"
 
-#: classes/pref/feeds.php:585
-#: classes/pref/feeds.php:815
+#: classes/pref/feeds.php:584
+#: classes/pref/feeds.php:814
 #, fuzzy
 msgid "Language:"
 msgstr "Език"
 
-#: classes/pref/feeds.php:592
-#: classes/pref/feeds.php:824
+#: classes/pref/feeds.php:591
+#: classes/pref/feeds.php:823
 msgid "Update"
 msgstr "Обновяване"
 
-#: classes/pref/feeds.php:607
-#: classes/pref/feeds.php:840
+#: classes/pref/feeds.php:606
+#: classes/pref/feeds.php:839
 msgid "Article purging:"
 msgstr "Изтриване на статия:"
 
-#: classes/pref/feeds.php:632
-#: classes/pref/feeds.php:861
-#: classes/pref/feeds.php:1652
-#: classes/pref/prefs.php:243
-#: classes/feeds.php:1017
-msgid "Password"
-msgstr "Парола"
-
-#: classes/pref/feeds.php:636
+#: classes/pref/feeds.php:635
 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:646
-#: classes/feeds.php:1028
-msgid "This feed requires authentication."
-msgstr "Тази хранилка изисква автентикация."
+#: classes/pref/feeds.php:647
+#: classes/pref/feeds.php:866
+#: classes/pref/users.php:82
+msgid "Options"
+msgstr "Опции"
 
-#: classes/pref/feeds.php:662
-#: classes/pref/feeds.php:871
+#: classes/pref/feeds.php:661
+#: classes/pref/feeds.php:870
 msgid "Hide from Popular feeds"
 msgstr "Скриване от \"Популярни хранилки\""
 
-#: classes/pref/feeds.php:674
-#: classes/pref/feeds.php:877
+#: classes/pref/feeds.php:673
+#: classes/pref/feeds.php:876
 msgid "Include in e-mail digest"
 msgstr "Включване в e-mail справката"
 
-#: classes/pref/feeds.php:687
-#: classes/pref/feeds.php:883
+#: classes/pref/feeds.php:686
+#: classes/pref/feeds.php:882
 msgid "Always display image attachments"
 msgstr "Винаги да се показват прикачените изображения"
 
-#: classes/pref/feeds.php:700
-#: classes/pref/feeds.php:891
+#: classes/pref/feeds.php:699
+#: classes/pref/feeds.php:890
 #, fuzzy
 msgid "Do not embed media"
 msgstr "Да не се влагат изображения"
 
-#: classes/pref/feeds.php:713
-#: classes/pref/feeds.php:899
+#: classes/pref/feeds.php:712
+#: classes/pref/feeds.php:898
 msgid "Cache media"
 msgstr ""
 
-#: classes/pref/feeds.php:725
-#: classes/pref/feeds.php:905
+#: classes/pref/feeds.php:724
+#: classes/pref/feeds.php:904
 msgid "Mark updated articles as unread"
 msgstr "Отбелязване на обновените статии като нечетени"
 
-#: classes/pref/feeds.php:729
+#: classes/pref/feeds.php:728
 msgid "Icon"
 msgstr "Икона"
 
-#: classes/pref/feeds.php:743
-#: classes/pref/feeds.php:1284
+#: classes/pref/feeds.php:742
+#: classes/pref/feeds.php:1283
 #: plugins/import_export/init.php:71
 #, fuzzy
 msgid "Choose file..."
 msgstr "Създаване на филтър..."
 
-#: classes/pref/feeds.php:750
+#: classes/pref/feeds.php:749
 msgid "Replace"
 msgstr "Замяна"
 
-#: classes/pref/feeds.php:757
+#: classes/pref/feeds.php:756
 #: classes/pref/prefs.php:679
 msgid "Plugins"
 msgstr "Добавки"
 
-#: classes/pref/feeds.php:1154
+#: classes/pref/feeds.php:1153
 msgid "Feeds with errors"
 msgstr "Хранилки с грешки"
 
-#: classes/pref/feeds.php:1161
+#: classes/pref/feeds.php:1160
 msgid "Inactive feeds"
 msgstr "Неактивни хранилки"
 
-#: classes/pref/feeds.php:1197
+#: classes/pref/feeds.php:1196
 msgid "Edit selected feeds"
 msgstr "Редактиране на избраните хранилки"
 
-#: classes/pref/feeds.php:1199
-#: classes/pref/feeds.php:1213
-#: classes/pref/filters.php:810
-msgid "Reset sort order"
-msgstr "Нулиране на подредбата"
-
-#: classes/pref/feeds.php:1201
-#: js/prefs.js:1462
+#: classes/pref/feeds.php:1200
+#: js/prefs.js:1171
 msgid "Batch subscribe"
 msgstr "Партидно абониране"
 
-#: classes/pref/feeds.php:1208
+#: classes/pref/feeds.php:1207
 msgid "Categories"
 msgstr "Категории"
 
-#: classes/pref/feeds.php:1211
+#: classes/pref/feeds.php:1210
 msgid "Add category"
 msgstr "Добавяне на категория"
 
-#: classes/pref/feeds.php:1215
+#: classes/pref/feeds.php:1214
 msgid "Remove selected"
 msgstr "Премахване на избраното"
 
-#: classes/pref/feeds.php:1272
+#: classes/pref/feeds.php:1271
 msgid "OPML"
 msgstr "OPML"
 
-#: classes/pref/feeds.php:1274
+#: classes/pref/feeds.php:1273
 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:1275
+#: classes/pref/feeds.php:1274
 msgid "Only main settings profile can be migrated using OPML."
 msgstr "Само основните настройки на профила могат да се мигрират чрез OPML."
 
-#: classes/pref/feeds.php:1290
+#: classes/pref/feeds.php:1289
 msgid "Import my OPML"
 msgstr "Внасяне на мой OPML"
 
-#: classes/pref/feeds.php:1296
+#: classes/pref/feeds.php:1295
 msgid "Filename:"
 msgstr "Име на файл:"
 
-#: classes/pref/feeds.php:1298
+#: classes/pref/feeds.php:1297
 msgid "Include settings"
 msgstr "Включително настройките"
 
-#: classes/pref/feeds.php:1302
+#: classes/pref/feeds.php:1301
 msgid "Export OPML"
 msgstr "Изнасяне на OPML"
 
-#: classes/pref/feeds.php:1306
+#: classes/pref/feeds.php:1305
 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:1310
+#: classes/pref/feeds.php:1309
 msgid "Public OPML URL"
 msgstr "Публичен OPML URL"
 
-#: classes/pref/feeds.php:1311
+#: classes/pref/feeds.php:1310
 msgid "Display published OPML URL"
 msgstr "Показване на публикувания OPML URL"
 
-#: classes/pref/feeds.php:1318
+#: classes/pref/feeds.php:1317
 msgid "Published & shared articles / Generated feeds"
 msgstr "Публикувани и споделени статии / Генерирани хранилки"
 
-#: classes/pref/feeds.php:1320
+#: classes/pref/feeds.php:1319
 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:1327
-#: classes/feeds.php:54
-#: classes/feeds.php:140
-msgid "View as RSS"
-msgstr "Преглед като RSS"
-
-#: classes/pref/feeds.php:1328
 msgid "Display URL"
 msgstr "Показване на URL"
 
-#: classes/pref/feeds.php:1331
+#: classes/pref/feeds.php:1330
 msgid "Clear all generated URLs"
 msgstr "Изчистване на всички генерирани URL-и"
 
-#: classes/pref/feeds.php:1410
+#: classes/pref/feeds.php:1409
 msgid "These feeds have not been updated with new content for 3 months (oldest first):"
 msgstr "Тези хранилки не са обновявани с ново съдържание от 3 месеца (най-старите отгоре):"
 
-#: classes/pref/feeds.php:1444
-#: classes/pref/feeds.php:1509
+#: classes/pref/feeds.php:1443
+#: classes/pref/feeds.php:1508
 msgid "Click to edit feed"
 msgstr "Клик за редактиране на хранилка"
 
-#: classes/pref/feeds.php:1462
-#: classes/pref/feeds.php:1529
+#: classes/pref/feeds.php:1461
+#: classes/pref/feeds.php:1528
 msgid "Unsubscribe from selected feeds"
 msgstr "Отписване от избраните хранилки"
 
-#: classes/pref/feeds.php:1632
+#: classes/pref/feeds.php:1629
 msgid "Add one valid RSS feed per line (no feed detection is done)"
 msgstr "Добавете по една валидна RSS хранилка на ред (не се прави засичане на хранилки)"
 
-#: classes/pref/feeds.php:1641
+#: classes/pref/feeds.php:1638
 msgid "Feeds to subscribe, One per line"
 msgstr "Хранилки за абониране. По една на ред"
 
-#: classes/pref/feeds.php:1664
+#: classes/pref/feeds.php:1661
 msgid "Feeds require authentication."
 msgstr "Хранилките изискват автентикация."
 
-#: classes/pref/feeds.php:1671
-#: classes/feeds.php:1031
-#: classes/feeds.php:1087
-msgid "Subscribe"
-msgstr "Абониране"
-
-#: classes/pref/filters.php:155
+#: classes/pref/users.php:26
 #, fuzzy
-msgid "Preview article"
-msgstr "Пресни статии"
+msgid "Edit user"
+msgstr "Редактиране на правило"
 
-#: classes/pref/filters.php:267
-#: classes/pref/filters.php:573
-msgid "(inverse)"
-msgstr "(обратно)"
+#: classes/pref/users.php:64
+msgid "Access level: "
+msgstr "Ниво на достъп:"
 
-#: classes/pref/filters.php:263
-#: classes/pref/filters.php:572
-#, php-format
-msgid "%s on %s in %s %s"
-msgstr "%s на %s в %s %s"
+#: classes/pref/users.php:96
+#: js/prefs.js:403
+msgid "User details"
+msgstr "Детайли на потребител"
 
-#: classes/pref/filters.php:383
-#: classes/pref/filters.php:870
-#: classes/pref/filters.php:977
-msgid "Match"
-msgstr "Съвпадение"
+#: classes/pref/users.php:136
+#: classes/pref/users.php:406
+msgid "Registered"
+msgstr "Регистриран"
 
-#: classes/pref/filters.php:397
-#: classes/pref/filters.php:455
-#: classes/pref/filters.php:884
-#: classes/pref/filters.php:911
-msgid "Add"
-msgstr "Добавяне"
+#: classes/pref/users.php:137
+msgid "Last logged in"
+msgstr "Последно влязъл"
 
-#: classes/pref/filters.php:400
-#: classes/pref/filters.php:458
-#: classes/pref/filters.php:887
-#: classes/pref/filters.php:914
-#: classes/feeds.php:122
-msgid "Delete"
-msgstr "Изтриване"
+#: classes/pref/users.php:145
+msgid "Subscribed feeds count"
+msgstr "Бройка на абонираните хранилки"
 
-#: classes/pref/filters.php:441
-#: classes/pref/filters.php:897
-msgid "Apply actions"
-msgstr "Прилагане на действията"
-
-#: classes/pref/filters.php:492
-#: classes/pref/filters.php:926
-msgid "Enabled"
-msgstr "Активирано"
-
-#: classes/pref/filters.php:501
-#: classes/pref/filters.php:929
-msgid "Match any rule"
-msgstr "Съвпадение с някое правило"
-
-#: classes/pref/filters.php:510
-#: classes/pref/filters.php:932
-msgid "Inverse matching"
-msgstr "Обратно съвпадение"
-
-#: classes/pref/filters.php:522
-#: classes/pref/filters.php:939
-msgid "Test"
-msgstr "Проба"
-
-#: classes/pref/filters.php:804
-msgid "Combine"
-msgstr "Комбиниране"
-
-#: classes/pref/filters.php:942
-msgid "Create"
-msgstr "Създаване"
-
-#: classes/pref/filters.php:987
-msgid "Regular expression, without outer delimiters (i.e. slashes)"
-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:43
-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:797
-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:819
-msgid "Add action"
-msgstr "Добавяне на действие"
-
-#: classes/pref/filters.php:1139
-msgid "[No caption]"
-msgstr "[Без надпис]"
-
-#: classes/pref/filters.php:1141
-#, php-format
-msgid "%s (%d rule)"
-msgid_plural "%s (%d rules)"
-msgstr[0] "%s (%d правило)"
-msgstr[1] "%s (%d правила)"
-
-#: classes/pref/filters.php:1155
+#: classes/pref/users.php:146
 #, fuzzy
-msgid "matches any rule"
-msgstr "Съвпадение с някое правило"
+msgid "Stored articles"
+msgstr "Статии със звезда"
 
-#: classes/pref/filters.php:1158
+#: classes/pref/users.php:150
+#: classes/pref/users.php:405
+msgid "Subscribed feeds"
+msgstr "Абонирани хранилки"
+
+#: classes/pref/users.php:176
+msgid "User not found"
+msgstr "Потребителят не е намерен"
+
+#: classes/pref/users.php:246
 #, php-format
-msgid "%s (+%d action)"
-msgid_plural "%s (+%d actions)"
-msgstr[0] "%s (+%d действие)"
-msgstr[1] "%s (+%d действия)"
+msgid "Added user <b>%s</b> with password <b>%s</b>"
+msgstr "Добавен потребител <b>%s</b> с парола <b>%s</b>"
+
+#: classes/pref/users.php:253
+#, php-format
+msgid "Could not create user <b>%s</b>"
+msgstr "Не може да се създаде потребител <b>%s</b>"
+
+#: classes/pref/users.php:257
+#, php-format
+msgid "User <b>%s</b> already exists."
+msgstr "Потребителят <b>%s</b> вече съществува."
+
+#: classes/pref/users.php:285
+#, 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:287
+#, 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:310
+msgid "[tt-rss] Password change notification"
+msgstr "[tt-rss] Известие за смяна на парола"
+
+#: classes/pref/users.php:363
+msgid "Create user"
+msgstr "Създаване на потребител"
+
+#: classes/pref/users.php:371
+#: classes/handler/public.php:747
+msgid "Reset password"
+msgstr "Смяна на парола"
+
+#: classes/pref/users.php:404
+msgid "Access Level"
+msgstr "Ниво на достъп"
+
+#: classes/pref/users.php:407
+msgid "Last login"
+msgstr "Последен вход"
+
+#: classes/pref/users.php:426
+msgid "Click to edit"
+msgstr "Клик за редактиране"
+
+#: classes/pref/users.php:446
+msgid "No users defined."
+msgstr "Не е указан потребител."
+
+#: classes/pref/users.php:448
+msgid "No matching users found."
+msgstr "Не са намерени съвпадащи потребители."
 
 #: classes/pref/prefs.php:19
 msgid "Interface"
@@ -1998,7 +1922,7 @@ msgid "Strip all but most common HTML tags when reading articles."
 msgstr "Премахване на HTML кодовете при показване на статиите, освен най-основните."
 
 #: classes/pref/prefs.php:53
-#: js/prefs.js:1424
+#: js/prefs.js:1136
 msgid "Customize stylesheet"
 msgstr "Нагласяване стила на страницата"
 
@@ -2241,255 +2165,298 @@ msgstr "Премахване на избраните профили"
 msgid "Activate profile"
 msgstr "Активиране на профил"
 
-#: classes/feeds.php:53
-msgid "View as RSS feed"
-msgstr "Преглед като RSS хранилка"
+#: 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/feeds.php:62
-#, php-format
-msgid "Last updated: %s"
-msgstr "Последно обновяване: %s"
+#: classes/dlg.php:44
+msgid "Your Public OPML URL is:"
+msgstr "Вашият публичен OPML URL е:"
 
-#: classes/feeds.php:100
+#: classes/dlg.php:53
+#: classes/dlg.php:178
+#: plugins/share/init.php:125
+msgid "Generate new URL"
+msgstr "Генериране на нов URL"
+
+#: classes/dlg.php:67
+msgid "Update daemon is enabled in configuration, but daemon process is not running, which prevents all feeds from updating. Please start the daemon process or contact instance owner."
+msgstr "Обновяващият демон е активиран в конфигурацията, но процесът на демона не е включен, което пречи на всички хранилки да се обновяват. Моля, включете процеса на демона или се свържете със собственика на инсталацията!"
+
+#: classes/dlg.php:71
+#: classes/dlg.php:80
+msgid "Last update:"
+msgstr "Последно обновяване:"
+
+#: classes/dlg.php:76
+msgid "Update daemon is taking too long to perform a feed update. This could indicate a problem like crash or a hang. Please check the daemon process or contact instance owner."
+msgstr "Обновяващият демон изисква твърде много време за обновяване на хранилките. Това може да е знак за проблем като срив или забиване. Моля, проверете процеса на демона или се свържете със собственика на инсталацията!"
+
+#: classes/dlg.php:169
+msgid "You can view this feed as RSS using the following URL:"
+msgstr "Можете да видите тази хранилка като RSS на следния URL:"
+
+#: classes/dlg.php:190
+msgid "You are using default tt-rss password. Please change it in the Preferences (Personal data / Authentication)."
+msgstr ""
+
+#: classes/dlg.php:194
 #, fuzzy
-msgid "Select..."
-msgstr "Избиране"
+msgid "Open Preferences"
+msgstr "Предпочитания"
 
-#: classes/feeds.php:104
-msgid "Invert"
-msgstr "Обръщане"
+#: classes/opml.php:31
+#: classes/opml.php:36
+msgid "OPML Utility"
+msgstr "OPML инструмент"
 
-#: classes/feeds.php:107
-msgid "Selection toggle:"
-msgstr "Превключване на избора:"
+#: classes/opml.php:40
+msgid "Importing OPML..."
+msgstr "Внасяне на OPML..."
 
-#: classes/feeds.php:113
-msgid "Selection:"
-msgstr "Избрани:"
+#: classes/opml.php:45
+msgid "Return to preferences"
+msgstr "Връщане към предпочитания"
 
-#: classes/feeds.php:116
-msgid "Set score"
-msgstr "Задаване на точки"
+#: classes/opml.php:301
+#, php-format
+msgid "Adding feed: %s"
+msgstr "Добавяне на хранилка: %s"
 
-#: classes/feeds.php:119
-msgid "Archive"
-msgstr "Архивиране"
+#: classes/opml.php:312
+#, php-format
+msgid "Duplicate feed: %s"
+msgstr "Дублирана хранилка: %s"
 
-#: classes/feeds.php:121
-msgid "Move back"
+#: classes/opml.php:326
+#, php-format
+msgid "Adding label %s"
+msgstr "Добавяне на етикет \"%s\""
+
+#: classes/opml.php:329
+#, php-format
+msgid "Duplicate label: %s"
+msgstr "Дублиран етикет: %s"
+
+#: classes/opml.php:341
+#, php-format
+msgid "Setting preference key %s to %s"
+msgstr "Задаване на ключ за предпочитания \"%s\" към \"%s\""
+
+#: classes/opml.php:377
+msgid "Adding filter..."
+msgstr "Добавяне на филтър..."
+
+#: classes/opml.php:512
+#, php-format
+msgid "Processing category: %s"
+msgstr "Обработка на категория: %s"
+
+#: classes/opml.php:558
+#, php-format
+msgid "Upload failed with error code %d"
+msgstr "Качването се провали с код за грешка \"%d\""
+
+#: classes/opml.php:570
+#: plugins/import_export/init.php:471
+msgid "Unable to move uploaded file."
+msgstr "Невъзможност за преместване на качения файл."
+
+#: classes/opml.php:574
+#: plugins/import_export/init.php:475
+msgid "Error: please upload OPML file."
+msgstr "Грешка: моля, качете OPML файл!"
+
+#: classes/opml.php:585
+msgid "Error: unable to find moved OPML file."
+msgstr "Грешка: не може да се намери преместеният OPML файл."
+
+#: classes/opml.php:594
+msgid "Error while parsing document."
+msgstr "Грешка при разбора на документа."
+
+#: classes/article.php:26
+msgid "Article not found."
+msgstr "Статията не е намерена."
+
+#: classes/article.php:211
+msgid "Tags for this article (separated by commas):"
+msgstr "Тагове за тази статия (разделени със запетаи):"
+
+#: classes/article.php:337
+#: classes/article.php:719
+#: classes/article.php:874
+msgid "no tags"
+msgstr "няма тагове"
+
+#: classes/article.php:447
+msgid "unknown type"
+msgstr "незнаен вид"
+
+#: classes/article.php:524
+msgid "Attachments"
+msgstr "Прикачени"
+
+#: classes/article.php:688
+msgid " - "
+msgstr " - "
+
+#: classes/article.php:912
+msgid "(edit note)"
+msgstr "(редактиране на бележка)"
+
+#: classes/handler/public.php:407
+#: plugins/bookmarklets/init.php:40
+msgid "Share with Tiny Tiny RSS"
+msgstr "Споделяне с Tiny Tiny RSS"
+
+#: classes/handler/public.php:415
+msgid "Title:"
+msgstr "Заглавие:"
+
+#: classes/handler/public.php:419
+msgid "Content:"
+msgstr "Съдържание:"
+
+#: classes/handler/public.php:421
+msgid "Labels:"
+msgstr "Етикети:"
+
+#: classes/handler/public.php:440
+msgid "Shared article will appear in the Published feed."
+msgstr "Споделените статии ще се появят в \"Публикувани статии\"."
+
+#: classes/handler/public.php:442
+msgid "Share"
+msgstr "Споделяне"
+
+#: classes/handler/public.php:464
+msgid "Not logged in"
+msgstr "Не сте влезли"
+
+#: classes/handler/public.php:527
+msgid "Incorrect username or password"
+msgstr "Грешен потребител или парола"
+
+#: classes/handler/public.php:581
+#, php-format
+msgid "Already subscribed to <b>%s</b>."
+msgstr "Вече сте абонирани за <b>%s</b>."
+
+#: classes/handler/public.php:584
+#, php-format
+msgid "Subscribed to <b>%s</b>."
+msgstr "Абонирани сте за <b>%s</b>."
+
+#: classes/handler/public.php:587
+#, php-format
+msgid "Could not subscribe to <b>%s</b>."
+msgstr "Невъзможно абониране за <b>%s</b>."
+
+#: classes/handler/public.php:590
+#, php-format
+msgid "No feeds found in <b>%s</b>."
+msgstr "Няма намерени хранилки в <b>%s</b>."
+
+#: classes/handler/public.php:593
+msgid "Multiple feed URLs found."
+msgstr "Намерени са множество URL-и на хранилки."
+
+#: classes/handler/public.php:597
+#, 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:615
+msgid "Subscribe to selected feed"
+msgstr "Абониране за избраната хранилка"
+
+#: classes/handler/public.php:642
+msgid "Edit subscription options"
+msgstr "Редактиране на абонаментните опции"
+
+#: classes/handler/public.php:680
+msgid "Password recovery"
+msgstr "Възстановяване на парола"
+
+#: classes/handler/public.php:725
+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:757
+msgid "Some of the required form parameters are missing or incorrect."
+msgstr "Някои от задължителните параметри на формата липсват или са грешни."
+
+#: classes/handler/public.php:761
+#: classes/handler/public.php:830
+msgid "Go back"
 msgstr "Назад"
 
-#: classes/feeds.php:127
-#: classes/feeds.php:132
-#: plugins/mail/init.php:76
-#: plugins/mailto/init.php:25
-msgid "Forward by email"
-msgstr "Препращане по e-mail"
+#: classes/handler/public.php:799
+msgid "[tt-rss] Password reset request"
+msgstr "[tt-rss] Заявка за смяна на парола"
 
-#: classes/feeds.php:136
-msgid "Feed:"
-msgstr "Хранилка:"
+#: classes/handler/public.php:826
+msgid "Sorry, login and email combination not found."
+msgstr "Съжалявам, комбинацията от потребител и e-mail не е намерена."
 
-#: classes/feeds.php:193
-#: classes/feeds.php:819
-msgid "Feed not found."
-msgstr "Хранилката не е намерена."
+#: classes/handler/public.php:848
+msgid "Your access level is insufficient to run this script."
+msgstr "Вашето ниво на достъп е недостатъчно за изпълнението на този скрипт."
 
-#: classes/feeds.php:255
-msgid "Never"
-msgstr "Никога"
+#: classes/handler/public.php:874
+msgid "Database Updater"
+msgstr "Обновяване на базата данни"
 
-#: classes/feeds.php:342
-#, php-format
-msgid "Imported at %s"
-msgstr "Внесено в \"%s\""
+#: classes/handler/public.php:939
+msgid "Perform updates"
+msgstr "Извършване на обновявания"
 
-#: classes/feeds.php:394
-#: classes/feeds.php:487
-msgid "mark feed as read"
-msgstr "отбелязване на хранилката като прочетена"
-
-#: classes/feeds.php:542
-msgid "Collapse article"
-msgstr "Свиване на статия"
-
-#: classes/feeds.php:703
-msgid "No unread articles found to display."
-msgstr "Не са намерени нечетени статии за показване."
-
-#: classes/feeds.php:706
-msgid "No updated articles found to display."
-msgstr "Не са намерени обновени статии за показване."
-
-#: classes/feeds.php:709
-msgid "No starred articles found to display."
-msgstr "Не са намерени статии със звезда за показване."
-
-#: classes/feeds.php:713
-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:715
-msgid "No articles found to display."
-msgstr "Не са намерени статии за показване."
-
-#: classes/feeds.php:731
-#: classes/feeds.php:922
-#, php-format
-msgid "Feeds last updated at %s"
-msgstr "Хранилките са обновени за последно в %s"
-
-#: classes/feeds.php:743
-#: classes/feeds.php:934
-msgid "Some feeds have update errors (click for details)"
-msgstr "Някои хранилки имат грешки при обновяването (клик за детайли)"
-
-#: classes/feeds.php:911
-msgid "No feed selected."
-msgstr "Не е избрана хранилка."
-
-#: classes/feeds.php:975
-#: classes/feeds.php:983
-msgid "Feed or site URL"
-msgstr "URL на хранилка/сайт"
-
-#: classes/feeds.php:997
-msgid "Available feeds"
-msgstr "Налични хранилки"
-
-#: classes/feeds.php:1034
-msgid "More feeds"
-msgstr "Още хранилки"
-
-#: classes/feeds.php:1063
-msgid "Popular feeds"
-msgstr "Популярни хранилки"
-
-#: classes/feeds.php:1064
-msgid "Feed archive"
-msgstr "Архив с хранилки"
-
-#: classes/feeds.php:1067
-msgid "limit:"
-msgstr "лимит"
-
-#: classes/feeds.php:1101
-msgid "Look for"
-msgstr "Търсене за"
-
-#: classes/feeds.php:1109
-#, php-format
-msgid "in %s"
+#: plugins/af_zz_imgproxy/init.php:208
+msgid "Image proxy settings (af_zz_imgproxy)"
 msgstr ""
 
-#: classes/feeds.php:1114
-msgid "Used for word stemming"
-msgstr ""
+#: plugins/af_zz_imgproxy/init.php:232
+#, fuzzy
+msgid "Enable proxy for all remote images."
+msgstr "Активиране на категории за хранилки"
 
-#: classes/feeds.php:1123
-msgid "Search syntax"
-msgstr "Синтаксис на търсенето"
+#: plugins/af_zz_imgproxy/init.php:236
+#, fuzzy
+msgid "Don't cache files locally."
+msgstr "Локално кеширане на изображенията"
 
-#: classes/feeds.php:1577
-msgid "Starred articles"
-msgstr "Статии със звезда"
-
-#: classes/feeds.php:1579
-msgid "Published articles"
-msgstr "Публикувани статии"
-
-#: classes/feeds.php:1581
-msgid "Fresh articles"
-msgstr "Пресни статии"
-
-#: classes/feeds.php:1585
-msgid "Archived articles"
-msgstr "Архивирани статии"
-
-#: classes/feeds.php:1587
-msgid "Recently read"
-msgstr "Наскоро четени"
-
-#: classes/feeds.php:1708
-msgid "Special"
-msgstr "Специални"
-
-#: classes/feeds.php:1965
-#, php-format
-msgid "Search results: %s"
-msgstr "Резултати от търсенето: %s"
-
-#: 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."
+#: plugins/af_zz_imgproxy/init.php:252
+#: plugins/af_redditimgur/init.php:79
+#, fuzzy
+msgid "Configuration saved"
 msgstr "Конфигурацията е запазена."
 
-#: plugins/note/init.php:28
-#: plugins/note/note.js:11
-msgid "Edit article note"
-msgstr "Редактиране бележка на статия"
-
 #: plugins/vf_shared/init.php:17
 #: plugins/vf_shared/init.php:73
 msgid "Shared articles"
 msgstr "Споделени статии"
 
-#: plugins/auth_internal/init.php:67
-msgid "Please enter your one time password:"
-msgstr "Моля, въведете еднократната Ви парола:"
+#: plugins/bookmarklets/init.php:20
+msgid "Bookmarklets"
+msgstr "Отметки"
 
-#: plugins/auth_internal/init.php:208
-msgid "Password has been changed."
-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/auth_internal/init.php:210
-msgid "Old password is incorrect."
-msgstr "Старата парола е грешна."
+#: plugins/bookmarklets/init.php:26
+#, php-format
+msgid "Subscribe to %s in Tiny Tiny RSS?"
+msgstr "Абониране за \"%s\" в Tiny Tiny RSS?"
 
-#: plugins/af_readability/init.php:25
-#, fuzzy
-msgid "Data saved."
-msgstr "Данните са запазени (%s)"
+#: plugins/bookmarklets/init.php:31
+msgid "Subscribe in Tiny Tiny RSS"
+msgstr "Абониране в Tiny Tiny RSS?"
 
-#: plugins/af_readability/init.php:41
-#, fuzzy
-msgid "Inline content"
-msgstr "Редактиране бележка на статия"
-
-#: plugins/af_readability/init.php:47
-msgid "Readability settings (af_readability)"
-msgstr ""
-
-#: plugins/af_readability/init.php:78
-msgid "Use Readability for pages shared via bookmarklet."
-msgstr ""
-
-#: plugins/af_readability/init.php:90
-#: plugins/af_psql_trgm/init.php:198
-msgid "Currently enabled for (click to edit):"
-msgstr "Текущо активирано за (клик за редактиране):"
-
-#: plugins/af_readability/init.php:107
-#, fuzzy
-msgid "Readability"
-msgstr "Проверка за наличност"
-
-#: plugins/af_readability/init.php:118
-#, fuzzy
-msgid "Inline article content"
-msgstr "Редактиране бележка на статия"
+#: plugins/bookmarklets/init.php:34
+msgid "Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS"
+msgstr "Използвайте тази отметка за публикуване на произволни страници чрез Tiny Tiny RSS"
 
 #: plugins/af_redditimgur/init.php:30
 msgid "Reddit content settings (af_redditimgur)"
@@ -2503,11 +2470,21 @@ msgstr ""
 msgid "Enable additional duplicate checking"
 msgstr ""
 
-#: plugins/af_redditimgur/init.php:79
-#: plugins/af_zz_imgproxy/init.php:252
-#, fuzzy
-msgid "Configuration saved"
-msgstr "Конфигурацията е запазена."
+#: plugins/af_comics/init.php:49
+msgid "Feeds supported by af_comics"
+msgstr "Хранилки, поддържани от af_comics"
+
+#: plugins/af_comics/init.php:51
+msgid "The following comics are currently supported:"
+msgstr "Текущо се поддържат следните комикси:"
+
+#: plugins/af_comics/init.php:69
+msgid "To subscribe to GoComics use the comic's regular web page as the feed URL (e.g. for the <em>Garfield</em> comic use <code>http://www.gocomics.com/garfield</code>)."
+msgstr ""
+
+#: plugins/af_comics/init.php:71
+msgid "Drop any updated filters into <code>filters.local</code> in plugin directory."
+msgstr ""
 
 #: plugins/af_psql_trgm/init.php:29
 #, fuzzy, php-format
@@ -2544,26 +2521,88 @@ msgstr "Минимална дължина на заглавие:"
 msgid "Enable for all feeds:"
 msgstr "Активиране на категории за хранилки"
 
+#: plugins/af_psql_trgm/init.php:198
+#: plugins/af_readability/init.php:90
+msgid "Currently enabled for (click to edit):"
+msgstr "Текущо активирано за (клик за редактиране):"
+
 #: plugins/af_psql_trgm/init.php:216
 msgid "Similarity (pg_trgm)"
 msgstr "Подобност (pg_trgm)"
 
-#: plugins/af_comics/init.php:49
-msgid "Feeds supported by af_comics"
-msgstr "Хранилки, поддържани от af_comics"
+#: plugins/af_readability/init.php:25
+#, fuzzy
+msgid "Data saved."
+msgstr "Данните са запазени (%s)"
 
-#: plugins/af_comics/init.php:51
-msgid "The following comics are currently supported:"
-msgstr "Текущо се поддържат следните комикси:"
+#: plugins/af_readability/init.php:41
+#, fuzzy
+msgid "Inline content"
+msgstr "Редактиране бележка на статия"
 
-#: plugins/af_comics/init.php:69
-msgid "To subscribe to GoComics use the comic's regular web page as the feed URL (e.g. for the <em>Garfield</em> comic use <code>http://www.gocomics.com/garfield</code>)."
+#: plugins/af_readability/init.php:47
+msgid "Readability settings (af_readability)"
 msgstr ""
 
-#: plugins/af_comics/init.php:71
-msgid "Drop any updated filters into <code>filters.local</code> in plugin directory."
+#: plugins/af_readability/init.php:78
+msgid "Use Readability for pages shared via bookmarklet."
 msgstr ""
 
+#: plugins/af_readability/init.php:107
+#, fuzzy
+msgid "Readability"
+msgstr "Проверка за наличност"
+
+#: plugins/af_readability/init.php:118
+#, fuzzy
+msgid "Inline article content"
+msgstr "Редактиране бележка на статия"
+
+#: plugins/mailto/init.php:50
+#: plugins/mailto/init.php:58
+#: plugins/mail/init.php:118
+#: plugins/mail/init.php:124
+msgid "[Forwarded]"
+msgstr "[Препратено]"
+
+#: plugins/mailto/init.php:50
+#: plugins/mail/init.php:118
+msgid "Multiple articles"
+msgstr "Множество статии"
+
+#: plugins/mailto/init.php:74
+msgid "Clicking the following link to invoke your mail client:"
+msgstr "Изберете следния линк, за да извикате пощенския Ви клиент:"
+
+#: plugins/mailto/init.php:78
+msgid "Forward selected article(s) by email."
+msgstr "Препращане на избраните статии по e-mail."
+
+#: plugins/mailto/init.php:81
+msgid "You should be able to edit the message before sending in your mail client."
+msgstr "Ще имате възможност да редактирате съобщението преди изпращане в пощенския Ви клиент."
+
+#: plugins/mailto/init.php:86
+msgid "Close this dialog"
+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/import_export/init.php:53
 msgid "Import and export"
 msgstr "Внасяне и изнасяне"
@@ -2630,101 +2669,6 @@ msgstr "Качването се провали с код за грешка \"%d\
 msgid "No file uploaded."
 msgstr "Няма качени файлове."
 
-#: plugins/mail/init.php:29
-msgid "Mail addresses saved."
-msgstr "Пощенските адреси са запазени."
-
-#: plugins/mail/init.php:35
-msgid "Mail plugin"
-msgstr "Добавка за поща"
-
-#: plugins/mail/init.php:37
-msgid "You can set predefined email addressed here (comma-separated list):"
-msgstr "Тук можете да зададете предефинирани e-mail адреси (разделени със запетаи):"
-
-#: plugins/mail/init.php:118
-#: plugins/mail/init.php:124
-#: plugins/mailto/init.php:50
-#: plugins/mailto/init.php:58
-msgid "[Forwarded]"
-msgstr "[Препратено]"
-
-#: plugins/mail/init.php:118
-#: plugins/mailto/init.php:50
-msgid "Multiple articles"
-msgstr "Множество статии"
-
-#: plugins/mail/init.php:146
-msgid "To:"
-msgstr "До:"
-
-#: plugins/mail/init.php:161
-msgid "Subject:"
-msgstr "Заглавие:"
-
-#: plugins/mail/init.php:178
-msgid "Send e-mail"
-msgstr "Изпращане на e-mail"
-
-#: plugins/close_button/init.php:25
-msgid "Close article"
-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 "Абониране за \"%s\" в Tiny Tiny RSS?"
-
-#: 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 "Използвайте тази отметка за публикуване на произволни страници чрез Tiny Tiny RSS"
-
-#: plugins/toggle_sidebar/init.php:23
-msgid "Collapse feedlist"
-msgstr "Свиване на списъка с хранилки"
-
-#: plugins/af_zz_imgproxy/init.php:208
-msgid "Image proxy settings (af_zz_imgproxy)"
-msgstr ""
-
-#: plugins/af_zz_imgproxy/init.php:232
-#, fuzzy
-msgid "Enable proxy for all remote images."
-msgstr "Активиране на категории за хранилки"
-
-#: plugins/af_zz_imgproxy/init.php:236
-#, fuzzy
-msgid "Don't cache files locally."
-msgstr "Локално кеширане на изображенията"
-
-#: plugins/mailto/init.php:74
-msgid "Clicking the following link to invoke your mail client:"
-msgstr "Изберете следния линк, за да извикате пощенския Ви клиент:"
-
-#: plugins/mailto/init.php:78
-msgid "Forward selected article(s) by email."
-msgstr "Препращане на избраните статии по e-mail."
-
-#: plugins/mailto/init.php:81
-msgid "You should be able to edit the message before sending in your mail client."
-msgstr "Ще имате възможност да редактирате съобщението преди изпращане в пощенския Ви клиент."
-
-#: plugins/mailto/init.php:86
-msgid "Close this dialog"
-msgstr "Затваряне на този диалог"
-
 #: plugins/share/init.php:41
 msgid "You can disable all articles shared by unique URLs here."
 msgstr "Тук можете да деактивирате всички статии, споделени чрез уникални URL-и."
@@ -2745,450 +2689,599 @@ msgstr "Можете да споделите тази статия чрез сл
 msgid "Unshare article"
 msgstr "Премахване на споделянето на статия"
 
-#: js/FeedTree.js:75
+#: plugins/toggle_sidebar/init.php:23
+msgid "Collapse feedlist"
+msgstr "Свиване на списъка с хранилки"
+
+#: plugins/close_button/init.php:25
+msgid "Close article"
+msgstr "Затваряне на статия"
+
+#: plugins/mail/init.php:29
+msgid "Mail addresses saved."
+msgstr "Пощенските адреси са запазени."
+
+#: plugins/mail/init.php:35
+msgid "Mail plugin"
+msgstr "Добавка за поща"
+
+#: plugins/mail/init.php:37
+msgid "You can set predefined email addressed here (comma-separated list):"
+msgstr "Тук можете да зададете предефинирани e-mail адреси (разделени със запетаи):"
+
+#: plugins/mail/init.php:146
+msgid "To:"
+msgstr "До:"
+
+#: plugins/mail/init.php:161
+msgid "Subject:"
+msgstr "Заглавие:"
+
+#: plugins/mail/init.php:178
+msgid "Send e-mail"
+msgstr "Изпращане на e-mail"
+
+#: plugins/note/init.php:28
+#: plugins/note/note.js:11
+msgid "Edit article note"
+msgstr "Редактиране бележка на статия"
+
+#: plugins/auth_internal/init.php:67
+msgid "Please enter your one time password:"
+msgstr "Моля, въведете еднократната Ви парола:"
+
+#: plugins/auth_internal/init.php:208
+msgid "Password has been changed."
+msgstr "Паролата е сменена."
+
+#: plugins/auth_internal/init.php:210
+msgid "Old password is incorrect."
+msgstr "Старата парола е грешна."
+
+#: js/FeedTree.js:76
 #, fuzzy
 msgid "(Un)collapse"
 msgstr "Прибиране/изваждане на страничния панел"
 
-#: js/PrefFeedTree.js:35
+#: js/PrefFeedTree.js:36
 msgid "Edit category"
 msgstr "Редактиране на категория"
 
-#: js/PrefFeedTree.js:42
+#: js/PrefFeedTree.js:43
 msgid "Remove category"
 msgstr "Премахване на категория"
 
-#: js/PrefFilterTree.js:46
+#: js/PrefFilterTree.js:47
 msgid "Inverse"
 msgstr "Обръщане"
 
-#: js/feedlist.js:511
+#: js/feedlist.js:461
 #, fuzzy
 msgid "Mark %w in %s older than 1 day as read?"
 msgstr "Отбелязване на всички статии в \"%s\", по-стари от 1 ден, като прочетени?"
 
-#: js/feedlist.js:514
+#: js/feedlist.js:464
 #, fuzzy
 msgid "Mark %w in %s older than 1 week as read?"
 msgstr "Отбелязване на всички статии в \"%s\", по-стари от 1 седмица, като прочетени?"
 
-#: js/feedlist.js:517
+#: js/feedlist.js:467
 #, fuzzy
 msgid "Mark %w in %s older than 2 weeks as read?"
 msgstr "Отбелязване на всички статии в \"%s\", по-стари от 2 седмици, като прочетени?"
 
-#: js/feedlist.js:520
+#: js/feedlist.js:470
 #, fuzzy
 msgid "Mark %w in %s as read?"
 msgstr "Отбелязване на всички статии в \"%s\" като прочетени?"
 
-#: js/feedlist.js:523
+#: js/feedlist.js:473
 #, fuzzy
 msgid "search results"
 msgstr "Резултати от търсенето: %s"
 
-#: js/feedlist.js:523
+#: js/feedlist.js:473
 #, fuzzy
 msgid "all articles"
 msgstr "Всички статии"
 
-#: js/functions.js:74
+#: js/functions.js:100
 msgid "Close"
 msgstr "Затваряне"
 
-#: js/functions.js:141
+#: js/functions.js:167
 msgid "Click to close"
 msgstr "Затваряне"
 
-#: js/functions.js:448
+#: js/functions.js:456
 msgid "Error explained"
 msgstr "Обяснение на грешка"
 
-#: js/functions.js:592
+#: js/functions.js:490
+msgid "Upload complete."
+msgstr "Качването приключи."
+
+#: js/functions.js:508
+msgid "Remove stored feed icon?"
+msgstr "Премахване на съхранената икона на хранилка?"
+
+#: js/functions.js:510
+msgid "Removing feed icon..."
+msgstr "Премахване икона на хранилка..."
+
+#: js/functions.js:515
+msgid "Feed icon removed."
+msgstr "Иконата на хранилката е премахната."
+
+#: js/functions.js:532
+msgid "Please select an image file to upload."
+msgstr "Моля, изберете файл с изображение за качване!"
+
+#: js/functions.js:533
+msgid "Upload new icon for this feed?"
+msgstr "Качване на нова икона за тази хранилка?"
+
+#: js/functions.js:534
+msgid "Uploading, please wait..."
+msgstr "Качване. Моля, изчакайте..."
+
+#: js/functions.js:542
+msgid "Please enter label caption:"
+msgstr "Моля, въведете надпис на етикет:"
+
+#: js/functions.js:575
 msgid "Subscribe to Feed"
 msgstr "Абониране за хранилка"
 
-#: js/functions.js:621
+#: js/functions.js:602
 msgid "Failed to parse output. This can indicate server timeout and/or network issues. Backend output was logged to browser console."
 msgstr "Разборът на изхода се провали. Това може да е знак за просрочено време на сървъра и/или мрежови проблеми. Бекенд изходът е запазен в конзолата на браузъра."
 
-#: js/functions.js:636
+#: js/functions.js:617
 #, perl-format
 msgid "Subscribed to %s"
 msgstr "Абониране за \"%s\""
 
-#: js/functions.js:641
+#: js/functions.js:622
 msgid "Specified URL seems to be invalid."
 msgstr "Указаният URL изглежда невалиден."
 
-#: js/functions.js:644
+#: js/functions.js:625
 msgid "Specified URL doesn't seem to contain any feeds."
 msgstr "Указаният URL не изглежда да съдържа хранилки."
 
-#: js/functions.js:656
+#: js/functions.js:637
 msgid "Expand to select feed"
 msgstr "Разгъване за избор на хранилка"
 
-#: js/functions.js:668
+#: js/functions.js:649
 #, perl-format
 msgid "Couldn't download the specified URL: %s"
 msgstr "Не може да се изтегли указаният URL: %s"
 
-#: js/functions.js:672
+#: js/functions.js:653
 #, perl-format
 msgid "XML validation failed: %s"
 msgstr "XML проверката се провали: %s"
 
-#: js/functions.js:676
+#: js/functions.js:657
 msgid "You are already subscribed to this feed."
 msgstr "Вече сте абонирани за тази хранилка."
 
-#: js/functions.js:1136
+#: js/functions.js:1098
 msgid "Generate new syndication address for this feed?"
 msgstr "Генериране на нов синдикиращ адрес за тази хранилка?"
 
-#: js/functions.js:1140
-#: js/prefs.js:1095
+#: js/functions.js:1100
+#: js/prefs.js:870
 msgid "Trying to change address..."
 msgstr "Опит за смяна на адрес..."
 
-#: js/functions.js:1245
-#: js/tt-rss.js:446
-#: js/tt-rss.js:673
+#: js/functions.js:1199
+#: js/tt-rss.js:399
+#: js/tt-rss.js:612
 msgid "You can't edit this kind of feed."
 msgstr "Не можете да редактирате този вид хранилка."
 
-#: js/functions.js:1260
+#: js/functions.js:1213
 msgid "Edit Feed"
 msgstr "Редактиране на хранилка"
 
-#: js/functions.js:1266
-#: js/prefs.js:100
-#: js/prefs.js:209
-#: js/prefs.js:647
+#: js/functions.js:1217
+#: js/prefs.js:176
+#: js/prefs.js:523
+#: js/prefs.js:1139
+#: js/prefs.js:78
 msgid "Saving data..."
 msgstr "Запазване на данни..."
 
-#: js/functions.js:1293
+#: js/functions.js:1243
 msgid "More Feeds"
 msgstr "Още хранилки"
 
-#: js/functions.js:1355
-#: js/functions.js:1464
-#: js/prefs.js:398
-#: js/prefs.js:540
-#: js/prefs.js:558
-#: js/prefs.js:1077
+#: js/functions.js:1297
+#: js/functions.js:1383
+#: js/prefs.js:332
+#: js/prefs.js:455
+#: js/prefs.js:473
+#: js/prefs.js:855
 msgid "No feeds are selected."
 msgstr "Не са избрани хранилки."
 
-#: js/functions.js:1398
+#: js/functions.js:1329
 msgid "Remove selected feeds from the archive? Feeds with stored articles will not be removed."
 msgstr "Премахване на избраните хранилки от архива? Хранилките със съхранени статии няма да бъдат премахнати."
 
-#: js/functions.js:1435
+#: js/functions.js:1360
 msgid "Feeds with update errors"
 msgstr "Хранилки с грешки при обновяване"
 
-#: js/functions.js:1446
-#: js/prefs.js:1058
+#: js/functions.js:1369
+#: js/prefs.js:841
 msgid "Remove selected feeds?"
 msgstr "Премахване на избраните хранилки?"
 
-#: js/functions.js:1449
-#: js/prefs.js:1061
+#: js/functions.js:1370
+#: js/prefs.js:842
 msgid "Removing selected feeds..."
 msgstr "Премахване на избраните хранилки..."
 
-#: js/prefs.js:60
-msgid "Please enter login:"
-msgstr "Моля, въведете потребител:"
-
-#: js/prefs.js:67
-msgid "Can't create user: no login specified."
-msgstr "Не може да се създаде потребител: не е указано име."
-
-#: js/prefs.js:71
-msgid "Adding user..."
-msgstr "Добавяне на потребител..."
-
-#: js/prefs.js:96
-msgid "User Editor"
-msgstr "Редактор на потребител"
-
-#: js/prefs.js:131
-msgid "Edit Filter"
-msgstr "Редактиране на филтър"
-
-#: js/prefs.js:170
+#: js/prefs.js:143
 msgid "Remove filter?"
 msgstr "Премахване на филтър?"
 
-#: js/prefs.js:175
+#: js/prefs.js:148
 msgid "Removing filter..."
 msgstr "Премахване на филтър..."
 
-#: js/prefs.js:292
+#: js/prefs.js:251
 msgid "Remove selected labels?"
 msgstr "Премахване на избраните етикети?"
 
-#: js/prefs.js:295
+#: js/prefs.js:252
 msgid "Removing selected labels..."
 msgstr "Премахване на избраните етикети..."
 
-#: js/prefs.js:308
-#: js/prefs.js:1144
+#: js/prefs.js:262
+#: js/prefs.js:909
 msgid "No labels are selected."
 msgstr "Не са избрани етикети."
 
-#: js/prefs.js:320
+#: js/prefs.js:274
 msgid "Remove selected users? Neither default admin nor your account will be removed."
 msgstr "Премахване на избраните потребители? Администраторът по подразбиране и Вашият акаунт няма да бъдат премахнати."
 
-#: js/prefs.js:323
+#: js/prefs.js:275
 msgid "Removing selected users..."
 msgstr "Премахване на избраните потребители..."
 
-#: js/prefs.js:338
-#: js/prefs.js:408
-#: js/prefs.js:427
-#: js/prefs.js:461
+#: js/prefs.js:286
+#: js/prefs.js:342
+#: js/prefs.js:361
+#: js/prefs.js:387
 msgid "No users are selected."
 msgstr "Не са избрани потребители."
 
-#: js/prefs.js:350
+#: js/prefs.js:297
 msgid "Remove selected filters?"
 msgstr "Премахване на избраните филтри?"
 
-#: js/prefs.js:353
+#: js/prefs.js:298
 msgid "Removing selected filters..."
 msgstr "Премахване на избраните филтри..."
 
-#: js/prefs.js:366
-#: js/prefs.js:495
-#: js/prefs.js:514
+#: js/prefs.js:308
+#: js/prefs.js:419
+#: js/prefs.js:438
 msgid "No filters are selected."
 msgstr "Не са избрани филтри."
 
-#: js/prefs.js:378
+#: js/prefs.js:319
 msgid "Unsubscribe from selected feeds?"
 msgstr "Отписване от избраните хранилки?"
 
-#: js/prefs.js:382
+#: js/prefs.js:321
 msgid "Unsubscribing from selected feeds..."
 msgstr "Отписване от избраните хранилки..."
 
-#: js/prefs.js:413
-#: js/prefs.js:432
-#: js/prefs.js:466
+#: js/prefs.js:347
+#: js/prefs.js:366
+#: js/prefs.js:392
 msgid "Please select only one user."
 msgstr "Моля, изберете само един потребител!"
 
-#: js/prefs.js:436
+#: js/prefs.js:370
 msgid "Reset password of selected user?"
 msgstr "Смяна паролата на избрания потребител?"
 
-#: js/prefs.js:439
+#: js/prefs.js:371
 msgid "Resetting password for selected user..."
 msgstr "Смяна паролата на избрания потребител..."
 
-#: js/prefs.js:500
+#: js/prefs.js:424
 msgid "Please select only one filter."
 msgstr "Моля, изберете само един филтър!"
 
-#: js/prefs.js:518
+#: js/prefs.js:442
 msgid "Combine selected filters?"
 msgstr "Комбиниране на избраните филтри?"
 
-#: js/prefs.js:521
+#: js/prefs.js:443
 msgid "Joining filters..."
 msgstr "Съединяване на филтри..."
 
-#: js/prefs.js:580
+#: js/prefs.js:487
 msgid "Edit Multiple Feeds"
 msgstr "Редактиране на множество хранилки"
 
-#: js/prefs.js:604
+#: js/prefs.js:511
 msgid "Save changes to selected feeds?"
 msgstr "Запазване на промените в избраните хранилки?"
 
-#: js/prefs.js:681
+#: js/prefs.js:552
 msgid "OPML Import"
 msgstr "Внасяне на OPML"
 
-#: js/prefs.js:700
+#: js/prefs.js:571
 msgid "Please choose an OPML file first."
 msgstr "Моля, първо изберете OPML файл!"
 
-#: js/prefs.js:703
+#: js/prefs.js:574
 #: plugins/import_export/import_export.js:115
 msgid "Importing, please wait..."
 msgstr "Внасяне. Моля, изчакайте..."
 
-#: js/prefs.js:869
+#: js/prefs.js:737
 msgid "Reset to defaults?"
 msgstr "Връщане по подразбиране?"
 
-#: js/prefs.js:1468
-msgid "Subscribing to feeds..."
-msgstr "Абониране за хранилки..."
+#: js/prefs.js:777
+#, perl-format
+msgid "Remove category %s? Any nested feeds would be placed into Uncategorized."
+msgstr "Премахване на категория \"%s\"? Всички хранилки в нея ще бъдат сложени в \"Без категория\"."
 
-#: js/prefs.js:1487
-msgid "Clear stored data for this plugin?"
-msgstr "Изчистване на съхранените данни за тази добавка?"
+#: js/prefs.js:778
+msgid "Removing category..."
+msgstr "Премахване на категория..."
 
-#: js/prefs.js:1501
-msgid "Clear all messages in the error log?"
-msgstr "Изчистване на всички съобщения от журнала с грешки?"
+#: js/prefs.js:794
+msgid "Remove selected categories?"
+msgstr "Премахване на избраните категории?"
 
-#: js/tt-rss.js:118
+#: js/prefs.js:795
+msgid "Removing selected categories..."
+msgstr "Премахване на избраните категории..."
+
+#: js/prefs.js:805
+msgid "No categories are selected."
+msgstr "Не са избрани категории."
+
+#: js/prefs.js:812
+msgid "Category title:"
+msgstr "Име на категория:"
+
+#: js/prefs.js:815
+msgid "Creating category..."
+msgstr "Създаване на категория..."
+
+#: js/prefs.js:832
+msgid "Feeds without recent updates"
+msgstr "Хранилки без скорошни обновления"
+
+#: js/prefs.js:869
+msgid "Replace current OPML publishing address with a new one?"
+msgstr "Замяна на текущо публикувания OPML адрес с нов?"
+
+#: js/prefs.js:898
+msgid "Reset selected labels to default colors?"
+msgstr "Връщане на избраните етикети към цветове по подразбиране?"
+
+#: js/prefs.js:926
+msgid "Settings Profiles"
+msgstr "Настройки на профили"
+
+#: js/prefs.js:935
+msgid "Remove selected profiles? Active and default profiles will not be removed."
+msgstr "Премахване на избраните профили? Активните и подразбиращи профили няма да бъдат премахнати."
+
+#: js/prefs.js:936
+msgid "Removing selected profiles..."
+msgstr "Премахване на избраните профили..."
+
+#: js/prefs.js:948
+msgid "No profiles are selected."
+msgstr "Не са избрани профили."
+
+#: js/prefs.js:955
+#: js/prefs.js:997
+msgid "Activate selected profile?"
+msgstr "Активиране на избрания профил?"
+
+#: js/prefs.js:964
+#: js/prefs.js:1008
+msgid "Please choose a profile to activate."
+msgstr "Моля, изберете профил за активиране!"
+
+#: js/prefs.js:969
+msgid "Creating profile..."
+msgstr "Създаване на профил..."
+
+#: js/prefs.js:1016
+msgid "This will invalidate all previously generated feed URLs. Continue?"
+msgstr "Това ще отвалидира всички предходно генерирани URL-и за хранилката. Продължаване?"
+
+#: js/prefs.js:1017
+#: plugins/share/share_prefs.js:3
+msgid "Clearing URLs..."
+msgstr "Изчистване на URL-и..."
+
+#: js/prefs.js:1020
+msgid "Generated URLs cleared."
+msgstr "Генерираните URL-и са изчистени."
+
+#: js/prefs.js:1053
+#, fuzzy
+msgid "Rename category to:"
+msgstr "Премахване на категория"
+
+#: js/prefs.js:1074
+msgid "Label Editor"
+msgstr "Редактор на етикети"
+
+#: js/tt-rss.js:111
 msgid "Mark all articles as read?"
 msgstr "Отбелязване на всички статии като прочетени?"
 
-#: js/tt-rss.js:124
+#: js/tt-rss.js:115
 msgid "Marking all feeds as read..."
 msgstr "Отбелязване на всички хранилки като прочетени..."
 
-#: js/tt-rss.js:398
+#: js/tt-rss.js:351
 msgid "Please enable mail plugin first."
 msgstr "Моля, първо активирайте добавката \"mail\"!"
 
-#: js/tt-rss.js:527
+#: js/tt-rss.js:477
 msgid "Please enable embed_original plugin first."
 msgstr "Моля, първо активирайте добавката \"embed_original\"!"
 
-#: js/tt-rss.js:540
-#: js/tt-rss.js:723
+#: js/tt-rss.js:490
+#: js/tt-rss.js:653
 msgid "Widescreen is not available in combined mode."
 msgstr "Няма широк екран в комбиниран режим."
 
-#: js/tt-rss.js:821
-msgid "You can't rescore this kind of feed."
-msgstr "Не можете да преточкувате този тип хранилка."
-
-#: js/tt-rss.js:826
-#: js/tt-rss.js:686
-msgid "Please select some feed first."
-msgstr "Моля, първо изберете някоя хранилка!"
-
-#: js/tt-rss.js:831
-#, perl-format
-msgid "Rescore articles in %s?"
-msgstr "Преточкуване на статиите в \"%s\"?"
-
-#: js/tt-rss.js:834
-msgid "Rescoring articles..."
-msgstr "Преточкуване на статии..."
-
-#: js/viewfeed.js:917
-#: js/viewfeed.js:955
-#: js/viewfeed.js:1003
-#: js/viewfeed.js:1924
-#: plugins/mail/mail.js:7
+#: js/viewfeed.js:444
+#: js/viewfeed.js:461
+#: js/viewfeed.js:484
+#: js/viewfeed.js:521
+#: js/viewfeed.js:542
+#: js/viewfeed.js:651
+#: js/viewfeed.js:685
+#: js/viewfeed.js:727
+#: js/viewfeed.js:1564
 #: plugins/mailto/init.js:7
-#: js/viewfeed.js:675
-#: js/viewfeed.js:697
-#: js/viewfeed.js:718
-#: js/viewfeed.js:777
-#: js/viewfeed.js:805
+#: plugins/mail/mail.js:7
 msgid "No articles are selected."
 msgstr "Не са избрани статии."
 
-#: js/viewfeed.js:925
+#: js/viewfeed.js:659
 #, 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:927
+#: js/viewfeed.js:661
 #, perl-format
 msgid "Delete %d selected article?"
 msgid_plural "Delete %d selected articles?"
 msgstr[0] "Изтриване на %d избрана статия?"
 msgstr[1] "Изтриване на %d избрани статии?"
 
-#: js/viewfeed.js:964
+#: js/viewfeed.js:694
 #, 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:967
+#: js/viewfeed.js:697
 #, perl-format
 msgid "Move %d archived article back?"
 msgid_plural "Move %d archived articles back?"
 msgstr[0] "Връщане на %d архивирана статия?"
 msgstr[1] "Връщане на %d архивирани статии?"
 
-#: js/viewfeed.js:969
+#: js/viewfeed.js:698
 msgid "Please note that unstarred articles might get purged on next feed update."
 msgstr "Моля имайте предвид, че статиите без звезда може да бъдат изтрити при следващото обновяване на хранилката."
 
-#: js/viewfeed.js:1009
+#: js/viewfeed.js:733
 #, 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:1029
+#: js/viewfeed.js:753
 msgid "Edit article Tags"
 msgstr "Редактиране таговете на статия"
 
-#: js/viewfeed.js:1035
+#: js/viewfeed.js:757
 msgid "Saving article tags..."
 msgstr "Запазване таговете на статия..."
 
-#: js/viewfeed.js:1666
+#: js/viewfeed.js:1015
+msgid "No article is selected."
+msgstr "Не е избрана статия."
+
+#: js/viewfeed.js:1050
+msgid "No articles found to mark"
+msgstr "Не са намерени статии за отбелязване"
+
+#: js/viewfeed.js:1052
+#, perl-format
+msgid "Mark %d article as read?"
+msgid_plural "Mark %d articles as read?"
+msgstr[0] "Отбелязване на %d статия като прочетена?"
+msgstr[1] "Отбелязване на %d статии като прочетени?"
+
+#: js/viewfeed.js:1312
 msgid "Open original article"
 msgstr "Отваряне на оригиналната статия"
 
-#: js/viewfeed.js:1673
+#: js/viewfeed.js:1319
 msgid "Display article URL"
 msgstr "Показване URL-а на статията"
 
-#: js/viewfeed.js:1780
+#: js/viewfeed.js:1426
 msgid "Assign label"
 msgstr "Присвояване на етикет"
 
-#: js/viewfeed.js:1785
+#: js/viewfeed.js:1431
 msgid "Remove label"
 msgstr "Премахване на етикет"
 
-#: js/viewfeed.js:1817
+#: js/viewfeed.js:1463
 msgid "Select articles in group"
 msgstr "Избиране на статии в група"
 
-#: js/viewfeed.js:1827
+#: js/viewfeed.js:1473
 msgid "Mark group as read"
 msgstr "Отбелязване на групата като прочетена"
 
-#: js/viewfeed.js:1839
+#: js/viewfeed.js:1485
 msgid "Mark feed as read"
 msgstr "Отбелязване на хранилката като прочетена"
 
-#: js/viewfeed.js:1892
+#: js/viewfeed.js:1538
 msgid "Please enter new score for selected articles:"
 msgstr "Моля, въведете нови точки за избраната статия:"
 
-#: js/viewfeed.js:1955
+#: js/viewfeed.js:1571
 msgid "Please enter new score for this article:"
 msgstr "Моля, въведете нови точки за тази статия:"
 
-#: js/viewfeed.js:1986
+#: js/viewfeed.js:1591
 msgid "Article URL:"
 msgstr "URL на статията:"
 
-#: plugins/note/note.js:17
-msgid "Saving article note..."
-msgstr "Запазване бележка на статия..."
+#: plugins/embed_original/init.js:6
+msgid "Sorry, your browser does not support sandboxed iframes."
+msgstr "Съжалявам, браузърът Ви не поддържа тестови iframe-ове."
 
 #: plugins/af_psql_trgm/init.js:11
 msgid "Related articles"
 msgstr "Свързани статии"
 
+#: plugins/mailto/init.js:21
+#: plugins/mail/mail.js:21
+msgid "Forward article by email"
+msgstr "Препращане на статия по e-mail"
+
+#: plugins/shorten_expanded/init.js:43
+msgid "Click to expand article"
+msgstr "Клик за разпъване на статия"
+
 #: plugins/import_export/import_export.js:13
 msgid "Export Data"
 msgstr "Изнасяне на данни"
@@ -3208,259 +3301,170 @@ msgstr "Внасяне на данни"
 msgid "Please choose the file first."
 msgstr "Моля, първо изберете файл!"
 
-#: plugins/mail/mail.js:21
-#: plugins/mailto/init.js:21
-msgid "Forward article by email"
-msgstr "Препращане на статия по e-mail"
+#: plugins/share/share_prefs.js:2
+msgid "This will invalidate all previously shared article URLs. Continue?"
+msgstr "Това ще отвалидира всички предходно споделени URL-и на статията. Продължаване?"
 
-#: plugins/mail/mail.js:36
-msgid "Error sending email:"
-msgstr "Грешка при изпращане на e-mail:"
-
-#: plugins/mail/mail.js:38
-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:45
-msgid "Click to expand article"
-msgstr "Клик за разпъване на статия"
+#: plugins/share/share_prefs.js:8
+msgid "Shared URLs cleared."
+msgstr "Споделените URL-и са изчистени."
 
 #: plugins/share/share.js:10
 msgid "Share article by URL"
 msgstr "Споделяне на статия чрез URL"
 
-#: plugins/share/share.js:14
+#: plugins/share/share.js:13
 msgid "Generate new share URL for this article?"
 msgstr "Генериране на нов споделен URL за тази статия?"
 
-#: plugins/share/share.js:18
+#: plugins/share/share.js:15
 msgid "Trying to change URL..."
 msgstr "Опит за смяна на URL..."
 
-#: plugins/share/share.js:55
+#: plugins/share/share.js:48
 msgid "Remove sharing for this article?"
 msgstr "Премахване споделянето на тази статия?"
 
-#: plugins/share/share.js:59
+#: plugins/share/share.js:50
 msgid "Trying to unshare..."
 msgstr "Опит за премахване на споделянето..."
 
-#: plugins/share/share_prefs.js:3
-msgid "This will invalidate all previously shared article URLs. Continue?"
-msgstr "Това ще отвалидира всички предходно споделени URL-и на статията. Продължаване?"
+#: plugins/mail/mail.js:30
+msgid "Error sending email:"
+msgstr "Грешка при изпращане на e-mail:"
 
-#: plugins/share/share_prefs.js:6
-#: js/prefs.js:1277
-msgid "Clearing URLs..."
-msgstr "Изчистване на URL-и..."
+#: plugins/mail/mail.js:32
+msgid "Your message has been sent."
+msgstr "Съобщението Ви е изпратено."
 
-#: plugins/share/share_prefs.js:13
-msgid "Shared URLs cleared."
-msgstr "Споделените URL-и са изчистени."
+#: plugins/note/note.js:15
+msgid "Saving article note..."
+msgstr "Запазване бележка на статия..."
 
-#: js/feedlist.js:204
+#: js/feedlist.js:168
 #, fuzzy
 msgid "Your password is at default value"
 msgstr "Паролата Ви е със стойност по подразбиране. Моля, сменете я!"
 
-#: js/feedlist.js:453
+#: js/feedlist.js:413
 msgid "Mark all articles in %s as read?"
 msgstr "Отбелязване на всички статии в \"%s\" като прочетени?"
 
-#: js/functions.js:494
-msgid "Upload complete."
-msgstr "Качването приключи."
-
-#: js/functions.js:511
-msgid "Remove stored feed icon?"
-msgstr "Премахване на съхранената икона на хранилка?"
-
-#: js/functions.js:516
-msgid "Removing feed icon..."
-msgstr "Премахване икона на хранилка..."
-
-#: js/functions.js:521
-msgid "Feed icon removed."
-msgstr "Иконата на хранилката е премахната."
-
-#: js/functions.js:537
-msgid "Please select an image file to upload."
-msgstr "Моля, изберете файл с изображение за качване!"
-
-#: js/functions.js:539
-msgid "Upload new icon for this feed?"
-msgstr "Качване на нова икона за тази хранилка?"
-
-#: js/functions.js:540
-msgid "Uploading, please wait..."
-msgstr "Качване. Моля, изчакайте..."
-
-#: js/functions.js:550
-msgid "Please enter label caption:"
-msgstr "Моля, въведете надпис на етикет:"
-
-#: js/functions.js:555
-msgid "Can't create label: missing caption."
-msgstr "Не може да се създаде етикет: липсва надпис."
-
-#: js/functions.js:797
+#: js/functions.js:764
 msgid "Edit rule"
 msgstr "Редактиране на правило"
 
-#: js/functions.js:819
+#: js/functions.js:786
 msgid "Edit action"
 msgstr "Редактиране на действие"
 
-#: js/functions.js:860
+#: js/functions.js:825
 msgid "Looking for articles (%d processed, %f found)..."
 msgstr ""
 
-#: js/functions.js:890
+#: js/functions.js:855
 #, fuzzy
 msgid "Found %d articles matching this filter:"
 msgstr "Статии, съвпадащи с този филтър:"
 
-#: js/functions.js:942
+#: js/functions.js:907
 msgid "Create Filter"
 msgstr "Създаване на филтър"
 
-#: js/functions.js:1060
-#: js/tt-rss.js:692
+#: js/functions.js:1016
+#: js/tt-rss.js:631
 msgid "Unsubscribe from %s?"
 msgstr "Отписване от \"%s\"?"
 
-#: js/functions.js:1063
+#: js/functions.js:1019
 msgid "Removing feed..."
 msgstr "Премахване на хранилка..."
 
-#: js/functions.js:1489
+#: js/functions.js:1410
 msgid "Help"
 msgstr "Помощ"
 
-#: js/prefs.js:973
-msgid "Remove category %s? Any nested feeds would be placed into Uncategorized."
-msgstr "Премахване на категория \"%s\"? Всички хранилки в нея ще бъдат сложени в \"Без категория\"."
+#: js/prefs.js:44
+msgid "Please enter login:"
+msgstr "Моля, въведете потребител:"
 
-#: js/prefs.js:979
-msgid "Removing category..."
-msgstr "Премахване на категория..."
+#: js/prefs.js:51
+msgid "Can't create user: no login specified."
+msgstr "Не може да се създаде потребител: не е указано име."
 
-#: js/prefs.js:997
-msgid "Remove selected categories?"
-msgstr "Премахване на избраните категории?"
+#: js/prefs.js:55
+msgid "Adding user..."
+msgstr "Добавяне на потребител..."
 
-#: js/prefs.js:1000
-msgid "Removing selected categories..."
-msgstr "Премахване на избраните категории..."
+#: js/prefs.js:74
+msgid "User Editor"
+msgstr "Редактор на потребител"
 
-#: js/prefs.js:1013
-msgid "No categories are selected."
-msgstr "Не са избрани категории."
+#: js/prefs.js:104
+msgid "Edit Filter"
+msgstr "Редактиране на филтър"
 
-#: js/prefs.js:1020
-msgid "Category title:"
-msgstr "Име на категория:"
+#: js/prefs.js:1175
+msgid "Subscribing to feeds..."
+msgstr "Абониране за хранилки..."
 
-#: js/prefs.js:1024
-msgid "Creating category..."
-msgstr "Създаване на категория..."
+#: js/prefs.js:1191
+msgid "Clear stored data for this plugin?"
+msgstr "Изчистване на съхранените данни за тази добавка?"
 
-#: js/prefs.js:1047
-msgid "Feeds without recent updates"
-msgstr "Хранилки без скорошни обновления"
+#: js/prefs.js:1203
+msgid "Clear all messages in the error log?"
+msgstr "Изчистване на всички съобщения от журнала с грешки?"
 
-#: js/prefs.js:1091
-msgid "Replace current OPML publishing address with a new one?"
-msgstr "Замяна на текущо публикувания OPML адрес с нов?"
-
-#: js/prefs.js:1129
-msgid "Reset selected labels to default colors?"
-msgstr "Връщане на избраните етикети към цветове по подразбиране?"
-
-#: js/prefs.js:1161
-msgid "Settings Profiles"
-msgstr "Настройки на профили"
-
-#: js/prefs.js:1170
-msgid "Remove selected profiles? Active and default profiles will not be removed."
-msgstr "Премахване на избраните профили? Активните и подразбиращи профили няма да бъдат премахнати."
-
-#: js/prefs.js:1173
-msgid "Removing selected profiles..."
-msgstr "Премахване на избраните профили..."
-
-#: js/prefs.js:1189
-msgid "No profiles are selected."
-msgstr "Не са избрани профили."
-
-#: js/prefs.js:1197
-#: js/prefs.js:1250
-msgid "Activate selected profile?"
-msgstr "Активиране на избрания профил?"
-
-#: js/prefs.js:1214
-#: js/prefs.js:1266
-msgid "Please choose a profile to activate."
-msgstr "Моля, изберете профил за активиране!"
-
-#: js/prefs.js:1219
-msgid "Creating profile..."
-msgstr "Създаване на профил..."
-
-#: js/prefs.js:1274
-msgid "This will invalidate all previously generated feed URLs. Continue?"
-msgstr "Това ще отвалидира всички предходно генерирани URL-и за хранилката. Продължаване?"
-
-#: js/prefs.js:1284
-msgid "Generated URLs cleared."
-msgstr "Генерираните URL-и са изчистени."
-
-#: js/prefs.js:1356
-msgid "Label Editor"
-msgstr "Редактор на етикети"
-
-#: js/tt-rss.js:681
+#: js/tt-rss.js:620
 msgid "You can't unsubscribe from the category."
 msgstr "Не можете да се отпишете от тази категория."
 
-#: js/viewfeed.js:127
-#: js/viewfeed.js:177
-#: js/viewfeed.js:194
+#: js/tt-rss.js:625
+msgid "Please select some feed first."
+msgstr "Моля, първо изберете някоя хранилка!"
+
+#: js/viewfeed.js:89
+#: js/viewfeed.js:135
+#: js/viewfeed.js:152
 msgid "Click to open next unread feed."
 msgstr "Отваряне на следващата непрочетена хранилка."
 
-#: js/viewfeed.js:131
+#: js/viewfeed.js:93
 msgid "Cancel search"
 msgstr "Отмяна на търсенето"
 
-#: js/viewfeed.js:191
+#: js/viewfeed.js:149
 #, fuzzy
 msgid "New articles found, reload feed to continue."
 msgstr "Не са намерени статии за показване."
 
-#: js/viewfeed.js:620
+#: js/viewfeed.js:405
 msgid "%d article selected"
 msgid_plural "%d articles selected"
 msgstr[0] "%d статия е избрана"
 msgstr[1] "%d статии са избрани"
 
-#: js/viewfeed.js:1284
-msgid "No article is selected."
-msgstr "Не е избрана статия."
+#~ msgid "Rescore feed"
+#~ msgstr "Преточкуване на хранилка"
 
-#: js/viewfeed.js:1319
-msgid "No articles found to mark"
-msgstr "Не са намерени статии за отбелязване"
+#~ msgid "Create label..."
+#~ msgstr "Създаване на етикет..."
 
-#: js/viewfeed.js:1321
-msgid "Mark %d article as read?"
-msgid_plural "Mark %d articles as read?"
-msgstr[0] "Отбелязване на %d статия като прочетена?"
-msgstr[1] "Отбелязване на %d статии като прочетени?"
+#~ msgid "Create filter..."
+#~ msgstr "Създаване на филтър..."
+
+#~ msgid "You can't rescore this kind of feed."
+#~ msgstr "Не можете да преточкувате този тип хранилка."
+
+#~ msgid "Rescore articles in %s?"
+#~ msgstr "Преточкуване на статиите в \"%s\"?"
+
+#~ msgid "Rescoring articles..."
+#~ msgstr "Преточкуване на статии..."
+
+#~ msgid "Can't create label: missing caption."
+#~ msgstr "Не може да се създаде етикет: липсва надпис."
 
 #~ msgid "Firefox integration"
 #~ msgstr "Firefox интеграция"
diff --git a/locale/ca_CA/LC_MESSAGES/messages.mo b/locale/ca_CA/LC_MESSAGES/messages.mo
index ab1cb8963..cd12fabae 100644
Binary files a/locale/ca_CA/LC_MESSAGES/messages.mo and b/locale/ca_CA/LC_MESSAGES/messages.mo differ
diff --git a/locale/ca_CA/LC_MESSAGES/messages.po b/locale/ca_CA/LC_MESSAGES/messages.po
index 4cb5b95be..cdad527ed 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: 2018-10-10 08:24+0300\n"
+"POT-Creation-Date: 2018-12-01 12:59+0300\n"
 "PO-Revision-Date: 2009-11-19 09:40+0100\n"
 "Last-Translator: Alfred Galitó <bratac@bratac.cat>\n"
 "Language-Team: Català <bratac@bratac.cat>\n"
@@ -95,8 +95,8 @@ msgid "Weekly"
 msgstr "Setmanalment"
 
 #: backend.php:103
-#: classes/pref/users.php:47
 #: classes/pref/system.php:51
+#: classes/pref/users.php:47
 msgid "User"
 msgstr "Usuari"
 
@@ -173,33 +173,33 @@ msgstr "No s'ha trobat l'usuari"
 
 #: index.php:151
 #: index.php:167
-#: index.php:285
+#: index.php:282
 #: prefs.php:120
 #: classes/backend.php:5
 #: classes/pref/labels.php:294
-#: classes/pref/feeds.php:1230
 #: classes/pref/filters.php:822
-#: js/feedlist.js:148
-#: js/feedlist.js:491
-#: js/feedlist.js:539
-#: js/functions.js:314
-#: js/functions.js:1336
-#: js/prefs.js:562
-#: js/prefs.js:754
-#: js/prefs.js:1488
-#: js/prefs.js:1503
-#: js/tt-rss.js:547
-#: js/viewfeed.js:1180
+#: classes/pref/feeds.php:1229
+#: js/feedlist.js:118
+#: js/feedlist.js:446
+#: js/feedlist.js:487
+#: js/functions.js:328
+#: js/functions.js:551
+#: js/functions.js:1286
+#: js/prefs.js:477
+#: js/prefs.js:617
+#: js/prefs.js:956
+#: js/prefs.js:1000
+#: js/prefs.js:1028
+#: js/prefs.js:1037
+#: js/prefs.js:1045
+#: js/prefs.js:1057
+#: js/tt-rss.js:497
+#: js/viewfeed.js:509
+#: js/viewfeed.js:928
 #: plugins/import_export/import_export.js:17
-#: js/functions.js:565
-#: js/prefs.js:1200
-#: js/prefs.js:1253
-#: js/prefs.js:1292
-#: js/prefs.js:1305
-#: js/prefs.js:1316
-#: js/prefs.js:1331
-#: js/tt-rss.js:564
-#: js/viewfeed.js:760
+#: js/prefs.js:1192
+#: js/prefs.js:1205
+#: js/tt-rss.js:510
 msgid "Loading, please wait..."
 msgstr "S'està obrint, preneu paciència..."
 
@@ -217,13 +217,13 @@ msgid "All Articles"
 msgstr "Tots els articles"
 
 #: index.php:194
-#: include/functions.php:1227
+#: include/functions.php:1172
 #: classes/feeds.php:110
 msgid "Starred"
 msgstr "Marcats"
 
 #: index.php:195
-#: include/functions.php:1228
+#: include/functions.php:1173
 #: classes/feeds.php:111
 msgid "Published"
 msgstr "Publicats"
@@ -264,11 +264,11 @@ msgid "Title"
 msgstr "Títol"
 
 #: index.php:211
-#: index.php:251
-#: include/functions.php:1215
+#: index.php:250
+#: include/functions.php:1160
 #: classes/feeds.php:115
-#: js/FeedTree.js:41
-#: js/FeedTree.js:69
+#: js/FeedTree.js:42
+#: js/FeedTree.js:70
 msgid "Mark as read"
 msgstr "Marca'l com a llegit"
 
@@ -306,7 +306,7 @@ msgid "Feed actions:"
 msgstr "Accions sobre els canals:"
 
 #: index.php:246
-#: classes/handler/public.php:551
+#: classes/handler/public.php:575
 msgid "Subscribe to feed..."
 msgstr "Subscriviu-vos al canal"
 
@@ -315,58 +315,46 @@ msgid "Edit this feed..."
 msgstr "Edita aquest canal..."
 
 #: index.php:248
-msgid "Rescore feed"
-msgstr "Canvia la puntuació del canal"
-
-#: index.php:249
-#: classes/pref/feeds.php:770
-#: classes/pref/feeds.php:1203
-#: js/PrefFeedTree.js:61
+#: classes/pref/feeds.php:769
+#: classes/pref/feeds.php:1202
+#: js/PrefFeedTree.js:62
 msgid "Unsubscribe"
 msgstr "Dóna't de baixa"
 
-#: index.php:250
+#: index.php:249
 msgid "All feeds:"
 msgstr "Tots els canals"
 
-#: index.php:252
+#: index.php:251
 msgid "(Un)hide read feeds"
 msgstr "Mostra/amaga els canals llegits"
 
-#: index.php:253
+#: index.php:252
 msgid "Other actions:"
 msgstr "Altres accions:"
 
-#: index.php:254
-#: include/functions.php:1201
+#: index.php:253
+#: include/functions.php:1146
 #, fuzzy
 msgid "Toggle widescreen mode"
 msgstr "Canvia al mode de reordenació de categories"
 
-#: index.php:255
-msgid "Create label..."
-msgstr "Crea una etiqueta"
-
-#: index.php:256
-msgid "Create filter..."
-msgstr "Crea un filtre..."
-
-#: index.php:257
+#: index.php:254
 #, fuzzy
 msgid "Keyboard shortcuts help"
 msgstr "Dreceres de teclat"
 
-#: index.php:266
+#: index.php:263
 msgid "Logout"
 msgstr "Surt"
 
-#: index.php:272
+#: index.php:269
 msgid "Updates are available from Git."
 msgstr ""
 
 #: prefs.php:33
 #: prefs.php:138
-#: include/functions.php:1230
+#: include/functions.php:1175
 #: classes/pref/prefs.php:425
 msgid "Preferences"
 msgstr "Preferències"
@@ -381,8 +369,8 @@ msgstr "Surt de les preferències"
 
 #: prefs.php:141
 #: classes/pref/feeds.php:114
-#: classes/pref/feeds.php:1138
-#: classes/pref/feeds.php:1192
+#: classes/pref/feeds.php:1137
+#: classes/pref/feeds.php:1191
 msgid "Feeds"
 msgstr "Canals"
 
@@ -392,8 +380,8 @@ msgid "Filters"
 msgstr "Filtres"
 
 #: prefs.php:147
+#: classes/feeds.php:1696
 #: classes/pref/labels.php:94
-#: classes/feeds.php:1710
 msgid "Labels"
 msgstr "Etiquetes"
 
@@ -405,80 +393,80 @@ msgstr "Usuaris"
 msgid "System"
 msgstr ""
 
-#: register.php:186
+#: register.php:185
 #: include/login_form.php:162
 msgid "Create new account"
 msgstr "Creeu un compte nou"
 
-#: register.php:192
+#: register.php:191
 msgid "New user registrations are administratively disabled."
 msgstr "L'administrador ha deshabilitat els registres de nous usuaris."
 
-#: register.php:196
-#: register.php:241
-#: register.php:254
-#: register.php:269
-#: register.php:288
-#: register.php:336
-#: register.php:346
-#: register.php:358
-#: classes/handler/public.php:623
-#: classes/handler/public.php:697
-#: classes/handler/public.php:798
-#: classes/handler/public.php:877
-#: classes/handler/public.php:891
-#: classes/handler/public.php:898
-#: classes/handler/public.php:923
+#: register.php:195
+#: register.php:240
+#: register.php:253
+#: register.php:268
+#: register.php:287
+#: register.php:334
+#: register.php:344
+#: register.php:356
+#: classes/handler/public.php:647
+#: classes/handler/public.php:721
+#: 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"
 
-#: register.php:217
+#: register.php:216
 msgid "Your temporary password will be sent to the specified email. Accounts, which were not logged in once, are erased automatically 24 hours after temporary password is sent."
 msgstr "La vostra contrasenya temporal s'enviarà a l'adreça electrònica especificada. Els comptes en els quals no s'hagi entrat almenys un cop s'eliminaran passades 24 hores des de l'enviament de la contrasenya."
 
-#: register.php:223
+#: register.php:222
 msgid "Desired login:"
 msgstr "Usuari desitjat:"
 
-#: register.php:226
+#: register.php:225
 msgid "Check availability"
 msgstr "Comprova la disponibilitat"
 
-#: register.php:228
-#: classes/handler/public.php:713
+#: register.php:227
+#: classes/handler/public.php:737
 msgid "Email:"
 msgstr "Adreça electrònica:"
 
-#: register.php:231
-#: classes/handler/public.php:718
+#: register.php:230
+#: classes/handler/public.php:742
 msgid "How much is two plus two:"
 msgstr "Quant és dos més dos:"
 
-#: register.php:234
+#: register.php:233
 msgid "Submit registration"
 msgstr "Envia el registre"
 
-#: register.php:252
+#: register.php:251
 msgid "Your registration information is incomplete."
 msgstr "La vostra informació de registre és incompleta."
 
-#: register.php:267
+#: register.php:266
 msgid "Sorry, this username is already taken."
 msgstr "Aquest nom d'usuari ja existeix."
 
-#: register.php:286
+#: register.php:285
 msgid "Registration failed."
 msgstr "Ha fallat el regsitre"
 
-#: register.php:333
+#: register.php:331
 msgid "Account created successfully."
 msgstr "S'ha creat el compte."
 
-#: register.php:355
+#: register.php:353
 msgid "New user registrations are currently closed."
 msgstr "Actualment no es permet el registre de nous usuaris."
 
-#: update.php:66
+#: update.php:67
 #, fuzzy
 msgid "Tiny Tiny RSS data update script."
 msgstr "La base de dades de Tiny Tiny RSS està actualitzada."
@@ -492,10 +480,10 @@ msgstr "Tots els canals"
 
 #: include/controls.php:138
 #: include/controls.php:230
-#: classes/opml.php:512
-#: classes/digest.php:120
+#: classes/digest.php:124
+#: classes/feeds.php:1708
 #: classes/pref/feeds.php:233
-#: classes/feeds.php:1722
+#: classes/opml.php:512
 msgid "Uncategorized"
 msgstr "Sense categoria"
 
@@ -510,319 +498,319 @@ msgstr[1] "Articles marcats"
 msgid "No feeds found."
 msgstr "No s'ha trobat cap canal."
 
-#: include/functions.php:983
+#: include/functions.php:928
 #, php-format
 msgid "%d min"
 msgstr ""
 
-#: include/functions.php:1177
+#: include/functions.php:1122
 msgid "Navigation"
 msgstr "Navegació"
 
-#: include/functions.php:1178
+#: include/functions.php:1123
 #, fuzzy
 msgid "Open next feed"
 msgstr "Canals generats"
 
-#: include/functions.php:1179
+#: include/functions.php:1124
 msgid "Open previous feed"
 msgstr ""
 
-#: include/functions.php:1180
+#: include/functions.php:1125
 #, fuzzy
 msgid "Open next article"
 msgstr "Mostra el contingut original de l'article"
 
-#: include/functions.php:1181
+#: include/functions.php:1126
 #, fuzzy
 msgid "Open previous article"
 msgstr "Mostra el contingut original de l'article"
 
-#: include/functions.php:1182
+#: include/functions.php:1127
 msgid "Open next article (don't scroll long articles)"
 msgstr ""
 
-#: include/functions.php:1183
+#: include/functions.php:1128
 msgid "Open previous article (don't scroll long articles)"
 msgstr ""
 
-#: include/functions.php:1184
+#: include/functions.php:1129
 msgid "Move to next article (don't expand or mark read)"
 msgstr ""
 
-#: include/functions.php:1185
+#: include/functions.php:1130
 msgid "Move to previous article (don't expand or mark read)"
 msgstr ""
 
-#: include/functions.php:1186
+#: include/functions.php:1131
 msgid "Show search dialog"
 msgstr "Mostra el diàleg de cerca"
 
-#: include/functions.php:1187
+#: include/functions.php:1132
 #, fuzzy
 msgid "Article"
 msgstr "Tots els articles"
 
-#: include/functions.php:1188
-#: js/viewfeed.js:1695
+#: include/functions.php:1133
+#: js/viewfeed.js:1341
 msgid "Toggle starred"
 msgstr "Commuta els marcats"
 
-#: include/functions.php:1189
-#: js/viewfeed.js:1707
+#: include/functions.php:1134
+#: js/viewfeed.js:1353
 msgid "Toggle published"
 msgstr "Commuta els publicats"
 
-#: include/functions.php:1190
-#: js/viewfeed.js:1682
+#: include/functions.php:1135
+#: js/viewfeed.js:1328
 msgid "Toggle unread"
 msgstr "Commuta els no llegits"
 
-#: include/functions.php:1191
+#: include/functions.php:1136
 msgid "Edit tags"
 msgstr "Edita les etiquetes"
 
-#: include/functions.php:1192
+#: include/functions.php:1137
 #, fuzzy
 msgid "Open in new window"
 msgstr "Obre l'article en una finestra nova"
 
-#: include/functions.php:1193
-#: js/viewfeed.js:1728
+#: include/functions.php:1138
+#: js/viewfeed.js:1374
 #, fuzzy
 msgid "Mark below as read"
 msgstr "Marca'l com a llegit"
 
-#: include/functions.php:1194
-#: js/viewfeed.js:1721
+#: include/functions.php:1139
+#: js/viewfeed.js:1367
 #, fuzzy
 msgid "Mark above as read"
 msgstr "Marca'l com a llegit"
 
-#: include/functions.php:1195
+#: include/functions.php:1140
 #, fuzzy
 msgid "Scroll down"
 msgstr "Fet!"
 
-#: include/functions.php:1196
+#: include/functions.php:1141
 msgid "Scroll up"
 msgstr ""
 
-#: include/functions.php:1197
+#: include/functions.php:1142
 #, fuzzy
 msgid "Select article under cursor"
 msgstr "Seleccioneu un article mitjançant el ratolí."
 
-#: include/functions.php:1198
+#: include/functions.php:1143
 #, fuzzy
 msgid "Email article"
 msgstr "Tots els articles"
 
-#: include/functions.php:1199
+#: include/functions.php:1144
 #, fuzzy
 msgid "Close/collapse article"
 msgstr "Buida els articles"
 
-#: include/functions.php:1200
+#: include/functions.php:1145
 #, fuzzy
 msgid "Toggle article expansion (combined mode)"
 msgstr "Canvia al mode de reordenació de categories"
 
-#: include/functions.php:1202
+#: include/functions.php:1147
 #: plugins/embed_original/init.php:33
 #, fuzzy
 msgid "Toggle embed original"
 msgstr "Canvia al mode de reordenació de categories"
 
-#: include/functions.php:1203
+#: include/functions.php:1148
 #, fuzzy
 msgid "Article selection"
 msgstr "Accions actives de l'article"
 
-#: include/functions.php:1204
+#: include/functions.php:1149
 #, fuzzy
 msgid "Select all articles"
 msgstr "Buida els articles"
 
-#: include/functions.php:1205
+#: include/functions.php:1150
 #, fuzzy
 msgid "Select unread"
 msgstr "Purga els articles per llegir"
 
-#: include/functions.php:1206
+#: include/functions.php:1151
 #, fuzzy
 msgid "Select starred"
 msgstr "Marca'l com a destacat"
 
-#: include/functions.php:1207
+#: include/functions.php:1152
 #, fuzzy
 msgid "Select published"
 msgstr "Purga els articles per llegir"
 
-#: include/functions.php:1208
+#: include/functions.php:1153
 #, fuzzy
 msgid "Invert selection"
 msgstr "Accions actives de l'article"
 
-#: include/functions.php:1209
+#: include/functions.php:1154
 #, fuzzy
 msgid "Deselect everything"
 msgstr "Buida els articles"
 
-#: include/functions.php:1210
-#: classes/pref/feeds.php:522
-#: classes/pref/feeds.php:794
+#: include/functions.php:1155
+#: classes/pref/feeds.php:521
+#: classes/pref/feeds.php:793
 msgid "Feed"
 msgstr "Canal"
 
-#: include/functions.php:1211
+#: include/functions.php:1156
 #, fuzzy
 msgid "Refresh current feed"
 msgstr "Actualitza els canals actius"
 
-#: include/functions.php:1212
+#: include/functions.php:1157
 #, fuzzy
 msgid "Un/hide read feeds"
 msgstr "Mostra/amaga els canals llegits"
 
-#: include/functions.php:1213
-#: classes/pref/feeds.php:1195
+#: include/functions.php:1158
+#: classes/pref/feeds.php:1194
 msgid "Subscribe to feed"
 msgstr "Subscriu-te al canal"
 
-#: include/functions.php:1214
-#: js/FeedTree.js:48
-#: js/PrefFeedTree.js:55
-#: js/viewfeed.js:1846
+#: include/functions.php:1159
+#: js/FeedTree.js:49
+#: js/PrefFeedTree.js:56
+#: js/viewfeed.js:1492
 msgid "Edit feed"
 msgstr "Edita el canal"
 
-#: include/functions.php:1216
+#: include/functions.php:1161
 #, fuzzy
 msgid "Reverse headlines"
 msgstr "Inverteix l'ordre de les capçaleres (les més antigues les primeres)"
 
-#: include/functions.php:1217
+#: include/functions.php:1162
 msgid "Toggle headline grouping"
 msgstr ""
 
-#: include/functions.php:1218
+#: include/functions.php:1163
 #, fuzzy
 msgid "Debug feed update"
 msgstr "S'ha acabat l'actualització dels canals."
 
-#: include/functions.php:1219
+#: include/functions.php:1164
 #, fuzzy
 msgid "Debug viewfeed()"
 msgstr "S'ha acabat l'actualització dels canals."
 
-#: include/functions.php:1220
-#: js/FeedTree.js:97
+#: include/functions.php:1165
+#: js/FeedTree.js:98
 msgid "Mark all feeds as read"
 msgstr "Marca tots els canals com a llegits"
 
-#: include/functions.php:1221
+#: include/functions.php:1166
 #, fuzzy
 msgid "Un/collapse current category"
 msgstr "Clica-hi per a reduir la categoria"
 
-#: include/functions.php:1222
-#, fuzzy
-msgid "Toggle combined mode"
-msgstr "Canvia al mode de reordenació de categories"
-
-#: include/functions.php:1223
+#: include/functions.php:1167
 #, fuzzy
 msgid "Toggle auto expand in combined mode"
 msgstr "Canvia al mode de reordenació de categories"
 
-#: include/functions.php:1224
+#: include/functions.php:1168
+#, fuzzy
+msgid "Toggle combined mode"
+msgstr "Canvia al mode de reordenació de categories"
+
+#: include/functions.php:1169
 #, fuzzy
 msgid "Go to"
 msgstr "Vés a..."
 
-#: include/functions.php:1225
-#: classes/feeds.php:1583
+#: include/functions.php:1170
+#: classes/feeds.php:1569
 msgid "All articles"
 msgstr "Tots els articles"
 
-#: include/functions.php:1226
+#: include/functions.php:1171
 #, fuzzy
 msgid "Fresh"
 msgstr "Actualitza"
 
-#: include/functions.php:1229
-#: js/tt-rss.js:491
-#: js/tt-rss.js:660
+#: include/functions.php:1174
+#: js/tt-rss.js:439
+#: js/tt-rss.js:599
 msgid "Tag cloud"
 msgstr "Núvol d'etiquetes"
 
-#: include/functions.php:1231
+#: include/functions.php:1176
 #, fuzzy
 msgid "Other"
 msgstr "Altres:"
 
-#: include/functions.php:1232
+#: include/functions.php:1177
 #: classes/pref/labels.php:279
 msgid "Create label"
 msgstr "Crea una etiqueta"
 
-#: include/functions.php:1233
+#: include/functions.php:1178
 #: classes/pref/filters.php:801
 msgid "Create filter"
 msgstr "Crea un filtre"
 
-#: include/functions.php:1234
+#: include/functions.php:1179
 #, fuzzy
 msgid "Un/collapse sidebar"
 msgstr "Redueix la barra lateral"
 
-#: include/functions.php:1235
+#: include/functions.php:1180
 #, fuzzy
 msgid "Show help dialog"
 msgstr "Mostra el diàleg de cerca"
 
-#: include/functions.php:2582
+#: include/functions.php:2529
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: include/functions.php:2583
+#: include/functions.php:2530
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: include/functions.php:2584
+#: include/functions.php:2531
 msgid "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form"
 msgstr ""
 
-#: include/functions.php:2585
+#: include/functions.php:2532
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: include/functions.php:2586
+#: include/functions.php:2533
 #, fuzzy
 msgid "No file was uploaded"
 msgstr "No hi ha cap fitxer OPML per a carregar."
 
-#: include/functions.php:2587
+#: include/functions.php:2534
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: include/functions.php:2588
+#: include/functions.php:2535
 msgid "Failed to write file to disk."
 msgstr ""
 
-#: include/functions.php:2589
+#: include/functions.php:2536
 msgid "A PHP extension stopped the file upload."
 msgstr ""
 
 #: include/login_form.php:107
-#: classes/handler/public.php:446
-#: classes/handler/public.php:708
+#: classes/handler/public.php:466
+#: classes/handler/public.php:732
 msgid "Login:"
 msgstr "Usuari:"
 
 #: include/login_form.php:117
-#: classes/handler/public.php:449
+#: classes/handler/public.php:469
 msgid "Password:"
 msgstr "Contrasenya:"
 
@@ -837,9 +825,9 @@ msgid "Profile:"
 msgstr "Fitxer:"
 
 #: include/login_form.php:133
-#: classes/handler/public.php:252
 #: classes/pref/prefs.php:1037
 #: classes/rpc.php:69
+#: classes/handler/public.php:272
 #, fuzzy
 msgid "Default profile"
 msgstr "Nombre maximal d'articles par défaut"
@@ -857,220 +845,30 @@ msgid "Remember me"
 msgstr ""
 
 #: include/login_form.php:159
-#: classes/handler/public.php:454
+#: classes/handler/public.php:474
 msgid "Log in"
 msgstr "Registreu-vos"
 
-#: include/sessions.php:46
+#: include/sessions.php:45
 #, fuzzy
 msgid "Session failed to validate (schema version changed)"
 msgstr "No s'ha pogut validar la sessió (IP incorrecta)"
 
-#: include/sessions.php:62
+#: include/sessions.php:53
+#, fuzzy
+msgid "Session failed to validate (UA changed)."
+msgstr "No s'ha pogut validar la sessió (IP incorrecta)"
+
+#: include/sessions.php:67
 #, fuzzy
 msgid "Session failed to validate (password changed)"
 msgstr "No s'ha pogut validar la sessió (IP incorrecta)"
 
-#: include/sessions.php:69
+#: include/sessions.php:74
 #, fuzzy
 msgid "Session failed to validate (user not found)"
 msgstr "No s'ha pogut validar la sessió (IP incorrecta)"
 
-#: classes/article.php:26
-#, fuzzy
-msgid "Article not found."
-msgstr "No s'ha trobat el canal."
-
-#: classes/article.php:211
-msgid "Tags for this article (separated by commas):"
-msgstr "Etiquetes per aquest article (separades per comes):"
-
-#: classes/article.php:236
-#: classes/pref/labels.php:82
-#: classes/pref/users.php:103
-#: classes/pref/feeds.php:774
-#: classes/pref/feeds.php:914
-#: classes/pref/filters.php:525
-#: classes/pref/prefs.php:982
-#: plugins/nsfw/init.php:85
-#: plugins/note/init.php:58
-#: plugins/af_readability/init.php:80
-#: plugins/af_redditimgur/init.php:66
-#: plugins/af_psql_trgm/init.php:188
-#: plugins/mail/init.php:65
-#: plugins/af_zz_imgproxy/init.php:238
-msgid "Save"
-msgstr "Desa"
-
-#: classes/article.php:238
-#: classes/handler/public.php:423
-#: classes/handler/public.php:457
-#: classes/pref/labels.php:84
-#: classes/pref/users.php:105
-#: classes/pref/feeds.php:775
-#: classes/pref/feeds.php:917
-#: classes/pref/feeds.php:1672
-#: classes/pref/filters.php:528
-#: classes/pref/filters.php:945
-#: classes/pref/filters.php:1022
-#: classes/pref/filters.php:1115
-#: classes/pref/prefs.php:984
-#: classes/feeds.php:1037
-#: classes/feeds.php:1089
-#: classes/feeds.php:1128
-#: plugins/note/init.php:60
-#: plugins/mail/init.php:179
-msgid "Cancel"
-msgstr "Cancel·la"
-
-#: classes/article.php:337
-#: classes/article.php:720
-#: classes/article.php:875
-msgid "no tags"
-msgstr "sense etiqueta"
-
-#: classes/article.php:448
-msgid "unknown type"
-msgstr "tipus desconegut"
-
-#: classes/article.php:525
-#, fuzzy
-msgid "Attachments"
-msgstr "Adjuncions:"
-
-#: classes/article.php:626
-#: classes/feeds.php:661
-#, fuzzy
-msgid "comment"
-msgid_plural "comments"
-msgstr[0] "comentaris"
-msgstr[1] "comentaris"
-
-#: classes/article.php:630
-#: classes/feeds.php:665
-msgid "comments"
-msgstr "comentaris"
-
-#: classes/article.php:689
-msgid " - "
-msgstr " - "
-
-#: classes/article.php:730
-#: classes/feeds.php:647
-msgid "Edit tags for this article"
-msgstr "Edita les etiquetes d'aquest article"
-
-#: classes/article.php:763
-#: classes/feeds.php:602
-#, fuzzy
-msgid "Originally from:"
-msgstr "Mostra el contingut original de l'article"
-
-#: classes/article.php:774
-#: classes/pref/feeds.php:539
-#: classes/feeds.php:613
-#, fuzzy
-msgid "Feed URL"
-msgstr "Canal"
-
-#: classes/article.php:811
-#: classes/backend.php:103
-#: classes/dlg.php:33
-#: classes/dlg.php:56
-#: classes/dlg.php:89
-#: classes/dlg.php:154
-#: classes/dlg.php:181
-#: classes/dlg.php:197
-#: classes/pref/feeds.php:1466
-#: classes/pref/feeds.php:1533
-#: classes/pref/filters.php:208
-#: classes/pref/prefs.php:1099
-#: plugins/af_psql_trgm/init.php:109
-#: plugins/import_export/init.php:446
-#: plugins/import_export/init.php:490
-#: plugins/share/init.php:128
-msgid "Close this window"
-msgstr "Tanca la finestra"
-
-#: classes/article.php:913
-#, fuzzy
-msgid "(edit note)"
-msgstr "edita la nota"
-
-#: classes/opml.php:31
-#: classes/opml.php:36
-msgid "OPML Utility"
-msgstr "Eina OPML"
-
-#: classes/opml.php:40
-#, fuzzy
-msgid "Importing OPML..."
-msgstr "S'està important OPML (s'està utilitzant l'extensió DOMXML)..."
-
-#: classes/opml.php:45
-msgid "Return to preferences"
-msgstr "Torna a les preferències"
-
-#: classes/opml.php:301
-#, fuzzy, php-format
-msgid "Adding feed: %s"
-msgstr "S'està afegint el canal..."
-
-#: classes/opml.php:312
-#, fuzzy, php-format
-msgid "Duplicate feed: %s"
-msgstr "Crea un filtre"
-
-#: classes/opml.php:326
-#, fuzzy, php-format
-msgid "Adding label %s"
-msgstr "Assigna-li l'etiqueta"
-
-#: classes/opml.php:329
-#, php-format
-msgid "Duplicate label: %s"
-msgstr ""
-
-#: classes/opml.php:341
-#, php-format
-msgid "Setting preference key %s to %s"
-msgstr ""
-
-#: classes/opml.php:377
-#, fuzzy
-msgid "Adding filter..."
-msgstr "S'està afegint el canal..."
-
-#: classes/opml.php:512
-#, fuzzy, php-format
-msgid "Processing category: %s"
-msgstr "Posa'l a la categoria:"
-
-#: classes/opml.php:558
-#, php-format
-msgid "Upload failed with error code %d"
-msgstr ""
-
-#: classes/opml.php:570
-#: plugins/import_export/init.php:471
-#, fuzzy
-msgid "Unable to move uploaded file."
-msgstr "Error: si us plau carregueu el fitxer OPML."
-
-#: classes/opml.php:574
-#: plugins/import_export/init.php:475
-msgid "Error: please upload OPML file."
-msgstr "Error: si us plau carregueu el fitxer OPML."
-
-#: classes/opml.php:585
-#, fuzzy
-msgid "Error: unable to find moved OPML file."
-msgstr "Error: si us plau carregueu el fitxer OPML."
-
-#: classes/opml.php:594
-msgid "Error while parsing document."
-msgstr "Error mentre s'analitza el document."
-
 #: classes/backend.php:31
 msgid "Other interface tips are available in the Tiny Tiny RSS wiki."
 msgstr ""
@@ -1091,173 +889,377 @@ msgstr ""
 msgid "Help topic not found."
 msgstr "No s'ha trobat el tema a l'ajuda."
 
-#: 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/backend.php:103
+#: classes/pref/filters.php:208
+#: classes/pref/feeds.php:1465
+#: classes/pref/feeds.php:1532
+#: classes/pref/prefs.php:1099
+#: classes/dlg.php:33
+#: classes/dlg.php:56
+#: classes/dlg.php:89
+#: classes/dlg.php:154
+#: classes/dlg.php:181
+#: classes/dlg.php:197
+#: classes/article.php:810
+#: plugins/af_psql_trgm/init.php:109
+#: plugins/import_export/init.php:446
+#: plugins/import_export/init.php:490
+#: plugins/share/init.php:128
+msgid "Close this window"
+msgstr "Tanca la finestra"
 
-#: classes/dlg.php:44
+#: classes/feeds.php:53
 #, fuzzy
-msgid "Your Public OPML URL is:"
-msgstr "Enllaç als articles publicats del canal."
+msgid "View as RSS feed"
+msgstr "Visualitza els canals"
 
-#: classes/dlg.php:53
-#: classes/dlg.php:178
-#: plugins/share/init.php:125
+#: classes/feeds.php:54
+#: classes/feeds.php:140
+#: classes/pref/feeds.php:1326
 #, fuzzy
-msgid "Generate new URL"
-msgstr "Canals generats"
+msgid "View as RSS"
+msgstr "Visualitza les etiquetes"
 
-#: classes/dlg.php:67
-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 "L'actualització de daemon està activada en la configuració però el procés daemon no funciona, fet que impedeix l'actualització de tots els canals. Si us plau, engegueu el procés del daemon o contacteu amb el responsable pertinent."
-
-#: classes/dlg.php:71
-#: classes/dlg.php:80
-msgid "Last update:"
-msgstr "Última actualització:"
-
-#: classes/dlg.php:76
-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 "L'actualització del daemon és més llarga que la d'un canal. Això pot indicar un problema com la caiguda. Si us plau, reviseu dels processos del daemon o contacteu amb el seu propietari."
-
-#: classes/dlg.php:169
-msgid "You can view this feed as RSS using the following URL:"
-msgstr ""
-
-#: classes/dlg.php:190
-msgid "You are using default tt-rss password. Please change it in the Preferences (Personal data / Authentication)."
-msgstr ""
-
-#: classes/dlg.php:194
-#, fuzzy
-msgid "Open Preferences"
-msgstr "Preferències"
-
-#: classes/handler/public.php:387
-#: plugins/bookmarklets/init.php:40
-#, fuzzy
-msgid "Share with Tiny Tiny RSS"
-msgstr "Torna a Tiny Tiny RSS"
-
-#: classes/handler/public.php:395
-msgid "Title:"
-msgstr "Titre&nbsp;:"
-
-#: classes/handler/public.php:397
-#: classes/pref/feeds.php:537
-msgid "URL:"
-msgstr "URL:"
-
-#: classes/handler/public.php:399
-#, fuzzy
-msgid "Content:"
-msgstr "Contingut"
-
-#: classes/handler/public.php:401
-#, fuzzy
-msgid "Labels:"
-msgstr "Etiquetes"
-
-#: classes/handler/public.php:420
-msgid "Shared article will appear in the Published feed."
-msgstr ""
-
-#: classes/handler/public.php:422
-msgid "Share"
-msgstr ""
-
-#: classes/handler/public.php:444
-#, fuzzy
-msgid "Not logged in"
-msgstr "Última connexió el"
-
-#: classes/handler/public.php:504
-msgid "Incorrect username or password"
-msgstr "El nom d'usuari o la contrasenya és incorrecte"
-
-#: classes/handler/public.php:557
-#, php-format
-msgid "Already subscribed to <b>%s</b>."
-msgstr "Ja esteu subscrit a <b>%s</b>."
-
-#: classes/handler/public.php:560
-#, php-format
-msgid "Subscribed to <b>%s</b>."
-msgstr "Subscrit a <b>%s</b>."
-
-#: classes/handler/public.php:563
+#: classes/feeds.php:62
 #, fuzzy, php-format
-msgid "Could not subscribe to <b>%s</b>."
-msgstr "Ja esteu subscrit a <b>%s</b>."
+msgid "Last updated: %s"
+msgstr "Dernière mise à jour&nbsp;:"
 
-#: classes/handler/public.php:566
-#, fuzzy, php-format
-msgid "No feeds found in <b>%s</b>."
-msgstr "No s'ha trobat cap canal."
-
-#: classes/handler/public.php:569
+#: classes/feeds.php:100
 #, fuzzy
-msgid "Multiple feed URLs found."
-msgstr "L'adreça URL del canal ha canviat."
+msgid "Select..."
+msgstr "Selecciona:"
 
-#: classes/handler/public.php:573
-#, 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/feeds.php:102
+#: classes/pref/labels.php:273
+#: classes/pref/filters.php:391
+#: classes/pref/filters.php:449
+#: classes/pref/filters.php:795
+#: classes/pref/filters.php:878
+#: classes/pref/filters.php:905
+#: classes/pref/feeds.php:1185
+#: classes/pref/feeds.php:1416
+#: classes/pref/feeds.php:1481
+#: classes/pref/users.php:358
+#: classes/pref/prefs.php:996
+msgid "All"
+msgstr "Tot"
 
-#: classes/handler/public.php:591
+#: classes/feeds.php:104
+msgid "Invert"
+msgstr "Inverteix"
+
+#: classes/feeds.php:105
+#: classes/pref/labels.php:275
+#: classes/pref/filters.php:393
+#: classes/pref/filters.php:451
+#: classes/pref/filters.php:797
+#: classes/pref/filters.php:880
+#: classes/pref/filters.php:907
+#: classes/pref/feeds.php:1187
+#: classes/pref/feeds.php:1418
+#: classes/pref/feeds.php:1483
+#: classes/pref/users.php:360
+#: classes/pref/prefs.php:998
+msgid "None"
+msgstr "Cap"
+
+#: classes/feeds.php:107
+msgid "Selection toggle:"
+msgstr "Commuta la selecció"
+
+#: classes/feeds.php:113
+msgid "Selection:"
+msgstr "Selecció:"
+
+#: classes/feeds.php:116
 #, fuzzy
-msgid "Subscribe to selected feed"
-msgstr "Us voleu donar de baixa dels canals seleccionats?"
+msgid "Set score"
+msgstr "Puntuació"
 
-#: classes/handler/public.php:618
-msgid "Edit subscription options"
-msgstr "Edita les opcions de les subscripcions"
-
-#: classes/handler/public.php:656
+#: classes/feeds.php:119
 #, fuzzy
-msgid "Password recovery"
-msgstr "Contrasenya:"
+msgid "Archive"
+msgstr "Data de l'article"
 
-#: classes/handler/public.php:701
-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:723
-#: classes/pref/users.php:372
-msgid "Reset password"
-msgstr "Reinicia la contrasenya"
-
-#: classes/handler/public.php:733
-msgid "Some of the required form parameters are missing or incorrect."
-msgstr ""
-
-#: classes/handler/public.php:737
-#: classes/handler/public.php:806
+#: classes/feeds.php:121
 #, fuzzy
-msgid "Go back"
+msgid "Move back"
 msgstr "Vés enrere"
 
-#: classes/handler/public.php:775
+#: classes/feeds.php:122
+#: classes/pref/filters.php:400
+#: classes/pref/filters.php:458
+#: classes/pref/filters.php:887
+#: classes/pref/filters.php:914
 #, fuzzy
-msgid "[tt-rss] Password reset request"
-msgstr "[tt-rss] Notificació de canvi de contrasenya"
+msgid "Delete"
+msgstr "Per defecte"
 
-#: classes/handler/public.php:802
-msgid "Sorry, login and email combination not found."
+#: classes/feeds.php:127
+#: classes/feeds.php:132
+#: plugins/mailto/init.php:25
+#: plugins/mail/init.php:76
+#, fuzzy
+msgid "Forward by email"
+msgstr "Marca l'article"
+
+#: classes/feeds.php:136
+msgid "Feed:"
+msgstr "Flux&nbsp;:"
+
+#: classes/feeds.php:193
+#: classes/feeds.php:802
+msgid "Feed not found."
+msgstr "No s'ha trobat el canal."
+
+#: classes/feeds.php:255
+#, fuzzy
+msgid "Never"
+msgstr "No ho purguis mai"
+
+#: classes/feeds.php:341
+#, fuzzy, php-format
+msgid "Imported at %s"
+msgstr "Importeu"
+
+#: classes/feeds.php:391
+#: classes/feeds.php:484
+#, fuzzy
+msgid "mark feed as read"
+msgstr "Marca el canal com a llegit"
+
+#: classes/feeds.php:540
+#, fuzzy
+msgid "Collapse article"
+msgstr "Buida els articles"
+
+#: classes/feeds.php:592
+#: classes/article.php:762
+#, fuzzy
+msgid "Originally from:"
+msgstr "Mostra el contingut original de l'article"
+
+#: classes/feeds.php:603
+#: classes/pref/feeds.php:538
+#: classes/article.php:773
+#, fuzzy
+msgid "Feed URL"
+msgstr "Canal"
+
+#: classes/feeds.php:630
+#: classes/article.php:729
+msgid "Edit tags for this article"
+msgstr "Edita les etiquetes d'aquest article"
+
+#: classes/feeds.php:644
+#: classes/article.php:625
+#, fuzzy
+msgid "comment"
+msgid_plural "comments"
+msgstr[0] "comentaris"
+msgstr[1] "comentaris"
+
+#: classes/feeds.php:648
+#: classes/article.php:629
+msgid "comments"
+msgstr "comentaris"
+
+#: classes/feeds.php:686
+msgid "No unread articles found to display."
+msgstr "No es poden mostrar els articles no llegits perquè no n'hi ha."
+
+#: classes/feeds.php:689
+msgid "No updated articles found to display."
+msgstr "No hi ha cap article actualitzat."
+
+#: classes/feeds.php:692
+msgid "No starred articles found to display."
+msgstr "No hi ha articles marcats per mostrar."
+
+#: classes/feeds.php:696
+#, 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:698
+msgid "No articles found to display."
+msgstr "No s'han trobat articles per a mostrar."
+
+#: classes/feeds.php:714
+#: classes/feeds.php:905
+#, fuzzy, php-format
+msgid "Feeds last updated at %s"
+msgstr "Erreurs de mise à jour"
+
+#: classes/feeds.php:726
+#: classes/feeds.php:917
+msgid "Some feeds have update errors (click for details)"
+msgstr "S'han detectat errors en alguns canals (feu clic aquí per veure'n els detalls)"
+
+#: classes/feeds.php:894
+msgid "No feed selected."
+msgstr "No heu seleccionat cap canal."
+
+#: classes/feeds.php:958
+#: classes/feeds.php:966
+#, fuzzy
+msgid "Feed or site URL"
+msgstr "Canal"
+
+#: classes/feeds.php:972
+#: classes/pref/feeds.php:559
+#: classes/pref/feeds.php:800
+#: classes/pref/feeds.php:1632
+msgid "Place in category:"
+msgstr "Posa'l a la categoria:"
+
+#: classes/feeds.php:980
+#, fuzzy
+msgid "Available feeds"
+msgstr "Tots els canals"
+
+#: classes/feeds.php:992
+#: classes/pref/feeds.php:621
+#: classes/pref/feeds.php:848
+#: classes/pref/users.php:61
+msgid "Authentication"
+msgstr "Autenticació"
+
+#: classes/feeds.php:996
+#: classes/pref/feeds.php:625
+#: classes/pref/feeds.php:852
+#: classes/pref/feeds.php:1646
+#: classes/pref/users.php:403
+msgid "Login"
+msgstr "Entra"
+
+#: classes/feeds.php:1000
+#: classes/pref/feeds.php:631
+#: classes/pref/feeds.php:860
+#: classes/pref/feeds.php:1649
+#: classes/pref/prefs.php:243
+#, fuzzy
+msgid "Password"
+msgstr "Contrasenya:"
+
+#: classes/feeds.php:1011
+#: classes/pref/feeds.php:645
+msgid "This feed requires authentication."
+msgstr "Aquest canal requereix autenticació."
+
+#: classes/feeds.php:1014
+#: classes/feeds.php:1070
+#: classes/pref/feeds.php:1668
+msgid "Subscribe"
+msgstr "Subscriu-t'hi"
+
+#: classes/feeds.php:1017
+#, fuzzy
+msgid "More feeds"
+msgstr "Més canals"
+
+#: classes/feeds.php:1020
+#: classes/feeds.php:1072
+#: classes/feeds.php:1111
+#: classes/pref/labels.php:84
+#: classes/pref/filters.php:528
+#: classes/pref/filters.php:945
+#: classes/pref/filters.php:1022
+#: classes/pref/filters.php:1115
+#: classes/pref/feeds.php:774
+#: classes/pref/feeds.php:916
+#: classes/pref/feeds.php:1669
+#: classes/pref/users.php:105
+#: classes/pref/prefs.php:984
+#: classes/article.php:238
+#: classes/handler/public.php:443
+#: classes/handler/public.php:477
+#: plugins/mail/init.php:179
+#: plugins/note/init.php:60
+msgid "Cancel"
+msgstr "Cancel·la"
+
+#: classes/feeds.php:1042
+#: classes/feeds.php:1110
+#: classes/pref/filters.php:788
+#: classes/pref/feeds.php:1178
+#: classes/pref/users.php:345
+#: js/tt-rss.js:152
+msgid "Search"
+msgstr "Cerca"
+
+#: classes/feeds.php:1046
+#, fuzzy
+msgid "Popular feeds"
+msgstr "mostra els canals"
+
+#: classes/feeds.php:1047
+#, fuzzy
+msgid "Feed archive"
+msgstr "Accions dels canals"
+
+#: classes/feeds.php:1050
+#, fuzzy
+msgid "limit:"
+msgstr "Límit:"
+
+#: classes/feeds.php:1071
+#: classes/pref/labels.php:282
+#: classes/pref/filters.php:518
+#: classes/pref/filters.php:814
+#: classes/pref/feeds.php:751
+#: classes/pref/users.php:369
+msgid "Remove"
+msgstr "Suprimeix"
+
+#: classes/feeds.php:1084
+msgid "Look for"
+msgstr "Mirar-ho per"
+
+#: classes/feeds.php:1092
+#, php-format
+msgid "in %s"
 msgstr ""
 
-#: classes/handler/public.php:824
-msgid "Your access level is insufficient to run this script."
-msgstr "No teniu prou permisos per a executar aquest script."
+#: classes/feeds.php:1097
+msgid "Used for word stemming"
+msgstr ""
 
-#: classes/handler/public.php:850
-msgid "Database Updater"
-msgstr "Eina d'actualització de la base de dades"
+#: classes/feeds.php:1106
+#, fuzzy
+msgid "Search syntax"
+msgstr "Convertir en intitulé"
 
-#: classes/handler/public.php:915
-msgid "Perform updates"
-msgstr "Aplica les actualitzacions"
+#: classes/feeds.php:1563
+msgid "Starred articles"
+msgstr "Articles marcats"
+
+#: classes/feeds.php:1565
+msgid "Published articles"
+msgstr "Articles publicats"
+
+#: classes/feeds.php:1567
+msgid "Fresh articles"
+msgstr "Articles nous"
+
+#: classes/feeds.php:1571
+#, fuzzy
+msgid "Archived articles"
+msgstr "Articles mémorisés"
+
+#: classes/feeds.php:1573
+msgid "Recently read"
+msgstr ""
+
+#: classes/feeds.php:1694
+msgid "Special"
+msgstr "Especial"
+
+#: classes/feeds.php:1951
+#, fuzzy, php-format
+msgid "Search results: %s"
+msgstr "Resultats de la cerca"
 
 #: classes/pref/labels.php:25
 #: classes/pref/filters.php:377
@@ -1280,206 +1282,206 @@ msgstr "Primer pla"
 msgid "Background:"
 msgstr "Fons"
 
+#: classes/pref/labels.php:82
+#: classes/pref/filters.php:525
+#: classes/pref/feeds.php:773
+#: classes/pref/feeds.php:913
+#: classes/pref/users.php:103
+#: classes/pref/prefs.php:982
+#: classes/article.php:236
+#: plugins/af_zz_imgproxy/init.php:238
+#: plugins/af_redditimgur/init.php:66
+#: plugins/af_psql_trgm/init.php:188
+#: plugins/af_readability/init.php:80
+#: plugins/nsfw/init.php:85
+#: plugins/mail/init.php:65
+#: plugins/note/init.php:58
+msgid "Save"
+msgstr "Desa"
+
 #: classes/pref/labels.php:244
 #, php-format
 msgid "Created label <b>%s</b>"
 msgstr "S'ha creat l'etiqueta <b>%s</b> "
 
 #: classes/pref/labels.php:270
-#: classes/pref/users.php:356
-#: classes/pref/feeds.php:1183
-#: classes/pref/feeds.php:1414
-#: classes/pref/feeds.php:1479
 #: classes/pref/filters.php:388
 #: classes/pref/filters.php:446
 #: classes/pref/filters.php:792
 #: classes/pref/filters.php:875
 #: classes/pref/filters.php:902
+#: classes/pref/feeds.php:1182
+#: classes/pref/feeds.php:1413
+#: classes/pref/feeds.php:1478
+#: classes/pref/users.php:355
 #: classes/pref/prefs.php:993
 #, fuzzy
 msgid "Select"
 msgstr "Selecciona:"
 
-#: classes/pref/labels.php:273
-#: classes/pref/users.php:359
-#: classes/pref/feeds.php:1186
-#: classes/pref/feeds.php:1417
-#: classes/pref/feeds.php:1482
-#: classes/pref/filters.php:391
-#: classes/pref/filters.php:449
-#: classes/pref/filters.php:795
-#: classes/pref/filters.php:878
-#: classes/pref/filters.php:905
-#: classes/pref/prefs.php:996
-#: classes/feeds.php:102
-msgid "All"
-msgstr "Tot"
-
-#: classes/pref/labels.php:275
-#: classes/pref/users.php:361
-#: classes/pref/feeds.php:1188
-#: classes/pref/feeds.php:1419
-#: classes/pref/feeds.php:1484
-#: classes/pref/filters.php:393
-#: classes/pref/filters.php:451
-#: classes/pref/filters.php:797
-#: classes/pref/filters.php:880
-#: classes/pref/filters.php:907
-#: classes/pref/prefs.php:998
-#: classes/feeds.php:105
-msgid "None"
-msgstr "Cap"
-
-#: classes/pref/labels.php:282
-#: classes/pref/users.php:370
-#: classes/pref/feeds.php:752
-#: classes/pref/filters.php:518
-#: classes/pref/filters.php:814
-#: classes/feeds.php:1088
-msgid "Remove"
-msgstr "Suprimeix"
-
 #: classes/pref/labels.php:285
 msgid "Clear colors"
 msgstr "Elimina els colors"
 
-#: classes/pref/users.php:6
-#: classes/pref/system.php:8
-msgid "Your access level is insufficient to open this tab."
-msgstr "No teniu  permisos per a obrir aquesta pestanya."
-
-#: classes/pref/users.php:26
+#: classes/pref/filters.php:155
 #, fuzzy
-msgid "Edit user"
-msgstr "Filtres"
+msgid "Preview article"
+msgstr "Filtra l'article"
 
-#: classes/pref/users.php:61
-#: classes/pref/feeds.php:622
-#: classes/pref/feeds.php:849
-#: classes/feeds.php:1009
-msgid "Authentication"
-msgstr "Autenticació"
-
-#: classes/pref/users.php:64
-msgid "Access level: "
-msgstr "Nivell d'accés:"
-
-#: classes/pref/users.php:82
-#: classes/pref/feeds.php:648
-#: classes/pref/feeds.php:867
-msgid "Options"
-msgstr "Opcions"
-
-#: classes/pref/users.php:96
-#: js/prefs.js:479
-msgid "User details"
-msgstr "Detalls de l'usuari"
-
-#: classes/pref/users.php:136
-#: classes/pref/users.php:407
-msgid "Registered"
-msgstr "Registrat"
-
-#: classes/pref/users.php:137
-msgid "Last logged in"
-msgstr "Última connexió el"
-
-#: classes/pref/users.php:145
-msgid "Subscribed feeds count"
-msgstr "Nombre de canals subscrits"
-
-#: classes/pref/users.php:146
+#: classes/pref/filters.php:267
+#: classes/pref/filters.php:573
 #, fuzzy
-msgid "Stored articles"
-msgstr "Articles marcats"
+msgid "(inverse)"
+msgstr "(Invers)"
 
-#: classes/pref/users.php:150
-#: classes/pref/users.php:406
-msgid "Subscribed feeds"
-msgstr "Canals subscrits"
-
-#: classes/pref/users.php:176
-msgid "User not found"
-msgstr "No s'ha trobat l'usuari"
-
-#: classes/pref/users.php:246
+#: classes/pref/filters.php:263
+#: classes/pref/filters.php:572
 #, php-format
-msgid "Added user <b>%s</b> with password <b>%s</b>"
-msgstr "S'ha creat l'usuari <b>%s</b> amb la contrasenya <b>%s</b>"
-
-#: classes/pref/users.php:253
-#, php-format
-msgid "Could not create user <b>%s</b>"
-msgstr "No s'ha pogut crear l'usuari <b>%s</b>"
-
-#: classes/pref/users.php:257
-#, php-format
-msgid "User <b>%s</b> already exists."
-msgstr "L'usuari<b>%s</b> ja existeix."
-
-#: classes/pref/users.php:285
-#, fuzzy, php-format
-msgid "Changed password of user <b>%s</b> to <b>%s</b>"
+msgid "%s on %s in %s %s"
 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:287
-#, fuzzy, php-format
-msgid "Sending new password of user <b>%s</b> to <b>%s</b>"
+#: classes/pref/filters.php:383
+#: classes/pref/filters.php:870
+#: classes/pref/filters.php:977
+msgid "Match"
+msgstr "Coincidència"
+
+#: classes/pref/filters.php:397
+#: classes/pref/filters.php:455
+#: classes/pref/filters.php:884
+#: classes/pref/filters.php:911
+msgid "Add"
 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:311
-msgid "[tt-rss] Password change notification"
-msgstr "[tt-rss] Notificació de canvi de contrasenya"
+#: classes/pref/filters.php:441
+#: classes/pref/filters.php:897
+#, fuzzy
+msgid "Apply actions"
+msgstr "Accions dels canals"
 
-#: classes/pref/users.php:346
-#: classes/pref/feeds.php:1179
-#: classes/pref/filters.php:788
-#: classes/feeds.php:1059
-#: classes/feeds.php:1127
-#: js/tt-rss.js:165
-msgid "Search"
-msgstr "Cerca"
+#: classes/pref/filters.php:492
+#: classes/pref/filters.php:926
+msgid "Enabled"
+msgstr "Activat"
 
-#: classes/pref/users.php:364
-msgid "Create user"
-msgstr "Crea un usuari"
+#: classes/pref/filters.php:501
+#: classes/pref/filters.php:929
+#, fuzzy
+msgid "Match any rule"
+msgstr "Basat en:"
+
+#: classes/pref/filters.php:510
+#: classes/pref/filters.php:932
+#, fuzzy
+msgid "Inverse matching"
+msgstr "Coincidència inversa"
+
+#: classes/pref/filters.php:522
+#: classes/pref/filters.php:939
+msgid "Test"
+msgstr "Tester"
+
+#: classes/pref/filters.php:804
+msgid "Combine"
+msgstr ""
 
-#: classes/pref/users.php:368
 #: classes/pref/filters.php:807
+#: classes/pref/users.php:367
 msgid "Edit"
 msgstr "Edita"
 
-#: classes/pref/users.php:404
-#: classes/pref/feeds.php:626
-#: classes/pref/feeds.php:853
-#: classes/pref/feeds.php:1649
-#: classes/feeds.php:1013
-msgid "Login"
-msgstr "Entra"
+#: classes/pref/filters.php:810
+#: classes/pref/feeds.php:1198
+#: classes/pref/feeds.php:1212
+#, fuzzy
+msgid "Reset sort order"
+msgstr "Reinicia la contrasenya"
 
-#: classes/pref/users.php:405
-msgid "Access Level"
-msgstr "Permisos"
+#: classes/pref/filters.php:942
+msgid "Create"
+msgstr "Crea"
 
-#: classes/pref/users.php:408
-msgid "Last login"
-msgstr "Última connexió"
+#: classes/pref/filters.php:987
+msgid "Regular expression, without outer delimiters (i.e. slashes)"
+msgstr ""
 
-#: classes/pref/users.php:427
-msgid "Click to edit"
-msgstr "Feu clic per editar"
+#: classes/pref/filters.php:993
+msgid "Inverse regular expression matching"
+msgstr ""
 
-#: classes/pref/users.php:447
-msgid "No users defined."
-msgstr "No s'han definit els usuaris."
+#: classes/pref/filters.php:995
+msgid "on field"
+msgstr "al camp"
 
-#: classes/pref/users.php:449
-msgid "No matching users found."
-msgstr "No s'ha trobat cap usuari que coinicideixi. "
+#: classes/pref/filters.php:1001
+#: js/PrefFilterTree.js:44
+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:764
+#, 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:786
+#, fuzzy
+msgid "Add action"
+msgstr "Accions dels canals"
+
+#: classes/pref/filters.php:1139
+#, fuzzy
+msgid "[No caption]"
+msgstr "Descriptif"
+
+#: classes/pref/filters.php:1141
+#, 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:1155
+#, fuzzy
+msgid "matches any rule"
+msgstr "Basat en:"
+
+#: classes/pref/filters.php:1158
+#, fuzzy, php-format
+msgid "%s (+%d action)"
+msgid_plural "%s (+%d actions)"
+msgstr[0] "Accions dels canals"
+msgstr[1] "Accions dels canals"
+
+#: classes/pref/system.php:8
+#: classes/pref/users.php:6
+msgid "Your access level is insufficient to open this tab."
+msgstr "No teniu  permisos per a obrir aquesta pestanya."
 
 #: classes/pref/system.php:29
 msgid "Error Log"
@@ -1526,420 +1528,341 @@ msgid_plural "(%d feeds)"
 msgstr[0] "Edita el canal"
 msgstr[1] "Edita el canal"
 
-#: classes/pref/feeds.php:514
+#: classes/pref/feeds.php:513
 #: classes/pref/prefs.php:18
 msgid "General"
 msgstr "General"
 
-#: classes/pref/feeds.php:528
+#: classes/pref/feeds.php:527
 #, fuzzy
 msgid "Feed Title"
 msgstr "Títol"
 
-#: classes/pref/feeds.php:560
-#: classes/pref/feeds.php:801
-#: classes/pref/feeds.php:1635
-#: classes/feeds.php:989
-msgid "Place in category:"
-msgstr "Posa'l a la categoria:"
+#: classes/pref/feeds.php:536
+#: classes/handler/public.php:417
+msgid "URL:"
+msgstr "URL:"
 
-#: classes/pref/feeds.php:572
+#: classes/pref/feeds.php:571
 #, fuzzy
 msgid "Site URL:"
 msgstr "Titre&nbsp;:"
 
-#: classes/pref/feeds.php:574
+#: classes/pref/feeds.php:573
 #, fuzzy
 msgid "Site URL"
 msgstr "Canal"
 
-#: classes/pref/feeds.php:585
-#: classes/pref/feeds.php:815
+#: classes/pref/feeds.php:584
+#: classes/pref/feeds.php:814
 #, fuzzy
 msgid "Language:"
 msgstr "Idioma:"
 
-#: classes/pref/feeds.php:592
-#: classes/pref/feeds.php:824
+#: classes/pref/feeds.php:591
+#: classes/pref/feeds.php:823
 msgid "Update"
 msgstr "Actualitza"
 
-#: classes/pref/feeds.php:607
-#: classes/pref/feeds.php:840
+#: classes/pref/feeds.php:606
+#: classes/pref/feeds.php:839
 msgid "Article purging:"
 msgstr "Neteja d'articles:"
 
-#: classes/pref/feeds.php:632
-#: classes/pref/feeds.php:861
-#: classes/pref/feeds.php:1652
-#: classes/pref/prefs.php:243
-#: classes/feeds.php:1017
-#, fuzzy
-msgid "Password"
-msgstr "Contrasenya:"
-
-#: classes/pref/feeds.php:636
+#: classes/pref/feeds.php:635
 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:646
-#: classes/feeds.php:1028
-msgid "This feed requires authentication."
-msgstr "Aquest canal requereix autenticació."
+#: classes/pref/feeds.php:647
+#: classes/pref/feeds.php:866
+#: classes/pref/users.php:82
+msgid "Options"
+msgstr "Opcions"
 
-#: classes/pref/feeds.php:662
-#: classes/pref/feeds.php:871
+#: classes/pref/feeds.php:661
+#: classes/pref/feeds.php:870
 #, fuzzy
 msgid "Hide from Popular feeds"
 msgstr "Amaga-ho de la llista de canals"
 
-#: classes/pref/feeds.php:674
-#: classes/pref/feeds.php:877
+#: classes/pref/feeds.php:673
+#: classes/pref/feeds.php:876
 msgid "Include in e-mail digest"
 msgstr "Inclou-lo en el resum diari per correu electrònic"
 
-#: classes/pref/feeds.php:687
-#: classes/pref/feeds.php:883
+#: classes/pref/feeds.php:686
+#: classes/pref/feeds.php:882
 msgid "Always display image attachments"
 msgstr "Mostra les imatges adjuntes"
 
-#: classes/pref/feeds.php:700
-#: classes/pref/feeds.php:891
+#: classes/pref/feeds.php:699
+#: classes/pref/feeds.php:890
 #, fuzzy
 msgid "Do not embed media"
 msgstr "No mostris imatges en els articles"
 
-#: classes/pref/feeds.php:713
-#: classes/pref/feeds.php:899
+#: classes/pref/feeds.php:712
+#: classes/pref/feeds.php:898
 msgid "Cache media"
 msgstr ""
 
-#: classes/pref/feeds.php:725
-#: classes/pref/feeds.php:905
+#: classes/pref/feeds.php:724
+#: classes/pref/feeds.php:904
 #, fuzzy
 msgid "Mark updated articles as unread"
 msgstr "Esteu segur que voleu marcar tots els articles com a llegits?"
 
-#: classes/pref/feeds.php:729
+#: classes/pref/feeds.php:728
 #, fuzzy
 msgid "Icon"
 msgstr "Action"
 
-#: classes/pref/feeds.php:743
-#: classes/pref/feeds.php:1284
+#: classes/pref/feeds.php:742
+#: classes/pref/feeds.php:1283
 #: plugins/import_export/init.php:71
 #, fuzzy
 msgid "Choose file..."
 msgstr "Crea un filtre..."
 
-#: classes/pref/feeds.php:750
+#: classes/pref/feeds.php:749
 msgid "Replace"
 msgstr ""
 
-#: classes/pref/feeds.php:757
+#: classes/pref/feeds.php:756
 #: classes/pref/prefs.php:679
 msgid "Plugins"
 msgstr ""
 
-#: classes/pref/feeds.php:1154
+#: classes/pref/feeds.php:1153
 #, fuzzy
 msgid "Feeds with errors"
 msgstr "Editor de canals"
 
-#: classes/pref/feeds.php:1161
+#: classes/pref/feeds.php:1160
 #, fuzzy
 msgid "Inactive feeds"
 msgstr "Tots els canals"
 
-#: classes/pref/feeds.php:1197
+#: classes/pref/feeds.php:1196
 #, fuzzy
 msgid "Edit selected feeds"
 msgstr "S'estan purgant els canals seleccionats..."
 
-#: classes/pref/feeds.php:1199
-#: classes/pref/feeds.php:1213
-#: classes/pref/filters.php:810
-#, fuzzy
-msgid "Reset sort order"
-msgstr "Reinicia la contrasenya"
-
-#: classes/pref/feeds.php:1201
-#: js/prefs.js:1462
+#: classes/pref/feeds.php:1200
+#: js/prefs.js:1171
 #, fuzzy
 msgid "Batch subscribe"
 msgstr "Dóna't de baixa"
 
-#: classes/pref/feeds.php:1208
+#: classes/pref/feeds.php:1207
 #, fuzzy
 msgid "Categories"
 msgstr "Catégorie&nbsp;:"
 
-#: classes/pref/feeds.php:1211
+#: classes/pref/feeds.php:1210
 #, fuzzy
 msgid "Add category"
 msgstr "S'està afegint la categoria..."
 
-#: classes/pref/feeds.php:1215
+#: classes/pref/feeds.php:1214
 #, fuzzy
 msgid "Remove selected"
 msgstr "Esteu segur que voleu suprimir els filtres seleccionats?"
 
-#: classes/pref/feeds.php:1272
+#: classes/pref/feeds.php:1271
 msgid "OPML"
 msgstr "OPML"
 
-#: classes/pref/feeds.php:1274
+#: classes/pref/feeds.php:1273
 msgid "Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings."
 msgstr ""
 
-#: classes/pref/feeds.php:1275
+#: classes/pref/feeds.php:1274
 msgid "Only main settings profile can be migrated using OPML."
 msgstr ""
 
-#: classes/pref/feeds.php:1290
+#: classes/pref/feeds.php:1289
 #, fuzzy
 msgid "Import my OPML"
 msgstr "S'està important OPML (s'està utilitzant l'extensió DOMXML)..."
 
-#: classes/pref/feeds.php:1296
+#: classes/pref/feeds.php:1295
 msgid "Filename:"
 msgstr ""
 
-#: classes/pref/feeds.php:1298
+#: classes/pref/feeds.php:1297
 #, fuzzy
 msgid "Include settings"
 msgstr "Inclou-lo en el resum diari per correu electrònic"
 
-#: classes/pref/feeds.php:1302
+#: classes/pref/feeds.php:1301
 #, fuzzy
 msgid "Export OPML"
 msgstr "Exporta en format OPML"
 
-#: classes/pref/feeds.php:1306
+#: classes/pref/feeds.php:1305
 #, 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:1310
+#: classes/pref/feeds.php:1309
 msgid "Public OPML URL"
 msgstr ""
 
-#: classes/pref/feeds.php:1311
+#: classes/pref/feeds.php:1310
 msgid "Display published OPML URL"
 msgstr ""
 
-#: classes/pref/feeds.php:1318
+#: classes/pref/feeds.php:1317
 #, 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:1320
+#: classes/pref/feeds.php:1319
 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:1327
-#: classes/feeds.php:54
-#: classes/feeds.php:140
-#, fuzzy
-msgid "View as RSS"
-msgstr "Visualitza les etiquetes"
-
-#: classes/pref/feeds.php:1328
 #, fuzzy
 msgid "Display URL"
 msgstr "afficher les étiquettes"
 
-#: classes/pref/feeds.php:1331
+#: classes/pref/feeds.php:1330
 msgid "Clear all generated URLs"
 msgstr ""
 
-#: classes/pref/feeds.php:1410
+#: classes/pref/feeds.php:1409
 #, 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:1444
-#: classes/pref/feeds.php:1509
+#: classes/pref/feeds.php:1443
+#: classes/pref/feeds.php:1508
 #, fuzzy
 msgid "Click to edit feed"
 msgstr "Feu clic per editar"
 
-#: classes/pref/feeds.php:1462
-#: classes/pref/feeds.php:1529
+#: classes/pref/feeds.php:1461
+#: classes/pref/feeds.php:1528
 #, fuzzy
 msgid "Unsubscribe from selected feeds"
 msgstr "Us voleu donar de baixa dels canals seleccionats?"
 
-#: classes/pref/feeds.php:1632
+#: classes/pref/feeds.php:1629
 msgid "Add one valid RSS feed per line (no feed detection is done)"
 msgstr ""
 
-#: classes/pref/feeds.php:1641
+#: classes/pref/feeds.php:1638
 msgid "Feeds to subscribe, One per line"
 msgstr ""
 
-#: classes/pref/feeds.php:1664
+#: classes/pref/feeds.php:1661
 #, fuzzy
 msgid "Feeds require authentication."
 msgstr "Aquest canal requereix autenticació."
 
-#: classes/pref/feeds.php:1671
-#: classes/feeds.php:1031
-#: classes/feeds.php:1087
-msgid "Subscribe"
-msgstr "Subscriu-t'hi"
-
-#: classes/pref/filters.php:155
+#: classes/pref/users.php:26
 #, fuzzy
-msgid "Preview article"
-msgstr "Filtra l'article"
-
-#: classes/pref/filters.php:267
-#: classes/pref/filters.php:573
-#, fuzzy
-msgid "(inverse)"
-msgstr "(Invers)"
-
-#: classes/pref/filters.php:263
-#: classes/pref/filters.php:572
-#, php-format
-msgid "%s on %s in %s %s"
-msgstr ""
-
-#: classes/pref/filters.php:383
-#: classes/pref/filters.php:870
-#: classes/pref/filters.php:977
-msgid "Match"
-msgstr "Coincidència"
-
-#: classes/pref/filters.php:397
-#: classes/pref/filters.php:455
-#: classes/pref/filters.php:884
-#: classes/pref/filters.php:911
-msgid "Add"
-msgstr ""
-
-#: classes/pref/filters.php:400
-#: classes/pref/filters.php:458
-#: classes/pref/filters.php:887
-#: classes/pref/filters.php:914
-#: classes/feeds.php:122
-#, fuzzy
-msgid "Delete"
-msgstr "Per defecte"
-
-#: classes/pref/filters.php:441
-#: classes/pref/filters.php:897
-#, fuzzy
-msgid "Apply actions"
-msgstr "Accions dels canals"
-
-#: classes/pref/filters.php:492
-#: classes/pref/filters.php:926
-msgid "Enabled"
-msgstr "Activat"
-
-#: classes/pref/filters.php:501
-#: classes/pref/filters.php:929
-#, fuzzy
-msgid "Match any rule"
-msgstr "Basat en:"
-
-#: classes/pref/filters.php:510
-#: classes/pref/filters.php:932
-#, fuzzy
-msgid "Inverse matching"
-msgstr "Coincidència inversa"
-
-#: classes/pref/filters.php:522
-#: classes/pref/filters.php:939
-msgid "Test"
-msgstr "Tester"
-
-#: classes/pref/filters.php:804
-msgid "Combine"
-msgstr ""
-
-#: classes/pref/filters.php:942
-msgid "Create"
-msgstr "Crea"
-
-#: classes/pref/filters.php:987
-msgid "Regular expression, without outer delimiters (i.e. slashes)"
-msgstr ""
-
-#: 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:43
-msgid "in"
-msgstr "a"
-
-#: classes/pref/filters.php:1014
-#, fuzzy
-msgid "Wiki: Filters"
+msgid "Edit user"
 msgstr "Filtres"
 
-#: classes/pref/filters.php:1019
+#: classes/pref/users.php:64
+msgid "Access level: "
+msgstr "Nivell d'accés:"
+
+#: classes/pref/users.php:96
+#: js/prefs.js:403
+msgid "User details"
+msgstr "Detalls de l'usuari"
+
+#: classes/pref/users.php:136
+#: classes/pref/users.php:406
+msgid "Registered"
+msgstr "Registrat"
+
+#: classes/pref/users.php:137
+msgid "Last logged in"
+msgstr "Última connexió el"
+
+#: classes/pref/users.php:145
+msgid "Subscribed feeds count"
+msgstr "Nombre de canals subscrits"
+
+#: classes/pref/users.php:146
 #, fuzzy
-msgid "Save rule"
-msgstr "Desa"
+msgid "Stored articles"
+msgstr "Articles marcats"
 
-#: classes/pref/filters.php:1019
-#: js/functions.js:797
-#, fuzzy
-msgid "Add rule"
-msgstr "S'està afegint la categoria..."
+#: classes/pref/users.php:150
+#: classes/pref/users.php:405
+msgid "Subscribed feeds"
+msgstr "Canals subscrits"
 
-#: classes/pref/filters.php:1042
-msgid "Perform Action"
-msgstr "Acció a realitzar:"
+#: classes/pref/users.php:176
+msgid "User not found"
+msgstr "No s'ha trobat l'usuari"
 
-#: classes/pref/filters.php:1093
-#, fuzzy
-msgid "No actions available"
-msgstr "Hi ha una nova versió de Tiny Tiny RSS!"
+#: classes/pref/users.php:246
+#, php-format
+msgid "Added user <b>%s</b> with password <b>%s</b>"
+msgstr "S'ha creat l'usuari <b>%s</b> amb la contrasenya <b>%s</b>"
 
-#: classes/pref/filters.php:1112
-#, fuzzy
-msgid "Save action"
-msgstr "Quadre d'accions"
+#: classes/pref/users.php:253
+#, php-format
+msgid "Could not create user <b>%s</b>"
+msgstr "No s'ha pogut crear l'usuari <b>%s</b>"
 
-#: classes/pref/filters.php:1112
-#: js/functions.js:819
-#, fuzzy
-msgid "Add action"
-msgstr "Accions dels canals"
+#: classes/pref/users.php:257
+#, php-format
+msgid "User <b>%s</b> already exists."
+msgstr "L'usuari<b>%s</b> ja existeix."
 
-#: classes/pref/filters.php:1139
-#, fuzzy
-msgid "[No caption]"
-msgstr "Descriptif"
-
-#: classes/pref/filters.php:1141
+#: classes/pref/users.php:285
 #, 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..."
+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/filters.php:1155
-#, fuzzy
-msgid "matches any rule"
-msgstr "Basat en:"
-
-#: classes/pref/filters.php:1158
+#: classes/pref/users.php:287
 #, fuzzy, php-format
-msgid "%s (+%d action)"
-msgid_plural "%s (+%d actions)"
-msgstr[0] "Accions dels canals"
-msgstr[1] "Accions dels canals"
+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:310
+msgid "[tt-rss] Password change notification"
+msgstr "[tt-rss] Notificació de canvi de contrasenya"
+
+#: classes/pref/users.php:363
+msgid "Create user"
+msgstr "Crea un usuari"
+
+#: classes/pref/users.php:371
+#: classes/handler/public.php:747
+msgid "Reset password"
+msgstr "Reinicia la contrasenya"
+
+#: classes/pref/users.php:404
+msgid "Access Level"
+msgstr "Permisos"
+
+#: classes/pref/users.php:407
+msgid "Last login"
+msgstr "Última connexió"
+
+#: classes/pref/users.php:426
+msgid "Click to edit"
+msgstr "Feu clic per editar"
+
+#: classes/pref/users.php:446
+msgid "No users defined."
+msgstr "No s'han definit els usuaris."
+
+#: classes/pref/users.php:448
+msgid "No matching users found."
+msgstr "No s'ha trobat cap usuari que coinicideixi. "
 
 #: classes/pref/prefs.php:19
 msgid "Interface"
@@ -2127,7 +2050,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:1424
+#: js/prefs.js:1136
 #, fuzzy
 msgid "Customize stylesheet"
 msgstr "URL de la fulla d'estils personalitzada."
@@ -2393,275 +2316,318 @@ msgstr "Esteu segur que voleu suprimir els filtres seleccionats?"
 msgid "Activate profile"
 msgstr "Esteu segur que voleu suprimir els filtres seleccionats?"
 
-#: classes/feeds.php:53
-#, fuzzy
-msgid "View as RSS feed"
-msgstr "Visualitza els canals"
+#: 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/feeds.php:62
+#: classes/dlg.php:44
+#, fuzzy
+msgid "Your Public OPML URL is:"
+msgstr "Enllaç als articles publicats del canal."
+
+#: classes/dlg.php:53
+#: classes/dlg.php:178
+#: plugins/share/init.php:125
+#, fuzzy
+msgid "Generate new URL"
+msgstr "Canals generats"
+
+#: classes/dlg.php:67
+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 "L'actualització de daemon està activada en la configuració però el procés daemon no funciona, fet que impedeix l'actualització de tots els canals. Si us plau, engegueu el procés del daemon o contacteu amb el responsable pertinent."
+
+#: classes/dlg.php:71
+#: classes/dlg.php:80
+msgid "Last update:"
+msgstr "Última actualització:"
+
+#: classes/dlg.php:76
+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 "L'actualització del daemon és més llarga que la d'un canal. Això pot indicar un problema com la caiguda. Si us plau, reviseu dels processos del daemon o contacteu amb el seu propietari."
+
+#: classes/dlg.php:169
+msgid "You can view this feed as RSS using the following URL:"
+msgstr ""
+
+#: classes/dlg.php:190
+msgid "You are using default tt-rss password. Please change it in the Preferences (Personal data / Authentication)."
+msgstr ""
+
+#: classes/dlg.php:194
+#, fuzzy
+msgid "Open Preferences"
+msgstr "Preferències"
+
+#: classes/opml.php:31
+#: classes/opml.php:36
+msgid "OPML Utility"
+msgstr "Eina OPML"
+
+#: classes/opml.php:40
+#, fuzzy
+msgid "Importing OPML..."
+msgstr "S'està important OPML (s'està utilitzant l'extensió DOMXML)..."
+
+#: classes/opml.php:45
+msgid "Return to preferences"
+msgstr "Torna a les preferències"
+
+#: classes/opml.php:301
 #, fuzzy, php-format
-msgid "Last updated: %s"
-msgstr "Dernière mise à jour&nbsp;:"
+msgid "Adding feed: %s"
+msgstr "S'està afegint el canal..."
 
-#: classes/feeds.php:100
+#: classes/opml.php:312
+#, fuzzy, php-format
+msgid "Duplicate feed: %s"
+msgstr "Crea un filtre"
+
+#: classes/opml.php:326
+#, fuzzy, php-format
+msgid "Adding label %s"
+msgstr "Assigna-li l'etiqueta"
+
+#: classes/opml.php:329
+#, php-format
+msgid "Duplicate label: %s"
+msgstr ""
+
+#: classes/opml.php:341
+#, php-format
+msgid "Setting preference key %s to %s"
+msgstr ""
+
+#: classes/opml.php:377
 #, fuzzy
-msgid "Select..."
-msgstr "Selecciona:"
+msgid "Adding filter..."
+msgstr "S'està afegint el canal..."
 
-#: classes/feeds.php:104
-msgid "Invert"
-msgstr "Inverteix"
+#: classes/opml.php:512
+#, fuzzy, php-format
+msgid "Processing category: %s"
+msgstr "Posa'l a la categoria:"
 
-#: classes/feeds.php:107
-msgid "Selection toggle:"
-msgstr "Commuta la selecció"
+#: classes/opml.php:558
+#, php-format
+msgid "Upload failed with error code %d"
+msgstr ""
 
-#: classes/feeds.php:113
-msgid "Selection:"
-msgstr "Selecció:"
-
-#: classes/feeds.php:116
+#: classes/opml.php:570
+#: plugins/import_export/init.php:471
 #, fuzzy
-msgid "Set score"
-msgstr "Puntuació"
+msgid "Unable to move uploaded file."
+msgstr "Error: si us plau carregueu el fitxer OPML."
 
-#: classes/feeds.php:119
+#: classes/opml.php:574
+#: plugins/import_export/init.php:475
+msgid "Error: please upload OPML file."
+msgstr "Error: si us plau carregueu el fitxer OPML."
+
+#: classes/opml.php:585
 #, fuzzy
-msgid "Archive"
-msgstr "Data de l'article"
+msgid "Error: unable to find moved OPML file."
+msgstr "Error: si us plau carregueu el fitxer OPML."
 
-#: classes/feeds.php:121
+#: classes/opml.php:594
+msgid "Error while parsing document."
+msgstr "Error mentre s'analitza el document."
+
+#: classes/article.php:26
 #, fuzzy
-msgid "Move back"
-msgstr "Vés enrere"
-
-#: classes/feeds.php:127
-#: classes/feeds.php:132
-#: plugins/mail/init.php:76
-#: plugins/mailto/init.php:25
-#, fuzzy
-msgid "Forward by email"
-msgstr "Marca l'article"
-
-#: classes/feeds.php:136
-msgid "Feed:"
-msgstr "Flux&nbsp;:"
-
-#: classes/feeds.php:193
-#: classes/feeds.php:819
-msgid "Feed not found."
+msgid "Article not found."
 msgstr "No s'ha trobat el canal."
 
-#: classes/feeds.php:255
+#: classes/article.php:211
+msgid "Tags for this article (separated by commas):"
+msgstr "Etiquetes per aquest article (separades per comes):"
+
+#: classes/article.php:337
+#: classes/article.php:719
+#: classes/article.php:874
+msgid "no tags"
+msgstr "sense etiqueta"
+
+#: classes/article.php:447
+msgid "unknown type"
+msgstr "tipus desconegut"
+
+#: classes/article.php:524
 #, fuzzy
-msgid "Never"
-msgstr "No ho purguis mai"
+msgid "Attachments"
+msgstr "Adjuncions:"
 
-#: classes/feeds.php:342
-#, fuzzy, php-format
-msgid "Imported at %s"
-msgstr "Importeu"
+#: classes/article.php:688
+msgid " - "
+msgstr " - "
 
-#: classes/feeds.php:394
-#: classes/feeds.php:487
+#: classes/article.php:912
 #, fuzzy
-msgid "mark feed as read"
-msgstr "Marca el canal com a llegit"
+msgid "(edit note)"
+msgstr "edita la nota"
 
-#: classes/feeds.php:542
+#: classes/handler/public.php:407
+#: plugins/bookmarklets/init.php:40
 #, fuzzy
-msgid "Collapse article"
-msgstr "Buida els articles"
+msgid "Share with Tiny Tiny RSS"
+msgstr "Torna a Tiny Tiny RSS"
 
-#: classes/feeds.php:703
-msgid "No unread articles found to display."
-msgstr "No es poden mostrar els articles no llegits perquè no n'hi ha."
+#: classes/handler/public.php:415
+msgid "Title:"
+msgstr "Titre&nbsp;:"
 
-#: classes/feeds.php:706
-msgid "No updated articles found to display."
-msgstr "No hi ha cap article actualitzat."
-
-#: classes/feeds.php:709
-msgid "No starred articles found to display."
-msgstr "No hi ha articles marcats per mostrar."
-
-#: classes/feeds.php:713
+#: classes/handler/public.php:419
 #, 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."
+msgid "Content:"
+msgstr "Contingut"
 
-#: classes/feeds.php:715
-msgid "No articles found to display."
-msgstr "No s'han trobat articles per a mostrar."
-
-#: classes/feeds.php:731
-#: classes/feeds.php:922
-#, fuzzy, php-format
-msgid "Feeds last updated at %s"
-msgstr "Erreurs de mise à jour"
-
-#: classes/feeds.php:743
-#: classes/feeds.php:934
-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:911
-msgid "No feed selected."
-msgstr "No heu seleccionat cap canal."
-
-#: classes/feeds.php:975
-#: classes/feeds.php:983
+#: classes/handler/public.php:421
 #, fuzzy
-msgid "Feed or site URL"
-msgstr "Canal"
+msgid "Labels:"
+msgstr "Etiquetes"
 
-#: classes/feeds.php:997
+#: classes/handler/public.php:440
+msgid "Shared article will appear in the Published feed."
+msgstr ""
+
+#: classes/handler/public.php:442
+msgid "Share"
+msgstr ""
+
+#: classes/handler/public.php:464
 #, fuzzy
-msgid "Available feeds"
-msgstr "Tots els canals"
+msgid "Not logged in"
+msgstr "Última connexió el"
 
-#: classes/feeds.php:1034
-#, fuzzy
-msgid "More feeds"
-msgstr "Més canals"
+#: classes/handler/public.php:527
+msgid "Incorrect username or password"
+msgstr "El nom d'usuari o la contrasenya és incorrecte"
 
-#: classes/feeds.php:1063
-#, fuzzy
-msgid "Popular feeds"
-msgstr "mostra els canals"
-
-#: classes/feeds.php:1064
-#, fuzzy
-msgid "Feed archive"
-msgstr "Accions dels canals"
-
-#: classes/feeds.php:1067
-#, fuzzy
-msgid "limit:"
-msgstr "Límit:"
-
-#: classes/feeds.php:1101
-msgid "Look for"
-msgstr "Mirar-ho per"
-
-#: classes/feeds.php:1109
+#: classes/handler/public.php:581
 #, php-format
-msgid "in %s"
-msgstr ""
+msgid "Already subscribed to <b>%s</b>."
+msgstr "Ja esteu subscrit a <b>%s</b>."
 
-#: classes/feeds.php:1114
-msgid "Used for word stemming"
-msgstr ""
+#: classes/handler/public.php:584
+#, php-format
+msgid "Subscribed to <b>%s</b>."
+msgstr "Subscrit a <b>%s</b>."
 
-#: classes/feeds.php:1123
-#, fuzzy
-msgid "Search syntax"
-msgstr "Convertir en intitulé"
-
-#: classes/feeds.php:1577
-msgid "Starred articles"
-msgstr "Articles marcats"
-
-#: classes/feeds.php:1579
-msgid "Published articles"
-msgstr "Articles publicats"
-
-#: classes/feeds.php:1581
-msgid "Fresh articles"
-msgstr "Articles nous"
-
-#: classes/feeds.php:1585
-#, fuzzy
-msgid "Archived articles"
-msgstr "Articles mémorisés"
-
-#: classes/feeds.php:1587
-msgid "Recently read"
-msgstr ""
-
-#: classes/feeds.php:1708
-msgid "Special"
-msgstr "Especial"
-
-#: classes/feeds.php:1965
+#: classes/handler/public.php:587
 #, fuzzy, php-format
-msgid "Search results: %s"
-msgstr "Resultats de la cerca"
+msgid "Could not subscribe to <b>%s</b>."
+msgstr "Ja esteu subscrit a <b>%s</b>."
 
-#: plugins/nsfw/init.php:30
-#: plugins/nsfw/init.php:42
-msgid "Not work safe (click to toggle)"
-msgstr ""
+#: classes/handler/public.php:590
+#, fuzzy, php-format
+msgid "No feeds found in <b>%s</b>."
+msgstr "No s'ha trobat cap canal."
 
-#: 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
+#: classes/handler/public.php:593
 #, fuzzy
-msgid "Configuration saved."
+msgid "Multiple feed URLs found."
+msgstr "L'adreça URL del canal ha canviat."
+
+#: classes/handler/public.php:597
+#, 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:615
+#, fuzzy
+msgid "Subscribe to selected feed"
+msgstr "Us voleu donar de baixa dels canals seleccionats?"
+
+#: classes/handler/public.php:642
+msgid "Edit subscription options"
+msgstr "Edita les opcions de les subscripcions"
+
+#: classes/handler/public.php:680
+#, fuzzy
+msgid "Password recovery"
+msgstr "Contrasenya:"
+
+#: classes/handler/public.php:725
+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:757
+msgid "Some of the required form parameters are missing or incorrect."
+msgstr ""
+
+#: classes/handler/public.php:761
+#: classes/handler/public.php:830
+#, fuzzy
+msgid "Go back"
+msgstr "Vés enrere"
+
+#: classes/handler/public.php:799
+#, fuzzy
+msgid "[tt-rss] Password reset request"
+msgstr "[tt-rss] Notificació de canvi de contrasenya"
+
+#: classes/handler/public.php:826
+msgid "Sorry, login and email combination not found."
+msgstr ""
+
+#: 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:874
+msgid "Database Updater"
+msgstr "Eina d'actualització de la base de dades"
+
+#: classes/handler/public.php:939
+msgid "Perform updates"
+msgstr "Aplica les actualitzacions"
+
+#: plugins/af_zz_imgproxy/init.php:208
+msgid "Image proxy settings (af_zz_imgproxy)"
+msgstr ""
+
+#: plugins/af_zz_imgproxy/init.php:232
+#, fuzzy
+msgid "Enable proxy for all remote images."
+msgstr "Afficher les icônes dans la liste des flux"
+
+#: plugins/af_zz_imgproxy/init.php:236
+#, fuzzy
+msgid "Don't cache files locally."
+msgstr "Emmagatzema les imatges localment"
+
+#: plugins/af_zz_imgproxy/init.php:252
+#: plugins/af_redditimgur/init.php:79
+#, fuzzy
+msgid "Configuration saved"
 msgstr "S'ha desat la configuració"
 
-#: plugins/note/init.php:28
-#: plugins/note/note.js:11
-#, fuzzy
-msgid "Edit article note"
-msgstr "Edita les etiquetes"
-
 #: plugins/vf_shared/init.php:17
 #: plugins/vf_shared/init.php:73
 #, fuzzy
 msgid "Shared articles"
 msgstr "Articles marcats"
 
-#: plugins/auth_internal/init.php:67
-#, fuzzy
-msgid "Please enter your one time password:"
-msgstr "Si us plau, escriviu una nota per aquest article:"
-
-#: plugins/auth_internal/init.php:208
-msgid "Password has been changed."
-msgstr "S'ha modificat la contrasenya."
-
-#: plugins/auth_internal/init.php:210
-msgid "Old password is incorrect."
-msgstr "La contrasenya antiga és incorrecta."
-
-#: plugins/af_readability/init.php:25
-msgid "Data saved."
+#: plugins/bookmarklets/init.php:20
+msgid "Bookmarklets"
 msgstr ""
 
-#: plugins/af_readability/init.php:41
-#, fuzzy
-msgid "Inline content"
-msgstr "Desplaça el contingut de l'article"
-
-#: plugins/af_readability/init.php:47
-msgid "Readability settings (af_readability)"
+#: 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_readability/init.php:78
-msgid "Use Readability for pages shared via bookmarklet."
-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_readability/init.php:90
-#: plugins/af_psql_trgm/init.php:198
-msgid "Currently enabled for (click to edit):"
-msgstr ""
-
-#: plugins/af_readability/init.php:107
+#: plugins/bookmarklets/init.php:31
 #, fuzzy
-msgid "Readability"
-msgstr "Comprova la disponibilitat"
+msgid "Subscribe in Tiny Tiny RSS"
+msgstr "Torna a Tiny Tiny RSS"
 
-#: plugins/af_readability/init.php:118
-#, fuzzy
-msgid "Inline article content"
-msgstr "Desplaça el contingut de l'article"
+#: plugins/bookmarklets/init.php:34
+msgid "Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS"
+msgstr ""
 
 #: plugins/af_redditimgur/init.php:30
 msgid "Reddit content settings (af_redditimgur)"
@@ -2675,11 +2641,21 @@ msgstr ""
 msgid "Enable additional duplicate checking"
 msgstr ""
 
-#: plugins/af_redditimgur/init.php:79
-#: plugins/af_zz_imgproxy/init.php:252
-#, fuzzy
-msgid "Configuration saved"
-msgstr "S'ha desat la configuració"
+#: plugins/af_comics/init.php:49
+msgid "Feeds supported by af_comics"
+msgstr ""
+
+#: plugins/af_comics/init.php:51
+msgid "The following comics are currently supported:"
+msgstr ""
+
+#: plugins/af_comics/init.php:69
+msgid "To subscribe to GoComics use the comic's regular web page as the feed URL (e.g. for the <em>Garfield</em> comic use <code>http://www.gocomics.com/garfield</code>)."
+msgstr ""
+
+#: plugins/af_comics/init.php:71
+msgid "Drop any updated filters into <code>filters.local</code> in plugin directory."
+msgstr ""
 
 #: plugins/af_psql_trgm/init.php:29
 #, php-format
@@ -2719,26 +2695,91 @@ msgstr ""
 msgid "Enable for all feeds:"
 msgstr "Afficher les icônes dans la liste des flux"
 
+#: plugins/af_psql_trgm/init.php:198
+#: plugins/af_readability/init.php:90
+msgid "Currently enabled for (click to edit):"
+msgstr ""
+
 #: plugins/af_psql_trgm/init.php:216
 msgid "Similarity (pg_trgm)"
 msgstr ""
 
-#: plugins/af_comics/init.php:49
-msgid "Feeds supported by af_comics"
+#: plugins/af_readability/init.php:25
+msgid "Data saved."
 msgstr ""
 
-#: plugins/af_comics/init.php:51
-msgid "The following comics are currently supported:"
+#: plugins/af_readability/init.php:41
+#, fuzzy
+msgid "Inline content"
+msgstr "Desplaça el contingut de l'article"
+
+#: plugins/af_readability/init.php:47
+msgid "Readability settings (af_readability)"
 msgstr ""
 
-#: plugins/af_comics/init.php:69
-msgid "To subscribe to GoComics use the comic's regular web page as the feed URL (e.g. for the <em>Garfield</em> comic use <code>http://www.gocomics.com/garfield</code>)."
+#: plugins/af_readability/init.php:78
+msgid "Use Readability for pages shared via bookmarklet."
 msgstr ""
 
-#: plugins/af_comics/init.php:71
-msgid "Drop any updated filters into <code>filters.local</code> in plugin directory."
+#: plugins/af_readability/init.php:107
+#, fuzzy
+msgid "Readability"
+msgstr "Comprova la disponibilitat"
+
+#: plugins/af_readability/init.php:118
+#, fuzzy
+msgid "Inline article content"
+msgstr "Desplaça el contingut de l'article"
+
+#: plugins/mailto/init.php:50
+#: plugins/mailto/init.php:58
+#: plugins/mail/init.php:118
+#: plugins/mail/init.php:124
+msgid "[Forwarded]"
 msgstr ""
 
+#: plugins/mailto/init.php:50
+#: plugins/mail/init.php:118
+#, fuzzy
+msgid "Multiple articles"
+msgstr "Tots els articles"
+
+#: plugins/mailto/init.php:74
+msgid "Clicking the following link to invoke your mail client:"
+msgstr ""
+
+#: plugins/mailto/init.php:78
+#, fuzzy
+msgid "Forward selected article(s) by email."
+msgstr "Marca l'article"
+
+#: plugins/mailto/init.php:81
+msgid "You should be able to edit the message before sending in your mail client."
+msgstr ""
+
+#: plugins/mailto/init.php:86
+#, fuzzy
+msgid "Close this dialog"
+msgstr "Tanca la finestra"
+
+#: 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 "S'ha desat la configuració"
+
 #: plugins/import_export/init.php:53
 msgid "Import and export"
 msgstr ""
@@ -2809,109 +2850,6 @@ msgstr ""
 msgid "No file uploaded."
 msgstr "No hi ha cap fitxer OPML per a carregar."
 
-#: plugins/mail/init.php:29
-msgid "Mail addresses saved."
-msgstr ""
-
-#: plugins/mail/init.php:35
-msgid "Mail plugin"
-msgstr ""
-
-#: plugins/mail/init.php:37
-msgid "You can set predefined email addressed here (comma-separated list):"
-msgstr ""
-
-#: plugins/mail/init.php:118
-#: plugins/mail/init.php:124
-#: plugins/mailto/init.php:50
-#: plugins/mailto/init.php:58
-msgid "[Forwarded]"
-msgstr ""
-
-#: plugins/mail/init.php:118
-#: plugins/mailto/init.php:50
-#, fuzzy
-msgid "Multiple articles"
-msgstr "Tots els articles"
-
-#: plugins/mail/init.php:146
-#, fuzzy
-msgid "To:"
-msgstr "Dalt"
-
-#: plugins/mail/init.php:161
-#, fuzzy
-msgid "Subject:"
-msgstr "Selecciona:"
-
-#: plugins/mail/init.php:178
-#, fuzzy
-msgid "Send e-mail"
-msgstr "Canvieu l'adreça electrònica"
-
-#: plugins/close_button/init.php:25
-#, fuzzy
-msgid "Close article"
-msgstr "Buida els articles"
-
-#: 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
-#, fuzzy, php-format
-msgid "Subscribe to %s in Tiny Tiny RSS?"
-msgstr "Torna a Tiny Tiny RSS"
-
-#: plugins/bookmarklets/init.php:31
-#, fuzzy
-msgid "Subscribe in Tiny Tiny RSS"
-msgstr "Torna a Tiny Tiny RSS"
-
-#: plugins/bookmarklets/init.php:34
-msgid "Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS"
-msgstr ""
-
-#: plugins/toggle_sidebar/init.php:23
-msgid "Collapse feedlist"
-msgstr "Redueix la llista de canals"
-
-#: plugins/af_zz_imgproxy/init.php:208
-msgid "Image proxy settings (af_zz_imgproxy)"
-msgstr ""
-
-#: plugins/af_zz_imgproxy/init.php:232
-#, fuzzy
-msgid "Enable proxy for all remote images."
-msgstr "Afficher les icônes dans la liste des flux"
-
-#: plugins/af_zz_imgproxy/init.php:236
-#, fuzzy
-msgid "Don't cache files locally."
-msgstr "Emmagatzema les imatges localment"
-
-#: plugins/mailto/init.php:74
-msgid "Clicking the following link to invoke your mail client:"
-msgstr ""
-
-#: plugins/mailto/init.php:78
-#, fuzzy
-msgid "Forward selected article(s) by email."
-msgstr "Marca l'article"
-
-#: plugins/mailto/init.php:81
-msgid "You should be able to edit the message before sending in your mail client."
-msgstr ""
-
-#: plugins/mailto/init.php:86
-#, fuzzy
-msgid "Close this dialog"
-msgstr "Tanca la finestra"
-
 #: plugins/share/init.php:41
 msgid "You can disable all articles shared by unique URLs here."
 msgstr ""
@@ -2935,484 +2873,657 @@ msgstr ""
 msgid "Unshare article"
 msgstr "Treu la marca de l'article"
 
-#: js/FeedTree.js:75
+#: plugins/toggle_sidebar/init.php:23
+msgid "Collapse feedlist"
+msgstr "Redueix la llista de canals"
+
+#: plugins/close_button/init.php:25
+#, fuzzy
+msgid "Close article"
+msgstr "Buida els articles"
+
+#: plugins/mail/init.php:29
+msgid "Mail addresses saved."
+msgstr ""
+
+#: plugins/mail/init.php:35
+msgid "Mail plugin"
+msgstr ""
+
+#: plugins/mail/init.php:37
+msgid "You can set predefined email addressed here (comma-separated list):"
+msgstr ""
+
+#: plugins/mail/init.php:146
+#, fuzzy
+msgid "To:"
+msgstr "Dalt"
+
+#: plugins/mail/init.php:161
+#, fuzzy
+msgid "Subject:"
+msgstr "Selecciona:"
+
+#: plugins/mail/init.php:178
+#, fuzzy
+msgid "Send e-mail"
+msgstr "Canvieu l'adreça electrònica"
+
+#: plugins/note/init.php:28
+#: plugins/note/note.js:11
+#, fuzzy
+msgid "Edit article note"
+msgstr "Edita les etiquetes"
+
+#: plugins/auth_internal/init.php:67
+#, fuzzy
+msgid "Please enter your one time password:"
+msgstr "Si us plau, escriviu una nota per aquest article:"
+
+#: plugins/auth_internal/init.php:208
+msgid "Password has been changed."
+msgstr "S'ha modificat la contrasenya."
+
+#: plugins/auth_internal/init.php:210
+msgid "Old password is incorrect."
+msgstr "La contrasenya antiga és incorrecta."
+
+#: js/FeedTree.js:76
 #, fuzzy
 msgid "(Un)collapse"
 msgstr "Redueix la barra lateral"
 
-#: js/PrefFeedTree.js:35
+#: js/PrefFeedTree.js:36
 #, fuzzy
 msgid "Edit category"
 msgstr "Edita les categories"
 
-#: js/PrefFeedTree.js:42
+#: js/PrefFeedTree.js:43
 #, fuzzy
 msgid "Remove category"
 msgstr "Crea una categoria"
 
-#: js/PrefFilterTree.js:46
+#: js/PrefFilterTree.js:47
 #, fuzzy
 msgid "Inverse"
 msgstr "(Invers)"
 
-#: js/feedlist.js:511
+#: js/feedlist.js:461
 #, fuzzy
 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:514
+#: js/feedlist.js:464
 #, fuzzy
 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:517
+#: js/feedlist.js:467
 #, fuzzy
 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:520
+#: js/feedlist.js:470
 #, 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:523
+#: js/feedlist.js:473
 #, fuzzy
 msgid "search results"
 msgstr "Resultats de la cerca"
 
-#: js/feedlist.js:523
+#: js/feedlist.js:473
 #, fuzzy
 msgid "all articles"
 msgstr "Tots els articles"
 
-#: js/functions.js:74
+#: js/functions.js:100
 msgid "Close"
 msgstr ""
 
-#: js/functions.js:141
+#: js/functions.js:167
 #, fuzzy
 msgid "Click to close"
 msgstr "Feu clic per editar"
 
-#: js/functions.js:448
+#: js/functions.js:456
 msgid "Error explained"
 msgstr ""
 
-#: js/functions.js:592
+#: js/functions.js:490
+#, fuzzy
+msgid "Upload complete."
+msgstr "Articles mémorisés"
+
+#: js/functions.js:508
+#, fuzzy
+msgid "Remove stored feed icon?"
+msgstr "Elimina les dades emmagatzemades"
+
+#: js/functions.js:510
+#, fuzzy
+msgid "Removing feed icon..."
+msgstr "S'està eliminant el canal..."
+
+#: js/functions.js:515
+#, fuzzy
+msgid "Feed icon removed."
+msgstr "No s'ha trobat el canal."
+
+#: js/functions.js:532
+#, fuzzy
+msgid "Please select an image file to upload."
+msgstr "Si us plau, seleccioneu un canal."
+
+#: js/functions.js:533
+msgid "Upload new icon for this feed?"
+msgstr ""
+
+#: js/functions.js:534
+#, fuzzy
+msgid "Uploading, please wait..."
+msgstr "S'està obrint, preneu paciència..."
+
+#: js/functions.js:542
+msgid "Please enter label caption:"
+msgstr "Si us plau, escriviu un títol per a l'etiqueta:"
+
+#: js/functions.js:575
 msgid "Subscribe to Feed"
 msgstr "Subscriviu-vos al canal"
 
-#: js/functions.js:621
+#: js/functions.js:602
 msgid "Failed to parse output. This can indicate server timeout and/or network issues. Backend output was logged to browser console."
 msgstr ""
 
-#: js/functions.js:636
+#: js/functions.js:617
 #, fuzzy, perl-format
 msgid "Subscribed to %s"
 msgstr "Subscrit als canals:"
 
-#: js/functions.js:641
+#: js/functions.js:622
 msgid "Specified URL seems to be invalid."
 msgstr ""
 
-#: js/functions.js:644
+#: js/functions.js:625
 msgid "Specified URL doesn't seem to contain any feeds."
 msgstr ""
 
-#: js/functions.js:656
+#: js/functions.js:637
 #, fuzzy
 msgid "Expand to select feed"
 msgstr "S'estan purgant els canals seleccionats..."
 
-#: js/functions.js:668
+#: js/functions.js:649
 #, fuzzy, perl-format
 msgid "Couldn't download the specified URL: %s"
 msgstr "No s'ha pogut subscriure: no s'ha especificat la URL del canal."
 
-#: js/functions.js:672
+#: js/functions.js:653
 #, perl-format
 msgid "XML validation failed: %s"
 msgstr ""
 
-#: js/functions.js:676
+#: js/functions.js:657
 #, fuzzy
 msgid "You are already subscribed to this feed."
 msgstr "No esteu subscrit a cap canal."
 
-#: js/functions.js:1136
+#: js/functions.js:1098
 msgid "Generate new syndication address for this feed?"
 msgstr ""
 
-#: js/functions.js:1140
-#: js/prefs.js:1095
+#: js/functions.js:1100
+#: js/prefs.js:870
 msgid "Trying to change address..."
 msgstr "S'està intentant canviar l'adreça..."
 
-#: js/functions.js:1245
-#: js/tt-rss.js:446
-#: js/tt-rss.js:673
+#: js/functions.js:1199
+#: js/tt-rss.js:399
+#: js/tt-rss.js:612
 msgid "You can't edit this kind of feed."
 msgstr "No podeu editar aquest tipus de canal."
 
-#: js/functions.js:1260
+#: js/functions.js:1213
 #, fuzzy
 msgid "Edit Feed"
 msgstr "Edita el canal"
 
-#: js/functions.js:1266
-#: js/prefs.js:100
-#: js/prefs.js:209
-#: js/prefs.js:647
+#: js/functions.js:1217
+#: js/prefs.js:176
+#: js/prefs.js:523
+#: js/prefs.js:1139
+#: js/prefs.js:78
 #, fuzzy
 msgid "Saving data..."
 msgstr "S'està desant el canal..."
 
-#: js/functions.js:1293
+#: js/functions.js:1243
 #, fuzzy
 msgid "More Feeds"
 msgstr "Més canals"
 
-#: js/functions.js:1355
-#: js/functions.js:1464
-#: js/prefs.js:398
-#: js/prefs.js:540
-#: js/prefs.js:558
-#: js/prefs.js:1077
+#: js/functions.js:1297
+#: js/functions.js:1383
+#: js/prefs.js:332
+#: js/prefs.js:455
+#: js/prefs.js:473
+#: js/prefs.js:855
 msgid "No feeds are selected."
 msgstr "No heu seleccionat cap canal."
 
-#: js/functions.js:1398
+#: js/functions.js:1329
 msgid "Remove selected feeds from the archive? Feeds with stored articles will not be removed."
 msgstr ""
 
-#: js/functions.js:1435
+#: js/functions.js:1360
 #, fuzzy
 msgid "Feeds with update errors"
 msgstr "Erreurs de mise à jour"
 
-#: js/functions.js:1446
-#: js/prefs.js:1058
+#: js/functions.js:1369
+#: js/prefs.js:841
 #, fuzzy
 msgid "Remove selected feeds?"
 msgstr "Esteu segur que voleu suprimir els filtres seleccionats?"
 
-#: js/functions.js:1449
-#: js/prefs.js:1061
+#: js/functions.js:1370
+#: js/prefs.js:842
 #, fuzzy
 msgid "Removing selected feeds..."
 msgstr "S'estan suprimint els filtres seleccionats..."
 
-#: js/prefs.js:60
-msgid "Please enter login:"
-msgstr "Si us plau, introduïu la vostra identificació (login)"
-
-#: js/prefs.js:67
-msgid "Can't create user: no login specified."
-msgstr "No s'ha pogut crear l'usuari: no hi ha cap nom especificat."
-
-#: js/prefs.js:71
-msgid "Adding user..."
-msgstr "S'està afegint l'usuari"
-
-#: js/prefs.js:96
-msgid "User Editor"
-msgstr "Editor de perfils d'usuari"
-
-#: js/prefs.js:131
-#, fuzzy
-msgid "Edit Filter"
-msgstr "Filtres"
-
-#: js/prefs.js:170
+#: js/prefs.js:143
 #, fuzzy
 msgid "Remove filter?"
 msgstr "Esteu segur que voleu suprimir el filtre %s?"
 
-#: js/prefs.js:175
+#: js/prefs.js:148
 msgid "Removing filter..."
 msgstr "S'està eliminant el filtre."
 
-#: js/prefs.js:292
+#: js/prefs.js:251
 msgid "Remove selected labels?"
 msgstr "Esteu segur que voleu suprimir les etiquetes seleccionades?"
 
-#: js/prefs.js:295
+#: js/prefs.js:252
 msgid "Removing selected labels..."
 msgstr "S'estan seleccionat les etiquetes seleccionades..."
 
-#: js/prefs.js:308
-#: js/prefs.js:1144
+#: js/prefs.js:262
+#: js/prefs.js:909
 msgid "No labels are selected."
 msgstr "No heu seleccionat cap etiqueta."
 
-#: js/prefs.js:320
+#: js/prefs.js:274
 msgid "Remove selected users? Neither default admin nor your account will be removed."
 msgstr ""
 
-#: js/prefs.js:323
+#: js/prefs.js:275
 msgid "Removing selected users..."
 msgstr "S'estan suprimint els usuaris seleccionats..."
 
-#: js/prefs.js:338
-#: js/prefs.js:408
-#: js/prefs.js:427
-#: js/prefs.js:461
+#: js/prefs.js:286
+#: js/prefs.js:342
+#: js/prefs.js:361
+#: js/prefs.js:387
 msgid "No users are selected."
 msgstr "No heu seleccionat cap usuari."
 
-#: js/prefs.js:350
+#: js/prefs.js:297
 msgid "Remove selected filters?"
 msgstr "Esteu segur que voleu suprimir els filtres seleccionats?"
 
-#: js/prefs.js:353
+#: js/prefs.js:298
 msgid "Removing selected filters..."
 msgstr "S'estan suprimint els filtres seleccionats..."
 
-#: js/prefs.js:366
-#: js/prefs.js:495
-#: js/prefs.js:514
+#: js/prefs.js:308
+#: js/prefs.js:419
+#: js/prefs.js:438
 msgid "No filters are selected."
 msgstr "No heu seleccionat cap filtre."
 
-#: js/prefs.js:378
+#: js/prefs.js:319
 msgid "Unsubscribe from selected feeds?"
 msgstr "Us voleu donar de baixa dels canals seleccionats?"
 
-#: js/prefs.js:382
+#: js/prefs.js:321
 msgid "Unsubscribing from selected feeds..."
 msgstr "S'estan cancel·lant les subscripcions als canals seleccionats."
 
-#: js/prefs.js:413
-#: js/prefs.js:432
-#: js/prefs.js:466
+#: js/prefs.js:347
+#: js/prefs.js:366
+#: js/prefs.js:392
 msgid "Please select only one user."
 msgstr "Si us plau, seleccioneu només un usuari."
 
-#: js/prefs.js:436
+#: js/prefs.js:370
 msgid "Reset password of selected user?"
 msgstr "Voleu reiniciar la contrasenya de l'usuari seleccionat?"
 
-#: js/prefs.js:439
+#: js/prefs.js:371
 msgid "Resetting password for selected user..."
 msgstr "S'està reiniciant la contrasenya de l'usuari seleccionat..."
 
-#: js/prefs.js:500
+#: js/prefs.js:424
 msgid "Please select only one filter."
 msgstr "Si us plau, seleccioneu només un filtre."
 
-#: js/prefs.js:518
+#: js/prefs.js:442
 #, fuzzy
 msgid "Combine selected filters?"
 msgstr "Esteu segur que voleu suprimir els filtres seleccionats?"
 
-#: js/prefs.js:521
+#: js/prefs.js:443
 #, fuzzy
 msgid "Joining filters..."
 msgstr "S'està eliminant el filtre."
 
-#: js/prefs.js:580
+#: js/prefs.js:487
 #, fuzzy
 msgid "Edit Multiple Feeds"
 msgstr "Editor múltiple de canals"
 
-#: js/prefs.js:604
+#: js/prefs.js:511
 msgid "Save changes to selected feeds?"
 msgstr "Esteu segur que voleu desar els canvis als canals seleccionats?"
 
-#: js/prefs.js:681
+#: js/prefs.js:552
 #, fuzzy
 msgid "OPML Import"
 msgstr "Importeu"
 
-#: js/prefs.js:700
+#: js/prefs.js:571
 #, fuzzy
 msgid "Please choose an OPML file first."
 msgstr "Primerament heu de seleccionar un canal."
 
-#: js/prefs.js:703
+#: js/prefs.js:574
 #: plugins/import_export/import_export.js:115
 #, fuzzy
 msgid "Importing, please wait..."
 msgstr "S'està obrint, preneu paciència..."
 
-#: js/prefs.js:869
+#: js/prefs.js:737
 msgid "Reset to defaults?"
 msgstr "Esteu segur que voleu establir els valors per defecte?"
 
-#: js/prefs.js:1468
+#: js/prefs.js:777
+#, perl-format
+msgid "Remove category %s? Any nested feeds would be placed into Uncategorized."
+msgstr ""
+
+#: js/prefs.js:778
 #, fuzzy
-msgid "Subscribing to feeds..."
-msgstr "S'està subscrivint a un canal..."
+msgid "Removing category..."
+msgstr "Crea una categoria"
 
-#: js/prefs.js:1487
-msgid "Clear stored data for this plugin?"
+#: js/prefs.js:794
+msgid "Remove selected categories?"
+msgstr "Esteu segur que voleu suprimir les categories seleccionades?"
+
+#: js/prefs.js:795
+msgid "Removing selected categories..."
+msgstr "S'estan seleccionant les categories seleccionades..."
+
+#: js/prefs.js:805
+msgid "No categories are selected."
+msgstr "No heu seleccionat cap categoria."
+
+#: js/prefs.js:812
+#, fuzzy
+msgid "Category title:"
+msgstr "Edita les categories"
+
+#: js/prefs.js:815
+#, fuzzy
+msgid "Creating category..."
+msgstr "Crea un filtre..."
+
+#: js/prefs.js:832
+#, fuzzy
+msgid "Feeds without recent updates"
+msgstr "Erreurs de mise à jour"
+
+#: js/prefs.js:869
+#, 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:898
+#, 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:926
+#, fuzzy
+msgid "Settings Profiles"
+msgstr "Crea un filtre"
+
+#: js/prefs.js:935
+msgid "Remove selected profiles? Active and default profiles will not be removed."
 msgstr ""
 
-#: js/prefs.js:1501
-msgid "Clear all messages in the error log?"
+#: js/prefs.js:936
+#, fuzzy
+msgid "Removing selected profiles..."
+msgstr "S'estan suprimint els filtres seleccionats..."
+
+#: js/prefs.js:948
+#, fuzzy
+msgid "No profiles are selected."
+msgstr "No hi ha cap article seleccionat."
+
+#: js/prefs.js:955
+#: js/prefs.js:997
+#, fuzzy
+msgid "Activate selected profile?"
+msgstr "Esteu segur que voleu suprimir els filtres seleccionats?"
+
+#: js/prefs.js:964
+#: js/prefs.js:1008
+#, fuzzy
+msgid "Please choose a profile to activate."
+msgstr "Primerament heu de seleccionar un canal."
+
+#: js/prefs.js:969
+#, fuzzy
+msgid "Creating profile..."
+msgstr "Crea un filtre"
+
+#: js/prefs.js:1016
+msgid "This will invalidate all previously generated feed URLs. Continue?"
 msgstr ""
 
-#: js/tt-rss.js:118
+#: js/prefs.js:1017
+#: plugins/share/share_prefs.js:3
+#, fuzzy
+msgid "Clearing URLs..."
+msgstr "S'està netejant el canal..."
+
+#: js/prefs.js:1020
+#, fuzzy
+msgid "Generated URLs cleared."
+msgstr "Canals generats"
+
+#: js/prefs.js:1053
+#, fuzzy
+msgid "Rename category to:"
+msgstr "Crea una categoria"
+
+#: js/prefs.js:1074
+msgid "Label Editor"
+msgstr "Éditeur d'intitulé"
+
+#: js/tt-rss.js:111
 msgid "Mark all articles as read?"
 msgstr "Esteu segur que voleu marcar tots els articles com a llegits?"
 
-#: js/tt-rss.js:124
+#: js/tt-rss.js:115
 msgid "Marking all feeds as read..."
 msgstr "S'estan marcant tots els canals com a llegits..."
 
-#: js/tt-rss.js:398
+#: js/tt-rss.js:351
 #, fuzzy
 msgid "Please enable mail plugin first."
 msgstr "Primerament heu de seleccionar un canal."
 
-#: js/tt-rss.js:527
+#: js/tt-rss.js:477
 #, fuzzy
 msgid "Please enable embed_original plugin first."
 msgstr "Primerament heu de seleccionar un canal."
 
-#: js/tt-rss.js:540
-#: js/tt-rss.js:723
+#: js/tt-rss.js:490
+#: js/tt-rss.js:653
 msgid "Widescreen is not available in combined mode."
 msgstr ""
 
-#: js/tt-rss.js:821
-msgid "You can't rescore this kind of feed."
-msgstr "No podeu canviar la puntuació d'aquest tipus de canal."
-
-#: js/tt-rss.js:826
-#: js/tt-rss.js:686
-msgid "Please select some feed first."
-msgstr "Primerament heu de seleccionar un canal."
-
-#: js/tt-rss.js:831
-#, perl-format
-msgid "Rescore articles in %s?"
-msgstr "Esteu segur que voleu canviar la puntuació dels articles a %s?"
-
-#: js/tt-rss.js:834
-msgid "Rescoring articles..."
-msgstr "S'estan canviant la puntuació dels articles"
-
-#: js/viewfeed.js:917
-#: js/viewfeed.js:955
-#: js/viewfeed.js:1003
-#: js/viewfeed.js:1924
-#: plugins/mail/mail.js:7
+#: js/viewfeed.js:444
+#: js/viewfeed.js:461
+#: js/viewfeed.js:484
+#: js/viewfeed.js:521
+#: js/viewfeed.js:542
+#: js/viewfeed.js:651
+#: js/viewfeed.js:685
+#: js/viewfeed.js:727
+#: js/viewfeed.js:1564
 #: plugins/mailto/init.js:7
-#: js/viewfeed.js:675
-#: js/viewfeed.js:697
-#: js/viewfeed.js:718
-#: js/viewfeed.js:777
-#: js/viewfeed.js:805
+#: plugins/mail/mail.js:7
 msgid "No articles are selected."
 msgstr "No hi ha cap article seleccionat."
 
-#: js/viewfeed.js:925
+#: js/viewfeed.js:659
 #, 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:927
+#: js/viewfeed.js:661
 #, 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:964
+#: js/viewfeed.js:694
 #, 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:967
+#: js/viewfeed.js:697
 #, 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:969
+#: js/viewfeed.js:698
 msgid "Please note that unstarred articles might get purged on next feed update."
 msgstr ""
 
-#: js/viewfeed.js:1009
+#: js/viewfeed.js:733
 #, 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:1029
+#: js/viewfeed.js:753
 #, fuzzy
 msgid "Edit article Tags"
 msgstr "Edita les etiquetes"
 
-#: js/viewfeed.js:1035
+#: js/viewfeed.js:757
 msgid "Saving article tags..."
 msgstr "S'estan desant les etiquetes de l'article"
 
-#: js/viewfeed.js:1666
+#: js/viewfeed.js:1015
+msgid "No article is selected."
+msgstr "No hi ha cap article seleccionat."
+
+#: js/viewfeed.js:1050
+msgid "No articles found to mark"
+msgstr "No s'han trobat articles per a marcar."
+
+#: js/viewfeed.js:1052
+#, fuzzy, perl-format
+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) ?"
+
+#: js/viewfeed.js:1312
 #, fuzzy
 msgid "Open original article"
 msgstr "Mostra el contingut original de l'article"
 
-#: js/viewfeed.js:1673
+#: js/viewfeed.js:1319
 #, fuzzy
 msgid "Display article URL"
 msgstr "afficher les étiquettes"
 
-#: js/viewfeed.js:1780
+#: js/viewfeed.js:1426
 msgid "Assign label"
 msgstr "Assigna-li l'etiqueta"
 
-#: js/viewfeed.js:1785
+#: js/viewfeed.js:1431
 #, fuzzy
 msgid "Remove label"
 msgstr "Esteu segur que voleu suprimir les etiquetes seleccionades?"
 
-#: js/viewfeed.js:1817
+#: js/viewfeed.js:1463
 #, fuzzy
 msgid "Select articles in group"
 msgstr "Seleccioneu un article mitjançant el ratolí."
 
-#: js/viewfeed.js:1827
+#: js/viewfeed.js:1473
 #, fuzzy
 msgid "Mark group as read"
 msgstr "Marca'l com a llegit"
 
-#: js/viewfeed.js:1839
+#: js/viewfeed.js:1485
 msgid "Mark feed as read"
 msgstr "Marca el canal com a llegit"
 
-#: js/viewfeed.js:1892
+#: js/viewfeed.js:1538
 #, fuzzy
 msgid "Please enter new score for selected articles:"
 msgstr "Si us plau, escriviu una nota per aquest article:"
 
-#: js/viewfeed.js:1955
+#: js/viewfeed.js:1571
 #, fuzzy
 msgid "Please enter new score for this article:"
 msgstr "Si us plau, escriviu una nota per aquest article:"
 
-#: js/viewfeed.js:1986
+#: js/viewfeed.js:1591
 #, fuzzy
 msgid "Article URL:"
 msgstr "Tots els articles"
 
-#: plugins/note/note.js:17
-#, fuzzy
-msgid "Saving article note..."
-msgstr "S'estan desant les etiquetes de l'article"
+#: plugins/embed_original/init.js:6
+msgid "Sorry, your browser does not support sandboxed iframes."
+msgstr ""
 
 #: plugins/af_psql_trgm/init.js:11
 #, fuzzy
 msgid "Related articles"
 msgstr "Buida els articles"
 
+#: plugins/mailto/init.js:21
+#: plugins/mail/mail.js:21
+#, fuzzy
+msgid "Forward article by email"
+msgstr "Marca l'article"
+
+#: plugins/shorten_expanded/init.js:43
+msgid "Click to expand article"
+msgstr "Clica-hi per a veure el cos de l'article"
+
 #: plugins/import_export/import_export.js:13
 #, fuzzy
 msgid "Export Data"
@@ -3435,294 +3546,186 @@ 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
-#, fuzzy
-msgid "Forward article by email"
-msgstr "Marca l'article"
-
-#: plugins/mail/mail.js:36
-msgid "Error sending email:"
+#: plugins/share/share_prefs.js:2
+msgid "This will invalidate all previously shared article URLs. Continue?"
 msgstr ""
 
-#: plugins/mail/mail.js:38
-#, fuzzy
-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."
+#: plugins/share/share_prefs.js:8
+msgid "Shared URLs cleared."
 msgstr ""
 
-#: plugins/shorten_expanded/init.js:45
-msgid "Click to expand article"
-msgstr "Clica-hi per a veure el cos de l'article"
-
 #: plugins/share/share.js:10
 #, fuzzy
 msgid "Share article by URL"
 msgstr "Marca l'article"
 
-#: plugins/share/share.js:14
+#: plugins/share/share.js:13
 #, fuzzy
 msgid "Generate new share URL for this article?"
 msgstr "Si us plau, escriviu una nota per aquest article:"
 
-#: plugins/share/share.js:18
+#: plugins/share/share.js:15
 #, fuzzy
 msgid "Trying to change URL..."
 msgstr "S'està intentant canviar l'adreça electrònica..."
 
-#: plugins/share/share.js:55
+#: plugins/share/share.js:48
 #, fuzzy
 msgid "Remove sharing for this article?"
 msgstr "Edita les etiquetes d'aquest article"
 
-#: plugins/share/share.js:59
+#: plugins/share/share.js:50
 #, fuzzy
 msgid "Trying to unshare..."
 msgstr "S'està intentant canviar l'adreça..."
 
-#: plugins/share/share_prefs.js:3
-msgid "This will invalidate all previously shared article URLs. Continue?"
+#: plugins/mail/mail.js:30
+msgid "Error sending email:"
 msgstr ""
 
-#: plugins/share/share_prefs.js:6
-#: js/prefs.js:1277
+#: plugins/mail/mail.js:32
 #, fuzzy
-msgid "Clearing URLs..."
-msgstr "S'està netejant el canal..."
+msgid "Your message has been sent."
+msgstr "S'ha modificat la contrasenya."
 
-#: plugins/share/share_prefs.js:13
-msgid "Shared URLs cleared."
-msgstr ""
+#: plugins/note/note.js:15
+#, fuzzy
+msgid "Saving article note..."
+msgstr "S'estan desant les etiquetes de l'article"
 
-#: js/feedlist.js:204
+#: js/feedlist.js:168
 #, fuzzy
 msgid "Your password is at default value"
 msgstr ""
 "La contrasenya actual és la predeterminada,\n"
 "\t\t\t\t\t\t penseu en modificar-la."
 
-#: js/feedlist.js:453
+#: js/feedlist.js:413
 msgid "Mark all articles in %s as read?"
 msgstr "Esteu segur que voleu marcar tots els articles de %s com a llegits?"
 
-#: js/functions.js:494
-#, fuzzy
-msgid "Upload complete."
-msgstr "Articles mémorisés"
-
-#: js/functions.js:511
-#, fuzzy
-msgid "Remove stored feed icon?"
-msgstr "Elimina les dades emmagatzemades"
-
-#: js/functions.js:516
-#, fuzzy
-msgid "Removing feed icon..."
-msgstr "S'està eliminant el canal..."
-
-#: js/functions.js:521
-#, fuzzy
-msgid "Feed icon removed."
-msgstr "No s'ha trobat el canal."
-
-#: js/functions.js:537
-#, fuzzy
-msgid "Please select an image file to upload."
-msgstr "Si us plau, seleccioneu un canal."
-
-#: js/functions.js:539
-msgid "Upload new icon for this feed?"
-msgstr ""
-
-#: js/functions.js:540
-#, fuzzy
-msgid "Uploading, please wait..."
-msgstr "S'està obrint, preneu paciència..."
-
-#: js/functions.js:550
-msgid "Please enter label caption:"
-msgstr "Si us plau, escriviu un títol per a l'etiqueta:"
-
-#: js/functions.js:555
-msgid "Can't create label: missing caption."
-msgstr "No s'ha pogut crear l'etiqueta: Títol desconegut."
-
-#: js/functions.js:797
+#: js/functions.js:764
 #, fuzzy
 msgid "Edit rule"
 msgstr "Filtres"
 
-#: js/functions.js:819
+#: js/functions.js:786
 #, fuzzy
 msgid "Edit action"
 msgstr "Accions dels canals"
 
-#: js/functions.js:860
+#: js/functions.js:825
 msgid "Looking for articles (%d processed, %f found)..."
 msgstr ""
 
-#: js/functions.js:890
+#: js/functions.js:855
 #, fuzzy
 msgid "Found %d articles matching this filter:"
 msgstr "No s'ha trobat cap fitxer que coincideixi."
 
-#: js/functions.js:942
+#: js/functions.js:907
 msgid "Create Filter"
 msgstr "Crea un filtre"
 
-#: js/functions.js:1060
-#: js/tt-rss.js:692
+#: js/functions.js:1016
+#: js/tt-rss.js:631
 msgid "Unsubscribe from %s?"
 msgstr "Us voleu donar de baixa de %s ?"
 
-#: js/functions.js:1063
+#: js/functions.js:1019
 msgid "Removing feed..."
 msgstr "S'està eliminant el canal..."
 
-#: js/functions.js:1489
+#: js/functions.js:1410
 msgid "Help"
 msgstr "Ajuda"
 
-#: js/prefs.js:973
-msgid "Remove category %s? Any nested feeds would be placed into Uncategorized."
+#: js/prefs.js:44
+msgid "Please enter login:"
+msgstr "Si us plau, introduïu la vostra identificació (login)"
+
+#: js/prefs.js:51
+msgid "Can't create user: no login specified."
+msgstr "No s'ha pogut crear l'usuari: no hi ha cap nom especificat."
+
+#: js/prefs.js:55
+msgid "Adding user..."
+msgstr "S'està afegint l'usuari"
+
+#: js/prefs.js:74
+msgid "User Editor"
+msgstr "Editor de perfils d'usuari"
+
+#: js/prefs.js:104
+#, fuzzy
+msgid "Edit Filter"
+msgstr "Filtres"
+
+#: js/prefs.js:1175
+#, fuzzy
+msgid "Subscribing to feeds..."
+msgstr "S'està subscrivint a un canal..."
+
+#: js/prefs.js:1191
+msgid "Clear stored data for this plugin?"
 msgstr ""
 
-#: js/prefs.js:979
-#, fuzzy
-msgid "Removing category..."
-msgstr "Crea una categoria"
-
-#: js/prefs.js:997
-msgid "Remove selected categories?"
-msgstr "Esteu segur que voleu suprimir les categories seleccionades?"
-
-#: js/prefs.js:1000
-msgid "Removing selected categories..."
-msgstr "S'estan seleccionant les categories seleccionades..."
-
-#: js/prefs.js:1013
-msgid "No categories are selected."
-msgstr "No heu seleccionat cap categoria."
-
-#: js/prefs.js:1020
-#, fuzzy
-msgid "Category title:"
-msgstr "Edita les categories"
-
-#: js/prefs.js:1024
-#, fuzzy
-msgid "Creating category..."
-msgstr "Crea un filtre..."
-
-#: js/prefs.js:1047
-#, fuzzy
-msgid "Feeds without recent updates"
-msgstr "Erreurs de mise à jour"
-
-#: js/prefs.js:1091
-#, 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:1129
-#, 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:1161
-#, fuzzy
-msgid "Settings Profiles"
-msgstr "Crea un filtre"
-
-#: js/prefs.js:1170
-msgid "Remove selected profiles? Active and default profiles will not be removed."
+#: js/prefs.js:1203
+msgid "Clear all messages in the error log?"
 msgstr ""
 
-#: js/prefs.js:1173
-#, fuzzy
-msgid "Removing selected profiles..."
-msgstr "S'estan suprimint els filtres seleccionats..."
-
-#: js/prefs.js:1189
-#, fuzzy
-msgid "No profiles are selected."
-msgstr "No hi ha cap article seleccionat."
-
-#: js/prefs.js:1197
-#: js/prefs.js:1250
-#, fuzzy
-msgid "Activate selected profile?"
-msgstr "Esteu segur que voleu suprimir els filtres seleccionats?"
-
-#: js/prefs.js:1214
-#: js/prefs.js:1266
-#, fuzzy
-msgid "Please choose a profile to activate."
-msgstr "Primerament heu de seleccionar un canal."
-
-#: js/prefs.js:1219
-#, fuzzy
-msgid "Creating profile..."
-msgstr "Crea un filtre"
-
-#: js/prefs.js:1274
-msgid "This will invalidate all previously generated feed URLs. Continue?"
-msgstr ""
-
-#: js/prefs.js:1284
-#, fuzzy
-msgid "Generated URLs cleared."
-msgstr "Canals generats"
-
-#: js/prefs.js:1356
-msgid "Label Editor"
-msgstr "Éditeur d'intitulé"
-
-#: js/tt-rss.js:681
+#: js/tt-rss.js:620
 msgid "You can't unsubscribe from the category."
 msgstr "No us podeu donar de baixa de la categoria."
 
-#: js/viewfeed.js:127
-#: js/viewfeed.js:177
-#: js/viewfeed.js:194
+#: js/tt-rss.js:625
+msgid "Please select some feed first."
+msgstr "Primerament heu de seleccionar un canal."
+
+#: js/viewfeed.js:89
+#: js/viewfeed.js:135
+#: js/viewfeed.js:152
 #, fuzzy
 msgid "Click to open next unread feed."
 msgstr "Feu clic per editar"
 
-#: js/viewfeed.js:131
+#: js/viewfeed.js:93
 #, fuzzy
 msgid "Cancel search"
 msgstr "Cancel·la"
 
-#: js/viewfeed.js:191
+#: js/viewfeed.js:149
 #, fuzzy
 msgid "New articles found, reload feed to continue."
 msgstr "No s'han trobat articles per a mostrar."
 
-#: js/viewfeed.js:620
+#: js/viewfeed.js:405
 #, 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:1284
-msgid "No article is selected."
-msgstr "No hi ha cap article seleccionat."
+#~ msgid "Rescore feed"
+#~ msgstr "Canvia la puntuació del canal"
 
-#: js/viewfeed.js:1319
-msgid "No articles found to mark"
-msgstr "No s'han trobat articles per a marcar."
+#~ msgid "Create label..."
+#~ msgstr "Crea una etiqueta"
 
-#: js/viewfeed.js:1321
-#, 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 "Create filter..."
+#~ msgstr "Crea un filtre..."
+
+#~ msgid "You can't rescore this kind of feed."
+#~ msgstr "No podeu canviar la puntuació d'aquest tipus de canal."
+
+#~ msgid "Rescore articles in %s?"
+#~ msgstr "Esteu segur que voleu canviar la puntuació dels articles a %s?"
+
+#~ msgid "Rescoring articles..."
+#~ msgstr "S'estan canviant la puntuació dels articles"
+
+#~ msgid "Can't create label: missing caption."
+#~ msgstr "No s'ha pogut crear l'etiqueta: Títol desconegut."
 
 #, fuzzy
 #~ msgid "Firefox integration"
diff --git a/locale/cs_CZ/LC_MESSAGES/messages.mo b/locale/cs_CZ/LC_MESSAGES/messages.mo
index ebe005c69..4b3027df9 100644
Binary files a/locale/cs_CZ/LC_MESSAGES/messages.mo and b/locale/cs_CZ/LC_MESSAGES/messages.mo differ
diff --git a/locale/cs_CZ/LC_MESSAGES/messages.po b/locale/cs_CZ/LC_MESSAGES/messages.po
index 8663531d0..bf28aa586 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: 2018-10-10 08:24+0300\n"
+"POT-Creation-Date: 2018-12-01 12:59+0300\n"
 "PO-Revision-Date: 2014-09-09 08:13+0100\n"
 "Last-Translator: Trottel <trottel09@gmail.com>\n"
 "Language-Team: Czech <kde-i18n-doc@kde.org>\n"
@@ -95,8 +95,8 @@ msgid "Weekly"
 msgstr "Týdně"
 
 #: backend.php:103
-#: classes/pref/users.php:47
 #: classes/pref/system.php:51
+#: classes/pref/users.php:47
 msgid "User"
 msgstr "Uživatel"
 
@@ -168,33 +168,33 @@ msgstr "Uživatel nebyl nalezen"
 
 #: index.php:151
 #: index.php:167
-#: index.php:285
+#: index.php:282
 #: prefs.php:120
 #: classes/backend.php:5
 #: classes/pref/labels.php:294
-#: classes/pref/feeds.php:1230
 #: classes/pref/filters.php:822
-#: js/feedlist.js:148
-#: js/feedlist.js:491
-#: js/feedlist.js:539
-#: js/functions.js:314
-#: js/functions.js:1336
-#: js/prefs.js:562
-#: js/prefs.js:754
-#: js/prefs.js:1488
-#: js/prefs.js:1503
-#: js/tt-rss.js:547
-#: js/viewfeed.js:1180
+#: classes/pref/feeds.php:1229
+#: js/feedlist.js:118
+#: js/feedlist.js:446
+#: js/feedlist.js:487
+#: js/functions.js:328
+#: js/functions.js:551
+#: js/functions.js:1286
+#: js/prefs.js:477
+#: js/prefs.js:617
+#: js/prefs.js:956
+#: js/prefs.js:1000
+#: js/prefs.js:1028
+#: js/prefs.js:1037
+#: js/prefs.js:1045
+#: js/prefs.js:1057
+#: js/tt-rss.js:497
+#: js/viewfeed.js:509
+#: js/viewfeed.js:928
 #: plugins/import_export/import_export.js:17
-#: js/functions.js:565
-#: js/prefs.js:1200
-#: js/prefs.js:1253
-#: js/prefs.js:1292
-#: js/prefs.js:1305
-#: js/prefs.js:1316
-#: js/prefs.js:1331
-#: js/tt-rss.js:564
-#: js/viewfeed.js:760
+#: js/prefs.js:1192
+#: js/prefs.js:1205
+#: js/tt-rss.js:510
 msgid "Loading, please wait..."
 msgstr "Načítání, čekejte..."
 
@@ -211,13 +211,13 @@ msgid "All Articles"
 msgstr "Všechny články"
 
 #: index.php:194
-#: include/functions.php:1227
+#: include/functions.php:1172
 #: classes/feeds.php:110
 msgid "Starred"
 msgstr "Označeno hvězdičkou"
 
 #: index.php:195
-#: include/functions.php:1228
+#: include/functions.php:1173
 #: classes/feeds.php:111
 msgid "Published"
 msgstr "Publikováno"
@@ -257,11 +257,11 @@ msgid "Title"
 msgstr "Název"
 
 #: index.php:211
-#: index.php:251
-#: include/functions.php:1215
+#: index.php:250
+#: include/functions.php:1160
 #: classes/feeds.php:115
-#: js/FeedTree.js:41
-#: js/FeedTree.js:69
+#: js/FeedTree.js:42
+#: js/FeedTree.js:70
 msgid "Mark as read"
 msgstr "Označit jako přečtené"
 
@@ -298,7 +298,7 @@ msgid "Feed actions:"
 msgstr "Akce kanálů:"
 
 #: index.php:246
-#: classes/handler/public.php:551
+#: classes/handler/public.php:575
 msgid "Subscribe to feed..."
 msgstr "Přihlásit se k odběru kanálu..."
 
@@ -307,56 +307,44 @@ msgid "Edit this feed..."
 msgstr "Upravit tento kanál..."
 
 #: index.php:248
-msgid "Rescore feed"
-msgstr "Přehodnotit kanál"
-
-#: index.php:249
-#: classes/pref/feeds.php:770
-#: classes/pref/feeds.php:1203
-#: js/PrefFeedTree.js:61
+#: classes/pref/feeds.php:769
+#: classes/pref/feeds.php:1202
+#: js/PrefFeedTree.js:62
 msgid "Unsubscribe"
 msgstr "Odhlásit odběr"
 
-#: index.php:250
+#: index.php:249
 msgid "All feeds:"
 msgstr "Všechny kanály:"
 
-#: index.php:252
+#: index.php:251
 msgid "(Un)hide read feeds"
 msgstr "Zobrazit nebo skrýt přečtené kanály"
 
-#: index.php:253
+#: index.php:252
 msgid "Other actions:"
 msgstr "Ostatní akce:"
 
-#: index.php:254
-#: include/functions.php:1201
+#: index.php:253
+#: include/functions.php:1146
 msgid "Toggle widescreen mode"
 msgstr "Přepnout širokoúhlý režim"
 
-#: index.php:255
-msgid "Create label..."
-msgstr "Vytvořit štítek..."
-
-#: index.php:256
-msgid "Create filter..."
-msgstr "Vytvořit filtr..."
-
-#: index.php:257
+#: index.php:254
 msgid "Keyboard shortcuts help"
 msgstr "Nápověda ke klávesovým zkratkám"
 
-#: index.php:266
+#: index.php:263
 msgid "Logout"
 msgstr "Odhlásit se"
 
-#: index.php:272
+#: index.php:269
 msgid "Updates are available from Git."
 msgstr ""
 
 #: prefs.php:33
 #: prefs.php:138
-#: include/functions.php:1230
+#: include/functions.php:1175
 #: classes/pref/prefs.php:425
 msgid "Preferences"
 msgstr "Předvolby"
@@ -371,8 +359,8 @@ msgstr "Opustit předvolby"
 
 #: prefs.php:141
 #: classes/pref/feeds.php:114
-#: classes/pref/feeds.php:1138
-#: classes/pref/feeds.php:1192
+#: classes/pref/feeds.php:1137
+#: classes/pref/feeds.php:1191
 msgid "Feeds"
 msgstr "Kanály"
 
@@ -382,8 +370,8 @@ msgid "Filters"
 msgstr "Filtry"
 
 #: prefs.php:147
+#: classes/feeds.php:1696
 #: classes/pref/labels.php:94
-#: classes/feeds.php:1710
 msgid "Labels"
 msgstr "Štítky"
 
@@ -395,80 +383,80 @@ msgstr "Uživatelé"
 msgid "System"
 msgstr "Systém"
 
-#: register.php:186
+#: register.php:185
 #: include/login_form.php:162
 msgid "Create new account"
 msgstr "Vytvořit nový účet"
 
-#: register.php:192
+#: register.php:191
 msgid "New user registrations are administratively disabled."
 msgstr "Registrace nových uživatelů jsou zakázány správcem."
 
-#: register.php:196
-#: register.php:241
-#: register.php:254
-#: register.php:269
-#: register.php:288
-#: register.php:336
-#: register.php:346
-#: register.php:358
-#: classes/handler/public.php:623
-#: classes/handler/public.php:697
-#: classes/handler/public.php:798
-#: classes/handler/public.php:877
-#: classes/handler/public.php:891
-#: classes/handler/public.php:898
-#: classes/handler/public.php:923
+#: register.php:195
+#: register.php:240
+#: register.php:253
+#: register.php:268
+#: register.php:287
+#: register.php:334
+#: register.php:344
+#: register.php:356
+#: classes/handler/public.php:647
+#: classes/handler/public.php:721
+#: 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"
 
-#: register.php:217
+#: register.php:216
 msgid "Your temporary password will be sent to the specified email. Accounts, which were not logged in once, are erased automatically 24 hours after temporary password is sent."
 msgstr "Vaše dočasné heslo bude odesláno na zadaný e-mail. Účet, do kterého se nikdo do 24 hodin od odeslání dočasného hesla nepřihlásí, bude smazán."
 
-#: register.php:223
+#: register.php:222
 msgid "Desired login:"
 msgstr "Požadované přihlašovací jméno:"
 
-#: register.php:226
+#: register.php:225
 msgid "Check availability"
 msgstr "Zkontrolovat dostupnost"
 
-#: register.php:228
-#: classes/handler/public.php:713
+#: register.php:227
+#: classes/handler/public.php:737
 msgid "Email:"
 msgstr "E-mail:"
 
-#: register.php:231
-#: classes/handler/public.php:718
+#: register.php:230
+#: classes/handler/public.php:742
 msgid "How much is two plus two:"
 msgstr "Kolik je dva plus dva:"
 
-#: register.php:234
+#: register.php:233
 msgid "Submit registration"
 msgstr "Odeslat registraci"
 
-#: register.php:252
+#: register.php:251
 msgid "Your registration information is incomplete."
 msgstr "Vaše registrační údaje nejsou úplné."
 
-#: register.php:267
+#: register.php:266
 msgid "Sorry, this username is already taken."
 msgstr "Bohužel, toto uživatelské jméno se již používá."
 
-#: register.php:286
+#: register.php:285
 msgid "Registration failed."
 msgstr "Registrace selhala."
 
-#: register.php:333
+#: register.php:331
 msgid "Account created successfully."
 msgstr "Účet byl úspěšně vytvořen."
 
-#: register.php:355
+#: register.php:353
 msgid "New user registrations are currently closed."
 msgstr "Registrace nových uživatelů jsou nyní uzavřeny."
 
-#: update.php:66
+#: update.php:67
 msgid "Tiny Tiny RSS data update script."
 msgstr "Skript aktualizace dat Tiny Tiny RSS."
 
@@ -481,10 +469,10 @@ msgstr "Všechny kanály"
 
 #: include/controls.php:138
 #: include/controls.php:230
-#: classes/opml.php:512
-#: classes/digest.php:120
+#: classes/digest.php:124
+#: classes/feeds.php:1708
 #: classes/pref/feeds.php:233
-#: classes/feeds.php:1722
+#: classes/opml.php:512
 msgid "Uncategorized"
 msgstr "Bez zařazení"
 
@@ -500,287 +488,287 @@ msgstr[2] "%d archivovaných článků"
 msgid "No feeds found."
 msgstr "Nenalezeny žádné kanály."
 
-#: include/functions.php:983
+#: include/functions.php:928
 #, php-format
 msgid "%d min"
 msgstr ""
 
-#: include/functions.php:1177
+#: include/functions.php:1122
 msgid "Navigation"
 msgstr "Navigace"
 
-#: include/functions.php:1178
+#: include/functions.php:1123
 msgid "Open next feed"
 msgstr "Otevřít další kanál"
 
-#: include/functions.php:1179
+#: include/functions.php:1124
 msgid "Open previous feed"
 msgstr "Otevřít předchozí kanál"
 
-#: include/functions.php:1180
+#: include/functions.php:1125
 msgid "Open next article"
 msgstr "Otevřít další článek"
 
-#: include/functions.php:1181
+#: include/functions.php:1126
 msgid "Open previous article"
 msgstr "Otevřít předchozí článek"
 
-#: include/functions.php:1182
+#: include/functions.php:1127
 msgid "Open next article (don't scroll long articles)"
 msgstr "Otevřít další článek (neposouvat dlouhé články)"
 
-#: include/functions.php:1183
+#: include/functions.php:1128
 msgid "Open previous article (don't scroll long articles)"
 msgstr "Otevřít předchozí článek (neposouvat dlouhé články)"
 
-#: include/functions.php:1184
+#: include/functions.php:1129
 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/functions.php:1185
+#: include/functions.php:1130
 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/functions.php:1186
+#: include/functions.php:1131
 msgid "Show search dialog"
 msgstr "Zobrazit dialogové okno hledání"
 
-#: include/functions.php:1187
+#: include/functions.php:1132
 msgid "Article"
 msgstr "Článek"
 
-#: include/functions.php:1188
-#: js/viewfeed.js:1695
+#: include/functions.php:1133
+#: js/viewfeed.js:1341
 msgid "Toggle starred"
 msgstr "Přepnout označeno hvězdičkou"
 
-#: include/functions.php:1189
-#: js/viewfeed.js:1707
+#: include/functions.php:1134
+#: js/viewfeed.js:1353
 msgid "Toggle published"
 msgstr "Přepnout publikováno"
 
-#: include/functions.php:1190
-#: js/viewfeed.js:1682
+#: include/functions.php:1135
+#: js/viewfeed.js:1328
 msgid "Toggle unread"
 msgstr "Přepnout nepřečteno"
 
-#: include/functions.php:1191
+#: include/functions.php:1136
 msgid "Edit tags"
 msgstr "Upravit značky"
 
-#: include/functions.php:1192
+#: include/functions.php:1137
 msgid "Open in new window"
 msgstr "Otevřít v novém okně"
 
-#: include/functions.php:1193
-#: js/viewfeed.js:1728
+#: include/functions.php:1138
+#: js/viewfeed.js:1374
 msgid "Mark below as read"
 msgstr "Označit pod jako přečtené"
 
-#: include/functions.php:1194
-#: js/viewfeed.js:1721
+#: include/functions.php:1139
+#: js/viewfeed.js:1367
 msgid "Mark above as read"
 msgstr "Označit nad jako přečtené"
 
-#: include/functions.php:1195
+#: include/functions.php:1140
 msgid "Scroll down"
 msgstr "Posunout dolů"
 
-#: include/functions.php:1196
+#: include/functions.php:1141
 msgid "Scroll up"
 msgstr "Posunout nahoru"
 
-#: include/functions.php:1197
+#: include/functions.php:1142
 msgid "Select article under cursor"
 msgstr "Vybrat článek pod kurzorem"
 
-#: include/functions.php:1198
+#: include/functions.php:1143
 msgid "Email article"
 msgstr "Odeslat článek e-mailem"
 
-#: include/functions.php:1199
+#: include/functions.php:1144
 msgid "Close/collapse article"
 msgstr "Zavřít nebo sbalit článek"
 
-#: include/functions.php:1200
+#: include/functions.php:1145
 msgid "Toggle article expansion (combined mode)"
 msgstr "Přepnout rozbalení článku (kombinovaný režim)"
 
-#: include/functions.php:1202
+#: include/functions.php:1147
 #: plugins/embed_original/init.php:33
 msgid "Toggle embed original"
 msgstr "Přepnout vložen originál"
 
-#: include/functions.php:1203
+#: include/functions.php:1148
 msgid "Article selection"
 msgstr "Výběr článků"
 
-#: include/functions.php:1204
+#: include/functions.php:1149
 msgid "Select all articles"
 msgstr "Vybrat všechny články"
 
-#: include/functions.php:1205
+#: include/functions.php:1150
 msgid "Select unread"
 msgstr "Vybrat nepřečtené"
 
-#: include/functions.php:1206
+#: include/functions.php:1151
 msgid "Select starred"
 msgstr "Vybrat označené hvězdičkou"
 
-#: include/functions.php:1207
+#: include/functions.php:1152
 msgid "Select published"
 msgstr "Vybrat publikované"
 
-#: include/functions.php:1208
+#: include/functions.php:1153
 msgid "Invert selection"
 msgstr "Invertovat výběr"
 
-#: include/functions.php:1209
+#: include/functions.php:1154
 msgid "Deselect everything"
 msgstr "Zrušit výběr všeho"
 
-#: include/functions.php:1210
-#: classes/pref/feeds.php:522
-#: classes/pref/feeds.php:794
+#: include/functions.php:1155
+#: classes/pref/feeds.php:521
+#: classes/pref/feeds.php:793
 msgid "Feed"
 msgstr "Kanál"
 
-#: include/functions.php:1211
+#: include/functions.php:1156
 msgid "Refresh current feed"
 msgstr "Obnovit aktuální kanál"
 
-#: include/functions.php:1212
+#: include/functions.php:1157
 msgid "Un/hide read feeds"
 msgstr "Zobrazit nebo skrýt přečtené kanály"
 
-#: include/functions.php:1213
-#: classes/pref/feeds.php:1195
+#: include/functions.php:1158
+#: classes/pref/feeds.php:1194
 msgid "Subscribe to feed"
 msgstr "Přihlásit se k odběru kanálu"
 
-#: include/functions.php:1214
-#: js/FeedTree.js:48
-#: js/PrefFeedTree.js:55
-#: js/viewfeed.js:1846
+#: include/functions.php:1159
+#: js/FeedTree.js:49
+#: js/PrefFeedTree.js:56
+#: js/viewfeed.js:1492
 msgid "Edit feed"
 msgstr "Upravit kanál"
 
-#: include/functions.php:1216
+#: include/functions.php:1161
 msgid "Reverse headlines"
 msgstr "Obrácené pořadí nadpisů"
 
-#: include/functions.php:1217
+#: include/functions.php:1162
 msgid "Toggle headline grouping"
 msgstr ""
 
-#: include/functions.php:1218
+#: include/functions.php:1163
 msgid "Debug feed update"
 msgstr "Ladit aktualizaci kanálů"
 
-#: include/functions.php:1219
+#: include/functions.php:1164
 #, fuzzy
 msgid "Debug viewfeed()"
 msgstr "Ladit aktualizaci kanálů"
 
-#: include/functions.php:1220
-#: js/FeedTree.js:97
+#: include/functions.php:1165
+#: js/FeedTree.js:98
 msgid "Mark all feeds as read"
 msgstr "Označit všechny kanály jako přečtené"
 
-#: include/functions.php:1221
+#: include/functions.php:1166
 msgid "Un/collapse current category"
 msgstr "Rozbalit nebo sbalit aktuální kategorii"
 
-#: include/functions.php:1222
-msgid "Toggle combined mode"
-msgstr "Přepnout kombinovaný režim"
-
-#: include/functions.php:1223
+#: include/functions.php:1167
 msgid "Toggle auto expand in combined mode"
 msgstr "Přepnout automatické rozbalení v kombinovaném režimu"
 
-#: include/functions.php:1224
+#: include/functions.php:1168
+msgid "Toggle combined mode"
+msgstr "Přepnout kombinovaný režim"
+
+#: include/functions.php:1169
 msgid "Go to"
 msgstr "Přejít na"
 
-#: include/functions.php:1225
-#: classes/feeds.php:1583
+#: include/functions.php:1170
+#: classes/feeds.php:1569
 msgid "All articles"
 msgstr "Všechny články"
 
-#: include/functions.php:1226
+#: include/functions.php:1171
 msgid "Fresh"
 msgstr "Nové"
 
-#: include/functions.php:1229
-#: js/tt-rss.js:491
-#: js/tt-rss.js:660
+#: include/functions.php:1174
+#: js/tt-rss.js:439
+#: js/tt-rss.js:599
 msgid "Tag cloud"
 msgstr "Seznam značek"
 
-#: include/functions.php:1231
+#: include/functions.php:1176
 msgid "Other"
 msgstr "Ostatní"
 
-#: include/functions.php:1232
+#: include/functions.php:1177
 #: classes/pref/labels.php:279
 msgid "Create label"
 msgstr "Vytvořit štítek"
 
-#: include/functions.php:1233
+#: include/functions.php:1178
 #: classes/pref/filters.php:801
 msgid "Create filter"
 msgstr "Vytvořit filtr"
 
-#: include/functions.php:1234
+#: include/functions.php:1179
 msgid "Un/collapse sidebar"
 msgstr "Rozbalit nebo sbalit postranní panel"
 
-#: include/functions.php:1235
+#: include/functions.php:1180
 msgid "Show help dialog"
 msgstr "Zobrazit dialogové okno nápovědy"
 
-#: include/functions.php:2582
+#: include/functions.php:2529
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: include/functions.php:2583
+#: include/functions.php:2530
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: include/functions.php:2584
+#: include/functions.php:2531
 msgid "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form"
 msgstr ""
 
-#: include/functions.php:2585
+#: include/functions.php:2532
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: include/functions.php:2586
+#: include/functions.php:2533
 #, fuzzy
 msgid "No file was uploaded"
 msgstr "Nebyl nahrán žádný soubor."
 
-#: include/functions.php:2587
+#: include/functions.php:2534
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: include/functions.php:2588
+#: include/functions.php:2535
 msgid "Failed to write file to disk."
 msgstr ""
 
-#: include/functions.php:2589
+#: include/functions.php:2536
 msgid "A PHP extension stopped the file upload."
 msgstr ""
 
 #: include/login_form.php:107
-#: classes/handler/public.php:446
-#: classes/handler/public.php:708
+#: classes/handler/public.php:466
+#: classes/handler/public.php:732
 msgid "Login:"
 msgstr "Přihlášení:"
 
 #: include/login_form.php:117
-#: classes/handler/public.php:449
+#: classes/handler/public.php:469
 msgid "Password:"
 msgstr "Heslo:"
 
@@ -793,9 +781,9 @@ msgid "Profile:"
 msgstr "Profil:"
 
 #: include/login_form.php:133
-#: classes/handler/public.php:252
 #: classes/pref/prefs.php:1037
 #: classes/rpc.php:69
+#: classes/handler/public.php:272
 msgid "Default profile"
 msgstr "Výchozí profil"
 
@@ -812,208 +800,27 @@ msgid "Remember me"
 msgstr "Zapamatovat si mě"
 
 #: include/login_form.php:159
-#: classes/handler/public.php:454
+#: classes/handler/public.php:474
 msgid "Log in"
 msgstr "Přihlásit se"
 
-#: include/sessions.php:46
+#: include/sessions.php:45
 msgid "Session failed to validate (schema version changed)"
 msgstr "Nepodařilo se ověřit relaci (změnila se verze schématu)"
 
-#: include/sessions.php:62
+#: include/sessions.php:53
+#, fuzzy
+msgid "Session failed to validate (UA changed)."
+msgstr "Nepodařilo se ověřit relaci (změnilo se heslo)"
+
+#: include/sessions.php:67
 msgid "Session failed to validate (password changed)"
 msgstr "Nepodařilo se ověřit relaci (změnilo se heslo)"
 
-#: include/sessions.php:69
+#: include/sessions.php:74
 msgid "Session failed to validate (user not found)"
 msgstr "Nepodařilo se ověřit relaci (uživatel nebyl nalezen)"
 
-#: classes/article.php:26
-msgid "Article not found."
-msgstr "Článek nenalezen."
-
-#: classes/article.php:211
-msgid "Tags for this article (separated by commas):"
-msgstr "Značky pro tento článek (oddělené čárkami):"
-
-#: classes/article.php:236
-#: classes/pref/labels.php:82
-#: classes/pref/users.php:103
-#: classes/pref/feeds.php:774
-#: classes/pref/feeds.php:914
-#: classes/pref/filters.php:525
-#: classes/pref/prefs.php:982
-#: plugins/nsfw/init.php:85
-#: plugins/note/init.php:58
-#: plugins/af_readability/init.php:80
-#: plugins/af_redditimgur/init.php:66
-#: plugins/af_psql_trgm/init.php:188
-#: plugins/mail/init.php:65
-#: plugins/af_zz_imgproxy/init.php:238
-msgid "Save"
-msgstr "Uložit"
-
-#: classes/article.php:238
-#: classes/handler/public.php:423
-#: classes/handler/public.php:457
-#: classes/pref/labels.php:84
-#: classes/pref/users.php:105
-#: classes/pref/feeds.php:775
-#: classes/pref/feeds.php:917
-#: classes/pref/feeds.php:1672
-#: classes/pref/filters.php:528
-#: classes/pref/filters.php:945
-#: classes/pref/filters.php:1022
-#: classes/pref/filters.php:1115
-#: classes/pref/prefs.php:984
-#: classes/feeds.php:1037
-#: classes/feeds.php:1089
-#: classes/feeds.php:1128
-#: plugins/note/init.php:60
-#: plugins/mail/init.php:179
-msgid "Cancel"
-msgstr "Zrušit"
-
-#: classes/article.php:337
-#: classes/article.php:720
-#: classes/article.php:875
-msgid "no tags"
-msgstr "žádné značky"
-
-#: classes/article.php:448
-msgid "unknown type"
-msgstr "neznámý typ"
-
-#: classes/article.php:525
-msgid "Attachments"
-msgstr "Přílohy"
-
-#: classes/article.php:626
-#: classes/feeds.php:661
-msgid "comment"
-msgid_plural "comments"
-msgstr[0] "komentář"
-msgstr[1] "komentáře"
-msgstr[2] "komentáře"
-
-#: classes/article.php:630
-#: classes/feeds.php:665
-msgid "comments"
-msgstr "komentáře"
-
-#: classes/article.php:689
-msgid " - "
-msgstr " - "
-
-#: classes/article.php:730
-#: classes/feeds.php:647
-msgid "Edit tags for this article"
-msgstr "Upravit značky pro tento článek"
-
-#: classes/article.php:763
-#: classes/feeds.php:602
-msgid "Originally from:"
-msgstr "Původně z:"
-
-#: classes/article.php:774
-#: classes/pref/feeds.php:539
-#: classes/feeds.php:613
-msgid "Feed URL"
-msgstr "URL kanálu"
-
-#: classes/article.php:811
-#: classes/backend.php:103
-#: classes/dlg.php:33
-#: classes/dlg.php:56
-#: classes/dlg.php:89
-#: classes/dlg.php:154
-#: classes/dlg.php:181
-#: classes/dlg.php:197
-#: classes/pref/feeds.php:1466
-#: classes/pref/feeds.php:1533
-#: classes/pref/filters.php:208
-#: classes/pref/prefs.php:1099
-#: plugins/af_psql_trgm/init.php:109
-#: plugins/import_export/init.php:446
-#: plugins/import_export/init.php:490
-#: plugins/share/init.php:128
-msgid "Close this window"
-msgstr "Zavřít toto okno"
-
-#: classes/article.php:913
-msgid "(edit note)"
-msgstr "(upravit poznámku)"
-
-#: classes/opml.php:31
-#: classes/opml.php:36
-msgid "OPML Utility"
-msgstr "Nástroj OPML"
-
-#: classes/opml.php:40
-msgid "Importing OPML..."
-msgstr "Importování OPML..."
-
-#: classes/opml.php:45
-msgid "Return to preferences"
-msgstr "Zpět do předvoleb"
-
-#: classes/opml.php:301
-#, php-format
-msgid "Adding feed: %s"
-msgstr "Přidávání kanálu: %s"
-
-#: classes/opml.php:312
-#, php-format
-msgid "Duplicate feed: %s"
-msgstr "Duplicitní kanál: %s"
-
-#: classes/opml.php:326
-#, php-format
-msgid "Adding label %s"
-msgstr "Přidávání štítku %s"
-
-#: classes/opml.php:329
-#, php-format
-msgid "Duplicate label: %s"
-msgstr "Duplicitní štítek: %s"
-
-#: classes/opml.php:341
-#, php-format
-msgid "Setting preference key %s to %s"
-msgstr "Nastavení klíče předvoleb %s na %s"
-
-#: classes/opml.php:377
-msgid "Adding filter..."
-msgstr "Přidávání filtru..."
-
-#: classes/opml.php:512
-#, php-format
-msgid "Processing category: %s"
-msgstr "Zpracovávání kategorie: %s"
-
-#: classes/opml.php:558
-#, php-format
-msgid "Upload failed with error code %d"
-msgstr "Nahrávání selhalo s kódem chyby %d"
-
-#: classes/opml.php:570
-#: plugins/import_export/init.php:471
-msgid "Unable to move uploaded file."
-msgstr "Nelze přesunout nahraný soubor."
-
-#: classes/opml.php:574
-#: plugins/import_export/init.php:475
-msgid "Error: please upload OPML file."
-msgstr "Chyba: nahrajte soubor OPML."
-
-#: classes/opml.php:585
-msgid "Error: unable to find moved OPML file."
-msgstr "Chyba: nelze nalézt přesunutý soubor OPML."
-
-#: classes/opml.php:594
-msgid "Error while parsing document."
-msgstr "Chyba při zpracování dokumentu."
-
 #: 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."
@@ -1034,162 +841,355 @@ msgstr "Ctrl"
 msgid "Help topic not found."
 msgstr "Téma nápovědy nenalezeno."
 
-#: 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."
+#: classes/backend.php:103
+#: classes/pref/filters.php:208
+#: classes/pref/feeds.php:1465
+#: classes/pref/feeds.php:1532
+#: classes/pref/prefs.php:1099
+#: classes/dlg.php:33
+#: classes/dlg.php:56
+#: classes/dlg.php:89
+#: classes/dlg.php:154
+#: classes/dlg.php:181
+#: classes/dlg.php:197
+#: classes/article.php:810
+#: plugins/af_psql_trgm/init.php:109
+#: plugins/import_export/init.php:446
+#: plugins/import_export/init.php:490
+#: plugins/share/init.php:128
+msgid "Close this window"
+msgstr "Zavřít toto okno"
 
-#: classes/dlg.php:44
-msgid "Your Public OPML URL is:"
-msgstr "Vaše veřejná URL OPML je:"
+#: classes/feeds.php:53
+msgid "View as RSS feed"
+msgstr "Zobrazit jako kanál RSS"
 
-#: classes/dlg.php:53
-#: classes/dlg.php:178
-#: plugins/share/init.php:125
-msgid "Generate new URL"
-msgstr "Generovat novou URL"
+#: classes/feeds.php:54
+#: classes/feeds.php:140
+#: classes/pref/feeds.php:1326
+msgid "View as RSS"
+msgstr "Zobrazit jako RSS"
 
-#: classes/dlg.php:67
-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 "Démon aktualizací je povolen v konfiguraci, ale proces typu démon není spuštěn, což zabraňuje aktualizaci všech kanálů. Spusťte proces typu démon, nebo kontaktujte vlastníka instance."
+#: classes/feeds.php:62
+#, php-format
+msgid "Last updated: %s"
+msgstr "Naposledy aktualizováno: %s"
 
-#: classes/dlg.php:71
-#: classes/dlg.php:80
-msgid "Last update:"
-msgstr "Poslední aktualizace:"
+#: classes/feeds.php:100
+#, fuzzy
+msgid "Select..."
+msgstr "Vybrat"
 
-#: classes/dlg.php:76
-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 "Démonu aktualizací trvá příliš dlouho provedení aktualizace kanálu. To může znamenat problém, jako je zhroucení nebo zablokování. Zkontrolujte proces typu démon nebo kontaktujte vlastníka instance."
+#: classes/feeds.php:102
+#: classes/pref/labels.php:273
+#: classes/pref/filters.php:391
+#: classes/pref/filters.php:449
+#: classes/pref/filters.php:795
+#: classes/pref/filters.php:878
+#: classes/pref/filters.php:905
+#: classes/pref/feeds.php:1185
+#: classes/pref/feeds.php:1416
+#: classes/pref/feeds.php:1481
+#: classes/pref/users.php:358
+#: classes/pref/prefs.php:996
+msgid "All"
+msgstr "Vše"
 
-#: classes/dlg.php:169
-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/feeds.php:104
+msgid "Invert"
+msgstr "Invertovat"
 
-#: classes/dlg.php:190
-msgid "You are using default tt-rss password. Please change it in the Preferences (Personal data / Authentication)."
+#: classes/feeds.php:105
+#: classes/pref/labels.php:275
+#: classes/pref/filters.php:393
+#: classes/pref/filters.php:451
+#: classes/pref/filters.php:797
+#: classes/pref/filters.php:880
+#: classes/pref/filters.php:907
+#: classes/pref/feeds.php:1187
+#: classes/pref/feeds.php:1418
+#: classes/pref/feeds.php:1483
+#: classes/pref/users.php:360
+#: classes/pref/prefs.php:998
+msgid "None"
+msgstr "Žádný"
+
+#: classes/feeds.php:107
+msgid "Selection toggle:"
+msgstr "Přepínač výběru:"
+
+#: classes/feeds.php:113
+msgid "Selection:"
+msgstr "Výběr:"
+
+#: classes/feeds.php:116
+msgid "Set score"
+msgstr "Nastavit hodnocení"
+
+#: classes/feeds.php:119
+msgid "Archive"
+msgstr "Archivovat"
+
+#: classes/feeds.php:121
+msgid "Move back"
+msgstr "Zpět"
+
+#: classes/feeds.php:122
+#: classes/pref/filters.php:400
+#: classes/pref/filters.php:458
+#: classes/pref/filters.php:887
+#: classes/pref/filters.php:914
+msgid "Delete"
+msgstr "Odstranit"
+
+#: classes/feeds.php:127
+#: classes/feeds.php:132
+#: plugins/mailto/init.php:25
+#: plugins/mail/init.php:76
+msgid "Forward by email"
+msgstr "Přeposlat e-mailem"
+
+#: classes/feeds.php:136
+msgid "Feed:"
+msgstr "Kanál:"
+
+#: classes/feeds.php:193
+#: classes/feeds.php:802
+msgid "Feed not found."
+msgstr "Kanál nenalezen."
+
+#: classes/feeds.php:255
+msgid "Never"
+msgstr "Nikdy"
+
+#: classes/feeds.php:341
+#, php-format
+msgid "Imported at %s"
+msgstr "Importováno v %s"
+
+#: classes/feeds.php:391
+#: classes/feeds.php:484
+msgid "mark feed as read"
+msgstr "označit kanál jako přečtený"
+
+#: classes/feeds.php:540
+msgid "Collapse article"
+msgstr "Sbalit článek"
+
+#: classes/feeds.php:592
+#: classes/article.php:762
+msgid "Originally from:"
+msgstr "Původně z:"
+
+#: classes/feeds.php:603
+#: classes/pref/feeds.php:538
+#: classes/article.php:773
+msgid "Feed URL"
+msgstr "URL kanálu"
+
+#: classes/feeds.php:630
+#: classes/article.php:729
+msgid "Edit tags for this article"
+msgstr "Upravit značky pro tento článek"
+
+#: classes/feeds.php:644
+#: classes/article.php:625
+msgid "comment"
+msgid_plural "comments"
+msgstr[0] "komentář"
+msgstr[1] "komentáře"
+msgstr[2] "komentáře"
+
+#: classes/feeds.php:648
+#: classes/article.php:629
+msgid "comments"
+msgstr "komentáře"
+
+#: classes/feeds.php:686
+msgid "No unread articles found to display."
+msgstr "Nenalezeny žádné nepřečtené články k zobrazení."
+
+#: classes/feeds.php:689
+msgid "No updated articles found to display."
+msgstr "Nenalezeny žádné aktualizované články k zobrazení."
+
+#: classes/feeds.php:692
+msgid "No starred articles found to display."
+msgstr "Nenalezeny žádné články označené hvězdičkou k zobrazení."
+
+#: classes/feeds.php:696
+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:698
+msgid "No articles found to display."
+msgstr "Nenalezeny žádné články k zobrazení."
+
+#: classes/feeds.php:714
+#: classes/feeds.php:905
+#, php-format
+msgid "Feeds last updated at %s"
+msgstr "Kanál naposledy aktualizován v %s"
+
+#: classes/feeds.php:726
+#: classes/feeds.php:917
+msgid "Some feeds have update errors (click for details)"
+msgstr "Některé kanály mají chyby aktualizace (klikněte pro podrobnosti)"
+
+#: classes/feeds.php:894
+msgid "No feed selected."
+msgstr "Není vybrán žádný kanál."
+
+#: classes/feeds.php:958
+#: classes/feeds.php:966
+msgid "Feed or site URL"
+msgstr "Kanál nebo URL stránky"
+
+#: classes/feeds.php:972
+#: classes/pref/feeds.php:559
+#: classes/pref/feeds.php:800
+#: classes/pref/feeds.php:1632
+msgid "Place in category:"
+msgstr "Umístit do kategorie:"
+
+#: classes/feeds.php:980
+msgid "Available feeds"
+msgstr "Dostupné kanály"
+
+#: classes/feeds.php:992
+#: classes/pref/feeds.php:621
+#: classes/pref/feeds.php:848
+#: classes/pref/users.php:61
+msgid "Authentication"
+msgstr "Ověření"
+
+#: classes/feeds.php:996
+#: classes/pref/feeds.php:625
+#: classes/pref/feeds.php:852
+#: classes/pref/feeds.php:1646
+#: classes/pref/users.php:403
+msgid "Login"
+msgstr "Přihlášení"
+
+#: classes/feeds.php:1000
+#: classes/pref/feeds.php:631
+#: classes/pref/feeds.php:860
+#: classes/pref/feeds.php:1649
+#: classes/pref/prefs.php:243
+msgid "Password"
+msgstr "Heslo"
+
+#: classes/feeds.php:1011
+#: classes/pref/feeds.php:645
+msgid "This feed requires authentication."
+msgstr "Tento kanál vyžaduje ověření."
+
+#: classes/feeds.php:1014
+#: classes/feeds.php:1070
+#: classes/pref/feeds.php:1668
+msgid "Subscribe"
+msgstr "Přihlásit se k odběru"
+
+#: classes/feeds.php:1017
+msgid "More feeds"
+msgstr "Více kanálů"
+
+#: classes/feeds.php:1020
+#: classes/feeds.php:1072
+#: classes/feeds.php:1111
+#: classes/pref/labels.php:84
+#: classes/pref/filters.php:528
+#: classes/pref/filters.php:945
+#: classes/pref/filters.php:1022
+#: classes/pref/filters.php:1115
+#: classes/pref/feeds.php:774
+#: classes/pref/feeds.php:916
+#: classes/pref/feeds.php:1669
+#: classes/pref/users.php:105
+#: classes/pref/prefs.php:984
+#: classes/article.php:238
+#: classes/handler/public.php:443
+#: classes/handler/public.php:477
+#: plugins/mail/init.php:179
+#: plugins/note/init.php:60
+msgid "Cancel"
+msgstr "Zrušit"
+
+#: classes/feeds.php:1042
+#: classes/feeds.php:1110
+#: classes/pref/filters.php:788
+#: classes/pref/feeds.php:1178
+#: classes/pref/users.php:345
+#: js/tt-rss.js:152
+msgid "Search"
+msgstr "Hledat"
+
+#: classes/feeds.php:1046
+msgid "Popular feeds"
+msgstr "Oblíbené kanály"
+
+#: classes/feeds.php:1047
+msgid "Feed archive"
+msgstr "Archiv kanálů"
+
+#: classes/feeds.php:1050
+msgid "limit:"
+msgstr "omezení:"
+
+#: classes/feeds.php:1071
+#: classes/pref/labels.php:282
+#: classes/pref/filters.php:518
+#: classes/pref/filters.php:814
+#: classes/pref/feeds.php:751
+#: classes/pref/users.php:369
+msgid "Remove"
+msgstr "Odebrat"
+
+#: classes/feeds.php:1084
+msgid "Look for"
+msgstr "Hledat"
+
+#: classes/feeds.php:1092
+#, php-format
+msgid "in %s"
 msgstr ""
 
-#: classes/dlg.php:194
-#, fuzzy
-msgid "Open Preferences"
-msgstr "Předvolby"
+#: classes/feeds.php:1097
+msgid "Used for word stemming"
+msgstr ""
 
-#: classes/handler/public.php:387
-#: plugins/bookmarklets/init.php:40
-msgid "Share with Tiny Tiny RSS"
-msgstr "Sdílet s Tiny Tiny RSS"
+#: classes/feeds.php:1106
+msgid "Search syntax"
+msgstr "Syntaxe hledání"
 
-#: classes/handler/public.php:395
-msgid "Title:"
-msgstr "Název:"
+#: classes/feeds.php:1563
+msgid "Starred articles"
+msgstr "Články označené hvězdičkou"
 
-#: classes/handler/public.php:397
-#: classes/pref/feeds.php:537
-msgid "URL:"
-msgstr "URL:"
+#: classes/feeds.php:1565
+msgid "Published articles"
+msgstr "Publikované články"
 
-#: classes/handler/public.php:399
-msgid "Content:"
-msgstr "Obsah:"
+#: classes/feeds.php:1567
+msgid "Fresh articles"
+msgstr "Nové články"
 
-#: classes/handler/public.php:401
-msgid "Labels:"
-msgstr "Štítky:"
+#: classes/feeds.php:1571
+msgid "Archived articles"
+msgstr "Archivované články"
 
-#: classes/handler/public.php:420
-msgid "Shared article will appear in the Published feed."
-msgstr "Sdílený článek se objeví v kanálu Publikováno."
+#: classes/feeds.php:1573
+msgid "Recently read"
+msgstr "Nedávno přečtené"
 
-#: classes/handler/public.php:422
-msgid "Share"
-msgstr "Sdílet"
+#: classes/feeds.php:1694
+msgid "Special"
+msgstr "Speciální"
 
-#: classes/handler/public.php:444
-msgid "Not logged in"
-msgstr "Nepřihlášený"
-
-#: classes/handler/public.php:504
-msgid "Incorrect username or password"
-msgstr "Nesprávné uživatelské jméno nebo heslo"
-
-#: classes/handler/public.php:557
+#: classes/feeds.php:1951
 #, php-format
-msgid "Already subscribed to <b>%s</b>."
-msgstr "Již odebíráte <b>%s</b>."
-
-#: classes/handler/public.php:560
-#, php-format
-msgid "Subscribed to <b>%s</b>."
-msgstr "Přihlášen k odběru <b>%s</b>."
-
-#: classes/handler/public.php:563
-#, 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:566
-#, php-format
-msgid "No feeds found in <b>%s</b>."
-msgstr "Nenalezeny žádné kanály v <b>%s</b>."
-
-#: classes/handler/public.php:569
-msgid "Multiple feed URLs found."
-msgstr "Nalezeno více URL kanálů."
-
-#: classes/handler/public.php:573
-#, 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:591
-msgid "Subscribe to selected feed"
-msgstr "Přihlásit se k odběru vybraného kanálu"
-
-#: classes/handler/public.php:618
-msgid "Edit subscription options"
-msgstr "Upravit volby odebírání"
-
-#: classes/handler/public.php:656
-msgid "Password recovery"
-msgstr "Obnovení hesla"
-
-#: classes/handler/public.php:701
-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:723
-#: classes/pref/users.php:372
-msgid "Reset password"
-msgstr "Obnovit heslo"
-
-#: classes/handler/public.php:733
-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:737
-#: classes/handler/public.php:806
-msgid "Go back"
-msgstr "Jít zpět"
-
-#: classes/handler/public.php:775
-msgid "[tt-rss] Password reset request"
-msgstr "[tt-rss] Vyžadováno obnovení hesla"
-
-#: classes/handler/public.php:802
-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:824
-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:850
-msgid "Database Updater"
-msgstr "Aktualizační nástroj databáze"
-
-#: classes/handler/public.php:915
-msgid "Perform updates"
-msgstr "Provést aktualizace"
+msgid "Search results: %s"
+msgstr "Výsledky hledání: %s"
 
 #: classes/pref/labels.php:25
 #: classes/pref/filters.php:377
@@ -1209,201 +1209,196 @@ msgstr "Popředí:"
 msgid "Background:"
 msgstr "Pozadí:"
 
+#: classes/pref/labels.php:82
+#: classes/pref/filters.php:525
+#: classes/pref/feeds.php:773
+#: classes/pref/feeds.php:913
+#: classes/pref/users.php:103
+#: classes/pref/prefs.php:982
+#: classes/article.php:236
+#: plugins/af_zz_imgproxy/init.php:238
+#: plugins/af_redditimgur/init.php:66
+#: plugins/af_psql_trgm/init.php:188
+#: plugins/af_readability/init.php:80
+#: plugins/nsfw/init.php:85
+#: plugins/mail/init.php:65
+#: plugins/note/init.php:58
+msgid "Save"
+msgstr "Uložit"
+
 #: classes/pref/labels.php:244
 #, php-format
 msgid "Created label <b>%s</b>"
 msgstr "Vytvořen štítek <b>%s</b>"
 
 #: classes/pref/labels.php:270
-#: classes/pref/users.php:356
-#: classes/pref/feeds.php:1183
-#: classes/pref/feeds.php:1414
-#: classes/pref/feeds.php:1479
 #: classes/pref/filters.php:388
 #: classes/pref/filters.php:446
 #: classes/pref/filters.php:792
 #: classes/pref/filters.php:875
 #: classes/pref/filters.php:902
+#: classes/pref/feeds.php:1182
+#: classes/pref/feeds.php:1413
+#: classes/pref/feeds.php:1478
+#: classes/pref/users.php:355
 #: classes/pref/prefs.php:993
 msgid "Select"
 msgstr "Vybrat"
 
-#: classes/pref/labels.php:273
-#: classes/pref/users.php:359
-#: classes/pref/feeds.php:1186
-#: classes/pref/feeds.php:1417
-#: classes/pref/feeds.php:1482
-#: classes/pref/filters.php:391
-#: classes/pref/filters.php:449
-#: classes/pref/filters.php:795
-#: classes/pref/filters.php:878
-#: classes/pref/filters.php:905
-#: classes/pref/prefs.php:996
-#: classes/feeds.php:102
-msgid "All"
-msgstr "Vše"
-
-#: classes/pref/labels.php:275
-#: classes/pref/users.php:361
-#: classes/pref/feeds.php:1188
-#: classes/pref/feeds.php:1419
-#: classes/pref/feeds.php:1484
-#: classes/pref/filters.php:393
-#: classes/pref/filters.php:451
-#: classes/pref/filters.php:797
-#: classes/pref/filters.php:880
-#: classes/pref/filters.php:907
-#: classes/pref/prefs.php:998
-#: classes/feeds.php:105
-msgid "None"
-msgstr "Žádný"
-
-#: classes/pref/labels.php:282
-#: classes/pref/users.php:370
-#: classes/pref/feeds.php:752
-#: classes/pref/filters.php:518
-#: classes/pref/filters.php:814
-#: classes/feeds.php:1088
-msgid "Remove"
-msgstr "Odebrat"
-
 #: classes/pref/labels.php:285
 msgid "Clear colors"
 msgstr "Vymazat barvy"
 
-#: classes/pref/users.php:6
-#: classes/pref/system.php:8
-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."
-
-#: classes/pref/users.php:26
+#: classes/pref/filters.php:155
 #, fuzzy
-msgid "Edit user"
-msgstr "Upravit pravidlo"
+msgid "Preview article"
+msgstr "Nové články"
 
-#: classes/pref/users.php:61
-#: classes/pref/feeds.php:622
-#: classes/pref/feeds.php:849
-#: classes/feeds.php:1009
-msgid "Authentication"
-msgstr "Ověření"
+#: classes/pref/filters.php:267
+#: classes/pref/filters.php:573
+msgid "(inverse)"
+msgstr "(inverzní)"
 
-#: classes/pref/users.php:64
-msgid "Access level: "
-msgstr "Úroveň přístupu: "
-
-#: classes/pref/users.php:82
-#: classes/pref/feeds.php:648
-#: classes/pref/feeds.php:867
-msgid "Options"
-msgstr "Volby"
-
-#: classes/pref/users.php:96
-#: js/prefs.js:479
-msgid "User details"
-msgstr "Podrobnosti uživatele"
-
-#: classes/pref/users.php:136
-#: classes/pref/users.php:407
-msgid "Registered"
-msgstr "Registrován"
-
-#: classes/pref/users.php:137
-msgid "Last logged in"
-msgstr "Naposledy přihlášen"
-
-#: classes/pref/users.php:145
-msgid "Subscribed feeds count"
-msgstr "Počet odebíraných kanálů"
-
-#: classes/pref/users.php:146
-#, fuzzy
-msgid "Stored articles"
-msgstr "Články označené hvězdičkou"
-
-#: classes/pref/users.php:150
-#: classes/pref/users.php:406
-msgid "Subscribed feeds"
-msgstr "Odebírané kanály"
-
-#: classes/pref/users.php:176
-msgid "User not found"
-msgstr "Uživatel nebyl nalezen"
-
-#: classes/pref/users.php:246
+#: classes/pref/filters.php:263
+#: classes/pref/filters.php:572
 #, php-format
-msgid "Added user <b>%s</b> with password <b>%s</b>"
-msgstr "Přidán uživatel <b>%s</b> s heslem <b>%s</b>"
+msgid "%s on %s in %s %s"
+msgstr "%s na %s v %s %s"
 
-#: classes/pref/users.php:253
-#, php-format
-msgid "Could not create user <b>%s</b>"
-msgstr "Nelze vytvořit uživatele <b>%s</b>"
+#: classes/pref/filters.php:383
+#: classes/pref/filters.php:870
+#: classes/pref/filters.php:977
+msgid "Match"
+msgstr "Odpovídá"
 
-#: classes/pref/users.php:257
-#, php-format
-msgid "User <b>%s</b> already exists."
-msgstr "Uživatel <b>%s</b> již existuje."
+#: classes/pref/filters.php:397
+#: classes/pref/filters.php:455
+#: classes/pref/filters.php:884
+#: classes/pref/filters.php:911
+msgid "Add"
+msgstr "Přidat"
 
-#: classes/pref/users.php:285
-#, 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/filters.php:441
+#: classes/pref/filters.php:897
+msgid "Apply actions"
+msgstr "Použít akce"
 
-#: classes/pref/users.php:287
-#, 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/filters.php:492
+#: classes/pref/filters.php:926
+msgid "Enabled"
+msgstr "Povoleno"
 
-#: classes/pref/users.php:311
-msgid "[tt-rss] Password change notification"
-msgstr "[tt-rss] Oznámení o změně hesla"
+#: classes/pref/filters.php:501
+#: classes/pref/filters.php:929
+msgid "Match any rule"
+msgstr "Odpovídá jakémukoliv pravidlu"
 
-#: classes/pref/users.php:346
-#: classes/pref/feeds.php:1179
-#: classes/pref/filters.php:788
-#: classes/feeds.php:1059
-#: classes/feeds.php:1127
-#: js/tt-rss.js:165
-msgid "Search"
-msgstr "Hledat"
+#: classes/pref/filters.php:510
+#: classes/pref/filters.php:932
+msgid "Inverse matching"
+msgstr "Inverzní porovnání"
 
-#: classes/pref/users.php:364
-msgid "Create user"
-msgstr "Vytvořit uživatele"
+#: classes/pref/filters.php:522
+#: classes/pref/filters.php:939
+msgid "Test"
+msgstr "Test"
+
+#: classes/pref/filters.php:804
+msgid "Combine"
+msgstr "Kombinovat"
 
-#: classes/pref/users.php:368
 #: classes/pref/filters.php:807
+#: classes/pref/users.php:367
 msgid "Edit"
 msgstr "Upravit"
 
-#: classes/pref/users.php:404
-#: classes/pref/feeds.php:626
-#: classes/pref/feeds.php:853
-#: classes/pref/feeds.php:1649
-#: classes/feeds.php:1013
-msgid "Login"
-msgstr "Přihlášení"
+#: classes/pref/filters.php:810
+#: classes/pref/feeds.php:1198
+#: classes/pref/feeds.php:1212
+msgid "Reset sort order"
+msgstr "Obnovit pořadí řazení"
 
-#: classes/pref/users.php:405
-msgid "Access Level"
-msgstr "Úroveň přístupu"
+#: classes/pref/filters.php:942
+msgid "Create"
+msgstr "Vytvořit"
 
-#: classes/pref/users.php:408
-msgid "Last login"
-msgstr "Poslední přihlášení"
+#: classes/pref/filters.php:987
+msgid "Regular expression, without outer delimiters (i.e. slashes)"
+msgstr ""
 
-#: classes/pref/users.php:427
-msgid "Click to edit"
-msgstr "Klikněte pro úpravu"
+#: classes/pref/filters.php:993
+msgid "Inverse regular expression matching"
+msgstr "Inverzní porovnání regulárního výrazu"
 
-#: classes/pref/users.php:447
-msgid "No users defined."
-msgstr "Nejsou definováni žádní uživatelé."
+#: classes/pref/filters.php:995
+msgid "on field"
+msgstr "pole"
 
-#: classes/pref/users.php:449
-msgid "No matching users found."
-msgstr "Nebyli nalezeni žádní odpovídající uživatelé."
+#: classes/pref/filters.php:1001
+#: js/PrefFilterTree.js:44
+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:764
+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:786
+msgid "Add action"
+msgstr "Přidat akci"
+
+#: classes/pref/filters.php:1139
+msgid "[No caption]"
+msgstr "[Bez titulku]"
+
+#: classes/pref/filters.php:1141
+#, 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:1155
+#, fuzzy
+msgid "matches any rule"
+msgstr "Odpovídá jakémukoliv pravidlu"
+
+#: classes/pref/filters.php:1158
+#, 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/system.php:8
+#: classes/pref/users.php:6
+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."
 
 #: classes/pref/system.php:29
 msgid "Error Log"
@@ -1449,387 +1444,316 @@ msgstr[0] "(%d kanál)"
 msgstr[1] "(%d kanály)"
 msgstr[2] "(%d kanálů)"
 
-#: classes/pref/feeds.php:514
+#: classes/pref/feeds.php:513
 #: classes/pref/prefs.php:18
 msgid "General"
 msgstr "Obecné"
 
-#: classes/pref/feeds.php:528
+#: classes/pref/feeds.php:527
 msgid "Feed Title"
 msgstr "Název kanálu"
 
-#: classes/pref/feeds.php:560
-#: classes/pref/feeds.php:801
-#: classes/pref/feeds.php:1635
-#: classes/feeds.php:989
-msgid "Place in category:"
-msgstr "Umístit do kategorie:"
+#: classes/pref/feeds.php:536
+#: classes/handler/public.php:417
+msgid "URL:"
+msgstr "URL:"
 
-#: classes/pref/feeds.php:572
+#: classes/pref/feeds.php:571
 #, fuzzy
 msgid "Site URL:"
 msgstr "URL článku:"
 
-#: classes/pref/feeds.php:574
+#: classes/pref/feeds.php:573
 #, fuzzy
 msgid "Site URL"
 msgstr "URL kanálu"
 
-#: classes/pref/feeds.php:585
-#: classes/pref/feeds.php:815
+#: classes/pref/feeds.php:584
+#: classes/pref/feeds.php:814
 #, fuzzy
 msgid "Language:"
 msgstr "Jazyk"
 
-#: classes/pref/feeds.php:592
-#: classes/pref/feeds.php:824
+#: classes/pref/feeds.php:591
+#: classes/pref/feeds.php:823
 msgid "Update"
 msgstr "Aktualizovat"
 
-#: classes/pref/feeds.php:607
-#: classes/pref/feeds.php:840
+#: classes/pref/feeds.php:606
+#: classes/pref/feeds.php:839
 msgid "Article purging:"
 msgstr "Čištění článků:"
 
-#: classes/pref/feeds.php:632
-#: classes/pref/feeds.php:861
-#: classes/pref/feeds.php:1652
-#: classes/pref/prefs.php:243
-#: classes/feeds.php:1017
-msgid "Password"
-msgstr "Heslo"
-
-#: classes/pref/feeds.php:636
+#: classes/pref/feeds.php:635
 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:646
-#: classes/feeds.php:1028
-msgid "This feed requires authentication."
-msgstr "Tento kanál vyžaduje ověření."
+#: classes/pref/feeds.php:647
+#: classes/pref/feeds.php:866
+#: classes/pref/users.php:82
+msgid "Options"
+msgstr "Volby"
 
-#: classes/pref/feeds.php:662
-#: classes/pref/feeds.php:871
+#: classes/pref/feeds.php:661
+#: classes/pref/feeds.php:870
 msgid "Hide from Popular feeds"
 msgstr "Skrýt před oblíbenými kanály"
 
-#: classes/pref/feeds.php:674
-#: classes/pref/feeds.php:877
+#: classes/pref/feeds.php:673
+#: classes/pref/feeds.php:876
 msgid "Include in e-mail digest"
 msgstr "Zahrnout do e-mailového výtahu"
 
-#: classes/pref/feeds.php:687
-#: classes/pref/feeds.php:883
+#: classes/pref/feeds.php:686
+#: classes/pref/feeds.php:882
 msgid "Always display image attachments"
 msgstr "Vždy zobrazovat obrázkové přílohy"
 
-#: classes/pref/feeds.php:700
-#: classes/pref/feeds.php:891
+#: classes/pref/feeds.php:699
+#: classes/pref/feeds.php:890
 #, fuzzy
 msgid "Do not embed media"
 msgstr "Nevkládat obrázky"
 
-#: classes/pref/feeds.php:713
-#: classes/pref/feeds.php:899
+#: classes/pref/feeds.php:712
+#: classes/pref/feeds.php:898
 msgid "Cache media"
 msgstr ""
 
-#: classes/pref/feeds.php:725
-#: classes/pref/feeds.php:905
+#: classes/pref/feeds.php:724
+#: classes/pref/feeds.php:904
 msgid "Mark updated articles as unread"
 msgstr "Označit aktualizované články jako nepřečtené"
 
-#: classes/pref/feeds.php:729
+#: classes/pref/feeds.php:728
 msgid "Icon"
 msgstr "Ikona"
 
-#: classes/pref/feeds.php:743
-#: classes/pref/feeds.php:1284
+#: classes/pref/feeds.php:742
+#: classes/pref/feeds.php:1283
 #: plugins/import_export/init.php:71
 #, fuzzy
 msgid "Choose file..."
 msgstr "Vytvořit filtr..."
 
-#: classes/pref/feeds.php:750
+#: classes/pref/feeds.php:749
 msgid "Replace"
 msgstr "Nahradit"
 
-#: classes/pref/feeds.php:757
+#: classes/pref/feeds.php:756
 #: classes/pref/prefs.php:679
 msgid "Plugins"
 msgstr "Moduly"
 
-#: classes/pref/feeds.php:1154
+#: classes/pref/feeds.php:1153
 msgid "Feeds with errors"
 msgstr "Kanály s chybami"
 
-#: classes/pref/feeds.php:1161
+#: classes/pref/feeds.php:1160
 msgid "Inactive feeds"
 msgstr "Neaktivní kanály"
 
-#: classes/pref/feeds.php:1197
+#: classes/pref/feeds.php:1196
 msgid "Edit selected feeds"
 msgstr "Upravit vybrané kanály"
 
-#: classes/pref/feeds.php:1199
-#: classes/pref/feeds.php:1213
-#: classes/pref/filters.php:810
-msgid "Reset sort order"
-msgstr "Obnovit pořadí řazení"
-
-#: classes/pref/feeds.php:1201
-#: js/prefs.js:1462
+#: classes/pref/feeds.php:1200
+#: js/prefs.js:1171
 msgid "Batch subscribe"
 msgstr "Dávkové přihlášení k odběru"
 
-#: classes/pref/feeds.php:1208
+#: classes/pref/feeds.php:1207
 msgid "Categories"
 msgstr "Kategorie"
 
-#: classes/pref/feeds.php:1211
+#: classes/pref/feeds.php:1210
 msgid "Add category"
 msgstr "Přidat kategorii"
 
-#: classes/pref/feeds.php:1215
+#: classes/pref/feeds.php:1214
 msgid "Remove selected"
 msgstr "Odebrat vybrané"
 
-#: classes/pref/feeds.php:1272
+#: classes/pref/feeds.php:1271
 msgid "OPML"
 msgstr "OPML"
 
-#: classes/pref/feeds.php:1274
+#: classes/pref/feeds.php:1273
 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:1275
+#: classes/pref/feeds.php:1274
 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:1290
+#: classes/pref/feeds.php:1289
 msgid "Import my OPML"
 msgstr "Importovat mé OPML"
 
-#: classes/pref/feeds.php:1296
+#: classes/pref/feeds.php:1295
 msgid "Filename:"
 msgstr "Název souboru:"
 
-#: classes/pref/feeds.php:1298
+#: classes/pref/feeds.php:1297
 msgid "Include settings"
 msgstr "Zahrnout nastavení"
 
-#: classes/pref/feeds.php:1302
+#: classes/pref/feeds.php:1301
 msgid "Export OPML"
 msgstr "Exportovat OPML"
 
-#: classes/pref/feeds.php:1306
+#: classes/pref/feeds.php:1305
 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:1310
+#: classes/pref/feeds.php:1309
 msgid "Public OPML URL"
 msgstr "Veřejná URL OPML"
 
-#: classes/pref/feeds.php:1311
+#: classes/pref/feeds.php:1310
 msgid "Display published OPML URL"
 msgstr "Zobrazit URL publikovaných OPML"
 
-#: classes/pref/feeds.php:1318
+#: classes/pref/feeds.php:1317
 msgid "Published & shared articles / Generated feeds"
 msgstr "Publikované a sdílené články / Generované kanály"
 
-#: classes/pref/feeds.php:1320
+#: classes/pref/feeds.php:1319
 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:1327
-#: classes/feeds.php:54
-#: classes/feeds.php:140
-msgid "View as RSS"
-msgstr "Zobrazit jako RSS"
-
-#: classes/pref/feeds.php:1328
 msgid "Display URL"
 msgstr "Zobrazit URL"
 
-#: classes/pref/feeds.php:1331
+#: classes/pref/feeds.php:1330
 msgid "Clear all generated URLs"
 msgstr "Vymazat všechny vygenerované URL"
 
-#: classes/pref/feeds.php:1410
+#: classes/pref/feeds.php:1409
 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:1444
-#: classes/pref/feeds.php:1509
+#: classes/pref/feeds.php:1443
+#: classes/pref/feeds.php:1508
 msgid "Click to edit feed"
 msgstr "Klikněte pro úpravu kanálu"
 
-#: classes/pref/feeds.php:1462
-#: classes/pref/feeds.php:1529
+#: classes/pref/feeds.php:1461
+#: classes/pref/feeds.php:1528
 msgid "Unsubscribe from selected feeds"
 msgstr "Odhlásit odběr vybraných kanálů"
 
-#: classes/pref/feeds.php:1632
+#: classes/pref/feeds.php:1629
 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:1641
+#: classes/pref/feeds.php:1638
 msgid "Feeds to subscribe, One per line"
 msgstr "Kanály k odebírání, jeden na řádek"
 
-#: classes/pref/feeds.php:1664
+#: classes/pref/feeds.php:1661
 msgid "Feeds require authentication."
 msgstr "Kanály vyžadují ověření."
 
-#: classes/pref/feeds.php:1671
-#: classes/feeds.php:1031
-#: classes/feeds.php:1087
-msgid "Subscribe"
-msgstr "Přihlásit se k odběru"
-
-#: classes/pref/filters.php:155
+#: classes/pref/users.php:26
 #, fuzzy
-msgid "Preview article"
-msgstr "Nové články"
+msgid "Edit user"
+msgstr "Upravit pravidlo"
 
-#: classes/pref/filters.php:267
-#: classes/pref/filters.php:573
-msgid "(inverse)"
-msgstr "(inverzní)"
+#: classes/pref/users.php:64
+msgid "Access level: "
+msgstr "Úroveň přístupu: "
 
-#: classes/pref/filters.php:263
-#: classes/pref/filters.php:572
-#, php-format
-msgid "%s on %s in %s %s"
-msgstr "%s na %s v %s %s"
+#: classes/pref/users.php:96
+#: js/prefs.js:403
+msgid "User details"
+msgstr "Podrobnosti uživatele"
 
-#: classes/pref/filters.php:383
-#: classes/pref/filters.php:870
-#: classes/pref/filters.php:977
-msgid "Match"
-msgstr "Odpovídá"
+#: classes/pref/users.php:136
+#: classes/pref/users.php:406
+msgid "Registered"
+msgstr "Registrován"
 
-#: classes/pref/filters.php:397
-#: classes/pref/filters.php:455
-#: classes/pref/filters.php:884
-#: classes/pref/filters.php:911
-msgid "Add"
-msgstr "Přidat"
+#: classes/pref/users.php:137
+msgid "Last logged in"
+msgstr "Naposledy přihlášen"
 
-#: classes/pref/filters.php:400
-#: classes/pref/filters.php:458
-#: classes/pref/filters.php:887
-#: classes/pref/filters.php:914
-#: classes/feeds.php:122
-msgid "Delete"
-msgstr "Odstranit"
+#: classes/pref/users.php:145
+msgid "Subscribed feeds count"
+msgstr "Počet odebíraných kanálů"
 
-#: classes/pref/filters.php:441
-#: classes/pref/filters.php:897
-msgid "Apply actions"
-msgstr "Použít akce"
-
-#: classes/pref/filters.php:492
-#: classes/pref/filters.php:926
-msgid "Enabled"
-msgstr "Povoleno"
-
-#: classes/pref/filters.php:501
-#: classes/pref/filters.php:929
-msgid "Match any rule"
-msgstr "Odpovídá jakémukoliv pravidlu"
-
-#: classes/pref/filters.php:510
-#: classes/pref/filters.php:932
-msgid "Inverse matching"
-msgstr "Inverzní porovnání"
-
-#: classes/pref/filters.php:522
-#: classes/pref/filters.php:939
-msgid "Test"
-msgstr "Test"
-
-#: classes/pref/filters.php:804
-msgid "Combine"
-msgstr "Kombinovat"
-
-#: classes/pref/filters.php:942
-msgid "Create"
-msgstr "Vytvořit"
-
-#: classes/pref/filters.php:987
-msgid "Regular expression, without outer delimiters (i.e. slashes)"
-msgstr ""
-
-#: 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:43
-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:797
-msgid "Add rule"
-msgstr "Přidat pravidlo"
-
-#: classes/pref/filters.php:1042
-msgid "Perform Action"
-msgstr "Provést akci"
-
-#: classes/pref/filters.php:1093
+#: classes/pref/users.php:146
 #, fuzzy
-msgid "No actions available"
-msgstr "Je dostupná nová verze!"
+msgid "Stored articles"
+msgstr "Články označené hvězdičkou"
 
-#: classes/pref/filters.php:1112
-msgid "Save action"
-msgstr "Uložit akci"
+#: classes/pref/users.php:150
+#: classes/pref/users.php:405
+msgid "Subscribed feeds"
+msgstr "Odebírané kanály"
 
-#: classes/pref/filters.php:1112
-#: js/functions.js:819
-msgid "Add action"
-msgstr "Přidat akci"
+#: classes/pref/users.php:176
+msgid "User not found"
+msgstr "Uživatel nebyl nalezen"
 
-#: classes/pref/filters.php:1139
-msgid "[No caption]"
-msgstr "[Bez titulku]"
-
-#: classes/pref/filters.php:1141
+#: classes/pref/users.php:246
 #, 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)"
+msgid "Added user <b>%s</b> with password <b>%s</b>"
+msgstr "Přidán uživatel <b>%s</b> s heslem <b>%s</b>"
 
-#: classes/pref/filters.php:1155
-#, fuzzy
-msgid "matches any rule"
-msgstr "Odpovídá jakémukoliv pravidlu"
-
-#: classes/pref/filters.php:1158
+#: classes/pref/users.php:253
 #, 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í)"
+msgid "Could not create user <b>%s</b>"
+msgstr "Nelze vytvořit uživatele <b>%s</b>"
+
+#: classes/pref/users.php:257
+#, php-format
+msgid "User <b>%s</b> already exists."
+msgstr "Uživatel <b>%s</b> již existuje."
+
+#: classes/pref/users.php:285
+#, 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:287
+#, 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:310
+msgid "[tt-rss] Password change notification"
+msgstr "[tt-rss] Oznámení o změně hesla"
+
+#: classes/pref/users.php:363
+msgid "Create user"
+msgstr "Vytvořit uživatele"
+
+#: classes/pref/users.php:371
+#: classes/handler/public.php:747
+msgid "Reset password"
+msgstr "Obnovit heslo"
+
+#: classes/pref/users.php:404
+msgid "Access Level"
+msgstr "Úroveň přístupu"
+
+#: classes/pref/users.php:407
+msgid "Last login"
+msgstr "Poslední přihlášení"
+
+#: classes/pref/users.php:426
+msgid "Click to edit"
+msgstr "Klikněte pro úpravu"
+
+#: classes/pref/users.php:446
+msgid "No users defined."
+msgstr "Nejsou definováni žádní uživatelé."
+
+#: classes/pref/users.php:448
+msgid "No matching users found."
+msgstr "Nebyli nalezeni žádní odpovídající uživatelé."
 
 #: classes/pref/prefs.php:19
 msgid "Interface"
@@ -2005,7 +1929,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:1424
+#: js/prefs.js:1136
 msgid "Customize stylesheet"
 msgstr "Přizpůsobit šablonu stylů"
 
@@ -2248,254 +2172,298 @@ msgstr "Odebrat vybrané profily"
 msgid "Activate profile"
 msgstr "Aktivovat profil"
 
-#: classes/feeds.php:53
-msgid "View as RSS feed"
-msgstr "Zobrazit jako kanál RSS"
+#: 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."
 
-#: classes/feeds.php:62
-#, php-format
-msgid "Last updated: %s"
-msgstr "Naposledy aktualizováno: %s"
+#: classes/dlg.php:44
+msgid "Your Public OPML URL is:"
+msgstr "Vaše veřejná URL OPML je:"
 
-#: classes/feeds.php:100
+#: classes/dlg.php:53
+#: classes/dlg.php:178
+#: plugins/share/init.php:125
+msgid "Generate new URL"
+msgstr "Generovat novou URL"
+
+#: classes/dlg.php:67
+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 "Démon aktualizací je povolen v konfiguraci, ale proces typu démon není spuštěn, což zabraňuje aktualizaci všech kanálů. Spusťte proces typu démon, nebo kontaktujte vlastníka instance."
+
+#: classes/dlg.php:71
+#: classes/dlg.php:80
+msgid "Last update:"
+msgstr "Poslední aktualizace:"
+
+#: classes/dlg.php:76
+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 "Démonu aktualizací trvá příliš dlouho provedení aktualizace kanálu. To může znamenat problém, jako je zhroucení nebo zablokování. Zkontrolujte proces typu démon nebo kontaktujte vlastníka instance."
+
+#: classes/dlg.php:169
+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/dlg.php:190
+msgid "You are using default tt-rss password. Please change it in the Preferences (Personal data / Authentication)."
+msgstr ""
+
+#: classes/dlg.php:194
 #, fuzzy
-msgid "Select..."
-msgstr "Vybrat"
+msgid "Open Preferences"
+msgstr "Předvolby"
 
-#: classes/feeds.php:104
-msgid "Invert"
-msgstr "Invertovat"
+#: classes/opml.php:31
+#: classes/opml.php:36
+msgid "OPML Utility"
+msgstr "Nástroj OPML"
 
-#: classes/feeds.php:107
-msgid "Selection toggle:"
-msgstr "Přepínač výběru:"
+#: classes/opml.php:40
+msgid "Importing OPML..."
+msgstr "Importování OPML..."
 
-#: classes/feeds.php:113
-msgid "Selection:"
-msgstr "Výběr:"
+#: classes/opml.php:45
+msgid "Return to preferences"
+msgstr "Zpět do předvoleb"
 
-#: classes/feeds.php:116
-msgid "Set score"
-msgstr "Nastavit hodnocení"
-
-#: classes/feeds.php:119
-msgid "Archive"
-msgstr "Archivovat"
-
-#: classes/feeds.php:121
-msgid "Move back"
-msgstr "Zpět"
-
-#: classes/feeds.php:127
-#: classes/feeds.php:132
-#: plugins/mail/init.php:76
-#: plugins/mailto/init.php:25
-msgid "Forward by email"
-msgstr "Přeposlat e-mailem"
-
-#: classes/feeds.php:136
-msgid "Feed:"
-msgstr "Kanál:"
-
-#: classes/feeds.php:193
-#: classes/feeds.php:819
-msgid "Feed not found."
-msgstr "Kanál nenalezen."
-
-#: classes/feeds.php:255
-msgid "Never"
-msgstr "Nikdy"
-
-#: classes/feeds.php:342
+#: classes/opml.php:301
 #, php-format
-msgid "Imported at %s"
-msgstr "Importováno v %s"
+msgid "Adding feed: %s"
+msgstr "Přidávání kanálu: %s"
 
-#: classes/feeds.php:394
-#: classes/feeds.php:487
-msgid "mark feed as read"
-msgstr "označit kanál jako přečtený"
-
-#: classes/feeds.php:542
-msgid "Collapse article"
-msgstr "Sbalit článek"
-
-#: classes/feeds.php:703
-msgid "No unread articles found to display."
-msgstr "Nenalezeny žádné nepřečtené články k zobrazení."
-
-#: classes/feeds.php:706
-msgid "No updated articles found to display."
-msgstr "Nenalezeny žádné aktualizované články k zobrazení."
-
-#: classes/feeds.php:709
-msgid "No starred articles found to display."
-msgstr "Nenalezeny žádné články označené hvězdičkou k zobrazení."
-
-#: classes/feeds.php:713
-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:715
-msgid "No articles found to display."
-msgstr "Nenalezeny žádné články k zobrazení."
-
-#: classes/feeds.php:731
-#: classes/feeds.php:922
+#: classes/opml.php:312
 #, php-format
-msgid "Feeds last updated at %s"
-msgstr "Kanál naposledy aktualizován v %s"
+msgid "Duplicate feed: %s"
+msgstr "Duplicitní kanál: %s"
 
-#: classes/feeds.php:743
-#: classes/feeds.php:934
-msgid "Some feeds have update errors (click for details)"
-msgstr "Některé kanály mají chyby aktualizace (klikněte pro podrobnosti)"
-
-#: classes/feeds.php:911
-msgid "No feed selected."
-msgstr "Není vybrán žádný kanál."
-
-#: classes/feeds.php:975
-#: classes/feeds.php:983
-msgid "Feed or site URL"
-msgstr "Kanál nebo URL stránky"
-
-#: classes/feeds.php:997
-msgid "Available feeds"
-msgstr "Dostupné kanály"
-
-#: classes/feeds.php:1034
-msgid "More feeds"
-msgstr "Více kanálů"
-
-#: classes/feeds.php:1063
-msgid "Popular feeds"
-msgstr "Oblíbené kanály"
-
-#: classes/feeds.php:1064
-msgid "Feed archive"
-msgstr "Archiv kanálů"
-
-#: classes/feeds.php:1067
-msgid "limit:"
-msgstr "omezení:"
-
-#: classes/feeds.php:1101
-msgid "Look for"
-msgstr "Hledat"
-
-#: classes/feeds.php:1109
+#: classes/opml.php:326
 #, php-format
-msgid "in %s"
+msgid "Adding label %s"
+msgstr "Přidávání štítku %s"
+
+#: classes/opml.php:329
+#, php-format
+msgid "Duplicate label: %s"
+msgstr "Duplicitní štítek: %s"
+
+#: classes/opml.php:341
+#, php-format
+msgid "Setting preference key %s to %s"
+msgstr "Nastavení klíče předvoleb %s na %s"
+
+#: classes/opml.php:377
+msgid "Adding filter..."
+msgstr "Přidávání filtru..."
+
+#: classes/opml.php:512
+#, php-format
+msgid "Processing category: %s"
+msgstr "Zpracovávání kategorie: %s"
+
+#: classes/opml.php:558
+#, php-format
+msgid "Upload failed with error code %d"
+msgstr "Nahrávání selhalo s kódem chyby %d"
+
+#: classes/opml.php:570
+#: plugins/import_export/init.php:471
+msgid "Unable to move uploaded file."
+msgstr "Nelze přesunout nahraný soubor."
+
+#: classes/opml.php:574
+#: plugins/import_export/init.php:475
+msgid "Error: please upload OPML file."
+msgstr "Chyba: nahrajte soubor OPML."
+
+#: classes/opml.php:585
+msgid "Error: unable to find moved OPML file."
+msgstr "Chyba: nelze nalézt přesunutý soubor OPML."
+
+#: classes/opml.php:594
+msgid "Error while parsing document."
+msgstr "Chyba při zpracování dokumentu."
+
+#: classes/article.php:26
+msgid "Article not found."
+msgstr "Článek nenalezen."
+
+#: classes/article.php:211
+msgid "Tags for this article (separated by commas):"
+msgstr "Značky pro tento článek (oddělené čárkami):"
+
+#: classes/article.php:337
+#: classes/article.php:719
+#: classes/article.php:874
+msgid "no tags"
+msgstr "žádné značky"
+
+#: classes/article.php:447
+msgid "unknown type"
+msgstr "neznámý typ"
+
+#: classes/article.php:524
+msgid "Attachments"
+msgstr "Přílohy"
+
+#: classes/article.php:688
+msgid " - "
+msgstr " - "
+
+#: classes/article.php:912
+msgid "(edit note)"
+msgstr "(upravit poznámku)"
+
+#: classes/handler/public.php:407
+#: plugins/bookmarklets/init.php:40
+msgid "Share with Tiny Tiny RSS"
+msgstr "Sdílet s Tiny Tiny RSS"
+
+#: classes/handler/public.php:415
+msgid "Title:"
+msgstr "Název:"
+
+#: classes/handler/public.php:419
+msgid "Content:"
+msgstr "Obsah:"
+
+#: classes/handler/public.php:421
+msgid "Labels:"
+msgstr "Štítky:"
+
+#: classes/handler/public.php:440
+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:442
+msgid "Share"
+msgstr "Sdílet"
+
+#: classes/handler/public.php:464
+msgid "Not logged in"
+msgstr "Nepřihlášený"
+
+#: classes/handler/public.php:527
+msgid "Incorrect username or password"
+msgstr "Nesprávné uživatelské jméno nebo heslo"
+
+#: classes/handler/public.php:581
+#, php-format
+msgid "Already subscribed to <b>%s</b>."
+msgstr "Již odebíráte <b>%s</b>."
+
+#: classes/handler/public.php:584
+#, php-format
+msgid "Subscribed to <b>%s</b>."
+msgstr "Přihlášen k odběru <b>%s</b>."
+
+#: classes/handler/public.php:587
+#, 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:590
+#, php-format
+msgid "No feeds found in <b>%s</b>."
+msgstr "Nenalezeny žádné kanály v <b>%s</b>."
+
+#: classes/handler/public.php:593
+msgid "Multiple feed URLs found."
+msgstr "Nalezeno více URL kanálů."
+
+#: classes/handler/public.php:597
+#, 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:615
+msgid "Subscribe to selected feed"
+msgstr "Přihlásit se k odběru vybraného kanálu"
+
+#: classes/handler/public.php:642
+msgid "Edit subscription options"
+msgstr "Upravit volby odebírání"
+
+#: classes/handler/public.php:680
+msgid "Password recovery"
+msgstr "Obnovení hesla"
+
+#: classes/handler/public.php:725
+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:757
+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:761
+#: classes/handler/public.php:830
+msgid "Go back"
+msgstr "Jít zpět"
+
+#: classes/handler/public.php:799
+msgid "[tt-rss] Password reset request"
+msgstr "[tt-rss] Vyžadováno obnovení hesla"
+
+#: 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: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:874
+msgid "Database Updater"
+msgstr "Aktualizační nástroj databáze"
+
+#: classes/handler/public.php:939
+msgid "Perform updates"
+msgstr "Provést aktualizace"
+
+#: plugins/af_zz_imgproxy/init.php:208
+msgid "Image proxy settings (af_zz_imgproxy)"
 msgstr ""
 
-#: classes/feeds.php:1114
-msgid "Used for word stemming"
-msgstr ""
+#: plugins/af_zz_imgproxy/init.php:232
+#, fuzzy
+msgid "Enable proxy for all remote images."
+msgstr "Povolit kategorie kanálů"
 
-#: classes/feeds.php:1123
-msgid "Search syntax"
-msgstr "Syntaxe hledání"
+#: plugins/af_zz_imgproxy/init.php:236
+#, fuzzy
+msgid "Don't cache files locally."
+msgstr "Ukládat obrázky do mezipaměti místně"
 
-#: classes/feeds.php:1577
-msgid "Starred articles"
-msgstr "Články označené hvězdičkou"
-
-#: classes/feeds.php:1579
-msgid "Published articles"
-msgstr "Publikované články"
-
-#: classes/feeds.php:1581
-msgid "Fresh articles"
-msgstr "Nové články"
-
-#: classes/feeds.php:1585
-msgid "Archived articles"
-msgstr "Archivované články"
-
-#: classes/feeds.php:1587
-msgid "Recently read"
-msgstr "Nedávno přečtené"
-
-#: classes/feeds.php:1708
-msgid "Special"
-msgstr "Speciální"
-
-#: classes/feeds.php:1965
-#, php-format
-msgid "Search results: %s"
-msgstr "Výsledky hledání: %s"
-
-#: 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."
+#: plugins/af_zz_imgproxy/init.php:252
+#: plugins/af_redditimgur/init.php:79
+#, fuzzy
+msgid "Configuration saved"
 msgstr "Konfigurace uložena."
 
-#: plugins/note/init.php:28
-#: plugins/note/note.js:11
-msgid "Edit article note"
-msgstr "Upravit poznámku článku"
-
 #: plugins/vf_shared/init.php:17
 #: plugins/vf_shared/init.php:73
 msgid "Shared articles"
 msgstr "Sdílené články"
 
-#: plugins/auth_internal/init.php:67
-msgid "Please enter your one time password:"
-msgstr "Zadejte své jednorázové heslo:"
+#: plugins/bookmarklets/init.php:20
+msgid "Bookmarklets"
+msgstr "Záložkové aplety"
 
-#: plugins/auth_internal/init.php:208
-msgid "Password has been changed."
-msgstr "Heslo bylo změněno."
+#: 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 "Přetáhněte níže uvedený odkaz na panel nástrojů prohlížeče, otevřete v prohlížeči kanál, o který máte zájem, a klikněte na odkaz pro přihlášení k jeho odběru."
 
-#: plugins/auth_internal/init.php:210
-msgid "Old password is incorrect."
-msgstr "Staré heslo je nesprávné."
+#: plugins/bookmarklets/init.php:26
+#, php-format
+msgid "Subscribe to %s in Tiny Tiny RSS?"
+msgstr "Přihlásit se k odběru %s v Tiny Tiny RSS?"
 
-#: plugins/af_readability/init.php:25
-msgid "Data saved."
-msgstr ""
+#: plugins/bookmarklets/init.php:31
+msgid "Subscribe in Tiny Tiny RSS"
+msgstr "Přihlásit se k odběru v Tiny Tiny RSS"
 
-#: plugins/af_readability/init.php:41
-#, fuzzy
-msgid "Inline content"
-msgstr "Upravit poznámku článku"
-
-#: plugins/af_readability/init.php:47
-msgid "Readability settings (af_readability)"
-msgstr ""
-
-#: plugins/af_readability/init.php:78
-msgid "Use Readability for pages shared via bookmarklet."
-msgstr ""
-
-#: plugins/af_readability/init.php:90
-#: plugins/af_psql_trgm/init.php:198
-msgid "Currently enabled for (click to edit):"
-msgstr ""
-
-#: plugins/af_readability/init.php:107
-#, fuzzy
-msgid "Readability"
-msgstr "Zkontrolovat dostupnost"
-
-#: plugins/af_readability/init.php:118
-#, fuzzy
-msgid "Inline article content"
-msgstr "Upravit poznámku článku"
+#: plugins/bookmarklets/init.php:34
+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_redditimgur/init.php:30
 msgid "Reddit content settings (af_redditimgur)"
@@ -2509,11 +2477,21 @@ msgstr ""
 msgid "Enable additional duplicate checking"
 msgstr ""
 
-#: plugins/af_redditimgur/init.php:79
-#: plugins/af_zz_imgproxy/init.php:252
-#, fuzzy
-msgid "Configuration saved"
-msgstr "Konfigurace uložena."
+#: plugins/af_comics/init.php:49
+msgid "Feeds supported by af_comics"
+msgstr "Kanály podporované af_comics"
+
+#: plugins/af_comics/init.php:51
+msgid "The following comics are currently supported:"
+msgstr "Nyní jsou podporovány následující komiksy:"
+
+#: plugins/af_comics/init.php:69
+msgid "To subscribe to GoComics use the comic's regular web page as the feed URL (e.g. for the <em>Garfield</em> comic use <code>http://www.gocomics.com/garfield</code>)."
+msgstr ""
+
+#: plugins/af_comics/init.php:71
+msgid "Drop any updated filters into <code>filters.local</code> in plugin directory."
+msgstr ""
 
 #: plugins/af_psql_trgm/init.php:29
 #, php-format
@@ -2553,26 +2531,87 @@ msgstr ""
 msgid "Enable for all feeds:"
 msgstr "Povolit kategorie kanálů"
 
+#: plugins/af_psql_trgm/init.php:198
+#: plugins/af_readability/init.php:90
+msgid "Currently enabled for (click to edit):"
+msgstr ""
+
 #: plugins/af_psql_trgm/init.php:216
 msgid "Similarity (pg_trgm)"
 msgstr ""
 
-#: plugins/af_comics/init.php:49
-msgid "Feeds supported by af_comics"
-msgstr "Kanály podporované af_comics"
-
-#: plugins/af_comics/init.php:51
-msgid "The following comics are currently supported:"
-msgstr "Nyní jsou podporovány následující komiksy:"
-
-#: plugins/af_comics/init.php:69
-msgid "To subscribe to GoComics use the comic's regular web page as the feed URL (e.g. for the <em>Garfield</em> comic use <code>http://www.gocomics.com/garfield</code>)."
+#: plugins/af_readability/init.php:25
+msgid "Data saved."
 msgstr ""
 
-#: plugins/af_comics/init.php:71
-msgid "Drop any updated filters into <code>filters.local</code> in plugin directory."
+#: plugins/af_readability/init.php:41
+#, fuzzy
+msgid "Inline content"
+msgstr "Upravit poznámku článku"
+
+#: plugins/af_readability/init.php:47
+msgid "Readability settings (af_readability)"
 msgstr ""
 
+#: plugins/af_readability/init.php:78
+msgid "Use Readability for pages shared via bookmarklet."
+msgstr ""
+
+#: plugins/af_readability/init.php:107
+#, fuzzy
+msgid "Readability"
+msgstr "Zkontrolovat dostupnost"
+
+#: plugins/af_readability/init.php:118
+#, fuzzy
+msgid "Inline article content"
+msgstr "Upravit poznámku článku"
+
+#: plugins/mailto/init.php:50
+#: plugins/mailto/init.php:58
+#: plugins/mail/init.php:118
+#: plugins/mail/init.php:124
+msgid "[Forwarded]"
+msgstr "[Přeposláno]"
+
+#: plugins/mailto/init.php:50
+#: plugins/mail/init.php:118
+msgid "Multiple articles"
+msgstr "Více článků"
+
+#: plugins/mailto/init.php:74
+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/mailto/init.php:78
+msgid "Forward selected article(s) by email."
+msgstr "Přeposlat vybrané články e-mailem."
+
+#: plugins/mailto/init.php:81
+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/mailto/init.php:86
+msgid "Close this dialog"
+msgstr "Zavřít tento dialog"
+
+#: 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/import_export/init.php:53
 msgid "Import and export"
 msgstr "Import a export"
@@ -2642,101 +2681,6 @@ msgstr "Nahrávání selhalo s kódem chyby %d"
 msgid "No file uploaded."
 msgstr "Nebyl nahrán žádný soubor."
 
-#: plugins/mail/init.php:29
-msgid "Mail addresses saved."
-msgstr "E-mailové adresy uloženy."
-
-#: plugins/mail/init.php:35
-msgid "Mail plugin"
-msgstr "Modul odesílání e-mailů"
-
-#: plugins/mail/init.php:37
-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:118
-#: plugins/mail/init.php:124
-#: plugins/mailto/init.php:50
-#: plugins/mailto/init.php:58
-msgid "[Forwarded]"
-msgstr "[Přeposláno]"
-
-#: plugins/mail/init.php:118
-#: plugins/mailto/init.php:50
-msgid "Multiple articles"
-msgstr "Více článků"
-
-#: plugins/mail/init.php:146
-msgid "To:"
-msgstr "Do:"
-
-#: plugins/mail/init.php:161
-msgid "Subject:"
-msgstr "Předmět:"
-
-#: plugins/mail/init.php:178
-msgid "Send e-mail"
-msgstr "Odeslat e-mail"
-
-#: plugins/close_button/init.php:25
-msgid "Close article"
-msgstr "Zavřít článek"
-
-#: plugins/bookmarklets/init.php:20
-msgid "Bookmarklets"
-msgstr "Záložkové aplety"
-
-#: 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 "Přetáhněte níže uvedený odkaz na panel nástrojů prohlížeče, otevřete v prohlížeči kanál, o který máte zájem, a klikněte na odkaz pro přihlášení k jeho odběru."
-
-#: plugins/bookmarklets/init.php:26
-#, php-format
-msgid "Subscribe to %s in Tiny Tiny RSS?"
-msgstr "Přihlásit se k odběru %s v Tiny Tiny RSS?"
-
-#: plugins/bookmarklets/init.php:31
-msgid "Subscribe in Tiny Tiny RSS"
-msgstr "Přihlásit se k odběru v Tiny Tiny RSS"
-
-#: plugins/bookmarklets/init.php:34
-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/toggle_sidebar/init.php:23
-msgid "Collapse feedlist"
-msgstr "Sbalit seznam kanálů"
-
-#: plugins/af_zz_imgproxy/init.php:208
-msgid "Image proxy settings (af_zz_imgproxy)"
-msgstr ""
-
-#: plugins/af_zz_imgproxy/init.php:232
-#, fuzzy
-msgid "Enable proxy for all remote images."
-msgstr "Povolit kategorie kanálů"
-
-#: plugins/af_zz_imgproxy/init.php:236
-#, fuzzy
-msgid "Don't cache files locally."
-msgstr "Ukládat obrázky do mezipaměti místně"
-
-#: plugins/mailto/init.php:74
-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/mailto/init.php:78
-msgid "Forward selected article(s) by email."
-msgstr "Přeposlat vybrané články e-mailem."
-
-#: plugins/mailto/init.php:81
-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/mailto/init.php:86
-msgid "Close this dialog"
-msgstr "Zavřít tento dialog"
-
 #: plugins/share/init.php:41
 msgid "You can disable all articles shared by unique URLs here."
 msgstr "Zde můžete zakázat všechny články sdílené pomocí jedinečných URL."
@@ -2757,356 +2701,481 @@ msgstr "Můžete sdílet tento článek pomocí následující jedinečné URL:"
 msgid "Unshare article"
 msgstr "Zrušit sdílení článku"
 
-#: js/FeedTree.js:75
+#: plugins/toggle_sidebar/init.php:23
+msgid "Collapse feedlist"
+msgstr "Sbalit seznam kanálů"
+
+#: plugins/close_button/init.php:25
+msgid "Close article"
+msgstr "Zavřít článek"
+
+#: plugins/mail/init.php:29
+msgid "Mail addresses saved."
+msgstr "E-mailové adresy uloženy."
+
+#: plugins/mail/init.php:35
+msgid "Mail plugin"
+msgstr "Modul odesílání e-mailů"
+
+#: plugins/mail/init.php:37
+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:146
+msgid "To:"
+msgstr "Do:"
+
+#: plugins/mail/init.php:161
+msgid "Subject:"
+msgstr "Předmět:"
+
+#: plugins/mail/init.php:178
+msgid "Send e-mail"
+msgstr "Odeslat e-mail"
+
+#: plugins/note/init.php:28
+#: plugins/note/note.js:11
+msgid "Edit article note"
+msgstr "Upravit poznámku článku"
+
+#: plugins/auth_internal/init.php:67
+msgid "Please enter your one time password:"
+msgstr "Zadejte své jednorázové heslo:"
+
+#: plugins/auth_internal/init.php:208
+msgid "Password has been changed."
+msgstr "Heslo bylo změněno."
+
+#: plugins/auth_internal/init.php:210
+msgid "Old password is incorrect."
+msgstr "Staré heslo je nesprávné."
+
+#: js/FeedTree.js:76
 #, fuzzy
 msgid "(Un)collapse"
 msgstr "Rozbalit nebo sbalit postranní panel"
 
-#: js/PrefFeedTree.js:35
+#: js/PrefFeedTree.js:36
 msgid "Edit category"
 msgstr "Upravit kategorii"
 
-#: js/PrefFeedTree.js:42
+#: js/PrefFeedTree.js:43
 msgid "Remove category"
 msgstr "Odebrat kategorii"
 
-#: js/PrefFilterTree.js:46
+#: js/PrefFilterTree.js:47
 msgid "Inverse"
 msgstr "Inverzní"
 
-#: js/feedlist.js:511
+#: js/feedlist.js:461
 #, 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:514
+#: js/feedlist.js:464
 #, 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:517
+#: js/feedlist.js:467
 #, 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:520
+#: js/feedlist.js:470
 #, fuzzy
 msgid "Mark %w in %s as read?"
 msgstr "Označit všechny články v %s jako přečtené?"
 
-#: js/feedlist.js:523
+#: js/feedlist.js:473
 #, fuzzy
 msgid "search results"
 msgstr "Výsledky hledání: %s"
 
-#: js/feedlist.js:523
+#: js/feedlist.js:473
 #, fuzzy
 msgid "all articles"
 msgstr "Všechny články"
 
-#: js/functions.js:74
+#: js/functions.js:100
 msgid "Close"
 msgstr "Zavřít"
 
-#: js/functions.js:141
+#: js/functions.js:167
 msgid "Click to close"
 msgstr "Klikněte pro zavření"
 
-#: js/functions.js:448
+#: js/functions.js:456
 msgid "Error explained"
 msgstr "Vysvětlení chyby"
 
-#: js/functions.js:592
+#: js/functions.js:490
+msgid "Upload complete."
+msgstr "Nahrávání dokončeno."
+
+#: js/functions.js:508
+msgid "Remove stored feed icon?"
+msgstr "Odebrat uloženou ikonu kanálu?"
+
+#: js/functions.js:510
+msgid "Removing feed icon..."
+msgstr "Odebírání ikony kanálu..."
+
+#: js/functions.js:515
+msgid "Feed icon removed."
+msgstr "Ikona kanálu odebrána."
+
+#: js/functions.js:532
+msgid "Please select an image file to upload."
+msgstr "Vyberte soubor obrázku k nahrání."
+
+#: js/functions.js:533
+msgid "Upload new icon for this feed?"
+msgstr "Nahrát novou ikonu pro tento kanál?"
+
+#: js/functions.js:534
+msgid "Uploading, please wait..."
+msgstr "Nahrávání, čekejte..."
+
+#: js/functions.js:542
+msgid "Please enter label caption:"
+msgstr "Zadejte titulek štítku:"
+
+#: js/functions.js:575
 msgid "Subscribe to Feed"
 msgstr "Přihlásit se k odběru kanálu"
 
-#: js/functions.js:621
+#: js/functions.js:602
 msgid "Failed to parse output. This can indicate server timeout and/or network issues. Backend output was logged to browser console."
 msgstr "Nepodařilo se zpracovat výstup. To může znamenat vypršení časového limitu serveru a/nebo problémy se sítí. Výstup vnitřního jádra byl zaznamenán do konzole prohlížeče."
 
-#: js/functions.js:636
+#: js/functions.js:617
 #, perl-format
 msgid "Subscribed to %s"
 msgstr "Přihlášen k odběru %s"
 
-#: js/functions.js:641
+#: js/functions.js:622
 msgid "Specified URL seems to be invalid."
 msgstr "Zdá se, že zadaná URL je neplatná."
 
-#: js/functions.js:644
+#: js/functions.js:625
 msgid "Specified URL doesn't seem to contain any feeds."
 msgstr "Zdá se, že zadaná URL neobsahuje žádné kanály."
 
-#: js/functions.js:656
+#: js/functions.js:637
 msgid "Expand to select feed"
 msgstr "Rozbalte pro výběr kanálu"
 
-#: js/functions.js:668
+#: js/functions.js:649
 #, perl-format
 msgid "Couldn't download the specified URL: %s"
 msgstr "Nelze stáhnout zadanou URL: %s"
 
-#: js/functions.js:672
+#: js/functions.js:653
 #, perl-format
 msgid "XML validation failed: %s"
 msgstr "Ověření XML selhalo: %s"
 
-#: js/functions.js:676
+#: js/functions.js:657
 msgid "You are already subscribed to this feed."
 msgstr "Již jste přihlášeni k odběru tohoto kanálu."
 
-#: js/functions.js:1136
+#: js/functions.js:1098
 msgid "Generate new syndication address for this feed?"
 msgstr "Generovat novou adresu syndikace pro tento kanál?"
 
-#: js/functions.js:1140
-#: js/prefs.js:1095
+#: js/functions.js:1100
+#: js/prefs.js:870
 msgid "Trying to change address..."
 msgstr "Pokus o změnu adresy..."
 
-#: js/functions.js:1245
-#: js/tt-rss.js:446
-#: js/tt-rss.js:673
+#: js/functions.js:1199
+#: js/tt-rss.js:399
+#: js/tt-rss.js:612
 msgid "You can't edit this kind of feed."
 msgstr "Nemůžete upravit tento druh kanálu."
 
-#: js/functions.js:1260
+#: js/functions.js:1213
 msgid "Edit Feed"
 msgstr "Upravit kanál"
 
-#: js/functions.js:1266
-#: js/prefs.js:100
-#: js/prefs.js:209
-#: js/prefs.js:647
+#: js/functions.js:1217
+#: js/prefs.js:176
+#: js/prefs.js:523
+#: js/prefs.js:1139
+#: js/prefs.js:78
 msgid "Saving data..."
 msgstr "Ukládání dat..."
 
-#: js/functions.js:1293
+#: js/functions.js:1243
 msgid "More Feeds"
 msgstr "Více kanálů"
 
-#: js/functions.js:1355
-#: js/functions.js:1464
-#: js/prefs.js:398
-#: js/prefs.js:540
-#: js/prefs.js:558
-#: js/prefs.js:1077
+#: js/functions.js:1297
+#: js/functions.js:1383
+#: js/prefs.js:332
+#: js/prefs.js:455
+#: js/prefs.js:473
+#: js/prefs.js:855
 msgid "No feeds are selected."
 msgstr "Nejsou vybrány žádné kanály."
 
-#: js/functions.js:1398
+#: js/functions.js:1329
 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:1435
+#: js/functions.js:1360
 msgid "Feeds with update errors"
 msgstr "Kanály s chybami aktualizace"
 
-#: js/functions.js:1446
-#: js/prefs.js:1058
+#: js/functions.js:1369
+#: js/prefs.js:841
 msgid "Remove selected feeds?"
 msgstr "Odebrat vybrané kanály?"
 
-#: js/functions.js:1449
-#: js/prefs.js:1061
+#: js/functions.js:1370
+#: js/prefs.js:842
 msgid "Removing selected feeds..."
 msgstr "Odebírání vybraných kanálů..."
 
-#: js/prefs.js:60
-msgid "Please enter login:"
-msgstr "Zadejte přihlašovací jméno:"
-
-#: js/prefs.js:67
-msgid "Can't create user: no login specified."
-msgstr "Nelze vytvořit uživatele: nezadáno přihlašovací jméno."
-
-#: js/prefs.js:71
-msgid "Adding user..."
-msgstr "Přidávání uživatele..."
-
-#: js/prefs.js:96
-msgid "User Editor"
-msgstr "Editor uživatelů"
-
-#: js/prefs.js:131
-msgid "Edit Filter"
-msgstr "Upravit filtr"
-
-#: js/prefs.js:170
+#: js/prefs.js:143
 msgid "Remove filter?"
 msgstr "Odebrat filtr?"
 
-#: js/prefs.js:175
+#: js/prefs.js:148
 msgid "Removing filter..."
 msgstr "Odebírání filtru..."
 
-#: js/prefs.js:292
+#: js/prefs.js:251
 msgid "Remove selected labels?"
 msgstr "Odebrat vybrané štítky?"
 
-#: js/prefs.js:295
+#: js/prefs.js:252
 msgid "Removing selected labels..."
 msgstr "Odebírání vybraných štítků..."
 
-#: js/prefs.js:308
-#: js/prefs.js:1144
+#: js/prefs.js:262
+#: js/prefs.js:909
 msgid "No labels are selected."
 msgstr "Nejsou vybrány žádné štítky."
 
-#: js/prefs.js:320
+#: js/prefs.js:274
 msgid "Remove selected users? Neither default admin nor your account will be removed."
 msgstr "Odebrat vybrané uživatele? Výchozí účet správce ani váš účet nebudou odebrány."
 
-#: js/prefs.js:323
+#: js/prefs.js:275
 msgid "Removing selected users..."
 msgstr "Odebírání vybraných uživatelů..."
 
-#: js/prefs.js:338
-#: js/prefs.js:408
-#: js/prefs.js:427
-#: js/prefs.js:461
+#: js/prefs.js:286
+#: js/prefs.js:342
+#: js/prefs.js:361
+#: js/prefs.js:387
 msgid "No users are selected."
 msgstr "Nejsou vybráni žádní uživatelé."
 
-#: js/prefs.js:350
+#: js/prefs.js:297
 msgid "Remove selected filters?"
 msgstr "Odebrat vybrané filtry?"
 
-#: js/prefs.js:353
+#: js/prefs.js:298
 msgid "Removing selected filters..."
 msgstr "Odebírání vybraných filtrů..."
 
-#: js/prefs.js:366
-#: js/prefs.js:495
-#: js/prefs.js:514
+#: js/prefs.js:308
+#: js/prefs.js:419
+#: js/prefs.js:438
 msgid "No filters are selected."
 msgstr "Nejsou vybrány žádné filtry."
 
-#: js/prefs.js:378
+#: js/prefs.js:319
 msgid "Unsubscribe from selected feeds?"
 msgstr "Odhlásit odběr vybraných kanálů?"
 
-#: js/prefs.js:382
+#: js/prefs.js:321
 msgid "Unsubscribing from selected feeds..."
 msgstr "Odhlašování odběru vybraných kanálů..."
 
-#: js/prefs.js:413
-#: js/prefs.js:432
-#: js/prefs.js:466
+#: js/prefs.js:347
+#: js/prefs.js:366
+#: js/prefs.js:392
 msgid "Please select only one user."
 msgstr "Vyberte pouze jednoho uživatele."
 
-#: js/prefs.js:436
+#: js/prefs.js:370
 msgid "Reset password of selected user?"
 msgstr "Obnovit heslo vybraného uživatele?"
 
-#: js/prefs.js:439
+#: js/prefs.js:371
 msgid "Resetting password for selected user..."
 msgstr "Obnovování hesla pro vybraného uživatele..."
 
-#: js/prefs.js:500
+#: js/prefs.js:424
 msgid "Please select only one filter."
 msgstr "Vyberte pouze jeden filtr."
 
-#: js/prefs.js:518
+#: js/prefs.js:442
 msgid "Combine selected filters?"
 msgstr "Kombinovat vybrané filtry?"
 
-#: js/prefs.js:521
+#: js/prefs.js:443
 msgid "Joining filters..."
 msgstr "Spojování filtrů..."
 
-#: js/prefs.js:580
+#: js/prefs.js:487
 msgid "Edit Multiple Feeds"
 msgstr "Upravit více kanálů"
 
-#: js/prefs.js:604
+#: js/prefs.js:511
 msgid "Save changes to selected feeds?"
 msgstr "Uložit změny ve vybraných kanálech?"
 
-#: js/prefs.js:681
+#: js/prefs.js:552
 msgid "OPML Import"
 msgstr "Import OPML"
 
-#: js/prefs.js:700
+#: js/prefs.js:571
 msgid "Please choose an OPML file first."
 msgstr "Nejdříve zvolte soubor OPML."
 
-#: js/prefs.js:703
+#: js/prefs.js:574
 #: plugins/import_export/import_export.js:115
 msgid "Importing, please wait..."
 msgstr "Importování, čekejte..."
 
-#: js/prefs.js:869
+#: js/prefs.js:737
 msgid "Reset to defaults?"
 msgstr "Obnovit na výchozí hodnoty?"
 
-#: js/prefs.js:1468
-msgid "Subscribing to feeds..."
-msgstr "Přihlašování k odběru kanálů..."
+#: js/prefs.js:777
+#, perl-format
+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:1487
-msgid "Clear stored data for this plugin?"
-msgstr "Vymazat uložená data pro tento modul?"
+#: js/prefs.js:778
+msgid "Removing category..."
+msgstr "Odebírání kategorie..."
 
-#: js/prefs.js:1501
-msgid "Clear all messages in the error log?"
-msgstr "Vymazat všechny zprávy v protokolu chyb?"
+#: js/prefs.js:794
+msgid "Remove selected categories?"
+msgstr "Odebrat vybrané kategorie?"
 
-#: js/tt-rss.js:118
+#: js/prefs.js:795
+msgid "Removing selected categories..."
+msgstr "Odebírání vybraných kategorií..."
+
+#: js/prefs.js:805
+msgid "No categories are selected."
+msgstr "Nejsou vybrány žádné kategorie."
+
+#: js/prefs.js:812
+msgid "Category title:"
+msgstr "Název kategorie:"
+
+#: js/prefs.js:815
+msgid "Creating category..."
+msgstr "Vytváření kategorie..."
+
+#: js/prefs.js:832
+msgid "Feeds without recent updates"
+msgstr "Kanály bez nedávných aktualizací"
+
+#: js/prefs.js:869
+msgid "Replace current OPML publishing address with a new one?"
+msgstr "Nahradit aktuální publikační adresu OPML novou?"
+
+#: js/prefs.js:898
+msgid "Reset selected labels to default colors?"
+msgstr "Obnovit vybrané štítky na výchozí barvy?"
+
+#: js/prefs.js:926
+msgid "Settings Profiles"
+msgstr "Profily nastavení"
+
+#: js/prefs.js:935
+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:936
+msgid "Removing selected profiles..."
+msgstr "Odebírání vybraných profilů..."
+
+#: js/prefs.js:948
+msgid "No profiles are selected."
+msgstr "Nejsou vybrány žádné profily."
+
+#: js/prefs.js:955
+#: js/prefs.js:997
+msgid "Activate selected profile?"
+msgstr "Aktivovat vybraný profil?"
+
+#: js/prefs.js:964
+#: js/prefs.js:1008
+msgid "Please choose a profile to activate."
+msgstr "Zvolte profil k aktivaci."
+
+#: js/prefs.js:969
+msgid "Creating profile..."
+msgstr "Vytváření profilu..."
+
+#: js/prefs.js:1016
+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:1017
+#: plugins/share/share_prefs.js:3
+msgid "Clearing URLs..."
+msgstr "Vymazávání URL..."
+
+#: js/prefs.js:1020
+msgid "Generated URLs cleared."
+msgstr "Generované URL vymazány."
+
+#: js/prefs.js:1053
+#, fuzzy
+msgid "Rename category to:"
+msgstr "Odebrat kategorii"
+
+#: js/prefs.js:1074
+msgid "Label Editor"
+msgstr "Editor štítků"
+
+#: js/tt-rss.js:111
 msgid "Mark all articles as read?"
 msgstr "Označit všechny články jako přečtené?"
 
-#: js/tt-rss.js:124
+#: js/tt-rss.js:115
 msgid "Marking all feeds as read..."
 msgstr "Označování všech kanálů jako přečtených..."
 
-#: js/tt-rss.js:398
+#: js/tt-rss.js:351
 msgid "Please enable mail plugin first."
 msgstr "Nejdříve povolte modul odesílání e-mailů."
 
-#: js/tt-rss.js:527
+#: js/tt-rss.js:477
 msgid "Please enable embed_original plugin first."
 msgstr "Nejdříve povolte modul embed_original."
 
-#: js/tt-rss.js:540
-#: js/tt-rss.js:723
+#: js/tt-rss.js:490
+#: js/tt-rss.js:653
 msgid "Widescreen is not available in combined mode."
 msgstr ""
 
-#: js/tt-rss.js:821
-msgid "You can't rescore this kind of feed."
-msgstr "Nemůžete přehodnotit tento druh kanálu."
-
-#: js/tt-rss.js:826
-#: js/tt-rss.js:686
-msgid "Please select some feed first."
-msgstr "Nejdříve vyberte nějaký kanál."
-
-#: js/tt-rss.js:831
-#, perl-format
-msgid "Rescore articles in %s?"
-msgstr "Přehodnotit články v %s?"
-
-#: js/tt-rss.js:834
-msgid "Rescoring articles..."
-msgstr "Přehodnocování článků..."
-
-#: js/viewfeed.js:917
-#: js/viewfeed.js:955
-#: js/viewfeed.js:1003
-#: js/viewfeed.js:1924
-#: plugins/mail/mail.js:7
+#: js/viewfeed.js:444
+#: js/viewfeed.js:461
+#: js/viewfeed.js:484
+#: js/viewfeed.js:521
+#: js/viewfeed.js:542
+#: js/viewfeed.js:651
+#: js/viewfeed.js:685
+#: js/viewfeed.js:727
+#: js/viewfeed.js:1564
 #: plugins/mailto/init.js:7
-#: js/viewfeed.js:675
-#: js/viewfeed.js:697
-#: js/viewfeed.js:718
-#: js/viewfeed.js:777
-#: js/viewfeed.js:805
+#: plugins/mail/mail.js:7
 msgid "No articles are selected."
 msgstr "Nejsou vybrány žádné články."
 
-#: js/viewfeed.js:925
+#: js/viewfeed.js:659
 #, perl-format
 msgid "Delete %d selected article in %s?"
 msgid_plural "Delete %d selected articles in %s?"
@@ -3114,7 +3183,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:927
+#: js/viewfeed.js:661
 #, perl-format
 msgid "Delete %d selected article?"
 msgid_plural "Delete %d selected articles?"
@@ -3122,7 +3191,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:964
+#: js/viewfeed.js:694
 #, perl-format
 msgid "Archive %d selected article in %s?"
 msgid_plural "Archive %d selected articles in %s?"
@@ -3130,7 +3199,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:967
+#: js/viewfeed.js:697
 #, perl-format
 msgid "Move %d archived article back?"
 msgid_plural "Move %d archived articles back?"
@@ -3138,11 +3207,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:969
+#: js/viewfeed.js:698
 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:1009
+#: js/viewfeed.js:733
 #, perl-format
 msgid "Mark %d selected article in %s as read?"
 msgid_plural "Mark %d selected articles in %s as read?"
@@ -3150,63 +3219,88 @@ 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:1029
+#: js/viewfeed.js:753
 msgid "Edit article Tags"
 msgstr "Upravit značky článku"
 
-#: js/viewfeed.js:1035
+#: js/viewfeed.js:757
 msgid "Saving article tags..."
 msgstr "Ukládání značek článku..."
 
-#: js/viewfeed.js:1666
+#: js/viewfeed.js:1015
+msgid "No article is selected."
+msgstr "Není vybrán žádný článek."
+
+#: js/viewfeed.js:1050
+msgid "No articles found to mark"
+msgstr "Nenalezeny žádné články k označení"
+
+#: js/viewfeed.js:1052
+#, perl-format
+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é?"
+
+#: js/viewfeed.js:1312
 msgid "Open original article"
 msgstr "Otevřít původní článek"
 
-#: js/viewfeed.js:1673
+#: js/viewfeed.js:1319
 msgid "Display article URL"
 msgstr "Zobrazit URL článku"
 
-#: js/viewfeed.js:1780
+#: js/viewfeed.js:1426
 msgid "Assign label"
 msgstr "Přiřadit štítek"
 
-#: js/viewfeed.js:1785
+#: js/viewfeed.js:1431
 msgid "Remove label"
 msgstr "Odebrat štítek"
 
-#: js/viewfeed.js:1817
+#: js/viewfeed.js:1463
 msgid "Select articles in group"
 msgstr "Vybrat články ve skupině"
 
-#: js/viewfeed.js:1827
+#: js/viewfeed.js:1473
 msgid "Mark group as read"
 msgstr "Označit skupinu jako přečtenou"
 
-#: js/viewfeed.js:1839
+#: js/viewfeed.js:1485
 msgid "Mark feed as read"
 msgstr "Označit kanál jako přečtený"
 
-#: js/viewfeed.js:1892
+#: js/viewfeed.js:1538
 msgid "Please enter new score for selected articles:"
 msgstr "Zadejte nové hodnocení pro vybrané články:"
 
-#: js/viewfeed.js:1955
+#: js/viewfeed.js:1571
 msgid "Please enter new score for this article:"
 msgstr "Zadejte nové hodnocení pro tento článek:"
 
-#: js/viewfeed.js:1986
+#: js/viewfeed.js:1591
 msgid "Article URL:"
 msgstr "URL článku:"
 
-#: plugins/note/note.js:17
-msgid "Saving article note..."
-msgstr "Ukládání poznámky článku..."
+#: 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/af_psql_trgm/init.js:11
 #, fuzzy
 msgid "Related articles"
 msgstr "Smazat článek"
 
+#: plugins/mailto/init.js:21
+#: plugins/mail/mail.js:21
+msgid "Forward article by email"
+msgstr "Přeposlat článek e-mailem"
+
+#: plugins/shorten_expanded/init.js:43
+msgid "Click to expand article"
+msgstr "Klikněte pro rozbalení článku"
+
 #: plugins/import_export/import_export.js:13
 msgid "Export Data"
 msgstr "Exportovat data"
@@ -3227,261 +3321,171 @@ msgstr "Import dat"
 msgid "Please choose the file first."
 msgstr "Nejdříve zvolte soubor."
 
-#: plugins/mail/mail.js:21
-#: plugins/mailto/init.js:21
-msgid "Forward article by email"
-msgstr "Přeposlat článek e-mailem"
+#: plugins/share/share_prefs.js:2
+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/mail/mail.js:36
-msgid "Error sending email:"
-msgstr "Chyba při odesílání e-mailu:"
-
-#: plugins/mail/mail.js:38
-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:45
-msgid "Click to expand article"
-msgstr "Klikněte pro rozbalení článku"
+#: plugins/share/share_prefs.js:8
+msgid "Shared URLs cleared."
+msgstr "Sdílené URL vymazány."
 
 #: plugins/share/share.js:10
 msgid "Share article by URL"
 msgstr "Sdílet článek pomocí URL"
 
-#: plugins/share/share.js:14
+#: plugins/share/share.js:13
 msgid "Generate new share URL for this article?"
 msgstr "Generovat novou URL sdílení pro tento článek?"
 
-#: plugins/share/share.js:18
+#: plugins/share/share.js:15
 msgid "Trying to change URL..."
 msgstr "Pokus o změnu URL..."
 
-#: plugins/share/share.js:55
+#: plugins/share/share.js:48
 msgid "Remove sharing for this article?"
 msgstr "Odebrat sdílení pro tento článek?"
 
-#: plugins/share/share.js:59
+#: plugins/share/share.js:50
 msgid "Trying to unshare..."
 msgstr "Pokus o zrušení sdílení..."
 
-#: plugins/share/share_prefs.js:3
-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/mail/mail.js:30
+msgid "Error sending email:"
+msgstr "Chyba při odesílání e-mailu:"
 
-#: plugins/share/share_prefs.js:6
-#: js/prefs.js:1277
-msgid "Clearing URLs..."
-msgstr "Vymazávání URL..."
+#: plugins/mail/mail.js:32
+msgid "Your message has been sent."
+msgstr "Vaše zpráva byla odeslána."
 
-#: plugins/share/share_prefs.js:13
-msgid "Shared URLs cleared."
-msgstr "Sdílené URL vymazány."
+#: plugins/note/note.js:15
+msgid "Saving article note..."
+msgstr "Ukládání poznámky článku..."
 
-#: js/feedlist.js:204
+#: js/feedlist.js:168
 #, fuzzy
 msgid "Your password is at default value"
 msgstr "Vaše heslo má výchozí hodnotu, změňte ho."
 
-#: js/feedlist.js:453
+#: js/feedlist.js:413
 msgid "Mark all articles in %s as read?"
 msgstr "Označit všechny články v %s jako přečtené?"
 
-#: js/functions.js:494
-msgid "Upload complete."
-msgstr "Nahrávání dokončeno."
-
-#: js/functions.js:511
-msgid "Remove stored feed icon?"
-msgstr "Odebrat uloženou ikonu kanálu?"
-
-#: js/functions.js:516
-msgid "Removing feed icon..."
-msgstr "Odebírání ikony kanálu..."
-
-#: js/functions.js:521
-msgid "Feed icon removed."
-msgstr "Ikona kanálu odebrána."
-
-#: js/functions.js:537
-msgid "Please select an image file to upload."
-msgstr "Vyberte soubor obrázku k nahrání."
-
-#: js/functions.js:539
-msgid "Upload new icon for this feed?"
-msgstr "Nahrát novou ikonu pro tento kanál?"
-
-#: js/functions.js:540
-msgid "Uploading, please wait..."
-msgstr "Nahrávání, čekejte..."
-
-#: js/functions.js:550
-msgid "Please enter label caption:"
-msgstr "Zadejte titulek štítku:"
-
-#: js/functions.js:555
-msgid "Can't create label: missing caption."
-msgstr "Nelze vytvořit štítek: chybí titulek."
-
-#: js/functions.js:797
+#: js/functions.js:764
 msgid "Edit rule"
 msgstr "Upravit pravidlo"
 
-#: js/functions.js:819
+#: js/functions.js:786
 msgid "Edit action"
 msgstr "Upravit akci"
 
-#: js/functions.js:860
+#: js/functions.js:825
 msgid "Looking for articles (%d processed, %f found)..."
 msgstr ""
 
-#: js/functions.js:890
+#: js/functions.js:855
 #, fuzzy
 msgid "Found %d articles matching this filter:"
 msgstr "Články odpovídající tomuto filtru:"
 
-#: js/functions.js:942
+#: js/functions.js:907
 msgid "Create Filter"
 msgstr "Vytvořit filtr"
 
-#: js/functions.js:1060
-#: js/tt-rss.js:692
+#: js/functions.js:1016
+#: js/tt-rss.js:631
 msgid "Unsubscribe from %s?"
 msgstr "Odhlásit odběr %s?"
 
-#: js/functions.js:1063
+#: js/functions.js:1019
 msgid "Removing feed..."
 msgstr "Odebírání kanálu..."
 
-#: js/functions.js:1489
+#: js/functions.js:1410
 msgid "Help"
 msgstr "Nápověda"
 
-#: js/prefs.js:973
-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:44
+msgid "Please enter login:"
+msgstr "Zadejte přihlašovací jméno:"
 
-#: js/prefs.js:979
-msgid "Removing category..."
-msgstr "Odebírání kategorie..."
+#: js/prefs.js:51
+msgid "Can't create user: no login specified."
+msgstr "Nelze vytvořit uživatele: nezadáno přihlašovací jméno."
 
-#: js/prefs.js:997
-msgid "Remove selected categories?"
-msgstr "Odebrat vybrané kategorie?"
+#: js/prefs.js:55
+msgid "Adding user..."
+msgstr "Přidávání uživatele..."
 
-#: js/prefs.js:1000
-msgid "Removing selected categories..."
-msgstr "Odebírání vybraných kategorií..."
+#: js/prefs.js:74
+msgid "User Editor"
+msgstr "Editor uživatelů"
 
-#: js/prefs.js:1013
-msgid "No categories are selected."
-msgstr "Nejsou vybrány žádné kategorie."
+#: js/prefs.js:104
+msgid "Edit Filter"
+msgstr "Upravit filtr"
 
-#: js/prefs.js:1020
-msgid "Category title:"
-msgstr "Název kategorie:"
+#: js/prefs.js:1175
+msgid "Subscribing to feeds..."
+msgstr "Přihlašování k odběru kanálů..."
 
-#: js/prefs.js:1024
-msgid "Creating category..."
-msgstr "Vytváření kategorie..."
+#: js/prefs.js:1191
+msgid "Clear stored data for this plugin?"
+msgstr "Vymazat uložená data pro tento modul?"
 
-#: js/prefs.js:1047
-msgid "Feeds without recent updates"
-msgstr "Kanály bez nedávných aktualizací"
+#: js/prefs.js:1203
+msgid "Clear all messages in the error log?"
+msgstr "Vymazat všechny zprávy v protokolu chyb?"
 
-#: js/prefs.js:1091
-msgid "Replace current OPML publishing address with a new one?"
-msgstr "Nahradit aktuální publikační adresu OPML novou?"
-
-#: js/prefs.js:1129
-msgid "Reset selected labels to default colors?"
-msgstr "Obnovit vybrané štítky na výchozí barvy?"
-
-#: js/prefs.js:1161
-msgid "Settings Profiles"
-msgstr "Profily nastavení"
-
-#: js/prefs.js:1170
-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:1173
-msgid "Removing selected profiles..."
-msgstr "Odebírání vybraných profilů..."
-
-#: js/prefs.js:1189
-msgid "No profiles are selected."
-msgstr "Nejsou vybrány žádné profily."
-
-#: js/prefs.js:1197
-#: js/prefs.js:1250
-msgid "Activate selected profile?"
-msgstr "Aktivovat vybraný profil?"
-
-#: js/prefs.js:1214
-#: js/prefs.js:1266
-msgid "Please choose a profile to activate."
-msgstr "Zvolte profil k aktivaci."
-
-#: js/prefs.js:1219
-msgid "Creating profile..."
-msgstr "Vytváření profilu..."
-
-#: js/prefs.js:1274
-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:1284
-msgid "Generated URLs cleared."
-msgstr "Generované URL vymazány."
-
-#: js/prefs.js:1356
-msgid "Label Editor"
-msgstr "Editor štítků"
-
-#: js/tt-rss.js:681
+#: js/tt-rss.js:620
 msgid "You can't unsubscribe from the category."
 msgstr "Nemůžete odhlásit odběr kategorie."
 
-#: js/viewfeed.js:127
-#: js/viewfeed.js:177
-#: js/viewfeed.js:194
+#: js/tt-rss.js:625
+msgid "Please select some feed first."
+msgstr "Nejdříve vyberte nějaký kanál."
+
+#: js/viewfeed.js:89
+#: js/viewfeed.js:135
+#: js/viewfeed.js:152
 msgid "Click to open next unread feed."
 msgstr "Klikněte pro otevření dalšího nepřečteného kanálu."
 
-#: js/viewfeed.js:131
+#: js/viewfeed.js:93
 msgid "Cancel search"
 msgstr "Zrušit hledání"
 
-#: js/viewfeed.js:191
+#: js/viewfeed.js:149
 #, fuzzy
 msgid "New articles found, reload feed to continue."
 msgstr "Nenalezeny žádné články k zobrazení."
 
-#: js/viewfeed.js:620
+#: js/viewfeed.js:405
 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:1284
-msgid "No article is selected."
-msgstr "Není vybrán žádný článek."
+#~ msgid "Rescore feed"
+#~ msgstr "Přehodnotit kanál"
 
-#: js/viewfeed.js:1319
-msgid "No articles found to mark"
-msgstr "Nenalezeny žádné články k označení"
+#~ msgid "Create label..."
+#~ msgstr "Vytvořit štítek..."
 
-#: js/viewfeed.js:1321
-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 "Create filter..."
+#~ msgstr "Vytvořit filtr..."
+
+#~ msgid "You can't rescore this kind of feed."
+#~ msgstr "Nemůžete přehodnotit tento druh kanálu."
+
+#~ msgid "Rescore articles in %s?"
+#~ msgstr "Přehodnotit články v %s?"
+
+#~ msgid "Rescoring articles..."
+#~ msgstr "Přehodnocování článků..."
+
+#~ msgid "Can't create label: missing caption."
+#~ msgstr "Nelze vytvořit štítek: chybí titulek."
 
 #~ msgid "Firefox integration"
 #~ msgstr "Integrace s Firefoxem"
diff --git a/locale/da_DK/LC_MESSAGES/messages.mo b/locale/da_DK/LC_MESSAGES/messages.mo
index 8d874f8b9..b12360a8c 100644
Binary files a/locale/da_DK/LC_MESSAGES/messages.mo and b/locale/da_DK/LC_MESSAGES/messages.mo differ
diff --git a/locale/da_DK/LC_MESSAGES/messages.po b/locale/da_DK/LC_MESSAGES/messages.po
index 2093e6c41..e0f065f44 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: 2018-10-10 08:24+0300\n"
+"POT-Creation-Date: 2018-12-01 12:59+0300\n"
 "Last-Translator: Brendan <brendan@tucows.com>\n"
 "Language-Team: OpenSRS brendan@tucows.com>\n"
 "Language: da_DK\n"
@@ -89,8 +89,8 @@ msgid "Weekly"
 msgstr "Ugentligt"
 
 #: backend.php:103
-#: classes/pref/users.php:47
 #: classes/pref/system.php:51
+#: classes/pref/users.php:47
 msgid "User"
 msgstr "Bruger"
 
@@ -162,33 +162,33 @@ msgstr "Bruger ikke fundet"
 
 #: index.php:151
 #: index.php:167
-#: index.php:285
+#: index.php:282
 #: prefs.php:120
 #: classes/backend.php:5
 #: classes/pref/labels.php:294
-#: classes/pref/feeds.php:1230
 #: classes/pref/filters.php:822
-#: js/feedlist.js:148
-#: js/feedlist.js:491
-#: js/feedlist.js:539
-#: js/functions.js:314
-#: js/functions.js:1336
-#: js/prefs.js:562
-#: js/prefs.js:754
-#: js/prefs.js:1488
-#: js/prefs.js:1503
-#: js/tt-rss.js:547
-#: js/viewfeed.js:1180
+#: classes/pref/feeds.php:1229
+#: js/feedlist.js:118
+#: js/feedlist.js:446
+#: js/feedlist.js:487
+#: js/functions.js:328
+#: js/functions.js:551
+#: js/functions.js:1286
+#: js/prefs.js:477
+#: js/prefs.js:617
+#: js/prefs.js:956
+#: js/prefs.js:1000
+#: js/prefs.js:1028
+#: js/prefs.js:1037
+#: js/prefs.js:1045
+#: js/prefs.js:1057
+#: js/tt-rss.js:497
+#: js/viewfeed.js:509
+#: js/viewfeed.js:928
 #: plugins/import_export/import_export.js:17
-#: js/functions.js:565
-#: js/prefs.js:1200
-#: js/prefs.js:1253
-#: js/prefs.js:1292
-#: js/prefs.js:1305
-#: js/prefs.js:1316
-#: js/prefs.js:1331
-#: js/tt-rss.js:564
-#: js/viewfeed.js:760
+#: js/prefs.js:1192
+#: js/prefs.js:1205
+#: js/tt-rss.js:510
 msgid "Loading, please wait..."
 msgstr "Indlæser, vent venligst ..."
 
@@ -205,13 +205,13 @@ msgid "All Articles"
 msgstr "Alle artikler"
 
 #: index.php:194
-#: include/functions.php:1227
+#: include/functions.php:1172
 #: classes/feeds.php:110
 msgid "Starred"
 msgstr "Markeret"
 
 #: index.php:195
-#: include/functions.php:1228
+#: include/functions.php:1173
 #: classes/feeds.php:111
 msgid "Published"
 msgstr "Udgivet"
@@ -251,11 +251,11 @@ msgid "Title"
 msgstr "Overskrift"
 
 #: index.php:211
-#: index.php:251
-#: include/functions.php:1215
+#: index.php:250
+#: include/functions.php:1160
 #: classes/feeds.php:115
-#: js/FeedTree.js:41
-#: js/FeedTree.js:69
+#: js/FeedTree.js:42
+#: js/FeedTree.js:70
 msgid "Mark as read"
 msgstr "Marker som læst"
 
@@ -292,7 +292,7 @@ msgid "Feed actions:"
 msgstr "Feed-handlinger:"
 
 #: index.php:246
-#: classes/handler/public.php:551
+#: classes/handler/public.php:575
 msgid "Subscribe to feed..."
 msgstr "Abonner på feedet ..."
 
@@ -301,56 +301,44 @@ msgid "Edit this feed..."
 msgstr "Rediger dette feed"
 
 #: index.php:248
-msgid "Rescore feed"
-msgstr "Gendan feed"
-
-#: index.php:249
-#: classes/pref/feeds.php:770
-#: classes/pref/feeds.php:1203
-#: js/PrefFeedTree.js:61
+#: classes/pref/feeds.php:769
+#: classes/pref/feeds.php:1202
+#: js/PrefFeedTree.js:62
 msgid "Unsubscribe"
 msgstr "Aflys abonnement"
 
-#: index.php:250
+#: index.php:249
 msgid "All feeds:"
 msgstr "Alle feeds:"
 
-#: index.php:252
+#: index.php:251
 msgid "(Un)hide read feeds"
 msgstr "Vis/skjul læste feeds"
 
-#: index.php:253
+#: index.php:252
 msgid "Other actions:"
 msgstr "Andre handlinger:"
 
-#: index.php:254
-#: include/functions.php:1201
+#: index.php:253
+#: include/functions.php:1146
 msgid "Toggle widescreen mode"
 msgstr "Skift til widescreen"
 
-#: index.php:255
-msgid "Create label..."
-msgstr "Opret etiket ..."
-
-#: index.php:256
-msgid "Create filter..."
-msgstr "Opret filter ..."
-
-#: index.php:257
+#: index.php:254
 msgid "Keyboard shortcuts help"
 msgstr "Hjælp til tastaturgenveje"
 
-#: index.php:266
+#: index.php:263
 msgid "Logout"
 msgstr "Log af"
 
-#: index.php:272
+#: index.php:269
 msgid "Updates are available from Git."
 msgstr ""
 
 #: prefs.php:33
 #: prefs.php:138
-#: include/functions.php:1230
+#: include/functions.php:1175
 #: classes/pref/prefs.php:425
 msgid "Preferences"
 msgstr "Præferencer"
@@ -365,8 +353,8 @@ msgstr "Luk præferencer"
 
 #: prefs.php:141
 #: classes/pref/feeds.php:114
-#: classes/pref/feeds.php:1138
-#: classes/pref/feeds.php:1192
+#: classes/pref/feeds.php:1137
+#: classes/pref/feeds.php:1191
 msgid "Feeds"
 msgstr "Feeds"
 
@@ -376,8 +364,8 @@ msgid "Filters"
 msgstr "Filtre"
 
 #: prefs.php:147
+#: classes/feeds.php:1696
 #: classes/pref/labels.php:94
-#: classes/feeds.php:1710
 msgid "Labels"
 msgstr "Etiketter"
 
@@ -389,81 +377,81 @@ msgstr "Brugere"
 msgid "System"
 msgstr "System"
 
-#: register.php:186
+#: register.php:185
 #: include/login_form.php:162
 msgid "Create new account"
 msgstr "Opret ny konto"
 
-#: register.php:192
+#: register.php:191
 msgid "New user registrations are administratively disabled."
 msgstr ""
 
-#: register.php:196
-#: register.php:241
-#: register.php:254
-#: register.php:269
-#: register.php:288
-#: register.php:336
-#: register.php:346
-#: register.php:358
-#: classes/handler/public.php:623
-#: classes/handler/public.php:697
-#: classes/handler/public.php:798
-#: classes/handler/public.php:877
-#: classes/handler/public.php:891
-#: classes/handler/public.php:898
-#: classes/handler/public.php:923
+#: register.php:195
+#: register.php:240
+#: register.php:253
+#: register.php:268
+#: register.php:287
+#: register.php:334
+#: register.php:344
+#: register.php:356
+#: classes/handler/public.php:647
+#: classes/handler/public.php:721
+#: 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"
 
-#: register.php:217
+#: register.php:216
 msgid "Your temporary password will be sent to the specified email. Accounts, which were not logged in once, are erased automatically 24 hours after temporary password is sent."
 msgstr ""
 
-#: register.php:223
+#: register.php:222
 msgid "Desired login:"
 msgstr "Ønsket logon:"
 
-#: register.php:226
+#: register.php:225
 msgid "Check availability"
 msgstr "Tjek tilgængelighed"
 
-#: register.php:228
-#: classes/handler/public.php:713
+#: register.php:227
+#: classes/handler/public.php:737
 msgid "Email:"
 msgstr "E-mail:"
 
-#: register.php:231
-#: classes/handler/public.php:718
+#: register.php:230
+#: classes/handler/public.php:742
 msgid "How much is two plus two:"
 msgstr ""
 
-#: register.php:234
+#: register.php:233
 msgid "Submit registration"
 msgstr "Indsend registrering"
 
-#: register.php:252
+#: register.php:251
 msgid "Your registration information is incomplete."
 msgstr ""
 
-#: register.php:267
+#: register.php:266
 msgid "Sorry, this username is already taken."
 msgstr ""
 
-#: register.php:286
+#: register.php:285
 msgid "Registration failed."
 msgstr "Registrering mislykkedes."
 
-#: register.php:333
+#: register.php:331
 msgid "Account created successfully."
 msgstr "Konto blev oprettet med succes."
 
-#: register.php:355
+#: register.php:353
 msgid "New user registrations are currently closed."
 msgstr ""
 
-#: update.php:66
+#: update.php:67
 msgid "Tiny Tiny RSS data update script."
 msgstr ""
 
@@ -476,10 +464,10 @@ msgstr "Alle feeds"
 
 #: include/controls.php:138
 #: include/controls.php:230
-#: classes/opml.php:512
-#: classes/digest.php:120
+#: classes/digest.php:124
+#: classes/feeds.php:1708
 #: classes/pref/feeds.php:233
-#: classes/feeds.php:1722
+#: classes/opml.php:512
 msgid "Uncategorized"
 msgstr "Ikke kategoriseret"
 
@@ -494,290 +482,290 @@ msgstr[1] "Arkiverede artikler"
 msgid "No feeds found."
 msgstr "Der blev ikke fundet nogen feeds."
 
-#: include/functions.php:983
+#: include/functions.php:928
 #, php-format
 msgid "%d min"
 msgstr ""
 
-#: include/functions.php:1177
+#: include/functions.php:1122
 msgid "Navigation"
 msgstr "Navigation"
 
-#: include/functions.php:1178
+#: include/functions.php:1123
 msgid "Open next feed"
 msgstr "Åbn næste feed"
 
-#: include/functions.php:1179
+#: include/functions.php:1124
 msgid "Open previous feed"
 msgstr "Åbn forrige feed"
 
-#: include/functions.php:1180
+#: include/functions.php:1125
 msgid "Open next article"
 msgstr "Åbn næste artikel"
 
-#: include/functions.php:1181
+#: include/functions.php:1126
 msgid "Open previous article"
 msgstr "Åbn forrige artikel"
 
-#: include/functions.php:1182
+#: include/functions.php:1127
 msgid "Open next article (don't scroll long articles)"
 msgstr ""
 
-#: include/functions.php:1183
+#: include/functions.php:1128
 msgid "Open previous article (don't scroll long articles)"
 msgstr ""
 
-#: include/functions.php:1184
+#: include/functions.php:1129
 msgid "Move to next article (don't expand or mark read)"
 msgstr ""
 
-#: include/functions.php:1185
+#: include/functions.php:1130
 msgid "Move to previous article (don't expand or mark read)"
 msgstr ""
 
-#: include/functions.php:1186
+#: include/functions.php:1131
 msgid "Show search dialog"
 msgstr "Vise søgedialog"
 
-#: include/functions.php:1187
+#: include/functions.php:1132
 msgid "Article"
 msgstr "Artikel"
 
-#: include/functions.php:1188
-#: js/viewfeed.js:1695
+#: include/functions.php:1133
+#: js/viewfeed.js:1341
 msgid "Toggle starred"
 msgstr "Skift markeret"
 
-#: include/functions.php:1189
-#: js/viewfeed.js:1707
+#: include/functions.php:1134
+#: js/viewfeed.js:1353
 msgid "Toggle published"
 msgstr "Skift udgivne"
 
-#: include/functions.php:1190
-#: js/viewfeed.js:1682
+#: include/functions.php:1135
+#: js/viewfeed.js:1328
 msgid "Toggle unread"
 msgstr "Skift ulæst"
 
-#: include/functions.php:1191
+#: include/functions.php:1136
 msgid "Edit tags"
 msgstr "Rediger tags"
 
-#: include/functions.php:1192
+#: include/functions.php:1137
 msgid "Open in new window"
 msgstr "Åbn i et nyt vindue"
 
-#: include/functions.php:1193
-#: js/viewfeed.js:1728
+#: include/functions.php:1138
+#: js/viewfeed.js:1374
 msgid "Mark below as read"
 msgstr "Marker nedenstående som læst"
 
-#: include/functions.php:1194
-#: js/viewfeed.js:1721
+#: include/functions.php:1139
+#: js/viewfeed.js:1367
 msgid "Mark above as read"
 msgstr "Marker ovenstående som læst"
 
-#: include/functions.php:1195
+#: include/functions.php:1140
 msgid "Scroll down"
 msgstr "Rul nedad"
 
-#: include/functions.php:1196
+#: include/functions.php:1141
 msgid "Scroll up"
 msgstr "Rul opad"
 
-#: include/functions.php:1197
+#: include/functions.php:1142
 msgid "Select article under cursor"
 msgstr "Vælg artikel under markør"
 
-#: include/functions.php:1198
+#: include/functions.php:1143
 msgid "Email article"
 msgstr "E-mail-artikel"
 
-#: include/functions.php:1199
+#: include/functions.php:1144
 msgid "Close/collapse article"
 msgstr "Luk/skjul artikel"
 
-#: include/functions.php:1200
+#: include/functions.php:1145
 #, fuzzy
 msgid "Toggle article expansion (combined mode)"
 msgstr "Skift kombineret modus"
 
-#: include/functions.php:1202
+#: include/functions.php:1147
 #: plugins/embed_original/init.php:33
 msgid "Toggle embed original"
 msgstr "Skift integreret original"
 
-#: include/functions.php:1203
+#: include/functions.php:1148
 msgid "Article selection"
 msgstr "Artikelvalg"
 
-#: include/functions.php:1204
+#: include/functions.php:1149
 msgid "Select all articles"
 msgstr "Vælg alle artikler"
 
-#: include/functions.php:1205
+#: include/functions.php:1150
 msgid "Select unread"
 msgstr "Vælg ulæste"
 
-#: include/functions.php:1206
+#: include/functions.php:1151
 msgid "Select starred"
 msgstr "Vælg markerede"
 
-#: include/functions.php:1207
+#: include/functions.php:1152
 msgid "Select published"
 msgstr "Vælg udgivne"
 
-#: include/functions.php:1208
+#: include/functions.php:1153
 msgid "Invert selection"
 msgstr "Inverter valg"
 
-#: include/functions.php:1209
+#: include/functions.php:1154
 msgid "Deselect everything"
 msgstr "Fravælg alt"
 
-#: include/functions.php:1210
-#: classes/pref/feeds.php:522
-#: classes/pref/feeds.php:794
+#: include/functions.php:1155
+#: classes/pref/feeds.php:521
+#: classes/pref/feeds.php:793
 msgid "Feed"
 msgstr "Feed"
 
-#: include/functions.php:1211
+#: include/functions.php:1156
 msgid "Refresh current feed"
 msgstr "Opdater aktuelt feed"
 
-#: include/functions.php:1212
+#: include/functions.php:1157
 msgid "Un/hide read feeds"
 msgstr "Vis/skjul læste feeds"
 
-#: include/functions.php:1213
-#: classes/pref/feeds.php:1195
+#: include/functions.php:1158
+#: classes/pref/feeds.php:1194
 msgid "Subscribe to feed"
 msgstr "Abonner på feedet"
 
-#: include/functions.php:1214
-#: js/FeedTree.js:48
-#: js/PrefFeedTree.js:55
-#: js/viewfeed.js:1846
+#: include/functions.php:1159
+#: js/FeedTree.js:49
+#: js/PrefFeedTree.js:56
+#: js/viewfeed.js:1492
 msgid "Edit feed"
 msgstr "Rediger feed"
 
-#: include/functions.php:1216
+#: include/functions.php:1161
 msgid "Reverse headlines"
 msgstr "Reverser overskrifter"
 
-#: include/functions.php:1217
+#: include/functions.php:1162
 msgid "Toggle headline grouping"
 msgstr ""
 
-#: include/functions.php:1218
+#: include/functions.php:1163
 msgid "Debug feed update"
 msgstr "Udfør fejlfinding i feed-opdatering"
 
-#: include/functions.php:1219
+#: include/functions.php:1164
 #, fuzzy
 msgid "Debug viewfeed()"
 msgstr "Udfør fejlfinding i feed-opdatering"
 
-#: include/functions.php:1220
-#: js/FeedTree.js:97
+#: include/functions.php:1165
+#: js/FeedTree.js:98
 #, fuzzy
 msgid "Mark all feeds as read"
 msgstr "Marker feed som læst"
 
-#: include/functions.php:1221
+#: include/functions.php:1166
 msgid "Un/collapse current category"
 msgstr "Vis/skjul aktuel kategori"
 
-#: include/functions.php:1222
-msgid "Toggle combined mode"
-msgstr "Skift kombineret modus"
-
-#: include/functions.php:1223
+#: include/functions.php:1167
 #, fuzzy
 msgid "Toggle auto expand in combined mode"
 msgstr "Skift kombineret modus"
 
-#: include/functions.php:1224
+#: include/functions.php:1168
+msgid "Toggle combined mode"
+msgstr "Skift kombineret modus"
+
+#: include/functions.php:1169
 msgid "Go to"
 msgstr "Gå til"
 
-#: include/functions.php:1225
-#: classes/feeds.php:1583
+#: include/functions.php:1170
+#: classes/feeds.php:1569
 msgid "All articles"
 msgstr "Alle artikler"
 
-#: include/functions.php:1226
+#: include/functions.php:1171
 msgid "Fresh"
 msgstr "Ny"
 
-#: include/functions.php:1229
-#: js/tt-rss.js:491
-#: js/tt-rss.js:660
+#: include/functions.php:1174
+#: js/tt-rss.js:439
+#: js/tt-rss.js:599
 msgid "Tag cloud"
 msgstr "Tag Cloud"
 
-#: include/functions.php:1231
+#: include/functions.php:1176
 msgid "Other"
 msgstr "Andet"
 
-#: include/functions.php:1232
+#: include/functions.php:1177
 #: classes/pref/labels.php:279
 msgid "Create label"
 msgstr "Opret etiket"
 
-#: include/functions.php:1233
+#: include/functions.php:1178
 #: classes/pref/filters.php:801
 msgid "Create filter"
 msgstr "Opret filter"
 
-#: include/functions.php:1234
+#: include/functions.php:1179
 msgid "Un/collapse sidebar"
 msgstr "Vis/skjul sidebjælke"
 
-#: include/functions.php:1235
+#: include/functions.php:1180
 msgid "Show help dialog"
 msgstr "Vis hjælpedialog"
 
-#: include/functions.php:2582
+#: include/functions.php:2529
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: include/functions.php:2583
+#: include/functions.php:2530
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: include/functions.php:2584
+#: include/functions.php:2531
 msgid "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form"
 msgstr ""
 
-#: include/functions.php:2585
+#: include/functions.php:2532
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: include/functions.php:2586
+#: include/functions.php:2533
 #, fuzzy
 msgid "No file was uploaded"
 msgstr "Der er ikke indlæst nogen fil."
 
-#: include/functions.php:2587
+#: include/functions.php:2534
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: include/functions.php:2588
+#: include/functions.php:2535
 msgid "Failed to write file to disk."
 msgstr ""
 
-#: include/functions.php:2589
+#: include/functions.php:2536
 msgid "A PHP extension stopped the file upload."
 msgstr ""
 
 #: include/login_form.php:107
-#: classes/handler/public.php:446
-#: classes/handler/public.php:708
+#: classes/handler/public.php:466
+#: classes/handler/public.php:732
 msgid "Login:"
 msgstr "Logon:"
 
 #: include/login_form.php:117
-#: classes/handler/public.php:449
+#: classes/handler/public.php:469
 msgid "Password:"
 msgstr "Adgangskode:"
 
@@ -790,9 +778,9 @@ msgid "Profile:"
 msgstr "Profil:"
 
 #: include/login_form.php:133
-#: classes/handler/public.php:252
 #: classes/pref/prefs.php:1037
 #: classes/rpc.php:69
+#: classes/handler/public.php:272
 msgid "Default profile"
 msgstr "Standardprofil"
 
@@ -809,208 +797,26 @@ msgid "Remember me"
 msgstr "Husk mig"
 
 #: include/login_form.php:159
-#: classes/handler/public.php:454
+#: classes/handler/public.php:474
 msgid "Log in"
 msgstr "Log på"
 
-#: include/sessions.php:46
+#: include/sessions.php:45
 msgid "Session failed to validate (schema version changed)"
 msgstr ""
 
-#: include/sessions.php:62
+#: include/sessions.php:53
+msgid "Session failed to validate (UA changed)."
+msgstr ""
+
+#: include/sessions.php:67
 msgid "Session failed to validate (password changed)"
 msgstr ""
 
-#: include/sessions.php:69
+#: include/sessions.php:74
 msgid "Session failed to validate (user not found)"
 msgstr ""
 
-#: classes/article.php:26
-msgid "Article not found."
-msgstr "Artikel ikke fundet"
-
-#: classes/article.php:211
-msgid "Tags for this article (separated by commas):"
-msgstr ""
-
-#: classes/article.php:236
-#: classes/pref/labels.php:82
-#: classes/pref/users.php:103
-#: classes/pref/feeds.php:774
-#: classes/pref/feeds.php:914
-#: classes/pref/filters.php:525
-#: classes/pref/prefs.php:982
-#: plugins/nsfw/init.php:85
-#: plugins/note/init.php:58
-#: plugins/af_readability/init.php:80
-#: plugins/af_redditimgur/init.php:66
-#: plugins/af_psql_trgm/init.php:188
-#: plugins/mail/init.php:65
-#: plugins/af_zz_imgproxy/init.php:238
-msgid "Save"
-msgstr "Gem"
-
-#: classes/article.php:238
-#: classes/handler/public.php:423
-#: classes/handler/public.php:457
-#: classes/pref/labels.php:84
-#: classes/pref/users.php:105
-#: classes/pref/feeds.php:775
-#: classes/pref/feeds.php:917
-#: classes/pref/feeds.php:1672
-#: classes/pref/filters.php:528
-#: classes/pref/filters.php:945
-#: classes/pref/filters.php:1022
-#: classes/pref/filters.php:1115
-#: classes/pref/prefs.php:984
-#: classes/feeds.php:1037
-#: classes/feeds.php:1089
-#: classes/feeds.php:1128
-#: plugins/note/init.php:60
-#: plugins/mail/init.php:179
-msgid "Cancel"
-msgstr "Annuller"
-
-#: classes/article.php:337
-#: classes/article.php:720
-#: classes/article.php:875
-msgid "no tags"
-msgstr "ingen tags"
-
-#: classes/article.php:448
-msgid "unknown type"
-msgstr "ukendt type"
-
-#: classes/article.php:525
-msgid "Attachments"
-msgstr "Vedhæftninger"
-
-#: classes/article.php:626
-#: classes/feeds.php:661
-#, fuzzy
-msgid "comment"
-msgid_plural "comments"
-msgstr[0] "kommentarer"
-msgstr[1] "kommentarer"
-
-#: classes/article.php:630
-#: classes/feeds.php:665
-msgid "comments"
-msgstr "kommentarer"
-
-#: classes/article.php:689
-msgid " - "
-msgstr " - "
-
-#: classes/article.php:730
-#: classes/feeds.php:647
-msgid "Edit tags for this article"
-msgstr ""
-
-#: classes/article.php:763
-#: classes/feeds.php:602
-msgid "Originally from:"
-msgstr "Oprindeligt fra:"
-
-#: classes/article.php:774
-#: classes/pref/feeds.php:539
-#: classes/feeds.php:613
-msgid "Feed URL"
-msgstr "Feedets webadresse"
-
-#: classes/article.php:811
-#: classes/backend.php:103
-#: classes/dlg.php:33
-#: classes/dlg.php:56
-#: classes/dlg.php:89
-#: classes/dlg.php:154
-#: classes/dlg.php:181
-#: classes/dlg.php:197
-#: classes/pref/feeds.php:1466
-#: classes/pref/feeds.php:1533
-#: classes/pref/filters.php:208
-#: classes/pref/prefs.php:1099
-#: plugins/af_psql_trgm/init.php:109
-#: plugins/import_export/init.php:446
-#: plugins/import_export/init.php:490
-#: plugins/share/init.php:128
-msgid "Close this window"
-msgstr "Luk dette vindue"
-
-#: classes/article.php:913
-msgid "(edit note)"
-msgstr "(rediger note)"
-
-#: classes/opml.php:31
-#: classes/opml.php:36
-msgid "OPML Utility"
-msgstr "OPML-hjælpeprogram"
-
-#: classes/opml.php:40
-msgid "Importing OPML..."
-msgstr "Importerer OPML ..."
-
-#: classes/opml.php:45
-msgid "Return to preferences"
-msgstr "Vend tilbage til præferencer"
-
-#: classes/opml.php:301
-#, php-format
-msgid "Adding feed: %s"
-msgstr "Tilføjer feed: %s"
-
-#: classes/opml.php:312
-#, php-format
-msgid "Duplicate feed: %s"
-msgstr "Dupliker feed: %s"
-
-#: classes/opml.php:326
-#, php-format
-msgid "Adding label %s"
-msgstr "Tilføjer etiket: %s"
-
-#: classes/opml.php:329
-#, php-format
-msgid "Duplicate label: %s"
-msgstr "Dupliker etiket: %s"
-
-#: classes/opml.php:341
-#, php-format
-msgid "Setting preference key %s to %s"
-msgstr ""
-
-#: classes/opml.php:377
-msgid "Adding filter..."
-msgstr "Tilføjer filter ..."
-
-#: classes/opml.php:512
-#, php-format
-msgid "Processing category: %s"
-msgstr "Behandler kategori: %s"
-
-#: classes/opml.php:558
-#, php-format
-msgid "Upload failed with error code %d"
-msgstr ""
-
-#: classes/opml.php:570
-#: plugins/import_export/init.php:471
-msgid "Unable to move uploaded file."
-msgstr ""
-
-#: classes/opml.php:574
-#: plugins/import_export/init.php:475
-msgid "Error: please upload OPML file."
-msgstr ""
-
-#: classes/opml.php:585
-msgid "Error: unable to find moved OPML file."
-msgstr ""
-
-#: classes/opml.php:594
-msgid "Error while parsing document."
-msgstr "Fejl under dokumentparsing."
-
 #: classes/backend.php:31
 msgid "Other interface tips are available in the Tiny Tiny RSS wiki."
 msgstr ""
@@ -1031,165 +837,355 @@ msgstr "Ctrl"
 msgid "Help topic not found."
 msgstr "Emne i hjælp ikke fundet."
 
-#: 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/backend.php:103
+#: classes/pref/filters.php:208
+#: classes/pref/feeds.php:1465
+#: classes/pref/feeds.php:1532
+#: classes/pref/prefs.php:1099
+#: classes/dlg.php:33
+#: classes/dlg.php:56
+#: classes/dlg.php:89
+#: classes/dlg.php:154
+#: classes/dlg.php:181
+#: classes/dlg.php:197
+#: classes/article.php:810
+#: plugins/af_psql_trgm/init.php:109
+#: plugins/import_export/init.php:446
+#: plugins/import_export/init.php:490
+#: plugins/share/init.php:128
+msgid "Close this window"
+msgstr "Luk dette vindue"
 
-#: classes/dlg.php:44
-#, fuzzy
-msgid "Your Public OPML URL is:"
-msgstr "Webadresse til offentlig OPML"
+#: classes/feeds.php:53
+msgid "View as RSS feed"
+msgstr "Vis som RSS-feed"
 
-#: classes/dlg.php:53
-#: classes/dlg.php:178
-#: plugins/share/init.php:125
-msgid "Generate new URL"
-msgstr "Generer ny webadresse"
+#: classes/feeds.php:54
+#: classes/feeds.php:140
+#: classes/pref/feeds.php:1326
+msgid "View as RSS"
+msgstr "Vis som RSS"
 
-#: classes/dlg.php:67
-msgid "Update daemon is enabled in configuration, but daemon process is not running, which prevents all feeds from updating. Please start the daemon process or contact instance owner."
-msgstr ""
-
-#: classes/dlg.php:71
-#: classes/dlg.php:80
-msgid "Last update:"
-msgstr "Sidste opdatering:"
-
-#: classes/dlg.php:76
-msgid "Update daemon is taking too long to perform a feed update. This could indicate a problem like crash or a hang. Please check the daemon process or contact instance owner."
-msgstr ""
-
-#: classes/dlg.php:169
-msgid "You can view this feed as RSS using the following URL:"
-msgstr ""
-
-#: classes/dlg.php:190
-msgid "You are using default tt-rss password. Please change it in the Preferences (Personal data / Authentication)."
-msgstr ""
-
-#: classes/dlg.php:194
-#, fuzzy
-msgid "Open Preferences"
-msgstr "Præferencer"
-
-#: classes/handler/public.php:387
-#: plugins/bookmarklets/init.php:40
-#, fuzzy
-msgid "Share with Tiny Tiny RSS"
-msgstr "Opdater Tiny Tiny RSS"
-
-#: classes/handler/public.php:395
-msgid "Title:"
-msgstr "Overskrift:"
-
-#: classes/handler/public.php:397
-#: classes/pref/feeds.php:537
-msgid "URL:"
-msgstr "URL:"
-
-#: classes/handler/public.php:399
-msgid "Content:"
-msgstr "Indhold:"
-
-#: classes/handler/public.php:401
-msgid "Labels:"
-msgstr "Etiketter:"
-
-#: classes/handler/public.php:420
-msgid "Shared article will appear in the Published feed."
-msgstr ""
-
-#: classes/handler/public.php:422
-msgid "Share"
-msgstr "Del"
-
-#: classes/handler/public.php:444
-msgid "Not logged in"
-msgstr "Ikke logget på"
-
-#: classes/handler/public.php:504
-msgid "Incorrect username or password"
-msgstr "Forkert brugernavn eller adgangskode"
-
-#: classes/handler/public.php:557
-#, fuzzy, php-format
-msgid "Already subscribed to <b>%s</b>."
-msgstr "Abonneret på %s"
-
-#: classes/handler/public.php:560
-#, fuzzy, php-format
-msgid "Subscribed to <b>%s</b>."
-msgstr "Abonneret på %s"
-
-#: classes/handler/public.php:563
+#: classes/feeds.php:62
 #, php-format
-msgid "Could not subscribe to <b>%s</b>."
-msgstr ""
+msgid "Last updated: %s"
+msgstr "Sidste opdatering: %s"
 
-#: classes/handler/public.php:566
-#, fuzzy, php-format
-msgid "No feeds found in <b>%s</b>."
-msgstr "Der blev ikke fundet nogen feeds."
+#: classes/feeds.php:100
+#, fuzzy
+msgid "Select..."
+msgstr "Vælg"
 
-#: classes/handler/public.php:569
-msgid "Multiple feed URLs found."
-msgstr "Der er fundet flere webadresser til feed"
+#: classes/feeds.php:102
+#: classes/pref/labels.php:273
+#: classes/pref/filters.php:391
+#: classes/pref/filters.php:449
+#: classes/pref/filters.php:795
+#: classes/pref/filters.php:878
+#: classes/pref/filters.php:905
+#: classes/pref/feeds.php:1185
+#: classes/pref/feeds.php:1416
+#: classes/pref/feeds.php:1481
+#: classes/pref/users.php:358
+#: classes/pref/prefs.php:996
+msgid "All"
+msgstr "Alle"
 
-#: classes/handler/public.php:573
-#, php-format
-msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
-msgstr ""
+#: classes/feeds.php:104
+msgid "Invert"
+msgstr "Inverter"
 
-#: classes/handler/public.php:591
-msgid "Subscribe to selected feed"
-msgstr "Abonner på valgte feed"
+#: classes/feeds.php:105
+#: classes/pref/labels.php:275
+#: classes/pref/filters.php:393
+#: classes/pref/filters.php:451
+#: classes/pref/filters.php:797
+#: classes/pref/filters.php:880
+#: classes/pref/filters.php:907
+#: classes/pref/feeds.php:1187
+#: classes/pref/feeds.php:1418
+#: classes/pref/feeds.php:1483
+#: classes/pref/users.php:360
+#: classes/pref/prefs.php:998
+msgid "None"
+msgstr "Ingen"
 
-#: classes/handler/public.php:618
-msgid "Edit subscription options"
-msgstr "Rediger abonnementsindstillinger"
+#: classes/feeds.php:107
+msgid "Selection toggle:"
+msgstr "Valg af skift:"
 
-#: classes/handler/public.php:656
-msgid "Password recovery"
-msgstr "Genoprettelse af adgangskode"
+#: classes/feeds.php:113
+msgid "Selection:"
+msgstr "Valg:"
 
-#: classes/handler/public.php:701
-msgid "You will need to provide valid account name and email. A password reset link will be sent to your email address."
-msgstr ""
+#: classes/feeds.php:116
+msgid "Set score"
+msgstr "Indstil resultat"
 
-#: classes/handler/public.php:723
-#: classes/pref/users.php:372
-msgid "Reset password"
-msgstr "Nulstil adgangskode"
+#: classes/feeds.php:119
+msgid "Archive"
+msgstr "Arkiv"
 
-#: classes/handler/public.php:733
-msgid "Some of the required form parameters are missing or incorrect."
-msgstr ""
-
-#: classes/handler/public.php:737
-#: classes/handler/public.php:806
-msgid "Go back"
+#: classes/feeds.php:121
+msgid "Move back"
 msgstr "Gå tilbage"
 
-#: classes/handler/public.php:775
+#: classes/feeds.php:122
+#: classes/pref/filters.php:400
+#: classes/pref/filters.php:458
+#: classes/pref/filters.php:887
+#: classes/pref/filters.php:914
+msgid "Delete"
+msgstr "Slet"
+
+#: classes/feeds.php:127
+#: classes/feeds.php:132
+#: plugins/mailto/init.php:25
+#: plugins/mail/init.php:76
+msgid "Forward by email"
+msgstr "Videresend via e-mail"
+
+#: classes/feeds.php:136
+msgid "Feed:"
+msgstr "Feed:"
+
+#: classes/feeds.php:193
+#: classes/feeds.php:802
+msgid "Feed not found."
+msgstr "Feed ikke fundet."
+
+#: classes/feeds.php:255
+msgid "Never"
+msgstr "Aldrig"
+
+#: classes/feeds.php:341
+#, php-format
+msgid "Imported at %s"
+msgstr "Importeret på %s"
+
+#: classes/feeds.php:391
+#: classes/feeds.php:484
+msgid "mark feed as read"
+msgstr "marker feed som læst"
+
+#: classes/feeds.php:540
+msgid "Collapse article"
+msgstr "Skjul artikel"
+
+#: classes/feeds.php:592
+#: classes/article.php:762
+msgid "Originally from:"
+msgstr "Oprindeligt fra:"
+
+#: classes/feeds.php:603
+#: classes/pref/feeds.php:538
+#: classes/article.php:773
+msgid "Feed URL"
+msgstr "Feedets webadresse"
+
+#: classes/feeds.php:630
+#: classes/article.php:729
+msgid "Edit tags for this article"
+msgstr ""
+
+#: classes/feeds.php:644
+#: classes/article.php:625
 #, fuzzy
-msgid "[tt-rss] Password reset request"
-msgstr "[tt-rss] meddelelse om adgangskodeændring"
+msgid "comment"
+msgid_plural "comments"
+msgstr[0] "kommentarer"
+msgstr[1] "kommentarer"
 
-#: classes/handler/public.php:802
-msgid "Sorry, login and email combination not found."
+#: classes/feeds.php:648
+#: classes/article.php:629
+msgid "comments"
+msgstr "kommentarer"
+
+#: classes/feeds.php:686
+msgid "No unread articles found to display."
 msgstr ""
 
-#: classes/handler/public.php:824
-msgid "Your access level is insufficient to run this script."
+#: classes/feeds.php:689
+msgid "No updated articles found to display."
 msgstr ""
 
-#: classes/handler/public.php:850
-msgid "Database Updater"
-msgstr "Opdatering af database"
+#: classes/feeds.php:692
+msgid "No starred articles found to display."
+msgstr ""
 
-#: classes/handler/public.php:915
-msgid "Perform updates"
-msgstr "Udfør opdateringer"
+#: classes/feeds.php:696
+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:698
+msgid "No articles found to display."
+msgstr ""
+
+#: classes/feeds.php:714
+#: classes/feeds.php:905
+#, fuzzy, php-format
+msgid "Feeds last updated at %s"
+msgstr "Sidste opdatering: %s"
+
+#: classes/feeds.php:726
+#: classes/feeds.php:917
+msgid "Some feeds have update errors (click for details)"
+msgstr ""
+
+#: classes/feeds.php:894
+msgid "No feed selected."
+msgstr "Der er ikke valgt noget feed."
+
+#: classes/feeds.php:958
+#: classes/feeds.php:966
+msgid "Feed or site URL"
+msgstr "Webadresse til feed eller webside"
+
+#: classes/feeds.php:972
+#: classes/pref/feeds.php:559
+#: classes/pref/feeds.php:800
+#: classes/pref/feeds.php:1632
+msgid "Place in category:"
+msgstr "Placer i kategori:"
+
+#: classes/feeds.php:980
+msgid "Available feeds"
+msgstr "Tilgængelige feeds"
+
+#: classes/feeds.php:992
+#: classes/pref/feeds.php:621
+#: classes/pref/feeds.php:848
+#: classes/pref/users.php:61
+msgid "Authentication"
+msgstr "Godkendelse"
+
+#: classes/feeds.php:996
+#: classes/pref/feeds.php:625
+#: classes/pref/feeds.php:852
+#: classes/pref/feeds.php:1646
+#: classes/pref/users.php:403
+msgid "Login"
+msgstr "Logon"
+
+#: classes/feeds.php:1000
+#: classes/pref/feeds.php:631
+#: classes/pref/feeds.php:860
+#: classes/pref/feeds.php:1649
+#: classes/pref/prefs.php:243
+msgid "Password"
+msgstr "Adgangskode"
+
+#: classes/feeds.php:1011
+#: classes/pref/feeds.php:645
+msgid "This feed requires authentication."
+msgstr "Dette feed kræver godkendelse."
+
+#: classes/feeds.php:1014
+#: classes/feeds.php:1070
+#: classes/pref/feeds.php:1668
+msgid "Subscribe"
+msgstr "Abonner"
+
+#: classes/feeds.php:1017
+msgid "More feeds"
+msgstr "Flere feeds"
+
+#: classes/feeds.php:1020
+#: classes/feeds.php:1072
+#: classes/feeds.php:1111
+#: classes/pref/labels.php:84
+#: classes/pref/filters.php:528
+#: classes/pref/filters.php:945
+#: classes/pref/filters.php:1022
+#: classes/pref/filters.php:1115
+#: classes/pref/feeds.php:774
+#: classes/pref/feeds.php:916
+#: classes/pref/feeds.php:1669
+#: classes/pref/users.php:105
+#: classes/pref/prefs.php:984
+#: classes/article.php:238
+#: classes/handler/public.php:443
+#: classes/handler/public.php:477
+#: plugins/mail/init.php:179
+#: plugins/note/init.php:60
+msgid "Cancel"
+msgstr "Annuller"
+
+#: classes/feeds.php:1042
+#: classes/feeds.php:1110
+#: classes/pref/filters.php:788
+#: classes/pref/feeds.php:1178
+#: classes/pref/users.php:345
+#: js/tt-rss.js:152
+msgid "Search"
+msgstr "Søg"
+
+#: classes/feeds.php:1046
+msgid "Popular feeds"
+msgstr "Populære feeds"
+
+#: classes/feeds.php:1047
+msgid "Feed archive"
+msgstr "Feed-arkiv"
+
+#: classes/feeds.php:1050
+msgid "limit:"
+msgstr "grænse:"
+
+#: classes/feeds.php:1071
+#: classes/pref/labels.php:282
+#: classes/pref/filters.php:518
+#: classes/pref/filters.php:814
+#: classes/pref/feeds.php:751
+#: classes/pref/users.php:369
+msgid "Remove"
+msgstr "Fjern"
+
+#: classes/feeds.php:1084
+msgid "Look for"
+msgstr "Led efter"
+
+#: classes/feeds.php:1092
+#, php-format
+msgid "in %s"
+msgstr ""
+
+#: classes/feeds.php:1097
+msgid "Used for word stemming"
+msgstr ""
+
+#: classes/feeds.php:1106
+msgid "Search syntax"
+msgstr "Søgesyntaks"
+
+#: classes/feeds.php:1563
+msgid "Starred articles"
+msgstr "Markerede artikler"
+
+#: classes/feeds.php:1565
+msgid "Published articles"
+msgstr "Udgivne artikler"
+
+#: classes/feeds.php:1567
+msgid "Fresh articles"
+msgstr "Nye artikler"
+
+#: classes/feeds.php:1571
+msgid "Archived articles"
+msgstr "Arkiverede artikler"
+
+#: classes/feeds.php:1573
+msgid "Recently read"
+msgstr "Senest læst"
+
+#: classes/feeds.php:1694
+msgid "Special"
+msgstr "Speciel"
+
+#: classes/feeds.php:1951
+#, php-format
+msgid "Search results: %s"
+msgstr "Søgeresultater: %s"
 
 #: classes/pref/labels.php:25
 #: classes/pref/filters.php:377
@@ -1209,201 +1205,194 @@ msgstr "Forgrund:"
 msgid "Background:"
 msgstr "Baggrund:"
 
+#: classes/pref/labels.php:82
+#: classes/pref/filters.php:525
+#: classes/pref/feeds.php:773
+#: classes/pref/feeds.php:913
+#: classes/pref/users.php:103
+#: classes/pref/prefs.php:982
+#: classes/article.php:236
+#: plugins/af_zz_imgproxy/init.php:238
+#: plugins/af_redditimgur/init.php:66
+#: plugins/af_psql_trgm/init.php:188
+#: plugins/af_readability/init.php:80
+#: plugins/nsfw/init.php:85
+#: plugins/mail/init.php:65
+#: plugins/note/init.php:58
+msgid "Save"
+msgstr "Gem"
+
 #: classes/pref/labels.php:244
 #, fuzzy, php-format
 msgid "Created label <b>%s</b>"
 msgstr "Opret etiket"
 
 #: classes/pref/labels.php:270
-#: classes/pref/users.php:356
-#: classes/pref/feeds.php:1183
-#: classes/pref/feeds.php:1414
-#: classes/pref/feeds.php:1479
 #: classes/pref/filters.php:388
 #: classes/pref/filters.php:446
 #: classes/pref/filters.php:792
 #: classes/pref/filters.php:875
 #: classes/pref/filters.php:902
+#: classes/pref/feeds.php:1182
+#: classes/pref/feeds.php:1413
+#: classes/pref/feeds.php:1478
+#: classes/pref/users.php:355
 #: classes/pref/prefs.php:993
 msgid "Select"
 msgstr "Vælg"
 
-#: classes/pref/labels.php:273
-#: classes/pref/users.php:359
-#: classes/pref/feeds.php:1186
-#: classes/pref/feeds.php:1417
-#: classes/pref/feeds.php:1482
-#: classes/pref/filters.php:391
-#: classes/pref/filters.php:449
-#: classes/pref/filters.php:795
-#: classes/pref/filters.php:878
-#: classes/pref/filters.php:905
-#: classes/pref/prefs.php:996
-#: classes/feeds.php:102
-msgid "All"
-msgstr "Alle"
-
-#: classes/pref/labels.php:275
-#: classes/pref/users.php:361
-#: classes/pref/feeds.php:1188
-#: classes/pref/feeds.php:1419
-#: classes/pref/feeds.php:1484
-#: classes/pref/filters.php:393
-#: classes/pref/filters.php:451
-#: classes/pref/filters.php:797
-#: classes/pref/filters.php:880
-#: classes/pref/filters.php:907
-#: classes/pref/prefs.php:998
-#: classes/feeds.php:105
-msgid "None"
-msgstr "Ingen"
-
-#: classes/pref/labels.php:282
-#: classes/pref/users.php:370
-#: classes/pref/feeds.php:752
-#: classes/pref/filters.php:518
-#: classes/pref/filters.php:814
-#: classes/feeds.php:1088
-msgid "Remove"
-msgstr "Fjern"
-
 #: classes/pref/labels.php:285
 msgid "Clear colors"
 msgstr "Gennemsigtige farver"
 
-#: classes/pref/users.php:6
-#: classes/pref/system.php:8
-msgid "Your access level is insufficient to open this tab."
-msgstr ""
-
-#: classes/pref/users.php:26
+#: classes/pref/filters.php:155
 #, fuzzy
-msgid "Edit user"
-msgstr "Rediger regel"
+msgid "Preview article"
+msgstr "Nye artikler"
 
-#: classes/pref/users.php:61
-#: classes/pref/feeds.php:622
-#: classes/pref/feeds.php:849
-#: classes/feeds.php:1009
-msgid "Authentication"
-msgstr "Godkendelse"
+#: classes/pref/filters.php:267
+#: classes/pref/filters.php:573
+msgid "(inverse)"
+msgstr "(inverter)"
 
-#: classes/pref/users.php:64
-msgid "Access level: "
-msgstr "Adgangsniveau: "
-
-#: classes/pref/users.php:82
-#: classes/pref/feeds.php:648
-#: classes/pref/feeds.php:867
-msgid "Options"
-msgstr "Indstillinger"
-
-#: classes/pref/users.php:96
-#: js/prefs.js:479
-msgid "User details"
-msgstr "Brugeroplysninger"
-
-#: classes/pref/users.php:136
-#: classes/pref/users.php:407
-msgid "Registered"
-msgstr "Registreret"
-
-#: classes/pref/users.php:137
-msgid "Last logged in"
-msgstr "Sidst logget på"
-
-#: classes/pref/users.php:145
-msgid "Subscribed feeds count"
-msgstr "Antal abonnerede feeds"
-
-#: classes/pref/users.php:146
-#, fuzzy
-msgid "Stored articles"
-msgstr "Markerede artikler"
-
-#: classes/pref/users.php:150
-#: classes/pref/users.php:406
-msgid "Subscribed feeds"
-msgstr "Abonnerede feeds"
-
-#: classes/pref/users.php:176
-msgid "User not found"
-msgstr "Bruger ikke fundet"
-
-#: classes/pref/users.php:246
+#: classes/pref/filters.php:263
+#: classes/pref/filters.php:572
 #, php-format
-msgid "Added user <b>%s</b> with password <b>%s</b>"
+msgid "%s on %s in %s %s"
 msgstr ""
 
-#: classes/pref/users.php:253
-#, php-format
-msgid "Could not create user <b>%s</b>"
-msgstr ""
+#: classes/pref/filters.php:383
+#: classes/pref/filters.php:870
+#: classes/pref/filters.php:977
+msgid "Match"
+msgstr "Tilpasning"
 
-#: classes/pref/users.php:257
-#, php-format
-msgid "User <b>%s</b> already exists."
-msgstr ""
+#: classes/pref/filters.php:397
+#: classes/pref/filters.php:455
+#: classes/pref/filters.php:884
+#: classes/pref/filters.php:911
+msgid "Add"
+msgstr "Tilføj"
 
-#: classes/pref/users.php:285
-#, php-format
-msgid "Changed password of user <b>%s</b> to <b>%s</b>"
-msgstr ""
+#: classes/pref/filters.php:441
+#: classes/pref/filters.php:897
+msgid "Apply actions"
+msgstr "Anvend handlinger"
 
-#: classes/pref/users.php:287
-#, php-format
-msgid "Sending new password of user <b>%s</b> to <b>%s</b>"
-msgstr ""
+#: classes/pref/filters.php:492
+#: classes/pref/filters.php:926
+msgid "Enabled"
+msgstr "Aktiveret"
 
-#: classes/pref/users.php:311
-msgid "[tt-rss] Password change notification"
-msgstr "[tt-rss] meddelelse om adgangskodeændring"
+#: classes/pref/filters.php:501
+#: classes/pref/filters.php:929
+msgid "Match any rule"
+msgstr "Match enhver regel"
 
-#: classes/pref/users.php:346
-#: classes/pref/feeds.php:1179
-#: classes/pref/filters.php:788
-#: classes/feeds.php:1059
-#: classes/feeds.php:1127
-#: js/tt-rss.js:165
-msgid "Search"
-msgstr "Søg"
+#: classes/pref/filters.php:510
+#: classes/pref/filters.php:932
+msgid "Inverse matching"
+msgstr "Inverter tilpasning"
 
-#: classes/pref/users.php:364
-msgid "Create user"
-msgstr "Opret bruger"
+#: classes/pref/filters.php:522
+#: classes/pref/filters.php:939
+msgid "Test"
+msgstr "Test"
+
+#: classes/pref/filters.php:804
+msgid "Combine"
+msgstr "Kombiner"
 
-#: classes/pref/users.php:368
 #: classes/pref/filters.php:807
+#: classes/pref/users.php:367
 msgid "Edit"
 msgstr "Rediger"
 
-#: classes/pref/users.php:404
-#: classes/pref/feeds.php:626
-#: classes/pref/feeds.php:853
-#: classes/pref/feeds.php:1649
-#: classes/feeds.php:1013
-msgid "Login"
-msgstr "Logon"
+#: classes/pref/filters.php:810
+#: classes/pref/feeds.php:1198
+#: classes/pref/feeds.php:1212
+msgid "Reset sort order"
+msgstr "Nulstil sorteringsrækkefølge"
 
-#: classes/pref/users.php:405
-msgid "Access Level"
-msgstr "Adgangsniveau"
+#: classes/pref/filters.php:942
+msgid "Create"
+msgstr "Opret"
 
-#: classes/pref/users.php:408
-msgid "Last login"
-msgstr "Sidste logon"
+#: classes/pref/filters.php:987
+msgid "Regular expression, without outer delimiters (i.e. slashes)"
+msgstr ""
 
-#: classes/pref/users.php:427
-msgid "Click to edit"
-msgstr "Klik for at redigere"
+#: classes/pref/filters.php:993
+msgid "Inverse regular expression matching"
+msgstr "Inverter tilpasning af normalt udtryk"
 
-#: classes/pref/users.php:447
-msgid "No users defined."
-msgstr "Der er ikke defineret nogen brugere."
+#: classes/pref/filters.php:995
+msgid "on field"
+msgstr "på feltet"
 
-#: classes/pref/users.php:449
-msgid "No matching users found."
-msgstr "Der er ikke fundet matchende brugere."
+#: classes/pref/filters.php:1001
+#: js/PrefFilterTree.js:44
+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:764
+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:786
+msgid "Add action"
+msgstr "Tilføj handling"
+
+#: classes/pref/filters.php:1139
+msgid "[No caption]"
+msgstr "[Ingen billedtekst]"
+
+#: classes/pref/filters.php:1141
+#, 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:1155
+#, fuzzy
+msgid "matches any rule"
+msgstr "Match enhver regel"
+
+#: classes/pref/filters.php:1158
+#, fuzzy, php-format
+msgid "%s (+%d action)"
+msgid_plural "%s (+%d actions)"
+msgstr[0] "Tilføj handling"
+msgstr[1] "Tilføj handling"
+
+#: classes/pref/system.php:8
+#: classes/pref/users.php:6
+msgid "Your access level is insufficient to open this tab."
+msgstr ""
 
 #: classes/pref/system.php:29
 msgid "Error Log"
@@ -1448,386 +1437,317 @@ msgid_plural "(%d feeds)"
 msgstr[0] "Rediger feed"
 msgstr[1] "Rediger feed"
 
-#: classes/pref/feeds.php:514
+#: classes/pref/feeds.php:513
 #: classes/pref/prefs.php:18
 msgid "General"
 msgstr "Generelt"
 
-#: classes/pref/feeds.php:528
+#: classes/pref/feeds.php:527
 msgid "Feed Title"
 msgstr "Feed-overskrift"
 
-#: classes/pref/feeds.php:560
-#: classes/pref/feeds.php:801
-#: classes/pref/feeds.php:1635
-#: classes/feeds.php:989
-msgid "Place in category:"
-msgstr "Placer i kategori:"
+#: classes/pref/feeds.php:536
+#: classes/handler/public.php:417
+msgid "URL:"
+msgstr "URL:"
 
-#: classes/pref/feeds.php:572
+#: classes/pref/feeds.php:571
 #, fuzzy
 msgid "Site URL:"
 msgstr "Artiklens webadresse:"
 
-#: classes/pref/feeds.php:574
+#: classes/pref/feeds.php:573
 #, fuzzy
 msgid "Site URL"
 msgstr "Feedets webadresse"
 
-#: classes/pref/feeds.php:585
-#: classes/pref/feeds.php:815
+#: classes/pref/feeds.php:584
+#: classes/pref/feeds.php:814
 #, fuzzy
 msgid "Language:"
 msgstr "Sprog"
 
-#: classes/pref/feeds.php:592
-#: classes/pref/feeds.php:824
+#: classes/pref/feeds.php:591
+#: classes/pref/feeds.php:823
 msgid "Update"
 msgstr "Opdater"
 
-#: classes/pref/feeds.php:607
-#: classes/pref/feeds.php:840
+#: classes/pref/feeds.php:606
+#: classes/pref/feeds.php:839
 msgid "Article purging:"
 msgstr "Artikeltømning:"
 
-#: classes/pref/feeds.php:632
-#: classes/pref/feeds.php:861
-#: classes/pref/feeds.php:1652
-#: classes/pref/prefs.php:243
-#: classes/feeds.php:1017
-msgid "Password"
-msgstr "Adgangskode"
-
-#: classes/pref/feeds.php:636
+#: classes/pref/feeds.php:635
 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:646
-#: classes/feeds.php:1028
-msgid "This feed requires authentication."
-msgstr "Dette feed kræver godkendelse."
+#: classes/pref/feeds.php:647
+#: classes/pref/feeds.php:866
+#: classes/pref/users.php:82
+msgid "Options"
+msgstr "Indstillinger"
 
-#: classes/pref/feeds.php:662
-#: classes/pref/feeds.php:871
+#: classes/pref/feeds.php:661
+#: classes/pref/feeds.php:870
 msgid "Hide from Popular feeds"
 msgstr "Skjul fra Populære feeds"
 
-#: classes/pref/feeds.php:674
-#: classes/pref/feeds.php:877
+#: classes/pref/feeds.php:673
+#: classes/pref/feeds.php:876
 msgid "Include in e-mail digest"
 msgstr "Inkluder i e-mail-digest"
 
-#: classes/pref/feeds.php:687
-#: classes/pref/feeds.php:883
+#: classes/pref/feeds.php:686
+#: classes/pref/feeds.php:882
 msgid "Always display image attachments"
 msgstr "Vis altid billedvedhæftninger"
 
-#: classes/pref/feeds.php:700
-#: classes/pref/feeds.php:891
+#: classes/pref/feeds.php:699
+#: classes/pref/feeds.php:890
 #, fuzzy
 msgid "Do not embed media"
 msgstr "Inkorporer ikke billeder"
 
-#: classes/pref/feeds.php:713
-#: classes/pref/feeds.php:899
+#: classes/pref/feeds.php:712
+#: classes/pref/feeds.php:898
 msgid "Cache media"
 msgstr ""
 
-#: classes/pref/feeds.php:725
-#: classes/pref/feeds.php:905
+#: classes/pref/feeds.php:724
+#: classes/pref/feeds.php:904
 #, fuzzy
 msgid "Mark updated articles as unread"
 msgstr "Marker feed som læst"
 
-#: classes/pref/feeds.php:729
+#: classes/pref/feeds.php:728
 msgid "Icon"
 msgstr "Ikon"
 
-#: classes/pref/feeds.php:743
-#: classes/pref/feeds.php:1284
+#: classes/pref/feeds.php:742
+#: classes/pref/feeds.php:1283
 #: plugins/import_export/init.php:71
 #, fuzzy
 msgid "Choose file..."
 msgstr "Opret filter ..."
 
-#: classes/pref/feeds.php:750
+#: classes/pref/feeds.php:749
 msgid "Replace"
 msgstr "Erstat"
 
-#: classes/pref/feeds.php:757
+#: classes/pref/feeds.php:756
 #: classes/pref/prefs.php:679
 msgid "Plugins"
 msgstr "Plugins"
 
-#: classes/pref/feeds.php:1154
+#: classes/pref/feeds.php:1153
 msgid "Feeds with errors"
 msgstr "Feeds med fejl"
 
-#: classes/pref/feeds.php:1161
+#: classes/pref/feeds.php:1160
 msgid "Inactive feeds"
 msgstr "Inaktive feeds"
 
-#: classes/pref/feeds.php:1197
+#: classes/pref/feeds.php:1196
 msgid "Edit selected feeds"
 msgstr "Rediger valgte feeds"
 
-#: classes/pref/feeds.php:1199
-#: classes/pref/feeds.php:1213
-#: classes/pref/filters.php:810
-msgid "Reset sort order"
-msgstr "Nulstil sorteringsrækkefølge"
-
-#: classes/pref/feeds.php:1201
-#: js/prefs.js:1462
+#: classes/pref/feeds.php:1200
+#: js/prefs.js:1171
 msgid "Batch subscribe"
 msgstr "Batchabonnement"
 
-#: classes/pref/feeds.php:1208
+#: classes/pref/feeds.php:1207
 msgid "Categories"
 msgstr "Kategorier"
 
-#: classes/pref/feeds.php:1211
+#: classes/pref/feeds.php:1210
 msgid "Add category"
 msgstr "Tilføj kategori"
 
-#: classes/pref/feeds.php:1215
+#: classes/pref/feeds.php:1214
 msgid "Remove selected"
 msgstr "Fjern valgte"
 
-#: classes/pref/feeds.php:1272
+#: classes/pref/feeds.php:1271
 msgid "OPML"
 msgstr "OPML"
 
-#: classes/pref/feeds.php:1274
+#: classes/pref/feeds.php:1273
 msgid "Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings."
 msgstr ""
 
-#: classes/pref/feeds.php:1275
+#: classes/pref/feeds.php:1274
 msgid "Only main settings profile can be migrated using OPML."
 msgstr ""
 
-#: classes/pref/feeds.php:1290
+#: classes/pref/feeds.php:1289
 msgid "Import my OPML"
 msgstr "Importer min OPML"
 
-#: classes/pref/feeds.php:1296
+#: classes/pref/feeds.php:1295
 msgid "Filename:"
 msgstr "Filnavn:"
 
-#: classes/pref/feeds.php:1298
+#: classes/pref/feeds.php:1297
 msgid "Include settings"
 msgstr "Inkluder indstillinger"
 
-#: classes/pref/feeds.php:1302
+#: classes/pref/feeds.php:1301
 msgid "Export OPML"
 msgstr "Eksporter OPML"
 
-#: classes/pref/feeds.php:1306
+#: classes/pref/feeds.php:1305
 msgid "Your OPML can be published publicly and can be subscribed by anyone who knows the URL below."
 msgstr ""
 
-#: classes/pref/feeds.php:1310
+#: classes/pref/feeds.php:1309
 msgid "Public OPML URL"
 msgstr "Webadresse til offentlig OPML"
 
-#: classes/pref/feeds.php:1311
+#: classes/pref/feeds.php:1310
 msgid "Display published OPML URL"
 msgstr "Vis webadresse på udgivne OPML"
 
-#: classes/pref/feeds.php:1318
+#: classes/pref/feeds.php:1317
 msgid "Published & shared articles / Generated feeds"
 msgstr ""
 
-#: classes/pref/feeds.php:1320
+#: classes/pref/feeds.php:1319
 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:1327
-#: classes/feeds.php:54
-#: classes/feeds.php:140
-msgid "View as RSS"
-msgstr "Vis som RSS"
-
-#: classes/pref/feeds.php:1328
 msgid "Display URL"
 msgstr "Vis webadresse"
 
-#: classes/pref/feeds.php:1331
+#: classes/pref/feeds.php:1330
 msgid "Clear all generated URLs"
 msgstr "Ryd alle genererede webadresser"
 
-#: classes/pref/feeds.php:1410
+#: classes/pref/feeds.php:1409
 msgid "These feeds have not been updated with new content for 3 months (oldest first):"
 msgstr ""
 
-#: classes/pref/feeds.php:1444
-#: classes/pref/feeds.php:1509
+#: classes/pref/feeds.php:1443
+#: classes/pref/feeds.php:1508
 msgid "Click to edit feed"
 msgstr "Klik for at redigere feed"
 
-#: classes/pref/feeds.php:1462
-#: classes/pref/feeds.php:1529
+#: classes/pref/feeds.php:1461
+#: classes/pref/feeds.php:1528
 msgid "Unsubscribe from selected feeds"
 msgstr "Aflys abonnement for valgte feeds"
 
-#: classes/pref/feeds.php:1632
+#: classes/pref/feeds.php:1629
 msgid "Add one valid RSS feed per line (no feed detection is done)"
 msgstr ""
 
-#: classes/pref/feeds.php:1641
+#: classes/pref/feeds.php:1638
 msgid "Feeds to subscribe, One per line"
 msgstr ""
 
-#: classes/pref/feeds.php:1664
+#: classes/pref/feeds.php:1661
 msgid "Feeds require authentication."
 msgstr "Feeds kræver godkendelse."
 
-#: classes/pref/feeds.php:1671
-#: classes/feeds.php:1031
-#: classes/feeds.php:1087
-msgid "Subscribe"
-msgstr "Abonner"
-
-#: classes/pref/filters.php:155
+#: classes/pref/users.php:26
 #, fuzzy
-msgid "Preview article"
-msgstr "Nye artikler"
+msgid "Edit user"
+msgstr "Rediger regel"
 
-#: classes/pref/filters.php:267
-#: classes/pref/filters.php:573
-msgid "(inverse)"
-msgstr "(inverter)"
+#: classes/pref/users.php:64
+msgid "Access level: "
+msgstr "Adgangsniveau: "
 
-#: classes/pref/filters.php:263
-#: classes/pref/filters.php:572
+#: classes/pref/users.php:96
+#: js/prefs.js:403
+msgid "User details"
+msgstr "Brugeroplysninger"
+
+#: classes/pref/users.php:136
+#: classes/pref/users.php:406
+msgid "Registered"
+msgstr "Registreret"
+
+#: classes/pref/users.php:137
+msgid "Last logged in"
+msgstr "Sidst logget på"
+
+#: classes/pref/users.php:145
+msgid "Subscribed feeds count"
+msgstr "Antal abonnerede feeds"
+
+#: classes/pref/users.php:146
+#, fuzzy
+msgid "Stored articles"
+msgstr "Markerede artikler"
+
+#: classes/pref/users.php:150
+#: classes/pref/users.php:405
+msgid "Subscribed feeds"
+msgstr "Abonnerede feeds"
+
+#: classes/pref/users.php:176
+msgid "User not found"
+msgstr "Bruger ikke fundet"
+
+#: classes/pref/users.php:246
 #, php-format
-msgid "%s on %s in %s %s"
+msgid "Added user <b>%s</b> with password <b>%s</b>"
 msgstr ""
 
-#: classes/pref/filters.php:383
-#: classes/pref/filters.php:870
-#: classes/pref/filters.php:977
-msgid "Match"
-msgstr "Tilpasning"
-
-#: classes/pref/filters.php:397
-#: classes/pref/filters.php:455
-#: classes/pref/filters.php:884
-#: classes/pref/filters.php:911
-msgid "Add"
-msgstr "Tilføj"
-
-#: classes/pref/filters.php:400
-#: classes/pref/filters.php:458
-#: classes/pref/filters.php:887
-#: classes/pref/filters.php:914
-#: classes/feeds.php:122
-msgid "Delete"
-msgstr "Slet"
-
-#: classes/pref/filters.php:441
-#: classes/pref/filters.php:897
-msgid "Apply actions"
-msgstr "Anvend handlinger"
-
-#: classes/pref/filters.php:492
-#: classes/pref/filters.php:926
-msgid "Enabled"
-msgstr "Aktiveret"
-
-#: classes/pref/filters.php:501
-#: classes/pref/filters.php:929
-msgid "Match any rule"
-msgstr "Match enhver regel"
-
-#: classes/pref/filters.php:510
-#: classes/pref/filters.php:932
-msgid "Inverse matching"
-msgstr "Inverter tilpasning"
-
-#: classes/pref/filters.php:522
-#: classes/pref/filters.php:939
-msgid "Test"
-msgstr "Test"
-
-#: classes/pref/filters.php:804
-msgid "Combine"
-msgstr "Kombiner"
-
-#: classes/pref/filters.php:942
-msgid "Create"
-msgstr "Opret"
-
-#: classes/pref/filters.php:987
-msgid "Regular expression, without outer delimiters (i.e. slashes)"
+#: classes/pref/users.php:253
+#, php-format
+msgid "Could not create user <b>%s</b>"
 msgstr ""
 
-#: classes/pref/filters.php:993
-msgid "Inverse regular expression matching"
-msgstr "Inverter tilpasning af normalt udtryk"
+#: classes/pref/users.php:257
+#, php-format
+msgid "User <b>%s</b> already exists."
+msgstr ""
 
-#: classes/pref/filters.php:995
-msgid "on field"
-msgstr "på feltet"
+#: classes/pref/users.php:285
+#, php-format
+msgid "Changed password of user <b>%s</b> to <b>%s</b>"
+msgstr ""
 
-#: classes/pref/filters.php:1001
-#: js/PrefFilterTree.js:43
-msgid "in"
-msgstr "i"
+#: classes/pref/users.php:287
+#, php-format
+msgid "Sending new password of user <b>%s</b> to <b>%s</b>"
+msgstr ""
 
-#: classes/pref/filters.php:1014
-msgid "Wiki: Filters"
-msgstr "Wiki: Filtre"
+#: classes/pref/users.php:310
+msgid "[tt-rss] Password change notification"
+msgstr "[tt-rss] meddelelse om adgangskodeændring"
 
-#: classes/pref/filters.php:1019
-msgid "Save rule"
-msgstr "Gem regel"
+#: classes/pref/users.php:363
+msgid "Create user"
+msgstr "Opret bruger"
 
-#: classes/pref/filters.php:1019
-#: js/functions.js:797
-msgid "Add rule"
-msgstr "Tilføj regel"
+#: classes/pref/users.php:371
+#: classes/handler/public.php:747
+msgid "Reset password"
+msgstr "Nulstil adgangskode"
 
-#: classes/pref/filters.php:1042
-msgid "Perform Action"
-msgstr "Udfør handling"
+#: classes/pref/users.php:404
+msgid "Access Level"
+msgstr "Adgangsniveau"
 
-#: classes/pref/filters.php:1093
-#, fuzzy
-msgid "No actions available"
-msgstr "Ny version til rådighed!"
+#: classes/pref/users.php:407
+msgid "Last login"
+msgstr "Sidste logon"
 
-#: classes/pref/filters.php:1112
-msgid "Save action"
-msgstr "Gem handling"
+#: classes/pref/users.php:426
+msgid "Click to edit"
+msgstr "Klik for at redigere"
 
-#: classes/pref/filters.php:1112
-#: js/functions.js:819
-msgid "Add action"
-msgstr "Tilføj handling"
+#: classes/pref/users.php:446
+msgid "No users defined."
+msgstr "Der er ikke defineret nogen brugere."
 
-#: classes/pref/filters.php:1139
-msgid "[No caption]"
-msgstr "[Ingen billedtekst]"
-
-#: classes/pref/filters.php:1141
-#, 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:1155
-#, fuzzy
-msgid "matches any rule"
-msgstr "Match enhver regel"
-
-#: classes/pref/filters.php:1158
-#, 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:448
+msgid "No matching users found."
+msgstr "Der er ikke fundet matchende brugere."
 
 #: classes/pref/prefs.php:19
 msgid "Interface"
@@ -2009,7 +1929,7 @@ msgid "Strip all but most common HTML tags when reading articles."
 msgstr ""
 
 #: classes/pref/prefs.php:53
-#: js/prefs.js:1424
+#: js/prefs.js:1136
 msgid "Customize stylesheet"
 msgstr "Tilpas designark"
 
@@ -2254,256 +2174,303 @@ msgstr "Fjern valgte profiler"
 msgid "Activate profile"
 msgstr "Aktiver profil"
 
-#: classes/feeds.php:53
-msgid "View as RSS feed"
-msgstr "Vis som RSS-feed"
+#: 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/feeds.php:62
-#, php-format
-msgid "Last updated: %s"
-msgstr "Sidste opdatering: %s"
-
-#: classes/feeds.php:100
+#: classes/dlg.php:44
 #, fuzzy
-msgid "Select..."
-msgstr "Vælg"
+msgid "Your Public OPML URL is:"
+msgstr "Webadresse til offentlig OPML"
 
-#: classes/feeds.php:104
-msgid "Invert"
-msgstr "Inverter"
+#: classes/dlg.php:53
+#: classes/dlg.php:178
+#: plugins/share/init.php:125
+msgid "Generate new URL"
+msgstr "Generer ny webadresse"
 
-#: classes/feeds.php:107
-msgid "Selection toggle:"
-msgstr "Valg af skift:"
+#: classes/dlg.php:67
+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/feeds.php:113
-msgid "Selection:"
-msgstr "Valg:"
+#: classes/dlg.php:71
+#: classes/dlg.php:80
+msgid "Last update:"
+msgstr "Sidste opdatering:"
 
-#: classes/feeds.php:116
-msgid "Set score"
-msgstr "Indstil resultat"
+#: classes/dlg.php:76
+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/feeds.php:119
-msgid "Archive"
-msgstr "Arkiv"
+#: classes/dlg.php:169
+msgid "You can view this feed as RSS using the following URL:"
+msgstr ""
 
-#: classes/feeds.php:121
-msgid "Move back"
+#: classes/dlg.php:190
+msgid "You are using default tt-rss password. Please change it in the Preferences (Personal data / Authentication)."
+msgstr ""
+
+#: classes/dlg.php:194
+#, fuzzy
+msgid "Open Preferences"
+msgstr "Præferencer"
+
+#: classes/opml.php:31
+#: classes/opml.php:36
+msgid "OPML Utility"
+msgstr "OPML-hjælpeprogram"
+
+#: classes/opml.php:40
+msgid "Importing OPML..."
+msgstr "Importerer OPML ..."
+
+#: classes/opml.php:45
+msgid "Return to preferences"
+msgstr "Vend tilbage til præferencer"
+
+#: classes/opml.php:301
+#, php-format
+msgid "Adding feed: %s"
+msgstr "Tilføjer feed: %s"
+
+#: classes/opml.php:312
+#, php-format
+msgid "Duplicate feed: %s"
+msgstr "Dupliker feed: %s"
+
+#: classes/opml.php:326
+#, php-format
+msgid "Adding label %s"
+msgstr "Tilføjer etiket: %s"
+
+#: classes/opml.php:329
+#, php-format
+msgid "Duplicate label: %s"
+msgstr "Dupliker etiket: %s"
+
+#: classes/opml.php:341
+#, php-format
+msgid "Setting preference key %s to %s"
+msgstr ""
+
+#: classes/opml.php:377
+msgid "Adding filter..."
+msgstr "Tilføjer filter ..."
+
+#: classes/opml.php:512
+#, php-format
+msgid "Processing category: %s"
+msgstr "Behandler kategori: %s"
+
+#: classes/opml.php:558
+#, php-format
+msgid "Upload failed with error code %d"
+msgstr ""
+
+#: classes/opml.php:570
+#: plugins/import_export/init.php:471
+msgid "Unable to move uploaded file."
+msgstr ""
+
+#: classes/opml.php:574
+#: plugins/import_export/init.php:475
+msgid "Error: please upload OPML file."
+msgstr ""
+
+#: classes/opml.php:585
+msgid "Error: unable to find moved OPML file."
+msgstr ""
+
+#: classes/opml.php:594
+msgid "Error while parsing document."
+msgstr "Fejl under dokumentparsing."
+
+#: classes/article.php:26
+msgid "Article not found."
+msgstr "Artikel ikke fundet"
+
+#: classes/article.php:211
+msgid "Tags for this article (separated by commas):"
+msgstr ""
+
+#: classes/article.php:337
+#: classes/article.php:719
+#: classes/article.php:874
+msgid "no tags"
+msgstr "ingen tags"
+
+#: classes/article.php:447
+msgid "unknown type"
+msgstr "ukendt type"
+
+#: classes/article.php:524
+msgid "Attachments"
+msgstr "Vedhæftninger"
+
+#: classes/article.php:688
+msgid " - "
+msgstr " - "
+
+#: classes/article.php:912
+msgid "(edit note)"
+msgstr "(rediger note)"
+
+#: classes/handler/public.php:407
+#: plugins/bookmarklets/init.php:40
+#, fuzzy
+msgid "Share with Tiny Tiny RSS"
+msgstr "Opdater Tiny Tiny RSS"
+
+#: classes/handler/public.php:415
+msgid "Title:"
+msgstr "Overskrift:"
+
+#: classes/handler/public.php:419
+msgid "Content:"
+msgstr "Indhold:"
+
+#: classes/handler/public.php:421
+msgid "Labels:"
+msgstr "Etiketter:"
+
+#: classes/handler/public.php:440
+msgid "Shared article will appear in the Published feed."
+msgstr ""
+
+#: classes/handler/public.php:442
+msgid "Share"
+msgstr "Del"
+
+#: classes/handler/public.php:464
+msgid "Not logged in"
+msgstr "Ikke logget på"
+
+#: classes/handler/public.php:527
+msgid "Incorrect username or password"
+msgstr "Forkert brugernavn eller adgangskode"
+
+#: classes/handler/public.php:581
+#, fuzzy, php-format
+msgid "Already subscribed to <b>%s</b>."
+msgstr "Abonneret på %s"
+
+#: classes/handler/public.php:584
+#, fuzzy, php-format
+msgid "Subscribed to <b>%s</b>."
+msgstr "Abonneret på %s"
+
+#: classes/handler/public.php:587
+#, php-format
+msgid "Could not subscribe to <b>%s</b>."
+msgstr ""
+
+#: classes/handler/public.php:590
+#, fuzzy, php-format
+msgid "No feeds found in <b>%s</b>."
+msgstr "Der blev ikke fundet nogen feeds."
+
+#: classes/handler/public.php:593
+msgid "Multiple feed URLs found."
+msgstr "Der er fundet flere webadresser til feed"
+
+#: classes/handler/public.php:597
+#, php-format
+msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
+msgstr ""
+
+#: classes/handler/public.php:615
+msgid "Subscribe to selected feed"
+msgstr "Abonner på valgte feed"
+
+#: classes/handler/public.php:642
+msgid "Edit subscription options"
+msgstr "Rediger abonnementsindstillinger"
+
+#: classes/handler/public.php:680
+msgid "Password recovery"
+msgstr "Genoprettelse af adgangskode"
+
+#: classes/handler/public.php:725
+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:757
+msgid "Some of the required form parameters are missing or incorrect."
+msgstr ""
+
+#: classes/handler/public.php:761
+#: classes/handler/public.php:830
+msgid "Go back"
 msgstr "Gå tilbage"
 
-#: classes/feeds.php:127
-#: classes/feeds.php:132
-#: plugins/mail/init.php:76
-#: plugins/mailto/init.php:25
-msgid "Forward by email"
-msgstr "Videresend via e-mail"
+#: classes/handler/public.php:799
+#, fuzzy
+msgid "[tt-rss] Password reset request"
+msgstr "[tt-rss] meddelelse om adgangskodeændring"
 
-#: classes/feeds.php:136
-msgid "Feed:"
-msgstr "Feed:"
-
-#: classes/feeds.php:193
-#: classes/feeds.php:819
-msgid "Feed not found."
-msgstr "Feed ikke fundet."
-
-#: classes/feeds.php:255
-msgid "Never"
-msgstr "Aldrig"
-
-#: classes/feeds.php:342
-#, php-format
-msgid "Imported at %s"
-msgstr "Importeret på %s"
-
-#: classes/feeds.php:394
-#: classes/feeds.php:487
-msgid "mark feed as read"
-msgstr "marker feed som læst"
-
-#: classes/feeds.php:542
-msgid "Collapse article"
-msgstr "Skjul artikel"
-
-#: classes/feeds.php:703
-msgid "No unread articles found to display."
+#: classes/handler/public.php:826
+msgid "Sorry, login and email combination not found."
 msgstr ""
 
-#: classes/feeds.php:706
-msgid "No updated articles found to display."
+#: classes/handler/public.php:848
+msgid "Your access level is insufficient to run this script."
 msgstr ""
 
-#: classes/feeds.php:709
-msgid "No starred articles found to display."
+#: classes/handler/public.php:874
+msgid "Database Updater"
+msgstr "Opdatering af database"
+
+#: classes/handler/public.php:939
+msgid "Perform updates"
+msgstr "Udfør opdateringer"
+
+#: plugins/af_zz_imgproxy/init.php:208
+msgid "Image proxy settings (af_zz_imgproxy)"
 msgstr ""
 
-#: classes/feeds.php:713
-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 ""
+#: plugins/af_zz_imgproxy/init.php:232
+#, fuzzy
+msgid "Enable proxy for all remote images."
+msgstr "Aktiver feed-kategorier"
 
-#: classes/feeds.php:715
-msgid "No articles found to display."
-msgstr ""
+#: plugins/af_zz_imgproxy/init.php:236
+#, fuzzy
+msgid "Don't cache files locally."
+msgstr "Cache billeder lokalt"
 
-#: classes/feeds.php:731
-#: classes/feeds.php:922
-#, fuzzy, php-format
-msgid "Feeds last updated at %s"
-msgstr "Sidste opdatering: %s"
-
-#: classes/feeds.php:743
-#: classes/feeds.php:934
-msgid "Some feeds have update errors (click for details)"
-msgstr ""
-
-#: classes/feeds.php:911
-msgid "No feed selected."
-msgstr "Der er ikke valgt noget feed."
-
-#: classes/feeds.php:975
-#: classes/feeds.php:983
-msgid "Feed or site URL"
-msgstr "Webadresse til feed eller webside"
-
-#: classes/feeds.php:997
-msgid "Available feeds"
-msgstr "Tilgængelige feeds"
-
-#: classes/feeds.php:1034
-msgid "More feeds"
-msgstr "Flere feeds"
-
-#: classes/feeds.php:1063
-msgid "Popular feeds"
-msgstr "Populære feeds"
-
-#: classes/feeds.php:1064
-msgid "Feed archive"
-msgstr "Feed-arkiv"
-
-#: classes/feeds.php:1067
-msgid "limit:"
-msgstr "grænse:"
-
-#: classes/feeds.php:1101
-msgid "Look for"
-msgstr "Led efter"
-
-#: classes/feeds.php:1109
-#, php-format
-msgid "in %s"
-msgstr ""
-
-#: classes/feeds.php:1114
-msgid "Used for word stemming"
-msgstr ""
-
-#: classes/feeds.php:1123
-msgid "Search syntax"
-msgstr "Søgesyntaks"
-
-#: classes/feeds.php:1577
-msgid "Starred articles"
-msgstr "Markerede artikler"
-
-#: classes/feeds.php:1579
-msgid "Published articles"
-msgstr "Udgivne artikler"
-
-#: classes/feeds.php:1581
-msgid "Fresh articles"
-msgstr "Nye artikler"
-
-#: classes/feeds.php:1585
-msgid "Archived articles"
-msgstr "Arkiverede artikler"
-
-#: classes/feeds.php:1587
-msgid "Recently read"
-msgstr "Senest læst"
-
-#: classes/feeds.php:1708
-msgid "Special"
-msgstr "Speciel"
-
-#: classes/feeds.php:1965
-#, php-format
-msgid "Search results: %s"
-msgstr "Søgeresultater: %s"
-
-#: 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-plugin"
-
-#: plugins/nsfw/init.php:79
-msgid "Tags to consider NSFW (comma-separated)"
-msgstr ""
-
-#: plugins/nsfw/init.php:100
-msgid "Configuration saved."
+#: plugins/af_zz_imgproxy/init.php:252
+#: plugins/af_redditimgur/init.php:79
+#, fuzzy
+msgid "Configuration saved"
 msgstr "Konfiguration gemt."
 
-#: plugins/note/init.php:28
-#: plugins/note/note.js:11
-msgid "Edit article note"
-msgstr "Rediger artikelnote"
-
 #: plugins/vf_shared/init.php:17
 #: plugins/vf_shared/init.php:73
 msgid "Shared articles"
 msgstr "Delte artikler"
 
-#: plugins/auth_internal/init.php:67
-#, fuzzy
-msgid "Please enter your one time password:"
-msgstr "Forkert engangsadgangskode"
+#: plugins/bookmarklets/init.php:20
+msgid "Bookmarklets"
+msgstr "Bogmærker"
 
-#: plugins/auth_internal/init.php:208
-msgid "Password has been changed."
-msgstr "Adgangskoden er blevet ændret."
-
-#: plugins/auth_internal/init.php:210
-msgid "Old password is incorrect."
-msgstr "Gammel adgangskode er forkert."
-
-#: plugins/af_readability/init.php:25
-msgid "Data saved."
+#: 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_readability/init.php:41
+#: 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 "Inline content"
-msgstr "Rediger artikelnote"
+msgid "Subscribe in Tiny Tiny RSS"
+msgstr "Opdater Tiny Tiny RSS"
 
-#: plugins/af_readability/init.php:47
-msgid "Readability settings (af_readability)"
+#: plugins/bookmarklets/init.php:34
+msgid "Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS"
 msgstr ""
 
-#: plugins/af_readability/init.php:78
-msgid "Use Readability for pages shared via bookmarklet."
-msgstr ""
-
-#: plugins/af_readability/init.php:90
-#: plugins/af_psql_trgm/init.php:198
-msgid "Currently enabled for (click to edit):"
-msgstr ""
-
-#: plugins/af_readability/init.php:107
-#, fuzzy
-msgid "Readability"
-msgstr "Tjek tilgængelighed"
-
-#: plugins/af_readability/init.php:118
-#, fuzzy
-msgid "Inline article content"
-msgstr "Rediger artikelnote"
-
 #: plugins/af_redditimgur/init.php:30
 msgid "Reddit content settings (af_redditimgur)"
 msgstr ""
@@ -2516,11 +2483,21 @@ msgstr ""
 msgid "Enable additional duplicate checking"
 msgstr ""
 
-#: plugins/af_redditimgur/init.php:79
-#: plugins/af_zz_imgproxy/init.php:252
-#, fuzzy
-msgid "Configuration saved"
-msgstr "Konfiguration gemt."
+#: plugins/af_comics/init.php:49
+msgid "Feeds supported by af_comics"
+msgstr ""
+
+#: plugins/af_comics/init.php:51
+msgid "The following comics are currently supported:"
+msgstr ""
+
+#: plugins/af_comics/init.php:69
+msgid "To subscribe to GoComics use the comic's regular web page as the feed URL (e.g. for the <em>Garfield</em> comic use <code>http://www.gocomics.com/garfield</code>)."
+msgstr ""
+
+#: plugins/af_comics/init.php:71
+msgid "Drop any updated filters into <code>filters.local</code> in plugin directory."
+msgstr ""
 
 #: plugins/af_psql_trgm/init.php:29
 #, php-format
@@ -2560,26 +2537,88 @@ msgstr ""
 msgid "Enable for all feeds:"
 msgstr "Aktiver feed-kategorier"
 
+#: plugins/af_psql_trgm/init.php:198
+#: plugins/af_readability/init.php:90
+msgid "Currently enabled for (click to edit):"
+msgstr ""
+
 #: plugins/af_psql_trgm/init.php:216
 msgid "Similarity (pg_trgm)"
 msgstr ""
 
-#: plugins/af_comics/init.php:49
-msgid "Feeds supported by af_comics"
+#: plugins/af_readability/init.php:25
+msgid "Data saved."
 msgstr ""
 
-#: plugins/af_comics/init.php:51
-msgid "The following comics are currently supported:"
+#: plugins/af_readability/init.php:41
+#, fuzzy
+msgid "Inline content"
+msgstr "Rediger artikelnote"
+
+#: plugins/af_readability/init.php:47
+msgid "Readability settings (af_readability)"
 msgstr ""
 
-#: plugins/af_comics/init.php:69
-msgid "To subscribe to GoComics use the comic's regular web page as the feed URL (e.g. for the <em>Garfield</em> comic use <code>http://www.gocomics.com/garfield</code>)."
+#: plugins/af_readability/init.php:78
+msgid "Use Readability for pages shared via bookmarklet."
 msgstr ""
 
-#: plugins/af_comics/init.php:71
-msgid "Drop any updated filters into <code>filters.local</code> in plugin directory."
+#: plugins/af_readability/init.php:107
+#, fuzzy
+msgid "Readability"
+msgstr "Tjek tilgængelighed"
+
+#: plugins/af_readability/init.php:118
+#, fuzzy
+msgid "Inline article content"
+msgstr "Rediger artikelnote"
+
+#: plugins/mailto/init.php:50
+#: plugins/mailto/init.php:58
+#: plugins/mail/init.php:118
+#: plugins/mail/init.php:124
+msgid "[Forwarded]"
+msgstr "[Fremsendt]"
+
+#: plugins/mailto/init.php:50
+#: plugins/mail/init.php:118
+msgid "Multiple articles"
+msgstr "Flere artikler"
+
+#: plugins/mailto/init.php:74
+msgid "Clicking the following link to invoke your mail client:"
 msgstr ""
 
+#: plugins/mailto/init.php:78
+#, fuzzy
+msgid "Forward selected article(s) by email."
+msgstr "Videresend artikel via e-mail"
+
+#: plugins/mailto/init.php:81
+msgid "You should be able to edit the message before sending in your mail client."
+msgstr ""
+
+#: plugins/mailto/init.php:86
+msgid "Close this dialog"
+msgstr "Luk denne dialog"
+
+#: 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-plugin"
+
+#: plugins/nsfw/init.php:79
+msgid "Tags to consider NSFW (comma-separated)"
+msgstr ""
+
+#: plugins/nsfw/init.php:100
+msgid "Configuration saved."
+msgstr "Konfiguration gemt."
+
 #: plugins/import_export/init.php:53
 msgid "Import and export"
 msgstr "Import og eksport"
@@ -2646,104 +2685,6 @@ msgstr ""
 msgid "No file uploaded."
 msgstr "Der er ikke indlæst nogen fil."
 
-#: plugins/mail/init.php:29
-msgid "Mail addresses saved."
-msgstr ""
-
-#: plugins/mail/init.php:35
-#, fuzzy
-msgid "Mail plugin"
-msgstr "Brugerplugins"
-
-#: plugins/mail/init.php:37
-msgid "You can set predefined email addressed here (comma-separated list):"
-msgstr ""
-
-#: plugins/mail/init.php:118
-#: plugins/mail/init.php:124
-#: plugins/mailto/init.php:50
-#: plugins/mailto/init.php:58
-msgid "[Forwarded]"
-msgstr "[Fremsendt]"
-
-#: plugins/mail/init.php:118
-#: plugins/mailto/init.php:50
-msgid "Multiple articles"
-msgstr "Flere artikler"
-
-#: plugins/mail/init.php:146
-msgid "To:"
-msgstr "Til:"
-
-#: plugins/mail/init.php:161
-msgid "Subject:"
-msgstr "Emne:"
-
-#: plugins/mail/init.php:178
-msgid "Send e-mail"
-msgstr "Send e-mail"
-
-#: plugins/close_button/init.php:25
-msgid "Close article"
-msgstr "Luk artikel"
-
-#: plugins/bookmarklets/init.php:20
-msgid "Bookmarklets"
-msgstr "Bogmærker"
-
-#: 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
-#, fuzzy, php-format
-msgid "Subscribe to %s in Tiny Tiny RSS?"
-msgstr "Abonneret på %s"
-
-#: plugins/bookmarklets/init.php:31
-#, fuzzy
-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/toggle_sidebar/init.php:23
-msgid "Collapse feedlist"
-msgstr "Skjul feed-liste"
-
-#: plugins/af_zz_imgproxy/init.php:208
-msgid "Image proxy settings (af_zz_imgproxy)"
-msgstr ""
-
-#: plugins/af_zz_imgproxy/init.php:232
-#, fuzzy
-msgid "Enable proxy for all remote images."
-msgstr "Aktiver feed-kategorier"
-
-#: plugins/af_zz_imgproxy/init.php:236
-#, fuzzy
-msgid "Don't cache files locally."
-msgstr "Cache billeder lokalt"
-
-#: plugins/mailto/init.php:74
-msgid "Clicking the following link to invoke your mail client:"
-msgstr ""
-
-#: plugins/mailto/init.php:78
-#, fuzzy
-msgid "Forward selected article(s) by email."
-msgstr "Videresend artikel via e-mail"
-
-#: plugins/mailto/init.php:81
-msgid "You should be able to edit the message before sending in your mail client."
-msgstr ""
-
-#: plugins/mailto/init.php:86
-msgid "Close this dialog"
-msgstr "Luk denne dialog"
-
 #: plugins/share/init.php:41
 msgid "You can disable all articles shared by unique URLs here."
 msgstr ""
@@ -2764,461 +2705,613 @@ msgstr ""
 msgid "Unshare article"
 msgstr "Annuller deling af artikel"
 
-#: js/FeedTree.js:75
+#: plugins/toggle_sidebar/init.php:23
+msgid "Collapse feedlist"
+msgstr "Skjul feed-liste"
+
+#: plugins/close_button/init.php:25
+msgid "Close article"
+msgstr "Luk artikel"
+
+#: plugins/mail/init.php:29
+msgid "Mail addresses saved."
+msgstr ""
+
+#: plugins/mail/init.php:35
+#, fuzzy
+msgid "Mail plugin"
+msgstr "Brugerplugins"
+
+#: plugins/mail/init.php:37
+msgid "You can set predefined email addressed here (comma-separated list):"
+msgstr ""
+
+#: plugins/mail/init.php:146
+msgid "To:"
+msgstr "Til:"
+
+#: plugins/mail/init.php:161
+msgid "Subject:"
+msgstr "Emne:"
+
+#: plugins/mail/init.php:178
+msgid "Send e-mail"
+msgstr "Send e-mail"
+
+#: plugins/note/init.php:28
+#: plugins/note/note.js:11
+msgid "Edit article note"
+msgstr "Rediger artikelnote"
+
+#: plugins/auth_internal/init.php:67
+#, fuzzy
+msgid "Please enter your one time password:"
+msgstr "Forkert engangsadgangskode"
+
+#: plugins/auth_internal/init.php:208
+msgid "Password has been changed."
+msgstr "Adgangskoden er blevet ændret."
+
+#: plugins/auth_internal/init.php:210
+msgid "Old password is incorrect."
+msgstr "Gammel adgangskode er forkert."
+
+#: js/FeedTree.js:76
 #, fuzzy
 msgid "(Un)collapse"
 msgstr "Vis/skjul sidebjælke"
 
-#: js/PrefFeedTree.js:35
+#: js/PrefFeedTree.js:36
 msgid "Edit category"
 msgstr "Rediger kategori"
 
-#: js/PrefFeedTree.js:42
+#: js/PrefFeedTree.js:43
 msgid "Remove category"
 msgstr "Fjern kategori"
 
-#: js/PrefFilterTree.js:46
+#: js/PrefFilterTree.js:47
 msgid "Inverse"
 msgstr "Inverter"
 
-#: js/feedlist.js:511
+#: js/feedlist.js:461
 #, fuzzy
 msgid "Mark %w in %s older than 1 day as read?"
 msgstr "Ændr resultater af artikler i %s?"
 
-#: js/feedlist.js:514
+#: js/feedlist.js:464
 #, fuzzy
 msgid "Mark %w in %s older than 1 week as read?"
 msgstr "Ændr resultater af artikler i %s?"
 
-#: js/feedlist.js:517
+#: js/feedlist.js:467
 #, fuzzy
 msgid "Mark %w in %s older than 2 weeks as read?"
 msgstr "Ændr resultater af artikler i %s?"
 
-#: js/feedlist.js:520
+#: js/feedlist.js:470
 #, fuzzy
 msgid "Mark %w in %s as read?"
 msgstr "Ændr resultater af artikler i %s?"
 
-#: js/feedlist.js:523
+#: js/feedlist.js:473
 #, fuzzy
 msgid "search results"
 msgstr "Søgeresultater: %s"
 
-#: js/feedlist.js:523
+#: js/feedlist.js:473
 #, fuzzy
 msgid "all articles"
 msgstr "Alle artikler"
 
-#: js/functions.js:74
+#: js/functions.js:100
 msgid "Close"
 msgstr ""
 
-#: js/functions.js:141
+#: js/functions.js:167
 msgid "Click to close"
 msgstr "Klik for at lukke"
 
-#: js/functions.js:448
+#: js/functions.js:456
 msgid "Error explained"
 msgstr "Fejl forklaret"
 
-#: js/functions.js:592
+#: js/functions.js:490
+msgid "Upload complete."
+msgstr "Indlæsning færdig."
+
+#: js/functions.js:508
+msgid "Remove stored feed icon?"
+msgstr "Fjern gemt feed-ikon?"
+
+#: js/functions.js:510
+msgid "Removing feed icon..."
+msgstr "Fjerner feed-ikon ..."
+
+#: js/functions.js:515
+msgid "Feed icon removed."
+msgstr "Feed-ikon fjernet."
+
+#: js/functions.js:532
+#, fuzzy
+msgid "Please select an image file to upload."
+msgstr "Fjern valgte filtre?"
+
+#: js/functions.js:533
+msgid "Upload new icon for this feed?"
+msgstr ""
+
+#: js/functions.js:534
+msgid "Uploading, please wait..."
+msgstr "Indlæser, vent venligst ..."
+
+#: js/functions.js:542
+msgid "Please enter label caption:"
+msgstr "Indtast mærketekst:"
+
+#: js/functions.js:575
 msgid "Subscribe to Feed"
 msgstr "Abonner på feedet"
 
-#: js/functions.js:621
+#: js/functions.js:602
 msgid "Failed to parse output. This can indicate server timeout and/or network issues. Backend output was logged to browser console."
 msgstr ""
 
-#: js/functions.js:636
+#: js/functions.js:617
 #, perl-format
 msgid "Subscribed to %s"
 msgstr "Abonneret på %s"
 
-#: js/functions.js:641
+#: js/functions.js:622
 msgid "Specified URL seems to be invalid."
 msgstr ""
 
-#: js/functions.js:644
+#: js/functions.js:625
 msgid "Specified URL doesn't seem to contain any feeds."
 msgstr ""
 
-#: js/functions.js:656
+#: js/functions.js:637
 msgid "Expand to select feed"
 msgstr "Udvid til valgt feed"
 
-#: js/functions.js:668
+#: js/functions.js:649
 #, perl-format
 msgid "Couldn't download the specified URL: %s"
 msgstr ""
 
-#: js/functions.js:672
+#: js/functions.js:653
 #, perl-format
 msgid "XML validation failed: %s"
 msgstr "XML-validering mislykkedes: %s"
 
-#: js/functions.js:676
+#: js/functions.js:657
 #, fuzzy
 msgid "You are already subscribed to this feed."
 msgstr "Abonneret på %s"
 
-#: js/functions.js:1136
+#: js/functions.js:1098
 msgid "Generate new syndication address for this feed?"
 msgstr ""
 
-#: js/functions.js:1140
-#: js/prefs.js:1095
+#: js/functions.js:1100
+#: js/prefs.js:870
 msgid "Trying to change address..."
 msgstr "Prøver at ændre adresse ..."
 
-#: js/functions.js:1245
-#: js/tt-rss.js:446
-#: js/tt-rss.js:673
+#: js/functions.js:1199
+#: js/tt-rss.js:399
+#: js/tt-rss.js:612
 msgid "You can't edit this kind of feed."
 msgstr ""
 
-#: js/functions.js:1260
+#: js/functions.js:1213
 msgid "Edit Feed"
 msgstr "Rediger feed"
 
-#: js/functions.js:1266
-#: js/prefs.js:100
-#: js/prefs.js:209
-#: js/prefs.js:647
+#: js/functions.js:1217
+#: js/prefs.js:176
+#: js/prefs.js:523
+#: js/prefs.js:1139
+#: js/prefs.js:78
 msgid "Saving data..."
 msgstr "Gemmer data ..."
 
-#: js/functions.js:1293
+#: js/functions.js:1243
 msgid "More Feeds"
 msgstr "Flere feeds"
 
-#: js/functions.js:1355
-#: js/functions.js:1464
-#: js/prefs.js:398
-#: js/prefs.js:540
-#: js/prefs.js:558
-#: js/prefs.js:1077
+#: js/functions.js:1297
+#: js/functions.js:1383
+#: js/prefs.js:332
+#: js/prefs.js:455
+#: js/prefs.js:473
+#: js/prefs.js:855
 msgid "No feeds are selected."
 msgstr "Der er ikke valgt nogen feeds."
 
-#: js/functions.js:1398
+#: js/functions.js:1329
 msgid "Remove selected feeds from the archive? Feeds with stored articles will not be removed."
 msgstr ""
 
-#: js/functions.js:1435
+#: js/functions.js:1360
 msgid "Feeds with update errors"
 msgstr "Feeds med opdateringsfejl"
 
-#: js/functions.js:1446
-#: js/prefs.js:1058
+#: js/functions.js:1369
+#: js/prefs.js:841
 msgid "Remove selected feeds?"
 msgstr "Fjern valgte feeds?"
 
-#: js/functions.js:1449
-#: js/prefs.js:1061
+#: js/functions.js:1370
+#: js/prefs.js:842
 msgid "Removing selected feeds..."
 msgstr "Fjerner valgte feeds ..."
 
-#: js/prefs.js:60
-msgid "Please enter login:"
-msgstr "Indtast brugernavn:"
-
-#: js/prefs.js:67
-msgid "Can't create user: no login specified."
-msgstr ""
-
-#: js/prefs.js:71
-msgid "Adding user..."
-msgstr "Tilføjer bruger ..."
-
-#: js/prefs.js:96
-msgid "User Editor"
-msgstr "Redigeringsprogram til bruger"
-
-#: js/prefs.js:131
-msgid "Edit Filter"
-msgstr "Rediger filter"
-
-#: js/prefs.js:170
+#: js/prefs.js:143
 msgid "Remove filter?"
 msgstr "Fjern filter?"
 
-#: js/prefs.js:175
+#: js/prefs.js:148
 msgid "Removing filter..."
 msgstr "Fjerner filter ..."
 
-#: js/prefs.js:292
+#: js/prefs.js:251
 msgid "Remove selected labels?"
 msgstr "Fjerne valgte etiketter?"
 
-#: js/prefs.js:295
+#: js/prefs.js:252
 msgid "Removing selected labels..."
 msgstr "Fjerner valgte etiketter ..."
 
-#: js/prefs.js:308
-#: js/prefs.js:1144
+#: js/prefs.js:262
+#: js/prefs.js:909
 msgid "No labels are selected."
 msgstr "Der er ikke valgt nogen etiketter."
 
-#: js/prefs.js:320
+#: js/prefs.js:274
 msgid "Remove selected users? Neither default admin nor your account will be removed."
 msgstr ""
 
-#: js/prefs.js:323
+#: js/prefs.js:275
 msgid "Removing selected users..."
 msgstr "Fjerner valgte brugere ..."
 
-#: js/prefs.js:338
-#: js/prefs.js:408
-#: js/prefs.js:427
-#: js/prefs.js:461
+#: js/prefs.js:286
+#: js/prefs.js:342
+#: js/prefs.js:361
+#: js/prefs.js:387
 msgid "No users are selected."
 msgstr "Der er ikke valgt nogen brugere."
 
-#: js/prefs.js:350
+#: js/prefs.js:297
 msgid "Remove selected filters?"
 msgstr "Fjern valgte filtre?"
 
-#: js/prefs.js:353
+#: js/prefs.js:298
 msgid "Removing selected filters..."
 msgstr "Fjerner valgte filtre ..."
 
-#: js/prefs.js:366
-#: js/prefs.js:495
-#: js/prefs.js:514
+#: js/prefs.js:308
+#: js/prefs.js:419
+#: js/prefs.js:438
 msgid "No filters are selected."
 msgstr "Der er ikke valgt nogen filtre."
 
-#: js/prefs.js:378
+#: js/prefs.js:319
 msgid "Unsubscribe from selected feeds?"
 msgstr "Aflyse abonnement for valgte feeds?"
 
-#: js/prefs.js:382
+#: js/prefs.js:321
 msgid "Unsubscribing from selected feeds..."
 msgstr "Aflyser abonnement for valgte feeds ..."
 
-#: js/prefs.js:413
-#: js/prefs.js:432
-#: js/prefs.js:466
+#: js/prefs.js:347
+#: js/prefs.js:366
+#: js/prefs.js:392
 msgid "Please select only one user."
 msgstr ""
 
-#: js/prefs.js:436
+#: js/prefs.js:370
 #, fuzzy
 msgid "Reset password of selected user?"
 msgstr "Nulstil adgangskode"
 
-#: js/prefs.js:439
+#: js/prefs.js:371
 #, fuzzy
 msgid "Resetting password for selected user..."
 msgstr "Fjerner valgte brugere ..."
 
-#: js/prefs.js:500
+#: js/prefs.js:424
 #, fuzzy
 msgid "Please select only one filter."
 msgstr "Fjern valgte filtre?"
 
-#: js/prefs.js:518
+#: js/prefs.js:442
 msgid "Combine selected filters?"
 msgstr "Kombiner valgte filtre?"
 
-#: js/prefs.js:521
+#: js/prefs.js:443
 msgid "Joining filters..."
 msgstr "Sammensætter filtre ..."
 
-#: js/prefs.js:580
+#: js/prefs.js:487
 msgid "Edit Multiple Feeds"
 msgstr "Rediger flere feeds"
 
-#: js/prefs.js:604
+#: js/prefs.js:511
 #, fuzzy
 msgid "Save changes to selected feeds?"
 msgstr "Abonner på valgte feed"
 
-#: js/prefs.js:681
+#: js/prefs.js:552
 msgid "OPML Import"
 msgstr "OPML-import"
 
-#: js/prefs.js:700
+#: js/prefs.js:571
 msgid "Please choose an OPML file first."
 msgstr ""
 
-#: js/prefs.js:703
+#: js/prefs.js:574
 #: plugins/import_export/import_export.js:115
 msgid "Importing, please wait..."
 msgstr "Importerer, vent venligst ..."
 
-#: js/prefs.js:869
+#: js/prefs.js:737
 msgid "Reset to defaults?"
 msgstr "Nulstil til standardindstillinger?"
 
-#: js/prefs.js:1468
-msgid "Subscribing to feeds..."
-msgstr "Abonnerer på feeds ..."
-
-#: js/prefs.js:1487
-msgid "Clear stored data for this plugin?"
+#: js/prefs.js:777
+#, perl-format
+msgid "Remove category %s? Any nested feeds would be placed into Uncategorized."
 msgstr ""
 
-#: js/prefs.js:1501
-msgid "Clear all messages in the error log?"
+#: js/prefs.js:778
+msgid "Removing category..."
+msgstr "Fjerner kategori ..."
+
+#: js/prefs.js:794
+msgid "Remove selected categories?"
+msgstr "Fjern valgte kategorier?"
+
+#: js/prefs.js:795
+msgid "Removing selected categories..."
+msgstr "Fjerner valgte kategorier ..."
+
+#: js/prefs.js:805
+msgid "No categories are selected."
+msgstr "Der er ikke valgt nogen kategorier."
+
+#: js/prefs.js:812
+msgid "Category title:"
+msgstr "Kategorititel:"
+
+#: js/prefs.js:815
+msgid "Creating category..."
+msgstr "Opretter kategori ..."
+
+#: js/prefs.js:832
+msgid "Feeds without recent updates"
+msgstr "Feeds uden nylige opdateringer"
+
+#: js/prefs.js:869
+msgid "Replace current OPML publishing address with a new one?"
 msgstr ""
 
-#: js/tt-rss.js:118
+#: js/prefs.js:898
+#, fuzzy
+msgid "Reset selected labels to default colors?"
+msgstr "Fjerne valgte etiketter?"
+
+#: js/prefs.js:926
+msgid "Settings Profiles"
+msgstr "Profilindstillinger"
+
+#: js/prefs.js:935
+msgid "Remove selected profiles? Active and default profiles will not be removed."
+msgstr ""
+
+#: js/prefs.js:936
+msgid "Removing selected profiles..."
+msgstr "Fjerner valgte profiler ..."
+
+#: js/prefs.js:948
+msgid "No profiles are selected."
+msgstr "Der er ikke valgt nogen profiler."
+
+#: js/prefs.js:955
+#: js/prefs.js:997
+msgid "Activate selected profile?"
+msgstr "Aktiver valgte profil?"
+
+#: js/prefs.js:964
+#: js/prefs.js:1008
+msgid "Please choose a profile to activate."
+msgstr ""
+
+#: js/prefs.js:969
+msgid "Creating profile..."
+msgstr "Opretter profil ..."
+
+#: js/prefs.js:1016
+msgid "This will invalidate all previously generated feed URLs. Continue?"
+msgstr ""
+
+#: js/prefs.js:1017
+#: plugins/share/share_prefs.js:3
+msgid "Clearing URLs..."
+msgstr "Rydder webadresser ..."
+
+#: js/prefs.js:1020
+msgid "Generated URLs cleared."
+msgstr "Genererede webadresser er ryddet."
+
+#: js/prefs.js:1053
+#, fuzzy
+msgid "Rename category to:"
+msgstr "Fjern kategori"
+
+#: js/prefs.js:1074
+msgid "Label Editor"
+msgstr "Labeleditor"
+
+#: js/tt-rss.js:111
 #, fuzzy
 msgid "Mark all articles as read?"
 msgstr "Marker ovenstående som læst"
 
-#: js/tt-rss.js:124
+#: js/tt-rss.js:115
 #, fuzzy
 msgid "Marking all feeds as read..."
 msgstr "Marker feed som læst"
 
-#: js/tt-rss.js:398
+#: js/tt-rss.js:351
 msgid "Please enable mail plugin first."
 msgstr ""
 
-#: js/tt-rss.js:527
+#: js/tt-rss.js:477
 msgid "Please enable embed_original plugin first."
 msgstr ""
 
-#: js/tt-rss.js:540
-#: js/tt-rss.js:723
+#: js/tt-rss.js:490
+#: js/tt-rss.js:653
 msgid "Widescreen is not available in combined mode."
 msgstr ""
 
-#: js/tt-rss.js:821
-msgid "You can't rescore this kind of feed."
-msgstr ""
-
-#: js/tt-rss.js:826
-#: js/tt-rss.js:686
-#, fuzzy
-msgid "Please select some feed first."
-msgstr "Rydder valgte feed ..."
-
-#: js/tt-rss.js:831
-#, perl-format
-msgid "Rescore articles in %s?"
-msgstr "Ændr resultater af artikler i %s?"
-
-#: js/tt-rss.js:834
-msgid "Rescoring articles..."
-msgstr "Ændrer artikelresultater ..."
-
-#: js/viewfeed.js:917
-#: js/viewfeed.js:955
-#: js/viewfeed.js:1003
-#: js/viewfeed.js:1924
-#: plugins/mail/mail.js:7
+#: js/viewfeed.js:444
+#: js/viewfeed.js:461
+#: js/viewfeed.js:484
+#: js/viewfeed.js:521
+#: js/viewfeed.js:542
+#: js/viewfeed.js:651
+#: js/viewfeed.js:685
+#: js/viewfeed.js:727
+#: js/viewfeed.js:1564
 #: plugins/mailto/init.js:7
-#: js/viewfeed.js:675
-#: js/viewfeed.js:697
-#: js/viewfeed.js:718
-#: js/viewfeed.js:777
-#: js/viewfeed.js:805
+#: plugins/mail/mail.js:7
 msgid "No articles are selected."
 msgstr "Der er ikke valgt nogen artikler."
 
-#: js/viewfeed.js:925
+#: js/viewfeed.js:659
 #, 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:927
+#: js/viewfeed.js:661
 #, 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:964
+#: js/viewfeed.js:694
 #, 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:967
+#: js/viewfeed.js:697
 #, 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:969
+#: js/viewfeed.js:698
 msgid "Please note that unstarred articles might get purged on next feed update."
 msgstr ""
 
-#: js/viewfeed.js:1009
+#: js/viewfeed.js:733
 #, 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:1029
+#: js/viewfeed.js:753
 msgid "Edit article Tags"
 msgstr "Rediger artikeltags"
 
-#: js/viewfeed.js:1035
+#: js/viewfeed.js:757
 msgid "Saving article tags..."
 msgstr "Gemmer artikeltags ..."
 
-#: js/viewfeed.js:1666
+#: js/viewfeed.js:1015
+msgid "No article is selected."
+msgstr "Der er ikke valgt nogen artikel."
+
+#: js/viewfeed.js:1050
+msgid "No articles found to mark"
+msgstr ""
+
+#: js/viewfeed.js:1052
+#, fuzzy, perl-format
+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"
+
+#: js/viewfeed.js:1312
 msgid "Open original article"
 msgstr "Åbn oprindelige artikel"
 
-#: js/viewfeed.js:1673
+#: js/viewfeed.js:1319
 msgid "Display article URL"
 msgstr "Vis artiklens webadresse"
 
-#: js/viewfeed.js:1780
+#: js/viewfeed.js:1426
 msgid "Assign label"
 msgstr "Tildel etiket"
 
-#: js/viewfeed.js:1785
+#: js/viewfeed.js:1431
 msgid "Remove label"
 msgstr "Fjern etiket"
 
-#: js/viewfeed.js:1817
+#: js/viewfeed.js:1463
 msgid "Select articles in group"
 msgstr "Vælg artikler i gruppen"
 
-#: js/viewfeed.js:1827
+#: js/viewfeed.js:1473
 msgid "Mark group as read"
 msgstr "Marker gruppe som læst"
 
-#: js/viewfeed.js:1839
+#: js/viewfeed.js:1485
 msgid "Mark feed as read"
 msgstr "Marker feed som læst"
 
-#: js/viewfeed.js:1892
+#: js/viewfeed.js:1538
 #, fuzzy
 msgid "Please enter new score for selected articles:"
 msgstr "Indtast kategorititel:"
 
-#: js/viewfeed.js:1955
+#: js/viewfeed.js:1571
 #, fuzzy
 msgid "Please enter new score for this article:"
 msgstr "Indtast kategorititel:"
 
-#: js/viewfeed.js:1986
+#: js/viewfeed.js:1591
 msgid "Article URL:"
 msgstr "Artiklens webadresse:"
 
-#: plugins/note/note.js:17
-msgid "Saving article note..."
-msgstr "Gemmer artikelnote ..."
+#: plugins/embed_original/init.js:6
+msgid "Sorry, your browser does not support sandboxed iframes."
+msgstr ""
 
 #: plugins/af_psql_trgm/init.js:11
 #, fuzzy
 msgid "Related articles"
 msgstr "Delte artikler"
 
+#: plugins/mailto/init.js:21
+#: plugins/mail/mail.js:21
+msgid "Forward article by email"
+msgstr "Videresend artikel via e-mail"
+
+#: plugins/shorten_expanded/init.js:43
+msgid "Click to expand article"
+msgstr "Klik for at udvide artikel"
+
 #: plugins/import_export/import_export.js:13
 msgid "Export Data"
 msgstr "Eksporter data"
@@ -3238,264 +3331,170 @@ msgstr "Dataimport"
 msgid "Please choose the file first."
 msgstr ""
 
-#: plugins/mail/mail.js:21
-#: plugins/mailto/init.js:21
-msgid "Forward article by email"
-msgstr "Videresend artikel via e-mail"
-
-#: plugins/mail/mail.js:36
-msgid "Error sending email:"
+#: plugins/share/share_prefs.js:2
+msgid "This will invalidate all previously shared article URLs. Continue?"
 msgstr ""
 
-#: plugins/mail/mail.js:38
-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:45
-msgid "Click to expand article"
-msgstr "Klik for at udvide artikel"
+#: plugins/share/share_prefs.js:8
+msgid "Shared URLs cleared."
+msgstr "Delte webadresser er ryddet."
 
 #: plugins/share/share.js:10
 msgid "Share article by URL"
 msgstr "Del artikel ved brug af webadresse"
 
-#: plugins/share/share.js:14
+#: plugins/share/share.js:13
 msgid "Generate new share URL for this article?"
 msgstr ""
 
-#: plugins/share/share.js:18
+#: plugins/share/share.js:15
 msgid "Trying to change URL..."
 msgstr "Prøver at ændre webadresse ..."
 
-#: plugins/share/share.js:55
+#: plugins/share/share.js:48
 msgid "Remove sharing for this article?"
 msgstr ""
 
-#: plugins/share/share.js:59
+#: plugins/share/share.js:50
 msgid "Trying to unshare..."
 msgstr "Prøver at annullere deling ..."
 
-#: plugins/share/share_prefs.js:3
-msgid "This will invalidate all previously shared article URLs. Continue?"
+#: plugins/mail/mail.js:30
+msgid "Error sending email:"
 msgstr ""
 
-#: plugins/share/share_prefs.js:6
-#: js/prefs.js:1277
-msgid "Clearing URLs..."
-msgstr "Rydder webadresser ..."
+#: plugins/mail/mail.js:32
+msgid "Your message has been sent."
+msgstr ""
 
-#: plugins/share/share_prefs.js:13
-msgid "Shared URLs cleared."
-msgstr "Delte webadresser er ryddet."
+#: plugins/note/note.js:15
+msgid "Saving article note..."
+msgstr "Gemmer artikelnote ..."
 
-#: js/feedlist.js:204
+#: js/feedlist.js:168
 msgid "Your password is at default value"
 msgstr ""
 
-#: js/feedlist.js:453
+#: js/feedlist.js:413
 #, fuzzy
 msgid "Mark all articles in %s as read?"
 msgstr "Ændr resultater af artikler i %s?"
 
-#: js/functions.js:494
-msgid "Upload complete."
-msgstr "Indlæsning færdig."
-
-#: js/functions.js:511
-msgid "Remove stored feed icon?"
-msgstr "Fjern gemt feed-ikon?"
-
-#: js/functions.js:516
-msgid "Removing feed icon..."
-msgstr "Fjerner feed-ikon ..."
-
-#: js/functions.js:521
-msgid "Feed icon removed."
-msgstr "Feed-ikon fjernet."
-
-#: js/functions.js:537
-#, fuzzy
-msgid "Please select an image file to upload."
-msgstr "Fjern valgte filtre?"
-
-#: js/functions.js:539
-msgid "Upload new icon for this feed?"
-msgstr ""
-
-#: js/functions.js:540
-msgid "Uploading, please wait..."
-msgstr "Indlæser, vent venligst ..."
-
-#: js/functions.js:550
-msgid "Please enter label caption:"
-msgstr "Indtast mærketekst:"
-
-#: js/functions.js:555
-#, fuzzy
-msgid "Can't create label: missing caption."
-msgstr "Indtast mærketekst:"
-
-#: js/functions.js:797
+#: js/functions.js:764
 msgid "Edit rule"
 msgstr "Rediger regel"
 
-#: js/functions.js:819
+#: js/functions.js:786
 msgid "Edit action"
 msgstr "Rediger handling"
 
-#: js/functions.js:860
+#: js/functions.js:825
 msgid "Looking for articles (%d processed, %f found)..."
 msgstr ""
 
-#: js/functions.js:890
+#: js/functions.js:855
 #, fuzzy
 msgid "Found %d articles matching this filter:"
 msgstr "Artikler, der matcher dette filter:"
 
-#: js/functions.js:942
+#: js/functions.js:907
 msgid "Create Filter"
 msgstr "Opret filter"
 
-#: js/functions.js:1060
-#: js/tt-rss.js:692
+#: js/functions.js:1016
+#: js/tt-rss.js:631
 msgid "Unsubscribe from %s?"
 msgstr "Aflyse abonnement fra %s?"
 
-#: js/functions.js:1063
+#: js/functions.js:1019
 msgid "Removing feed..."
 msgstr "Fjerner feed ..."
 
-#: js/functions.js:1489
+#: js/functions.js:1410
 msgid "Help"
 msgstr "Hjælp"
 
-#: js/prefs.js:973
-msgid "Remove category %s? Any nested feeds would be placed into Uncategorized."
+#: js/prefs.js:44
+msgid "Please enter login:"
+msgstr "Indtast brugernavn:"
+
+#: js/prefs.js:51
+msgid "Can't create user: no login specified."
 msgstr ""
 
-#: js/prefs.js:979
-msgid "Removing category..."
-msgstr "Fjerner kategori ..."
+#: js/prefs.js:55
+msgid "Adding user..."
+msgstr "Tilføjer bruger ..."
 
-#: js/prefs.js:997
-msgid "Remove selected categories?"
-msgstr "Fjern valgte kategorier?"
+#: js/prefs.js:74
+msgid "User Editor"
+msgstr "Redigeringsprogram til bruger"
 
-#: js/prefs.js:1000
-msgid "Removing selected categories..."
-msgstr "Fjerner valgte kategorier ..."
+#: js/prefs.js:104
+msgid "Edit Filter"
+msgstr "Rediger filter"
 
-#: js/prefs.js:1013
-msgid "No categories are selected."
-msgstr "Der er ikke valgt nogen kategorier."
+#: js/prefs.js:1175
+msgid "Subscribing to feeds..."
+msgstr "Abonnerer på feeds ..."
 
-#: js/prefs.js:1020
-msgid "Category title:"
-msgstr "Kategorititel:"
-
-#: js/prefs.js:1024
-msgid "Creating category..."
-msgstr "Opretter kategori ..."
-
-#: js/prefs.js:1047
-msgid "Feeds without recent updates"
-msgstr "Feeds uden nylige opdateringer"
-
-#: js/prefs.js:1091
-msgid "Replace current OPML publishing address with a new one?"
+#: js/prefs.js:1191
+msgid "Clear stored data for this plugin?"
 msgstr ""
 
-#: js/prefs.js:1129
-#, fuzzy
-msgid "Reset selected labels to default colors?"
-msgstr "Fjerne valgte etiketter?"
-
-#: js/prefs.js:1161
-msgid "Settings Profiles"
-msgstr "Profilindstillinger"
-
-#: js/prefs.js:1170
-msgid "Remove selected profiles? Active and default profiles will not be removed."
+#: js/prefs.js:1203
+msgid "Clear all messages in the error log?"
 msgstr ""
 
-#: js/prefs.js:1173
-msgid "Removing selected profiles..."
-msgstr "Fjerner valgte profiler ..."
-
-#: js/prefs.js:1189
-msgid "No profiles are selected."
-msgstr "Der er ikke valgt nogen profiler."
-
-#: js/prefs.js:1197
-#: js/prefs.js:1250
-msgid "Activate selected profile?"
-msgstr "Aktiver valgte profil?"
-
-#: js/prefs.js:1214
-#: js/prefs.js:1266
-msgid "Please choose a profile to activate."
-msgstr ""
-
-#: js/prefs.js:1219
-msgid "Creating profile..."
-msgstr "Opretter profil ..."
-
-#: js/prefs.js:1274
-msgid "This will invalidate all previously generated feed URLs. Continue?"
-msgstr ""
-
-#: js/prefs.js:1284
-msgid "Generated URLs cleared."
-msgstr "Genererede webadresser er ryddet."
-
-#: js/prefs.js:1356
-msgid "Label Editor"
-msgstr "Labeleditor"
-
-#: js/tt-rss.js:681
+#: js/tt-rss.js:620
 msgid "You can't unsubscribe from the category."
 msgstr ""
 
-#: js/viewfeed.js:127
-#: js/viewfeed.js:177
-#: js/viewfeed.js:194
+#: js/tt-rss.js:625
+#, fuzzy
+msgid "Please select some feed first."
+msgstr "Rydder valgte feed ..."
+
+#: js/viewfeed.js:89
+#: js/viewfeed.js:135
+#: js/viewfeed.js:152
 #, fuzzy
 msgid "Click to open next unread feed."
 msgstr "Klik for at redigere feed"
 
-#: js/viewfeed.js:131
+#: js/viewfeed.js:93
 msgid "Cancel search"
 msgstr "Annuller søgning"
 
-#: js/viewfeed.js:191
+#: js/viewfeed.js:149
 msgid "New articles found, reload feed to continue."
 msgstr ""
 
-#: js/viewfeed.js:620
+#: js/viewfeed.js:405
 #, 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:1284
-msgid "No article is selected."
-msgstr "Der er ikke valgt nogen artikel."
+#~ msgid "Rescore feed"
+#~ msgstr "Gendan feed"
 
-#: js/viewfeed.js:1319
-msgid "No articles found to mark"
-msgstr ""
+#~ msgid "Create label..."
+#~ msgstr "Opret etiket ..."
+
+#~ msgid "Create filter..."
+#~ msgstr "Opret filter ..."
+
+#~ msgid "Rescore articles in %s?"
+#~ msgstr "Ændr resultater af artikler i %s?"
+
+#~ msgid "Rescoring articles..."
+#~ msgstr "Ændrer artikelresultater ..."
 
-#: js/viewfeed.js:1321
 #, 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 "Can't create label: missing caption."
+#~ msgstr "Indtast mærketekst:"
 
 #~ msgid "Firefox integration"
 #~ msgstr "Firefox-integration"
diff --git a/locale/de_DE/LC_MESSAGES/messages.mo b/locale/de_DE/LC_MESSAGES/messages.mo
index 66af0924c..750011913 100644
Binary files a/locale/de_DE/LC_MESSAGES/messages.mo and b/locale/de_DE/LC_MESSAGES/messages.mo differ
diff --git a/locale/de_DE/LC_MESSAGES/messages.po b/locale/de_DE/LC_MESSAGES/messages.po
index 8249e1b03..f9ddd4bc3 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: 2018-10-10 08:24+0300\n"
+"POT-Creation-Date: 2018-12-01 12:59+0300\n"
 "PO-Revision-Date: 2017-07-04 18:53+0200\n"
 "Last-Translator: Heiko Adams <heiko.adams@gmail.com>\n"
 "Language-Team: \n"
@@ -96,8 +96,8 @@ msgid "Weekly"
 msgstr "Wöchentlich"
 
 #: backend.php:103
-#: classes/pref/users.php:47
 #: classes/pref/system.php:51
+#: classes/pref/users.php:47
 msgid "User"
 msgstr "Benutzer"
 
@@ -167,33 +167,33 @@ msgstr "Plugin nicht gefunden"
 
 #: index.php:151
 #: index.php:167
-#: index.php:285
+#: index.php:282
 #: prefs.php:120
 #: classes/backend.php:5
 #: classes/pref/labels.php:294
-#: classes/pref/feeds.php:1230
 #: classes/pref/filters.php:822
-#: js/feedlist.js:148
-#: js/feedlist.js:491
-#: js/feedlist.js:539
-#: js/functions.js:314
-#: js/functions.js:1336
-#: js/prefs.js:562
-#: js/prefs.js:754
-#: js/prefs.js:1488
-#: js/prefs.js:1503
-#: js/tt-rss.js:547
-#: js/viewfeed.js:1180
+#: classes/pref/feeds.php:1229
+#: js/feedlist.js:118
+#: js/feedlist.js:446
+#: js/feedlist.js:487
+#: js/functions.js:328
+#: js/functions.js:551
+#: js/functions.js:1286
+#: js/prefs.js:477
+#: js/prefs.js:617
+#: js/prefs.js:956
+#: js/prefs.js:1000
+#: js/prefs.js:1028
+#: js/prefs.js:1037
+#: js/prefs.js:1045
+#: js/prefs.js:1057
+#: js/tt-rss.js:497
+#: js/viewfeed.js:509
+#: js/viewfeed.js:928
 #: plugins/import_export/import_export.js:17
-#: js/functions.js:565
-#: js/prefs.js:1200
-#: js/prefs.js:1253
-#: js/prefs.js:1292
-#: js/prefs.js:1305
-#: js/prefs.js:1316
-#: js/prefs.js:1331
-#: js/tt-rss.js:564
-#: js/viewfeed.js:760
+#: js/prefs.js:1192
+#: js/prefs.js:1205
+#: js/tt-rss.js:510
 msgid "Loading, please wait..."
 msgstr "Ladevorgang, bitte warten..."
 
@@ -210,13 +210,13 @@ msgid "All Articles"
 msgstr "Alle Artikel"
 
 #: index.php:194
-#: include/functions.php:1227
+#: include/functions.php:1172
 #: classes/feeds.php:110
 msgid "Starred"
 msgstr "Markiert"
 
 #: index.php:195
-#: include/functions.php:1228
+#: include/functions.php:1173
 #: classes/feeds.php:111
 msgid "Published"
 msgstr "Veröffentlicht"
@@ -256,11 +256,11 @@ msgid "Title"
 msgstr "Titel"
 
 #: index.php:211
-#: index.php:251
-#: include/functions.php:1215
+#: index.php:250
+#: include/functions.php:1160
 #: classes/feeds.php:115
-#: js/FeedTree.js:41
-#: js/FeedTree.js:69
+#: js/FeedTree.js:42
+#: js/FeedTree.js:70
 msgid "Mark as read"
 msgstr "Als gelesen markieren"
 
@@ -297,7 +297,7 @@ msgid "Feed actions:"
 msgstr "Feed-Aktionen:"
 
 #: index.php:246
-#: classes/handler/public.php:551
+#: classes/handler/public.php:575
 msgid "Subscribe to feed..."
 msgstr "Feed abonnieren..."
 
@@ -306,56 +306,44 @@ msgid "Edit this feed..."
 msgstr "Feed bearbeiten..."
 
 #: index.php:248
-msgid "Rescore feed"
-msgstr "Feed neu bewerten"
-
-#: index.php:249
-#: classes/pref/feeds.php:770
-#: classes/pref/feeds.php:1203
-#: js/PrefFeedTree.js:61
+#: classes/pref/feeds.php:769
+#: classes/pref/feeds.php:1202
+#: js/PrefFeedTree.js:62
 msgid "Unsubscribe"
 msgstr "Feed abbestellen"
 
-#: index.php:250
+#: index.php:249
 msgid "All feeds:"
 msgstr "Alle Feeds:"
 
-#: index.php:252
+#: index.php:251
 msgid "(Un)hide read feeds"
 msgstr "Gelesene zeigen/verstecken"
 
-#: index.php:253
+#: index.php:252
 msgid "Other actions:"
 msgstr "Andere Aktionen:"
 
-#: index.php:254
-#: include/functions.php:1201
+#: index.php:253
+#: include/functions.php:1146
 msgid "Toggle widescreen mode"
 msgstr "Breitbild-Modus umschalten"
 
-#: index.php:255
-msgid "Create label..."
-msgstr "Label erstellen..."
-
-#: index.php:256
-msgid "Create filter..."
-msgstr "Filter erstellen..."
-
-#: index.php:257
+#: index.php:254
 msgid "Keyboard shortcuts help"
 msgstr "Tastaturkürzel"
 
-#: index.php:266
+#: index.php:263
 msgid "Logout"
 msgstr "Abmelden"
 
-#: index.php:272
+#: index.php:269
 msgid "Updates are available from Git."
 msgstr "Git-Updates sind verfügbar."
 
 #: prefs.php:33
 #: prefs.php:138
-#: include/functions.php:1230
+#: include/functions.php:1175
 #: classes/pref/prefs.php:425
 msgid "Preferences"
 msgstr "Einstellungen"
@@ -370,8 +358,8 @@ msgstr "Einstellungen verlassen"
 
 #: prefs.php:141
 #: classes/pref/feeds.php:114
-#: classes/pref/feeds.php:1138
-#: classes/pref/feeds.php:1192
+#: classes/pref/feeds.php:1137
+#: classes/pref/feeds.php:1191
 msgid "Feeds"
 msgstr "Feeds"
 
@@ -381,8 +369,8 @@ msgid "Filters"
 msgstr "Filter"
 
 #: prefs.php:147
+#: classes/feeds.php:1696
 #: classes/pref/labels.php:94
-#: classes/feeds.php:1710
 msgid "Labels"
 msgstr "Label"
 
@@ -394,80 +382,80 @@ msgstr "Benutzer"
 msgid "System"
 msgstr "System"
 
-#: register.php:186
+#: register.php:185
 #: include/login_form.php:162
 msgid "Create new account"
 msgstr "Neues Konto erstellen"
 
-#: register.php:192
+#: register.php:191
 msgid "New user registrations are administratively disabled."
 msgstr "Die Registrierung für neue Benutzer wurde administrativ deaktiviert."
 
-#: register.php:196
-#: register.php:241
-#: register.php:254
-#: register.php:269
-#: register.php:288
-#: register.php:336
-#: register.php:346
-#: register.php:358
-#: classes/handler/public.php:623
-#: classes/handler/public.php:697
-#: classes/handler/public.php:798
-#: classes/handler/public.php:877
-#: classes/handler/public.php:891
-#: classes/handler/public.php:898
-#: classes/handler/public.php:923
+#: register.php:195
+#: register.php:240
+#: register.php:253
+#: register.php:268
+#: register.php:287
+#: register.php:334
+#: register.php:344
+#: register.php:356
+#: classes/handler/public.php:647
+#: classes/handler/public.php:721
+#: 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"
 
-#: register.php:217
+#: register.php:216
 msgid "Your temporary password will be sent to the specified email. Accounts, which were not logged in once, are erased automatically 24 hours after temporary password is sent."
 msgstr "Ihr vorübergehendes Passwort wird an Ihre angegebene E-Mail-Adresse gesendet. Konten, die nicht innerhalb von 24 Stunden aktiviert wurden, werden gelöscht."
 
-#: register.php:223
+#: register.php:222
 msgid "Desired login:"
 msgstr "Gewünschter Benutzername:"
 
-#: register.php:226
+#: register.php:225
 msgid "Check availability"
 msgstr "Verfügbarkeit prüfen"
 
-#: register.php:228
-#: classes/handler/public.php:713
+#: register.php:227
+#: classes/handler/public.php:737
 msgid "Email:"
 msgstr "E-Mail:"
 
-#: register.php:231
-#: classes/handler/public.php:718
+#: register.php:230
+#: classes/handler/public.php:742
 msgid "How much is two plus two:"
 msgstr "Wieviel ist zwei plus zwei:"
 
-#: register.php:234
+#: register.php:233
 msgid "Submit registration"
 msgstr "Registrierung abschicken"
 
-#: register.php:252
+#: register.php:251
 msgid "Your registration information is incomplete."
 msgstr "Ihre Registrierungsinformationen sind unvollständig."
 
-#: register.php:267
+#: register.php:266
 msgid "Sorry, this username is already taken."
 msgstr "Leider ist dieser Benutzername schon vergeben."
 
-#: register.php:286
+#: register.php:285
 msgid "Registration failed."
 msgstr "Registrierung fehlgeschlagen."
 
-#: register.php:333
+#: register.php:331
 msgid "Account created successfully."
 msgstr "Konto erfolgreich erstellt."
 
-#: register.php:355
+#: register.php:353
 msgid "New user registrations are currently closed."
 msgstr "Registrierung für neue Benutzer ist momentan geschlossen."
 
-#: update.php:66
+#: update.php:67
 msgid "Tiny Tiny RSS data update script."
 msgstr "Skript zum Updaten von Tiny Tiny RSS."
 
@@ -480,10 +468,10 @@ msgstr "Alle Feeds"
 
 #: include/controls.php:138
 #: include/controls.php:230
-#: classes/opml.php:512
-#: classes/digest.php:120
+#: classes/digest.php:124
+#: classes/feeds.php:1708
 #: classes/pref/feeds.php:233
-#: classes/feeds.php:1722
+#: classes/opml.php:512
 msgid "Uncategorized"
 msgstr "Unkategorisiert"
 
@@ -498,285 +486,285 @@ msgstr[1] "%d archivierte Artikel"
 msgid "No feeds found."
 msgstr "Keine Feeds gefunden."
 
-#: include/functions.php:983
+#: include/functions.php:928
 #, php-format
 msgid "%d min"
 msgstr "%d min"
 
-#: include/functions.php:1177
+#: include/functions.php:1122
 msgid "Navigation"
 msgstr "Navigation"
 
-#: include/functions.php:1178
+#: include/functions.php:1123
 msgid "Open next feed"
 msgstr "Nächsten Feed öffnen"
 
-#: include/functions.php:1179
+#: include/functions.php:1124
 msgid "Open previous feed"
 msgstr "Vorherigen Feed öffnen"
 
-#: include/functions.php:1180
+#: include/functions.php:1125
 msgid "Open next article"
 msgstr "Nächsten Artikel öffnen"
 
-#: include/functions.php:1181
+#: include/functions.php:1126
 msgid "Open previous article"
 msgstr "Vorherigen Artikel öffnen"
 
-#: include/functions.php:1182
+#: include/functions.php:1127
 msgid "Open next article (don't scroll long articles)"
 msgstr "Nächsten Artikel laden (lange Artikel werden nicht gescrollt)"
 
-#: include/functions.php:1183
+#: include/functions.php:1128
 msgid "Open previous article (don't scroll long articles)"
 msgstr "Vorherigen Artikel laden (lange Artikel werden nicht gescrollt)"
 
-#: include/functions.php:1184
+#: include/functions.php:1129
 msgid "Move to next article (don't expand or mark read)"
 msgstr "Zum nächsten Artikel springen (nicht als gelesen markieren oder ausklappen)"
 
-#: include/functions.php:1185
+#: include/functions.php:1130
 msgid "Move to previous article (don't expand or mark read)"
 msgstr "Zum vorherigen Artikel springen (nicht als gelesen markieren oder ausklappen)"
 
-#: include/functions.php:1186
+#: include/functions.php:1131
 msgid "Show search dialog"
 msgstr "Suchdialog anzeigen"
 
-#: include/functions.php:1187
+#: include/functions.php:1132
 msgid "Article"
 msgstr "Artikel"
 
-#: include/functions.php:1188
-#: js/viewfeed.js:1695
+#: include/functions.php:1133
+#: js/viewfeed.js:1341
 msgid "Toggle starred"
 msgstr "Markierung ein-/ausschalten"
 
-#: include/functions.php:1189
-#: js/viewfeed.js:1707
+#: include/functions.php:1134
+#: js/viewfeed.js:1353
 msgid "Toggle published"
 msgstr "Veröffentlichung ein-/ausschalten"
 
-#: include/functions.php:1190
-#: js/viewfeed.js:1682
+#: include/functions.php:1135
+#: js/viewfeed.js:1328
 msgid "Toggle unread"
 msgstr "Gelesen-Status umschalten"
 
-#: include/functions.php:1191
+#: include/functions.php:1136
 msgid "Edit tags"
 msgstr "Tags bearbeiten"
 
-#: include/functions.php:1192
+#: include/functions.php:1137
 msgid "Open in new window"
 msgstr "In neuem Fenster öffnen"
 
-#: include/functions.php:1193
-#: js/viewfeed.js:1728
+#: include/functions.php:1138
+#: js/viewfeed.js:1374
 msgid "Mark below as read"
 msgstr "Untere als gelesen markieren"
 
-#: include/functions.php:1194
-#: js/viewfeed.js:1721
+#: include/functions.php:1139
+#: js/viewfeed.js:1367
 msgid "Mark above as read"
 msgstr "Obige als gelesen markieren"
 
-#: include/functions.php:1195
+#: include/functions.php:1140
 msgid "Scroll down"
 msgstr "Nach unten scrollen"
 
-#: include/functions.php:1196
+#: include/functions.php:1141
 msgid "Scroll up"
 msgstr "Nach oben scrollen"
 
-#: include/functions.php:1197
+#: include/functions.php:1142
 msgid "Select article under cursor"
 msgstr "Artikel unter Mauszeiger auswählen"
 
-#: include/functions.php:1198
+#: include/functions.php:1143
 msgid "Email article"
 msgstr "Artikel per E-Mail versenden"
 
-#: include/functions.php:1199
+#: include/functions.php:1144
 msgid "Close/collapse article"
 msgstr "Artikel schließen/verbergen"
 
-#: include/functions.php:1200
+#: include/functions.php:1145
 msgid "Toggle article expansion (combined mode)"
 msgstr "Anzeige umschalten (kombinierter Modus)"
 
-#: include/functions.php:1202
+#: include/functions.php:1147
 #: plugins/embed_original/init.php:33
 msgid "Toggle embed original"
 msgstr "\"Original einbetten\" umschalten"
 
-#: include/functions.php:1203
+#: include/functions.php:1148
 msgid "Article selection"
 msgstr "Artikelauswahl"
 
-#: include/functions.php:1204
+#: include/functions.php:1149
 msgid "Select all articles"
 msgstr "Alle Artikel auswählen"
 
-#: include/functions.php:1205
+#: include/functions.php:1150
 msgid "Select unread"
 msgstr "Ungelesene Artikel auswählen"
 
-#: include/functions.php:1206
+#: include/functions.php:1151
 msgid "Select starred"
 msgstr "Markierte Artikel auswählen"
 
-#: include/functions.php:1207
+#: include/functions.php:1152
 msgid "Select published"
 msgstr "Veröffentlichte Artikel auswählen"
 
-#: include/functions.php:1208
+#: include/functions.php:1153
 msgid "Invert selection"
 msgstr "Auswahl umkehren"
 
-#: include/functions.php:1209
+#: include/functions.php:1154
 msgid "Deselect everything"
 msgstr "Auswahl aufheben"
 
-#: include/functions.php:1210
-#: classes/pref/feeds.php:522
-#: classes/pref/feeds.php:794
+#: include/functions.php:1155
+#: classes/pref/feeds.php:521
+#: classes/pref/feeds.php:793
 msgid "Feed"
 msgstr "Feed"
 
-#: include/functions.php:1211
+#: include/functions.php:1156
 msgid "Refresh current feed"
 msgstr "Aktuellen Feed aktualisieren"
 
-#: include/functions.php:1212
+#: include/functions.php:1157
 msgid "Un/hide read feeds"
 msgstr "Gelesene Feeds zeigen/verstecken"
 
-#: include/functions.php:1213
-#: classes/pref/feeds.php:1195
+#: include/functions.php:1158
+#: classes/pref/feeds.php:1194
 msgid "Subscribe to feed"
 msgstr "Feed abonnieren"
 
-#: include/functions.php:1214
-#: js/FeedTree.js:48
-#: js/PrefFeedTree.js:55
-#: js/viewfeed.js:1846
+#: include/functions.php:1159
+#: js/FeedTree.js:49
+#: js/PrefFeedTree.js:56
+#: js/viewfeed.js:1492
 msgid "Edit feed"
 msgstr "Feed bearbeiten"
 
-#: include/functions.php:1216
+#: include/functions.php:1161
 msgid "Reverse headlines"
 msgstr "Schlagzeilensortierung umkehren"
 
-#: include/functions.php:1217
+#: include/functions.php:1162
 msgid "Toggle headline grouping"
 msgstr "Gruppierung der Kopfzeilen umschalten"
 
-#: include/functions.php:1218
+#: include/functions.php:1163
 msgid "Debug feed update"
 msgstr "Aktualisierung im Diagnose-Modus durchführen"
 
-#: include/functions.php:1219
+#: include/functions.php:1164
 msgid "Debug viewfeed()"
 msgstr "Debugge viewfeed()"
 
-#: include/functions.php:1220
-#: js/FeedTree.js:97
+#: include/functions.php:1165
+#: js/FeedTree.js:98
 msgid "Mark all feeds as read"
 msgstr "Alle Feeds als gelesen markieren"
 
-#: include/functions.php:1221
+#: include/functions.php:1166
 msgid "Un/collapse current category"
 msgstr "Aktuelle Kategorie ein-/ausklappen"
 
-#: include/functions.php:1222
-msgid "Toggle combined mode"
-msgstr "Kombinierte Feed-Anzeige umschalten"
-
-#: include/functions.php:1223
+#: include/functions.php:1167
 msgid "Toggle auto expand in combined mode"
 msgstr "Kombinierte Feed-Anzeige umschalten"
 
-#: include/functions.php:1224
+#: include/functions.php:1168
+msgid "Toggle combined mode"
+msgstr "Kombinierte Feed-Anzeige umschalten"
+
+#: include/functions.php:1169
 msgid "Go to"
 msgstr "Gehe zu"
 
-#: include/functions.php:1225
-#: classes/feeds.php:1583
+#: include/functions.php:1170
+#: classes/feeds.php:1569
 msgid "All articles"
 msgstr "Alle Artikel"
 
-#: include/functions.php:1226
+#: include/functions.php:1171
 msgid "Fresh"
 msgstr "Neu"
 
-#: include/functions.php:1229
-#: js/tt-rss.js:491
-#: js/tt-rss.js:660
+#: include/functions.php:1174
+#: js/tt-rss.js:439
+#: js/tt-rss.js:599
 msgid "Tag cloud"
 msgstr "Tagwolke"
 
-#: include/functions.php:1231
+#: include/functions.php:1176
 msgid "Other"
 msgstr "Sonstiges"
 
-#: include/functions.php:1232
+#: include/functions.php:1177
 #: classes/pref/labels.php:279
 msgid "Create label"
 msgstr "Label erstellen"
 
-#: include/functions.php:1233
+#: include/functions.php:1178
 #: classes/pref/filters.php:801
 msgid "Create filter"
 msgstr "Filter erstellen"
 
-#: include/functions.php:1234
+#: include/functions.php:1179
 msgid "Un/collapse sidebar"
 msgstr "Seitenleiste ein-/ausklappen"
 
-#: include/functions.php:1235
+#: include/functions.php:1180
 msgid "Show help dialog"
 msgstr "Hilfe anzeigen"
 
-#: include/functions.php:2582
+#: include/functions.php:2529
 msgid "There is no error, the file uploaded with success"
 msgstr "Kein Fehler. Datei erfolgreich hochgeladen"
 
-#: include/functions.php:2583
+#: include/functions.php:2530
 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/functions.php:2584
+#: include/functions.php:2531
 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/functions.php:2585
+#: include/functions.php:2532
 msgid "The uploaded file was only partially uploaded"
 msgstr "Die Datei wurde nur teilweise hochgeladen"
 
-#: include/functions.php:2586
+#: include/functions.php:2533
 msgid "No file was uploaded"
 msgstr "Es wurde keine Datei hochgeladen"
 
-#: include/functions.php:2587
+#: include/functions.php:2534
 msgid "Missing a temporary folder"
 msgstr "Fehlender temporärer Ordner"
 
-#: include/functions.php:2588
+#: include/functions.php:2535
 msgid "Failed to write file to disk."
 msgstr "Konnte Datei nicht speichern."
 
-#: include/functions.php:2589
+#: include/functions.php:2536
 msgid "A PHP extension stopped the file upload."
 msgstr "Eine PHP-Erweiterung hat den Upload unterbrochen."
 
 #: include/login_form.php:107
-#: classes/handler/public.php:446
-#: classes/handler/public.php:708
+#: classes/handler/public.php:466
+#: classes/handler/public.php:732
 msgid "Login:"
 msgstr "Benutzername:"
 
 #: include/login_form.php:117
-#: classes/handler/public.php:449
+#: classes/handler/public.php:469
 msgid "Password:"
 msgstr "Passwort:"
 
@@ -789,9 +777,9 @@ msgid "Profile:"
 msgstr "Profil:"
 
 #: include/login_form.php:133
-#: classes/handler/public.php:252
 #: classes/pref/prefs.php:1037
 #: classes/rpc.php:69
+#: classes/handler/public.php:272
 msgid "Default profile"
 msgstr "Standardprofil"
 
@@ -808,207 +796,27 @@ msgid "Remember me"
 msgstr "Erinnere dich an mich"
 
 #: include/login_form.php:159
-#: classes/handler/public.php:454
+#: classes/handler/public.php:474
 msgid "Log in"
 msgstr "Anmelden"
 
-#: include/sessions.php:46
+#: include/sessions.php:45
 msgid "Session failed to validate (schema version changed)"
 msgstr "Sitzung konnte nicht validiert werden (Schema-Version wurde geändert)"
 
-#: include/sessions.php:62
+#: include/sessions.php:53
+#, fuzzy
+msgid "Session failed to validate (UA changed)."
+msgstr "Sitzung konnte nicht validiert werden (Passwort wurde geändert)"
+
+#: include/sessions.php:67
 msgid "Session failed to validate (password changed)"
 msgstr "Sitzung konnte nicht validiert werden (Passwort wurde geändert)"
 
-#: include/sessions.php:69
+#: include/sessions.php:74
 msgid "Session failed to validate (user not found)"
 msgstr "Sitzung konnte nicht validiert werden (Benutzer existiert nicht)"
 
-#: classes/article.php:26
-msgid "Article not found."
-msgstr "Artikel nicht gefunden."
-
-#: classes/article.php:211
-msgid "Tags for this article (separated by commas):"
-msgstr "Tags für diesen Artikel (durch Komma getrennt):"
-
-#: classes/article.php:236
-#: classes/pref/labels.php:82
-#: classes/pref/users.php:103
-#: classes/pref/feeds.php:774
-#: classes/pref/feeds.php:914
-#: classes/pref/filters.php:525
-#: classes/pref/prefs.php:982
-#: plugins/nsfw/init.php:85
-#: plugins/note/init.php:58
-#: plugins/af_readability/init.php:80
-#: plugins/af_redditimgur/init.php:66
-#: plugins/af_psql_trgm/init.php:188
-#: plugins/mail/init.php:65
-#: plugins/af_zz_imgproxy/init.php:238
-msgid "Save"
-msgstr "Speichern"
-
-#: classes/article.php:238
-#: classes/handler/public.php:423
-#: classes/handler/public.php:457
-#: classes/pref/labels.php:84
-#: classes/pref/users.php:105
-#: classes/pref/feeds.php:775
-#: classes/pref/feeds.php:917
-#: classes/pref/feeds.php:1672
-#: classes/pref/filters.php:528
-#: classes/pref/filters.php:945
-#: classes/pref/filters.php:1022
-#: classes/pref/filters.php:1115
-#: classes/pref/prefs.php:984
-#: classes/feeds.php:1037
-#: classes/feeds.php:1089
-#: classes/feeds.php:1128
-#: plugins/note/init.php:60
-#: plugins/mail/init.php:179
-msgid "Cancel"
-msgstr "Abbrechen"
-
-#: classes/article.php:337
-#: classes/article.php:720
-#: classes/article.php:875
-msgid "no tags"
-msgstr "keine Tags"
-
-#: classes/article.php:448
-msgid "unknown type"
-msgstr "unbekannter Typ"
-
-#: classes/article.php:525
-msgid "Attachments"
-msgstr "Anhänge"
-
-#: classes/article.php:626
-#: classes/feeds.php:661
-msgid "comment"
-msgid_plural "comments"
-msgstr[0] "Kommentar"
-msgstr[1] "Kommentare"
-
-#: classes/article.php:630
-#: classes/feeds.php:665
-msgid "comments"
-msgstr "Kommentare"
-
-#: classes/article.php:689
-msgid " - "
-msgstr " - "
-
-#: classes/article.php:730
-#: classes/feeds.php:647
-msgid "Edit tags for this article"
-msgstr "Tags für diesen Artikel bearbeiten"
-
-#: classes/article.php:763
-#: classes/feeds.php:602
-msgid "Originally from:"
-msgstr "Original von:"
-
-#: classes/article.php:774
-#: classes/pref/feeds.php:539
-#: classes/feeds.php:613
-msgid "Feed URL"
-msgstr "Feed URL"
-
-#: classes/article.php:811
-#: classes/backend.php:103
-#: classes/dlg.php:33
-#: classes/dlg.php:56
-#: classes/dlg.php:89
-#: classes/dlg.php:154
-#: classes/dlg.php:181
-#: classes/dlg.php:197
-#: classes/pref/feeds.php:1466
-#: classes/pref/feeds.php:1533
-#: classes/pref/filters.php:208
-#: classes/pref/prefs.php:1099
-#: plugins/af_psql_trgm/init.php:109
-#: plugins/import_export/init.php:446
-#: plugins/import_export/init.php:490
-#: plugins/share/init.php:128
-msgid "Close this window"
-msgstr "Fenster schließen"
-
-#: classes/article.php:913
-msgid "(edit note)"
-msgstr "(Notiz bearbeiten)"
-
-#: classes/opml.php:31
-#: classes/opml.php:36
-msgid "OPML Utility"
-msgstr "OPML Werkzeug"
-
-#: classes/opml.php:40
-msgid "Importing OPML..."
-msgstr "Importiere OPML..."
-
-#: classes/opml.php:45
-msgid "Return to preferences"
-msgstr "Zu den Einstellungen zurückkehren"
-
-#: classes/opml.php:301
-#, php-format
-msgid "Adding feed: %s"
-msgstr "Füge Feed hinzu: %s"
-
-#: classes/opml.php:312
-#, php-format
-msgid "Duplicate feed: %s"
-msgstr "Doppelter Feed: %s"
-
-#: classes/opml.php:326
-#, php-format
-msgid "Adding label %s"
-msgstr "Füge Label %s hinzu"
-
-#: classes/opml.php:329
-#, php-format
-msgid "Duplicate label: %s"
-msgstr "Doppeltes Label: %s"
-
-#: classes/opml.php:341
-#, php-format
-msgid "Setting preference key %s to %s"
-msgstr "Setze Konfigurationsoption %s auf %s"
-
-#: classes/opml.php:377
-msgid "Adding filter..."
-msgstr "Füge Filter hinzu..."
-
-#: classes/opml.php:512
-#, php-format
-msgid "Processing category: %s"
-msgstr "Verarbeite Kategorie: %s"
-
-#: classes/opml.php:558
-#, php-format
-msgid "Upload failed with error code %d"
-msgstr "Upload schlug fehl. Fehlercode: %d"
-
-#: classes/opml.php:570
-#: plugins/import_export/init.php:471
-msgid "Unable to move uploaded file."
-msgstr "Fehler: konnte die hochgeladene Datei nicht verschieben."
-
-#: classes/opml.php:574
-#: plugins/import_export/init.php:475
-msgid "Error: please upload OPML file."
-msgstr "Fehler: bitte eine OPML-Datei hochladen."
-
-#: classes/opml.php:585
-msgid "Error: unable to find moved OPML file."
-msgstr "Fehler: konnte die verschobene OPML-Datei nicht finden."
-
-#: classes/opml.php:594
-msgid "Error while parsing document."
-msgstr "Fehler beim Parsen des Dokuments."
-
 #: 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."
@@ -1029,162 +837,353 @@ msgstr "Strg"
 msgid "Help topic not found."
 msgstr "Hilfethema nicht gefunden."
 
-#: 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."
+#: classes/backend.php:103
+#: classes/pref/filters.php:208
+#: classes/pref/feeds.php:1465
+#: classes/pref/feeds.php:1532
+#: classes/pref/prefs.php:1099
+#: classes/dlg.php:33
+#: classes/dlg.php:56
+#: classes/dlg.php:89
+#: classes/dlg.php:154
+#: classes/dlg.php:181
+#: classes/dlg.php:197
+#: classes/article.php:810
+#: plugins/af_psql_trgm/init.php:109
+#: plugins/import_export/init.php:446
+#: plugins/import_export/init.php:490
+#: plugins/share/init.php:128
+msgid "Close this window"
+msgstr "Fenster schließen"
 
-#: classes/dlg.php:44
-msgid "Your Public OPML URL is:"
-msgstr "Ihre öffentliche OPML-URL lautet:"
+#: classes/feeds.php:53
+msgid "View as RSS feed"
+msgstr "Als RSS-Feed anzeigen"
 
-#: classes/dlg.php:53
-#: classes/dlg.php:178
-#: plugins/share/init.php:125
-msgid "Generate new URL"
-msgstr "Erzeuge neue URL"
+#: classes/feeds.php:54
+#: classes/feeds.php:140
+#: classes/pref/feeds.php:1326
+msgid "View as RSS"
+msgstr "Als RSS anzeigen"
 
-#: classes/dlg.php:67
-msgid "Update daemon is enabled in configuration, but daemon process is not running, which prevents all feeds from updating. Please start the daemon process or contact instance owner."
-msgstr "Der Aktualisierungs-Daemon ist in den Einstellungen aktiviert, aber der Daemon Prozess läuft nicht, weshalb keine Feeds aktualisiert werden können. Bitte starten Sie den Prozess des Daemons oder benachrichtigen Sie den Besitzer der Instanz."
-
-#: classes/dlg.php:71
-#: classes/dlg.php:80
-msgid "Last update:"
-msgstr "Letzte Aktualisierung:"
-
-#: classes/dlg.php:76
-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 "Der Aktualisierungs Daemon braucht zu lange, um eine Aktualisierung durchzuführen. Dies könnte auf ein Problem wie einen Absturz oder eine Blockierung hinweisen. Bitte überprüfen Sie den Prozess des Daemons oder benachrichtigen Sie den Besitzer des Instanz."
-
-#: classes/dlg.php:169
-msgid "You can view this feed as RSS using the following URL:"
-msgstr "Sie finden diesen Feed als RSS unter der folgenden URL:"
-
-#: classes/dlg.php:190
-msgid "You are using default tt-rss password. Please change it in the Preferences (Personal data / Authentication)."
-msgstr ""
-
-#: classes/dlg.php:194
-#, fuzzy
-msgid "Open Preferences"
-msgstr "Einstellungen"
-
-#: classes/handler/public.php:387
-#: plugins/bookmarklets/init.php:40
-msgid "Share with Tiny Tiny RSS"
-msgstr "Teilen mit Tiny Tiny RSS"
-
-#: classes/handler/public.php:395
-msgid "Title:"
-msgstr "Titel:"
-
-#: classes/handler/public.php:397
-#: classes/pref/feeds.php:537
-msgid "URL:"
-msgstr "URL:"
-
-#: classes/handler/public.php:399
-msgid "Content:"
-msgstr "Inhalt:"
-
-#: classes/handler/public.php:401
-msgid "Labels:"
-msgstr "Label:"
-
-#: classes/handler/public.php:420
-msgid "Shared article will appear in the Published feed."
-msgstr "Geteilte Artikel erscheinen unter 'Veröffentlichte Artikel'."
-
-#: classes/handler/public.php:422
-msgid "Share"
-msgstr "Teilen"
-
-#: classes/handler/public.php:444
-msgid "Not logged in"
-msgstr "Nicht angemeldet"
-
-#: classes/handler/public.php:504
-msgid "Incorrect username or password"
-msgstr "Benutzername oder Passwort falsch"
-
-#: classes/handler/public.php:557
+#: classes/feeds.php:62
 #, php-format
-msgid "Already subscribed to <b>%s</b>."
-msgstr "<b>%s</b> bereits abonniert."
+msgid "Last updated: %s"
+msgstr "Letzte Aktualisierung: %s"
 
-#: classes/handler/public.php:560
+#: classes/feeds.php:100
+msgid "Select..."
+msgstr "Wähle..."
+
+#: classes/feeds.php:102
+#: classes/pref/labels.php:273
+#: classes/pref/filters.php:391
+#: classes/pref/filters.php:449
+#: classes/pref/filters.php:795
+#: classes/pref/filters.php:878
+#: classes/pref/filters.php:905
+#: classes/pref/feeds.php:1185
+#: classes/pref/feeds.php:1416
+#: classes/pref/feeds.php:1481
+#: classes/pref/users.php:358
+#: classes/pref/prefs.php:996
+msgid "All"
+msgstr "Alle"
+
+#: classes/feeds.php:104
+msgid "Invert"
+msgstr "Umkehren"
+
+#: classes/feeds.php:105
+#: classes/pref/labels.php:275
+#: classes/pref/filters.php:393
+#: classes/pref/filters.php:451
+#: classes/pref/filters.php:797
+#: classes/pref/filters.php:880
+#: classes/pref/filters.php:907
+#: classes/pref/feeds.php:1187
+#: classes/pref/feeds.php:1418
+#: classes/pref/feeds.php:1483
+#: classes/pref/users.php:360
+#: classes/pref/prefs.php:998
+msgid "None"
+msgstr "Keine"
+
+#: classes/feeds.php:107
+msgid "Selection toggle:"
+msgstr "Auswahl umschalten:"
+
+#: classes/feeds.php:113
+msgid "Selection:"
+msgstr "Auswahl:"
+
+#: classes/feeds.php:116
+msgid "Set score"
+msgstr "Bewerten"
+
+#: classes/feeds.php:119
+msgid "Archive"
+msgstr "Archiv"
+
+#: classes/feeds.php:121
+msgid "Move back"
+msgstr "Zurückgehen"
+
+#: classes/feeds.php:122
+#: classes/pref/filters.php:400
+#: classes/pref/filters.php:458
+#: classes/pref/filters.php:887
+#: classes/pref/filters.php:914
+msgid "Delete"
+msgstr "Löschen"
+
+#: classes/feeds.php:127
+#: classes/feeds.php:132
+#: plugins/mailto/init.php:25
+#: plugins/mail/init.php:76
+msgid "Forward by email"
+msgstr "Per E-Mail weiterleiten"
+
+#: classes/feeds.php:136
+msgid "Feed:"
+msgstr "Feed:"
+
+#: classes/feeds.php:193
+#: classes/feeds.php:802
+msgid "Feed not found."
+msgstr "Feed nicht gefunden."
+
+#: classes/feeds.php:255
+msgid "Never"
+msgstr "Niemals"
+
+#: classes/feeds.php:341
 #, php-format
-msgid "Subscribed to <b>%s</b>."
-msgstr "<b>%s</b> abonniert."
+msgid "Imported at %s"
+msgstr "Importiert nach %s"
 
-#: classes/handler/public.php:563
+#: classes/feeds.php:391
+#: classes/feeds.php:484
+msgid "mark feed as read"
+msgstr "den Feed als gelesen markieren"
+
+#: classes/feeds.php:540
+msgid "Collapse article"
+msgstr "Artikel einklappen"
+
+#: classes/feeds.php:592
+#: classes/article.php:762
+msgid "Originally from:"
+msgstr "Original von:"
+
+#: classes/feeds.php:603
+#: classes/pref/feeds.php:538
+#: classes/article.php:773
+msgid "Feed URL"
+msgstr "Feed URL"
+
+#: classes/feeds.php:630
+#: classes/article.php:729
+msgid "Edit tags for this article"
+msgstr "Tags für diesen Artikel bearbeiten"
+
+#: classes/feeds.php:644
+#: classes/article.php:625
+msgid "comment"
+msgid_plural "comments"
+msgstr[0] "Kommentar"
+msgstr[1] "Kommentare"
+
+#: classes/feeds.php:648
+#: classes/article.php:629
+msgid "comments"
+msgstr "Kommentare"
+
+#: classes/feeds.php:686
+msgid "No unread articles found to display."
+msgstr "Keine ungelesenen Artikel zum Anzeigen gefunden."
+
+#: classes/feeds.php:689
+msgid "No updated articles found to display."
+msgstr "Keine aktualisierten Artikel zum Anzeigen gefunden."
+
+#: classes/feeds.php:692
+msgid "No starred articles found to display."
+msgstr "Keine markierten Artikel zum Anzeigen gefunden."
+
+#: classes/feeds.php:696
+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:698
+msgid "No articles found to display."
+msgstr "Keine Artikel zum Anzeigen gefunden."
+
+#: classes/feeds.php:714
+#: classes/feeds.php:905
 #, php-format
-msgid "Could not subscribe to <b>%s</b>."
-msgstr "Konnte <b>%s</b> nicht abonnieren."
+msgid "Feeds last updated at %s"
+msgstr "Feeds zuletzt aktualisiert am %s"
 
-#: classes/handler/public.php:566
+#: classes/feeds.php:726
+#: classes/feeds.php:917
+msgid "Some feeds have update errors (click for details)"
+msgstr "Einige Feeds haben Aktualisierungsfehler (klicken für Details)"
+
+#: classes/feeds.php:894
+msgid "No feed selected."
+msgstr "Keinen Feed ausgewählt."
+
+#: classes/feeds.php:958
+#: classes/feeds.php:966
+msgid "Feed or site URL"
+msgstr "URL von Feed oder Seite"
+
+#: classes/feeds.php:972
+#: classes/pref/feeds.php:559
+#: classes/pref/feeds.php:800
+#: classes/pref/feeds.php:1632
+msgid "Place in category:"
+msgstr "In Kategorie einordnen:"
+
+#: classes/feeds.php:980
+msgid "Available feeds"
+msgstr "Verfügbare Feeds"
+
+#: classes/feeds.php:992
+#: classes/pref/feeds.php:621
+#: classes/pref/feeds.php:848
+#: classes/pref/users.php:61
+msgid "Authentication"
+msgstr "Authentifizierung"
+
+#: classes/feeds.php:996
+#: classes/pref/feeds.php:625
+#: classes/pref/feeds.php:852
+#: classes/pref/feeds.php:1646
+#: classes/pref/users.php:403
+msgid "Login"
+msgstr "Benutzername"
+
+#: classes/feeds.php:1000
+#: classes/pref/feeds.php:631
+#: classes/pref/feeds.php:860
+#: classes/pref/feeds.php:1649
+#: classes/pref/prefs.php:243
+msgid "Password"
+msgstr "Passwort"
+
+#: classes/feeds.php:1011
+#: classes/pref/feeds.php:645
+msgid "This feed requires authentication."
+msgstr "Dieser Feed erfordert Authentifizierung."
+
+#: classes/feeds.php:1014
+#: classes/feeds.php:1070
+#: classes/pref/feeds.php:1668
+msgid "Subscribe"
+msgstr "Abonnieren"
+
+#: classes/feeds.php:1017
+msgid "More feeds"
+msgstr "Weitere Feeds"
+
+#: classes/feeds.php:1020
+#: classes/feeds.php:1072
+#: classes/feeds.php:1111
+#: classes/pref/labels.php:84
+#: classes/pref/filters.php:528
+#: classes/pref/filters.php:945
+#: classes/pref/filters.php:1022
+#: classes/pref/filters.php:1115
+#: classes/pref/feeds.php:774
+#: classes/pref/feeds.php:916
+#: classes/pref/feeds.php:1669
+#: classes/pref/users.php:105
+#: classes/pref/prefs.php:984
+#: classes/article.php:238
+#: classes/handler/public.php:443
+#: classes/handler/public.php:477
+#: plugins/mail/init.php:179
+#: plugins/note/init.php:60
+msgid "Cancel"
+msgstr "Abbrechen"
+
+#: classes/feeds.php:1042
+#: classes/feeds.php:1110
+#: classes/pref/filters.php:788
+#: classes/pref/feeds.php:1178
+#: classes/pref/users.php:345
+#: js/tt-rss.js:152
+msgid "Search"
+msgstr "Suchen"
+
+#: classes/feeds.php:1046
+msgid "Popular feeds"
+msgstr "Beliebte Feeds"
+
+#: classes/feeds.php:1047
+msgid "Feed archive"
+msgstr "Feed-Archiv"
+
+#: classes/feeds.php:1050
+msgid "limit:"
+msgstr "Grenzwert:"
+
+#: classes/feeds.php:1071
+#: classes/pref/labels.php:282
+#: classes/pref/filters.php:518
+#: classes/pref/filters.php:814
+#: classes/pref/feeds.php:751
+#: classes/pref/users.php:369
+msgid "Remove"
+msgstr "Entfernen"
+
+#: classes/feeds.php:1084
+msgid "Look for"
+msgstr "Suche nach"
+
+#: classes/feeds.php:1092
 #, php-format
-msgid "No feeds found in <b>%s</b>."
-msgstr "Keine Feeds in <b>%s</b> gefunden."
+msgid "in %s"
+msgstr "in %s"
 
-#: classes/handler/public.php:569
-msgid "Multiple feed URLs found."
-msgstr "Mehrere Feed-URLs gefunden."
+#: classes/feeds.php:1097
+msgid "Used for word stemming"
+msgstr "Verwendet für Wortstamm"
 
-#: classes/handler/public.php:573
+#: classes/feeds.php:1106
+msgid "Search syntax"
+msgstr "Such-Syntax"
+
+#: classes/feeds.php:1563
+msgid "Starred articles"
+msgstr "Markierte Artikel"
+
+#: classes/feeds.php:1565
+msgid "Published articles"
+msgstr "Veröffentlichte Artikel"
+
+#: classes/feeds.php:1567
+msgid "Fresh articles"
+msgstr "Neue Artikel"
+
+#: classes/feeds.php:1571
+msgid "Archived articles"
+msgstr "Archivierte Artikel"
+
+#: classes/feeds.php:1573
+msgid "Recently read"
+msgstr "Kürzlich gelesen"
+
+#: classes/feeds.php:1694
+msgid "Special"
+msgstr "Sonderfeeds"
+
+#: classes/feeds.php:1951
 #, 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:591
-msgid "Subscribe to selected feed"
-msgstr "Ausgewählte Feeds abonnieren"
-
-#: classes/handler/public.php:618
-msgid "Edit subscription options"
-msgstr "Abonnementoptionen bearbeiten"
-
-#: classes/handler/public.php:656
-msgid "Password recovery"
-msgstr "Passwort-Wiederherstellung"
-
-#: classes/handler/public.php:701
-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:723
-#: classes/pref/users.php:372
-msgid "Reset password"
-msgstr "Passwort zurücksetzen"
-
-#: classes/handler/public.php:733
-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:737
-#: classes/handler/public.php:806
-msgid "Go back"
-msgstr "Zurück"
-
-#: classes/handler/public.php:775
-msgid "[tt-rss] Password reset request"
-msgstr "[tt-rss] neues Passwort anfordern"
-
-#: classes/handler/public.php:802
-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:824
-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:850
-msgid "Database Updater"
-msgstr "Datenbank-Updater"
-
-#: classes/handler/public.php:915
-msgid "Perform updates"
-msgstr "Aktualisierungen durchführen"
+msgid "Search results: %s"
+msgstr "Suchergebnisse: %s"
 
 #: classes/pref/labels.php:25
 #: classes/pref/filters.php:377
@@ -1204,199 +1203,191 @@ msgstr "Vordergrund:"
 msgid "Background:"
 msgstr "Hintergrund:"
 
+#: classes/pref/labels.php:82
+#: classes/pref/filters.php:525
+#: classes/pref/feeds.php:773
+#: classes/pref/feeds.php:913
+#: classes/pref/users.php:103
+#: classes/pref/prefs.php:982
+#: classes/article.php:236
+#: plugins/af_zz_imgproxy/init.php:238
+#: plugins/af_redditimgur/init.php:66
+#: plugins/af_psql_trgm/init.php:188
+#: plugins/af_readability/init.php:80
+#: plugins/nsfw/init.php:85
+#: plugins/mail/init.php:65
+#: plugins/note/init.php:58
+msgid "Save"
+msgstr "Speichern"
+
 #: classes/pref/labels.php:244
 #, php-format
 msgid "Created label <b>%s</b>"
 msgstr "Label <b>%s</b> erstellt"
 
 #: classes/pref/labels.php:270
-#: classes/pref/users.php:356
-#: classes/pref/feeds.php:1183
-#: classes/pref/feeds.php:1414
-#: classes/pref/feeds.php:1479
 #: classes/pref/filters.php:388
 #: classes/pref/filters.php:446
 #: classes/pref/filters.php:792
 #: classes/pref/filters.php:875
 #: classes/pref/filters.php:902
+#: classes/pref/feeds.php:1182
+#: classes/pref/feeds.php:1413
+#: classes/pref/feeds.php:1478
+#: classes/pref/users.php:355
 #: classes/pref/prefs.php:993
 msgid "Select"
 msgstr "Auswahl"
 
-#: classes/pref/labels.php:273
-#: classes/pref/users.php:359
-#: classes/pref/feeds.php:1186
-#: classes/pref/feeds.php:1417
-#: classes/pref/feeds.php:1482
-#: classes/pref/filters.php:391
-#: classes/pref/filters.php:449
-#: classes/pref/filters.php:795
-#: classes/pref/filters.php:878
-#: classes/pref/filters.php:905
-#: classes/pref/prefs.php:996
-#: classes/feeds.php:102
-msgid "All"
-msgstr "Alle"
-
-#: classes/pref/labels.php:275
-#: classes/pref/users.php:361
-#: classes/pref/feeds.php:1188
-#: classes/pref/feeds.php:1419
-#: classes/pref/feeds.php:1484
-#: classes/pref/filters.php:393
-#: classes/pref/filters.php:451
-#: classes/pref/filters.php:797
-#: classes/pref/filters.php:880
-#: classes/pref/filters.php:907
-#: classes/pref/prefs.php:998
-#: classes/feeds.php:105
-msgid "None"
-msgstr "Keine"
-
-#: classes/pref/labels.php:282
-#: classes/pref/users.php:370
-#: classes/pref/feeds.php:752
-#: classes/pref/filters.php:518
-#: classes/pref/filters.php:814
-#: classes/feeds.php:1088
-msgid "Remove"
-msgstr "Entfernen"
-
 #: classes/pref/labels.php:285
 msgid "Clear colors"
 msgstr "Farben löschen"
 
-#: classes/pref/users.php:6
-#: classes/pref/system.php:8
-msgid "Your access level is insufficient to open this tab."
-msgstr "Sie haben nicht die benötigten Rechte, um diese Registerkarte zu öffnen."
+#: classes/pref/filters.php:155
+msgid "Preview article"
+msgstr "Artikel-Vorschau"
 
-#: classes/pref/users.php:26
-msgid "Edit user"
-msgstr "Benutzer bearbeiten"
+#: classes/pref/filters.php:267
+#: classes/pref/filters.php:573
+msgid "(inverse)"
+msgstr "(invertiert)"
 
-#: classes/pref/users.php:61
-#: classes/pref/feeds.php:622
-#: classes/pref/feeds.php:849
-#: classes/feeds.php:1009
-msgid "Authentication"
-msgstr "Authentifizierung"
-
-#: classes/pref/users.php:64
-msgid "Access level: "
-msgstr "Zugriffsberechtigung: "
-
-#: classes/pref/users.php:82
-#: classes/pref/feeds.php:648
-#: classes/pref/feeds.php:867
-msgid "Options"
-msgstr "Optionen"
-
-#: classes/pref/users.php:96
-#: js/prefs.js:479
-msgid "User details"
-msgstr "Benutzerdetails"
-
-#: classes/pref/users.php:136
-#: classes/pref/users.php:407
-msgid "Registered"
-msgstr "Registriert"
-
-#: classes/pref/users.php:137
-msgid "Last logged in"
-msgstr "Zuletzt angemeldet"
-
-#: classes/pref/users.php:145
-msgid "Subscribed feeds count"
-msgstr "Anzahl abonnierter Feeds"
-
-#: classes/pref/users.php:146
-msgid "Stored articles"
-msgstr "Gespeicherte Artikel"
-
-#: classes/pref/users.php:150
-#: classes/pref/users.php:406
-msgid "Subscribed feeds"
-msgstr "Abonnierte Feeds"
-
-#: classes/pref/users.php:176
-msgid "User not found"
-msgstr "Benutzer nicht gefunden"
-
-#: classes/pref/users.php:246
+#: classes/pref/filters.php:263
+#: classes/pref/filters.php:572
 #, php-format
-msgid "Added user <b>%s</b> with password <b>%s</b>"
-msgstr "Benutzer <b>%s</b> mit Passwort <b>%s</b> hinzugefügt"
+msgid "%s on %s in %s %s"
+msgstr "%s innerhalb %s von %s %s"
 
-#: classes/pref/users.php:253
-#, php-format
-msgid "Could not create user <b>%s</b>"
-msgstr "Konnte den Benutzer <b>%s</b> nicht anlegen"
+#: classes/pref/filters.php:383
+#: classes/pref/filters.php:870
+#: classes/pref/filters.php:977
+msgid "Match"
+msgstr "Kriterien"
 
-#: classes/pref/users.php:257
-#, php-format
-msgid "User <b>%s</b> already exists."
-msgstr "Benutzer <b>%s</b> existiert bereits."
+#: classes/pref/filters.php:397
+#: classes/pref/filters.php:455
+#: classes/pref/filters.php:884
+#: classes/pref/filters.php:911
+msgid "Add"
+msgstr "Hinzufügen"
 
-#: classes/pref/users.php:285
-#, 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/filters.php:441
+#: classes/pref/filters.php:897
+msgid "Apply actions"
+msgstr "Aktionen anwenden"
 
-#: classes/pref/users.php:287
-#, 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/filters.php:492
+#: classes/pref/filters.php:926
+msgid "Enabled"
+msgstr "Aktiviert"
 
-#: classes/pref/users.php:311
-msgid "[tt-rss] Password change notification"
-msgstr "[tt-rss] Benachrichtigung: Passwort geändert"
+#: classes/pref/filters.php:501
+#: classes/pref/filters.php:929
+msgid "Match any rule"
+msgstr "Ein erfülltes Kriterium ist ausreichend"
 
-#: classes/pref/users.php:346
-#: classes/pref/feeds.php:1179
-#: classes/pref/filters.php:788
-#: classes/feeds.php:1059
-#: classes/feeds.php:1127
-#: js/tt-rss.js:165
-msgid "Search"
-msgstr "Suchen"
+#: classes/pref/filters.php:510
+#: classes/pref/filters.php:932
+msgid "Inverse matching"
+msgstr "Invertierte Übereinstimmung"
 
-#: classes/pref/users.php:364
-msgid "Create user"
-msgstr "Benutzer anlegen"
+#: classes/pref/filters.php:522
+#: classes/pref/filters.php:939
+msgid "Test"
+msgstr "Test"
+
+#: classes/pref/filters.php:804
+msgid "Combine"
+msgstr "Zusammenfügen"
 
-#: classes/pref/users.php:368
 #: classes/pref/filters.php:807
+#: classes/pref/users.php:367
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: classes/pref/users.php:404
-#: classes/pref/feeds.php:626
-#: classes/pref/feeds.php:853
-#: classes/pref/feeds.php:1649
-#: classes/feeds.php:1013
-msgid "Login"
-msgstr "Benutzername"
+#: classes/pref/filters.php:810
+#: classes/pref/feeds.php:1198
+#: classes/pref/feeds.php:1212
+msgid "Reset sort order"
+msgstr "Sortierreihenfolge zurücksetzen"
 
-#: classes/pref/users.php:405
-msgid "Access Level"
-msgstr "Zugriffsberechtigung"
+#: classes/pref/filters.php:942
+msgid "Create"
+msgstr "Erstellen"
 
-#: classes/pref/users.php:408
-msgid "Last login"
-msgstr "Zuletzt angemeldet"
+#: classes/pref/filters.php:987
+msgid "Regular expression, without outer delimiters (i.e. slashes)"
+msgstr ""
 
-#: classes/pref/users.php:427
-msgid "Click to edit"
-msgstr "Zum Bearbeiten klicken"
+#: classes/pref/filters.php:993
+msgid "Inverse regular expression matching"
+msgstr "Invertiere reguläre Ausdrücke"
 
-#: classes/pref/users.php:447
-msgid "No users defined."
-msgstr "Keine Benutzer definiert."
+#: classes/pref/filters.php:995
+msgid "on field"
+msgstr "in Feld"
 
-#: classes/pref/users.php:449
-msgid "No matching users found."
-msgstr "Keine zugehörigen Benutzer gefunden."
+#: classes/pref/filters.php:1001
+#: js/PrefFilterTree.js:44
+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:764
+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:786
+msgid "Add action"
+msgstr "Aktion hinzufügen"
+
+#: classes/pref/filters.php:1139
+msgid "[No caption]"
+msgstr "[kein Titel]"
+
+#: classes/pref/filters.php:1141
+#, 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:1155
+msgid "matches any rule"
+msgstr "erfüllt alle Regeln"
+
+#: classes/pref/filters.php:1158
+#, php-format
+msgid "%s (+%d action)"
+msgid_plural "%s (+%d actions)"
+msgstr[0] "%s (+%d Aktion)"
+msgstr[1] "%s (+%d Aktionen)"
+
+#: classes/pref/system.php:8
+#: classes/pref/users.php:6
+msgid "Your access level is insufficient to open this tab."
+msgstr "Sie haben nicht die benötigten Rechte, um diese Registerkarte zu öffnen."
 
 #: classes/pref/system.php:29
 msgid "Error Log"
@@ -1441,381 +1432,313 @@ msgid_plural "(%d feeds)"
 msgstr[0] "(%d Feed)"
 msgstr[1] "(%d Feeds)"
 
-#: classes/pref/feeds.php:514
+#: classes/pref/feeds.php:513
 #: classes/pref/prefs.php:18
 msgid "General"
 msgstr "Allgemein"
 
-#: classes/pref/feeds.php:528
+#: classes/pref/feeds.php:527
 msgid "Feed Title"
 msgstr "Feed-Titel"
 
-#: classes/pref/feeds.php:560
-#: classes/pref/feeds.php:801
-#: classes/pref/feeds.php:1635
-#: classes/feeds.php:989
-msgid "Place in category:"
-msgstr "In Kategorie einordnen:"
+#: classes/pref/feeds.php:536
+#: classes/handler/public.php:417
+msgid "URL:"
+msgstr "URL:"
 
-#: classes/pref/feeds.php:572
+#: classes/pref/feeds.php:571
 #, fuzzy
 msgid "Site URL:"
 msgstr "Artikel-URL:"
 
-#: classes/pref/feeds.php:574
+#: classes/pref/feeds.php:573
 #, fuzzy
 msgid "Site URL"
 msgstr "Feed URL"
 
-#: classes/pref/feeds.php:585
-#: classes/pref/feeds.php:815
+#: classes/pref/feeds.php:584
+#: classes/pref/feeds.php:814
 msgid "Language:"
 msgstr "Sprache:"
 
-#: classes/pref/feeds.php:592
-#: classes/pref/feeds.php:824
+#: classes/pref/feeds.php:591
+#: classes/pref/feeds.php:823
 msgid "Update"
 msgstr "Aktualisieren"
 
-#: classes/pref/feeds.php:607
-#: classes/pref/feeds.php:840
+#: classes/pref/feeds.php:606
+#: classes/pref/feeds.php:839
 msgid "Article purging:"
 msgstr "Artikel löschen:"
 
-#: classes/pref/feeds.php:632
-#: classes/pref/feeds.php:861
-#: classes/pref/feeds.php:1652
-#: classes/pref/prefs.php:243
-#: classes/feeds.php:1017
-msgid "Password"
-msgstr "Passwort"
-
-#: classes/pref/feeds.php:636
+#: classes/pref/feeds.php:635
 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:646
-#: classes/feeds.php:1028
-msgid "This feed requires authentication."
-msgstr "Dieser Feed erfordert Authentifizierung."
+#: classes/pref/feeds.php:647
+#: classes/pref/feeds.php:866
+#: classes/pref/users.php:82
+msgid "Options"
+msgstr "Optionen"
 
-#: classes/pref/feeds.php:662
-#: classes/pref/feeds.php:871
+#: classes/pref/feeds.php:661
+#: classes/pref/feeds.php:870
 msgid "Hide from Popular feeds"
 msgstr "Nicht unter beliebten Feeds aufführen"
 
-#: classes/pref/feeds.php:674
-#: classes/pref/feeds.php:877
+#: classes/pref/feeds.php:673
+#: classes/pref/feeds.php:876
 msgid "Include in e-mail digest"
 msgstr "In E-Mail-Zusammenfassung aufnehmen"
 
-#: classes/pref/feeds.php:687
-#: classes/pref/feeds.php:883
+#: classes/pref/feeds.php:686
+#: classes/pref/feeds.php:882
 msgid "Always display image attachments"
 msgstr "Angehängte Bilder immer anzeigen"
 
-#: classes/pref/feeds.php:700
-#: classes/pref/feeds.php:891
+#: classes/pref/feeds.php:699
+#: classes/pref/feeds.php:890
 #, fuzzy
 msgid "Do not embed media"
 msgstr "Bilder nicht einbetten"
 
-#: classes/pref/feeds.php:713
-#: classes/pref/feeds.php:899
+#: classes/pref/feeds.php:712
+#: classes/pref/feeds.php:898
 msgid "Cache media"
 msgstr "Speichere Medien zwischen"
 
-#: classes/pref/feeds.php:725
-#: classes/pref/feeds.php:905
+#: classes/pref/feeds.php:724
+#: classes/pref/feeds.php:904
 msgid "Mark updated articles as unread"
 msgstr "Aktualisierte Artikel als ungelesen markieren"
 
-#: classes/pref/feeds.php:729
+#: classes/pref/feeds.php:728
 msgid "Icon"
 msgstr "Symbol"
 
-#: classes/pref/feeds.php:743
-#: classes/pref/feeds.php:1284
+#: classes/pref/feeds.php:742
+#: classes/pref/feeds.php:1283
 #: plugins/import_export/init.php:71
 #, fuzzy
 msgid "Choose file..."
 msgstr "Filter erstellen..."
 
-#: classes/pref/feeds.php:750
+#: classes/pref/feeds.php:749
 msgid "Replace"
 msgstr "Ersetzen"
 
-#: classes/pref/feeds.php:757
+#: classes/pref/feeds.php:756
 #: classes/pref/prefs.php:679
 msgid "Plugins"
 msgstr "Plugins"
 
-#: classes/pref/feeds.php:1154
+#: classes/pref/feeds.php:1153
 msgid "Feeds with errors"
 msgstr "Feeds mit Fehlern"
 
-#: classes/pref/feeds.php:1161
+#: classes/pref/feeds.php:1160
 msgid "Inactive feeds"
 msgstr "Inaktive Feeds"
 
-#: classes/pref/feeds.php:1197
+#: classes/pref/feeds.php:1196
 msgid "Edit selected feeds"
 msgstr "Bearbeite ausgewählte Feeds"
 
-#: classes/pref/feeds.php:1199
-#: classes/pref/feeds.php:1213
-#: classes/pref/filters.php:810
-msgid "Reset sort order"
-msgstr "Sortierreihenfolge zurücksetzen"
-
-#: classes/pref/feeds.php:1201
-#: js/prefs.js:1462
+#: classes/pref/feeds.php:1200
+#: js/prefs.js:1171
 msgid "Batch subscribe"
 msgstr "Mehrere Feeds abonnieren"
 
-#: classes/pref/feeds.php:1208
+#: classes/pref/feeds.php:1207
 msgid "Categories"
 msgstr "Kategorien"
 
-#: classes/pref/feeds.php:1211
+#: classes/pref/feeds.php:1210
 msgid "Add category"
 msgstr "Kategorie anlegen"
 
-#: classes/pref/feeds.php:1215
+#: classes/pref/feeds.php:1214
 msgid "Remove selected"
 msgstr "Ausgewählte Kategorien löschen"
 
-#: classes/pref/feeds.php:1272
+#: classes/pref/feeds.php:1271
 msgid "OPML"
 msgstr "OPML"
 
-#: classes/pref/feeds.php:1274
+#: classes/pref/feeds.php:1273
 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:1275
+#: classes/pref/feeds.php:1274
 msgid "Only main settings profile can be migrated using OPML."
 msgstr "Nur das Hauptprofil kann mit OPML gesichert werden."
 
-#: classes/pref/feeds.php:1290
+#: classes/pref/feeds.php:1289
 msgid "Import my OPML"
 msgstr "OPML importieren"
 
-#: classes/pref/feeds.php:1296
+#: classes/pref/feeds.php:1295
 msgid "Filename:"
 msgstr "Dateiname:"
 
-#: classes/pref/feeds.php:1298
+#: classes/pref/feeds.php:1297
 msgid "Include settings"
 msgstr "Inklusive Einstellungen"
 
-#: classes/pref/feeds.php:1302
+#: classes/pref/feeds.php:1301
 msgid "Export OPML"
 msgstr "OPML exportieren"
 
-#: classes/pref/feeds.php:1306
+#: classes/pref/feeds.php:1305
 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:1310
+#: classes/pref/feeds.php:1309
 msgid "Public OPML URL"
 msgstr "Öffentliche OPML-URL"
 
-#: classes/pref/feeds.php:1311
+#: classes/pref/feeds.php:1310
 msgid "Display published OPML URL"
 msgstr "Zeige öffentliche OPML-URL"
 
-#: classes/pref/feeds.php:1318
+#: classes/pref/feeds.php:1317
 msgid "Published & shared articles / Generated feeds"
 msgstr "Veröffentlichte & geteilte Artikel / erzeugte Feeds"
 
-#: classes/pref/feeds.php:1320
+#: classes/pref/feeds.php:1319
 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:1327
-#: classes/feeds.php:54
-#: classes/feeds.php:140
-msgid "View as RSS"
-msgstr "Als RSS anzeigen"
-
-#: classes/pref/feeds.php:1328
 msgid "Display URL"
 msgstr "Zeige URL an"
 
-#: classes/pref/feeds.php:1331
+#: classes/pref/feeds.php:1330
 msgid "Clear all generated URLs"
 msgstr "Alle generierten URLs löschen"
 
-#: classes/pref/feeds.php:1410
+#: classes/pref/feeds.php:1409
 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:1444
-#: classes/pref/feeds.php:1509
+#: classes/pref/feeds.php:1443
+#: classes/pref/feeds.php:1508
 msgid "Click to edit feed"
 msgstr "Zum Bearbeiten klicken"
 
-#: classes/pref/feeds.php:1462
-#: classes/pref/feeds.php:1529
+#: classes/pref/feeds.php:1461
+#: classes/pref/feeds.php:1528
 msgid "Unsubscribe from selected feeds"
 msgstr "Ausgewählte Feeds abbestellen"
 
-#: classes/pref/feeds.php:1632
+#: classes/pref/feeds.php:1629
 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:1641
+#: classes/pref/feeds.php:1638
 msgid "Feeds to subscribe, One per line"
 msgstr "Zu abonnierende Feeds, Einen pro Zeile"
 
-#: classes/pref/feeds.php:1664
+#: classes/pref/feeds.php:1661
 msgid "Feeds require authentication."
 msgstr "Feeds benötigen Authentifizierung."
 
-#: classes/pref/feeds.php:1671
-#: classes/feeds.php:1031
-#: classes/feeds.php:1087
-msgid "Subscribe"
-msgstr "Abonnieren"
+#: classes/pref/users.php:26
+msgid "Edit user"
+msgstr "Benutzer bearbeiten"
 
-#: classes/pref/filters.php:155
-msgid "Preview article"
-msgstr "Artikel-Vorschau"
+#: classes/pref/users.php:64
+msgid "Access level: "
+msgstr "Zugriffsberechtigung: "
 
-#: classes/pref/filters.php:267
-#: classes/pref/filters.php:573
-msgid "(inverse)"
-msgstr "(invertiert)"
+#: classes/pref/users.php:96
+#: js/prefs.js:403
+msgid "User details"
+msgstr "Benutzerdetails"
 
-#: classes/pref/filters.php:263
-#: classes/pref/filters.php:572
+#: classes/pref/users.php:136
+#: classes/pref/users.php:406
+msgid "Registered"
+msgstr "Registriert"
+
+#: classes/pref/users.php:137
+msgid "Last logged in"
+msgstr "Zuletzt angemeldet"
+
+#: classes/pref/users.php:145
+msgid "Subscribed feeds count"
+msgstr "Anzahl abonnierter Feeds"
+
+#: classes/pref/users.php:146
+msgid "Stored articles"
+msgstr "Gespeicherte Artikel"
+
+#: classes/pref/users.php:150
+#: classes/pref/users.php:405
+msgid "Subscribed feeds"
+msgstr "Abonnierte Feeds"
+
+#: classes/pref/users.php:176
+msgid "User not found"
+msgstr "Benutzer nicht gefunden"
+
+#: classes/pref/users.php:246
 #, php-format
-msgid "%s on %s in %s %s"
-msgstr "%s innerhalb %s von %s %s"
+msgid "Added user <b>%s</b> with password <b>%s</b>"
+msgstr "Benutzer <b>%s</b> mit Passwort <b>%s</b> hinzugefügt"
 
-#: classes/pref/filters.php:383
-#: classes/pref/filters.php:870
-#: classes/pref/filters.php:977
-msgid "Match"
-msgstr "Kriterien"
-
-#: classes/pref/filters.php:397
-#: classes/pref/filters.php:455
-#: classes/pref/filters.php:884
-#: classes/pref/filters.php:911
-msgid "Add"
-msgstr "Hinzufügen"
-
-#: classes/pref/filters.php:400
-#: classes/pref/filters.php:458
-#: classes/pref/filters.php:887
-#: classes/pref/filters.php:914
-#: classes/feeds.php:122
-msgid "Delete"
-msgstr "Löschen"
-
-#: classes/pref/filters.php:441
-#: classes/pref/filters.php:897
-msgid "Apply actions"
-msgstr "Aktionen anwenden"
-
-#: classes/pref/filters.php:492
-#: classes/pref/filters.php:926
-msgid "Enabled"
-msgstr "Aktiviert"
-
-#: classes/pref/filters.php:501
-#: classes/pref/filters.php:929
-msgid "Match any rule"
-msgstr "Ein erfülltes Kriterium ist ausreichend"
-
-#: classes/pref/filters.php:510
-#: classes/pref/filters.php:932
-msgid "Inverse matching"
-msgstr "Invertierte Übereinstimmung"
-
-#: classes/pref/filters.php:522
-#: classes/pref/filters.php:939
-msgid "Test"
-msgstr "Test"
-
-#: classes/pref/filters.php:804
-msgid "Combine"
-msgstr "Zusammenfügen"
-
-#: classes/pref/filters.php:942
-msgid "Create"
-msgstr "Erstellen"
-
-#: classes/pref/filters.php:987
-msgid "Regular expression, without outer delimiters (i.e. slashes)"
-msgstr ""
-
-#: 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:43
-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:797
-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:819
-msgid "Add action"
-msgstr "Aktion hinzufügen"
-
-#: classes/pref/filters.php:1139
-msgid "[No caption]"
-msgstr "[kein Titel]"
-
-#: classes/pref/filters.php:1141
+#: classes/pref/users.php:253
 #, php-format
-msgid "%s (%d rule)"
-msgid_plural "%s (%d rules)"
-msgstr[0] "%s (%d Regel)"
-msgstr[1] "%s (%d Regeln)"
+msgid "Could not create user <b>%s</b>"
+msgstr "Konnte den Benutzer <b>%s</b> nicht anlegen"
 
-#: classes/pref/filters.php:1155
-msgid "matches any rule"
-msgstr "erfüllt alle Regeln"
-
-#: classes/pref/filters.php:1158
+#: classes/pref/users.php:257
 #, php-format
-msgid "%s (+%d action)"
-msgid_plural "%s (+%d actions)"
-msgstr[0] "%s (+%d Aktion)"
-msgstr[1] "%s (+%d Aktionen)"
+msgid "User <b>%s</b> already exists."
+msgstr "Benutzer <b>%s</b> existiert bereits."
+
+#: classes/pref/users.php:285
+#, 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:287
+#, 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:310
+msgid "[tt-rss] Password change notification"
+msgstr "[tt-rss] Benachrichtigung: Passwort geändert"
+
+#: classes/pref/users.php:363
+msgid "Create user"
+msgstr "Benutzer anlegen"
+
+#: classes/pref/users.php:371
+#: classes/handler/public.php:747
+msgid "Reset password"
+msgstr "Passwort zurücksetzen"
+
+#: classes/pref/users.php:404
+msgid "Access Level"
+msgstr "Zugriffsberechtigung"
+
+#: classes/pref/users.php:407
+msgid "Last login"
+msgstr "Zuletzt angemeldet"
+
+#: classes/pref/users.php:426
+msgid "Click to edit"
+msgstr "Zum Bearbeiten klicken"
+
+#: classes/pref/users.php:446
+msgid "No users defined."
+msgstr "Keine Benutzer definiert."
+
+#: classes/pref/users.php:448
+msgid "No matching users found."
+msgstr "Keine zugehörigen Benutzer gefunden."
 
 #: classes/pref/prefs.php:19
 msgid "Interface"
@@ -1991,7 +1914,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:1424
+#: js/prefs.js:1136
 msgid "Customize stylesheet"
 msgstr "Benutzerdefiniertes Stylesheet"
 
@@ -2234,250 +2157,295 @@ msgstr "Ausgewählte Profile entfernen"
 msgid "Activate profile"
 msgstr "Profil aktivieren"
 
-#: classes/feeds.php:53
-msgid "View as RSS feed"
-msgstr "Als RSS-Feed anzeigen"
+#: 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."
 
-#: classes/feeds.php:62
+#: classes/dlg.php:44
+msgid "Your Public OPML URL is:"
+msgstr "Ihre öffentliche OPML-URL lautet:"
+
+#: classes/dlg.php:53
+#: classes/dlg.php:178
+#: plugins/share/init.php:125
+msgid "Generate new URL"
+msgstr "Erzeuge neue URL"
+
+#: classes/dlg.php:67
+msgid "Update daemon is enabled in configuration, but daemon process is not running, which prevents all feeds from updating. Please start the daemon process or contact instance owner."
+msgstr "Der Aktualisierungs-Daemon ist in den Einstellungen aktiviert, aber der Daemon Prozess läuft nicht, weshalb keine Feeds aktualisiert werden können. Bitte starten Sie den Prozess des Daemons oder benachrichtigen Sie den Besitzer der Instanz."
+
+#: classes/dlg.php:71
+#: classes/dlg.php:80
+msgid "Last update:"
+msgstr "Letzte Aktualisierung:"
+
+#: classes/dlg.php:76
+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 "Der Aktualisierungs Daemon braucht zu lange, um eine Aktualisierung durchzuführen. Dies könnte auf ein Problem wie einen Absturz oder eine Blockierung hinweisen. Bitte überprüfen Sie den Prozess des Daemons oder benachrichtigen Sie den Besitzer des Instanz."
+
+#: classes/dlg.php:169
+msgid "You can view this feed as RSS using the following URL:"
+msgstr "Sie finden diesen Feed als RSS unter der folgenden URL:"
+
+#: classes/dlg.php:190
+msgid "You are using default tt-rss password. Please change it in the Preferences (Personal data / Authentication)."
+msgstr ""
+
+#: classes/dlg.php:194
+#, fuzzy
+msgid "Open Preferences"
+msgstr "Einstellungen"
+
+#: classes/opml.php:31
+#: classes/opml.php:36
+msgid "OPML Utility"
+msgstr "OPML Werkzeug"
+
+#: classes/opml.php:40
+msgid "Importing OPML..."
+msgstr "Importiere OPML..."
+
+#: classes/opml.php:45
+msgid "Return to preferences"
+msgstr "Zu den Einstellungen zurückkehren"
+
+#: classes/opml.php:301
 #, php-format
-msgid "Last updated: %s"
-msgstr "Letzte Aktualisierung: %s"
+msgid "Adding feed: %s"
+msgstr "Füge Feed hinzu: %s"
 
-#: classes/feeds.php:100
-msgid "Select..."
-msgstr "Wähle..."
-
-#: classes/feeds.php:104
-msgid "Invert"
-msgstr "Umkehren"
-
-#: classes/feeds.php:107
-msgid "Selection toggle:"
-msgstr "Auswahl umschalten:"
-
-#: classes/feeds.php:113
-msgid "Selection:"
-msgstr "Auswahl:"
-
-#: classes/feeds.php:116
-msgid "Set score"
-msgstr "Bewerten"
-
-#: classes/feeds.php:119
-msgid "Archive"
-msgstr "Archiv"
-
-#: classes/feeds.php:121
-msgid "Move back"
-msgstr "Zurückgehen"
-
-#: classes/feeds.php:127
-#: classes/feeds.php:132
-#: plugins/mail/init.php:76
-#: plugins/mailto/init.php:25
-msgid "Forward by email"
-msgstr "Per E-Mail weiterleiten"
-
-#: classes/feeds.php:136
-msgid "Feed:"
-msgstr "Feed:"
-
-#: classes/feeds.php:193
-#: classes/feeds.php:819
-msgid "Feed not found."
-msgstr "Feed nicht gefunden."
-
-#: classes/feeds.php:255
-msgid "Never"
-msgstr "Niemals"
-
-#: classes/feeds.php:342
+#: classes/opml.php:312
 #, php-format
-msgid "Imported at %s"
-msgstr "Importiert nach %s"
+msgid "Duplicate feed: %s"
+msgstr "Doppelter Feed: %s"
 
-#: classes/feeds.php:394
-#: classes/feeds.php:487
-msgid "mark feed as read"
-msgstr "den Feed als gelesen markieren"
-
-#: classes/feeds.php:542
-msgid "Collapse article"
-msgstr "Artikel einklappen"
-
-#: classes/feeds.php:703
-msgid "No unread articles found to display."
-msgstr "Keine ungelesenen Artikel zum Anzeigen gefunden."
-
-#: classes/feeds.php:706
-msgid "No updated articles found to display."
-msgstr "Keine aktualisierten Artikel zum Anzeigen gefunden."
-
-#: classes/feeds.php:709
-msgid "No starred articles found to display."
-msgstr "Keine markierten Artikel zum Anzeigen gefunden."
-
-#: classes/feeds.php:713
-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:715
-msgid "No articles found to display."
-msgstr "Keine Artikel zum Anzeigen gefunden."
-
-#: classes/feeds.php:731
-#: classes/feeds.php:922
+#: classes/opml.php:326
 #, php-format
-msgid "Feeds last updated at %s"
-msgstr "Feeds zuletzt aktualisiert am %s"
+msgid "Adding label %s"
+msgstr "Füge Label %s hinzu"
 
-#: classes/feeds.php:743
-#: classes/feeds.php:934
-msgid "Some feeds have update errors (click for details)"
-msgstr "Einige Feeds haben Aktualisierungsfehler (klicken für Details)"
-
-#: classes/feeds.php:911
-msgid "No feed selected."
-msgstr "Keinen Feed ausgewählt."
-
-#: classes/feeds.php:975
-#: classes/feeds.php:983
-msgid "Feed or site URL"
-msgstr "URL von Feed oder Seite"
-
-#: classes/feeds.php:997
-msgid "Available feeds"
-msgstr "Verfügbare Feeds"
-
-#: classes/feeds.php:1034
-msgid "More feeds"
-msgstr "Weitere Feeds"
-
-#: classes/feeds.php:1063
-msgid "Popular feeds"
-msgstr "Beliebte Feeds"
-
-#: classes/feeds.php:1064
-msgid "Feed archive"
-msgstr "Feed-Archiv"
-
-#: classes/feeds.php:1067
-msgid "limit:"
-msgstr "Grenzwert:"
-
-#: classes/feeds.php:1101
-msgid "Look for"
-msgstr "Suche nach"
-
-#: classes/feeds.php:1109
+#: classes/opml.php:329
 #, php-format
-msgid "in %s"
-msgstr "in %s"
+msgid "Duplicate label: %s"
+msgstr "Doppeltes Label: %s"
 
-#: classes/feeds.php:1114
-msgid "Used for word stemming"
-msgstr "Verwendet für Wortstamm"
-
-#: classes/feeds.php:1123
-msgid "Search syntax"
-msgstr "Such-Syntax"
-
-#: classes/feeds.php:1577
-msgid "Starred articles"
-msgstr "Markierte Artikel"
-
-#: classes/feeds.php:1579
-msgid "Published articles"
-msgstr "Veröffentlichte Artikel"
-
-#: classes/feeds.php:1581
-msgid "Fresh articles"
-msgstr "Neue Artikel"
-
-#: classes/feeds.php:1585
-msgid "Archived articles"
-msgstr "Archivierte Artikel"
-
-#: classes/feeds.php:1587
-msgid "Recently read"
-msgstr "Kürzlich gelesen"
-
-#: classes/feeds.php:1708
-msgid "Special"
-msgstr "Sonderfeeds"
-
-#: classes/feeds.php:1965
+#: classes/opml.php:341
 #, php-format
-msgid "Search results: %s"
-msgstr "Suchergebnisse: %s"
+msgid "Setting preference key %s to %s"
+msgstr "Setze Konfigurationsoption %s auf %s"
 
-#: plugins/nsfw/init.php:30
-#: plugins/nsfw/init.php:42
-msgid "Not work safe (click to toggle)"
-msgstr "NSFW (Klicken zum Anzeigen)"
+#: classes/opml.php:377
+msgid "Adding filter..."
+msgstr "Füge Filter hinzu..."
 
-#: plugins/nsfw/init.php:52
-msgid "NSFW Plugin"
-msgstr "NSFW Plugin"
+#: classes/opml.php:512
+#, php-format
+msgid "Processing category: %s"
+msgstr "Verarbeite Kategorie: %s"
 
-#: plugins/nsfw/init.php:79
-msgid "Tags to consider NSFW (comma-separated)"
-msgstr "Liste von NSFW-Tags (kommagetrennt)"
+#: classes/opml.php:558
+#, php-format
+msgid "Upload failed with error code %d"
+msgstr "Upload schlug fehl. Fehlercode: %d"
 
-#: plugins/nsfw/init.php:100
-msgid "Configuration saved."
-msgstr "Die Einstellungen wurden gespeichert."
+#: classes/opml.php:570
+#: plugins/import_export/init.php:471
+msgid "Unable to move uploaded file."
+msgstr "Fehler: konnte die hochgeladene Datei nicht verschieben."
 
-#: plugins/note/init.php:28
-#: plugins/note/note.js:11
-msgid "Edit article note"
-msgstr "Artikelnotizen bearbeiten"
+#: classes/opml.php:574
+#: plugins/import_export/init.php:475
+msgid "Error: please upload OPML file."
+msgstr "Fehler: bitte eine OPML-Datei hochladen."
+
+#: classes/opml.php:585
+msgid "Error: unable to find moved OPML file."
+msgstr "Fehler: konnte die verschobene OPML-Datei nicht finden."
+
+#: classes/opml.php:594
+msgid "Error while parsing document."
+msgstr "Fehler beim Parsen des Dokuments."
+
+#: classes/article.php:26
+msgid "Article not found."
+msgstr "Artikel nicht gefunden."
+
+#: classes/article.php:211
+msgid "Tags for this article (separated by commas):"
+msgstr "Tags für diesen Artikel (durch Komma getrennt):"
+
+#: classes/article.php:337
+#: classes/article.php:719
+#: classes/article.php:874
+msgid "no tags"
+msgstr "keine Tags"
+
+#: classes/article.php:447
+msgid "unknown type"
+msgstr "unbekannter Typ"
+
+#: classes/article.php:524
+msgid "Attachments"
+msgstr "Anhänge"
+
+#: classes/article.php:688
+msgid " - "
+msgstr " - "
+
+#: classes/article.php:912
+msgid "(edit note)"
+msgstr "(Notiz bearbeiten)"
+
+#: classes/handler/public.php:407
+#: plugins/bookmarklets/init.php:40
+msgid "Share with Tiny Tiny RSS"
+msgstr "Teilen mit Tiny Tiny RSS"
+
+#: classes/handler/public.php:415
+msgid "Title:"
+msgstr "Titel:"
+
+#: classes/handler/public.php:419
+msgid "Content:"
+msgstr "Inhalt:"
+
+#: classes/handler/public.php:421
+msgid "Labels:"
+msgstr "Label:"
+
+#: classes/handler/public.php:440
+msgid "Shared article will appear in the Published feed."
+msgstr "Geteilte Artikel erscheinen unter 'Veröffentlichte Artikel'."
+
+#: classes/handler/public.php:442
+msgid "Share"
+msgstr "Teilen"
+
+#: classes/handler/public.php:464
+msgid "Not logged in"
+msgstr "Nicht angemeldet"
+
+#: classes/handler/public.php:527
+msgid "Incorrect username or password"
+msgstr "Benutzername oder Passwort falsch"
+
+#: classes/handler/public.php:581
+#, php-format
+msgid "Already subscribed to <b>%s</b>."
+msgstr "<b>%s</b> bereits abonniert."
+
+#: classes/handler/public.php:584
+#, php-format
+msgid "Subscribed to <b>%s</b>."
+msgstr "<b>%s</b> abonniert."
+
+#: classes/handler/public.php:587
+#, php-format
+msgid "Could not subscribe to <b>%s</b>."
+msgstr "Konnte <b>%s</b> nicht abonnieren."
+
+#: classes/handler/public.php:590
+#, php-format
+msgid "No feeds found in <b>%s</b>."
+msgstr "Keine Feeds in <b>%s</b> gefunden."
+
+#: classes/handler/public.php:593
+msgid "Multiple feed URLs found."
+msgstr "Mehrere Feed-URLs gefunden."
+
+#: classes/handler/public.php:597
+#, 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:615
+msgid "Subscribe to selected feed"
+msgstr "Ausgewählte Feeds abonnieren"
+
+#: classes/handler/public.php:642
+msgid "Edit subscription options"
+msgstr "Abonnementoptionen bearbeiten"
+
+#: classes/handler/public.php:680
+msgid "Password recovery"
+msgstr "Passwort-Wiederherstellung"
+
+#: classes/handler/public.php:725
+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:757
+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:761
+#: classes/handler/public.php:830
+msgid "Go back"
+msgstr "Zurück"
+
+#: classes/handler/public.php:799
+msgid "[tt-rss] Password reset request"
+msgstr "[tt-rss] neues Passwort anfordern"
+
+#: 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: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:874
+msgid "Database Updater"
+msgstr "Datenbank-Updater"
+
+#: classes/handler/public.php:939
+msgid "Perform updates"
+msgstr "Aktualisierungen durchführen"
+
+#: plugins/af_zz_imgproxy/init.php:208
+msgid "Image proxy settings (af_zz_imgproxy)"
+msgstr "Bild-Proxy Einstellungen (af_zz_imgproxy)"
+
+#: plugins/af_zz_imgproxy/init.php:232
+msgid "Enable proxy for all remote images."
+msgstr "Aktiviere proxy für alle remote Bilddateien."
+
+#: plugins/af_zz_imgproxy/init.php:236
+msgid "Don't cache files locally."
+msgstr "Bilder lokal zwischenspeichern."
+
+#: plugins/af_zz_imgproxy/init.php:252
+#: plugins/af_redditimgur/init.php:79
+msgid "Configuration saved"
+msgstr "Die Einstellungen wurden gespeichert"
 
 #: plugins/vf_shared/init.php:17
 #: plugins/vf_shared/init.php:73
 msgid "Shared articles"
 msgstr "Geteilte Artikel"
 
-#: plugins/auth_internal/init.php:67
-msgid "Please enter your one time password:"
-msgstr "Bitte geben Sie Einmalpasswort ein:"
+#: plugins/bookmarklets/init.php:20
+msgid "Bookmarklets"
+msgstr "Lesezeichen"
 
-#: plugins/auth_internal/init.php:208
-msgid "Password has been changed."
-msgstr "Passwort wurde geändert."
+#: 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 "Ziehen Sie den folgenden Link in Ihre Browser-Toolbar, öffnen Sie den Feed, an dem Sie interessiert sind, in Ihren Browser und klicken auf den Link, um ihn zu abonnieren."
 
-#: plugins/auth_internal/init.php:210
-msgid "Old password is incorrect."
-msgstr "Altes Passwort ist falsch."
+#: plugins/bookmarklets/init.php:26
+#, php-format
+msgid "Subscribe to %s in Tiny Tiny RSS?"
+msgstr "%s in Tiny Tiny RSS abonnieren?"
 
-#: plugins/af_readability/init.php:25
-msgid "Data saved."
-msgstr "Daten gespeichert."
+#: plugins/bookmarklets/init.php:31
+msgid "Subscribe in Tiny Tiny RSS"
+msgstr "Abonnieren in Tiny Tiny RSS"
 
-#: plugins/af_readability/init.php:41
-msgid "Inline content"
-msgstr "Eingebetteter Artikelinhalt"
-
-#: plugins/af_readability/init.php:47
-msgid "Readability settings (af_readability)"
-msgstr "Readability Einstellungen (af_readability)"
-
-#: plugins/af_readability/init.php:78
-msgid "Use Readability for pages shared via bookmarklet."
-msgstr "Verwende Readability für über das Bookmarklet geteilte Seiten."
-
-#: plugins/af_readability/init.php:90
-#: plugins/af_psql_trgm/init.php:198
-msgid "Currently enabled for (click to edit):"
-msgstr "Zur Zeit aktiviert für (klicken zum Bearbeiten):"
-
-#: plugins/af_readability/init.php:107
-msgid "Readability"
-msgstr "Lesbarkeit"
-
-#: plugins/af_readability/init.php:118
-msgid "Inline article content"
-msgstr "Artikelinhalt"
+#: plugins/bookmarklets/init.php:34
+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_redditimgur/init.php:30
 msgid "Reddit content settings (af_redditimgur)"
@@ -2491,10 +2459,21 @@ msgstr "Extrahiere fehlenden Inhalt mit Readability"
 msgid "Enable additional duplicate checking"
 msgstr "Zusätzliche Duplikat-Prüfung aktivieren"
 
-#: plugins/af_redditimgur/init.php:79
-#: plugins/af_zz_imgproxy/init.php:252
-msgid "Configuration saved"
-msgstr "Die Einstellungen wurden gespeichert"
+#: plugins/af_comics/init.php:49
+msgid "Feeds supported by af_comics"
+msgstr "Von af_comics unterstützte Feeds"
+
+#: plugins/af_comics/init.php:51
+msgid "The following comics are currently supported:"
+msgstr "Die folgenden Comics werden momentan unterstützt:"
+
+#: plugins/af_comics/init.php:69
+msgid "To subscribe to GoComics use the comic's regular web page as the feed URL (e.g. for the <em>Garfield</em> comic use <code>http://www.gocomics.com/garfield</code>)."
+msgstr ""
+
+#: plugins/af_comics/init.php:71
+msgid "Drop any updated filters into <code>filters.local</code> in plugin directory."
+msgstr "Speichere aktualisierte Filter in <code>filters.local</code> im Plugin Verzeichnis."
 
 #: plugins/af_psql_trgm/init.php:29
 #, php-format
@@ -2530,25 +2509,83 @@ msgstr "Mindestlänge des Titels:"
 msgid "Enable for all feeds:"
 msgstr "Für alle Feeds aktivieren:"
 
+#: plugins/af_psql_trgm/init.php:198
+#: plugins/af_readability/init.php:90
+msgid "Currently enabled for (click to edit):"
+msgstr "Zur Zeit aktiviert für (klicken zum Bearbeiten):"
+
 #: plugins/af_psql_trgm/init.php:216
 msgid "Similarity (pg_trgm)"
 msgstr "Ähnlichkeit (pg_trgm)"
 
-#: plugins/af_comics/init.php:49
-msgid "Feeds supported by af_comics"
-msgstr "Von af_comics unterstützte Feeds"
+#: plugins/af_readability/init.php:25
+msgid "Data saved."
+msgstr "Daten gespeichert."
 
-#: plugins/af_comics/init.php:51
-msgid "The following comics are currently supported:"
-msgstr "Die folgenden Comics werden momentan unterstützt:"
+#: plugins/af_readability/init.php:41
+msgid "Inline content"
+msgstr "Eingebetteter Artikelinhalt"
 
-#: plugins/af_comics/init.php:69
-msgid "To subscribe to GoComics use the comic's regular web page as the feed URL (e.g. for the <em>Garfield</em> comic use <code>http://www.gocomics.com/garfield</code>)."
-msgstr ""
+#: plugins/af_readability/init.php:47
+msgid "Readability settings (af_readability)"
+msgstr "Readability Einstellungen (af_readability)"
 
-#: plugins/af_comics/init.php:71
-msgid "Drop any updated filters into <code>filters.local</code> in plugin directory."
-msgstr "Speichere aktualisierte Filter in <code>filters.local</code> im Plugin Verzeichnis."
+#: plugins/af_readability/init.php:78
+msgid "Use Readability for pages shared via bookmarklet."
+msgstr "Verwende Readability für über das Bookmarklet geteilte Seiten."
+
+#: plugins/af_readability/init.php:107
+msgid "Readability"
+msgstr "Lesbarkeit"
+
+#: plugins/af_readability/init.php:118
+msgid "Inline article content"
+msgstr "Artikelinhalt"
+
+#: plugins/mailto/init.php:50
+#: plugins/mailto/init.php:58
+#: plugins/mail/init.php:118
+#: plugins/mail/init.php:124
+msgid "[Forwarded]"
+msgstr "[Weitergeleitet]"
+
+#: plugins/mailto/init.php:50
+#: plugins/mail/init.php:118
+msgid "Multiple articles"
+msgstr "Mehrere Artikel"
+
+#: plugins/mailto/init.php:74
+msgid "Clicking the following link to invoke your mail client:"
+msgstr "Klicken Sie den folgenden Link, um Ihren Mailclienten aufzurufen:"
+
+#: plugins/mailto/init.php:78
+msgid "Forward selected article(s) by email."
+msgstr "Markierte(n) Artikel per E-Mail weiterleiten."
+
+#: plugins/mailto/init.php:81
+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/mailto/init.php:86
+msgid "Close this dialog"
+msgstr "Diesen Dialog schließen"
+
+#: 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/import_export/init.php:53
 msgid "Import and export"
@@ -2616,99 +2653,6 @@ msgstr "Upload schlug fehl. Fehlercode: %d (%s)"
 msgid "No file uploaded."
 msgstr "Es wurde keine Datei hochgeladen."
 
-#: plugins/mail/init.php:29
-msgid "Mail addresses saved."
-msgstr "Mailadresse gespeichert."
-
-#: plugins/mail/init.php:35
-msgid "Mail plugin"
-msgstr "Mail-Plugin"
-
-#: plugins/mail/init.php:37
-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:118
-#: plugins/mail/init.php:124
-#: plugins/mailto/init.php:50
-#: plugins/mailto/init.php:58
-msgid "[Forwarded]"
-msgstr "[Weitergeleitet]"
-
-#: plugins/mail/init.php:118
-#: plugins/mailto/init.php:50
-msgid "Multiple articles"
-msgstr "Mehrere Artikel"
-
-#: plugins/mail/init.php:146
-msgid "To:"
-msgstr "Empfänger:"
-
-#: plugins/mail/init.php:161
-msgid "Subject:"
-msgstr "Betreff:"
-
-#: plugins/mail/init.php:178
-msgid "Send e-mail"
-msgstr "E-Mail versenden"
-
-#: plugins/close_button/init.php:25
-msgid "Close article"
-msgstr "Artikel schließen"
-
-#: plugins/bookmarklets/init.php:20
-msgid "Bookmarklets"
-msgstr "Lesezeichen"
-
-#: 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 "Ziehen Sie den folgenden Link in Ihre Browser-Toolbar, öffnen Sie den Feed, an dem Sie interessiert sind, in Ihren Browser und klicken auf den Link, um ihn zu abonnieren."
-
-#: plugins/bookmarklets/init.php:26
-#, php-format
-msgid "Subscribe to %s in Tiny Tiny RSS?"
-msgstr "%s in Tiny Tiny RSS abonnieren?"
-
-#: plugins/bookmarklets/init.php:31
-msgid "Subscribe in Tiny Tiny RSS"
-msgstr "Abonnieren in Tiny Tiny RSS"
-
-#: plugins/bookmarklets/init.php:34
-msgid "Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS"
-msgstr "Benutzen Sie dieses Lesezeichen, um beliebige Seiten mit Tiny Tiny RSS zu teilen"
-
-#: plugins/toggle_sidebar/init.php:23
-msgid "Collapse feedlist"
-msgstr "Feedliste verbergen"
-
-#: plugins/af_zz_imgproxy/init.php:208
-msgid "Image proxy settings (af_zz_imgproxy)"
-msgstr "Bild-Proxy Einstellungen (af_zz_imgproxy)"
-
-#: plugins/af_zz_imgproxy/init.php:232
-msgid "Enable proxy for all remote images."
-msgstr "Aktiviere proxy für alle remote Bilddateien."
-
-#: plugins/af_zz_imgproxy/init.php:236
-msgid "Don't cache files locally."
-msgstr "Bilder lokal zwischenspeichern."
-
-#: plugins/mailto/init.php:74
-msgid "Clicking the following link to invoke your mail client:"
-msgstr "Klicken Sie den folgenden Link, um Ihren Mailclienten aufzurufen:"
-
-#: plugins/mailto/init.php:78
-msgid "Forward selected article(s) by email."
-msgstr "Markierte(n) Artikel per E-Mail weiterleiten."
-
-#: plugins/mailto/init.php:81
-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/mailto/init.php:86
-msgid "Close this dialog"
-msgstr "Diesen Dialog schließen"
-
 #: plugins/share/init.php:41
 msgid "You can disable all articles shared by unique URLs here."
 msgstr "Sie können alle durch URLs geteilten Artikel hier deaktivieren."
@@ -2729,443 +2673,592 @@ msgstr "Sie können diesen Artikel über folgende eindeutige URL teilen:"
 msgid "Unshare article"
 msgstr "Artikel nicht mehr teilen"
 
-#: js/FeedTree.js:75
+#: plugins/toggle_sidebar/init.php:23
+msgid "Collapse feedlist"
+msgstr "Feedliste verbergen"
+
+#: plugins/close_button/init.php:25
+msgid "Close article"
+msgstr "Artikel schließen"
+
+#: plugins/mail/init.php:29
+msgid "Mail addresses saved."
+msgstr "Mailadresse gespeichert."
+
+#: plugins/mail/init.php:35
+msgid "Mail plugin"
+msgstr "Mail-Plugin"
+
+#: plugins/mail/init.php:37
+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:146
+msgid "To:"
+msgstr "Empfänger:"
+
+#: plugins/mail/init.php:161
+msgid "Subject:"
+msgstr "Betreff:"
+
+#: plugins/mail/init.php:178
+msgid "Send e-mail"
+msgstr "E-Mail versenden"
+
+#: plugins/note/init.php:28
+#: plugins/note/note.js:11
+msgid "Edit article note"
+msgstr "Artikelnotizen bearbeiten"
+
+#: plugins/auth_internal/init.php:67
+msgid "Please enter your one time password:"
+msgstr "Bitte geben Sie Einmalpasswort ein:"
+
+#: plugins/auth_internal/init.php:208
+msgid "Password has been changed."
+msgstr "Passwort wurde geändert."
+
+#: plugins/auth_internal/init.php:210
+msgid "Old password is incorrect."
+msgstr "Altes Passwort ist falsch."
+
+#: js/FeedTree.js:76
 msgid "(Un)collapse"
 msgstr "ein-/ausklappen"
 
-#: js/PrefFeedTree.js:35
+#: js/PrefFeedTree.js:36
 msgid "Edit category"
 msgstr "Kategorie bearbeiten"
 
-#: js/PrefFeedTree.js:42
+#: js/PrefFeedTree.js:43
 msgid "Remove category"
 msgstr "Kategorie entfernen"
 
-#: js/PrefFilterTree.js:46
+#: js/PrefFilterTree.js:47
 msgid "Inverse"
 msgstr "Invertiert"
 
-#: js/feedlist.js:511
+#: js/feedlist.js:461
 msgid "Mark %w in %s older than 1 day as read?"
 msgstr "Markiere %w in %s, die älter als einen Tag sind, als gelesen?"
 
-#: js/feedlist.js:514
+#: js/feedlist.js:464
 msgid "Mark %w in %s older than 1 week as read?"
 msgstr "Markiere %w in %s, die älter als eine Woche sind, als gelesen?"
 
-#: js/feedlist.js:517
+#: js/feedlist.js:467
 msgid "Mark %w in %s older than 2 weeks as read?"
 msgstr "Markiere %w in %s, die älter als 2 Wochen sind, als gelesen?"
 
-#: js/feedlist.js:520
+#: js/feedlist.js:470
 msgid "Mark %w in %s as read?"
 msgstr "Markiere %w in %s als gelesen?"
 
-#: js/feedlist.js:523
+#: js/feedlist.js:473
 msgid "search results"
 msgstr "Suchergebnisse"
 
-#: js/feedlist.js:523
+#: js/feedlist.js:473
 msgid "all articles"
 msgstr "alle Artikel"
 
-#: js/functions.js:74
+#: js/functions.js:100
 msgid "Close"
 msgstr "Schließen"
 
-#: js/functions.js:141
+#: js/functions.js:167
 msgid "Click to close"
 msgstr "Zum Schließen klicken"
 
-#: js/functions.js:448
+#: js/functions.js:456
 msgid "Error explained"
 msgstr "Fehler erklärt"
 
-#: js/functions.js:592
+#: js/functions.js:490
+msgid "Upload complete."
+msgstr "Upload fertig."
+
+#: js/functions.js:508
+msgid "Remove stored feed icon?"
+msgstr "Gespeichertes Feed-Symbol entfernen?"
+
+#: js/functions.js:510
+msgid "Removing feed icon..."
+msgstr "Feedsymbol wird entfernt."
+
+#: js/functions.js:515
+msgid "Feed icon removed."
+msgstr "Feedsymbol entfernt."
+
+#: js/functions.js:532
+msgid "Please select an image file to upload."
+msgstr "Bitte eine Bilddatei zum Hochladen auswählen."
+
+#: js/functions.js:533
+msgid "Upload new icon for this feed?"
+msgstr "Neues Symbol für diesen Feed hochladen?"
+
+#: js/functions.js:534
+msgid "Uploading, please wait..."
+msgstr "Lade hoch, bitte warten..."
+
+#: js/functions.js:542
+msgid "Please enter label caption:"
+msgstr "Bitte einen Label-Titel eingeben:"
+
+#: js/functions.js:575
 msgid "Subscribe to Feed"
 msgstr "Feed abonnieren"
 
-#: js/functions.js:621
+#: js/functions.js:602
 msgid "Failed to parse output. This can indicate server timeout and/or network issues. Backend output was logged to browser console."
 msgstr "Fehler beim Verarbeiten der Ausgabe. Dies kann auf einen Server-Timeout oder Netzwerkprobleme deuten. Die Ausgabe des Backends wurde in der Browser-Konsole protokolliert."
 
-#: js/functions.js:636
+#: js/functions.js:617
 #, perl-format
 msgid "Subscribed to %s"
 msgstr "%s abonniert"
 
-#: js/functions.js:641
+#: js/functions.js:622
 msgid "Specified URL seems to be invalid."
 msgstr "Die angegebene URL scheint ungültig zu sein."
 
-#: js/functions.js:644
+#: js/functions.js:625
 msgid "Specified URL doesn't seem to contain any feeds."
 msgstr "Die angegebene URL scheint keine Feeds zu enthalten."
 
-#: js/functions.js:656
+#: js/functions.js:637
 msgid "Expand to select feed"
 msgstr "Ausklappen, um Feed auszuwählen"
 
-#: js/functions.js:668
+#: js/functions.js:649
 #, perl-format
 msgid "Couldn't download the specified URL: %s"
 msgstr "Die angegebene URL konnte nicht heruntergeladen werden: %s"
 
-#: js/functions.js:672
+#: js/functions.js:653
 #, perl-format
 msgid "XML validation failed: %s"
 msgstr "XML-Validierung fehlgeschlagen: %s"
 
-#: js/functions.js:676
+#: js/functions.js:657
 msgid "You are already subscribed to this feed."
 msgstr "Sie haben diesen Feed bereits abonniert."
 
-#: js/functions.js:1136
+#: js/functions.js:1098
 msgid "Generate new syndication address for this feed?"
 msgstr "Neue Veröffentlichungsadresse für diesen Feed erzeugen?"
 
-#: js/functions.js:1140
-#: js/prefs.js:1095
+#: js/functions.js:1100
+#: js/prefs.js:870
 msgid "Trying to change address..."
 msgstr "Versuche, die Adresse zu ändern..."
 
-#: js/functions.js:1245
-#: js/tt-rss.js:446
-#: js/tt-rss.js:673
+#: js/functions.js:1199
+#: js/tt-rss.js:399
+#: js/tt-rss.js:612
 msgid "You can't edit this kind of feed."
 msgstr "Sie können diese Art von Feed nicht bearbeiten."
 
-#: js/functions.js:1260
+#: js/functions.js:1213
 msgid "Edit Feed"
 msgstr "Feed bearbeiten"
 
-#: js/functions.js:1266
-#: js/prefs.js:100
-#: js/prefs.js:209
-#: js/prefs.js:647
+#: js/functions.js:1217
+#: js/prefs.js:176
+#: js/prefs.js:523
+#: js/prefs.js:1139
+#: js/prefs.js:78
 msgid "Saving data..."
 msgstr "Speichere Daten..."
 
-#: js/functions.js:1293
+#: js/functions.js:1243
 msgid "More Feeds"
 msgstr "Weitere Feeds"
 
-#: js/functions.js:1355
-#: js/functions.js:1464
-#: js/prefs.js:398
-#: js/prefs.js:540
-#: js/prefs.js:558
-#: js/prefs.js:1077
+#: js/functions.js:1297
+#: js/functions.js:1383
+#: js/prefs.js:332
+#: js/prefs.js:455
+#: js/prefs.js:473
+#: js/prefs.js:855
 msgid "No feeds are selected."
 msgstr "Keine Feeds ausgewählt."
 
-#: js/functions.js:1398
+#: js/functions.js:1329
 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:1435
+#: js/functions.js:1360
 msgid "Feeds with update errors"
 msgstr "Feeds mit Aktualisierungsfehlern"
 
-#: js/functions.js:1446
-#: js/prefs.js:1058
+#: js/functions.js:1369
+#: js/prefs.js:841
 msgid "Remove selected feeds?"
 msgstr "Ausgewählte Feeds entfernen?"
 
-#: js/functions.js:1449
-#: js/prefs.js:1061
+#: js/functions.js:1370
+#: js/prefs.js:842
 msgid "Removing selected feeds..."
 msgstr "Ausgewählte Feeds werden entfernt..."
 
-#: js/prefs.js:60
-msgid "Please enter login:"
-msgstr "Bitte Benutzernamen eingeben:"
-
-#: js/prefs.js:67
-msgid "Can't create user: no login specified."
-msgstr "Kann den Benutzer nicht hinzufügen: kein Login angegeben."
-
-#: js/prefs.js:71
-msgid "Adding user..."
-msgstr "Füge Benutzer hinzu..."
-
-#: js/prefs.js:96
-msgid "User Editor"
-msgstr "Benutzereditor"
-
-#: js/prefs.js:131
-msgid "Edit Filter"
-msgstr "Filter bearbeiten"
-
-#: js/prefs.js:170
+#: js/prefs.js:143
 msgid "Remove filter?"
 msgstr "Filter entfernen?"
 
-#: js/prefs.js:175
+#: js/prefs.js:148
 msgid "Removing filter..."
 msgstr "Filter werden entfernt..."
 
-#: js/prefs.js:292
+#: js/prefs.js:251
 msgid "Remove selected labels?"
 msgstr "Ausgewählte Label entfernen?"
 
-#: js/prefs.js:295
+#: js/prefs.js:252
 msgid "Removing selected labels..."
 msgstr "Ausgewählte Label werden entfernt..."
 
-#: js/prefs.js:308
-#: js/prefs.js:1144
+#: js/prefs.js:262
+#: js/prefs.js:909
 msgid "No labels are selected."
 msgstr "Keine Label ausgewählt."
 
-#: js/prefs.js:320
+#: js/prefs.js:274
 msgid "Remove selected users? Neither default admin nor your account will be removed."
 msgstr "Ausgewählte Benutzer löschen? Weder der Administrator noch Ihr eigenes Konto werden gelöscht."
 
-#: js/prefs.js:323
+#: js/prefs.js:275
 msgid "Removing selected users..."
 msgstr "Ausgewählte Benutzer werden entfernt..."
 
-#: js/prefs.js:338
-#: js/prefs.js:408
-#: js/prefs.js:427
-#: js/prefs.js:461
+#: js/prefs.js:286
+#: js/prefs.js:342
+#: js/prefs.js:361
+#: js/prefs.js:387
 msgid "No users are selected."
 msgstr "Keine Benutzer ausgewählt."
 
-#: js/prefs.js:350
+#: js/prefs.js:297
 msgid "Remove selected filters?"
 msgstr "Ausgewählte Filter entfernen?"
 
-#: js/prefs.js:353
+#: js/prefs.js:298
 msgid "Removing selected filters..."
 msgstr "Ausgewählte Filter werden entfernt..."
 
-#: js/prefs.js:366
-#: js/prefs.js:495
-#: js/prefs.js:514
+#: js/prefs.js:308
+#: js/prefs.js:419
+#: js/prefs.js:438
 msgid "No filters are selected."
 msgstr "Keine Filter ausgewählt."
 
-#: js/prefs.js:378
+#: js/prefs.js:319
 msgid "Unsubscribe from selected feeds?"
 msgstr "Ausgewählte Feeds abbestellen?"
 
-#: js/prefs.js:382
+#: js/prefs.js:321
 msgid "Unsubscribing from selected feeds..."
 msgstr "Bestelle ausgewählte Feeds ab..."
 
-#: js/prefs.js:413
-#: js/prefs.js:432
-#: js/prefs.js:466
+#: js/prefs.js:347
+#: js/prefs.js:366
+#: js/prefs.js:392
 msgid "Please select only one user."
 msgstr "Bitte nur einen Benutzer auswählen."
 
-#: js/prefs.js:436
+#: js/prefs.js:370
 msgid "Reset password of selected user?"
 msgstr "Passwort des ausgewählten Benutzers zurücksetzen?"
 
-#: js/prefs.js:439
+#: js/prefs.js:371
 msgid "Resetting password for selected user..."
 msgstr "Passwort des ausgewählten Benutzers wird zurückgesetzt..."
 
-#: js/prefs.js:500
+#: js/prefs.js:424
 msgid "Please select only one filter."
 msgstr "Bitte nur einen Filter auswählen."
 
-#: js/prefs.js:518
+#: js/prefs.js:442
 msgid "Combine selected filters?"
 msgstr "Ausgewählte Filter zusammenfügen?"
 
-#: js/prefs.js:521
+#: js/prefs.js:443
 msgid "Joining filters..."
 msgstr "Filter werden zusammengefügt..."
 
-#: js/prefs.js:580
+#: js/prefs.js:487
 msgid "Edit Multiple Feeds"
 msgstr "Mehrere Feeds bearbeiten"
 
-#: js/prefs.js:604
+#: js/prefs.js:511
 msgid "Save changes to selected feeds?"
 msgstr "Änderungen an den gewählten Feeds speichern?"
 
-#: js/prefs.js:681
+#: js/prefs.js:552
 msgid "OPML Import"
 msgstr "OPML Import"
 
-#: js/prefs.js:700
+#: js/prefs.js:571
 msgid "Please choose an OPML file first."
 msgstr "Bitte zuerst eine OPML-Datei auswählen."
 
-#: js/prefs.js:703
+#: js/prefs.js:574
 #: plugins/import_export/import_export.js:115
 msgid "Importing, please wait..."
 msgstr "Importiere, bitte warten..."
 
-#: js/prefs.js:869
+#: js/prefs.js:737
 msgid "Reset to defaults?"
 msgstr "Auf Standardwerte zurücksetzen?"
 
-#: js/prefs.js:1468
-msgid "Subscribing to feeds..."
-msgstr "Abonniere Feeds..."
+#: js/prefs.js:777
+#, perl-format
+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:1487
-msgid "Clear stored data for this plugin?"
-msgstr "Gesicherte Daten dieses Plugins löschen?"
+#: js/prefs.js:778
+msgid "Removing category..."
+msgstr "Kategorie wird entfernt..."
 
-#: js/prefs.js:1501
-msgid "Clear all messages in the error log?"
-msgstr "Alle Einträge aus dem Fehler-Protokoll löschen?"
+#: js/prefs.js:794
+msgid "Remove selected categories?"
+msgstr "Ausgewählte Kategorien entfernen?"
 
-#: js/tt-rss.js:118
+#: js/prefs.js:795
+msgid "Removing selected categories..."
+msgstr "Ausgewählte Kategorien werden entfernt..."
+
+#: js/prefs.js:805
+msgid "No categories are selected."
+msgstr "Keine Kategorien ausgewählt."
+
+#: js/prefs.js:812
+msgid "Category title:"
+msgstr "Name der Kategorie:"
+
+#: js/prefs.js:815
+msgid "Creating category..."
+msgstr "Kategorie wird erstellt..."
+
+#: js/prefs.js:832
+msgid "Feeds without recent updates"
+msgstr "Feeds ohne kürzliche Aktualisierungen"
+
+#: js/prefs.js:869
+msgid "Replace current OPML publishing address with a new one?"
+msgstr "Aktuelle Veröffentlichungsadresse durch eine Neue ersetzen?"
+
+#: js/prefs.js:898
+msgid "Reset selected labels to default colors?"
+msgstr "Farben der ausgewählten Label auf Standardwerte zurücksetzen?"
+
+#: js/prefs.js:926
+msgid "Settings Profiles"
+msgstr "Einstellungsprofile"
+
+#: js/prefs.js:935
+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:936
+msgid "Removing selected profiles..."
+msgstr "Ausgewählte Profile werden entfernt..."
+
+#: js/prefs.js:948
+msgid "No profiles are selected."
+msgstr "Keine Profile ausgewählt."
+
+#: js/prefs.js:955
+#: js/prefs.js:997
+msgid "Activate selected profile?"
+msgstr "Ausgewählte Profile aktivieren?"
+
+#: js/prefs.js:964
+#: js/prefs.js:1008
+msgid "Please choose a profile to activate."
+msgstr "Bitte ein Profil zum Aktivieren auswählen."
+
+#: js/prefs.js:969
+msgid "Creating profile..."
+msgstr "Profil wird erstellt..."
+
+#: js/prefs.js:1016
+msgid "This will invalidate all previously generated feed URLs. Continue?"
+msgstr "Alle zuvor erstellten Feed-URLs werden ungültig. Fortfahren?"
+
+#: js/prefs.js:1017
+#: plugins/share/share_prefs.js:3
+msgid "Clearing URLs..."
+msgstr "Leere URLs..."
+
+#: js/prefs.js:1020
+msgid "Generated URLs cleared."
+msgstr "Generierte URLs gelöscht."
+
+#: js/prefs.js:1053
+#, fuzzy
+msgid "Rename category to:"
+msgstr "Kategorie entfernen"
+
+#: js/prefs.js:1074
+msgid "Label Editor"
+msgstr "Label-Editor"
+
+#: js/tt-rss.js:111
 msgid "Mark all articles as read?"
 msgstr "Alle Artikel als gelesen markieren?"
 
-#: js/tt-rss.js:124
+#: js/tt-rss.js:115
 msgid "Marking all feeds as read..."
 msgstr "Alle Feeds werden als gelesen markiert..."
 
-#: js/tt-rss.js:398
+#: js/tt-rss.js:351
 msgid "Please enable mail plugin first."
 msgstr "Bitte erst das Mail-Plugin aktivieren."
 
-#: js/tt-rss.js:527
+#: js/tt-rss.js:477
 msgid "Please enable embed_original plugin first."
 msgstr "Bitte erst das \"Original einbetten\" Plugin aktivieren."
 
-#: js/tt-rss.js:540
-#: js/tt-rss.js:723
+#: js/tt-rss.js:490
+#: js/tt-rss.js:653
 msgid "Widescreen is not available in combined mode."
 msgstr "Widescreen ist in der kombinierten Ansicht nicht verfügbar."
 
-#: js/tt-rss.js:821
-msgid "You can't rescore this kind of feed."
-msgstr "Sie können diese Art von Feed nicht neu bewerten."
-
-#: js/tt-rss.js:826
-#: js/tt-rss.js:686
-msgid "Please select some feed first."
-msgstr "Bitte erst einen Feed auswählen."
-
-#: js/tt-rss.js:831
-#, perl-format
-msgid "Rescore articles in %s?"
-msgstr "Artikel in %s neu bewerten?"
-
-#: js/tt-rss.js:834
-msgid "Rescoring articles..."
-msgstr "Artikel werden neu bewertet..."
-
-#: js/viewfeed.js:917
-#: js/viewfeed.js:955
-#: js/viewfeed.js:1003
-#: js/viewfeed.js:1924
-#: plugins/mail/mail.js:7
+#: js/viewfeed.js:444
+#: js/viewfeed.js:461
+#: js/viewfeed.js:484
+#: js/viewfeed.js:521
+#: js/viewfeed.js:542
+#: js/viewfeed.js:651
+#: js/viewfeed.js:685
+#: js/viewfeed.js:727
+#: js/viewfeed.js:1564
 #: plugins/mailto/init.js:7
-#: js/viewfeed.js:675
-#: js/viewfeed.js:697
-#: js/viewfeed.js:718
-#: js/viewfeed.js:777
-#: js/viewfeed.js:805
+#: plugins/mail/mail.js:7
 msgid "No articles are selected."
 msgstr "Keine Artikel ausgewählt."
 
-#: js/viewfeed.js:925
+#: js/viewfeed.js:659
 #, 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:927
+#: js/viewfeed.js:661
 #, 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:964
+#: js/viewfeed.js:694
 #, 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:967
+#: js/viewfeed.js:697
 #, 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:969
+#: js/viewfeed.js:698
 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:1009
+#: js/viewfeed.js:733
 #, 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:1029
+#: js/viewfeed.js:753
 msgid "Edit article Tags"
 msgstr "Artikel-Tags bearbeiten"
 
-#: js/viewfeed.js:1035
+#: js/viewfeed.js:757
 msgid "Saving article tags..."
 msgstr "Artikel-Tags werden gespeichert..."
 
-#: js/viewfeed.js:1666
+#: js/viewfeed.js:1015
+msgid "No article is selected."
+msgstr "Kein Artikel ausgewählt."
+
+#: js/viewfeed.js:1050
+msgid "No articles found to mark"
+msgstr "Keine Artikel zum markieren gefunden"
+
+#: js/viewfeed.js:1052
+#, perl-format
+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?"
+
+#: js/viewfeed.js:1312
 msgid "Open original article"
 msgstr "Originalartikel öffnen"
 
-#: js/viewfeed.js:1673
+#: js/viewfeed.js:1319
 msgid "Display article URL"
 msgstr "Zeige Artikel-URL an"
 
-#: js/viewfeed.js:1780
+#: js/viewfeed.js:1426
 msgid "Assign label"
 msgstr "Label zuweisen"
 
-#: js/viewfeed.js:1785
+#: js/viewfeed.js:1431
 msgid "Remove label"
 msgstr "Label entfernen"
 
-#: js/viewfeed.js:1817
+#: js/viewfeed.js:1463
 msgid "Select articles in group"
 msgstr "Artikel als Gruppe auswählen"
 
-#: js/viewfeed.js:1827
+#: js/viewfeed.js:1473
 msgid "Mark group as read"
 msgstr "Gruppe als gelesen markieren"
 
-#: js/viewfeed.js:1839
+#: js/viewfeed.js:1485
 msgid "Mark feed as read"
 msgstr "Feed als gelesen markieren"
 
-#: js/viewfeed.js:1892
+#: js/viewfeed.js:1538
 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:1955
+#: js/viewfeed.js:1571
 msgid "Please enter new score for this article:"
 msgstr "Bitte geben Sie eine neue Bewertung für diesen Artikel ab:"
 
-#: js/viewfeed.js:1986
+#: js/viewfeed.js:1591
 msgid "Article URL:"
 msgstr "Artikel-URL:"
 
-#: plugins/note/note.js:17
-msgid "Saving article note..."
-msgstr "Artikelnotiz wird gespeichert..."
+#: 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/af_psql_trgm/init.js:11
 msgid "Related articles"
 msgstr "Verwandte Artikel"
 
+#: plugins/mailto/init.js:21
+#: plugins/mail/mail.js:21
+msgid "Forward article by email"
+msgstr "Artikel via E-Mail weiterleiten"
+
+#: plugins/shorten_expanded/init.js:43
+msgid "Click to expand article"
+msgstr "Klicken, um den Artikel aufzuklappen"
+
 #: plugins/import_export/import_export.js:13
 msgid "Export Data"
 msgstr "Daten exportieren"
@@ -3185,257 +3278,168 @@ 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
-msgid "Forward article by email"
-msgstr "Artikel via E-Mail weiterleiten"
+#: plugins/share/share_prefs.js:2
+msgid "This will invalidate all previously shared article URLs. Continue?"
+msgstr "Alle bisher geteilten Artikel URLs werden ungültig. Fortfahren?"
 
-#: plugins/mail/mail.js:36
-msgid "Error sending email:"
-msgstr "Fehler beim Senden der E-Mail:"
-
-#: plugins/mail/mail.js:38
-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:45
-msgid "Click to expand article"
-msgstr "Klicken, um den Artikel aufzuklappen"
+#: plugins/share/share_prefs.js:8
+msgid "Shared URLs cleared."
+msgstr "Geteilte URLs geleert."
 
 #: plugins/share/share.js:10
 msgid "Share article by URL"
 msgstr "Artikel über URL teilen"
 
-#: plugins/share/share.js:14
+#: plugins/share/share.js:13
 msgid "Generate new share URL for this article?"
 msgstr "Eine neue URL zum Teilen des Artikels erzeugen?"
 
-#: plugins/share/share.js:18
+#: plugins/share/share.js:15
 msgid "Trying to change URL..."
 msgstr "Versuche, die Adresse zu ändern..."
 
-#: plugins/share/share.js:55
+#: plugins/share/share.js:48
 msgid "Remove sharing for this article?"
 msgstr "Teilen für diesen Artikel rückgängig machen?"
 
-#: plugins/share/share.js:59
+#: plugins/share/share.js:50
 msgid "Trying to unshare..."
 msgstr "Versuche, Teilen rückgängig zu machen..."
 
-#: plugins/share/share_prefs.js:3
-msgid "This will invalidate all previously shared article URLs. Continue?"
-msgstr "Alle bisher geteilten Artikel URLs werden ungültig. Fortfahren?"
+#: plugins/mail/mail.js:30
+msgid "Error sending email:"
+msgstr "Fehler beim Senden der E-Mail:"
 
-#: plugins/share/share_prefs.js:6
-#: js/prefs.js:1277
-msgid "Clearing URLs..."
-msgstr "Leere URLs..."
+#: plugins/mail/mail.js:32
+msgid "Your message has been sent."
+msgstr "Ihre Nachricht wurde gesendet."
 
-#: plugins/share/share_prefs.js:13
-msgid "Shared URLs cleared."
-msgstr "Geteilte URLs geleert."
+#: plugins/note/note.js:15
+msgid "Saving article note..."
+msgstr "Artikelnotiz wird gespeichert..."
 
-#: js/feedlist.js:204
+#: js/feedlist.js:168
 #, fuzzy
 msgid "Your password is at default value"
 msgstr "Sie nutzen das Standard Passwort, bitte ändern Sie es."
 
-#: js/feedlist.js:453
+#: js/feedlist.js:413
 msgid "Mark all articles in %s as read?"
 msgstr "Alle Artikel in %s als gelesen markieren?"
 
-#: js/functions.js:494
-msgid "Upload complete."
-msgstr "Upload fertig."
-
-#: js/functions.js:511
-msgid "Remove stored feed icon?"
-msgstr "Gespeichertes Feed-Symbol entfernen?"
-
-#: js/functions.js:516
-msgid "Removing feed icon..."
-msgstr "Feedsymbol wird entfernt."
-
-#: js/functions.js:521
-msgid "Feed icon removed."
-msgstr "Feedsymbol entfernt."
-
-#: js/functions.js:537
-msgid "Please select an image file to upload."
-msgstr "Bitte eine Bilddatei zum Hochladen auswählen."
-
-#: js/functions.js:539
-msgid "Upload new icon for this feed?"
-msgstr "Neues Symbol für diesen Feed hochladen?"
-
-#: js/functions.js:540
-msgid "Uploading, please wait..."
-msgstr "Lade hoch, bitte warten..."
-
-#: js/functions.js:550
-msgid "Please enter label caption:"
-msgstr "Bitte einen Label-Titel eingeben:"
-
-#: js/functions.js:555
-msgid "Can't create label: missing caption."
-msgstr "Kann das Label nicht hinzufügen: fehlender Titel."
-
-#: js/functions.js:797
+#: js/functions.js:764
 msgid "Edit rule"
 msgstr "Regel bearbeiten"
 
-#: js/functions.js:819
+#: js/functions.js:786
 msgid "Edit action"
 msgstr "Aktion bearbeiten"
 
-#: js/functions.js:860
+#: js/functions.js:825
 msgid "Looking for articles (%d processed, %f found)..."
 msgstr "Suche Artikel (%d verarbeitet, %f gefunden)..."
 
-#: js/functions.js:890
+#: js/functions.js:855
 msgid "Found %d articles matching this filter:"
 msgstr "Es wurden %d passende Artikel gefunden:"
 
-#: js/functions.js:942
+#: js/functions.js:907
 msgid "Create Filter"
 msgstr "Filter erstellen"
 
-#: js/functions.js:1060
-#: js/tt-rss.js:692
+#: js/functions.js:1016
+#: js/tt-rss.js:631
 msgid "Unsubscribe from %s?"
 msgstr "%s abbestellen?"
 
-#: js/functions.js:1063
+#: js/functions.js:1019
 msgid "Removing feed..."
 msgstr "Feed wird entfernt..."
 
-#: js/functions.js:1489
+#: js/functions.js:1410
 msgid "Help"
 msgstr "Hilfe"
 
-#: js/prefs.js:973
-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:44
+msgid "Please enter login:"
+msgstr "Bitte Benutzernamen eingeben:"
 
-#: js/prefs.js:979
-msgid "Removing category..."
-msgstr "Kategorie wird entfernt..."
+#: js/prefs.js:51
+msgid "Can't create user: no login specified."
+msgstr "Kann den Benutzer nicht hinzufügen: kein Login angegeben."
 
-#: js/prefs.js:997
-msgid "Remove selected categories?"
-msgstr "Ausgewählte Kategorien entfernen?"
+#: js/prefs.js:55
+msgid "Adding user..."
+msgstr "Füge Benutzer hinzu..."
 
-#: js/prefs.js:1000
-msgid "Removing selected categories..."
-msgstr "Ausgewählte Kategorien werden entfernt..."
+#: js/prefs.js:74
+msgid "User Editor"
+msgstr "Benutzereditor"
 
-#: js/prefs.js:1013
-msgid "No categories are selected."
-msgstr "Keine Kategorien ausgewählt."
+#: js/prefs.js:104
+msgid "Edit Filter"
+msgstr "Filter bearbeiten"
 
-#: js/prefs.js:1020
-msgid "Category title:"
-msgstr "Name der Kategorie:"
+#: js/prefs.js:1175
+msgid "Subscribing to feeds..."
+msgstr "Abonniere Feeds..."
 
-#: js/prefs.js:1024
-msgid "Creating category..."
-msgstr "Kategorie wird erstellt..."
+#: js/prefs.js:1191
+msgid "Clear stored data for this plugin?"
+msgstr "Gesicherte Daten dieses Plugins löschen?"
 
-#: js/prefs.js:1047
-msgid "Feeds without recent updates"
-msgstr "Feeds ohne kürzliche Aktualisierungen"
+#: js/prefs.js:1203
+msgid "Clear all messages in the error log?"
+msgstr "Alle Einträge aus dem Fehler-Protokoll löschen?"
 
-#: js/prefs.js:1091
-msgid "Replace current OPML publishing address with a new one?"
-msgstr "Aktuelle Veröffentlichungsadresse durch eine Neue ersetzen?"
-
-#: js/prefs.js:1129
-msgid "Reset selected labels to default colors?"
-msgstr "Farben der ausgewählten Label auf Standardwerte zurücksetzen?"
-
-#: js/prefs.js:1161
-msgid "Settings Profiles"
-msgstr "Einstellungsprofile"
-
-#: js/prefs.js:1170
-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:1173
-msgid "Removing selected profiles..."
-msgstr "Ausgewählte Profile werden entfernt..."
-
-#: js/prefs.js:1189
-msgid "No profiles are selected."
-msgstr "Keine Profile ausgewählt."
-
-#: js/prefs.js:1197
-#: js/prefs.js:1250
-msgid "Activate selected profile?"
-msgstr "Ausgewählte Profile aktivieren?"
-
-#: js/prefs.js:1214
-#: js/prefs.js:1266
-msgid "Please choose a profile to activate."
-msgstr "Bitte ein Profil zum Aktivieren auswählen."
-
-#: js/prefs.js:1219
-msgid "Creating profile..."
-msgstr "Profil wird erstellt..."
-
-#: js/prefs.js:1274
-msgid "This will invalidate all previously generated feed URLs. Continue?"
-msgstr "Alle zuvor erstellten Feed-URLs werden ungültig. Fortfahren?"
-
-#: js/prefs.js:1284
-msgid "Generated URLs cleared."
-msgstr "Generierte URLs gelöscht."
-
-#: js/prefs.js:1356
-msgid "Label Editor"
-msgstr "Label-Editor"
-
-#: js/tt-rss.js:681
+#: js/tt-rss.js:620
 msgid "You can't unsubscribe from the category."
 msgstr "Sie können die Kategorie nicht abbestellen."
 
-#: js/viewfeed.js:127
-#: js/viewfeed.js:177
-#: js/viewfeed.js:194
+#: js/tt-rss.js:625
+msgid "Please select some feed first."
+msgstr "Bitte erst einen Feed auswählen."
+
+#: js/viewfeed.js:89
+#: js/viewfeed.js:135
+#: js/viewfeed.js:152
 msgid "Click to open next unread feed."
 msgstr "Hier klicken, um den nächsten ungelesenen Feed zu öffnen."
 
-#: js/viewfeed.js:131
+#: js/viewfeed.js:93
 msgid "Cancel search"
 msgstr "Suche abbrechen"
 
-#: js/viewfeed.js:191
+#: js/viewfeed.js:149
 msgid "New articles found, reload feed to continue."
 msgstr "Neue Artikel gefunden. Feed neu laden, um fortzufahren."
 
-#: js/viewfeed.js:620
+#: js/viewfeed.js:405
 msgid "%d article selected"
 msgid_plural "%d articles selected"
 msgstr[0] "%d Artikel ausgewählt"
 msgstr[1] "%d Artikel ausgewählt"
 
-#: js/viewfeed.js:1284
-msgid "No article is selected."
-msgstr "Kein Artikel ausgewählt."
+#~ msgid "Rescore feed"
+#~ msgstr "Feed neu bewerten"
 
-#: js/viewfeed.js:1319
-msgid "No articles found to mark"
-msgstr "Keine Artikel zum markieren gefunden"
+#~ msgid "Create label..."
+#~ msgstr "Label erstellen..."
 
-#: js/viewfeed.js:1321
-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 "Create filter..."
+#~ msgstr "Filter erstellen..."
+
+#~ msgid "You can't rescore this kind of feed."
+#~ msgstr "Sie können diese Art von Feed nicht neu bewerten."
+
+#~ msgid "Rescore articles in %s?"
+#~ msgstr "Artikel in %s neu bewerten?"
+
+#~ msgid "Rescoring articles..."
+#~ msgstr "Artikel werden neu bewertet..."
+
+#~ msgid "Can't create label: missing caption."
+#~ msgstr "Kann das Label nicht hinzufügen: fehlender Titel."
 
 #~ 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>"
diff --git a/locale/el_GR/LC_MESSAGES/messages.mo b/locale/el_GR/LC_MESSAGES/messages.mo
index 90fd67a10..5a17e2c2e 100644
Binary files a/locale/el_GR/LC_MESSAGES/messages.mo and b/locale/el_GR/LC_MESSAGES/messages.mo differ
diff --git a/locale/el_GR/LC_MESSAGES/messages.po b/locale/el_GR/LC_MESSAGES/messages.po
index ef1cfbc1c..ef04a2581 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: 2018-10-10 08:24+0300\n"
+"POT-Creation-Date: 2018-12-01 12:59+0300\n"
 "Last-Translator: Brendan <brendan@tucows.com>\n"
 "Language-Team: OpenSRS brendan@tucows.com>\n"
 "Language: el_GR\n"
@@ -89,8 +89,8 @@ msgid "Weekly"
 msgstr "Εβδομαδιαία"
 
 #: backend.php:103
-#: classes/pref/users.php:47
 #: classes/pref/system.php:51
+#: classes/pref/users.php:47
 msgid "User"
 msgstr "Χρήστης"
 
@@ -162,33 +162,33 @@ msgstr "Ο χρήστης δεν βρέθηκε."
 
 #: index.php:151
 #: index.php:167
-#: index.php:285
+#: index.php:282
 #: prefs.php:120
 #: classes/backend.php:5
 #: classes/pref/labels.php:294
-#: classes/pref/feeds.php:1230
 #: classes/pref/filters.php:822
-#: js/feedlist.js:148
-#: js/feedlist.js:491
-#: js/feedlist.js:539
-#: js/functions.js:314
-#: js/functions.js:1336
-#: js/prefs.js:562
-#: js/prefs.js:754
-#: js/prefs.js:1488
-#: js/prefs.js:1503
-#: js/tt-rss.js:547
-#: js/viewfeed.js:1180
+#: classes/pref/feeds.php:1229
+#: js/feedlist.js:118
+#: js/feedlist.js:446
+#: js/feedlist.js:487
+#: js/functions.js:328
+#: js/functions.js:551
+#: js/functions.js:1286
+#: js/prefs.js:477
+#: js/prefs.js:617
+#: js/prefs.js:956
+#: js/prefs.js:1000
+#: js/prefs.js:1028
+#: js/prefs.js:1037
+#: js/prefs.js:1045
+#: js/prefs.js:1057
+#: js/tt-rss.js:497
+#: js/viewfeed.js:509
+#: js/viewfeed.js:928
 #: plugins/import_export/import_export.js:17
-#: js/functions.js:565
-#: js/prefs.js:1200
-#: js/prefs.js:1253
-#: js/prefs.js:1292
-#: js/prefs.js:1305
-#: js/prefs.js:1316
-#: js/prefs.js:1331
-#: js/tt-rss.js:564
-#: js/viewfeed.js:760
+#: js/prefs.js:1192
+#: js/prefs.js:1205
+#: js/tt-rss.js:510
 msgid "Loading, please wait..."
 msgstr "Φόρτωση σε εξέλιξη, παρακαλώ περιμένετε..."
 
@@ -205,13 +205,13 @@ msgid "All Articles"
 msgstr "Όλα τα Άρθρα"
 
 #: index.php:194
-#: include/functions.php:1227
+#: include/functions.php:1172
 #: classes/feeds.php:110
 msgid "Starred"
 msgstr "Με αστέρι"
 
 #: index.php:195
-#: include/functions.php:1228
+#: include/functions.php:1173
 #: classes/feeds.php:111
 msgid "Published"
 msgstr "Δημοσιεύτηκαν"
@@ -251,11 +251,11 @@ msgid "Title"
 msgstr "Τίτλος"
 
 #: index.php:211
-#: index.php:251
-#: include/functions.php:1215
+#: index.php:250
+#: include/functions.php:1160
 #: classes/feeds.php:115
-#: js/FeedTree.js:41
-#: js/FeedTree.js:69
+#: js/FeedTree.js:42
+#: js/FeedTree.js:70
 msgid "Mark as read"
 msgstr "Σήμανση ως αναγνωσμένο"
 
@@ -292,7 +292,7 @@ msgid "Feed actions:"
 msgstr "Ενέργειες ροών:"
 
 #: index.php:246
-#: classes/handler/public.php:551
+#: classes/handler/public.php:575
 msgid "Subscribe to feed..."
 msgstr "Εγγραφή για ροή..."
 
@@ -301,56 +301,44 @@ msgid "Edit this feed..."
 msgstr "Επεξεργασία αυτής της ροής..."
 
 #: index.php:248
-msgid "Rescore feed"
-msgstr "Επανασύνθεση ροών"
-
-#: index.php:249
-#: classes/pref/feeds.php:770
-#: classes/pref/feeds.php:1203
-#: js/PrefFeedTree.js:61
+#: classes/pref/feeds.php:769
+#: classes/pref/feeds.php:1202
+#: js/PrefFeedTree.js:62
 msgid "Unsubscribe"
 msgstr "Κατάργηση εγγραφής"
 
-#: index.php:250
+#: index.php:249
 msgid "All feeds:"
 msgstr "Όλες οι ροές:"
 
-#: index.php:252
+#: index.php:251
 msgid "(Un)hide read feeds"
 msgstr "Επανεμφάνιση/Απόκρυψη ροών ανάγνωσης"
 
-#: index.php:253
+#: index.php:252
 msgid "Other actions:"
 msgstr "Άλλες ενέργειες:"
 
-#: index.php:254
-#: include/functions.php:1201
+#: index.php:253
+#: include/functions.php:1146
 msgid "Toggle widescreen mode"
 msgstr "Εναλλαγή λειτουργίας ευρείας οθόνης"
 
-#: index.php:255
-msgid "Create label..."
-msgstr "Δημιουργία ετικέτας..."
-
-#: index.php:256
-msgid "Create filter..."
-msgstr "Δημιουργία φίλτρου..."
-
-#: index.php:257
+#: index.php:254
 msgid "Keyboard shortcuts help"
 msgstr "Βοήθεια συντομεύσεων πληκτρολογίου"
 
-#: index.php:266
+#: index.php:263
 msgid "Logout"
 msgstr "Αποσύνδεση"
 
-#: index.php:272
+#: index.php:269
 msgid "Updates are available from Git."
 msgstr ""
 
 #: prefs.php:33
 #: prefs.php:138
-#: include/functions.php:1230
+#: include/functions.php:1175
 #: classes/pref/prefs.php:425
 msgid "Preferences"
 msgstr "Προτιμήσεις"
@@ -365,8 +353,8 @@ msgstr "Προτιμήσεις εξόδου"
 
 #: prefs.php:141
 #: classes/pref/feeds.php:114
-#: classes/pref/feeds.php:1138
-#: classes/pref/feeds.php:1192
+#: classes/pref/feeds.php:1137
+#: classes/pref/feeds.php:1191
 msgid "Feeds"
 msgstr "Ροές"
 
@@ -376,8 +364,8 @@ msgid "Filters"
 msgstr "Φίλτρα"
 
 #: prefs.php:147
+#: classes/feeds.php:1696
 #: classes/pref/labels.php:94
-#: classes/feeds.php:1710
 msgid "Labels"
 msgstr "Ετικέτες"
 
@@ -389,81 +377,81 @@ msgstr "Χρήστες"
 msgid "System"
 msgstr "Σύστημα"
 
-#: register.php:186
+#: register.php:185
 #: include/login_form.php:162
 msgid "Create new account"
 msgstr "Δημιουργία νέου λογαριασμού"
 
-#: register.php:192
+#: register.php:191
 msgid "New user registrations are administratively disabled."
 msgstr ""
 
-#: register.php:196
-#: register.php:241
-#: register.php:254
-#: register.php:269
-#: register.php:288
-#: register.php:336
-#: register.php:346
-#: register.php:358
-#: classes/handler/public.php:623
-#: classes/handler/public.php:697
-#: classes/handler/public.php:798
-#: classes/handler/public.php:877
-#: classes/handler/public.php:891
-#: classes/handler/public.php:898
-#: classes/handler/public.php:923
+#: register.php:195
+#: register.php:240
+#: register.php:253
+#: register.php:268
+#: register.php:287
+#: register.php:334
+#: register.php:344
+#: register.php:356
+#: classes/handler/public.php:647
+#: classes/handler/public.php:721
+#: 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"
 
-#: register.php:217
+#: register.php:216
 msgid "Your temporary password will be sent to the specified email. Accounts, which were not logged in once, are erased automatically 24 hours after temporary password is sent."
 msgstr ""
 
-#: register.php:223
+#: register.php:222
 msgid "Desired login:"
 msgstr "Επιθυμητή σύνδεση:"
 
-#: register.php:226
+#: register.php:225
 msgid "Check availability"
 msgstr "Έλεγχος διαθεσιμότητας"
 
-#: register.php:228
-#: classes/handler/public.php:713
+#: register.php:227
+#: classes/handler/public.php:737
 msgid "Email:"
 msgstr "Email:"
 
-#: register.php:231
-#: classes/handler/public.php:718
+#: register.php:230
+#: classes/handler/public.php:742
 msgid "How much is two plus two:"
 msgstr ""
 
-#: register.php:234
+#: register.php:233
 msgid "Submit registration"
 msgstr "Υποβολή εγγραφής"
 
-#: register.php:252
+#: register.php:251
 msgid "Your registration information is incomplete."
 msgstr ""
 
-#: register.php:267
+#: register.php:266
 msgid "Sorry, this username is already taken."
 msgstr ""
 
-#: register.php:286
+#: register.php:285
 msgid "Registration failed."
 msgstr "Η εγγραφή απέτυχε."
 
-#: register.php:333
+#: register.php:331
 msgid "Account created successfully."
 msgstr "Δημιουργήθηκε λογαριασμός με επιτυχία."
 
-#: register.php:355
+#: register.php:353
 msgid "New user registrations are currently closed."
 msgstr ""
 
-#: update.php:66
+#: update.php:67
 msgid "Tiny Tiny RSS data update script."
 msgstr ""
 
@@ -476,10 +464,10 @@ msgstr "Όλες οι ροές"
 
 #: include/controls.php:138
 #: include/controls.php:230
-#: classes/opml.php:512
-#: classes/digest.php:120
+#: classes/digest.php:124
+#: classes/feeds.php:1708
 #: classes/pref/feeds.php:233
-#: classes/feeds.php:1722
+#: classes/opml.php:512
 msgid "Uncategorized"
 msgstr "Χωρίς κατηγορία"
 
@@ -494,290 +482,290 @@ msgstr[1] "Αρχειοθετημένα άρθρα"
 msgid "No feeds found."
 msgstr "Δεν βρέθηκαν ροές."
 
-#: include/functions.php:983
+#: include/functions.php:928
 #, php-format
 msgid "%d min"
 msgstr ""
 
-#: include/functions.php:1177
+#: include/functions.php:1122
 msgid "Navigation"
 msgstr "Πλοήγηση"
 
-#: include/functions.php:1178
+#: include/functions.php:1123
 msgid "Open next feed"
 msgstr "Άνοιγμα επόμενης ροής"
 
-#: include/functions.php:1179
+#: include/functions.php:1124
 msgid "Open previous feed"
 msgstr "Άνοιγμα προηγούμενης ροής"
 
-#: include/functions.php:1180
+#: include/functions.php:1125
 msgid "Open next article"
 msgstr "Άνοιγμα επόμενου άρθρου"
 
-#: include/functions.php:1181
+#: include/functions.php:1126
 msgid "Open previous article"
 msgstr "Άνοιγμα προηγούμενου άρθρου"
 
-#: include/functions.php:1182
+#: include/functions.php:1127
 msgid "Open next article (don't scroll long articles)"
 msgstr ""
 
-#: include/functions.php:1183
+#: include/functions.php:1128
 msgid "Open previous article (don't scroll long articles)"
 msgstr ""
 
-#: include/functions.php:1184
+#: include/functions.php:1129
 msgid "Move to next article (don't expand or mark read)"
 msgstr ""
 
-#: include/functions.php:1185
+#: include/functions.php:1130
 msgid "Move to previous article (don't expand or mark read)"
 msgstr ""
 
-#: include/functions.php:1186
+#: include/functions.php:1131
 msgid "Show search dialog"
 msgstr "Εμφάνιση διαλόγου αναζήτησης"
 
-#: include/functions.php:1187
+#: include/functions.php:1132
 msgid "Article"
 msgstr "Άρθρο"
 
-#: include/functions.php:1188
-#: js/viewfeed.js:1695
+#: include/functions.php:1133
+#: js/viewfeed.js:1341
 msgid "Toggle starred"
 msgstr "Εναλλαγή με αστέρια"
 
-#: include/functions.php:1189
-#: js/viewfeed.js:1707
+#: include/functions.php:1134
+#: js/viewfeed.js:1353
 msgid "Toggle published"
 msgstr "Εναλλαγή δημοσιευμένη"
 
-#: include/functions.php:1190
-#: js/viewfeed.js:1682
+#: include/functions.php:1135
+#: js/viewfeed.js:1328
 msgid "Toggle unread"
 msgstr "Εναλλαγή μη αναγνωσμένο"
 
-#: include/functions.php:1191
+#: include/functions.php:1136
 msgid "Edit tags"
 msgstr "Επεξεργασία ετικετών"
 
-#: include/functions.php:1192
+#: include/functions.php:1137
 msgid "Open in new window"
 msgstr "Άνοιγμα σε νέο παράθυρο"
 
-#: include/functions.php:1193
-#: js/viewfeed.js:1728
+#: include/functions.php:1138
+#: js/viewfeed.js:1374
 msgid "Mark below as read"
 msgstr "Σήμανση παρακάτω ως αναγνωσμένα"
 
-#: include/functions.php:1194
-#: js/viewfeed.js:1721
+#: include/functions.php:1139
+#: js/viewfeed.js:1367
 msgid "Mark above as read"
 msgstr "Σήμανση παραπάνω ως αναγνωσμένα"
 
-#: include/functions.php:1195
+#: include/functions.php:1140
 msgid "Scroll down"
 msgstr "Κύλιση προς τα κάτω"
 
-#: include/functions.php:1196
+#: include/functions.php:1141
 msgid "Scroll up"
 msgstr "Κύλιση προς τα επάνω"
 
-#: include/functions.php:1197
+#: include/functions.php:1142
 msgid "Select article under cursor"
 msgstr "Επιλογή άρθρου κάτω από τον κέρσορα"
 
-#: include/functions.php:1198
+#: include/functions.php:1143
 msgid "Email article"
 msgstr "Αποστολή άρθρου με e-mail"
 
-#: include/functions.php:1199
+#: include/functions.php:1144
 msgid "Close/collapse article"
 msgstr "Κλείσιμο/σύμπτηξη άρθρου"
 
-#: include/functions.php:1200
+#: include/functions.php:1145
 #, fuzzy
 msgid "Toggle article expansion (combined mode)"
 msgstr "Εναλλαγή συνδυασμένης λειτουργίας"
 
-#: include/functions.php:1202
+#: include/functions.php:1147
 #: plugins/embed_original/init.php:33
 msgid "Toggle embed original"
 msgstr "Εναλλαγή ενσωμάτωσης πρωτοτύπου"
 
-#: include/functions.php:1203
+#: include/functions.php:1148
 msgid "Article selection"
 msgstr "Επιλογή άρθρου"
 
-#: include/functions.php:1204
+#: include/functions.php:1149
 msgid "Select all articles"
 msgstr "Επιλογή όλων των άρθρων"
 
-#: include/functions.php:1205
+#: include/functions.php:1150
 msgid "Select unread"
 msgstr "Επιλογή μη αναγνωσμένων"
 
-#: include/functions.php:1206
+#: include/functions.php:1151
 msgid "Select starred"
 msgstr "Επιλογή με αστέρια"
 
-#: include/functions.php:1207
+#: include/functions.php:1152
 msgid "Select published"
 msgstr "Επιλογή δημοσιευμένων"
 
-#: include/functions.php:1208
+#: include/functions.php:1153
 msgid "Invert selection"
 msgstr "Αναστροφή επιλογής"
 
-#: include/functions.php:1209
+#: include/functions.php:1154
 msgid "Deselect everything"
 msgstr "Αποεπιλογή όλων"
 
-#: include/functions.php:1210
-#: classes/pref/feeds.php:522
-#: classes/pref/feeds.php:794
+#: include/functions.php:1155
+#: classes/pref/feeds.php:521
+#: classes/pref/feeds.php:793
 msgid "Feed"
 msgstr "Ροή"
 
-#: include/functions.php:1211
+#: include/functions.php:1156
 msgid "Refresh current feed"
 msgstr "Ανανέωση τρέχουσας ροής"
 
-#: include/functions.php:1212
+#: include/functions.php:1157
 msgid "Un/hide read feeds"
 msgstr "Επανεμφάνιση/Απόκρυψη ροών ανάγνωσης"
 
-#: include/functions.php:1213
-#: classes/pref/feeds.php:1195
+#: include/functions.php:1158
+#: classes/pref/feeds.php:1194
 msgid "Subscribe to feed"
 msgstr "Εγγραφή για ροή"
 
-#: include/functions.php:1214
-#: js/FeedTree.js:48
-#: js/PrefFeedTree.js:55
-#: js/viewfeed.js:1846
+#: include/functions.php:1159
+#: js/FeedTree.js:49
+#: js/PrefFeedTree.js:56
+#: js/viewfeed.js:1492
 msgid "Edit feed"
 msgstr "Επεξεργασία ροής"
 
-#: include/functions.php:1216
+#: include/functions.php:1161
 msgid "Reverse headlines"
 msgstr "Αναστροφή κεφαλίδων"
 
-#: include/functions.php:1217
+#: include/functions.php:1162
 msgid "Toggle headline grouping"
 msgstr ""
 
-#: include/functions.php:1218
+#: include/functions.php:1163
 msgid "Debug feed update"
 msgstr "Εκσφαλμάτωση ενημέρωσης ροής"
 
-#: include/functions.php:1219
+#: include/functions.php:1164
 #, fuzzy
 msgid "Debug viewfeed()"
 msgstr "Εκσφαλμάτωση ενημέρωσης ροής"
 
-#: include/functions.php:1220
-#: js/FeedTree.js:97
+#: include/functions.php:1165
+#: js/FeedTree.js:98
 #, fuzzy
 msgid "Mark all feeds as read"
 msgstr "Σήμανση ροής ως αναγνωσμένη"
 
-#: include/functions.php:1221
+#: include/functions.php:1166
 msgid "Un/collapse current category"
 msgstr "Ανάπτυξη/σύμπτηξη τρέχουσας κατηγορίας"
 
-#: include/functions.php:1222
-msgid "Toggle combined mode"
-msgstr "Εναλλαγή συνδυασμένης λειτουργίας"
-
-#: include/functions.php:1223
+#: include/functions.php:1167
 #, fuzzy
 msgid "Toggle auto expand in combined mode"
 msgstr "Εναλλαγή συνδυασμένης λειτουργίας"
 
-#: include/functions.php:1224
+#: include/functions.php:1168
+msgid "Toggle combined mode"
+msgstr "Εναλλαγή συνδυασμένης λειτουργίας"
+
+#: include/functions.php:1169
 msgid "Go to"
 msgstr "Μετάβαση σε"
 
-#: include/functions.php:1225
-#: classes/feeds.php:1583
+#: include/functions.php:1170
+#: classes/feeds.php:1569
 msgid "All articles"
 msgstr "Όλα τα άρθρα"
 
-#: include/functions.php:1226
+#: include/functions.php:1171
 msgid "Fresh"
 msgstr "Φρέσκο"
 
-#: include/functions.php:1229
-#: js/tt-rss.js:491
-#: js/tt-rss.js:660
+#: include/functions.php:1174
+#: js/tt-rss.js:439
+#: js/tt-rss.js:599
 msgid "Tag cloud"
 msgstr "Τοποθέτηση ετικέτας σε νέφος"
 
-#: include/functions.php:1231
+#: include/functions.php:1176
 msgid "Other"
 msgstr "Άλλο"
 
-#: include/functions.php:1232
+#: include/functions.php:1177
 #: classes/pref/labels.php:279
 msgid "Create label"
 msgstr "Δημιουργία ετικέτας"
 
-#: include/functions.php:1233
+#: include/functions.php:1178
 #: classes/pref/filters.php:801
 msgid "Create filter"
 msgstr "Δημιουργία φίλτρου"
 
-#: include/functions.php:1234
+#: include/functions.php:1179
 msgid "Un/collapse sidebar"
 msgstr "Ανάπτυξη/σύμπτυξη πλευρικής μπάρας"
 
-#: include/functions.php:1235
+#: include/functions.php:1180
 msgid "Show help dialog"
 msgstr "Εμφάνιση πλαισίου βοήθειας"
 
-#: include/functions.php:2582
+#: include/functions.php:2529
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: include/functions.php:2583
+#: include/functions.php:2530
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: include/functions.php:2584
+#: include/functions.php:2531
 msgid "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form"
 msgstr ""
 
-#: include/functions.php:2585
+#: include/functions.php:2532
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: include/functions.php:2586
+#: include/functions.php:2533
 #, fuzzy
 msgid "No file was uploaded"
 msgstr "Δεν φορτώθηκε αρχείο."
 
-#: include/functions.php:2587
+#: include/functions.php:2534
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: include/functions.php:2588
+#: include/functions.php:2535
 msgid "Failed to write file to disk."
 msgstr ""
 
-#: include/functions.php:2589
+#: include/functions.php:2536
 msgid "A PHP extension stopped the file upload."
 msgstr ""
 
 #: include/login_form.php:107
-#: classes/handler/public.php:446
-#: classes/handler/public.php:708
+#: classes/handler/public.php:466
+#: classes/handler/public.php:732
 msgid "Login:"
 msgstr "Είσοδος:"
 
 #: include/login_form.php:117
-#: classes/handler/public.php:449
+#: classes/handler/public.php:469
 msgid "Password:"
 msgstr "Κωδικός Πρόσβασης:"
 
@@ -790,9 +778,9 @@ msgid "Profile:"
 msgstr "Προφίλ:"
 
 #: include/login_form.php:133
-#: classes/handler/public.php:252
 #: classes/pref/prefs.php:1037
 #: classes/rpc.php:69
+#: classes/handler/public.php:272
 msgid "Default profile"
 msgstr "Προκαθορισμένο προφίλ"
 
@@ -809,208 +797,26 @@ msgid "Remember me"
 msgstr "Απομνημόνευση"
 
 #: include/login_form.php:159
-#: classes/handler/public.php:454
+#: classes/handler/public.php:474
 msgid "Log in"
 msgstr "Συνδεθείτε"
 
-#: include/sessions.php:46
+#: include/sessions.php:45
 msgid "Session failed to validate (schema version changed)"
 msgstr ""
 
-#: include/sessions.php:62
+#: include/sessions.php:53
+msgid "Session failed to validate (UA changed)."
+msgstr ""
+
+#: include/sessions.php:67
 msgid "Session failed to validate (password changed)"
 msgstr ""
 
-#: include/sessions.php:69
+#: include/sessions.php:74
 msgid "Session failed to validate (user not found)"
 msgstr ""
 
-#: classes/article.php:26
-msgid "Article not found."
-msgstr "Το άρθρο δεν βρέθηκε."
-
-#: classes/article.php:211
-msgid "Tags for this article (separated by commas):"
-msgstr ""
-
-#: classes/article.php:236
-#: classes/pref/labels.php:82
-#: classes/pref/users.php:103
-#: classes/pref/feeds.php:774
-#: classes/pref/feeds.php:914
-#: classes/pref/filters.php:525
-#: classes/pref/prefs.php:982
-#: plugins/nsfw/init.php:85
-#: plugins/note/init.php:58
-#: plugins/af_readability/init.php:80
-#: plugins/af_redditimgur/init.php:66
-#: plugins/af_psql_trgm/init.php:188
-#: plugins/mail/init.php:65
-#: plugins/af_zz_imgproxy/init.php:238
-msgid "Save"
-msgstr "Αποθήκευση"
-
-#: classes/article.php:238
-#: classes/handler/public.php:423
-#: classes/handler/public.php:457
-#: classes/pref/labels.php:84
-#: classes/pref/users.php:105
-#: classes/pref/feeds.php:775
-#: classes/pref/feeds.php:917
-#: classes/pref/feeds.php:1672
-#: classes/pref/filters.php:528
-#: classes/pref/filters.php:945
-#: classes/pref/filters.php:1022
-#: classes/pref/filters.php:1115
-#: classes/pref/prefs.php:984
-#: classes/feeds.php:1037
-#: classes/feeds.php:1089
-#: classes/feeds.php:1128
-#: plugins/note/init.php:60
-#: plugins/mail/init.php:179
-msgid "Cancel"
-msgstr "Ακύρωση"
-
-#: classes/article.php:337
-#: classes/article.php:720
-#: classes/article.php:875
-msgid "no tags"
-msgstr "χωρίς ετικέτες"
-
-#: classes/article.php:448
-msgid "unknown type"
-msgstr "άγνωστος τύπος"
-
-#: classes/article.php:525
-msgid "Attachments"
-msgstr "Συνημμένα"
-
-#: classes/article.php:626
-#: classes/feeds.php:661
-#, fuzzy
-msgid "comment"
-msgid_plural "comments"
-msgstr[0] "σχόλια"
-msgstr[1] "σχόλια"
-
-#: classes/article.php:630
-#: classes/feeds.php:665
-msgid "comments"
-msgstr "σχόλια"
-
-#: classes/article.php:689
-msgid " - "
-msgstr " - "
-
-#: classes/article.php:730
-#: classes/feeds.php:647
-msgid "Edit tags for this article"
-msgstr ""
-
-#: classes/article.php:763
-#: classes/feeds.php:602
-msgid "Originally from:"
-msgstr "Αρχικά από:"
-
-#: classes/article.php:774
-#: classes/pref/feeds.php:539
-#: classes/feeds.php:613
-msgid "Feed URL"
-msgstr "URL Ροής"
-
-#: classes/article.php:811
-#: classes/backend.php:103
-#: classes/dlg.php:33
-#: classes/dlg.php:56
-#: classes/dlg.php:89
-#: classes/dlg.php:154
-#: classes/dlg.php:181
-#: classes/dlg.php:197
-#: classes/pref/feeds.php:1466
-#: classes/pref/feeds.php:1533
-#: classes/pref/filters.php:208
-#: classes/pref/prefs.php:1099
-#: plugins/af_psql_trgm/init.php:109
-#: plugins/import_export/init.php:446
-#: plugins/import_export/init.php:490
-#: plugins/share/init.php:128
-msgid "Close this window"
-msgstr "Κλείστε αυτό το παράθυρο"
-
-#: classes/article.php:913
-msgid "(edit note)"
-msgstr "(επεξεργασία σημείωσης)"
-
-#: classes/opml.php:31
-#: classes/opml.php:36
-msgid "OPML Utility"
-msgstr "Βοηθητικό OPML"
-
-#: classes/opml.php:40
-msgid "Importing OPML..."
-msgstr "Εισαγωγή OPML σε εξέλιξη..."
-
-#: classes/opml.php:45
-msgid "Return to preferences"
-msgstr "Επιστροφή σε προτιμήσεις"
-
-#: classes/opml.php:301
-#, php-format
-msgid "Adding feed: %s"
-msgstr "Προσθήκη ροής: %s"
-
-#: classes/opml.php:312
-#, php-format
-msgid "Duplicate feed: %s"
-msgstr "Αντιγραφή ροής: %s"
-
-#: classes/opml.php:326
-#, php-format
-msgid "Adding label %s"
-msgstr "Προσθήκη ετικέτας %s"
-
-#: classes/opml.php:329
-#, php-format
-msgid "Duplicate label: %s"
-msgstr "Αντιγραφή ετικέτας: %s"
-
-#: classes/opml.php:341
-#, php-format
-msgid "Setting preference key %s to %s"
-msgstr ""
-
-#: classes/opml.php:377
-msgid "Adding filter..."
-msgstr "Προσθήκη φίλτρου σε εξέλιξη..."
-
-#: classes/opml.php:512
-#, php-format
-msgid "Processing category: %s"
-msgstr "Επεξεργασία κατηγορίας: %s"
-
-#: classes/opml.php:558
-#, php-format
-msgid "Upload failed with error code %d"
-msgstr ""
-
-#: classes/opml.php:570
-#: plugins/import_export/init.php:471
-msgid "Unable to move uploaded file."
-msgstr ""
-
-#: classes/opml.php:574
-#: plugins/import_export/init.php:475
-msgid "Error: please upload OPML file."
-msgstr ""
-
-#: classes/opml.php:585
-msgid "Error: unable to find moved OPML file."
-msgstr ""
-
-#: classes/opml.php:594
-msgid "Error while parsing document."
-msgstr "Σφάλμα κατά τη συντακτική ανάλυση του εγγράφου."
-
 #: classes/backend.php:31
 msgid "Other interface tips are available in the Tiny Tiny RSS wiki."
 msgstr ""
@@ -1031,165 +837,355 @@ msgstr "Ctrl"
 msgid "Help topic not found."
 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/backend.php:103
+#: classes/pref/filters.php:208
+#: classes/pref/feeds.php:1465
+#: classes/pref/feeds.php:1532
+#: classes/pref/prefs.php:1099
+#: classes/dlg.php:33
+#: classes/dlg.php:56
+#: classes/dlg.php:89
+#: classes/dlg.php:154
+#: classes/dlg.php:181
+#: classes/dlg.php:197
+#: classes/article.php:810
+#: plugins/af_psql_trgm/init.php:109
+#: plugins/import_export/init.php:446
+#: plugins/import_export/init.php:490
+#: plugins/share/init.php:128
+msgid "Close this window"
+msgstr "Κλείστε αυτό το παράθυρο"
 
-#: classes/dlg.php:44
-#, fuzzy
-msgid "Your Public OPML URL is:"
-msgstr "Κοινό OPML URL"
+#: classes/feeds.php:53
+msgid "View as RSS feed"
+msgstr "Προβολή ως ροή RSS"
 
-#: classes/dlg.php:53
-#: classes/dlg.php:178
-#: plugins/share/init.php:125
-msgid "Generate new URL"
-msgstr "Παραγωγή νέου URL"
+#: classes/feeds.php:54
+#: classes/feeds.php:140
+#: classes/pref/feeds.php:1326
+msgid "View as RSS"
+msgstr "Προβολή ως RSS"
 
-#: classes/dlg.php:67
-msgid "Update daemon is enabled in configuration, but daemon process is not running, which prevents all feeds from updating. Please start the daemon process or contact instance owner."
-msgstr ""
-
-#: classes/dlg.php:71
-#: classes/dlg.php:80
-msgid "Last update:"
-msgstr "Τελευταία ενημέρωση:"
-
-#: classes/dlg.php:76
-msgid "Update daemon is taking too long to perform a feed update. This could indicate a problem like crash or a hang. Please check the daemon process or contact instance owner."
-msgstr ""
-
-#: classes/dlg.php:169
-msgid "You can view this feed as RSS using the following URL:"
-msgstr ""
-
-#: classes/dlg.php:190
-msgid "You are using default tt-rss password. Please change it in the Preferences (Personal data / Authentication)."
-msgstr ""
-
-#: classes/dlg.php:194
-#, fuzzy
-msgid "Open Preferences"
-msgstr "Προτιμήσεις"
-
-#: classes/handler/public.php:387
-#: plugins/bookmarklets/init.php:40
-#, fuzzy
-msgid "Share with Tiny Tiny RSS"
-msgstr "Ενημέρωση του Tiny Tiny RSS"
-
-#: classes/handler/public.php:395
-msgid "Title:"
-msgstr "Τίτλος:"
-
-#: classes/handler/public.php:397
-#: classes/pref/feeds.php:537
-msgid "URL:"
-msgstr "URL:"
-
-#: classes/handler/public.php:399
-msgid "Content:"
-msgstr "Περιεχόμενο:"
-
-#: classes/handler/public.php:401
-msgid "Labels:"
-msgstr "Ετικέτες:"
-
-#: classes/handler/public.php:420
-msgid "Shared article will appear in the Published feed."
-msgstr ""
-
-#: classes/handler/public.php:422
-msgid "Share"
-msgstr "Διαμοιρασμός"
-
-#: classes/handler/public.php:444
-msgid "Not logged in"
-msgstr "Δεν έγινε σύνδεση"
-
-#: classes/handler/public.php:504
-msgid "Incorrect username or password"
-msgstr "Λανθασμένο όνομα χρήστη ή κωδικός πρόσβασης"
-
-#: classes/handler/public.php:557
-#, fuzzy, php-format
-msgid "Already subscribed to <b>%s</b>."
-msgstr "Εγγεγραμμένος σε %s"
-
-#: classes/handler/public.php:560
-#, fuzzy, php-format
-msgid "Subscribed to <b>%s</b>."
-msgstr "Εγγεγραμμένος σε %s"
-
-#: classes/handler/public.php:563
+#: classes/feeds.php:62
 #, php-format
-msgid "Could not subscribe to <b>%s</b>."
-msgstr ""
+msgid "Last updated: %s"
+msgstr "Ενημερώθηκε τελευταία: %s"
 
-#: classes/handler/public.php:566
-#, fuzzy, php-format
-msgid "No feeds found in <b>%s</b>."
-msgstr "Δεν βρέθηκαν ροές."
-
-#: classes/handler/public.php:569
-msgid "Multiple feed URLs found."
-msgstr "Βρέθηκαν πολλαπλές URLs ροής."
-
-#: classes/handler/public.php:573
-#, php-format
-msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
-msgstr ""
-
-#: classes/handler/public.php:591
-msgid "Subscribe to selected feed"
-msgstr "Εγγραφή σε επιλεγμένες ροές"
-
-#: classes/handler/public.php:618
-msgid "Edit subscription options"
-msgstr "Επεξεργασία επιλογών εγγραφής"
-
-#: classes/handler/public.php:656
-msgid "Password recovery"
-msgstr "Ανάκτηση κωδικού πρόσβασης"
-
-#: classes/handler/public.php:701
-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:723
-#: classes/pref/users.php:372
-msgid "Reset password"
-msgstr "Επαναφορά κωδικού πρόσβασης"
-
-#: classes/handler/public.php:733
-msgid "Some of the required form parameters are missing or incorrect."
-msgstr ""
-
-#: classes/handler/public.php:737
-#: classes/handler/public.php:806
-msgid "Go back"
-msgstr "Επιστροφή"
-
-#: classes/handler/public.php:775
+#: classes/feeds.php:100
 #, fuzzy
-msgid "[tt-rss] Password reset request"
-msgstr "[tt-rss] Ειδοποίηση αλλαγής κωδικού πρόσβασης"
+msgid "Select..."
+msgstr "Επιλογή"
 
-#: classes/handler/public.php:802
-msgid "Sorry, login and email combination not found."
+#: classes/feeds.php:102
+#: classes/pref/labels.php:273
+#: classes/pref/filters.php:391
+#: classes/pref/filters.php:449
+#: classes/pref/filters.php:795
+#: classes/pref/filters.php:878
+#: classes/pref/filters.php:905
+#: classes/pref/feeds.php:1185
+#: classes/pref/feeds.php:1416
+#: classes/pref/feeds.php:1481
+#: classes/pref/users.php:358
+#: classes/pref/prefs.php:996
+msgid "All"
+msgstr "Όλα"
+
+#: classes/feeds.php:104
+msgid "Invert"
+msgstr "Αναστροφή"
+
+#: classes/feeds.php:105
+#: classes/pref/labels.php:275
+#: classes/pref/filters.php:393
+#: classes/pref/filters.php:451
+#: classes/pref/filters.php:797
+#: classes/pref/filters.php:880
+#: classes/pref/filters.php:907
+#: classes/pref/feeds.php:1187
+#: classes/pref/feeds.php:1418
+#: classes/pref/feeds.php:1483
+#: classes/pref/users.php:360
+#: classes/pref/prefs.php:998
+msgid "None"
+msgstr "Κανένα"
+
+#: classes/feeds.php:107
+msgid "Selection toggle:"
+msgstr "Εναλλαγή επιλογής:"
+
+#: classes/feeds.php:113
+msgid "Selection:"
+msgstr "Επιλογή:"
+
+#: classes/feeds.php:116
+msgid "Set score"
+msgstr "Ορισμός βαθμολογίας"
+
+#: classes/feeds.php:119
+msgid "Archive"
+msgstr "Αρχειοθέτηση"
+
+#: classes/feeds.php:121
+msgid "Move back"
+msgstr "Κίνηση προς τα πίσω"
+
+#: classes/feeds.php:122
+#: classes/pref/filters.php:400
+#: classes/pref/filters.php:458
+#: classes/pref/filters.php:887
+#: classes/pref/filters.php:914
+msgid "Delete"
+msgstr "Διαγραφή"
+
+#: classes/feeds.php:127
+#: classes/feeds.php:132
+#: plugins/mailto/init.php:25
+#: plugins/mail/init.php:76
+msgid "Forward by email"
+msgstr "Προώθηση μέσω e-mail"
+
+#: classes/feeds.php:136
+msgid "Feed:"
+msgstr "Ροή:"
+
+#: classes/feeds.php:193
+#: classes/feeds.php:802
+msgid "Feed not found."
+msgstr "Η ροή δεν βρέθηκε."
+
+#: classes/feeds.php:255
+msgid "Never"
+msgstr "Ποτέ"
+
+#: classes/feeds.php:341
+#, php-format
+msgid "Imported at %s"
+msgstr "Εισήχθη στις %s"
+
+#: classes/feeds.php:391
+#: classes/feeds.php:484
+msgid "mark feed as read"
+msgstr "σήμανση ροής ως αναγνωσμένη"
+
+#: classes/feeds.php:540
+msgid "Collapse article"
+msgstr "Σύμπτυξη άρθρου"
+
+#: classes/feeds.php:592
+#: classes/article.php:762
+msgid "Originally from:"
+msgstr "Αρχικά από:"
+
+#: classes/feeds.php:603
+#: classes/pref/feeds.php:538
+#: classes/article.php:773
+msgid "Feed URL"
+msgstr "URL Ροής"
+
+#: classes/feeds.php:630
+#: classes/article.php:729
+msgid "Edit tags for this article"
 msgstr ""
 
-#: classes/handler/public.php:824
-msgid "Your access level is insufficient to run this script."
+#: classes/feeds.php:644
+#: classes/article.php:625
+#, fuzzy
+msgid "comment"
+msgid_plural "comments"
+msgstr[0] "σχόλια"
+msgstr[1] "σχόλια"
+
+#: classes/feeds.php:648
+#: classes/article.php:629
+msgid "comments"
+msgstr "σχόλια"
+
+#: classes/feeds.php:686
+msgid "No unread articles found to display."
 msgstr ""
 
-#: classes/handler/public.php:850
-msgid "Database Updater"
-msgstr "Πρόγραμμα Ενημέρωσης Βάσης Δεδομένων"
+#: classes/feeds.php:689
+msgid "No updated articles found to display."
+msgstr ""
 
-#: classes/handler/public.php:915
-msgid "Perform updates"
-msgstr "Εκτέλεση ενημερώσεων"
+#: classes/feeds.php:692
+msgid "No starred articles found to display."
+msgstr ""
+
+#: classes/feeds.php:696
+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:698
+msgid "No articles found to display."
+msgstr ""
+
+#: classes/feeds.php:714
+#: classes/feeds.php:905
+#, fuzzy, php-format
+msgid "Feeds last updated at %s"
+msgstr "Ενημερώθηκε τελευταία: %s"
+
+#: classes/feeds.php:726
+#: classes/feeds.php:917
+msgid "Some feeds have update errors (click for details)"
+msgstr ""
+
+#: classes/feeds.php:894
+msgid "No feed selected."
+msgstr "Δεν επιλέχθηκε ροή."
+
+#: classes/feeds.php:958
+#: classes/feeds.php:966
+msgid "Feed or site URL"
+msgstr "URL ροής ή ιστοτόπου"
+
+#: classes/feeds.php:972
+#: classes/pref/feeds.php:559
+#: classes/pref/feeds.php:800
+#: classes/pref/feeds.php:1632
+msgid "Place in category:"
+msgstr "Τοποθέτηση σε κατηγορία:"
+
+#: classes/feeds.php:980
+msgid "Available feeds"
+msgstr "Διαθέσιμες ροές"
+
+#: classes/feeds.php:992
+#: classes/pref/feeds.php:621
+#: classes/pref/feeds.php:848
+#: classes/pref/users.php:61
+msgid "Authentication"
+msgstr "Πιστοποίηση"
+
+#: classes/feeds.php:996
+#: classes/pref/feeds.php:625
+#: classes/pref/feeds.php:852
+#: classes/pref/feeds.php:1646
+#: classes/pref/users.php:403
+msgid "Login"
+msgstr "Σύνδεση"
+
+#: classes/feeds.php:1000
+#: classes/pref/feeds.php:631
+#: classes/pref/feeds.php:860
+#: classes/pref/feeds.php:1649
+#: classes/pref/prefs.php:243
+msgid "Password"
+msgstr "Κωδικός Πρόσβασης"
+
+#: classes/feeds.php:1011
+#: classes/pref/feeds.php:645
+msgid "This feed requires authentication."
+msgstr "Αυτή η ροή απαιτεί πιστοποίηση."
+
+#: classes/feeds.php:1014
+#: classes/feeds.php:1070
+#: classes/pref/feeds.php:1668
+msgid "Subscribe"
+msgstr "Εγγραφή"
+
+#: classes/feeds.php:1017
+msgid "More feeds"
+msgstr "Περισσότερες ροές"
+
+#: classes/feeds.php:1020
+#: classes/feeds.php:1072
+#: classes/feeds.php:1111
+#: classes/pref/labels.php:84
+#: classes/pref/filters.php:528
+#: classes/pref/filters.php:945
+#: classes/pref/filters.php:1022
+#: classes/pref/filters.php:1115
+#: classes/pref/feeds.php:774
+#: classes/pref/feeds.php:916
+#: classes/pref/feeds.php:1669
+#: classes/pref/users.php:105
+#: classes/pref/prefs.php:984
+#: classes/article.php:238
+#: classes/handler/public.php:443
+#: classes/handler/public.php:477
+#: plugins/mail/init.php:179
+#: plugins/note/init.php:60
+msgid "Cancel"
+msgstr "Ακύρωση"
+
+#: classes/feeds.php:1042
+#: classes/feeds.php:1110
+#: classes/pref/filters.php:788
+#: classes/pref/feeds.php:1178
+#: classes/pref/users.php:345
+#: js/tt-rss.js:152
+msgid "Search"
+msgstr "Αναζήτηση"
+
+#: classes/feeds.php:1046
+msgid "Popular feeds"
+msgstr "Δημοφιλείς ροές"
+
+#: classes/feeds.php:1047
+msgid "Feed archive"
+msgstr "Αρχειοθέτηση ροής"
+
+#: classes/feeds.php:1050
+msgid "limit:"
+msgstr "όριο:"
+
+#: classes/feeds.php:1071
+#: classes/pref/labels.php:282
+#: classes/pref/filters.php:518
+#: classes/pref/filters.php:814
+#: classes/pref/feeds.php:751
+#: classes/pref/users.php:369
+msgid "Remove"
+msgstr "Αφαίρεση"
+
+#: classes/feeds.php:1084
+msgid "Look for"
+msgstr "Αναζήτηση"
+
+#: classes/feeds.php:1092
+#, php-format
+msgid "in %s"
+msgstr ""
+
+#: classes/feeds.php:1097
+msgid "Used for word stemming"
+msgstr ""
+
+#: classes/feeds.php:1106
+msgid "Search syntax"
+msgstr "Σύνταξη αναζήτησης"
+
+#: classes/feeds.php:1563
+msgid "Starred articles"
+msgstr "Άρθρα με αστέρια"
+
+#: classes/feeds.php:1565
+msgid "Published articles"
+msgstr "Δημοσιευμένα άρθρα"
+
+#: classes/feeds.php:1567
+msgid "Fresh articles"
+msgstr "Καινούργια άρθρα"
+
+#: classes/feeds.php:1571
+msgid "Archived articles"
+msgstr "Αρχειοθετημένα άρθρα"
+
+#: classes/feeds.php:1573
+msgid "Recently read"
+msgstr "Πρόσφατα αναγνωσμένα"
+
+#: classes/feeds.php:1694
+msgid "Special"
+msgstr "Ειδικό"
+
+#: classes/feeds.php:1951
+#, php-format
+msgid "Search results: %s"
+msgstr "Αποτελέσματα αναζήτησης: %s"
 
 #: classes/pref/labels.php:25
 #: classes/pref/filters.php:377
@@ -1209,201 +1205,194 @@ msgstr "Προσκήνιο:"
 msgid "Background:"
 msgstr "Παρασκήνιο:"
 
+#: classes/pref/labels.php:82
+#: classes/pref/filters.php:525
+#: classes/pref/feeds.php:773
+#: classes/pref/feeds.php:913
+#: classes/pref/users.php:103
+#: classes/pref/prefs.php:982
+#: classes/article.php:236
+#: plugins/af_zz_imgproxy/init.php:238
+#: plugins/af_redditimgur/init.php:66
+#: plugins/af_psql_trgm/init.php:188
+#: plugins/af_readability/init.php:80
+#: plugins/nsfw/init.php:85
+#: plugins/mail/init.php:65
+#: plugins/note/init.php:58
+msgid "Save"
+msgstr "Αποθήκευση"
+
 #: classes/pref/labels.php:244
 #, fuzzy, php-format
 msgid "Created label <b>%s</b>"
 msgstr "Δημιουργία ετικέτας"
 
 #: classes/pref/labels.php:270
-#: classes/pref/users.php:356
-#: classes/pref/feeds.php:1183
-#: classes/pref/feeds.php:1414
-#: classes/pref/feeds.php:1479
 #: classes/pref/filters.php:388
 #: classes/pref/filters.php:446
 #: classes/pref/filters.php:792
 #: classes/pref/filters.php:875
 #: classes/pref/filters.php:902
+#: classes/pref/feeds.php:1182
+#: classes/pref/feeds.php:1413
+#: classes/pref/feeds.php:1478
+#: classes/pref/users.php:355
 #: classes/pref/prefs.php:993
 msgid "Select"
 msgstr "Επιλογή"
 
-#: classes/pref/labels.php:273
-#: classes/pref/users.php:359
-#: classes/pref/feeds.php:1186
-#: classes/pref/feeds.php:1417
-#: classes/pref/feeds.php:1482
-#: classes/pref/filters.php:391
-#: classes/pref/filters.php:449
-#: classes/pref/filters.php:795
-#: classes/pref/filters.php:878
-#: classes/pref/filters.php:905
-#: classes/pref/prefs.php:996
-#: classes/feeds.php:102
-msgid "All"
-msgstr "Όλα"
-
-#: classes/pref/labels.php:275
-#: classes/pref/users.php:361
-#: classes/pref/feeds.php:1188
-#: classes/pref/feeds.php:1419
-#: classes/pref/feeds.php:1484
-#: classes/pref/filters.php:393
-#: classes/pref/filters.php:451
-#: classes/pref/filters.php:797
-#: classes/pref/filters.php:880
-#: classes/pref/filters.php:907
-#: classes/pref/prefs.php:998
-#: classes/feeds.php:105
-msgid "None"
-msgstr "Κανένα"
-
-#: classes/pref/labels.php:282
-#: classes/pref/users.php:370
-#: classes/pref/feeds.php:752
-#: classes/pref/filters.php:518
-#: classes/pref/filters.php:814
-#: classes/feeds.php:1088
-msgid "Remove"
-msgstr "Αφαίρεση"
-
 #: classes/pref/labels.php:285
 msgid "Clear colors"
 msgstr "Απαλοιφή χρωμάτων"
 
-#: classes/pref/users.php:6
-#: classes/pref/system.php:8
-msgid "Your access level is insufficient to open this tab."
-msgstr ""
-
-#: classes/pref/users.php:26
+#: classes/pref/filters.php:155
 #, fuzzy
-msgid "Edit user"
-msgstr "Επεξεργασία κανόνα"
+msgid "Preview article"
+msgstr "Καινούργια άρθρα"
 
-#: classes/pref/users.php:61
-#: classes/pref/feeds.php:622
-#: classes/pref/feeds.php:849
-#: classes/feeds.php:1009
-msgid "Authentication"
-msgstr "Πιστοποίηση"
+#: classes/pref/filters.php:267
+#: classes/pref/filters.php:573
+msgid "(inverse)"
+msgstr "(αναστροφή)"
 
-#: classes/pref/users.php:64
-msgid "Access level: "
-msgstr "Επίπεδο πρόσβασης: "
-
-#: classes/pref/users.php:82
-#: classes/pref/feeds.php:648
-#: classes/pref/feeds.php:867
-msgid "Options"
-msgstr "Επιλογές"
-
-#: classes/pref/users.php:96
-#: js/prefs.js:479
-msgid "User details"
-msgstr "Λεπτομέρειες χρήστη"
-
-#: classes/pref/users.php:136
-#: classes/pref/users.php:407
-msgid "Registered"
-msgstr "Εγγεγραμμένος"
-
-#: classes/pref/users.php:137
-msgid "Last logged in"
-msgstr "Τελευταία σύνδεση"
-
-#: classes/pref/users.php:145
-msgid "Subscribed feeds count"
-msgstr "Αριθμός εγγεγραμμένων ροών"
-
-#: classes/pref/users.php:146
-#, fuzzy
-msgid "Stored articles"
-msgstr "Άρθρα με αστέρια"
-
-#: classes/pref/users.php:150
-#: classes/pref/users.php:406
-msgid "Subscribed feeds"
-msgstr "Εγγεγραμμένες ροές"
-
-#: classes/pref/users.php:176
-msgid "User not found"
-msgstr "Ο χρήστης δεν βρέθηκε."
-
-#: classes/pref/users.php:246
+#: classes/pref/filters.php:263
+#: classes/pref/filters.php:572
 #, php-format
-msgid "Added user <b>%s</b> with password <b>%s</b>"
+msgid "%s on %s in %s %s"
 msgstr ""
 
-#: classes/pref/users.php:253
-#, php-format
-msgid "Could not create user <b>%s</b>"
-msgstr ""
+#: classes/pref/filters.php:383
+#: classes/pref/filters.php:870
+#: classes/pref/filters.php:977
+msgid "Match"
+msgstr "Αντιστοίχιση"
 
-#: classes/pref/users.php:257
-#, php-format
-msgid "User <b>%s</b> already exists."
-msgstr ""
+#: classes/pref/filters.php:397
+#: classes/pref/filters.php:455
+#: classes/pref/filters.php:884
+#: classes/pref/filters.php:911
+msgid "Add"
+msgstr "Προσθήκη"
 
-#: classes/pref/users.php:285
-#, php-format
-msgid "Changed password of user <b>%s</b> to <b>%s</b>"
-msgstr ""
+#: classes/pref/filters.php:441
+#: classes/pref/filters.php:897
+msgid "Apply actions"
+msgstr "Εφαρμογή ενεργειών"
 
-#: classes/pref/users.php:287
-#, php-format
-msgid "Sending new password of user <b>%s</b> to <b>%s</b>"
-msgstr ""
+#: classes/pref/filters.php:492
+#: classes/pref/filters.php:926
+msgid "Enabled"
+msgstr "Ενεργοποιημένο"
 
-#: classes/pref/users.php:311
-msgid "[tt-rss] Password change notification"
-msgstr "[tt-rss] Ειδοποίηση αλλαγής κωδικού πρόσβασης"
+#: classes/pref/filters.php:501
+#: classes/pref/filters.php:929
+msgid "Match any rule"
+msgstr "Αντιστοίχιση με οποιονδήποτε κανόνα"
 
-#: classes/pref/users.php:346
-#: classes/pref/feeds.php:1179
-#: classes/pref/filters.php:788
-#: classes/feeds.php:1059
-#: classes/feeds.php:1127
-#: js/tt-rss.js:165
-msgid "Search"
-msgstr "Αναζήτηση"
+#: classes/pref/filters.php:510
+#: classes/pref/filters.php:932
+msgid "Inverse matching"
+msgstr "Αναστροφή αντιστοίχισης"
 
-#: classes/pref/users.php:364
-msgid "Create user"
-msgstr "Δημιουργία χρήστη"
+#: classes/pref/filters.php:522
+#: classes/pref/filters.php:939
+msgid "Test"
+msgstr "Δοκιμή"
+
+#: classes/pref/filters.php:804
+msgid "Combine"
+msgstr "Συνδυασμός"
 
-#: classes/pref/users.php:368
 #: classes/pref/filters.php:807
+#: classes/pref/users.php:367
 msgid "Edit"
 msgstr "Επεξεργασία"
 
-#: classes/pref/users.php:404
-#: classes/pref/feeds.php:626
-#: classes/pref/feeds.php:853
-#: classes/pref/feeds.php:1649
-#: classes/feeds.php:1013
-msgid "Login"
-msgstr "Σύνδεση"
+#: classes/pref/filters.php:810
+#: classes/pref/feeds.php:1198
+#: classes/pref/feeds.php:1212
+msgid "Reset sort order"
+msgstr "Επαναφορά σειράς ταξινόμησης"
 
-#: classes/pref/users.php:405
-msgid "Access Level"
-msgstr "Επίπεδο Πρόσβασης"
+#: classes/pref/filters.php:942
+msgid "Create"
+msgstr "Δημιουργία"
 
-#: classes/pref/users.php:408
-msgid "Last login"
-msgstr "Τελευταία σύνδεση"
+#: classes/pref/filters.php:987
+msgid "Regular expression, without outer delimiters (i.e. slashes)"
+msgstr ""
 
-#: classes/pref/users.php:427
-msgid "Click to edit"
-msgstr "Κάντε κλικ για επεξεργασία"
+#: classes/pref/filters.php:993
+msgid "Inverse regular expression matching"
+msgstr "Αναστροφή τακτικής αντιστοίχισης έκφρασης"
 
-#: classes/pref/users.php:447
-msgid "No users defined."
-msgstr "Δεν ορίστηκαν χρήστες."
+#: classes/pref/filters.php:995
+msgid "on field"
+msgstr "επί τόπου"
 
-#: classes/pref/users.php:449
-msgid "No matching users found."
-msgstr "Δεν βρέθηκαν χρήστες που να αντιστοιχούν."
+#: classes/pref/filters.php:1001
+#: js/PrefFilterTree.js:44
+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:764
+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:786
+msgid "Add action"
+msgstr "Προσθήκη ενέργειας"
+
+#: classes/pref/filters.php:1139
+msgid "[No caption]"
+msgstr "[Χωρίς λεζάντα]"
+
+#: classes/pref/filters.php:1141
+#, fuzzy, php-format
+msgid "%s (%d rule)"
+msgid_plural "%s (%d rules)"
+msgstr[0] "Προσθήκη κανόνα"
+msgstr[1] "Προσθήκη κανόνα"
+
+#: classes/pref/filters.php:1155
+#, fuzzy
+msgid "matches any rule"
+msgstr "Αντιστοίχιση με οποιονδήποτε κανόνα"
+
+#: classes/pref/filters.php:1158
+#, fuzzy, php-format
+msgid "%s (+%d action)"
+msgid_plural "%s (+%d actions)"
+msgstr[0] "Προσθήκη ενέργειας"
+msgstr[1] "Προσθήκη ενέργειας"
+
+#: classes/pref/system.php:8
+#: classes/pref/users.php:6
+msgid "Your access level is insufficient to open this tab."
+msgstr ""
 
 #: classes/pref/system.php:29
 msgid "Error Log"
@@ -1448,386 +1437,317 @@ msgid_plural "(%d feeds)"
 msgstr[0] "Επεξεργασία ροής"
 msgstr[1] "Επεξεργασία ροής"
 
-#: classes/pref/feeds.php:514
+#: classes/pref/feeds.php:513
 #: classes/pref/prefs.php:18
 msgid "General"
 msgstr "Γενικά"
 
-#: classes/pref/feeds.php:528
+#: classes/pref/feeds.php:527
 msgid "Feed Title"
 msgstr "Τίτλος Ροής"
 
-#: classes/pref/feeds.php:560
-#: classes/pref/feeds.php:801
-#: classes/pref/feeds.php:1635
-#: classes/feeds.php:989
-msgid "Place in category:"
-msgstr "Τοποθέτηση σε κατηγορία:"
+#: classes/pref/feeds.php:536
+#: classes/handler/public.php:417
+msgid "URL:"
+msgstr "URL:"
 
-#: classes/pref/feeds.php:572
+#: classes/pref/feeds.php:571
 #, fuzzy
 msgid "Site URL:"
 msgstr "URL άρθρου:"
 
-#: classes/pref/feeds.php:574
+#: classes/pref/feeds.php:573
 #, fuzzy
 msgid "Site URL"
 msgstr "URL Ροής"
 
-#: classes/pref/feeds.php:585
-#: classes/pref/feeds.php:815
+#: classes/pref/feeds.php:584
+#: classes/pref/feeds.php:814
 #, fuzzy
 msgid "Language:"
 msgstr "Γλώσσα"
 
-#: classes/pref/feeds.php:592
-#: classes/pref/feeds.php:824
+#: classes/pref/feeds.php:591
+#: classes/pref/feeds.php:823
 msgid "Update"
 msgstr "Ενημέρωση"
 
-#: classes/pref/feeds.php:607
-#: classes/pref/feeds.php:840
+#: classes/pref/feeds.php:606
+#: classes/pref/feeds.php:839
 msgid "Article purging:"
 msgstr "Εκκαθάριση άρθρου:"
 
-#: classes/pref/feeds.php:632
-#: classes/pref/feeds.php:861
-#: classes/pref/feeds.php:1652
-#: classes/pref/prefs.php:243
-#: classes/feeds.php:1017
-msgid "Password"
-msgstr "Κωδικός Πρόσβασης"
-
-#: classes/pref/feeds.php:636
+#: classes/pref/feeds.php:635
 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:646
-#: classes/feeds.php:1028
-msgid "This feed requires authentication."
-msgstr "Αυτή η ροή απαιτεί πιστοποίηση."
+#: classes/pref/feeds.php:647
+#: classes/pref/feeds.php:866
+#: classes/pref/users.php:82
+msgid "Options"
+msgstr "Επιλογές"
 
-#: classes/pref/feeds.php:662
-#: classes/pref/feeds.php:871
+#: classes/pref/feeds.php:661
+#: classes/pref/feeds.php:870
 msgid "Hide from Popular feeds"
 msgstr "Απόκρυψη από Δημοφιλείς ροές"
 
-#: classes/pref/feeds.php:674
-#: classes/pref/feeds.php:877
+#: classes/pref/feeds.php:673
+#: classes/pref/feeds.php:876
 msgid "Include in e-mail digest"
 msgstr "Συμπεριλάβετε σε σύνοψη e-mail"
 
-#: classes/pref/feeds.php:687
-#: classes/pref/feeds.php:883
+#: classes/pref/feeds.php:686
+#: classes/pref/feeds.php:882
 msgid "Always display image attachments"
 msgstr "Να εμφανίζονται πάντα συνημμένα εικόνας"
 
-#: classes/pref/feeds.php:700
-#: classes/pref/feeds.php:891
+#: classes/pref/feeds.php:699
+#: classes/pref/feeds.php:890
 #, fuzzy
 msgid "Do not embed media"
 msgstr "Μην ενσωματώνετε εικόνες"
 
-#: classes/pref/feeds.php:713
-#: classes/pref/feeds.php:899
+#: classes/pref/feeds.php:712
+#: classes/pref/feeds.php:898
 msgid "Cache media"
 msgstr ""
 
-#: classes/pref/feeds.php:725
-#: classes/pref/feeds.php:905
+#: classes/pref/feeds.php:724
+#: classes/pref/feeds.php:904
 #, fuzzy
 msgid "Mark updated articles as unread"
 msgstr "Σήμανση ροής ως αναγνωσμένη"
 
-#: classes/pref/feeds.php:729
+#: classes/pref/feeds.php:728
 msgid "Icon"
 msgstr "Εικονίδιο"
 
-#: classes/pref/feeds.php:743
-#: classes/pref/feeds.php:1284
+#: classes/pref/feeds.php:742
+#: classes/pref/feeds.php:1283
 #: plugins/import_export/init.php:71
 #, fuzzy
 msgid "Choose file..."
 msgstr "Δημιουργία φίλτρου..."
 
-#: classes/pref/feeds.php:750
+#: classes/pref/feeds.php:749
 msgid "Replace"
 msgstr "Αντικατάσταση"
 
-#: classes/pref/feeds.php:757
+#: classes/pref/feeds.php:756
 #: classes/pref/prefs.php:679
 msgid "Plugins"
 msgstr "Πρόσθετα"
 
-#: classes/pref/feeds.php:1154
+#: classes/pref/feeds.php:1153
 msgid "Feeds with errors"
 msgstr "Ροές με σφάλματα"
 
-#: classes/pref/feeds.php:1161
+#: classes/pref/feeds.php:1160
 msgid "Inactive feeds"
 msgstr "Αδρανείς ροές"
 
-#: classes/pref/feeds.php:1197
+#: classes/pref/feeds.php:1196
 msgid "Edit selected feeds"
 msgstr "Επεξεργασία επιλεγμένων ροών"
 
-#: classes/pref/feeds.php:1199
-#: classes/pref/feeds.php:1213
-#: classes/pref/filters.php:810
-msgid "Reset sort order"
-msgstr "Επαναφορά σειράς ταξινόμησης"
-
-#: classes/pref/feeds.php:1201
-#: js/prefs.js:1462
+#: classes/pref/feeds.php:1200
+#: js/prefs.js:1171
 msgid "Batch subscribe"
 msgstr "Εγγραφή παρτίδας"
 
-#: classes/pref/feeds.php:1208
+#: classes/pref/feeds.php:1207
 msgid "Categories"
 msgstr "Κατηγορίες"
 
-#: classes/pref/feeds.php:1211
+#: classes/pref/feeds.php:1210
 msgid "Add category"
 msgstr "Προσθήκη κατηγορίας"
 
-#: classes/pref/feeds.php:1215
+#: classes/pref/feeds.php:1214
 msgid "Remove selected"
 msgstr "Αφαίρεση επιλεγμένων"
 
-#: classes/pref/feeds.php:1272
+#: classes/pref/feeds.php:1271
 msgid "OPML"
 msgstr "OPML"
 
-#: classes/pref/feeds.php:1274
+#: classes/pref/feeds.php:1273
 msgid "Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings."
 msgstr ""
 
-#: classes/pref/feeds.php:1275
+#: classes/pref/feeds.php:1274
 msgid "Only main settings profile can be migrated using OPML."
 msgstr ""
 
-#: classes/pref/feeds.php:1290
+#: classes/pref/feeds.php:1289
 msgid "Import my OPML"
 msgstr "Εισαγωγή του OPML μου"
 
-#: classes/pref/feeds.php:1296
+#: classes/pref/feeds.php:1295
 msgid "Filename:"
 msgstr "Όνομα αρχείου:"
 
-#: classes/pref/feeds.php:1298
+#: classes/pref/feeds.php:1297
 msgid "Include settings"
 msgstr "Συμπεριλάβετε ρυθμίσεις"
 
-#: classes/pref/feeds.php:1302
+#: classes/pref/feeds.php:1301
 msgid "Export OPML"
 msgstr "Εξαγωγή OPML"
 
-#: classes/pref/feeds.php:1306
+#: classes/pref/feeds.php:1305
 msgid "Your OPML can be published publicly and can be subscribed by anyone who knows the URL below."
 msgstr ""
 
-#: classes/pref/feeds.php:1310
+#: classes/pref/feeds.php:1309
 msgid "Public OPML URL"
 msgstr "Κοινό OPML URL"
 
-#: classes/pref/feeds.php:1311
+#: classes/pref/feeds.php:1310
 msgid "Display published OPML URL"
 msgstr "Εμφάνιση δημοσιευμένου URL του OPML"
 
-#: classes/pref/feeds.php:1318
+#: classes/pref/feeds.php:1317
 msgid "Published & shared articles / Generated feeds"
 msgstr ""
 
-#: classes/pref/feeds.php:1320
+#: classes/pref/feeds.php:1319
 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:1327
-#: classes/feeds.php:54
-#: classes/feeds.php:140
-msgid "View as RSS"
-msgstr "Προβολή ως RSS"
-
-#: classes/pref/feeds.php:1328
 msgid "Display URL"
 msgstr "Εμφάνιση URL"
 
-#: classes/pref/feeds.php:1331
+#: classes/pref/feeds.php:1330
 msgid "Clear all generated URLs"
 msgstr "Απαλοιφή όλων των παραχθέντων URLs"
 
-#: classes/pref/feeds.php:1410
+#: classes/pref/feeds.php:1409
 msgid "These feeds have not been updated with new content for 3 months (oldest first):"
 msgstr ""
 
-#: classes/pref/feeds.php:1444
-#: classes/pref/feeds.php:1509
+#: classes/pref/feeds.php:1443
+#: classes/pref/feeds.php:1508
 msgid "Click to edit feed"
 msgstr "Κάντε κλικ για επεξεργασία ροής"
 
-#: classes/pref/feeds.php:1462
-#: classes/pref/feeds.php:1529
+#: classes/pref/feeds.php:1461
+#: classes/pref/feeds.php:1528
 msgid "Unsubscribe from selected feeds"
 msgstr "Κατάργηση εγγραφής από επιλεγμένες ροές"
 
-#: classes/pref/feeds.php:1632
+#: classes/pref/feeds.php:1629
 msgid "Add one valid RSS feed per line (no feed detection is done)"
 msgstr ""
 
-#: classes/pref/feeds.php:1641
+#: classes/pref/feeds.php:1638
 msgid "Feeds to subscribe, One per line"
 msgstr ""
 
-#: classes/pref/feeds.php:1664
+#: classes/pref/feeds.php:1661
 msgid "Feeds require authentication."
 msgstr "Οι ροές απαιτούν πιστοποίηση."
 
-#: classes/pref/feeds.php:1671
-#: classes/feeds.php:1031
-#: classes/feeds.php:1087
-msgid "Subscribe"
-msgstr "Εγγραφή"
-
-#: classes/pref/filters.php:155
+#: classes/pref/users.php:26
 #, fuzzy
-msgid "Preview article"
-msgstr "Καινούργια άρθρα"
+msgid "Edit user"
+msgstr "Επεξεργασία κανόνα"
 
-#: classes/pref/filters.php:267
-#: classes/pref/filters.php:573
-msgid "(inverse)"
-msgstr "(αναστροφή)"
+#: classes/pref/users.php:64
+msgid "Access level: "
+msgstr "Επίπεδο πρόσβασης: "
 
-#: classes/pref/filters.php:263
-#: classes/pref/filters.php:572
+#: classes/pref/users.php:96
+#: js/prefs.js:403
+msgid "User details"
+msgstr "Λεπτομέρειες χρήστη"
+
+#: classes/pref/users.php:136
+#: classes/pref/users.php:406
+msgid "Registered"
+msgstr "Εγγεγραμμένος"
+
+#: classes/pref/users.php:137
+msgid "Last logged in"
+msgstr "Τελευταία σύνδεση"
+
+#: classes/pref/users.php:145
+msgid "Subscribed feeds count"
+msgstr "Αριθμός εγγεγραμμένων ροών"
+
+#: classes/pref/users.php:146
+#, fuzzy
+msgid "Stored articles"
+msgstr "Άρθρα με αστέρια"
+
+#: classes/pref/users.php:150
+#: classes/pref/users.php:405
+msgid "Subscribed feeds"
+msgstr "Εγγεγραμμένες ροές"
+
+#: classes/pref/users.php:176
+msgid "User not found"
+msgstr "Ο χρήστης δεν βρέθηκε."
+
+#: classes/pref/users.php:246
 #, php-format
-msgid "%s on %s in %s %s"
+msgid "Added user <b>%s</b> with password <b>%s</b>"
 msgstr ""
 
-#: classes/pref/filters.php:383
-#: classes/pref/filters.php:870
-#: classes/pref/filters.php:977
-msgid "Match"
-msgstr "Αντιστοίχιση"
-
-#: classes/pref/filters.php:397
-#: classes/pref/filters.php:455
-#: classes/pref/filters.php:884
-#: classes/pref/filters.php:911
-msgid "Add"
-msgstr "Προσθήκη"
-
-#: classes/pref/filters.php:400
-#: classes/pref/filters.php:458
-#: classes/pref/filters.php:887
-#: classes/pref/filters.php:914
-#: classes/feeds.php:122
-msgid "Delete"
-msgstr "Διαγραφή"
-
-#: classes/pref/filters.php:441
-#: classes/pref/filters.php:897
-msgid "Apply actions"
-msgstr "Εφαρμογή ενεργειών"
-
-#: classes/pref/filters.php:492
-#: classes/pref/filters.php:926
-msgid "Enabled"
-msgstr "Ενεργοποιημένο"
-
-#: classes/pref/filters.php:501
-#: classes/pref/filters.php:929
-msgid "Match any rule"
-msgstr "Αντιστοίχιση με οποιονδήποτε κανόνα"
-
-#: classes/pref/filters.php:510
-#: classes/pref/filters.php:932
-msgid "Inverse matching"
-msgstr "Αναστροφή αντιστοίχισης"
-
-#: classes/pref/filters.php:522
-#: classes/pref/filters.php:939
-msgid "Test"
-msgstr "Δοκιμή"
-
-#: classes/pref/filters.php:804
-msgid "Combine"
-msgstr "Συνδυασμός"
-
-#: classes/pref/filters.php:942
-msgid "Create"
-msgstr "Δημιουργία"
-
-#: classes/pref/filters.php:987
-msgid "Regular expression, without outer delimiters (i.e. slashes)"
+#: classes/pref/users.php:253
+#, php-format
+msgid "Could not create user <b>%s</b>"
 msgstr ""
 
-#: classes/pref/filters.php:993
-msgid "Inverse regular expression matching"
-msgstr "Αναστροφή τακτικής αντιστοίχισης έκφρασης"
+#: classes/pref/users.php:257
+#, php-format
+msgid "User <b>%s</b> already exists."
+msgstr ""
 
-#: classes/pref/filters.php:995
-msgid "on field"
-msgstr "επί τόπου"
+#: classes/pref/users.php:285
+#, php-format
+msgid "Changed password of user <b>%s</b> to <b>%s</b>"
+msgstr ""
 
-#: classes/pref/filters.php:1001
-#: js/PrefFilterTree.js:43
-msgid "in"
-msgstr "σε"
+#: classes/pref/users.php:287
+#, php-format
+msgid "Sending new password of user <b>%s</b> to <b>%s</b>"
+msgstr ""
 
-#: classes/pref/filters.php:1014
-msgid "Wiki: Filters"
-msgstr "Wiki: Φίλτρα"
+#: classes/pref/users.php:310
+msgid "[tt-rss] Password change notification"
+msgstr "[tt-rss] Ειδοποίηση αλλαγής κωδικού πρόσβασης"
 
-#: classes/pref/filters.php:1019
-msgid "Save rule"
-msgstr "Αποθήκευση κανόνα"
+#: classes/pref/users.php:363
+msgid "Create user"
+msgstr "Δημιουργία χρήστη"
 
-#: classes/pref/filters.php:1019
-#: js/functions.js:797
-msgid "Add rule"
-msgstr "Προσθήκη κανόνα"
+#: classes/pref/users.php:371
+#: classes/handler/public.php:747
+msgid "Reset password"
+msgstr "Επαναφορά κωδικού πρόσβασης"
 
-#: classes/pref/filters.php:1042
-msgid "Perform Action"
-msgstr "Πραγματοποίηση Ενέργειας"
+#: classes/pref/users.php:404
+msgid "Access Level"
+msgstr "Επίπεδο Πρόσβασης"
 
-#: classes/pref/filters.php:1093
-#, fuzzy
-msgid "No actions available"
-msgstr "Διατίθεται νέα έκδοση!"
+#: classes/pref/users.php:407
+msgid "Last login"
+msgstr "Τελευταία σύνδεση"
 
-#: classes/pref/filters.php:1112
-msgid "Save action"
-msgstr "Αποθήκευση ενέργειας"
+#: classes/pref/users.php:426
+msgid "Click to edit"
+msgstr "Κάντε κλικ για επεξεργασία"
 
-#: classes/pref/filters.php:1112
-#: js/functions.js:819
-msgid "Add action"
-msgstr "Προσθήκη ενέργειας"
+#: classes/pref/users.php:446
+msgid "No users defined."
+msgstr "Δεν ορίστηκαν χρήστες."
 
-#: classes/pref/filters.php:1139
-msgid "[No caption]"
-msgstr "[Χωρίς λεζάντα]"
-
-#: classes/pref/filters.php:1141
-#, fuzzy, php-format
-msgid "%s (%d rule)"
-msgid_plural "%s (%d rules)"
-msgstr[0] "Προσθήκη κανόνα"
-msgstr[1] "Προσθήκη κανόνα"
-
-#: classes/pref/filters.php:1155
-#, fuzzy
-msgid "matches any rule"
-msgstr "Αντιστοίχιση με οποιονδήποτε κανόνα"
-
-#: classes/pref/filters.php:1158
-#, fuzzy, php-format
-msgid "%s (+%d action)"
-msgid_plural "%s (+%d actions)"
-msgstr[0] "Προσθήκη ενέργειας"
-msgstr[1] "Προσθήκη ενέργειας"
+#: classes/pref/users.php:448
+msgid "No matching users found."
+msgstr "Δεν βρέθηκαν χρήστες που να αντιστοιχούν."
 
 #: classes/pref/prefs.php:19
 msgid "Interface"
@@ -2009,7 +1929,7 @@ msgid "Strip all but most common HTML tags when reading articles."
 msgstr ""
 
 #: classes/pref/prefs.php:53
-#: js/prefs.js:1424
+#: js/prefs.js:1136
 msgid "Customize stylesheet"
 msgstr "Διαμόρφωση φύλλου ύφους"
 
@@ -2254,256 +2174,303 @@ msgstr "Αφαίρεση επιλεγμένων προφίλ"
 msgid "Activate profile"
 msgstr "Ενεργοποίηση προφίλ"
 
-#: classes/feeds.php:53
-msgid "View as RSS feed"
-msgstr "Προβολή ως ροή RSS"
+#: 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/feeds.php:62
-#, php-format
-msgid "Last updated: %s"
-msgstr "Ενημερώθηκε τελευταία: %s"
-
-#: classes/feeds.php:100
+#: classes/dlg.php:44
 #, fuzzy
-msgid "Select..."
-msgstr "Επιλογή"
+msgid "Your Public OPML URL is:"
+msgstr "Κοινό OPML URL"
 
-#: classes/feeds.php:104
-msgid "Invert"
-msgstr "Αναστροφή"
+#: classes/dlg.php:53
+#: classes/dlg.php:178
+#: plugins/share/init.php:125
+msgid "Generate new URL"
+msgstr "Παραγωγή νέου URL"
 
-#: classes/feeds.php:107
-msgid "Selection toggle:"
-msgstr "Εναλλαγή επιλογής:"
+#: classes/dlg.php:67
+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/feeds.php:113
-msgid "Selection:"
-msgstr "Επιλογή:"
+#: classes/dlg.php:71
+#: classes/dlg.php:80
+msgid "Last update:"
+msgstr "Τελευταία ενημέρωση:"
 
-#: classes/feeds.php:116
-msgid "Set score"
-msgstr "Ορισμός βαθμολογίας"
+#: classes/dlg.php:76
+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/feeds.php:119
-msgid "Archive"
-msgstr "Αρχειοθέτηση"
+#: classes/dlg.php:169
+msgid "You can view this feed as RSS using the following URL:"
+msgstr ""
 
-#: classes/feeds.php:121
-msgid "Move back"
-msgstr "Κίνηση προς τα πίσω"
+#: classes/dlg.php:190
+msgid "You are using default tt-rss password. Please change it in the Preferences (Personal data / Authentication)."
+msgstr ""
 
-#: classes/feeds.php:127
-#: classes/feeds.php:132
-#: plugins/mail/init.php:76
-#: plugins/mailto/init.php:25
-msgid "Forward by email"
-msgstr "Προώθηση μέσω e-mail"
+#: classes/dlg.php:194
+#, fuzzy
+msgid "Open Preferences"
+msgstr "Προτιμήσεις"
 
-#: classes/feeds.php:136
-msgid "Feed:"
-msgstr "Ροή:"
+#: classes/opml.php:31
+#: classes/opml.php:36
+msgid "OPML Utility"
+msgstr "Βοηθητικό OPML"
 
-#: classes/feeds.php:193
-#: classes/feeds.php:819
-msgid "Feed not found."
-msgstr "Η ροή δεν βρέθηκε."
+#: classes/opml.php:40
+msgid "Importing OPML..."
+msgstr "Εισαγωγή OPML σε εξέλιξη..."
 
-#: classes/feeds.php:255
-msgid "Never"
-msgstr "Ποτέ"
+#: classes/opml.php:45
+msgid "Return to preferences"
+msgstr "Επιστροφή σε προτιμήσεις"
 
-#: classes/feeds.php:342
+#: classes/opml.php:301
 #, php-format
-msgid "Imported at %s"
-msgstr "Εισήχθη στις %s"
+msgid "Adding feed: %s"
+msgstr "Προσθήκη ροής: %s"
 
-#: classes/feeds.php:394
-#: classes/feeds.php:487
-msgid "mark feed as read"
-msgstr "σήμανση ροής ως αναγνωσμένη"
+#: classes/opml.php:312
+#, php-format
+msgid "Duplicate feed: %s"
+msgstr "Αντιγραφή ροής: %s"
 
-#: classes/feeds.php:542
-msgid "Collapse article"
-msgstr "Σύμπτυξη άρθρου"
+#: classes/opml.php:326
+#, php-format
+msgid "Adding label %s"
+msgstr "Προσθήκη ετικέτας %s"
 
-#: classes/feeds.php:703
-msgid "No unread articles found to display."
+#: classes/opml.php:329
+#, php-format
+msgid "Duplicate label: %s"
+msgstr "Αντιγραφή ετικέτας: %s"
+
+#: classes/opml.php:341
+#, php-format
+msgid "Setting preference key %s to %s"
 msgstr ""
 
-#: classes/feeds.php:706
-msgid "No updated articles found to display."
+#: classes/opml.php:377
+msgid "Adding filter..."
+msgstr "Προσθήκη φίλτρου σε εξέλιξη..."
+
+#: classes/opml.php:512
+#, php-format
+msgid "Processing category: %s"
+msgstr "Επεξεργασία κατηγορίας: %s"
+
+#: classes/opml.php:558
+#, php-format
+msgid "Upload failed with error code %d"
 msgstr ""
 
-#: classes/feeds.php:709
-msgid "No starred articles found to display."
+#: classes/opml.php:570
+#: plugins/import_export/init.php:471
+msgid "Unable to move uploaded file."
 msgstr ""
 
-#: classes/feeds.php:713
-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."
+#: classes/opml.php:574
+#: plugins/import_export/init.php:475
+msgid "Error: please upload OPML file."
 msgstr ""
 
-#: classes/feeds.php:715
-msgid "No articles found to display."
+#: classes/opml.php:585
+msgid "Error: unable to find moved OPML file."
 msgstr ""
 
-#: classes/feeds.php:731
-#: classes/feeds.php:922
+#: classes/opml.php:594
+msgid "Error while parsing document."
+msgstr "Σφάλμα κατά τη συντακτική ανάλυση του εγγράφου."
+
+#: classes/article.php:26
+msgid "Article not found."
+msgstr "Το άρθρο δεν βρέθηκε."
+
+#: classes/article.php:211
+msgid "Tags for this article (separated by commas):"
+msgstr ""
+
+#: classes/article.php:337
+#: classes/article.php:719
+#: classes/article.php:874
+msgid "no tags"
+msgstr "χωρίς ετικέτες"
+
+#: classes/article.php:447
+msgid "unknown type"
+msgstr "άγνωστος τύπος"
+
+#: classes/article.php:524
+msgid "Attachments"
+msgstr "Συνημμένα"
+
+#: classes/article.php:688
+msgid " - "
+msgstr " - "
+
+#: classes/article.php:912
+msgid "(edit note)"
+msgstr "(επεξεργασία σημείωσης)"
+
+#: classes/handler/public.php:407
+#: plugins/bookmarklets/init.php:40
+#, fuzzy
+msgid "Share with Tiny Tiny RSS"
+msgstr "Ενημέρωση του Tiny Tiny RSS"
+
+#: classes/handler/public.php:415
+msgid "Title:"
+msgstr "Τίτλος:"
+
+#: classes/handler/public.php:419
+msgid "Content:"
+msgstr "Περιεχόμενο:"
+
+#: classes/handler/public.php:421
+msgid "Labels:"
+msgstr "Ετικέτες:"
+
+#: classes/handler/public.php:440
+msgid "Shared article will appear in the Published feed."
+msgstr ""
+
+#: classes/handler/public.php:442
+msgid "Share"
+msgstr "Διαμοιρασμός"
+
+#: classes/handler/public.php:464
+msgid "Not logged in"
+msgstr "Δεν έγινε σύνδεση"
+
+#: classes/handler/public.php:527
+msgid "Incorrect username or password"
+msgstr "Λανθασμένο όνομα χρήστη ή κωδικός πρόσβασης"
+
+#: classes/handler/public.php:581
 #, fuzzy, php-format
-msgid "Feeds last updated at %s"
-msgstr "Ενημερώθηκε τελευταία: %s"
+msgid "Already subscribed to <b>%s</b>."
+msgstr "Εγγεγραμμένος σε %s"
 
-#: classes/feeds.php:743
-#: classes/feeds.php:934
-msgid "Some feeds have update errors (click for details)"
-msgstr ""
+#: classes/handler/public.php:584
+#, fuzzy, php-format
+msgid "Subscribed to <b>%s</b>."
+msgstr "Εγγεγραμμένος σε %s"
 
-#: classes/feeds.php:911
-msgid "No feed selected."
-msgstr "Δεν επιλέχθηκε ροή."
-
-#: classes/feeds.php:975
-#: classes/feeds.php:983
-msgid "Feed or site URL"
-msgstr "URL ροής ή ιστοτόπου"
-
-#: classes/feeds.php:997
-msgid "Available feeds"
-msgstr "Διαθέσιμες ροές"
-
-#: classes/feeds.php:1034
-msgid "More feeds"
-msgstr "Περισσότερες ροές"
-
-#: classes/feeds.php:1063
-msgid "Popular feeds"
-msgstr "Δημοφιλείς ροές"
-
-#: classes/feeds.php:1064
-msgid "Feed archive"
-msgstr "Αρχειοθέτηση ροής"
-
-#: classes/feeds.php:1067
-msgid "limit:"
-msgstr "όριο:"
-
-#: classes/feeds.php:1101
-msgid "Look for"
-msgstr "Αναζήτηση"
-
-#: classes/feeds.php:1109
+#: classes/handler/public.php:587
 #, php-format
-msgid "in %s"
+msgid "Could not subscribe to <b>%s</b>."
 msgstr ""
 
-#: classes/feeds.php:1114
-msgid "Used for word stemming"
-msgstr ""
+#: classes/handler/public.php:590
+#, fuzzy, php-format
+msgid "No feeds found in <b>%s</b>."
+msgstr "Δεν βρέθηκαν ροές."
 
-#: classes/feeds.php:1123
-msgid "Search syntax"
-msgstr "Σύνταξη αναζήτησης"
+#: classes/handler/public.php:593
+msgid "Multiple feed URLs found."
+msgstr "Βρέθηκαν πολλαπλές URLs ροής."
 
-#: classes/feeds.php:1577
-msgid "Starred articles"
-msgstr "Άρθρα με αστέρια"
-
-#: classes/feeds.php:1579
-msgid "Published articles"
-msgstr "Δημοσιευμένα άρθρα"
-
-#: classes/feeds.php:1581
-msgid "Fresh articles"
-msgstr "Καινούργια άρθρα"
-
-#: classes/feeds.php:1585
-msgid "Archived articles"
-msgstr "Αρχειοθετημένα άρθρα"
-
-#: classes/feeds.php:1587
-msgid "Recently read"
-msgstr "Πρόσφατα αναγνωσμένα"
-
-#: classes/feeds.php:1708
-msgid "Special"
-msgstr "Ειδικό"
-
-#: classes/feeds.php:1965
+#: classes/handler/public.php:597
 #, php-format
-msgid "Search results: %s"
-msgstr "Αποτελέσματα αναζήτησης: %s"
-
-#: plugins/nsfw/init.php:30
-#: plugins/nsfw/init.php:42
-msgid "Not work safe (click to toggle)"
+msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
 msgstr ""
 
-#: plugins/nsfw/init.php:52
-msgid "NSFW Plugin"
-msgstr "Πρόσθετο NSFW"
+#: classes/handler/public.php:615
+msgid "Subscribe to selected feed"
+msgstr "Εγγραφή σε επιλεγμένες ροές"
 
-#: plugins/nsfw/init.php:79
-msgid "Tags to consider NSFW (comma-separated)"
+#: classes/handler/public.php:642
+msgid "Edit subscription options"
+msgstr "Επεξεργασία επιλογών εγγραφής"
+
+#: classes/handler/public.php:680
+msgid "Password recovery"
+msgstr "Ανάκτηση κωδικού πρόσβασης"
+
+#: classes/handler/public.php:725
+msgid "You will need to provide valid account name and email. A password reset link will be sent to your email address."
 msgstr ""
 
-#: plugins/nsfw/init.php:100
-msgid "Configuration saved."
+#: classes/handler/public.php:757
+msgid "Some of the required form parameters are missing or incorrect."
+msgstr ""
+
+#: classes/handler/public.php:761
+#: classes/handler/public.php:830
+msgid "Go back"
+msgstr "Επιστροφή"
+
+#: classes/handler/public.php:799
+#, fuzzy
+msgid "[tt-rss] Password reset request"
+msgstr "[tt-rss] Ειδοποίηση αλλαγής κωδικού πρόσβασης"
+
+#: classes/handler/public.php:826
+msgid "Sorry, login and email combination not found."
+msgstr ""
+
+#: classes/handler/public.php:848
+msgid "Your access level is insufficient to run this script."
+msgstr ""
+
+#: classes/handler/public.php:874
+msgid "Database Updater"
+msgstr "Πρόγραμμα Ενημέρωσης Βάσης Δεδομένων"
+
+#: classes/handler/public.php:939
+msgid "Perform updates"
+msgstr "Εκτέλεση ενημερώσεων"
+
+#: plugins/af_zz_imgproxy/init.php:208
+msgid "Image proxy settings (af_zz_imgproxy)"
+msgstr ""
+
+#: plugins/af_zz_imgproxy/init.php:232
+#, fuzzy
+msgid "Enable proxy for all remote images."
+msgstr "Ενεργοποίηση κατηγοριών ροών"
+
+#: plugins/af_zz_imgproxy/init.php:236
+#, fuzzy
+msgid "Don't cache files locally."
+msgstr "Αποθήκευση εικόνων τοπικά"
+
+#: plugins/af_zz_imgproxy/init.php:252
+#: plugins/af_redditimgur/init.php:79
+#, fuzzy
+msgid "Configuration saved"
 msgstr "Η διαμόρφωση αποθηκεύτηκε."
 
-#: plugins/note/init.php:28
-#: plugins/note/note.js:11
-msgid "Edit article note"
-msgstr "Επεξεργασία σημείωσης άρθρου"
-
 #: plugins/vf_shared/init.php:17
 #: plugins/vf_shared/init.php:73
 msgid "Shared articles"
 msgstr "Κοινόχρηστα άρθρα"
 
-#: plugins/auth_internal/init.php:67
-#, fuzzy
-msgid "Please enter your one time password:"
-msgstr "Λανθασμένος κωδικός πρόσβασης μίας φοράς"
+#: plugins/bookmarklets/init.php:20
+msgid "Bookmarklets"
+msgstr "Σελιδοδείκτες"
 
-#: plugins/auth_internal/init.php:208
-msgid "Password has been changed."
-msgstr "Ο κωδικός πρόσβασης έχει αλλάξει."
-
-#: plugins/auth_internal/init.php:210
-msgid "Old password is incorrect."
-msgstr "Ο παλιός κωδικός πρόσβασης είναι λανθασμένος."
-
-#: plugins/af_readability/init.php:25
-msgid "Data saved."
+#: 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_readability/init.php:41
+#: 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 "Inline content"
-msgstr "Επεξεργασία σημείωσης άρθρου"
+msgid "Subscribe in Tiny Tiny RSS"
+msgstr "Ενημέρωση του Tiny Tiny RSS"
 
-#: plugins/af_readability/init.php:47
-msgid "Readability settings (af_readability)"
+#: plugins/bookmarklets/init.php:34
+msgid "Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS"
 msgstr ""
 
-#: plugins/af_readability/init.php:78
-msgid "Use Readability for pages shared via bookmarklet."
-msgstr ""
-
-#: plugins/af_readability/init.php:90
-#: plugins/af_psql_trgm/init.php:198
-msgid "Currently enabled for (click to edit):"
-msgstr ""
-
-#: plugins/af_readability/init.php:107
-#, fuzzy
-msgid "Readability"
-msgstr "Έλεγχος διαθεσιμότητας"
-
-#: plugins/af_readability/init.php:118
-#, fuzzy
-msgid "Inline article content"
-msgstr "Επεξεργασία σημείωσης άρθρου"
-
 #: plugins/af_redditimgur/init.php:30
 msgid "Reddit content settings (af_redditimgur)"
 msgstr ""
@@ -2516,11 +2483,21 @@ msgstr ""
 msgid "Enable additional duplicate checking"
 msgstr ""
 
-#: plugins/af_redditimgur/init.php:79
-#: plugins/af_zz_imgproxy/init.php:252
-#, fuzzy
-msgid "Configuration saved"
-msgstr "Η διαμόρφωση αποθηκεύτηκε."
+#: plugins/af_comics/init.php:49
+msgid "Feeds supported by af_comics"
+msgstr ""
+
+#: plugins/af_comics/init.php:51
+msgid "The following comics are currently supported:"
+msgstr ""
+
+#: plugins/af_comics/init.php:69
+msgid "To subscribe to GoComics use the comic's regular web page as the feed URL (e.g. for the <em>Garfield</em> comic use <code>http://www.gocomics.com/garfield</code>)."
+msgstr ""
+
+#: plugins/af_comics/init.php:71
+msgid "Drop any updated filters into <code>filters.local</code> in plugin directory."
+msgstr ""
 
 #: plugins/af_psql_trgm/init.php:29
 #, php-format
@@ -2560,26 +2537,88 @@ msgstr ""
 msgid "Enable for all feeds:"
 msgstr "Ενεργοποίηση κατηγοριών ροών"
 
+#: plugins/af_psql_trgm/init.php:198
+#: plugins/af_readability/init.php:90
+msgid "Currently enabled for (click to edit):"
+msgstr ""
+
 #: plugins/af_psql_trgm/init.php:216
 msgid "Similarity (pg_trgm)"
 msgstr ""
 
-#: plugins/af_comics/init.php:49
-msgid "Feeds supported by af_comics"
+#: plugins/af_readability/init.php:25
+msgid "Data saved."
 msgstr ""
 
-#: plugins/af_comics/init.php:51
-msgid "The following comics are currently supported:"
+#: plugins/af_readability/init.php:41
+#, fuzzy
+msgid "Inline content"
+msgstr "Επεξεργασία σημείωσης άρθρου"
+
+#: plugins/af_readability/init.php:47
+msgid "Readability settings (af_readability)"
 msgstr ""
 
-#: plugins/af_comics/init.php:69
-msgid "To subscribe to GoComics use the comic's regular web page as the feed URL (e.g. for the <em>Garfield</em> comic use <code>http://www.gocomics.com/garfield</code>)."
+#: plugins/af_readability/init.php:78
+msgid "Use Readability for pages shared via bookmarklet."
 msgstr ""
 
-#: plugins/af_comics/init.php:71
-msgid "Drop any updated filters into <code>filters.local</code> in plugin directory."
+#: plugins/af_readability/init.php:107
+#, fuzzy
+msgid "Readability"
+msgstr "Έλεγχος διαθεσιμότητας"
+
+#: plugins/af_readability/init.php:118
+#, fuzzy
+msgid "Inline article content"
+msgstr "Επεξεργασία σημείωσης άρθρου"
+
+#: plugins/mailto/init.php:50
+#: plugins/mailto/init.php:58
+#: plugins/mail/init.php:118
+#: plugins/mail/init.php:124
+msgid "[Forwarded]"
+msgstr "[Προωθήθηκε]"
+
+#: plugins/mailto/init.php:50
+#: plugins/mail/init.php:118
+msgid "Multiple articles"
+msgstr "Πολλαπλά άρθρα"
+
+#: plugins/mailto/init.php:74
+msgid "Clicking the following link to invoke your mail client:"
 msgstr ""
 
+#: plugins/mailto/init.php:78
+#, fuzzy
+msgid "Forward selected article(s) by email."
+msgstr "Προώθηση άρθρου μέσω e-mail"
+
+#: plugins/mailto/init.php:81
+msgid "You should be able to edit the message before sending in your mail client."
+msgstr ""
+
+#: plugins/mailto/init.php:86
+msgid "Close this dialog"
+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 ""
+
+#: plugins/nsfw/init.php:100
+msgid "Configuration saved."
+msgstr "Η διαμόρφωση αποθηκεύτηκε."
+
 #: plugins/import_export/init.php:53
 msgid "Import and export"
 msgstr "Εισαγωγή και εξαγωγή"
@@ -2646,104 +2685,6 @@ msgstr ""
 msgid "No file uploaded."
 msgstr "Δεν φορτώθηκε αρχείο."
 
-#: plugins/mail/init.php:29
-msgid "Mail addresses saved."
-msgstr ""
-
-#: plugins/mail/init.php:35
-#, fuzzy
-msgid "Mail plugin"
-msgstr "Πρόσθετα χρήστη"
-
-#: plugins/mail/init.php:37
-msgid "You can set predefined email addressed here (comma-separated list):"
-msgstr ""
-
-#: plugins/mail/init.php:118
-#: plugins/mail/init.php:124
-#: plugins/mailto/init.php:50
-#: plugins/mailto/init.php:58
-msgid "[Forwarded]"
-msgstr "[Προωθήθηκε]"
-
-#: plugins/mail/init.php:118
-#: plugins/mailto/init.php:50
-msgid "Multiple articles"
-msgstr "Πολλαπλά άρθρα"
-
-#: plugins/mail/init.php:146
-msgid "To:"
-msgstr "Προς:"
-
-#: plugins/mail/init.php:161
-msgid "Subject:"
-msgstr "Θέμα:"
-
-#: plugins/mail/init.php:178
-msgid "Send e-mail"
-msgstr "Αποστολή e-mail"
-
-#: plugins/close_button/init.php:25
-msgid "Close article"
-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
-#, fuzzy, php-format
-msgid "Subscribe to %s in Tiny Tiny RSS?"
-msgstr "Εγγεγραμμένος σε %s"
-
-#: plugins/bookmarklets/init.php:31
-#, fuzzy
-msgid "Subscribe in Tiny Tiny RSS"
-msgstr "Ενημέρωση του Tiny Tiny RSS"
-
-#: plugins/bookmarklets/init.php:34
-msgid "Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS"
-msgstr ""
-
-#: plugins/toggle_sidebar/init.php:23
-msgid "Collapse feedlist"
-msgstr "Συρρίκνωση λίστας ροών"
-
-#: plugins/af_zz_imgproxy/init.php:208
-msgid "Image proxy settings (af_zz_imgproxy)"
-msgstr ""
-
-#: plugins/af_zz_imgproxy/init.php:232
-#, fuzzy
-msgid "Enable proxy for all remote images."
-msgstr "Ενεργοποίηση κατηγοριών ροών"
-
-#: plugins/af_zz_imgproxy/init.php:236
-#, fuzzy
-msgid "Don't cache files locally."
-msgstr "Αποθήκευση εικόνων τοπικά"
-
-#: plugins/mailto/init.php:74
-msgid "Clicking the following link to invoke your mail client:"
-msgstr ""
-
-#: plugins/mailto/init.php:78
-#, fuzzy
-msgid "Forward selected article(s) by email."
-msgstr "Προώθηση άρθρου μέσω e-mail"
-
-#: plugins/mailto/init.php:81
-msgid "You should be able to edit the message before sending in your mail client."
-msgstr ""
-
-#: plugins/mailto/init.php:86
-msgid "Close this dialog"
-msgstr "Κλείστε αυτό το πλαίσιο διαλόγου"
-
 #: plugins/share/init.php:41
 msgid "You can disable all articles shared by unique URLs here."
 msgstr ""
@@ -2764,461 +2705,613 @@ msgstr ""
 msgid "Unshare article"
 msgstr "Κατάργηση διαμοιρασμού άρθρου"
 
-#: js/FeedTree.js:75
+#: plugins/toggle_sidebar/init.php:23
+msgid "Collapse feedlist"
+msgstr "Συρρίκνωση λίστας ροών"
+
+#: plugins/close_button/init.php:25
+msgid "Close article"
+msgstr "Κλείσιμο άρθρου"
+
+#: plugins/mail/init.php:29
+msgid "Mail addresses saved."
+msgstr ""
+
+#: plugins/mail/init.php:35
+#, fuzzy
+msgid "Mail plugin"
+msgstr "Πρόσθετα χρήστη"
+
+#: plugins/mail/init.php:37
+msgid "You can set predefined email addressed here (comma-separated list):"
+msgstr ""
+
+#: plugins/mail/init.php:146
+msgid "To:"
+msgstr "Προς:"
+
+#: plugins/mail/init.php:161
+msgid "Subject:"
+msgstr "Θέμα:"
+
+#: plugins/mail/init.php:178
+msgid "Send e-mail"
+msgstr "Αποστολή e-mail"
+
+#: plugins/note/init.php:28
+#: plugins/note/note.js:11
+msgid "Edit article note"
+msgstr "Επεξεργασία σημείωσης άρθρου"
+
+#: plugins/auth_internal/init.php:67
+#, fuzzy
+msgid "Please enter your one time password:"
+msgstr "Λανθασμένος κωδικός πρόσβασης μίας φοράς"
+
+#: plugins/auth_internal/init.php:208
+msgid "Password has been changed."
+msgstr "Ο κωδικός πρόσβασης έχει αλλάξει."
+
+#: plugins/auth_internal/init.php:210
+msgid "Old password is incorrect."
+msgstr "Ο παλιός κωδικός πρόσβασης είναι λανθασμένος."
+
+#: js/FeedTree.js:76
 #, fuzzy
 msgid "(Un)collapse"
 msgstr "Ανάπτυξη/σύμπτυξη πλευρικής μπάρας"
 
-#: js/PrefFeedTree.js:35
+#: js/PrefFeedTree.js:36
 msgid "Edit category"
 msgstr "Επεξεργασία κατηγορίας"
 
-#: js/PrefFeedTree.js:42
+#: js/PrefFeedTree.js:43
 msgid "Remove category"
 msgstr "Αφαίρεση κατηγορίας"
 
-#: js/PrefFilterTree.js:46
+#: js/PrefFilterTree.js:47
 msgid "Inverse"
 msgstr "Αναστροφή"
 
-#: js/feedlist.js:511
+#: js/feedlist.js:461
 #, fuzzy
 msgid "Mark %w in %s older than 1 day as read?"
 msgstr "Αναβαθμολόγηση άρθρων σε %s;"
 
-#: js/feedlist.js:514
+#: js/feedlist.js:464
 #, fuzzy
 msgid "Mark %w in %s older than 1 week as read?"
 msgstr "Αναβαθμολόγηση άρθρων σε %s;"
 
-#: js/feedlist.js:517
+#: js/feedlist.js:467
 #, fuzzy
 msgid "Mark %w in %s older than 2 weeks as read?"
 msgstr "Αναβαθμολόγηση άρθρων σε %s;"
 
-#: js/feedlist.js:520
+#: js/feedlist.js:470
 #, fuzzy
 msgid "Mark %w in %s as read?"
 msgstr "Αναβαθμολόγηση άρθρων σε %s;"
 
-#: js/feedlist.js:523
+#: js/feedlist.js:473
 #, fuzzy
 msgid "search results"
 msgstr "Αποτελέσματα αναζήτησης: %s"
 
-#: js/feedlist.js:523
+#: js/feedlist.js:473
 #, fuzzy
 msgid "all articles"
 msgstr "Όλα τα άρθρα"
 
-#: js/functions.js:74
+#: js/functions.js:100
 msgid "Close"
 msgstr ""
 
-#: js/functions.js:141
+#: js/functions.js:167
 msgid "Click to close"
 msgstr "Κάντε κλικ για κλείσιμο"
 
-#: js/functions.js:448
+#: js/functions.js:456
 msgid "Error explained"
 msgstr "Επεξήγηση σφάλματος"
 
-#: js/functions.js:592
+#: js/functions.js:490
+msgid "Upload complete."
+msgstr "Πλήρης φόρτωση."
+
+#: js/functions.js:508
+msgid "Remove stored feed icon?"
+msgstr "Αφαίρεση αποθηκευμένου εικονιδίου ροής;"
+
+#: js/functions.js:510
+msgid "Removing feed icon..."
+msgstr "Αφαίρεση εικονιδίου ροής σε εξέλιξη..."
+
+#: js/functions.js:515
+msgid "Feed icon removed."
+msgstr "Το εικονίδιο ροής αφαιρέθηκε."
+
+#: js/functions.js:532
+#, fuzzy
+msgid "Please select an image file to upload."
+msgstr "Αφαίρεση επιλεγμένων φίλτρων;"
+
+#: js/functions.js:533
+msgid "Upload new icon for this feed?"
+msgstr ""
+
+#: js/functions.js:534
+msgid "Uploading, please wait..."
+msgstr "Μεταφόρτωση σε εξέλιξη, περιμένετε..."
+
+#: js/functions.js:542
+msgid "Please enter label caption:"
+msgstr "Εισάγετε λεζάντα ετικέτας:"
+
+#: js/functions.js:575
 msgid "Subscribe to Feed"
 msgstr "Εγγραφή για Ροή"
 
-#: js/functions.js:621
+#: js/functions.js:602
 msgid "Failed to parse output. This can indicate server timeout and/or network issues. Backend output was logged to browser console."
 msgstr ""
 
-#: js/functions.js:636
+#: js/functions.js:617
 #, perl-format
 msgid "Subscribed to %s"
 msgstr "Εγγεγραμμένος σε %s"
 
-#: js/functions.js:641
+#: js/functions.js:622
 msgid "Specified URL seems to be invalid."
 msgstr ""
 
-#: js/functions.js:644
+#: js/functions.js:625
 msgid "Specified URL doesn't seem to contain any feeds."
 msgstr ""
 
-#: js/functions.js:656
+#: js/functions.js:637
 msgid "Expand to select feed"
 msgstr "Επέκταση για επιλογή ροής"
 
-#: js/functions.js:668
+#: js/functions.js:649
 #, perl-format
 msgid "Couldn't download the specified URL: %s"
 msgstr ""
 
-#: js/functions.js:672
+#: js/functions.js:653
 #, perl-format
 msgid "XML validation failed: %s"
 msgstr "Η επικύρωση XML απέτυχε: %s"
 
-#: js/functions.js:676
+#: js/functions.js:657
 #, fuzzy
 msgid "You are already subscribed to this feed."
 msgstr "Εγγεγραμμένος σε %s"
 
-#: js/functions.js:1136
+#: js/functions.js:1098
 msgid "Generate new syndication address for this feed?"
 msgstr ""
 
-#: js/functions.js:1140
-#: js/prefs.js:1095
+#: js/functions.js:1100
+#: js/prefs.js:870
 msgid "Trying to change address..."
 msgstr "Απόπειρα αλλαγής διεύθυνσης σε εξέλιξη..."
 
-#: js/functions.js:1245
-#: js/tt-rss.js:446
-#: js/tt-rss.js:673
+#: js/functions.js:1199
+#: js/tt-rss.js:399
+#: js/tt-rss.js:612
 msgid "You can't edit this kind of feed."
 msgstr ""
 
-#: js/functions.js:1260
+#: js/functions.js:1213
 msgid "Edit Feed"
 msgstr "Επεξεργασία Ροής"
 
-#: js/functions.js:1266
-#: js/prefs.js:100
-#: js/prefs.js:209
-#: js/prefs.js:647
+#: js/functions.js:1217
+#: js/prefs.js:176
+#: js/prefs.js:523
+#: js/prefs.js:1139
+#: js/prefs.js:78
 msgid "Saving data..."
 msgstr "Αποθήκευση δεδομένων σε εξέλιξη..."
 
-#: js/functions.js:1293
+#: js/functions.js:1243
 msgid "More Feeds"
 msgstr "Περισσότερες Ροές"
 
-#: js/functions.js:1355
-#: js/functions.js:1464
-#: js/prefs.js:398
-#: js/prefs.js:540
-#: js/prefs.js:558
-#: js/prefs.js:1077
+#: js/functions.js:1297
+#: js/functions.js:1383
+#: js/prefs.js:332
+#: js/prefs.js:455
+#: js/prefs.js:473
+#: js/prefs.js:855
 msgid "No feeds are selected."
 msgstr "Δεν επιλέχθηκαν ροές."
 
-#: js/functions.js:1398
+#: js/functions.js:1329
 msgid "Remove selected feeds from the archive? Feeds with stored articles will not be removed."
 msgstr ""
 
-#: js/functions.js:1435
+#: js/functions.js:1360
 msgid "Feeds with update errors"
 msgstr "Ροές με σφάλματα ενημέρωσης"
 
-#: js/functions.js:1446
-#: js/prefs.js:1058
+#: js/functions.js:1369
+#: js/prefs.js:841
 msgid "Remove selected feeds?"
 msgstr "Αφαίρεση επιλεγμένων ροών;"
 
-#: js/functions.js:1449
-#: js/prefs.js:1061
+#: js/functions.js:1370
+#: js/prefs.js:842
 msgid "Removing selected feeds..."
 msgstr "Αφαίρεση επιλεγμένων ροών σε εξέλιξη..."
 
-#: js/prefs.js:60
-msgid "Please enter login:"
-msgstr "Εισάγετε σύνδεση:"
-
-#: js/prefs.js:67
-msgid "Can't create user: no login specified."
-msgstr ""
-
-#: js/prefs.js:71
-msgid "Adding user..."
-msgstr "Προσθήκη χρήστη σε εξέλιξη..."
-
-#: js/prefs.js:96
-msgid "User Editor"
-msgstr "Επεξεργαστής Χρήστη"
-
-#: js/prefs.js:131
-msgid "Edit Filter"
-msgstr "Επεξεργασία Φίλτρου"
-
-#: js/prefs.js:170
+#: js/prefs.js:143
 msgid "Remove filter?"
 msgstr "Αφαίρεση φίλτρου;"
 
-#: js/prefs.js:175
+#: js/prefs.js:148
 msgid "Removing filter..."
 msgstr "Αφαίρεση φίλτρου σε εξέλιξη..."
 
-#: js/prefs.js:292
+#: js/prefs.js:251
 msgid "Remove selected labels?"
 msgstr "Αφαίρεση επιλεγμένων ετικετών;"
 
-#: js/prefs.js:295
+#: js/prefs.js:252
 msgid "Removing selected labels..."
 msgstr "Αφαίρεση επιλεγμένων ετικετών σε εξέλιξη..."
 
-#: js/prefs.js:308
-#: js/prefs.js:1144
+#: js/prefs.js:262
+#: js/prefs.js:909
 msgid "No labels are selected."
 msgstr "Δεν επιλέχθηκαν ετικέτες."
 
-#: js/prefs.js:320
+#: js/prefs.js:274
 msgid "Remove selected users? Neither default admin nor your account will be removed."
 msgstr ""
 
-#: js/prefs.js:323
+#: js/prefs.js:275
 msgid "Removing selected users..."
 msgstr "Αφαίρεση επιλεγμένων χρηστών σε εξέλιξη..."
 
-#: js/prefs.js:338
-#: js/prefs.js:408
-#: js/prefs.js:427
-#: js/prefs.js:461
+#: js/prefs.js:286
+#: js/prefs.js:342
+#: js/prefs.js:361
+#: js/prefs.js:387
 msgid "No users are selected."
 msgstr "Δεν επιλέχθηκαν χρήστες."
 
-#: js/prefs.js:350
+#: js/prefs.js:297
 msgid "Remove selected filters?"
 msgstr "Αφαίρεση επιλεγμένων φίλτρων;"
 
-#: js/prefs.js:353
+#: js/prefs.js:298
 msgid "Removing selected filters..."
 msgstr "Αφαίρεση επιλεγμένων φίλτρων σε εξέλιξη..."
 
-#: js/prefs.js:366
-#: js/prefs.js:495
-#: js/prefs.js:514
+#: js/prefs.js:308
+#: js/prefs.js:419
+#: js/prefs.js:438
 msgid "No filters are selected."
 msgstr "Δεν επιλέχθηκαν φίλτρα."
 
-#: js/prefs.js:378
+#: js/prefs.js:319
 msgid "Unsubscribe from selected feeds?"
 msgstr "Κατάργηση εγγραφής από επιλεγμένες ροές;"
 
-#: js/prefs.js:382
+#: js/prefs.js:321
 msgid "Unsubscribing from selected feeds..."
 msgstr "Κατάργηση εγγραφής από επιλεγμένες ροές σε εξέλιξη..."
 
-#: js/prefs.js:413
-#: js/prefs.js:432
-#: js/prefs.js:466
+#: js/prefs.js:347
+#: js/prefs.js:366
+#: js/prefs.js:392
 msgid "Please select only one user."
 msgstr ""
 
-#: js/prefs.js:436
+#: js/prefs.js:370
 #, fuzzy
 msgid "Reset password of selected user?"
 msgstr "Επαναφορά κωδικού πρόσβασης"
 
-#: js/prefs.js:439
+#: js/prefs.js:371
 #, fuzzy
 msgid "Resetting password for selected user..."
 msgstr "Αφαίρεση επιλεγμένων χρηστών σε εξέλιξη..."
 
-#: js/prefs.js:500
+#: js/prefs.js:424
 #, fuzzy
 msgid "Please select only one filter."
 msgstr "Αφαίρεση επιλεγμένων φίλτρων;"
 
-#: js/prefs.js:518
+#: js/prefs.js:442
 msgid "Combine selected filters?"
 msgstr "Συνδυασμός επιλεγμένων φίλτρων;"
 
-#: js/prefs.js:521
+#: js/prefs.js:443
 msgid "Joining filters..."
 msgstr "Ένωση φίλτρων σε εξέλιξη...."
 
-#: js/prefs.js:580
+#: js/prefs.js:487
 msgid "Edit Multiple Feeds"
 msgstr "Επεξεργασία Πολλαπλών Ροών"
 
-#: js/prefs.js:604
+#: js/prefs.js:511
 #, fuzzy
 msgid "Save changes to selected feeds?"
 msgstr "Εγγραφή σε επιλεγμένες ροές"
 
-#: js/prefs.js:681
+#: js/prefs.js:552
 msgid "OPML Import"
 msgstr "Εισαγωγή OPML"
 
-#: js/prefs.js:700
+#: js/prefs.js:571
 msgid "Please choose an OPML file first."
 msgstr ""
 
-#: js/prefs.js:703
+#: js/prefs.js:574
 #: plugins/import_export/import_export.js:115
 msgid "Importing, please wait..."
 msgstr "Εισαγωγή σε εξέλιξη, παρακαλώ περιμένετε..."
 
-#: js/prefs.js:869
+#: js/prefs.js:737
 msgid "Reset to defaults?"
 msgstr "Επαναφορά σε προεπιλογές;"
 
-#: js/prefs.js:1468
-msgid "Subscribing to feeds..."
-msgstr "Γίνεται εγγραφή σε ροές..."
-
-#: js/prefs.js:1487
-msgid "Clear stored data for this plugin?"
+#: js/prefs.js:777
+#, perl-format
+msgid "Remove category %s? Any nested feeds would be placed into Uncategorized."
 msgstr ""
 
-#: js/prefs.js:1501
-msgid "Clear all messages in the error log?"
+#: js/prefs.js:778
+msgid "Removing category..."
+msgstr "Αφαίρεση κατηγορίας σε εξέλιξη..."
+
+#: js/prefs.js:794
+msgid "Remove selected categories?"
+msgstr "Αφαίρεση επιλεγμένων κατηγοριών;"
+
+#: js/prefs.js:795
+msgid "Removing selected categories..."
+msgstr "Αφαίρεση επιλεγμένων κατηγοριών σε εξέλιξη..."
+
+#: js/prefs.js:805
+msgid "No categories are selected."
+msgstr "Δεν επιλέχθηκαν κατηγορίες."
+
+#: js/prefs.js:812
+msgid "Category title:"
+msgstr "Τίτλος κατηγορίας:"
+
+#: js/prefs.js:815
+msgid "Creating category..."
+msgstr "Δημιουργία κατηγορίας σε εξέλιξη..."
+
+#: js/prefs.js:832
+msgid "Feeds without recent updates"
+msgstr "Ροές χωρίς πρόσφατες ενημερώσεις"
+
+#: js/prefs.js:869
+msgid "Replace current OPML publishing address with a new one?"
 msgstr ""
 
-#: js/tt-rss.js:118
+#: js/prefs.js:898
+#, fuzzy
+msgid "Reset selected labels to default colors?"
+msgstr "Αφαίρεση επιλεγμένων ετικετών;"
+
+#: js/prefs.js:926
+msgid "Settings Profiles"
+msgstr "Προφίλ Ρυθμίσεων"
+
+#: js/prefs.js:935
+msgid "Remove selected profiles? Active and default profiles will not be removed."
+msgstr ""
+
+#: js/prefs.js:936
+msgid "Removing selected profiles..."
+msgstr "Αφαίρεση επιλεγμένων φίλτρων σε εξέλιξη..."
+
+#: js/prefs.js:948
+msgid "No profiles are selected."
+msgstr "Δεν επιλέχθηκαν προφίλ."
+
+#: js/prefs.js:955
+#: js/prefs.js:997
+msgid "Activate selected profile?"
+msgstr "Ενεργοποίηση επιλεγμένου προφίλ;"
+
+#: js/prefs.js:964
+#: js/prefs.js:1008
+msgid "Please choose a profile to activate."
+msgstr ""
+
+#: js/prefs.js:969
+msgid "Creating profile..."
+msgstr "Δημιουργία προφίλ σε εξέλιξη..."
+
+#: js/prefs.js:1016
+msgid "This will invalidate all previously generated feed URLs. Continue?"
+msgstr ""
+
+#: js/prefs.js:1017
+#: plugins/share/share_prefs.js:3
+msgid "Clearing URLs..."
+msgstr "Απαλοιφή των URL..."
+
+#: js/prefs.js:1020
+msgid "Generated URLs cleared."
+msgstr "Έγινε απαλοιφή των URL που παρήχθησαν."
+
+#: js/prefs.js:1053
+#, fuzzy
+msgid "Rename category to:"
+msgstr "Αφαίρεση κατηγορίας"
+
+#: js/prefs.js:1074
+msgid "Label Editor"
+msgstr "Επεξεργαστής Ετικέτας"
+
+#: js/tt-rss.js:111
 #, fuzzy
 msgid "Mark all articles as read?"
 msgstr "Σήμανση παραπάνω ως αναγνωσμένα"
 
-#: js/tt-rss.js:124
+#: js/tt-rss.js:115
 #, fuzzy
 msgid "Marking all feeds as read..."
 msgstr "Σήμανση ροής ως αναγνωσμένη"
 
-#: js/tt-rss.js:398
+#: js/tt-rss.js:351
 msgid "Please enable mail plugin first."
 msgstr ""
 
-#: js/tt-rss.js:527
+#: js/tt-rss.js:477
 msgid "Please enable embed_original plugin first."
 msgstr ""
 
-#: js/tt-rss.js:540
-#: js/tt-rss.js:723
+#: js/tt-rss.js:490
+#: js/tt-rss.js:653
 msgid "Widescreen is not available in combined mode."
 msgstr ""
 
-#: js/tt-rss.js:821
-msgid "You can't rescore this kind of feed."
-msgstr ""
-
-#: js/tt-rss.js:826
-#: js/tt-rss.js:686
-#, fuzzy
-msgid "Please select some feed first."
-msgstr "Απαλοιφή επιλεγμένης ροής σε εξέλιξη..."
-
-#: js/tt-rss.js:831
-#, perl-format
-msgid "Rescore articles in %s?"
-msgstr "Αναβαθμολόγηση άρθρων σε %s;"
-
-#: js/tt-rss.js:834
-msgid "Rescoring articles..."
-msgstr "Γίνεται αναβαθμολόγηση άρθρων..."
-
-#: js/viewfeed.js:917
-#: js/viewfeed.js:955
-#: js/viewfeed.js:1003
-#: js/viewfeed.js:1924
-#: plugins/mail/mail.js:7
+#: js/viewfeed.js:444
+#: js/viewfeed.js:461
+#: js/viewfeed.js:484
+#: js/viewfeed.js:521
+#: js/viewfeed.js:542
+#: js/viewfeed.js:651
+#: js/viewfeed.js:685
+#: js/viewfeed.js:727
+#: js/viewfeed.js:1564
 #: plugins/mailto/init.js:7
-#: js/viewfeed.js:675
-#: js/viewfeed.js:697
-#: js/viewfeed.js:718
-#: js/viewfeed.js:777
-#: js/viewfeed.js:805
+#: plugins/mail/mail.js:7
 msgid "No articles are selected."
 msgstr "Δεν επιλέχθηκαν άρθρα."
 
-#: js/viewfeed.js:925
+#: js/viewfeed.js:659
 #, 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:927
+#: js/viewfeed.js:661
 #, fuzzy, perl-format
 msgid "Delete %d selected article?"
 msgid_plural "Delete %d selected articles?"
 msgstr[0] "Ενεργοποίηση επιλεγμένου προφίλ;"
 msgstr[1] "Ενεργοποίηση επιλεγμένου προφίλ;"
 
-#: js/viewfeed.js:964
+#: js/viewfeed.js:694
 #, 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:967
+#: js/viewfeed.js:697
 #, fuzzy, perl-format
 msgid "Move %d archived article back?"
 msgid_plural "Move %d archived articles back?"
 msgstr[0] "Αρχειοθετημένα άρθρα"
 msgstr[1] "Αρχειοθετημένα άρθρα"
 
-#: js/viewfeed.js:969
+#: js/viewfeed.js:698
 msgid "Please note that unstarred articles might get purged on next feed update."
 msgstr ""
 
-#: js/viewfeed.js:1009
+#: js/viewfeed.js:733
 #, 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:1029
+#: js/viewfeed.js:753
 msgid "Edit article Tags"
 msgstr "Επεξεργασία ετικετών άρθρου"
 
-#: js/viewfeed.js:1035
+#: js/viewfeed.js:757
 msgid "Saving article tags..."
 msgstr "Γίνεται αποθήκευση ετικετών άρθρου..."
 
-#: js/viewfeed.js:1666
+#: js/viewfeed.js:1015
+msgid "No article is selected."
+msgstr "Δεν επιλέχθηκε άρθρο."
+
+#: js/viewfeed.js:1050
+msgid "No articles found to mark"
+msgstr ""
+
+#: js/viewfeed.js:1052
+#, fuzzy, perl-format
+msgid "Mark %d article as read?"
+msgid_plural "Mark %d articles as read?"
+msgstr[0] "Σήμανση παραπάνω ως αναγνωσμένα"
+msgstr[1] "Σήμανση παραπάνω ως αναγνωσμένα"
+
+#: js/viewfeed.js:1312
 msgid "Open original article"
 msgstr "Άνοιγμα πρωτότυπου άρθρου"
 
-#: js/viewfeed.js:1673
+#: js/viewfeed.js:1319
 msgid "Display article URL"
 msgstr "Εμφάνιση URL άρθρου"
 
-#: js/viewfeed.js:1780
+#: js/viewfeed.js:1426
 msgid "Assign label"
 msgstr "Ανάθεση ετικέτας"
 
-#: js/viewfeed.js:1785
+#: js/viewfeed.js:1431
 msgid "Remove label"
 msgstr "Αφαίρεση ετικέτας"
 
-#: js/viewfeed.js:1817
+#: js/viewfeed.js:1463
 msgid "Select articles in group"
 msgstr "Επιλογή άρθρων σε ομάδα"
 
-#: js/viewfeed.js:1827
+#: js/viewfeed.js:1473
 msgid "Mark group as read"
 msgstr "Σήμανση ομάδας ως αναγνωσμένη"
 
-#: js/viewfeed.js:1839
+#: js/viewfeed.js:1485
 msgid "Mark feed as read"
 msgstr "Σήμανση ροής ως αναγνωσμένη"
 
-#: js/viewfeed.js:1892
+#: js/viewfeed.js:1538
 #, fuzzy
 msgid "Please enter new score for selected articles:"
 msgstr "Εισάγετε τίτλο κατηγορίας:"
 
-#: js/viewfeed.js:1955
+#: js/viewfeed.js:1571
 #, fuzzy
 msgid "Please enter new score for this article:"
 msgstr "Εισάγετε τίτλο κατηγορίας:"
 
-#: js/viewfeed.js:1986
+#: js/viewfeed.js:1591
 msgid "Article URL:"
 msgstr "URL άρθρου:"
 
-#: plugins/note/note.js:17
-msgid "Saving article note..."
-msgstr "Γίνεται αποθήκευση σημείωσης..."
+#: plugins/embed_original/init.js:6
+msgid "Sorry, your browser does not support sandboxed iframes."
+msgstr ""
 
 #: plugins/af_psql_trgm/init.js:11
 #, fuzzy
 msgid "Related articles"
 msgstr "Κοινόχρηστα άρθρα"
 
+#: plugins/mailto/init.js:21
+#: plugins/mail/mail.js:21
+msgid "Forward article by email"
+msgstr "Προώθηση άρθρου μέσω e-mail"
+
+#: plugins/shorten_expanded/init.js:43
+msgid "Click to expand article"
+msgstr "Κάντε κλικ για επέκταση άρθρου"
+
 #: plugins/import_export/import_export.js:13
 msgid "Export Data"
 msgstr "Εξαγωγή Δεδομένων"
@@ -3238,264 +3331,170 @@ msgstr "Εισαγωγή Δεδομένων"
 msgid "Please choose the file first."
 msgstr ""
 
-#: plugins/mail/mail.js:21
-#: plugins/mailto/init.js:21
-msgid "Forward article by email"
-msgstr "Προώθηση άρθρου μέσω e-mail"
-
-#: plugins/mail/mail.js:36
-msgid "Error sending email:"
+#: plugins/share/share_prefs.js:2
+msgid "This will invalidate all previously shared article URLs. Continue?"
 msgstr ""
 
-#: plugins/mail/mail.js:38
-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:45
-msgid "Click to expand article"
-msgstr "Κάντε κλικ για επέκταση άρθρου"
+#: plugins/share/share_prefs.js:8
+msgid "Shared URLs cleared."
+msgstr "Έγινε απαλοιφή των κοινόχρηστων URL."
 
 #: plugins/share/share.js:10
 msgid "Share article by URL"
 msgstr "Κοινή χρήση άρθρου από URL"
 
-#: plugins/share/share.js:14
+#: plugins/share/share.js:13
 msgid "Generate new share URL for this article?"
 msgstr ""
 
-#: plugins/share/share.js:18
+#: plugins/share/share.js:15
 msgid "Trying to change URL..."
 msgstr "Γίνεται απόπειρα αλλαγής URL..."
 
-#: plugins/share/share.js:55
+#: plugins/share/share.js:48
 msgid "Remove sharing for this article?"
 msgstr ""
 
-#: plugins/share/share.js:59
+#: plugins/share/share.js:50
 msgid "Trying to unshare..."
 msgstr "Γίνεται απόπειρα κατάργησης κοινής χρήσης..."
 
-#: plugins/share/share_prefs.js:3
-msgid "This will invalidate all previously shared article URLs. Continue?"
+#: plugins/mail/mail.js:30
+msgid "Error sending email:"
 msgstr ""
 
-#: plugins/share/share_prefs.js:6
-#: js/prefs.js:1277
-msgid "Clearing URLs..."
-msgstr "Απαλοιφή των URL..."
+#: plugins/mail/mail.js:32
+msgid "Your message has been sent."
+msgstr ""
 
-#: plugins/share/share_prefs.js:13
-msgid "Shared URLs cleared."
-msgstr "Έγινε απαλοιφή των κοινόχρηστων URL."
+#: plugins/note/note.js:15
+msgid "Saving article note..."
+msgstr "Γίνεται αποθήκευση σημείωσης..."
 
-#: js/feedlist.js:204
+#: js/feedlist.js:168
 msgid "Your password is at default value"
 msgstr ""
 
-#: js/feedlist.js:453
+#: js/feedlist.js:413
 #, fuzzy
 msgid "Mark all articles in %s as read?"
 msgstr "Αναβαθμολόγηση άρθρων σε %s;"
 
-#: js/functions.js:494
-msgid "Upload complete."
-msgstr "Πλήρης φόρτωση."
-
-#: js/functions.js:511
-msgid "Remove stored feed icon?"
-msgstr "Αφαίρεση αποθηκευμένου εικονιδίου ροής;"
-
-#: js/functions.js:516
-msgid "Removing feed icon..."
-msgstr "Αφαίρεση εικονιδίου ροής σε εξέλιξη..."
-
-#: js/functions.js:521
-msgid "Feed icon removed."
-msgstr "Το εικονίδιο ροής αφαιρέθηκε."
-
-#: js/functions.js:537
-#, fuzzy
-msgid "Please select an image file to upload."
-msgstr "Αφαίρεση επιλεγμένων φίλτρων;"
-
-#: js/functions.js:539
-msgid "Upload new icon for this feed?"
-msgstr ""
-
-#: js/functions.js:540
-msgid "Uploading, please wait..."
-msgstr "Μεταφόρτωση σε εξέλιξη, περιμένετε..."
-
-#: js/functions.js:550
-msgid "Please enter label caption:"
-msgstr "Εισάγετε λεζάντα ετικέτας:"
-
-#: js/functions.js:555
-#, fuzzy
-msgid "Can't create label: missing caption."
-msgstr "Εισάγετε λεζάντα ετικέτας:"
-
-#: js/functions.js:797
+#: js/functions.js:764
 msgid "Edit rule"
 msgstr "Επεξεργασία κανόνα"
 
-#: js/functions.js:819
+#: js/functions.js:786
 msgid "Edit action"
 msgstr "Επεξεργασία ενέργειας"
 
-#: js/functions.js:860
+#: js/functions.js:825
 msgid "Looking for articles (%d processed, %f found)..."
 msgstr ""
 
-#: js/functions.js:890
+#: js/functions.js:855
 #, fuzzy
 msgid "Found %d articles matching this filter:"
 msgstr "Άρθρα που ταιριάζουν σε αυτό το φίλτρο:"
 
-#: js/functions.js:942
+#: js/functions.js:907
 msgid "Create Filter"
 msgstr "Δημιουργία Φίλτρου"
 
-#: js/functions.js:1060
-#: js/tt-rss.js:692
+#: js/functions.js:1016
+#: js/tt-rss.js:631
 msgid "Unsubscribe from %s?"
 msgstr "Κατάργηση εγγραφής από %s;"
 
-#: js/functions.js:1063
+#: js/functions.js:1019
 msgid "Removing feed..."
 msgstr "Αφαίρεση ροής σε εξέλιξη..."
 
-#: js/functions.js:1489
+#: js/functions.js:1410
 msgid "Help"
 msgstr "Βοήθεια"
 
-#: js/prefs.js:973
-msgid "Remove category %s? Any nested feeds would be placed into Uncategorized."
+#: js/prefs.js:44
+msgid "Please enter login:"
+msgstr "Εισάγετε σύνδεση:"
+
+#: js/prefs.js:51
+msgid "Can't create user: no login specified."
 msgstr ""
 
-#: js/prefs.js:979
-msgid "Removing category..."
-msgstr "Αφαίρεση κατηγορίας σε εξέλιξη..."
+#: js/prefs.js:55
+msgid "Adding user..."
+msgstr "Προσθήκη χρήστη σε εξέλιξη..."
 
-#: js/prefs.js:997
-msgid "Remove selected categories?"
-msgstr "Αφαίρεση επιλεγμένων κατηγοριών;"
+#: js/prefs.js:74
+msgid "User Editor"
+msgstr "Επεξεργαστής Χρήστη"
 
-#: js/prefs.js:1000
-msgid "Removing selected categories..."
-msgstr "Αφαίρεση επιλεγμένων κατηγοριών σε εξέλιξη..."
+#: js/prefs.js:104
+msgid "Edit Filter"
+msgstr "Επεξεργασία Φίλτρου"
 
-#: js/prefs.js:1013
-msgid "No categories are selected."
-msgstr "Δεν επιλέχθηκαν κατηγορίες."
+#: js/prefs.js:1175
+msgid "Subscribing to feeds..."
+msgstr "Γίνεται εγγραφή σε ροές..."
 
-#: js/prefs.js:1020
-msgid "Category title:"
-msgstr "Τίτλος κατηγορίας:"
-
-#: js/prefs.js:1024
-msgid "Creating category..."
-msgstr "Δημιουργία κατηγορίας σε εξέλιξη..."
-
-#: js/prefs.js:1047
-msgid "Feeds without recent updates"
-msgstr "Ροές χωρίς πρόσφατες ενημερώσεις"
-
-#: js/prefs.js:1091
-msgid "Replace current OPML publishing address with a new one?"
+#: js/prefs.js:1191
+msgid "Clear stored data for this plugin?"
 msgstr ""
 
-#: js/prefs.js:1129
-#, fuzzy
-msgid "Reset selected labels to default colors?"
-msgstr "Αφαίρεση επιλεγμένων ετικετών;"
-
-#: js/prefs.js:1161
-msgid "Settings Profiles"
-msgstr "Προφίλ Ρυθμίσεων"
-
-#: js/prefs.js:1170
-msgid "Remove selected profiles? Active and default profiles will not be removed."
+#: js/prefs.js:1203
+msgid "Clear all messages in the error log?"
 msgstr ""
 
-#: js/prefs.js:1173
-msgid "Removing selected profiles..."
-msgstr "Αφαίρεση επιλεγμένων φίλτρων σε εξέλιξη..."
-
-#: js/prefs.js:1189
-msgid "No profiles are selected."
-msgstr "Δεν επιλέχθηκαν προφίλ."
-
-#: js/prefs.js:1197
-#: js/prefs.js:1250
-msgid "Activate selected profile?"
-msgstr "Ενεργοποίηση επιλεγμένου προφίλ;"
-
-#: js/prefs.js:1214
-#: js/prefs.js:1266
-msgid "Please choose a profile to activate."
-msgstr ""
-
-#: js/prefs.js:1219
-msgid "Creating profile..."
-msgstr "Δημιουργία προφίλ σε εξέλιξη..."
-
-#: js/prefs.js:1274
-msgid "This will invalidate all previously generated feed URLs. Continue?"
-msgstr ""
-
-#: js/prefs.js:1284
-msgid "Generated URLs cleared."
-msgstr "Έγινε απαλοιφή των URL που παρήχθησαν."
-
-#: js/prefs.js:1356
-msgid "Label Editor"
-msgstr "Επεξεργαστής Ετικέτας"
-
-#: js/tt-rss.js:681
+#: js/tt-rss.js:620
 msgid "You can't unsubscribe from the category."
 msgstr ""
 
-#: js/viewfeed.js:127
-#: js/viewfeed.js:177
-#: js/viewfeed.js:194
+#: js/tt-rss.js:625
+#, fuzzy
+msgid "Please select some feed first."
+msgstr "Απαλοιφή επιλεγμένης ροής σε εξέλιξη..."
+
+#: js/viewfeed.js:89
+#: js/viewfeed.js:135
+#: js/viewfeed.js:152
 #, fuzzy
 msgid "Click to open next unread feed."
 msgstr "Κάντε κλικ για επεξεργασία ροής"
 
-#: js/viewfeed.js:131
+#: js/viewfeed.js:93
 msgid "Cancel search"
 msgstr "Ακύρωση αναζήτησης"
 
-#: js/viewfeed.js:191
+#: js/viewfeed.js:149
 msgid "New articles found, reload feed to continue."
 msgstr ""
 
-#: js/viewfeed.js:620
+#: js/viewfeed.js:405
 #, fuzzy
 msgid "%d article selected"
 msgid_plural "%d articles selected"
 msgstr[0] "Δεν επιλέχθηκε άρθρο."
 msgstr[1] "Δεν επιλέχθηκε άρθρο."
 
-#: js/viewfeed.js:1284
-msgid "No article is selected."
-msgstr "Δεν επιλέχθηκε άρθρο."
+#~ msgid "Rescore feed"
+#~ msgstr "Επανασύνθεση ροών"
 
-#: js/viewfeed.js:1319
-msgid "No articles found to mark"
-msgstr ""
+#~ msgid "Create label..."
+#~ msgstr "Δημιουργία ετικέτας..."
+
+#~ msgid "Create filter..."
+#~ msgstr "Δημιουργία φίλτρου..."
+
+#~ msgid "Rescore articles in %s?"
+#~ msgstr "Αναβαθμολόγηση άρθρων σε %s;"
+
+#~ msgid "Rescoring articles..."
+#~ msgstr "Γίνεται αναβαθμολόγηση άρθρων..."
 
-#: js/viewfeed.js:1321
 #, fuzzy
-msgid "Mark %d article as read?"
-msgid_plural "Mark %d articles as read?"
-msgstr[0] "Σήμανση παραπάνω ως αναγνωσμένα"
-msgstr[1] "Σήμανση παραπάνω ως αναγνωσμένα"
+#~ msgid "Can't create label: missing caption."
+#~ msgstr "Εισάγετε λεζάντα ετικέτας:"
 
 #~ msgid "Firefox integration"
 #~ msgstr "Ένταξη Firefox"
diff --git a/locale/es_ES/LC_MESSAGES/messages.mo b/locale/es_ES/LC_MESSAGES/messages.mo
index eacb3e84b..89f9f22c8 100644
Binary files a/locale/es_ES/LC_MESSAGES/messages.mo and b/locale/es_ES/LC_MESSAGES/messages.mo differ
diff --git a/locale/es_ES/LC_MESSAGES/messages.po b/locale/es_ES/LC_MESSAGES/messages.po
index a6b00cb56..22618916b 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: 2018-10-10 08:24+0300\n"
+"POT-Creation-Date: 2018-12-01 12:59+0300\n"
 "PO-Revision-Date: 2014-03-10 14:18+0100\n"
 "Last-Translator: DavidM <milarupa@yahoo.es>\n"
 "Language-Team: Español <milarupa@yahoo.es>\n"
@@ -95,8 +95,8 @@ msgid "Weekly"
 msgstr "Semanalmente"
 
 #: backend.php:103
-#: classes/pref/users.php:47
 #: classes/pref/system.php:51
+#: classes/pref/users.php:47
 msgid "User"
 msgstr "Usuario"
 
@@ -168,33 +168,33 @@ msgstr "Usuario no encontrado"
 
 #: index.php:151
 #: index.php:167
-#: index.php:285
+#: index.php:282
 #: prefs.php:120
 #: classes/backend.php:5
 #: classes/pref/labels.php:294
-#: classes/pref/feeds.php:1230
 #: classes/pref/filters.php:822
-#: js/feedlist.js:148
-#: js/feedlist.js:491
-#: js/feedlist.js:539
-#: js/functions.js:314
-#: js/functions.js:1336
-#: js/prefs.js:562
-#: js/prefs.js:754
-#: js/prefs.js:1488
-#: js/prefs.js:1503
-#: js/tt-rss.js:547
-#: js/viewfeed.js:1180
+#: classes/pref/feeds.php:1229
+#: js/feedlist.js:118
+#: js/feedlist.js:446
+#: js/feedlist.js:487
+#: js/functions.js:328
+#: js/functions.js:551
+#: js/functions.js:1286
+#: js/prefs.js:477
+#: js/prefs.js:617
+#: js/prefs.js:956
+#: js/prefs.js:1000
+#: js/prefs.js:1028
+#: js/prefs.js:1037
+#: js/prefs.js:1045
+#: js/prefs.js:1057
+#: js/tt-rss.js:497
+#: js/viewfeed.js:509
+#: js/viewfeed.js:928
 #: plugins/import_export/import_export.js:17
-#: js/functions.js:565
-#: js/prefs.js:1200
-#: js/prefs.js:1253
-#: js/prefs.js:1292
-#: js/prefs.js:1305
-#: js/prefs.js:1316
-#: js/prefs.js:1331
-#: js/tt-rss.js:564
-#: js/viewfeed.js:760
+#: js/prefs.js:1192
+#: js/prefs.js:1205
+#: js/tt-rss.js:510
 msgid "Loading, please wait..."
 msgstr "Cargando. Por favor, espere..."
 
@@ -211,13 +211,13 @@ msgid "All Articles"
 msgstr "Todos"
 
 #: index.php:194
-#: include/functions.php:1227
+#: include/functions.php:1172
 #: classes/feeds.php:110
 msgid "Starred"
 msgstr "Favoritos"
 
 #: index.php:195
-#: include/functions.php:1228
+#: include/functions.php:1173
 #: classes/feeds.php:111
 msgid "Published"
 msgstr "Publicados"
@@ -257,11 +257,11 @@ msgid "Title"
 msgstr "Título"
 
 #: index.php:211
-#: index.php:251
-#: include/functions.php:1215
+#: index.php:250
+#: include/functions.php:1160
 #: classes/feeds.php:115
-#: js/FeedTree.js:41
-#: js/FeedTree.js:69
+#: js/FeedTree.js:42
+#: js/FeedTree.js:70
 msgid "Mark as read"
 msgstr "Marcar como leído"
 
@@ -298,7 +298,7 @@ msgid "Feed actions:"
 msgstr "Acciones de la fuente:"
 
 #: index.php:246
-#: classes/handler/public.php:551
+#: classes/handler/public.php:575
 msgid "Subscribe to feed..."
 msgstr "Suscribirse a una fuente..."
 
@@ -307,56 +307,44 @@ msgid "Edit this feed..."
 msgstr "Editar esta fuente..."
 
 #: index.php:248
-msgid "Rescore feed"
-msgstr "Reiniciar la puntuación"
-
-#: index.php:249
-#: classes/pref/feeds.php:770
-#: classes/pref/feeds.php:1203
-#: js/PrefFeedTree.js:61
+#: classes/pref/feeds.php:769
+#: classes/pref/feeds.php:1202
+#: js/PrefFeedTree.js:62
 msgid "Unsubscribe"
 msgstr "Cancelar la suscripción"
 
-#: index.php:250
+#: index.php:249
 msgid "All feeds:"
 msgstr "Todas las fuentes:"
 
-#: index.php:252
+#: index.php:251
 msgid "(Un)hide read feeds"
 msgstr "Ocultar/Mostrar fuentes leídas"
 
-#: index.php:253
+#: index.php:252
 msgid "Other actions:"
 msgstr "Otras acciones:"
 
-#: index.php:254
-#: include/functions.php:1201
+#: index.php:253
+#: include/functions.php:1146
 msgid "Toggle widescreen mode"
 msgstr "Alternar modo de pantalla ancha"
 
-#: index.php:255
-msgid "Create label..."
-msgstr "Crear marcador..."
-
-#: index.php:256
-msgid "Create filter..."
-msgstr "Crear filtro..."
-
-#: index.php:257
+#: index.php:254
 msgid "Keyboard shortcuts help"
 msgstr "Ayuda para atajos de teclado"
 
-#: index.php:266
+#: index.php:263
 msgid "Logout"
 msgstr "Cerrar sesión"
 
-#: index.php:272
+#: index.php:269
 msgid "Updates are available from Git."
 msgstr ""
 
 #: prefs.php:33
 #: prefs.php:138
-#: include/functions.php:1230
+#: include/functions.php:1175
 #: classes/pref/prefs.php:425
 msgid "Preferences"
 msgstr "Preferencias"
@@ -371,8 +359,8 @@ msgstr "Salir de las preferencias"
 
 #: prefs.php:141
 #: classes/pref/feeds.php:114
-#: classes/pref/feeds.php:1138
-#: classes/pref/feeds.php:1192
+#: classes/pref/feeds.php:1137
+#: classes/pref/feeds.php:1191
 msgid "Feeds"
 msgstr "Fuentes"
 
@@ -382,8 +370,8 @@ msgid "Filters"
 msgstr "Filtros"
 
 #: prefs.php:147
+#: classes/feeds.php:1696
 #: classes/pref/labels.php:94
-#: classes/feeds.php:1710
 msgid "Labels"
 msgstr "Marcadores"
 
@@ -395,80 +383,80 @@ msgstr "Usuarios"
 msgid "System"
 msgstr "Sistema"
 
-#: register.php:186
+#: register.php:185
 #: include/login_form.php:162
 msgid "Create new account"
 msgstr "Crear nueva cuenta"
 
-#: register.php:192
+#: register.php:191
 msgid "New user registrations are administratively disabled."
 msgstr "El registro de nuevos usuarios ha sido deshabilitado por el administrador."
 
-#: register.php:196
-#: register.php:241
-#: register.php:254
-#: register.php:269
-#: register.php:288
-#: register.php:336
-#: register.php:346
-#: register.php:358
-#: classes/handler/public.php:623
-#: classes/handler/public.php:697
-#: classes/handler/public.php:798
-#: classes/handler/public.php:877
-#: classes/handler/public.php:891
-#: classes/handler/public.php:898
-#: classes/handler/public.php:923
+#: register.php:195
+#: register.php:240
+#: register.php:253
+#: register.php:268
+#: register.php:287
+#: register.php:334
+#: register.php:344
+#: register.php:356
+#: classes/handler/public.php:647
+#: classes/handler/public.php:721
+#: 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"
 
-#: register.php:217
+#: register.php:216
 msgid "Your temporary password will be sent to the specified email. Accounts, which were not logged in once, are erased automatically 24 hours after temporary password is sent."
 msgstr "Su contraseña temporal será enviada a la dirección de correo especificada. Las cuentas a las que no se acceda al menos una vez serán borradas automáticamente a las 24 horas de enviar la contraseña temporal."
 
-#: register.php:223
+#: register.php:222
 msgid "Desired login:"
 msgstr "Nombre de usuario deseado:"
 
-#: register.php:226
+#: register.php:225
 msgid "Check availability"
 msgstr "Comprobar la disponibilidad"
 
-#: register.php:228
-#: classes/handler/public.php:713
+#: register.php:227
+#: classes/handler/public.php:737
 msgid "Email:"
 msgstr "Correo electrónico:"
 
-#: register.php:231
-#: classes/handler/public.php:718
+#: register.php:230
+#: classes/handler/public.php:742
 msgid "How much is two plus two:"
 msgstr "¿Cuánto es dos más dos?"
 
-#: register.php:234
+#: register.php:233
 msgid "Submit registration"
 msgstr "Enviar solicitud de registro"
 
-#: register.php:252
+#: register.php:251
 msgid "Your registration information is incomplete."
 msgstr "Su información de registro está incompleta"
 
-#: register.php:267
+#: register.php:266
 msgid "Sorry, this username is already taken."
 msgstr "Lo sentimos, este nombre de usuario ya existe."
 
-#: register.php:286
+#: register.php:285
 msgid "Registration failed."
 msgstr "El registro ha fallado."
 
-#: register.php:333
+#: register.php:331
 msgid "Account created successfully."
 msgstr "Cuenta creada correctamente."
 
-#: register.php:355
+#: register.php:353
 msgid "New user registrations are currently closed."
 msgstr "El registro de nuevos usuarios está cerrado en estos momentos."
 
-#: update.php:66
+#: update.php:67
 msgid "Tiny Tiny RSS data update script."
 msgstr "Script para actualizar datos de Tiny Tiny RSS."
 
@@ -481,10 +469,10 @@ msgstr "Todas las fuentes"
 
 #: include/controls.php:138
 #: include/controls.php:230
-#: classes/opml.php:512
-#: classes/digest.php:120
+#: classes/digest.php:124
+#: classes/feeds.php:1708
 #: classes/pref/feeds.php:233
-#: classes/feeds.php:1722
+#: classes/opml.php:512
 msgid "Uncategorized"
 msgstr "Sin clasificar"
 
@@ -499,287 +487,287 @@ msgstr[1] "%d artículos archivados"
 msgid "No feeds found."
 msgstr "No se han encontrado fuentes."
 
-#: include/functions.php:983
+#: include/functions.php:928
 #, php-format
 msgid "%d min"
 msgstr ""
 
-#: include/functions.php:1177
+#: include/functions.php:1122
 msgid "Navigation"
 msgstr "Navegación"
 
-#: include/functions.php:1178
+#: include/functions.php:1123
 msgid "Open next feed"
 msgstr "Abrir la fuente siguiente"
 
-#: include/functions.php:1179
+#: include/functions.php:1124
 msgid "Open previous feed"
 msgstr "Abrir la fuente siguiente"
 
-#: include/functions.php:1180
+#: include/functions.php:1125
 msgid "Open next article"
 msgstr "Abrir el artículo siguiente"
 
-#: include/functions.php:1181
+#: include/functions.php:1126
 msgid "Open previous article"
 msgstr "Abrir el artículo anterior"
 
-#: include/functions.php:1182
+#: include/functions.php:1127
 msgid "Open next article (don't scroll long articles)"
 msgstr "Abrir artículo siguiente (no desplazar artículos largos)"
 
-#: include/functions.php:1183
+#: include/functions.php:1128
 msgid "Open previous article (don't scroll long articles)"
 msgstr "Abrir artículo anterior (no desplazar artículos largos)"
 
-#: include/functions.php:1184
+#: include/functions.php:1129
 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/functions.php:1185
+#: include/functions.php:1130
 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/functions.php:1186
+#: include/functions.php:1131
 msgid "Show search dialog"
 msgstr "Mostrar el diálogo de búsqueda"
 
-#: include/functions.php:1187
+#: include/functions.php:1132
 msgid "Article"
 msgstr "Artículo"
 
-#: include/functions.php:1188
-#: js/viewfeed.js:1695
+#: include/functions.php:1133
+#: js/viewfeed.js:1341
 msgid "Toggle starred"
 msgstr "Alternar favoritos"
 
-#: include/functions.php:1189
-#: js/viewfeed.js:1707
+#: include/functions.php:1134
+#: js/viewfeed.js:1353
 msgid "Toggle published"
 msgstr "Alternar publicados"
 
-#: include/functions.php:1190
-#: js/viewfeed.js:1682
+#: include/functions.php:1135
+#: js/viewfeed.js:1328
 msgid "Toggle unread"
 msgstr "Alternar sin leer"
 
-#: include/functions.php:1191
+#: include/functions.php:1136
 msgid "Edit tags"
 msgstr "Editar etiquetas"
 
-#: include/functions.php:1192
+#: include/functions.php:1137
 msgid "Open in new window"
 msgstr "Abrir en ventana nueva"
 
-#: include/functions.php:1193
-#: js/viewfeed.js:1728
+#: include/functions.php:1138
+#: js/viewfeed.js:1374
 msgid "Mark below as read"
 msgstr "Marcar artículos posteriores como leídos"
 
-#: include/functions.php:1194
-#: js/viewfeed.js:1721
+#: include/functions.php:1139
+#: js/viewfeed.js:1367
 msgid "Mark above as read"
 msgstr "Marcar artículos anteriores como leídos"
 
-#: include/functions.php:1195
+#: include/functions.php:1140
 msgid "Scroll down"
 msgstr "Desplazarse abajo"
 
-#: include/functions.php:1196
+#: include/functions.php:1141
 msgid "Scroll up"
 msgstr "Desplazarse hacia arriba"
 
-#: include/functions.php:1197
+#: include/functions.php:1142
 msgid "Select article under cursor"
 msgstr "Seleccionar el artículo que esté bajo el cursor del ratón"
 
-#: include/functions.php:1198
+#: include/functions.php:1143
 msgid "Email article"
 msgstr "Enviar artículo por correo"
 
-#: include/functions.php:1199
+#: include/functions.php:1144
 msgid "Close/collapse article"
 msgstr "Cerrar/plegar artículo"
 
-#: include/functions.php:1200
+#: include/functions.php:1145
 msgid "Toggle article expansion (combined mode)"
 msgstr "Alternar expansión de los artículos (modo combinado)"
 
-#: include/functions.php:1202
+#: include/functions.php:1147
 #: plugins/embed_original/init.php:33
 msgid "Toggle embed original"
 msgstr "Alternar incrustación del artículo original"
 
-#: include/functions.php:1203
+#: include/functions.php:1148
 msgid "Article selection"
 msgstr "Selección de artículos"
 
-#: include/functions.php:1204
+#: include/functions.php:1149
 msgid "Select all articles"
 msgstr "Seleccionar todos los artículos"
 
-#: include/functions.php:1205
+#: include/functions.php:1150
 msgid "Select unread"
 msgstr "Seleccionar artículos sin leer"
 
-#: include/functions.php:1206
+#: include/functions.php:1151
 msgid "Select starred"
 msgstr "Seleccionar artículos favoritos"
 
-#: include/functions.php:1207
+#: include/functions.php:1152
 msgid "Select published"
 msgstr "Seleccionar artículos publicados"
 
-#: include/functions.php:1208
+#: include/functions.php:1153
 msgid "Invert selection"
 msgstr "Invertir selección "
 
-#: include/functions.php:1209
+#: include/functions.php:1154
 msgid "Deselect everything"
 msgstr "Deseleccionar todo"
 
-#: include/functions.php:1210
-#: classes/pref/feeds.php:522
-#: classes/pref/feeds.php:794
+#: include/functions.php:1155
+#: classes/pref/feeds.php:521
+#: classes/pref/feeds.php:793
 msgid "Feed"
 msgstr "Fuente"
 
-#: include/functions.php:1211
+#: include/functions.php:1156
 msgid "Refresh current feed"
 msgstr "Actualizar la fuente activa"
 
-#: include/functions.php:1212
+#: include/functions.php:1157
 msgid "Un/hide read feeds"
 msgstr "Ocultar/Mostrar fuentes leídas"
 
-#: include/functions.php:1213
-#: classes/pref/feeds.php:1195
+#: include/functions.php:1158
+#: classes/pref/feeds.php:1194
 msgid "Subscribe to feed"
 msgstr "Suscribirse a una fuente"
 
-#: include/functions.php:1214
-#: js/FeedTree.js:48
-#: js/PrefFeedTree.js:55
-#: js/viewfeed.js:1846
+#: include/functions.php:1159
+#: js/FeedTree.js:49
+#: js/PrefFeedTree.js:56
+#: js/viewfeed.js:1492
 msgid "Edit feed"
 msgstr "Editar fuente"
 
-#: include/functions.php:1216
+#: include/functions.php:1161
 msgid "Reverse headlines"
 msgstr "Invertir orden de titulares"
 
-#: include/functions.php:1217
+#: include/functions.php:1162
 msgid "Toggle headline grouping"
 msgstr ""
 
-#: include/functions.php:1218
+#: include/functions.php:1163
 msgid "Debug feed update"
 msgstr "Depurar la actualización de fuentes"
 
-#: include/functions.php:1219
+#: include/functions.php:1164
 #, fuzzy
 msgid "Debug viewfeed()"
 msgstr "Depurar la actualización de fuentes"
 
-#: include/functions.php:1220
-#: js/FeedTree.js:97
+#: include/functions.php:1165
+#: js/FeedTree.js:98
 msgid "Mark all feeds as read"
 msgstr "Marcar todas las fuentes como leídas"
 
-#: include/functions.php:1221
+#: include/functions.php:1166
 msgid "Un/collapse current category"
 msgstr "Desplegar/plegar la categoría"
 
-#: include/functions.php:1222
-msgid "Toggle combined mode"
-msgstr "Alternar modo combinado"
-
-#: include/functions.php:1223
+#: include/functions.php:1167
 msgid "Toggle auto expand in combined mode"
 msgstr "Expandir automáticamente los artículos en el modo combinado"
 
-#: include/functions.php:1224
+#: include/functions.php:1168
+msgid "Toggle combined mode"
+msgstr "Alternar modo combinado"
+
+#: include/functions.php:1169
 msgid "Go to"
 msgstr "Ir a"
 
-#: include/functions.php:1225
-#: classes/feeds.php:1583
+#: include/functions.php:1170
+#: classes/feeds.php:1569
 msgid "All articles"
 msgstr "Todos"
 
-#: include/functions.php:1226
+#: include/functions.php:1171
 msgid "Fresh"
 msgstr "Reciente"
 
-#: include/functions.php:1229
-#: js/tt-rss.js:491
-#: js/tt-rss.js:660
+#: include/functions.php:1174
+#: js/tt-rss.js:439
+#: js/tt-rss.js:599
 msgid "Tag cloud"
 msgstr "Nube de etiquetas"
 
-#: include/functions.php:1231
+#: include/functions.php:1176
 msgid "Other"
 msgstr "Otro"
 
-#: include/functions.php:1232
+#: include/functions.php:1177
 #: classes/pref/labels.php:279
 msgid "Create label"
 msgstr "Crear marcador"
 
-#: include/functions.php:1233
+#: include/functions.php:1178
 #: classes/pref/filters.php:801
 msgid "Create filter"
 msgstr "Crear filtro"
 
-#: include/functions.php:1234
+#: include/functions.php:1179
 msgid "Un/collapse sidebar"
 msgstr "Mostrar/ocultar la barra lateral"
 
-#: include/functions.php:1235
+#: include/functions.php:1180
 msgid "Show help dialog"
 msgstr "Mostrar el diálogo de ayuda"
 
-#: include/functions.php:2582
+#: include/functions.php:2529
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: include/functions.php:2583
+#: include/functions.php:2530
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: include/functions.php:2584
+#: include/functions.php:2531
 msgid "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form"
 msgstr ""
 
-#: include/functions.php:2585
+#: include/functions.php:2532
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: include/functions.php:2586
+#: include/functions.php:2533
 #, fuzzy
 msgid "No file was uploaded"
 msgstr "No se ha cargado ningún archivo."
 
-#: include/functions.php:2587
+#: include/functions.php:2534
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: include/functions.php:2588
+#: include/functions.php:2535
 msgid "Failed to write file to disk."
 msgstr ""
 
-#: include/functions.php:2589
+#: include/functions.php:2536
 msgid "A PHP extension stopped the file upload."
 msgstr ""
 
 #: include/login_form.php:107
-#: classes/handler/public.php:446
-#: classes/handler/public.php:708
+#: classes/handler/public.php:466
+#: classes/handler/public.php:732
 msgid "Login:"
 msgstr "Nombre de usuario:"
 
 #: include/login_form.php:117
-#: classes/handler/public.php:449
+#: classes/handler/public.php:469
 msgid "Password:"
 msgstr "Contraseña:"
 
@@ -792,9 +780,9 @@ msgid "Profile:"
 msgstr "Perfil:"
 
 #: include/login_form.php:133
-#: classes/handler/public.php:252
 #: classes/pref/prefs.php:1037
 #: classes/rpc.php:69
+#: classes/handler/public.php:272
 msgid "Default profile"
 msgstr "Perfil por defecto"
 
@@ -811,207 +799,27 @@ msgid "Remember me"
 msgstr "Recordarme"
 
 #: include/login_form.php:159
-#: classes/handler/public.php:454
+#: classes/handler/public.php:474
 msgid "Log in"
 msgstr "Iniciar sesión"
 
-#: include/sessions.php:46
+#: include/sessions.php:45
 msgid "Session failed to validate (schema version changed)"
 msgstr "No se pudo validar la sesión (ha cambiado la versión del esquema)"
 
-#: include/sessions.php:62
+#: include/sessions.php:53
+#, fuzzy
+msgid "Session failed to validate (UA changed)."
+msgstr "No se pudo validar la sesión (ha cambiado la contraseña)"
+
+#: include/sessions.php:67
 msgid "Session failed to validate (password changed)"
 msgstr "No se pudo validar la sesión (ha cambiado la contraseña)"
 
-#: include/sessions.php:69
+#: include/sessions.php:74
 msgid "Session failed to validate (user not found)"
 msgstr "No se pudo validar la sesión (usuario no encontrado)"
 
-#: classes/article.php:26
-msgid "Article not found."
-msgstr "Artículo no encontrado."
-
-#: classes/article.php:211
-msgid "Tags for this article (separated by commas):"
-msgstr "Etiquetas para este artículo (separadas por comas):"
-
-#: classes/article.php:236
-#: classes/pref/labels.php:82
-#: classes/pref/users.php:103
-#: classes/pref/feeds.php:774
-#: classes/pref/feeds.php:914
-#: classes/pref/filters.php:525
-#: classes/pref/prefs.php:982
-#: plugins/nsfw/init.php:85
-#: plugins/note/init.php:58
-#: plugins/af_readability/init.php:80
-#: plugins/af_redditimgur/init.php:66
-#: plugins/af_psql_trgm/init.php:188
-#: plugins/mail/init.php:65
-#: plugins/af_zz_imgproxy/init.php:238
-msgid "Save"
-msgstr "Guardar"
-
-#: classes/article.php:238
-#: classes/handler/public.php:423
-#: classes/handler/public.php:457
-#: classes/pref/labels.php:84
-#: classes/pref/users.php:105
-#: classes/pref/feeds.php:775
-#: classes/pref/feeds.php:917
-#: classes/pref/feeds.php:1672
-#: classes/pref/filters.php:528
-#: classes/pref/filters.php:945
-#: classes/pref/filters.php:1022
-#: classes/pref/filters.php:1115
-#: classes/pref/prefs.php:984
-#: classes/feeds.php:1037
-#: classes/feeds.php:1089
-#: classes/feeds.php:1128
-#: plugins/note/init.php:60
-#: plugins/mail/init.php:179
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: classes/article.php:337
-#: classes/article.php:720
-#: classes/article.php:875
-msgid "no tags"
-msgstr "sin etiquetas"
-
-#: classes/article.php:448
-msgid "unknown type"
-msgstr "tipo desconocido"
-
-#: classes/article.php:525
-msgid "Attachments"
-msgstr "Adjuntos"
-
-#: classes/article.php:626
-#: classes/feeds.php:661
-msgid "comment"
-msgid_plural "comments"
-msgstr[0] "comentario"
-msgstr[1] "comentarios"
-
-#: classes/article.php:630
-#: classes/feeds.php:665
-msgid "comments"
-msgstr "comentarios"
-
-#: classes/article.php:689
-msgid " - "
-msgstr " - "
-
-#: classes/article.php:730
-#: classes/feeds.php:647
-msgid "Edit tags for this article"
-msgstr "Editar las etiquetas de este artículo"
-
-#: classes/article.php:763
-#: classes/feeds.php:602
-msgid "Originally from:"
-msgstr "Original de:"
-
-#: classes/article.php:774
-#: classes/pref/feeds.php:539
-#: classes/feeds.php:613
-msgid "Feed URL"
-msgstr "URL de la fuente"
-
-#: classes/article.php:811
-#: classes/backend.php:103
-#: classes/dlg.php:33
-#: classes/dlg.php:56
-#: classes/dlg.php:89
-#: classes/dlg.php:154
-#: classes/dlg.php:181
-#: classes/dlg.php:197
-#: classes/pref/feeds.php:1466
-#: classes/pref/feeds.php:1533
-#: classes/pref/filters.php:208
-#: classes/pref/prefs.php:1099
-#: plugins/af_psql_trgm/init.php:109
-#: plugins/import_export/init.php:446
-#: plugins/import_export/init.php:490
-#: plugins/share/init.php:128
-msgid "Close this window"
-msgstr "Cerrar esta ventana"
-
-#: classes/article.php:913
-msgid "(edit note)"
-msgstr "(editar nota)"
-
-#: classes/opml.php:31
-#: classes/opml.php:36
-msgid "OPML Utility"
-msgstr "Utilidad OPML"
-
-#: classes/opml.php:40
-msgid "Importing OPML..."
-msgstr "Importando OPML..."
-
-#: classes/opml.php:45
-msgid "Return to preferences"
-msgstr "Volver a las preferencias"
-
-#: classes/opml.php:301
-#, php-format
-msgid "Adding feed: %s"
-msgstr "Añadiendo fuente: %s"
-
-#: classes/opml.php:312
-#, php-format
-msgid "Duplicate feed: %s"
-msgstr "Duplicar fuente: %s"
-
-#: classes/opml.php:326
-#, php-format
-msgid "Adding label %s"
-msgstr "Añadiendo el marcador %s"
-
-#: classes/opml.php:329
-#, php-format
-msgid "Duplicate label: %s"
-msgstr "Duplicar marcador: %s"
-
-#: classes/opml.php:341
-#, php-format
-msgid "Setting preference key %s to %s"
-msgstr "Configurando la opción %s como %s"
-
-#: classes/opml.php:377
-msgid "Adding filter..."
-msgstr "Añadiendo filtro..."
-
-#: classes/opml.php:512
-#, php-format
-msgid "Processing category: %s"
-msgstr "Procesando categoría: %s"
-
-#: classes/opml.php:558
-#, php-format
-msgid "Upload failed with error code %d"
-msgstr "La subida falló con el código de error %d"
-
-#: classes/opml.php:570
-#: plugins/import_export/init.php:471
-msgid "Unable to move uploaded file."
-msgstr "No se pudo mover el archivo subido."
-
-#: classes/opml.php:574
-#: plugins/import_export/init.php:475
-msgid "Error: please upload OPML file."
-msgstr "Error: por favor, suba un fichero OPML."
-
-#: classes/opml.php:585
-msgid "Error: unable to find moved OPML file."
-msgstr "Error: no se pudo encontrar el fichero OPML movido."
-
-#: classes/opml.php:594
-msgid "Error while parsing document."
-msgstr "Error mientras se analizaba el documento."
-
 #: 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."
@@ -1032,162 +840,354 @@ msgstr "Ctrl"
 msgid "Help topic not found."
 msgstr "Tema de ayuda no encontrado."
 
-#: 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."
+#: classes/backend.php:103
+#: classes/pref/filters.php:208
+#: classes/pref/feeds.php:1465
+#: classes/pref/feeds.php:1532
+#: classes/pref/prefs.php:1099
+#: classes/dlg.php:33
+#: classes/dlg.php:56
+#: classes/dlg.php:89
+#: classes/dlg.php:154
+#: classes/dlg.php:181
+#: classes/dlg.php:197
+#: classes/article.php:810
+#: plugins/af_psql_trgm/init.php:109
+#: plugins/import_export/init.php:446
+#: plugins/import_export/init.php:490
+#: plugins/share/init.php:128
+msgid "Close this window"
+msgstr "Cerrar esta ventana"
 
-#: classes/dlg.php:44
-msgid "Your Public OPML URL is:"
-msgstr "La URL de su archivo OPML público es:"
+#: classes/feeds.php:53
+msgid "View as RSS feed"
+msgstr "Ver como fuente RSS"
 
-#: classes/dlg.php:53
-#: classes/dlg.php:178
-#: plugins/share/init.php:125
-msgid "Generate new URL"
-msgstr "Generar URL nueva"
+#: classes/feeds.php:54
+#: classes/feeds.php:140
+#: classes/pref/feeds.php:1326
+msgid "View as RSS"
+msgstr "Ver como RSS"
 
-#: classes/dlg.php:67
-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 "El demonio de actualización está habilitado en la configuración, pero el proceso del demonio no está en funcionamiento, lo cual impide la actualización de todas las fuentes. Por favor, inicie el proceso del demonio o solicítelo al propietario de la instancia."
+#: classes/feeds.php:62
+#, php-format
+msgid "Last updated: %s"
+msgstr "Última actualización: %s"
 
-#: classes/dlg.php:71
-#: classes/dlg.php:80
-msgid "Last update:"
-msgstr "Última actualización:"
+#: classes/feeds.php:100
+#, fuzzy
+msgid "Select..."
+msgstr "Seleccionar"
 
-#: classes/dlg.php:76
-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 "El demonio de actualización está tardando demasiado en realizar una actualización de fuente. Esto podría deberse a un problema en el servidor (rotura, cuelgue,...). Por favor, compruebe el proceso del demonio o avise al propietario de la instancia."
+#: classes/feeds.php:102
+#: classes/pref/labels.php:273
+#: classes/pref/filters.php:391
+#: classes/pref/filters.php:449
+#: classes/pref/filters.php:795
+#: classes/pref/filters.php:878
+#: classes/pref/filters.php:905
+#: classes/pref/feeds.php:1185
+#: classes/pref/feeds.php:1416
+#: classes/pref/feeds.php:1481
+#: classes/pref/users.php:358
+#: classes/pref/prefs.php:996
+msgid "All"
+msgstr "Todo"
 
-#: classes/dlg.php:169
-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/feeds.php:104
+msgid "Invert"
+msgstr "Invertir"
 
-#: classes/dlg.php:190
-msgid "You are using default tt-rss password. Please change it in the Preferences (Personal data / Authentication)."
+#: classes/feeds.php:105
+#: classes/pref/labels.php:275
+#: classes/pref/filters.php:393
+#: classes/pref/filters.php:451
+#: classes/pref/filters.php:797
+#: classes/pref/filters.php:880
+#: classes/pref/filters.php:907
+#: classes/pref/feeds.php:1187
+#: classes/pref/feeds.php:1418
+#: classes/pref/feeds.php:1483
+#: classes/pref/users.php:360
+#: classes/pref/prefs.php:998
+msgid "None"
+msgstr "Nada"
+
+#: classes/feeds.php:107
+msgid "Selection toggle:"
+msgstr "Alternar la selección:"
+
+#: classes/feeds.php:113
+msgid "Selection:"
+msgstr "Selección:"
+
+#: classes/feeds.php:116
+msgid "Set score"
+msgstr "Definir puntuación"
+
+#: classes/feeds.php:119
+msgid "Archive"
+msgstr "Archivar"
+
+#: classes/feeds.php:121
+msgid "Move back"
+msgstr "Mover a la fuente original"
+
+#: classes/feeds.php:122
+#: classes/pref/filters.php:400
+#: classes/pref/filters.php:458
+#: classes/pref/filters.php:887
+#: classes/pref/filters.php:914
+msgid "Delete"
+msgstr "Borrar"
+
+#: classes/feeds.php:127
+#: classes/feeds.php:132
+#: plugins/mailto/init.php:25
+#: plugins/mail/init.php:76
+msgid "Forward by email"
+msgstr "Enviar por correo electrónico"
+
+#: classes/feeds.php:136
+msgid "Feed:"
+msgstr "Fuente:"
+
+#: classes/feeds.php:193
+#: classes/feeds.php:802
+msgid "Feed not found."
+msgstr "Fuente no encontrada."
+
+#: classes/feeds.php:255
+msgid "Never"
+msgstr "Nunca "
+
+#: classes/feeds.php:341
+#, php-format
+msgid "Imported at %s"
+msgstr "Importado en %s"
+
+#: classes/feeds.php:391
+#: classes/feeds.php:484
+msgid "mark feed as read"
+msgstr "Marcar fuente como leída"
+
+#: classes/feeds.php:540
+msgid "Collapse article"
+msgstr "Cerrar artículo"
+
+#: classes/feeds.php:592
+#: classes/article.php:762
+msgid "Originally from:"
+msgstr "Original de:"
+
+#: classes/feeds.php:603
+#: classes/pref/feeds.php:538
+#: classes/article.php:773
+msgid "Feed URL"
+msgstr "URL de la fuente"
+
+#: classes/feeds.php:630
+#: classes/article.php:729
+msgid "Edit tags for this article"
+msgstr "Editar las etiquetas de este artículo"
+
+#: classes/feeds.php:644
+#: classes/article.php:625
+msgid "comment"
+msgid_plural "comments"
+msgstr[0] "comentario"
+msgstr[1] "comentarios"
+
+#: classes/feeds.php:648
+#: classes/article.php:629
+msgid "comments"
+msgstr "comentarios"
+
+#: classes/feeds.php:686
+msgid "No unread articles found to display."
+msgstr "No se han encontrado artículos sin leer."
+
+#: classes/feeds.php:689
+msgid "No updated articles found to display."
+msgstr "No se han encontrado artículos actualizados."
+
+#: classes/feeds.php:692
+msgid "No starred articles found to display."
+msgstr "No se han encontrado artículos favoritos."
+
+#: classes/feeds.php:696
+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:698
+msgid "No articles found to display."
+msgstr "No se han encontrado artículos que mostrar."
+
+#: classes/feeds.php:714
+#: classes/feeds.php:905
+#, php-format
+msgid "Feeds last updated at %s"
+msgstr "Última actualización de las fuentes: %s"
+
+#: classes/feeds.php:726
+#: classes/feeds.php:917
+msgid "Some feeds have update errors (click for details)"
+msgstr "Error al actualizar algunas fuentes (pulse aquí para obtener los detalles)"
+
+#: classes/feeds.php:894
+msgid "No feed selected."
+msgstr "No se ha seleccionado ninguna fuente."
+
+#: classes/feeds.php:958
+#: classes/feeds.php:966
+msgid "Feed or site URL"
+msgstr "URL de la fuente o del sitio"
+
+#: classes/feeds.php:972
+#: classes/pref/feeds.php:559
+#: classes/pref/feeds.php:800
+#: classes/pref/feeds.php:1632
+msgid "Place in category:"
+msgstr "Categoría:"
+
+#: classes/feeds.php:980
+msgid "Available feeds"
+msgstr "Fuentes disponibles"
+
+#: classes/feeds.php:992
+#: classes/pref/feeds.php:621
+#: classes/pref/feeds.php:848
+#: classes/pref/users.php:61
+msgid "Authentication"
+msgstr "Autenticación"
+
+#: classes/feeds.php:996
+#: classes/pref/feeds.php:625
+#: classes/pref/feeds.php:852
+#: classes/pref/feeds.php:1646
+#: classes/pref/users.php:403
+msgid "Login"
+msgstr "Iniciar sesión"
+
+#: classes/feeds.php:1000
+#: classes/pref/feeds.php:631
+#: classes/pref/feeds.php:860
+#: classes/pref/feeds.php:1649
+#: classes/pref/prefs.php:243
+msgid "Password"
+msgstr "Contraseña:"
+
+#: classes/feeds.php:1011
+#: classes/pref/feeds.php:645
+msgid "This feed requires authentication."
+msgstr "Esta fuente requiere autenticación."
+
+#: classes/feeds.php:1014
+#: classes/feeds.php:1070
+#: classes/pref/feeds.php:1668
+msgid "Subscribe"
+msgstr "Suscribir"
+
+#: classes/feeds.php:1017
+msgid "More feeds"
+msgstr "Más fuentes"
+
+#: classes/feeds.php:1020
+#: classes/feeds.php:1072
+#: classes/feeds.php:1111
+#: classes/pref/labels.php:84
+#: classes/pref/filters.php:528
+#: classes/pref/filters.php:945
+#: classes/pref/filters.php:1022
+#: classes/pref/filters.php:1115
+#: classes/pref/feeds.php:774
+#: classes/pref/feeds.php:916
+#: classes/pref/feeds.php:1669
+#: classes/pref/users.php:105
+#: classes/pref/prefs.php:984
+#: classes/article.php:238
+#: classes/handler/public.php:443
+#: classes/handler/public.php:477
+#: plugins/mail/init.php:179
+#: plugins/note/init.php:60
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: classes/feeds.php:1042
+#: classes/feeds.php:1110
+#: classes/pref/filters.php:788
+#: classes/pref/feeds.php:1178
+#: classes/pref/users.php:345
+#: js/tt-rss.js:152
+msgid "Search"
+msgstr "Buscar"
+
+#: classes/feeds.php:1046
+msgid "Popular feeds"
+msgstr "Fuentes populares"
+
+#: classes/feeds.php:1047
+msgid "Feed archive"
+msgstr "Archivo de fuentes"
+
+#: classes/feeds.php:1050
+msgid "limit:"
+msgstr "límite:"
+
+#: classes/feeds.php:1071
+#: classes/pref/labels.php:282
+#: classes/pref/filters.php:518
+#: classes/pref/filters.php:814
+#: classes/pref/feeds.php:751
+#: classes/pref/users.php:369
+msgid "Remove"
+msgstr "Eliminar"
+
+#: classes/feeds.php:1084
+msgid "Look for"
+msgstr "Buscar"
+
+#: classes/feeds.php:1092
+#, php-format
+msgid "in %s"
 msgstr ""
 
-#: classes/dlg.php:194
-#, fuzzy
-msgid "Open Preferences"
-msgstr "Preferencias"
+#: classes/feeds.php:1097
+msgid "Used for word stemming"
+msgstr ""
 
-#: classes/handler/public.php:387
-#: plugins/bookmarklets/init.php:40
-msgid "Share with Tiny Tiny RSS"
-msgstr "Compartir con Tiny Tiny RSS"
+#: classes/feeds.php:1106
+msgid "Search syntax"
+msgstr "Sintaxis de búsqueda"
 
-#: classes/handler/public.php:395
-msgid "Title:"
-msgstr "Título:"
+#: classes/feeds.php:1563
+msgid "Starred articles"
+msgstr "Favoritos"
 
-#: classes/handler/public.php:397
-#: classes/pref/feeds.php:537
-msgid "URL:"
-msgstr "URL:"
+#: classes/feeds.php:1565
+msgid "Published articles"
+msgstr "Publicados"
 
-#: classes/handler/public.php:399
-msgid "Content:"
-msgstr "Contenido:"
+#: classes/feeds.php:1567
+msgid "Fresh articles"
+msgstr "Recientes"
 
-#: classes/handler/public.php:401
-msgid "Labels:"
-msgstr "Marcadores:"
+#: classes/feeds.php:1571
+msgid "Archived articles"
+msgstr "Artículos archivados"
 
-#: classes/handler/public.php:420
-msgid "Shared article will appear in the Published feed."
-msgstr "El artículo compartido aparecerá en la fuente Publicados."
+#: classes/feeds.php:1573
+msgid "Recently read"
+msgstr "Leídos recientemente"
 
-#: classes/handler/public.php:422
-msgid "Share"
-msgstr "Compartir"
+#: classes/feeds.php:1694
+msgid "Special"
+msgstr "Especial"
 
-#: classes/handler/public.php:444
-msgid "Not logged in"
-msgstr "No ha iniciado sesión"
-
-#: classes/handler/public.php:504
-msgid "Incorrect username or password"
-msgstr "Nombre de usuario o contraseña incorrecta"
-
-#: classes/handler/public.php:557
+#: classes/feeds.php:1951
 #, php-format
-msgid "Already subscribed to <b>%s</b>."
-msgstr "Ya está suscrito a <strong>%s</strong>."
-
-#: classes/handler/public.php:560
-#, php-format
-msgid "Subscribed to <b>%s</b>."
-msgstr "Suscrito a <strong>%s</strong>."
-
-#: classes/handler/public.php:563
-#, php-format
-msgid "Could not subscribe to <b>%s</b>."
-msgstr "No se pudo suscribir a <b>%s</b>."
-
-#: classes/handler/public.php:566
-#, php-format
-msgid "No feeds found in <b>%s</b>."
-msgstr "No se han encontrado fuentes en <b>%s</b>."
-
-#: classes/handler/public.php:569
-msgid "Multiple feed URLs found."
-msgstr "Múltiples fuentes encontradas."
-
-#: classes/handler/public.php:573
-#, 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:591
-msgid "Subscribe to selected feed"
-msgstr "Suscribirse a la fuente seleccionada"
-
-#: classes/handler/public.php:618
-msgid "Edit subscription options"
-msgstr "Editar las opciones de suscripción"
-
-#: classes/handler/public.php:656
-msgid "Password recovery"
-msgstr "Recuperación de contraseña"
-
-#: classes/handler/public.php:701
-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:723
-#: classes/pref/users.php:372
-msgid "Reset password"
-msgstr "Redefinir contraseña"
-
-#: classes/handler/public.php:733
-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:737
-#: classes/handler/public.php:806
-msgid "Go back"
-msgstr "Volver"
-
-#: classes/handler/public.php:775
-msgid "[tt-rss] Password reset request"
-msgstr "[tt-rss] Petición de cambio de contraseña"
-
-#: classes/handler/public.php:802
-msgid "Sorry, login and email combination not found."
-msgstr "Lo siento, combinación de usuario y correo electrónico incorrecta."
-
-#: classes/handler/public.php:824
-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:850
-msgid "Database Updater"
-msgstr "Actualizador de la base de datos"
-
-#: classes/handler/public.php:915
-msgid "Perform updates"
-msgstr "Actualizar"
+msgid "Search results: %s"
+msgstr "Resultados de búsqueda: %s"
 
 #: classes/pref/labels.php:25
 #: classes/pref/filters.php:377
@@ -1207,201 +1207,194 @@ msgstr "Primer plano:"
 msgid "Background:"
 msgstr "Fondo:"
 
+#: classes/pref/labels.php:82
+#: classes/pref/filters.php:525
+#: classes/pref/feeds.php:773
+#: classes/pref/feeds.php:913
+#: classes/pref/users.php:103
+#: classes/pref/prefs.php:982
+#: classes/article.php:236
+#: plugins/af_zz_imgproxy/init.php:238
+#: plugins/af_redditimgur/init.php:66
+#: plugins/af_psql_trgm/init.php:188
+#: plugins/af_readability/init.php:80
+#: plugins/nsfw/init.php:85
+#: plugins/mail/init.php:65
+#: plugins/note/init.php:58
+msgid "Save"
+msgstr "Guardar"
+
 #: classes/pref/labels.php:244
 #, php-format
 msgid "Created label <b>%s</b>"
 msgstr "Se ha creado la etiqueta <strong>%s</strong>"
 
 #: classes/pref/labels.php:270
-#: classes/pref/users.php:356
-#: classes/pref/feeds.php:1183
-#: classes/pref/feeds.php:1414
-#: classes/pref/feeds.php:1479
 #: classes/pref/filters.php:388
 #: classes/pref/filters.php:446
 #: classes/pref/filters.php:792
 #: classes/pref/filters.php:875
 #: classes/pref/filters.php:902
+#: classes/pref/feeds.php:1182
+#: classes/pref/feeds.php:1413
+#: classes/pref/feeds.php:1478
+#: classes/pref/users.php:355
 #: classes/pref/prefs.php:993
 msgid "Select"
 msgstr "Seleccionar"
 
-#: classes/pref/labels.php:273
-#: classes/pref/users.php:359
-#: classes/pref/feeds.php:1186
-#: classes/pref/feeds.php:1417
-#: classes/pref/feeds.php:1482
-#: classes/pref/filters.php:391
-#: classes/pref/filters.php:449
-#: classes/pref/filters.php:795
-#: classes/pref/filters.php:878
-#: classes/pref/filters.php:905
-#: classes/pref/prefs.php:996
-#: classes/feeds.php:102
-msgid "All"
-msgstr "Todo"
-
-#: classes/pref/labels.php:275
-#: classes/pref/users.php:361
-#: classes/pref/feeds.php:1188
-#: classes/pref/feeds.php:1419
-#: classes/pref/feeds.php:1484
-#: classes/pref/filters.php:393
-#: classes/pref/filters.php:451
-#: classes/pref/filters.php:797
-#: classes/pref/filters.php:880
-#: classes/pref/filters.php:907
-#: classes/pref/prefs.php:998
-#: classes/feeds.php:105
-msgid "None"
-msgstr "Nada"
-
-#: classes/pref/labels.php:282
-#: classes/pref/users.php:370
-#: classes/pref/feeds.php:752
-#: classes/pref/filters.php:518
-#: classes/pref/filters.php:814
-#: classes/feeds.php:1088
-msgid "Remove"
-msgstr "Eliminar"
-
 #: classes/pref/labels.php:285
 msgid "Clear colors"
 msgstr "Limpiar los colores"
 
-#: classes/pref/users.php:6
-#: classes/pref/system.php:8
-msgid "Your access level is insufficient to open this tab."
-msgstr "Su nivel de acceso es insuficiente para abrir esta pestaña."
-
-#: classes/pref/users.php:26
+#: classes/pref/filters.php:155
 #, fuzzy
-msgid "Edit user"
-msgstr "Editar regla"
+msgid "Preview article"
+msgstr "Filtrar artículo"
 
-#: classes/pref/users.php:61
-#: classes/pref/feeds.php:622
-#: classes/pref/feeds.php:849
-#: classes/feeds.php:1009
-msgid "Authentication"
-msgstr "Autenticación"
+#: classes/pref/filters.php:267
+#: classes/pref/filters.php:573
+msgid "(inverse)"
+msgstr "(inverso)"
 
-#: classes/pref/users.php:64
-msgid "Access level: "
-msgstr "Nivel de acceso:"
-
-#: classes/pref/users.php:82
-#: classes/pref/feeds.php:648
-#: classes/pref/feeds.php:867
-msgid "Options"
-msgstr "Opciones"
-
-#: classes/pref/users.php:96
-#: js/prefs.js:479
-msgid "User details"
-msgstr "Detalles del usuario"
-
-#: classes/pref/users.php:136
-#: classes/pref/users.php:407
-msgid "Registered"
-msgstr "Registrado"
-
-#: classes/pref/users.php:137
-msgid "Last logged in"
-msgstr "Última sesión el"
-
-#: classes/pref/users.php:145
-msgid "Subscribed feeds count"
-msgstr "Contador de fuentes suscritas"
-
-#: classes/pref/users.php:146
-#, fuzzy
-msgid "Stored articles"
-msgstr "Favoritos"
-
-#: classes/pref/users.php:150
-#: classes/pref/users.php:406
-msgid "Subscribed feeds"
-msgstr "Fuentes suscritas"
-
-#: classes/pref/users.php:176
-msgid "User not found"
-msgstr "Usuario no encontrado"
-
-#: classes/pref/users.php:246
+#: classes/pref/filters.php:263
+#: classes/pref/filters.php:572
 #, php-format
-msgid "Added user <b>%s</b> with password <b>%s</b>"
-msgstr "Se ha añadido al usuario <strong>%s</strong> con la contraseña <strong>%s</strong>"
+msgid "%s on %s in %s %s"
+msgstr "%s en %s en %s %s"
 
-#: classes/pref/users.php:253
-#, php-format
-msgid "Could not create user <b>%s</b>"
-msgstr "No se puede crear el usuario <strong>%s</strong>"
+#: classes/pref/filters.php:383
+#: classes/pref/filters.php:870
+#: classes/pref/filters.php:977
+msgid "Match"
+msgstr "Coincidir"
 
-#: classes/pref/users.php:257
-#, php-format
-msgid "User <b>%s</b> already exists."
-msgstr "El usuario <strong>%s</strong> ya existe."
+#: classes/pref/filters.php:397
+#: classes/pref/filters.php:455
+#: classes/pref/filters.php:884
+#: classes/pref/filters.php:911
+msgid "Add"
+msgstr "Añadir"
 
-#: classes/pref/users.php:285
-#, 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/filters.php:441
+#: classes/pref/filters.php:897
+msgid "Apply actions"
+msgstr "Aplicar acciones"
 
-#: classes/pref/users.php:287
-#, 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/filters.php:492
+#: classes/pref/filters.php:926
+msgid "Enabled"
+msgstr "Habilitado"
 
-#: classes/pref/users.php:311
-msgid "[tt-rss] Password change notification"
-msgstr "[tt-rss] Notificación de cambio de contraseña"
+#: classes/pref/filters.php:501
+#: classes/pref/filters.php:929
+msgid "Match any rule"
+msgstr "Coincidencia con cualquier regla"
 
-#: classes/pref/users.php:346
-#: classes/pref/feeds.php:1179
-#: classes/pref/filters.php:788
-#: classes/feeds.php:1059
-#: classes/feeds.php:1127
-#: js/tt-rss.js:165
-msgid "Search"
-msgstr "Buscar"
+#: classes/pref/filters.php:510
+#: classes/pref/filters.php:932
+msgid "Inverse matching"
+msgstr "Coincidencia inversa"
 
-#: classes/pref/users.php:364
-msgid "Create user"
-msgstr "Crear usuario"
+#: classes/pref/filters.php:522
+#: classes/pref/filters.php:939
+msgid "Test"
+msgstr "Probar"
+
+#: classes/pref/filters.php:804
+msgid "Combine"
+msgstr "Combinar"
 
-#: classes/pref/users.php:368
 #: classes/pref/filters.php:807
+#: classes/pref/users.php:367
 msgid "Edit"
 msgstr "Editar"
 
-#: classes/pref/users.php:404
-#: classes/pref/feeds.php:626
-#: classes/pref/feeds.php:853
-#: classes/pref/feeds.php:1649
-#: classes/feeds.php:1013
-msgid "Login"
-msgstr "Iniciar sesión"
+#: classes/pref/filters.php:810
+#: classes/pref/feeds.php:1198
+#: classes/pref/feeds.php:1212
+msgid "Reset sort order"
+msgstr "Reiniciar orden"
 
-#: classes/pref/users.php:405
-msgid "Access Level"
-msgstr "Nivel de acceso"
+#: classes/pref/filters.php:942
+msgid "Create"
+msgstr "Crear"
 
-#: classes/pref/users.php:408
-msgid "Last login"
-msgstr "Última sesión"
+#: classes/pref/filters.php:987
+msgid "Regular expression, without outer delimiters (i.e. slashes)"
+msgstr ""
 
-#: classes/pref/users.php:427
-msgid "Click to edit"
-msgstr "Pulse aquí para editar"
+#: classes/pref/filters.php:993
+msgid "Inverse regular expression matching"
+msgstr "Coincidencia inversa con la expresión regular"
 
-#: classes/pref/users.php:447
-msgid "No users defined."
-msgstr "No se han definido usuarios."
+#: classes/pref/filters.php:995
+msgid "on field"
+msgstr "en el campo"
 
-#: classes/pref/users.php:449
-msgid "No matching users found."
-msgstr "No se han encontrado usuarios coincidentes."
+#: classes/pref/filters.php:1001
+#: js/PrefFilterTree.js:44
+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:764
+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:786
+msgid "Add action"
+msgstr "Añadir acción"
+
+#: classes/pref/filters.php:1139
+msgid "[No caption]"
+msgstr "[Sin leyenda]"
+
+#: classes/pref/filters.php:1141
+#, 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:1155
+#, fuzzy
+msgid "matches any rule"
+msgstr "Coincidencia con cualquier regla"
+
+#: classes/pref/filters.php:1158
+#, php-format
+msgid "%s (+%d action)"
+msgid_plural "%s (+%d actions)"
+msgstr[0] "%s (+%d acción)"
+msgstr[1] "%s (+%d acciones)"
+
+#: classes/pref/system.php:8
+#: classes/pref/users.php:6
+msgid "Your access level is insufficient to open this tab."
+msgstr "Su nivel de acceso es insuficiente para abrir esta pestaña."
 
 #: classes/pref/system.php:29
 msgid "Error Log"
@@ -1446,385 +1439,316 @@ msgid_plural "(%d feeds)"
 msgstr[0] "(%d fuente)"
 msgstr[1] "(%d fuentes)"
 
-#: classes/pref/feeds.php:514
+#: classes/pref/feeds.php:513
 #: classes/pref/prefs.php:18
 msgid "General"
 msgstr "General"
 
-#: classes/pref/feeds.php:528
+#: classes/pref/feeds.php:527
 msgid "Feed Title"
 msgstr "Título de la fuente"
 
-#: classes/pref/feeds.php:560
-#: classes/pref/feeds.php:801
-#: classes/pref/feeds.php:1635
-#: classes/feeds.php:989
-msgid "Place in category:"
-msgstr "Categoría:"
+#: classes/pref/feeds.php:536
+#: classes/handler/public.php:417
+msgid "URL:"
+msgstr "URL:"
 
-#: classes/pref/feeds.php:572
+#: classes/pref/feeds.php:571
 #, fuzzy
 msgid "Site URL:"
 msgstr "URL del artículo:"
 
-#: classes/pref/feeds.php:574
+#: classes/pref/feeds.php:573
 #, fuzzy
 msgid "Site URL"
 msgstr "URL de la fuente"
 
-#: classes/pref/feeds.php:585
-#: classes/pref/feeds.php:815
+#: classes/pref/feeds.php:584
+#: classes/pref/feeds.php:814
 #, fuzzy
 msgid "Language:"
 msgstr "Idioma"
 
-#: classes/pref/feeds.php:592
-#: classes/pref/feeds.php:824
+#: classes/pref/feeds.php:591
+#: classes/pref/feeds.php:823
 msgid "Update"
 msgstr "Actualizar"
 
-#: classes/pref/feeds.php:607
-#: classes/pref/feeds.php:840
+#: classes/pref/feeds.php:606
+#: classes/pref/feeds.php:839
 msgid "Article purging:"
 msgstr "Purga de artículos"
 
-#: classes/pref/feeds.php:632
-#: classes/pref/feeds.php:861
-#: classes/pref/feeds.php:1652
-#: classes/pref/prefs.php:243
-#: classes/feeds.php:1017
-msgid "Password"
-msgstr "Contraseña:"
-
-#: classes/pref/feeds.php:636
+#: classes/pref/feeds.php:635
 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:646
-#: classes/feeds.php:1028
-msgid "This feed requires authentication."
-msgstr "Esta fuente requiere autenticación."
+#: classes/pref/feeds.php:647
+#: classes/pref/feeds.php:866
+#: classes/pref/users.php:82
+msgid "Options"
+msgstr "Opciones"
 
-#: classes/pref/feeds.php:662
-#: classes/pref/feeds.php:871
+#: classes/pref/feeds.php:661
+#: classes/pref/feeds.php:870
 msgid "Hide from Popular feeds"
 msgstr "No incluir en Fuentes Populares"
 
-#: classes/pref/feeds.php:674
-#: classes/pref/feeds.php:877
+#: classes/pref/feeds.php:673
+#: classes/pref/feeds.php:876
 msgid "Include in e-mail digest"
 msgstr "Incluir en el correo recopilatorio"
 
-#: classes/pref/feeds.php:687
-#: classes/pref/feeds.php:883
+#: classes/pref/feeds.php:686
+#: classes/pref/feeds.php:882
 msgid "Always display image attachments"
 msgstr "Mostrar siempre imágenes adjuntas"
 
-#: classes/pref/feeds.php:700
-#: classes/pref/feeds.php:891
+#: classes/pref/feeds.php:699
+#: classes/pref/feeds.php:890
 #, fuzzy
 msgid "Do not embed media"
 msgstr "No mostrar imágenes"
 
-#: classes/pref/feeds.php:713
-#: classes/pref/feeds.php:899
+#: classes/pref/feeds.php:712
+#: classes/pref/feeds.php:898
 msgid "Cache media"
 msgstr ""
 
-#: classes/pref/feeds.php:725
-#: classes/pref/feeds.php:905
+#: classes/pref/feeds.php:724
+#: classes/pref/feeds.php:904
 msgid "Mark updated articles as unread"
 msgstr "Marcar los artículos actualizados como sin leer"
 
-#: classes/pref/feeds.php:729
+#: classes/pref/feeds.php:728
 msgid "Icon"
 msgstr "Icono"
 
-#: classes/pref/feeds.php:743
-#: classes/pref/feeds.php:1284
+#: classes/pref/feeds.php:742
+#: classes/pref/feeds.php:1283
 #: plugins/import_export/init.php:71
 #, fuzzy
 msgid "Choose file..."
 msgstr "Crear filtro..."
 
-#: classes/pref/feeds.php:750
+#: classes/pref/feeds.php:749
 msgid "Replace"
 msgstr "Reemplazar"
 
-#: classes/pref/feeds.php:757
+#: classes/pref/feeds.php:756
 #: classes/pref/prefs.php:679
 msgid "Plugins"
 msgstr "Plugins"
 
-#: classes/pref/feeds.php:1154
+#: classes/pref/feeds.php:1153
 msgid "Feeds with errors"
 msgstr "Fuentes con errores"
 
-#: classes/pref/feeds.php:1161
+#: classes/pref/feeds.php:1160
 msgid "Inactive feeds"
 msgstr "Fuentes inactivas"
 
-#: classes/pref/feeds.php:1197
+#: classes/pref/feeds.php:1196
 msgid "Edit selected feeds"
 msgstr "Editar fuentes seleccionadas"
 
-#: classes/pref/feeds.php:1199
-#: classes/pref/feeds.php:1213
-#: classes/pref/filters.php:810
-msgid "Reset sort order"
-msgstr "Reiniciar orden"
-
-#: classes/pref/feeds.php:1201
-#: js/prefs.js:1462
+#: classes/pref/feeds.php:1200
+#: js/prefs.js:1171
 msgid "Batch subscribe"
 msgstr "Suscripción en lote"
 
-#: classes/pref/feeds.php:1208
+#: classes/pref/feeds.php:1207
 msgid "Categories"
 msgstr "Categorías"
 
-#: classes/pref/feeds.php:1211
+#: classes/pref/feeds.php:1210
 msgid "Add category"
 msgstr "Añadir categoría"
 
-#: classes/pref/feeds.php:1215
+#: classes/pref/feeds.php:1214
 msgid "Remove selected"
 msgstr "Eliminar seleccionadas"
 
-#: classes/pref/feeds.php:1272
+#: classes/pref/feeds.php:1271
 msgid "OPML"
 msgstr "OPML"
 
-#: classes/pref/feeds.php:1274
+#: classes/pref/feeds.php:1273
 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:1275
+#: classes/pref/feeds.php:1274
 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:1290
+#: classes/pref/feeds.php:1289
 msgid "Import my OPML"
 msgstr "Importar OPML"
 
-#: classes/pref/feeds.php:1296
+#: classes/pref/feeds.php:1295
 msgid "Filename:"
 msgstr "Nombre de archivo:"
 
-#: classes/pref/feeds.php:1298
+#: classes/pref/feeds.php:1297
 msgid "Include settings"
 msgstr "Incluir preferencias"
 
-#: classes/pref/feeds.php:1302
+#: classes/pref/feeds.php:1301
 msgid "Export OPML"
 msgstr "Exportar OPML"
 
-#: classes/pref/feeds.php:1306
+#: classes/pref/feeds.php:1305
 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:1310
+#: classes/pref/feeds.php:1309
 msgid "Public OPML URL"
 msgstr "URL del archivo OPML público"
 
-#: classes/pref/feeds.php:1311
+#: classes/pref/feeds.php:1310
 msgid "Display published OPML URL"
 msgstr "Mostrar la URL del OPML público"
 
-#: classes/pref/feeds.php:1318
+#: classes/pref/feeds.php:1317
 msgid "Published & shared articles / Generated feeds"
 msgstr "Artículos publicados y compartidos / Fuentes generadas"
 
-#: classes/pref/feeds.php:1320
+#: classes/pref/feeds.php:1319
 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:1327
-#: classes/feeds.php:54
-#: classes/feeds.php:140
-msgid "View as RSS"
-msgstr "Ver como RSS"
-
-#: classes/pref/feeds.php:1328
 msgid "Display URL"
 msgstr "Mostrar URL"
 
-#: classes/pref/feeds.php:1331
+#: classes/pref/feeds.php:1330
 msgid "Clear all generated URLs"
 msgstr "Limpiar todas las URLs generadas"
 
-#: classes/pref/feeds.php:1410
+#: classes/pref/feeds.php:1409
 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:1444
-#: classes/pref/feeds.php:1509
+#: classes/pref/feeds.php:1443
+#: classes/pref/feeds.php:1508
 msgid "Click to edit feed"
 msgstr "Pulse para editar fuente"
 
-#: classes/pref/feeds.php:1462
-#: classes/pref/feeds.php:1529
+#: classes/pref/feeds.php:1461
+#: classes/pref/feeds.php:1528
 msgid "Unsubscribe from selected feeds"
 msgstr "Cancelar la suscripción a las fuentes seleccionadas"
 
-#: classes/pref/feeds.php:1632
+#: classes/pref/feeds.php:1629
 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:1641
+#: classes/pref/feeds.php:1638
 msgid "Feeds to subscribe, One per line"
 msgstr "Fuentes para suscribirse, una por línea"
 
-#: classes/pref/feeds.php:1664
+#: classes/pref/feeds.php:1661
 msgid "Feeds require authentication."
 msgstr "Las fuentes requieren autenticación."
 
-#: classes/pref/feeds.php:1671
-#: classes/feeds.php:1031
-#: classes/feeds.php:1087
-msgid "Subscribe"
-msgstr "Suscribir"
-
-#: classes/pref/filters.php:155
+#: classes/pref/users.php:26
 #, fuzzy
-msgid "Preview article"
-msgstr "Filtrar artículo"
+msgid "Edit user"
+msgstr "Editar regla"
 
-#: classes/pref/filters.php:267
-#: classes/pref/filters.php:573
-msgid "(inverse)"
-msgstr "(inverso)"
+#: classes/pref/users.php:64
+msgid "Access level: "
+msgstr "Nivel de acceso:"
 
-#: classes/pref/filters.php:263
-#: classes/pref/filters.php:572
-#, php-format
-msgid "%s on %s in %s %s"
-msgstr "%s en %s en %s %s"
+#: classes/pref/users.php:96
+#: js/prefs.js:403
+msgid "User details"
+msgstr "Detalles del usuario"
 
-#: classes/pref/filters.php:383
-#: classes/pref/filters.php:870
-#: classes/pref/filters.php:977
-msgid "Match"
-msgstr "Coincidir"
+#: classes/pref/users.php:136
+#: classes/pref/users.php:406
+msgid "Registered"
+msgstr "Registrado"
 
-#: classes/pref/filters.php:397
-#: classes/pref/filters.php:455
-#: classes/pref/filters.php:884
-#: classes/pref/filters.php:911
-msgid "Add"
-msgstr "Añadir"
+#: classes/pref/users.php:137
+msgid "Last logged in"
+msgstr "Última sesión el"
 
-#: classes/pref/filters.php:400
-#: classes/pref/filters.php:458
-#: classes/pref/filters.php:887
-#: classes/pref/filters.php:914
-#: classes/feeds.php:122
-msgid "Delete"
-msgstr "Borrar"
+#: classes/pref/users.php:145
+msgid "Subscribed feeds count"
+msgstr "Contador de fuentes suscritas"
 
-#: classes/pref/filters.php:441
-#: classes/pref/filters.php:897
-msgid "Apply actions"
-msgstr "Aplicar acciones"
-
-#: classes/pref/filters.php:492
-#: classes/pref/filters.php:926
-msgid "Enabled"
-msgstr "Habilitado"
-
-#: classes/pref/filters.php:501
-#: classes/pref/filters.php:929
-msgid "Match any rule"
-msgstr "Coincidencia con cualquier regla"
-
-#: classes/pref/filters.php:510
-#: classes/pref/filters.php:932
-msgid "Inverse matching"
-msgstr "Coincidencia inversa"
-
-#: classes/pref/filters.php:522
-#: classes/pref/filters.php:939
-msgid "Test"
-msgstr "Probar"
-
-#: classes/pref/filters.php:804
-msgid "Combine"
-msgstr "Combinar"
-
-#: classes/pref/filters.php:942
-msgid "Create"
-msgstr "Crear"
-
-#: classes/pref/filters.php:987
-msgid "Regular expression, without outer delimiters (i.e. slashes)"
-msgstr ""
-
-#: 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:43
-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:797
-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
+#: classes/pref/users.php:146
 #, fuzzy
-msgid "No actions available"
-msgstr "¡Nueva versión disponible!"
+msgid "Stored articles"
+msgstr "Favoritos"
 
-#: classes/pref/filters.php:1112
-msgid "Save action"
-msgstr "Guardar acción"
+#: classes/pref/users.php:150
+#: classes/pref/users.php:405
+msgid "Subscribed feeds"
+msgstr "Fuentes suscritas"
 
-#: classes/pref/filters.php:1112
-#: js/functions.js:819
-msgid "Add action"
-msgstr "Añadir acción"
+#: classes/pref/users.php:176
+msgid "User not found"
+msgstr "Usuario no encontrado"
 
-#: classes/pref/filters.php:1139
-msgid "[No caption]"
-msgstr "[Sin leyenda]"
-
-#: classes/pref/filters.php:1141
+#: classes/pref/users.php:246
 #, php-format
-msgid "%s (%d rule)"
-msgid_plural "%s (%d rules)"
-msgstr[0] "%s (%d regla)"
-msgstr[1] "%s (%d reglas)"
+msgid "Added user <b>%s</b> with password <b>%s</b>"
+msgstr "Se ha añadido al usuario <strong>%s</strong> con la contraseña <strong>%s</strong>"
 
-#: classes/pref/filters.php:1155
-#, fuzzy
-msgid "matches any rule"
-msgstr "Coincidencia con cualquier regla"
-
-#: classes/pref/filters.php:1158
+#: classes/pref/users.php:253
 #, php-format
-msgid "%s (+%d action)"
-msgid_plural "%s (+%d actions)"
-msgstr[0] "%s (+%d acción)"
-msgstr[1] "%s (+%d acciones)"
+msgid "Could not create user <b>%s</b>"
+msgstr "No se puede crear el usuario <strong>%s</strong>"
+
+#: classes/pref/users.php:257
+#, php-format
+msgid "User <b>%s</b> already exists."
+msgstr "El usuario <strong>%s</strong> ya existe."
+
+#: classes/pref/users.php:285
+#, 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:287
+#, 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:310
+msgid "[tt-rss] Password change notification"
+msgstr "[tt-rss] Notificación de cambio de contraseña"
+
+#: classes/pref/users.php:363
+msgid "Create user"
+msgstr "Crear usuario"
+
+#: classes/pref/users.php:371
+#: classes/handler/public.php:747
+msgid "Reset password"
+msgstr "Redefinir contraseña"
+
+#: classes/pref/users.php:404
+msgid "Access Level"
+msgstr "Nivel de acceso"
+
+#: classes/pref/users.php:407
+msgid "Last login"
+msgstr "Última sesión"
+
+#: classes/pref/users.php:426
+msgid "Click to edit"
+msgstr "Pulse aquí para editar"
+
+#: classes/pref/users.php:446
+msgid "No users defined."
+msgstr "No se han definido usuarios."
+
+#: classes/pref/users.php:448
+msgid "No matching users found."
+msgstr "No se han encontrado usuarios coincidentes."
 
 #: classes/pref/prefs.php:19
 msgid "Interface"
@@ -2000,7 +1924,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:1424
+#: js/prefs.js:1136
 msgid "Customize stylesheet"
 msgstr "Personalizar hoja de estilo"
 
@@ -2243,254 +2167,298 @@ msgstr "Borrar los perfiles seleccionados"
 msgid "Activate profile"
 msgstr "Activar perfil"
 
-#: classes/feeds.php:53
-msgid "View as RSS feed"
-msgstr "Ver como fuente RSS"
+#: 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."
 
-#: classes/feeds.php:62
-#, php-format
-msgid "Last updated: %s"
-msgstr "Última actualización: %s"
+#: classes/dlg.php:44
+msgid "Your Public OPML URL is:"
+msgstr "La URL de su archivo OPML público es:"
 
-#: classes/feeds.php:100
+#: classes/dlg.php:53
+#: classes/dlg.php:178
+#: plugins/share/init.php:125
+msgid "Generate new URL"
+msgstr "Generar URL nueva"
+
+#: classes/dlg.php:67
+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 "El demonio de actualización está habilitado en la configuración, pero el proceso del demonio no está en funcionamiento, lo cual impide la actualización de todas las fuentes. Por favor, inicie el proceso del demonio o solicítelo al propietario de la instancia."
+
+#: classes/dlg.php:71
+#: classes/dlg.php:80
+msgid "Last update:"
+msgstr "Última actualización:"
+
+#: classes/dlg.php:76
+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 "El demonio de actualización está tardando demasiado en realizar una actualización de fuente. Esto podría deberse a un problema en el servidor (rotura, cuelgue,...). Por favor, compruebe el proceso del demonio o avise al propietario de la instancia."
+
+#: classes/dlg.php:169
+msgid "You can view this feed as RSS using the following URL:"
+msgstr "Puede ver esta fuente en formato RSS en la siguiente URL:"
+
+#: classes/dlg.php:190
+msgid "You are using default tt-rss password. Please change it in the Preferences (Personal data / Authentication)."
+msgstr ""
+
+#: classes/dlg.php:194
 #, fuzzy
-msgid "Select..."
-msgstr "Seleccionar"
+msgid "Open Preferences"
+msgstr "Preferencias"
 
-#: classes/feeds.php:104
-msgid "Invert"
-msgstr "Invertir"
+#: classes/opml.php:31
+#: classes/opml.php:36
+msgid "OPML Utility"
+msgstr "Utilidad OPML"
 
-#: classes/feeds.php:107
-msgid "Selection toggle:"
-msgstr "Alternar la selección:"
+#: classes/opml.php:40
+msgid "Importing OPML..."
+msgstr "Importando OPML..."
 
-#: classes/feeds.php:113
-msgid "Selection:"
-msgstr "Selección:"
+#: classes/opml.php:45
+msgid "Return to preferences"
+msgstr "Volver a las preferencias"
 
-#: classes/feeds.php:116
-msgid "Set score"
-msgstr "Definir puntuación"
-
-#: classes/feeds.php:119
-msgid "Archive"
-msgstr "Archivar"
-
-#: classes/feeds.php:121
-msgid "Move back"
-msgstr "Mover a la fuente original"
-
-#: classes/feeds.php:127
-#: classes/feeds.php:132
-#: plugins/mail/init.php:76
-#: plugins/mailto/init.php:25
-msgid "Forward by email"
-msgstr "Enviar por correo electrónico"
-
-#: classes/feeds.php:136
-msgid "Feed:"
-msgstr "Fuente:"
-
-#: classes/feeds.php:193
-#: classes/feeds.php:819
-msgid "Feed not found."
-msgstr "Fuente no encontrada."
-
-#: classes/feeds.php:255
-msgid "Never"
-msgstr "Nunca "
-
-#: classes/feeds.php:342
+#: classes/opml.php:301
 #, php-format
-msgid "Imported at %s"
-msgstr "Importado en %s"
+msgid "Adding feed: %s"
+msgstr "Añadiendo fuente: %s"
 
-#: classes/feeds.php:394
-#: classes/feeds.php:487
-msgid "mark feed as read"
-msgstr "Marcar fuente como leída"
-
-#: classes/feeds.php:542
-msgid "Collapse article"
-msgstr "Cerrar artículo"
-
-#: classes/feeds.php:703
-msgid "No unread articles found to display."
-msgstr "No se han encontrado artículos sin leer."
-
-#: classes/feeds.php:706
-msgid "No updated articles found to display."
-msgstr "No se han encontrado artículos actualizados."
-
-#: classes/feeds.php:709
-msgid "No starred articles found to display."
-msgstr "No se han encontrado artículos favoritos."
-
-#: classes/feeds.php:713
-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:715
-msgid "No articles found to display."
-msgstr "No se han encontrado artículos que mostrar."
-
-#: classes/feeds.php:731
-#: classes/feeds.php:922
+#: classes/opml.php:312
 #, php-format
-msgid "Feeds last updated at %s"
-msgstr "Última actualización de las fuentes: %s"
+msgid "Duplicate feed: %s"
+msgstr "Duplicar fuente: %s"
 
-#: classes/feeds.php:743
-#: classes/feeds.php:934
-msgid "Some feeds have update errors (click for details)"
-msgstr "Error al actualizar algunas fuentes (pulse aquí para obtener los detalles)"
-
-#: classes/feeds.php:911
-msgid "No feed selected."
-msgstr "No se ha seleccionado ninguna fuente."
-
-#: classes/feeds.php:975
-#: classes/feeds.php:983
-msgid "Feed or site URL"
-msgstr "URL de la fuente o del sitio"
-
-#: classes/feeds.php:997
-msgid "Available feeds"
-msgstr "Fuentes disponibles"
-
-#: classes/feeds.php:1034
-msgid "More feeds"
-msgstr "Más fuentes"
-
-#: classes/feeds.php:1063
-msgid "Popular feeds"
-msgstr "Fuentes populares"
-
-#: classes/feeds.php:1064
-msgid "Feed archive"
-msgstr "Archivo de fuentes"
-
-#: classes/feeds.php:1067
-msgid "limit:"
-msgstr "límite:"
-
-#: classes/feeds.php:1101
-msgid "Look for"
-msgstr "Buscar"
-
-#: classes/feeds.php:1109
+#: classes/opml.php:326
 #, php-format
-msgid "in %s"
+msgid "Adding label %s"
+msgstr "Añadiendo el marcador %s"
+
+#: classes/opml.php:329
+#, php-format
+msgid "Duplicate label: %s"
+msgstr "Duplicar marcador: %s"
+
+#: classes/opml.php:341
+#, php-format
+msgid "Setting preference key %s to %s"
+msgstr "Configurando la opción %s como %s"
+
+#: classes/opml.php:377
+msgid "Adding filter..."
+msgstr "Añadiendo filtro..."
+
+#: classes/opml.php:512
+#, php-format
+msgid "Processing category: %s"
+msgstr "Procesando categoría: %s"
+
+#: classes/opml.php:558
+#, php-format
+msgid "Upload failed with error code %d"
+msgstr "La subida falló con el código de error %d"
+
+#: classes/opml.php:570
+#: plugins/import_export/init.php:471
+msgid "Unable to move uploaded file."
+msgstr "No se pudo mover el archivo subido."
+
+#: classes/opml.php:574
+#: plugins/import_export/init.php:475
+msgid "Error: please upload OPML file."
+msgstr "Error: por favor, suba un fichero OPML."
+
+#: classes/opml.php:585
+msgid "Error: unable to find moved OPML file."
+msgstr "Error: no se pudo encontrar el fichero OPML movido."
+
+#: classes/opml.php:594
+msgid "Error while parsing document."
+msgstr "Error mientras se analizaba el documento."
+
+#: classes/article.php:26
+msgid "Article not found."
+msgstr "Artículo no encontrado."
+
+#: classes/article.php:211
+msgid "Tags for this article (separated by commas):"
+msgstr "Etiquetas para este artículo (separadas por comas):"
+
+#: classes/article.php:337
+#: classes/article.php:719
+#: classes/article.php:874
+msgid "no tags"
+msgstr "sin etiquetas"
+
+#: classes/article.php:447
+msgid "unknown type"
+msgstr "tipo desconocido"
+
+#: classes/article.php:524
+msgid "Attachments"
+msgstr "Adjuntos"
+
+#: classes/article.php:688
+msgid " - "
+msgstr " - "
+
+#: classes/article.php:912
+msgid "(edit note)"
+msgstr "(editar nota)"
+
+#: classes/handler/public.php:407
+#: plugins/bookmarklets/init.php:40
+msgid "Share with Tiny Tiny RSS"
+msgstr "Compartir con Tiny Tiny RSS"
+
+#: classes/handler/public.php:415
+msgid "Title:"
+msgstr "Título:"
+
+#: classes/handler/public.php:419
+msgid "Content:"
+msgstr "Contenido:"
+
+#: classes/handler/public.php:421
+msgid "Labels:"
+msgstr "Marcadores:"
+
+#: classes/handler/public.php:440
+msgid "Shared article will appear in the Published feed."
+msgstr "El artículo compartido aparecerá en la fuente Publicados."
+
+#: classes/handler/public.php:442
+msgid "Share"
+msgstr "Compartir"
+
+#: classes/handler/public.php:464
+msgid "Not logged in"
+msgstr "No ha iniciado sesión"
+
+#: classes/handler/public.php:527
+msgid "Incorrect username or password"
+msgstr "Nombre de usuario o contraseña incorrecta"
+
+#: classes/handler/public.php:581
+#, php-format
+msgid "Already subscribed to <b>%s</b>."
+msgstr "Ya está suscrito a <strong>%s</strong>."
+
+#: classes/handler/public.php:584
+#, php-format
+msgid "Subscribed to <b>%s</b>."
+msgstr "Suscrito a <strong>%s</strong>."
+
+#: classes/handler/public.php:587
+#, php-format
+msgid "Could not subscribe to <b>%s</b>."
+msgstr "No se pudo suscribir a <b>%s</b>."
+
+#: classes/handler/public.php:590
+#, php-format
+msgid "No feeds found in <b>%s</b>."
+msgstr "No se han encontrado fuentes en <b>%s</b>."
+
+#: classes/handler/public.php:593
+msgid "Multiple feed URLs found."
+msgstr "Múltiples fuentes encontradas."
+
+#: classes/handler/public.php:597
+#, 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:615
+msgid "Subscribe to selected feed"
+msgstr "Suscribirse a la fuente seleccionada"
+
+#: classes/handler/public.php:642
+msgid "Edit subscription options"
+msgstr "Editar las opciones de suscripción"
+
+#: classes/handler/public.php:680
+msgid "Password recovery"
+msgstr "Recuperación de contraseña"
+
+#: classes/handler/public.php:725
+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:757
+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:761
+#: classes/handler/public.php:830
+msgid "Go back"
+msgstr "Volver"
+
+#: classes/handler/public.php:799
+msgid "[tt-rss] Password reset request"
+msgstr "[tt-rss] Petición de cambio de contraseña"
+
+#: 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: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:874
+msgid "Database Updater"
+msgstr "Actualizador de la base de datos"
+
+#: classes/handler/public.php:939
+msgid "Perform updates"
+msgstr "Actualizar"
+
+#: plugins/af_zz_imgproxy/init.php:208
+msgid "Image proxy settings (af_zz_imgproxy)"
 msgstr ""
 
-#: classes/feeds.php:1114
-msgid "Used for word stemming"
-msgstr ""
+#: plugins/af_zz_imgproxy/init.php:232
+#, fuzzy
+msgid "Enable proxy for all remote images."
+msgstr "Actualizar todas las fuentes"
 
-#: classes/feeds.php:1123
-msgid "Search syntax"
-msgstr "Sintaxis de búsqueda"
+#: plugins/af_zz_imgproxy/init.php:236
+#, fuzzy
+msgid "Don't cache files locally."
+msgstr "Guardar las imágenes en la memoria caché local"
 
-#: classes/feeds.php:1577
-msgid "Starred articles"
-msgstr "Favoritos"
-
-#: classes/feeds.php:1579
-msgid "Published articles"
-msgstr "Publicados"
-
-#: classes/feeds.php:1581
-msgid "Fresh articles"
-msgstr "Recientes"
-
-#: classes/feeds.php:1585
-msgid "Archived articles"
-msgstr "Artículos archivados"
-
-#: classes/feeds.php:1587
-msgid "Recently read"
-msgstr "Leídos recientemente"
-
-#: classes/feeds.php:1708
-msgid "Special"
-msgstr "Especial"
-
-#: classes/feeds.php:1965
-#, php-format
-msgid "Search results: %s"
-msgstr "Resultados de búsqueda: %s"
-
-#: 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."
+#: plugins/af_zz_imgproxy/init.php:252
+#: plugins/af_redditimgur/init.php:79
+#, fuzzy
+msgid "Configuration saved"
 msgstr "Configuración guardada."
 
-#: plugins/note/init.php:28
-#: plugins/note/note.js:11
-msgid "Edit article note"
-msgstr "Editar nota del artículo"
-
 #: plugins/vf_shared/init.php:17
 #: plugins/vf_shared/init.php:73
 msgid "Shared articles"
 msgstr "Artículos compartidos"
 
-#: plugins/auth_internal/init.php:67
-msgid "Please enter your one time password:"
-msgstr "Por favor, introduzca su contraseña de un solo uso:"
+#: plugins/bookmarklets/init.php:20
+msgid "Bookmarklets"
+msgstr "Bookmarklets"
 
-#: plugins/auth_internal/init.php:208
-msgid "Password has been changed."
-msgstr "La contraseña ha sido cambiada."
+#: 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 "Arrastre el siguiente enlace a la barra de herramientas de su navegador. Cuando esté interesado en suscribirse a una fuente, ábrala con el navegador y pulse el enlace para suscribirse."
 
-#: plugins/auth_internal/init.php:210
-msgid "Old password is incorrect."
-msgstr "La contraseña antigua es incorrecta."
+#: plugins/bookmarklets/init.php:26
+#, php-format
+msgid "Subscribe to %s in Tiny Tiny RSS?"
+msgstr "¿Suscribirse a %s con Tiny Tiny RSS?"
 
-#: plugins/af_readability/init.php:25
-msgid "Data saved."
-msgstr ""
+#: plugins/bookmarklets/init.php:31
+msgid "Subscribe in Tiny Tiny RSS"
+msgstr "Suscribirse con Tiny Tiny RSS"
 
-#: plugins/af_readability/init.php:41
-#, fuzzy
-msgid "Inline content"
-msgstr "Desplazar el contenido del artículo"
-
-#: plugins/af_readability/init.php:47
-msgid "Readability settings (af_readability)"
-msgstr ""
-
-#: plugins/af_readability/init.php:78
-msgid "Use Readability for pages shared via bookmarklet."
-msgstr ""
-
-#: plugins/af_readability/init.php:90
-#: plugins/af_psql_trgm/init.php:198
-msgid "Currently enabled for (click to edit):"
-msgstr ""
-
-#: plugins/af_readability/init.php:107
-#, fuzzy
-msgid "Readability"
-msgstr "Comprobar la disponibilidad"
-
-#: plugins/af_readability/init.php:118
-#, fuzzy
-msgid "Inline article content"
-msgstr "Desplazar el contenido del artículo"
+#: plugins/bookmarklets/init.php:34
+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_redditimgur/init.php:30
 msgid "Reddit content settings (af_redditimgur)"
@@ -2504,11 +2472,21 @@ msgstr ""
 msgid "Enable additional duplicate checking"
 msgstr ""
 
-#: plugins/af_redditimgur/init.php:79
-#: plugins/af_zz_imgproxy/init.php:252
-#, fuzzy
-msgid "Configuration saved"
-msgstr "Configuración guardada."
+#: plugins/af_comics/init.php:49
+msgid "Feeds supported by af_comics"
+msgstr "Fuentes soportadas por af_comics"
+
+#: plugins/af_comics/init.php:51
+msgid "The following comics are currently supported:"
+msgstr "Actualmente están soportados los siguientes cómics:"
+
+#: plugins/af_comics/init.php:69
+msgid "To subscribe to GoComics use the comic's regular web page as the feed URL (e.g. for the <em>Garfield</em> comic use <code>http://www.gocomics.com/garfield</code>)."
+msgstr ""
+
+#: plugins/af_comics/init.php:71
+msgid "Drop any updated filters into <code>filters.local</code> in plugin directory."
+msgstr ""
 
 #: plugins/af_psql_trgm/init.php:29
 #, php-format
@@ -2548,26 +2526,87 @@ msgstr ""
 msgid "Enable for all feeds:"
 msgstr "Actualizar todas las fuentes"
 
+#: plugins/af_psql_trgm/init.php:198
+#: plugins/af_readability/init.php:90
+msgid "Currently enabled for (click to edit):"
+msgstr ""
+
 #: plugins/af_psql_trgm/init.php:216
 msgid "Similarity (pg_trgm)"
 msgstr ""
 
-#: plugins/af_comics/init.php:49
-msgid "Feeds supported by af_comics"
-msgstr "Fuentes soportadas por af_comics"
-
-#: plugins/af_comics/init.php:51
-msgid "The following comics are currently supported:"
-msgstr "Actualmente están soportados los siguientes cómics:"
-
-#: plugins/af_comics/init.php:69
-msgid "To subscribe to GoComics use the comic's regular web page as the feed URL (e.g. for the <em>Garfield</em> comic use <code>http://www.gocomics.com/garfield</code>)."
+#: plugins/af_readability/init.php:25
+msgid "Data saved."
 msgstr ""
 
-#: plugins/af_comics/init.php:71
-msgid "Drop any updated filters into <code>filters.local</code> in plugin directory."
+#: plugins/af_readability/init.php:41
+#, fuzzy
+msgid "Inline content"
+msgstr "Desplazar el contenido del artículo"
+
+#: plugins/af_readability/init.php:47
+msgid "Readability settings (af_readability)"
 msgstr ""
 
+#: plugins/af_readability/init.php:78
+msgid "Use Readability for pages shared via bookmarklet."
+msgstr ""
+
+#: plugins/af_readability/init.php:107
+#, fuzzy
+msgid "Readability"
+msgstr "Comprobar la disponibilidad"
+
+#: plugins/af_readability/init.php:118
+#, fuzzy
+msgid "Inline article content"
+msgstr "Desplazar el contenido del artículo"
+
+#: plugins/mailto/init.php:50
+#: plugins/mailto/init.php:58
+#: plugins/mail/init.php:118
+#: plugins/mail/init.php:124
+msgid "[Forwarded]"
+msgstr "[Reenviado]"
+
+#: plugins/mailto/init.php:50
+#: plugins/mail/init.php:118
+msgid "Multiple articles"
+msgstr "Múltiples artículos"
+
+#: plugins/mailto/init.php:74
+msgid "Clicking the following link to invoke your mail client:"
+msgstr "Hacer click en el enlace siguiente invocará su aplicación de correo:"
+
+#: plugins/mailto/init.php:78
+msgid "Forward selected article(s) by email."
+msgstr "Enviar artículo por correo"
+
+#: plugins/mailto/init.php:81
+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/mailto/init.php:86
+msgid "Close this dialog"
+msgstr "Cerrar este diálogo"
+
+#: 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/import_export/init.php:53
 msgid "Import and export"
 msgstr "Importar y exportar"
@@ -2634,102 +2673,6 @@ msgstr "La subida falló con el código de error %d"
 msgid "No file uploaded."
 msgstr "No se ha cargado ningún archivo."
 
-#: plugins/mail/init.php:29
-msgid "Mail addresses saved."
-msgstr ""
-
-#: plugins/mail/init.php:35
-#, fuzzy
-msgid "Mail plugin"
-msgstr "Plugins de usuario"
-
-#: plugins/mail/init.php:37
-msgid "You can set predefined email addressed here (comma-separated list):"
-msgstr ""
-
-#: plugins/mail/init.php:118
-#: plugins/mail/init.php:124
-#: plugins/mailto/init.php:50
-#: plugins/mailto/init.php:58
-msgid "[Forwarded]"
-msgstr "[Reenviado]"
-
-#: plugins/mail/init.php:118
-#: plugins/mailto/init.php:50
-msgid "Multiple articles"
-msgstr "Múltiples artículos"
-
-#: plugins/mail/init.php:146
-msgid "To:"
-msgstr "Para:"
-
-#: plugins/mail/init.php:161
-msgid "Subject:"
-msgstr "Asunto:"
-
-#: plugins/mail/init.php:178
-msgid "Send e-mail"
-msgstr "Enviar correo electrónico"
-
-#: plugins/close_button/init.php:25
-msgid "Close article"
-msgstr "Cerrar artículo"
-
-#: plugins/bookmarklets/init.php:20
-msgid "Bookmarklets"
-msgstr "Bookmarklets"
-
-#: plugins/bookmarklets/init.php:22
-msgid "Drag the link below to your browser toolbar, open the feed you're interested in in your browser and click on the link to subscribe to it."
-msgstr "Arrastre el siguiente enlace a la barra de herramientas de su navegador. Cuando esté interesado en suscribirse a una fuente, ábrala con el navegador y pulse el enlace para suscribirse."
-
-#: plugins/bookmarklets/init.php:26
-#, php-format
-msgid "Subscribe to %s in Tiny Tiny RSS?"
-msgstr "¿Suscribirse a %s con Tiny Tiny RSS?"
-
-#: plugins/bookmarklets/init.php:31
-msgid "Subscribe in Tiny Tiny RSS"
-msgstr "Suscribirse con Tiny Tiny RSS"
-
-#: plugins/bookmarklets/init.php:34
-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/toggle_sidebar/init.php:23
-msgid "Collapse feedlist"
-msgstr "Colapsar la lista de fuentes"
-
-#: plugins/af_zz_imgproxy/init.php:208
-msgid "Image proxy settings (af_zz_imgproxy)"
-msgstr ""
-
-#: plugins/af_zz_imgproxy/init.php:232
-#, fuzzy
-msgid "Enable proxy for all remote images."
-msgstr "Actualizar todas las fuentes"
-
-#: plugins/af_zz_imgproxy/init.php:236
-#, fuzzy
-msgid "Don't cache files locally."
-msgstr "Guardar las imágenes en la memoria caché local"
-
-#: plugins/mailto/init.php:74
-msgid "Clicking the following link to invoke your mail client:"
-msgstr "Hacer click en el enlace siguiente invocará su aplicación de correo:"
-
-#: plugins/mailto/init.php:78
-msgid "Forward selected article(s) by email."
-msgstr "Enviar artículo por correo"
-
-#: plugins/mailto/init.php:81
-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/mailto/init.php:86
-msgid "Close this dialog"
-msgstr "Cerrar este diálogo"
-
 #: plugins/share/init.php:41
 msgid "You can disable all articles shared by unique URLs here."
 msgstr "Aquí puede desactivar todos los artículos compartidos mediante URLs únicas."
@@ -2750,452 +2693,602 @@ msgstr "Puede compartir este artículo con la siguiente URL única:"
 msgid "Unshare article"
 msgstr "Dejar de compartir el artículo"
 
-#: js/FeedTree.js:75
+#: plugins/toggle_sidebar/init.php:23
+msgid "Collapse feedlist"
+msgstr "Colapsar la lista de fuentes"
+
+#: plugins/close_button/init.php:25
+msgid "Close article"
+msgstr "Cerrar artículo"
+
+#: plugins/mail/init.php:29
+msgid "Mail addresses saved."
+msgstr ""
+
+#: plugins/mail/init.php:35
+#, fuzzy
+msgid "Mail plugin"
+msgstr "Plugins de usuario"
+
+#: plugins/mail/init.php:37
+msgid "You can set predefined email addressed here (comma-separated list):"
+msgstr ""
+
+#: plugins/mail/init.php:146
+msgid "To:"
+msgstr "Para:"
+
+#: plugins/mail/init.php:161
+msgid "Subject:"
+msgstr "Asunto:"
+
+#: plugins/mail/init.php:178
+msgid "Send e-mail"
+msgstr "Enviar correo electrónico"
+
+#: plugins/note/init.php:28
+#: plugins/note/note.js:11
+msgid "Edit article note"
+msgstr "Editar nota del artículo"
+
+#: plugins/auth_internal/init.php:67
+msgid "Please enter your one time password:"
+msgstr "Por favor, introduzca su contraseña de un solo uso:"
+
+#: plugins/auth_internal/init.php:208
+msgid "Password has been changed."
+msgstr "La contraseña ha sido cambiada."
+
+#: plugins/auth_internal/init.php:210
+msgid "Old password is incorrect."
+msgstr "La contraseña antigua es incorrecta."
+
+#: js/FeedTree.js:76
 #, fuzzy
 msgid "(Un)collapse"
 msgstr "Mostrar/ocultar la barra lateral"
 
-#: js/PrefFeedTree.js:35
+#: js/PrefFeedTree.js:36
 msgid "Edit category"
 msgstr "Editar categoría"
 
-#: js/PrefFeedTree.js:42
+#: js/PrefFeedTree.js:43
 msgid "Remove category"
 msgstr "Borrar categoría"
 
-#: js/PrefFilterTree.js:46
+#: js/PrefFilterTree.js:47
 msgid "Inverse"
 msgstr "Inverso"
 
-#: js/feedlist.js:511
+#: js/feedlist.js:461
 #, 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:514
+#: js/feedlist.js:464
 #, 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:517
+#: js/feedlist.js:467
 #, 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:520
+#: js/feedlist.js:470
 #, fuzzy
 msgid "Mark %w in %s as read?"
 msgstr "¿Marcar todos los artículos de %s como leídos?"
 
-#: js/feedlist.js:523
+#: js/feedlist.js:473
 #, fuzzy
 msgid "search results"
 msgstr "Resultados de búsqueda: %s"
 
-#: js/feedlist.js:523
+#: js/feedlist.js:473
 #, fuzzy
 msgid "all articles"
 msgstr "Todos"
 
-#: js/functions.js:74
+#: js/functions.js:100
 #, fuzzy
 msgid "Close"
 msgstr "cerrar"
 
-#: js/functions.js:141
+#: js/functions.js:167
 msgid "Click to close"
 msgstr "Clic para cerrar"
 
-#: js/functions.js:448
+#: js/functions.js:456
 msgid "Error explained"
 msgstr "Error explicado"
 
-#: js/functions.js:592
+#: js/functions.js:490
+msgid "Upload complete."
+msgstr "Subida completa."
+
+#: js/functions.js:508
+msgid "Remove stored feed icon?"
+msgstr "¿Borrar el icono de la fuente?"
+
+#: js/functions.js:510
+msgid "Removing feed icon..."
+msgstr "Borrando el icono de la fuente..."
+
+#: js/functions.js:515
+msgid "Feed icon removed."
+msgstr "Icono de la fuente borrado."
+
+#: js/functions.js:532
+msgid "Please select an image file to upload."
+msgstr "Seleccione un archivo de imagen para cargar."
+
+#: js/functions.js:533
+msgid "Upload new icon for this feed?"
+msgstr "¿Cargar un nuevo icono para esta fuente?"
+
+#: js/functions.js:534
+msgid "Uploading, please wait..."
+msgstr "Cargando. Por favor, espere..."
+
+#: js/functions.js:542
+msgid "Please enter label caption:"
+msgstr "Por favor, introduzca el nombre del marcador:"
+
+#: js/functions.js:575
 msgid "Subscribe to Feed"
 msgstr "Suscribirse a fuente"
 
-#: js/functions.js:621
+#: js/functions.js:602
 msgid "Failed to parse output. This can indicate server timeout and/or network issues. Backend output was logged to browser console."
 msgstr ""
 
-#: js/functions.js:636
+#: js/functions.js:617
 #, perl-format
 msgid "Subscribed to %s"
 msgstr "Se ha suscrito a %s"
 
-#: js/functions.js:641
+#: js/functions.js:622
 msgid "Specified URL seems to be invalid."
 msgstr "La URL especificada parece ser inválida."
 
-#: js/functions.js:644
+#: js/functions.js:625
 msgid "Specified URL doesn't seem to contain any feeds."
 msgstr "La URL especificada no parece contener fuentes."
 
-#: js/functions.js:656
+#: js/functions.js:637
 msgid "Expand to select feed"
 msgstr "Expandir para seleccionar fuente"
 
-#: js/functions.js:668
+#: js/functions.js:649
 #, perl-format
 msgid "Couldn't download the specified URL: %s"
 msgstr "No se pudo cargar la URL especificada: %s"
 
-#: js/functions.js:672
+#: js/functions.js:653
 #, perl-format
 msgid "XML validation failed: %s"
 msgstr "Fallo de validación de XML: %s"
 
-#: js/functions.js:676
+#: js/functions.js:657
 msgid "You are already subscribed to this feed."
 msgstr "Ya está suscrito a esta fuente."
 
-#: js/functions.js:1136
+#: js/functions.js:1098
 msgid "Generate new syndication address for this feed?"
 msgstr "¿Generar nueva dirección de sindicación para esta fuente?"
 
-#: js/functions.js:1140
-#: js/prefs.js:1095
+#: js/functions.js:1100
+#: js/prefs.js:870
 msgid "Trying to change address..."
 msgstr "Intentando cambiar la dirección..."
 
-#: js/functions.js:1245
-#: js/tt-rss.js:446
-#: js/tt-rss.js:673
+#: js/functions.js:1199
+#: js/tt-rss.js:399
+#: js/tt-rss.js:612
 msgid "You can't edit this kind of feed."
 msgstr "No puede editar esta clase de fuente."
 
-#: js/functions.js:1260
+#: js/functions.js:1213
 msgid "Edit Feed"
 msgstr "Editar fuente"
 
-#: js/functions.js:1266
-#: js/prefs.js:100
-#: js/prefs.js:209
-#: js/prefs.js:647
+#: js/functions.js:1217
+#: js/prefs.js:176
+#: js/prefs.js:523
+#: js/prefs.js:1139
+#: js/prefs.js:78
 msgid "Saving data..."
 msgstr "Guardando datos..."
 
-#: js/functions.js:1293
+#: js/functions.js:1243
 msgid "More Feeds"
 msgstr "Más fuentes"
 
-#: js/functions.js:1355
-#: js/functions.js:1464
-#: js/prefs.js:398
-#: js/prefs.js:540
-#: js/prefs.js:558
-#: js/prefs.js:1077
+#: js/functions.js:1297
+#: js/functions.js:1383
+#: js/prefs.js:332
+#: js/prefs.js:455
+#: js/prefs.js:473
+#: js/prefs.js:855
 msgid "No feeds are selected."
 msgstr "No se han seleccionado fuentes."
 
-#: js/functions.js:1398
+#: js/functions.js:1329
 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:1435
+#: js/functions.js:1360
 msgid "Feeds with update errors"
 msgstr "Fuentes con errores de actualización"
 
-#: js/functions.js:1446
-#: js/prefs.js:1058
+#: js/functions.js:1369
+#: js/prefs.js:841
 msgid "Remove selected feeds?"
 msgstr "¿Borrar fuentes seleccionadas?"
 
-#: js/functions.js:1449
-#: js/prefs.js:1061
+#: js/functions.js:1370
+#: js/prefs.js:842
 msgid "Removing selected feeds..."
 msgstr "Borrando fuentes seleccionadas..."
 
-#: js/prefs.js:60
-msgid "Please enter login:"
-msgstr "Por favor, introduzca el nombre de usuario:"
-
-#: js/prefs.js:67
-msgid "Can't create user: no login specified."
-msgstr "No se puede crear el usuario: no se ha especificado el nombre de usuario."
-
-#: js/prefs.js:71
-msgid "Adding user..."
-msgstr "Añadiendo usuario..."
-
-#: js/prefs.js:96
-msgid "User Editor"
-msgstr "Editor de usuario"
-
-#: js/prefs.js:131
-msgid "Edit Filter"
-msgstr "Editar filtro"
-
-#: js/prefs.js:170
+#: js/prefs.js:143
 msgid "Remove filter?"
 msgstr "¿Borrar el filtro?"
 
-#: js/prefs.js:175
+#: js/prefs.js:148
 msgid "Removing filter..."
 msgstr "Eliminando el filtro..."
 
-#: js/prefs.js:292
+#: js/prefs.js:251
 msgid "Remove selected labels?"
 msgstr "¿Borrar los marcadores seleccionados?"
 
-#: js/prefs.js:295
+#: js/prefs.js:252
 msgid "Removing selected labels..."
 msgstr "Eliminando las etiquetas seleccionadas..."
 
-#: js/prefs.js:308
-#: js/prefs.js:1144
+#: js/prefs.js:262
+#: js/prefs.js:909
 msgid "No labels are selected."
 msgstr "No se han seleccionado marcadores."
 
-#: js/prefs.js:320
+#: js/prefs.js:274
 msgid "Remove selected users? Neither default admin nor your account will be removed."
 msgstr "¿Borrar los usuarios seleccionados? Su cuenta y la cuenta del administrador por defecto no serán borradas."
 
-#: js/prefs.js:323
+#: js/prefs.js:275
 msgid "Removing selected users..."
 msgstr "Eliminando los usuarios seleccionados..."
 
-#: js/prefs.js:338
-#: js/prefs.js:408
-#: js/prefs.js:427
-#: js/prefs.js:461
+#: js/prefs.js:286
+#: js/prefs.js:342
+#: js/prefs.js:361
+#: js/prefs.js:387
 msgid "No users are selected."
 msgstr "No se han seleccionado usuarios."
 
-#: js/prefs.js:350
+#: js/prefs.js:297
 msgid "Remove selected filters?"
 msgstr "¿Eliminar los filtros seleccionados?"
 
-#: js/prefs.js:353
+#: js/prefs.js:298
 msgid "Removing selected filters..."
 msgstr "Eliminando los filtros seleccionados..."
 
-#: js/prefs.js:366
-#: js/prefs.js:495
-#: js/prefs.js:514
+#: js/prefs.js:308
+#: js/prefs.js:419
+#: js/prefs.js:438
 msgid "No filters are selected."
 msgstr "No se han seleccionado filtros."
 
-#: js/prefs.js:378
+#: js/prefs.js:319
 msgid "Unsubscribe from selected feeds?"
 msgstr "¿Cancelar la suscripción a las fuentes seleccionadas?"
 
-#: js/prefs.js:382
+#: js/prefs.js:321
 msgid "Unsubscribing from selected feeds..."
 msgstr "Cancelando la suscripción a las fuentes seleccionadas..."
 
-#: js/prefs.js:413
-#: js/prefs.js:432
-#: js/prefs.js:466
+#: js/prefs.js:347
+#: js/prefs.js:366
+#: js/prefs.js:392
 msgid "Please select only one user."
 msgstr "Por favor, seleccione un solo usuario."
 
-#: js/prefs.js:436
+#: js/prefs.js:370
 msgid "Reset password of selected user?"
 msgstr "¿Restaurar la contraseña del usuario seleccionado?"
 
-#: js/prefs.js:439
+#: js/prefs.js:371
 msgid "Resetting password for selected user..."
 msgstr "Reajustando la contraseña del usuario seleccionado..."
 
-#: js/prefs.js:500
+#: js/prefs.js:424
 msgid "Please select only one filter."
 msgstr "Por favor, seleccione un solo filtro."
 
-#: js/prefs.js:518
+#: js/prefs.js:442
 msgid "Combine selected filters?"
 msgstr "¿Combinar los filtros seleccionados?"
 
-#: js/prefs.js:521
+#: js/prefs.js:443
 msgid "Joining filters..."
 msgstr "Uniendo filtros..."
 
-#: js/prefs.js:580
+#: js/prefs.js:487
 msgid "Edit Multiple Feeds"
 msgstr "Editar múltiples fuentes"
 
-#: js/prefs.js:604
+#: js/prefs.js:511
 msgid "Save changes to selected feeds?"
 msgstr "¿Guardar los cambios de las fuentes seleccionadas?"
 
-#: js/prefs.js:681
+#: js/prefs.js:552
 msgid "OPML Import"
 msgstr "Importar OPML"
 
-#: js/prefs.js:700
+#: js/prefs.js:571
 msgid "Please choose an OPML file first."
 msgstr "Por favor, seleccione un archivo OPML."
 
-#: js/prefs.js:703
+#: js/prefs.js:574
 #: plugins/import_export/import_export.js:115
 msgid "Importing, please wait..."
 msgstr "Importando, espere por favor..."
 
-#: js/prefs.js:869
+#: js/prefs.js:737
 msgid "Reset to defaults?"
 msgstr "¿Restaurar las opciones por defecto?"
 
-#: js/prefs.js:1468
-msgid "Subscribing to feeds..."
-msgstr "Suscribiéndose a las fuentes..."
+#: js/prefs.js:777
+#, perl-format
+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:1487
-msgid "Clear stored data for this plugin?"
-msgstr "¿Borrar los datos guardados por este plugin?"
+#: js/prefs.js:778
+msgid "Removing category..."
+msgstr "Borrando categoría..."
 
-#: js/prefs.js:1501
-msgid "Clear all messages in the error log?"
-msgstr "¿Borrar todos los mensajes del registro de errores?"
+#: js/prefs.js:794
+msgid "Remove selected categories?"
+msgstr "¿Eliminar las categorías seleccionadas?"
 
-#: js/tt-rss.js:118
+#: js/prefs.js:795
+msgid "Removing selected categories..."
+msgstr "Eliminando las categorías seleccionadas..."
+
+#: js/prefs.js:805
+msgid "No categories are selected."
+msgstr "No se han seleccionado categorías."
+
+#: js/prefs.js:812
+msgid "Category title:"
+msgstr "Nombre de la categoría:"
+
+#: js/prefs.js:815
+msgid "Creating category..."
+msgstr "Creando categoría..."
+
+#: js/prefs.js:832
+msgid "Feeds without recent updates"
+msgstr "Fuentes sin actualizaciones recientes"
+
+#: js/prefs.js:869
+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:898
+msgid "Reset selected labels to default colors?"
+msgstr "¿Restaurar color por defecto en los marcadores seleccionados?"
+
+#: js/prefs.js:926
+msgid "Settings Profiles"
+msgstr "Perfiles de preferencias"
+
+#: js/prefs.js:935
+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:936
+msgid "Removing selected profiles..."
+msgstr "Borrando los perfiles seleccionados..."
+
+#: js/prefs.js:948
+msgid "No profiles are selected."
+msgstr "No se ha seleccionado ningún perfil."
+
+#: js/prefs.js:955
+#: js/prefs.js:997
+msgid "Activate selected profile?"
+msgstr "¿Activar el perfil seleccionado?"
+
+#: js/prefs.js:964
+#: js/prefs.js:1008
+msgid "Please choose a profile to activate."
+msgstr "Seleccione un perfil para activar."
+
+#: js/prefs.js:969
+msgid "Creating profile..."
+msgstr "Creando perfil..."
+
+#: js/prefs.js:1016
+msgid "This will invalidate all previously generated feed URLs. Continue?"
+msgstr "Se invalidarán todas las URLs generadas previamente. ¿Continuar?"
+
+#: js/prefs.js:1017
+#: plugins/share/share_prefs.js:3
+msgid "Clearing URLs..."
+msgstr "Limpiando URLs..."
+
+#: js/prefs.js:1020
+msgid "Generated URLs cleared."
+msgstr "Borrar todas las URLs generadas"
+
+#: js/prefs.js:1053
+#, fuzzy
+msgid "Rename category to:"
+msgstr "Borrar categoría"
+
+#: js/prefs.js:1074
+msgid "Label Editor"
+msgstr "Editor de marcadores"
+
+#: js/tt-rss.js:111
 msgid "Mark all articles as read?"
 msgstr "¿Marcar todos los artículos como leídos?"
 
-#: js/tt-rss.js:124
+#: js/tt-rss.js:115
 msgid "Marking all feeds as read..."
 msgstr "Marcando todas las fuentes como leídas..."
 
-#: js/tt-rss.js:398
+#: js/tt-rss.js:351
 msgid "Please enable mail plugin first."
 msgstr "Por favor, habilite primero el plugin mail."
 
-#: js/tt-rss.js:527
+#: js/tt-rss.js:477
 msgid "Please enable embed_original plugin first."
 msgstr "Por favor, habilite primero el plugin embed_original."
 
-#: js/tt-rss.js:540
-#: js/tt-rss.js:723
+#: js/tt-rss.js:490
+#: js/tt-rss.js:653
 msgid "Widescreen is not available in combined mode."
 msgstr ""
 
-#: js/tt-rss.js:821
-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:826
-#: js/tt-rss.js:686
-msgid "Please select some feed first."
-msgstr "Por favor, seleccione primero alguna fuente."
-
-#: js/tt-rss.js:831
-#, perl-format
-msgid "Rescore articles in %s?"
-msgstr "¿Reiniciar la puntuación de los artículos de %s?"
-
-#: js/tt-rss.js:834
-msgid "Rescoring articles..."
-msgstr "Reiniciando la puntuación de los artículos..."
-
-#: js/viewfeed.js:917
-#: js/viewfeed.js:955
-#: js/viewfeed.js:1003
-#: js/viewfeed.js:1924
-#: plugins/mail/mail.js:7
+#: js/viewfeed.js:444
+#: js/viewfeed.js:461
+#: js/viewfeed.js:484
+#: js/viewfeed.js:521
+#: js/viewfeed.js:542
+#: js/viewfeed.js:651
+#: js/viewfeed.js:685
+#: js/viewfeed.js:727
+#: js/viewfeed.js:1564
 #: plugins/mailto/init.js:7
-#: js/viewfeed.js:675
-#: js/viewfeed.js:697
-#: js/viewfeed.js:718
-#: js/viewfeed.js:777
-#: js/viewfeed.js:805
+#: plugins/mail/mail.js:7
 msgid "No articles are selected."
 msgstr "No se han seleccionado artículos."
 
-#: js/viewfeed.js:925
+#: js/viewfeed.js:659
 #, 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:927
+#: js/viewfeed.js:661
 #, 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:964
+#: js/viewfeed.js:694
 #, 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:967
+#: js/viewfeed.js:697
 #, 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:969
+#: js/viewfeed.js:698
 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:1009
+#: js/viewfeed.js:733
 #, 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:1029
+#: js/viewfeed.js:753
 msgid "Edit article Tags"
 msgstr "Editar las etiquetas del artículo"
 
-#: js/viewfeed.js:1035
+#: js/viewfeed.js:757
 msgid "Saving article tags..."
 msgstr "Guardando las etiquetas del artículo..."
 
-#: js/viewfeed.js:1666
+#: js/viewfeed.js:1015
+msgid "No article is selected."
+msgstr "No se ha seleccionado ningún artículo."
+
+#: js/viewfeed.js:1050
+msgid "No articles found to mark"
+msgstr "No se han encontrado artículos que marcar"
+
+#: js/viewfeed.js:1052
+#, perl-format
+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?"
+
+#: js/viewfeed.js:1312
 msgid "Open original article"
 msgstr "Abrir artículo original"
 
-#: js/viewfeed.js:1673
+#: js/viewfeed.js:1319
 msgid "Display article URL"
 msgstr "Mostrar la URL del artículo"
 
-#: js/viewfeed.js:1780
+#: js/viewfeed.js:1426
 msgid "Assign label"
 msgstr "Asignar marcador"
 
-#: js/viewfeed.js:1785
+#: js/viewfeed.js:1431
 msgid "Remove label"
 msgstr "Borrar marcador"
 
-#: js/viewfeed.js:1817
+#: js/viewfeed.js:1463
 msgid "Select articles in group"
 msgstr "Seleccionar los artículos del grupo"
 
-#: js/viewfeed.js:1827
+#: js/viewfeed.js:1473
 msgid "Mark group as read"
 msgstr "Marcar grupo como leído"
 
-#: js/viewfeed.js:1839
+#: js/viewfeed.js:1485
 msgid "Mark feed as read"
 msgstr "Marcar fuente como leída"
 
-#: js/viewfeed.js:1892
+#: js/viewfeed.js:1538
 msgid "Please enter new score for selected articles:"
 msgstr "Por favor, introduzca puntuación para los artículos seleccionados:"
 
-#: js/viewfeed.js:1955
+#: js/viewfeed.js:1571
 msgid "Please enter new score for this article:"
 msgstr "Por favor, introduzca puntuación para este artículo:"
 
-#: js/viewfeed.js:1986
+#: js/viewfeed.js:1591
 msgid "Article URL:"
 msgstr "URL del artículo:"
 
-#: plugins/note/note.js:17
-msgid "Saving article note..."
-msgstr "Guardando nota del 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/af_psql_trgm/init.js:11
 #, fuzzy
 msgid "Related articles"
 msgstr "Borrar artículo"
 
+#: plugins/mailto/init.js:21
+#: plugins/mail/mail.js:21
+msgid "Forward article by email"
+msgstr "Enviar artículo por correo"
+
+#: plugins/shorten_expanded/init.js:43
+msgid "Click to expand article"
+msgstr "Desplegar el artículo"
+
 #: plugins/import_export/import_export.js:13
 msgid "Export Data"
 msgstr "Exportar datos"
@@ -3215,261 +3308,172 @@ 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
-msgid "Forward article by email"
-msgstr "Enviar artículo por correo"
+#: plugins/share/share_prefs.js:2
+msgid "This will invalidate all previously shared article URLs. Continue?"
+msgstr "Se invalidarán todas las URLs de artículos compartidos. ¿Continuar?"
 
-#: plugins/mail/mail.js:36
-msgid "Error sending email:"
-msgstr ""
-
-#: plugins/mail/mail.js:38
-#, fuzzy
-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:45
-msgid "Click to expand article"
-msgstr "Desplegar el artículo"
+#: plugins/share/share_prefs.js:8
+msgid "Shared URLs cleared."
+msgstr "Las URLs compartidas han sido borradas."
 
 #: plugins/share/share.js:10
 msgid "Share article by URL"
 msgstr "Compartir artículo mediante URL"
 
-#: plugins/share/share.js:14
+#: plugins/share/share.js:13
 msgid "Generate new share URL for this article?"
 msgstr "¿Generar una nueva URL para compartir este artículo?"
 
-#: plugins/share/share.js:18
+#: plugins/share/share.js:15
 msgid "Trying to change URL..."
 msgstr "Intentando cambiar la URL..."
 
-#: plugins/share/share.js:55
+#: plugins/share/share.js:48
 msgid "Remove sharing for this article?"
 msgstr "¿No compartir este artículo?"
 
-#: plugins/share/share.js:59
+#: plugins/share/share.js:50
 msgid "Trying to unshare..."
 msgstr "Intentando dejar de compartir..."
 
-#: plugins/share/share_prefs.js:3
-msgid "This will invalidate all previously shared article URLs. Continue?"
-msgstr "Se invalidarán todas las URLs de artículos compartidos. ¿Continuar?"
+#: plugins/mail/mail.js:30
+msgid "Error sending email:"
+msgstr ""
 
-#: plugins/share/share_prefs.js:6
-#: js/prefs.js:1277
-msgid "Clearing URLs..."
-msgstr "Limpiando URLs..."
+#: plugins/mail/mail.js:32
+#, fuzzy
+msgid "Your message has been sent."
+msgstr "Sus datos personales han sido guardados."
 
-#: plugins/share/share_prefs.js:13
-msgid "Shared URLs cleared."
-msgstr "Las URLs compartidas han sido borradas."
+#: plugins/note/note.js:15
+msgid "Saving article note..."
+msgstr "Guardando nota del artículo..."
 
-#: js/feedlist.js:204
+#: js/feedlist.js:168
 #, fuzzy
 msgid "Your password is at default value"
 msgstr "Su contraseña tiene el valor por defecto. Por favor, modifíquela."
 
-#: js/feedlist.js:453
+#: js/feedlist.js:413
 msgid "Mark all articles in %s as read?"
 msgstr "¿Marcar todos los artículos de %s como leídos?"
 
-#: js/functions.js:494
-msgid "Upload complete."
-msgstr "Subida completa."
-
-#: js/functions.js:511
-msgid "Remove stored feed icon?"
-msgstr "¿Borrar el icono de la fuente?"
-
-#: js/functions.js:516
-msgid "Removing feed icon..."
-msgstr "Borrando el icono de la fuente..."
-
-#: js/functions.js:521
-msgid "Feed icon removed."
-msgstr "Icono de la fuente borrado."
-
-#: js/functions.js:537
-msgid "Please select an image file to upload."
-msgstr "Seleccione un archivo de imagen para cargar."
-
-#: js/functions.js:539
-msgid "Upload new icon for this feed?"
-msgstr "¿Cargar un nuevo icono para esta fuente?"
-
-#: js/functions.js:540
-msgid "Uploading, please wait..."
-msgstr "Cargando. Por favor, espere..."
-
-#: js/functions.js:550
-msgid "Please enter label caption:"
-msgstr "Por favor, introduzca el nombre del marcador:"
-
-#: js/functions.js:555
-msgid "Can't create label: missing caption."
-msgstr "No se puede crear el marcador: falta nombre."
-
-#: js/functions.js:797
+#: js/functions.js:764
 msgid "Edit rule"
 msgstr "Editar regla"
 
-#: js/functions.js:819
+#: js/functions.js:786
 msgid "Edit action"
 msgstr "Editar acción"
 
-#: js/functions.js:860
+#: js/functions.js:825
 msgid "Looking for articles (%d processed, %f found)..."
 msgstr ""
 
-#: js/functions.js:890
+#: js/functions.js:855
 #, fuzzy
 msgid "Found %d articles matching this filter:"
 msgstr "Artículos coincidentes con este filtro:"
 
-#: js/functions.js:942
+#: js/functions.js:907
 msgid "Create Filter"
 msgstr "Crear filtro"
 
-#: js/functions.js:1060
-#: js/tt-rss.js:692
+#: js/functions.js:1016
+#: js/tt-rss.js:631
 msgid "Unsubscribe from %s?"
 msgstr "¿Cancelar la suscripción a %s?"
 
-#: js/functions.js:1063
+#: js/functions.js:1019
 msgid "Removing feed..."
 msgstr "Eliminando la fuente..."
 
-#: js/functions.js:1489
+#: js/functions.js:1410
 msgid "Help"
 msgstr "Ayuda"
 
-#: js/prefs.js:973
-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:44
+msgid "Please enter login:"
+msgstr "Por favor, introduzca el nombre de usuario:"
 
-#: js/prefs.js:979
-msgid "Removing category..."
-msgstr "Borrando categoría..."
+#: js/prefs.js:51
+msgid "Can't create user: no login specified."
+msgstr "No se puede crear el usuario: no se ha especificado el nombre de usuario."
 
-#: js/prefs.js:997
-msgid "Remove selected categories?"
-msgstr "¿Eliminar las categorías seleccionadas?"
+#: js/prefs.js:55
+msgid "Adding user..."
+msgstr "Añadiendo usuario..."
 
-#: js/prefs.js:1000
-msgid "Removing selected categories..."
-msgstr "Eliminando las categorías seleccionadas..."
+#: js/prefs.js:74
+msgid "User Editor"
+msgstr "Editor de usuario"
 
-#: js/prefs.js:1013
-msgid "No categories are selected."
-msgstr "No se han seleccionado categorías."
+#: js/prefs.js:104
+msgid "Edit Filter"
+msgstr "Editar filtro"
 
-#: js/prefs.js:1020
-msgid "Category title:"
-msgstr "Nombre de la categoría:"
+#: js/prefs.js:1175
+msgid "Subscribing to feeds..."
+msgstr "Suscribiéndose a las fuentes..."
 
-#: js/prefs.js:1024
-msgid "Creating category..."
-msgstr "Creando categoría..."
+#: js/prefs.js:1191
+msgid "Clear stored data for this plugin?"
+msgstr "¿Borrar los datos guardados por este plugin?"
 
-#: js/prefs.js:1047
-msgid "Feeds without recent updates"
-msgstr "Fuentes sin actualizaciones recientes"
+#: js/prefs.js:1203
+msgid "Clear all messages in the error log?"
+msgstr "¿Borrar todos los mensajes del registro de errores?"
 
-#: js/prefs.js:1091
-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:1129
-msgid "Reset selected labels to default colors?"
-msgstr "¿Restaurar color por defecto en los marcadores seleccionados?"
-
-#: js/prefs.js:1161
-msgid "Settings Profiles"
-msgstr "Perfiles de preferencias"
-
-#: js/prefs.js:1170
-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:1173
-msgid "Removing selected profiles..."
-msgstr "Borrando los perfiles seleccionados..."
-
-#: js/prefs.js:1189
-msgid "No profiles are selected."
-msgstr "No se ha seleccionado ningún perfil."
-
-#: js/prefs.js:1197
-#: js/prefs.js:1250
-msgid "Activate selected profile?"
-msgstr "¿Activar el perfil seleccionado?"
-
-#: js/prefs.js:1214
-#: js/prefs.js:1266
-msgid "Please choose a profile to activate."
-msgstr "Seleccione un perfil para activar."
-
-#: js/prefs.js:1219
-msgid "Creating profile..."
-msgstr "Creando perfil..."
-
-#: js/prefs.js:1274
-msgid "This will invalidate all previously generated feed URLs. Continue?"
-msgstr "Se invalidarán todas las URLs generadas previamente. ¿Continuar?"
-
-#: js/prefs.js:1284
-msgid "Generated URLs cleared."
-msgstr "Borrar todas las URLs generadas"
-
-#: js/prefs.js:1356
-msgid "Label Editor"
-msgstr "Editor de marcadores"
-
-#: js/tt-rss.js:681
+#: js/tt-rss.js:620
 msgid "You can't unsubscribe from the category."
 msgstr "No puede cancelar la suscripción a la categoría."
 
-#: js/viewfeed.js:127
-#: js/viewfeed.js:177
-#: js/viewfeed.js:194
+#: js/tt-rss.js:625
+msgid "Please select some feed first."
+msgstr "Por favor, seleccione primero alguna fuente."
+
+#: js/viewfeed.js:89
+#: js/viewfeed.js:135
+#: js/viewfeed.js:152
 #, fuzzy
 msgid "Click to open next unread feed."
 msgstr "Pulse para editar fuente"
 
-#: js/viewfeed.js:131
+#: js/viewfeed.js:93
 msgid "Cancel search"
 msgstr "Cancelar búsqueda"
 
-#: js/viewfeed.js:191
+#: js/viewfeed.js:149
 #, fuzzy
 msgid "New articles found, reload feed to continue."
 msgstr "No se han encontrado artículos que mostrar."
 
-#: js/viewfeed.js:620
+#: js/viewfeed.js:405
 msgid "%d article selected"
 msgid_plural "%d articles selected"
 msgstr[0] "%d artículo seleccionado"
 msgstr[1] "%d artículos seleccionados"
 
-#: js/viewfeed.js:1284
-msgid "No article is selected."
-msgstr "No se ha seleccionado ningún artículo."
+#~ msgid "Rescore feed"
+#~ msgstr "Reiniciar la puntuación"
 
-#: js/viewfeed.js:1319
-msgid "No articles found to mark"
-msgstr "No se han encontrado artículos que marcar"
+#~ msgid "Create label..."
+#~ msgstr "Crear marcador..."
 
-#: js/viewfeed.js:1321
-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 "Create filter..."
+#~ msgstr "Crear filtro..."
+
+#~ msgid "You can't rescore this kind of feed."
+#~ msgstr "No puede reiniciar la puntuación de esta clase de fuente."
+
+#~ msgid "Rescore articles in %s?"
+#~ msgstr "¿Reiniciar la puntuación de los artículos de %s?"
+
+#~ msgid "Rescoring articles..."
+#~ msgstr "Reiniciando la puntuación de los artículos..."
+
+#~ msgid "Can't create label: missing caption."
+#~ msgstr "No se puede crear el marcador: falta nombre."
 
 #~ msgid "Firefox integration"
 #~ msgstr "Integración con Firefox"
diff --git a/locale/es_LA/LC_MESSAGES/messages.mo b/locale/es_LA/LC_MESSAGES/messages.mo
index 4faa68355..10c0f4dfd 100644
Binary files a/locale/es_LA/LC_MESSAGES/messages.mo and b/locale/es_LA/LC_MESSAGES/messages.mo differ
diff --git a/locale/es_LA/LC_MESSAGES/messages.po b/locale/es_LA/LC_MESSAGES/messages.po
index 2d7b6523b..6e837f174 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: 2018-10-10 08:24+0300\n"
+"POT-Creation-Date: 2018-12-01 12:59+0300\n"
 "Last-Translator: Brendan <brendan@tucows.com>\n"
 "Language-Team: OpenSRS brendan@tucows.com>\n"
 "Language: es_LA\n"
@@ -89,8 +89,8 @@ msgid "Weekly"
 msgstr "Semanalmente"
 
 #: backend.php:103
-#: classes/pref/users.php:47
 #: classes/pref/system.php:51
+#: classes/pref/users.php:47
 msgid "User"
 msgstr "Usuario"
 
@@ -162,33 +162,33 @@ msgstr "Usuario no encontrado"
 
 #: index.php:151
 #: index.php:167
-#: index.php:285
+#: index.php:282
 #: prefs.php:120
 #: classes/backend.php:5
 #: classes/pref/labels.php:294
-#: classes/pref/feeds.php:1230
 #: classes/pref/filters.php:822
-#: js/feedlist.js:148
-#: js/feedlist.js:491
-#: js/feedlist.js:539
-#: js/functions.js:314
-#: js/functions.js:1336
-#: js/prefs.js:562
-#: js/prefs.js:754
-#: js/prefs.js:1488
-#: js/prefs.js:1503
-#: js/tt-rss.js:547
-#: js/viewfeed.js:1180
+#: classes/pref/feeds.php:1229
+#: js/feedlist.js:118
+#: js/feedlist.js:446
+#: js/feedlist.js:487
+#: js/functions.js:328
+#: js/functions.js:551
+#: js/functions.js:1286
+#: js/prefs.js:477
+#: js/prefs.js:617
+#: js/prefs.js:956
+#: js/prefs.js:1000
+#: js/prefs.js:1028
+#: js/prefs.js:1037
+#: js/prefs.js:1045
+#: js/prefs.js:1057
+#: js/tt-rss.js:497
+#: js/viewfeed.js:509
+#: js/viewfeed.js:928
 #: plugins/import_export/import_export.js:17
-#: js/functions.js:565
-#: js/prefs.js:1200
-#: js/prefs.js:1253
-#: js/prefs.js:1292
-#: js/prefs.js:1305
-#: js/prefs.js:1316
-#: js/prefs.js:1331
-#: js/tt-rss.js:564
-#: js/viewfeed.js:760
+#: js/prefs.js:1192
+#: js/prefs.js:1205
+#: js/tt-rss.js:510
 msgid "Loading, please wait..."
 msgstr "Cargando. Por favor, espere..."
 
@@ -205,13 +205,13 @@ msgid "All Articles"
 msgstr "Todos"
 
 #: index.php:194
-#: include/functions.php:1227
+#: include/functions.php:1172
 #: classes/feeds.php:110
 msgid "Starred"
 msgstr "Favoritos"
 
 #: index.php:195
-#: include/functions.php:1228
+#: include/functions.php:1173
 #: classes/feeds.php:111
 msgid "Published"
 msgstr "Publicados"
@@ -251,11 +251,11 @@ msgid "Title"
 msgstr "Título"
 
 #: index.php:211
-#: index.php:251
-#: include/functions.php:1215
+#: index.php:250
+#: include/functions.php:1160
 #: classes/feeds.php:115
-#: js/FeedTree.js:41
-#: js/FeedTree.js:69
+#: js/FeedTree.js:42
+#: js/FeedTree.js:70
 msgid "Mark as read"
 msgstr "Marcar como leído"
 
@@ -292,7 +292,7 @@ msgid "Feed actions:"
 msgstr "Acciones de la fuente:"
 
 #: index.php:246
-#: classes/handler/public.php:551
+#: classes/handler/public.php:575
 msgid "Subscribe to feed..."
 msgstr "Suscribirse a una fuente..."
 
@@ -301,56 +301,44 @@ msgid "Edit this feed..."
 msgstr "Editar esta fuente..."
 
 #: index.php:248
-msgid "Rescore feed"
-msgstr "Reiniciar la puntuación"
-
-#: index.php:249
-#: classes/pref/feeds.php:770
-#: classes/pref/feeds.php:1203
-#: js/PrefFeedTree.js:61
+#: classes/pref/feeds.php:769
+#: classes/pref/feeds.php:1202
+#: js/PrefFeedTree.js:62
 msgid "Unsubscribe"
 msgstr "Cancelar la suscripción"
 
-#: index.php:250
+#: index.php:249
 msgid "All feeds:"
 msgstr "Todas las fuentes:"
 
-#: index.php:252
+#: index.php:251
 msgid "(Un)hide read feeds"
 msgstr "Ocultar/mostrar fuentes leídas"
 
-#: index.php:253
+#: index.php:252
 msgid "Other actions:"
 msgstr "Otras acciones:"
 
-#: index.php:254
-#: include/functions.php:1201
+#: index.php:253
+#: include/functions.php:1146
 msgid "Toggle widescreen mode"
 msgstr "Alternar modo de pantalla ancha"
 
-#: index.php:255
-msgid "Create label..."
-msgstr "Crear marcador..."
-
-#: index.php:256
-msgid "Create filter..."
-msgstr "Crear filtro..."
-
-#: index.php:257
+#: index.php:254
 msgid "Keyboard shortcuts help"
 msgstr "Ayuda para atajos de teclado"
 
-#: index.php:266
+#: index.php:263
 msgid "Logout"
 msgstr "Cerrar sesión"
 
-#: index.php:272
+#: index.php:269
 msgid "Updates are available from Git."
 msgstr ""
 
 #: prefs.php:33
 #: prefs.php:138
-#: include/functions.php:1230
+#: include/functions.php:1175
 #: classes/pref/prefs.php:425
 msgid "Preferences"
 msgstr "Preferencias"
@@ -365,8 +353,8 @@ msgstr "Salir de las preferencias"
 
 #: prefs.php:141
 #: classes/pref/feeds.php:114
-#: classes/pref/feeds.php:1138
-#: classes/pref/feeds.php:1192
+#: classes/pref/feeds.php:1137
+#: classes/pref/feeds.php:1191
 msgid "Feeds"
 msgstr "Fuentes"
 
@@ -376,8 +364,8 @@ msgid "Filters"
 msgstr "Filtros"
 
 #: prefs.php:147
+#: classes/feeds.php:1696
 #: classes/pref/labels.php:94
-#: classes/feeds.php:1710
 msgid "Labels"
 msgstr "Marcadores"
 
@@ -389,81 +377,81 @@ msgstr "Usuarios"
 msgid "System"
 msgstr "Sistema"
 
-#: register.php:186
+#: register.php:185
 #: include/login_form.php:162
 msgid "Create new account"
 msgstr "Crear nueva cuenta"
 
-#: register.php:192
+#: register.php:191
 msgid "New user registrations are administratively disabled."
 msgstr ""
 
-#: register.php:196
-#: register.php:241
-#: register.php:254
-#: register.php:269
-#: register.php:288
-#: register.php:336
-#: register.php:346
-#: register.php:358
-#: classes/handler/public.php:623
-#: classes/handler/public.php:697
-#: classes/handler/public.php:798
-#: classes/handler/public.php:877
-#: classes/handler/public.php:891
-#: classes/handler/public.php:898
-#: classes/handler/public.php:923
+#: register.php:195
+#: register.php:240
+#: register.php:253
+#: register.php:268
+#: register.php:287
+#: register.php:334
+#: register.php:344
+#: register.php:356
+#: classes/handler/public.php:647
+#: classes/handler/public.php:721
+#: 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"
 
-#: register.php:217
+#: register.php:216
 msgid "Your temporary password will be sent to the specified email. Accounts, which were not logged in once, are erased automatically 24 hours after temporary password is sent."
 msgstr ""
 
-#: register.php:223
+#: register.php:222
 msgid "Desired login:"
 msgstr "Nombre de usuario deseado:"
 
-#: register.php:226
+#: register.php:225
 msgid "Check availability"
 msgstr "Comprobar la disponibilidad"
 
-#: register.php:228
-#: classes/handler/public.php:713
+#: register.php:227
+#: classes/handler/public.php:737
 msgid "Email:"
 msgstr "Correo electrónico:"
 
-#: register.php:231
-#: classes/handler/public.php:718
+#: register.php:230
+#: classes/handler/public.php:742
 msgid "How much is two plus two:"
 msgstr ""
 
-#: register.php:234
+#: register.php:233
 msgid "Submit registration"
 msgstr "Enviar solicitud de registro"
 
-#: register.php:252
+#: register.php:251
 msgid "Your registration information is incomplete."
 msgstr ""
 
-#: register.php:267
+#: register.php:266
 msgid "Sorry, this username is already taken."
 msgstr ""
 
-#: register.php:286
+#: register.php:285
 msgid "Registration failed."
 msgstr "El registro ha fallado."
 
-#: register.php:333
+#: register.php:331
 msgid "Account created successfully."
 msgstr "Cuenta creada correctamente."
 
-#: register.php:355
+#: register.php:353
 msgid "New user registrations are currently closed."
 msgstr ""
 
-#: update.php:66
+#: update.php:67
 msgid "Tiny Tiny RSS data update script."
 msgstr ""
 
@@ -476,10 +464,10 @@ msgstr "Todas las fuentes"
 
 #: include/controls.php:138
 #: include/controls.php:230
-#: classes/opml.php:512
-#: classes/digest.php:120
+#: classes/digest.php:124
+#: classes/feeds.php:1708
 #: classes/pref/feeds.php:233
-#: classes/feeds.php:1722
+#: classes/opml.php:512
 msgid "Uncategorized"
 msgstr "Sin clasificar"
 
@@ -494,290 +482,290 @@ msgstr[1] "Artículos archivados"
 msgid "No feeds found."
 msgstr "No se han encontrado fuentes."
 
-#: include/functions.php:983
+#: include/functions.php:928
 #, php-format
 msgid "%d min"
 msgstr ""
 
-#: include/functions.php:1177
+#: include/functions.php:1122
 msgid "Navigation"
 msgstr "Navegación"
 
-#: include/functions.php:1178
+#: include/functions.php:1123
 msgid "Open next feed"
 msgstr "Abrir la fuente siguiente"
 
-#: include/functions.php:1179
+#: include/functions.php:1124
 msgid "Open previous feed"
 msgstr "Abrir la fuente anterior"
 
-#: include/functions.php:1180
+#: include/functions.php:1125
 msgid "Open next article"
 msgstr "Abrir el artículo siguiente"
 
-#: include/functions.php:1181
+#: include/functions.php:1126
 msgid "Open previous article"
 msgstr "Abrir el artículo anterior"
 
-#: include/functions.php:1182
+#: include/functions.php:1127
 msgid "Open next article (don't scroll long articles)"
 msgstr ""
 
-#: include/functions.php:1183
+#: include/functions.php:1128
 msgid "Open previous article (don't scroll long articles)"
 msgstr ""
 
-#: include/functions.php:1184
+#: include/functions.php:1129
 msgid "Move to next article (don't expand or mark read)"
 msgstr ""
 
-#: include/functions.php:1185
+#: include/functions.php:1130
 msgid "Move to previous article (don't expand or mark read)"
 msgstr ""
 
-#: include/functions.php:1186
+#: include/functions.php:1131
 msgid "Show search dialog"
 msgstr "Mostrar el diálogo de búsqueda"
 
-#: include/functions.php:1187
+#: include/functions.php:1132
 msgid "Article"
 msgstr "Artículo"
 
-#: include/functions.php:1188
-#: js/viewfeed.js:1695
+#: include/functions.php:1133
+#: js/viewfeed.js:1341
 msgid "Toggle starred"
 msgstr "Alternar favoritos"
 
-#: include/functions.php:1189
-#: js/viewfeed.js:1707
+#: include/functions.php:1134
+#: js/viewfeed.js:1353
 msgid "Toggle published"
 msgstr "Alternar publicados"
 
-#: include/functions.php:1190
-#: js/viewfeed.js:1682
+#: include/functions.php:1135
+#: js/viewfeed.js:1328
 msgid "Toggle unread"
 msgstr "Alternar sin leer"
 
-#: include/functions.php:1191
+#: include/functions.php:1136
 msgid "Edit tags"
 msgstr "Editar etiquetas"
 
-#: include/functions.php:1192
+#: include/functions.php:1137
 msgid "Open in new window"
 msgstr "Abrir en nueva ventana"
 
-#: include/functions.php:1193
-#: js/viewfeed.js:1728
+#: include/functions.php:1138
+#: js/viewfeed.js:1374
 msgid "Mark below as read"
 msgstr "Marcar artículos posteriores como leídos"
 
-#: include/functions.php:1194
-#: js/viewfeed.js:1721
+#: include/functions.php:1139
+#: js/viewfeed.js:1367
 msgid "Mark above as read"
 msgstr "Marcar artículos anteriores como leídos"
 
-#: include/functions.php:1195
+#: include/functions.php:1140
 msgid "Scroll down"
 msgstr "Desplazarse hacia abajo"
 
-#: include/functions.php:1196
+#: include/functions.php:1141
 msgid "Scroll up"
 msgstr "Desplazarse hacia arriba"
 
-#: include/functions.php:1197
+#: include/functions.php:1142
 msgid "Select article under cursor"
 msgstr "Seleccionar el artículo bajo el puntero del mouse"
 
-#: include/functions.php:1198
+#: include/functions.php:1143
 msgid "Email article"
 msgstr "Enviar artículo por correo electrónico"
 
-#: include/functions.php:1199
+#: include/functions.php:1144
 msgid "Close/collapse article"
 msgstr "Cerrar/plegar artículo"
 
-#: include/functions.php:1200
+#: include/functions.php:1145
 #, fuzzy
 msgid "Toggle article expansion (combined mode)"
 msgstr "Alternar modo combinado"
 
-#: include/functions.php:1202
+#: include/functions.php:1147
 #: plugins/embed_original/init.php:33
 msgid "Toggle embed original"
 msgstr "Alternar incrustación del artículo original"
 
-#: include/functions.php:1203
+#: include/functions.php:1148
 msgid "Article selection"
 msgstr "Selección de artículos"
 
-#: include/functions.php:1204
+#: include/functions.php:1149
 msgid "Select all articles"
 msgstr "Seleccionar todos los artículos"
 
-#: include/functions.php:1205
+#: include/functions.php:1150
 msgid "Select unread"
 msgstr "Seleccionar artículos sin leer"
 
-#: include/functions.php:1206
+#: include/functions.php:1151
 msgid "Select starred"
 msgstr "Seleccionar artículos favoritos"
 
-#: include/functions.php:1207
+#: include/functions.php:1152
 msgid "Select published"
 msgstr "Seleccionar artículos publicados"
 
-#: include/functions.php:1208
+#: include/functions.php:1153
 msgid "Invert selection"
 msgstr "Invertir selección"
 
-#: include/functions.php:1209
+#: include/functions.php:1154
 msgid "Deselect everything"
 msgstr "Deseleccionar todo"
 
-#: include/functions.php:1210
-#: classes/pref/feeds.php:522
-#: classes/pref/feeds.php:794
+#: include/functions.php:1155
+#: classes/pref/feeds.php:521
+#: classes/pref/feeds.php:793
 msgid "Feed"
 msgstr "Fuente"
 
-#: include/functions.php:1211
+#: include/functions.php:1156
 msgid "Refresh current feed"
 msgstr "Actualizar la fuente activa"
 
-#: include/functions.php:1212
+#: include/functions.php:1157
 msgid "Un/hide read feeds"
 msgstr "Ocultar/mostrar fuentes leídas"
 
-#: include/functions.php:1213
-#: classes/pref/feeds.php:1195
+#: include/functions.php:1158
+#: classes/pref/feeds.php:1194
 msgid "Subscribe to feed"
 msgstr "Suscribirse a una fuente"
 
-#: include/functions.php:1214
-#: js/FeedTree.js:48
-#: js/PrefFeedTree.js:55
-#: js/viewfeed.js:1846
+#: include/functions.php:1159
+#: js/FeedTree.js:49
+#: js/PrefFeedTree.js:56
+#: js/viewfeed.js:1492
 msgid "Edit feed"
 msgstr "Editar fuente"
 
-#: include/functions.php:1216
+#: include/functions.php:1161
 msgid "Reverse headlines"
 msgstr "Invertir orden de titulares"
 
-#: include/functions.php:1217
+#: include/functions.php:1162
 msgid "Toggle headline grouping"
 msgstr ""
 
-#: include/functions.php:1218
+#: include/functions.php:1163
 msgid "Debug feed update"
 msgstr "Depurar la actualización de fuentes"
 
-#: include/functions.php:1219
+#: include/functions.php:1164
 #, fuzzy
 msgid "Debug viewfeed()"
 msgstr "Depurar la actualización de fuentes"
 
-#: include/functions.php:1220
-#: js/FeedTree.js:97
+#: include/functions.php:1165
+#: js/FeedTree.js:98
 #, fuzzy
 msgid "Mark all feeds as read"
 msgstr "Marcar fuente como leída"
 
-#: include/functions.php:1221
+#: include/functions.php:1166
 msgid "Un/collapse current category"
 msgstr "Desplegar/plegar la categoría"
 
-#: include/functions.php:1222
-msgid "Toggle combined mode"
-msgstr "Alternar modo combinado"
-
-#: include/functions.php:1223
+#: include/functions.php:1167
 #, fuzzy
 msgid "Toggle auto expand in combined mode"
 msgstr "Alternar modo combinado"
 
-#: include/functions.php:1224
+#: include/functions.php:1168
+msgid "Toggle combined mode"
+msgstr "Alternar modo combinado"
+
+#: include/functions.php:1169
 msgid "Go to"
 msgstr "Ir a"
 
-#: include/functions.php:1225
-#: classes/feeds.php:1583
+#: include/functions.php:1170
+#: classes/feeds.php:1569
 msgid "All articles"
 msgstr "Todos"
 
-#: include/functions.php:1226
+#: include/functions.php:1171
 msgid "Fresh"
 msgstr "Reciente"
 
-#: include/functions.php:1229
-#: js/tt-rss.js:491
-#: js/tt-rss.js:660
+#: include/functions.php:1174
+#: js/tt-rss.js:439
+#: js/tt-rss.js:599
 msgid "Tag cloud"
 msgstr "Nube de etiquetas"
 
-#: include/functions.php:1231
+#: include/functions.php:1176
 msgid "Other"
 msgstr "Otro"
 
-#: include/functions.php:1232
+#: include/functions.php:1177
 #: classes/pref/labels.php:279
 msgid "Create label"
 msgstr "Crear marcador"
 
-#: include/functions.php:1233
+#: include/functions.php:1178
 #: classes/pref/filters.php:801
 msgid "Create filter"
 msgstr "Crear filtro"
 
-#: include/functions.php:1234
+#: include/functions.php:1179
 msgid "Un/collapse sidebar"
 msgstr "Mostrar/ocultar la barra lateral"
 
-#: include/functions.php:1235
+#: include/functions.php:1180
 msgid "Show help dialog"
 msgstr "Mostrar el diálogo de ayuda"
 
-#: include/functions.php:2582
+#: include/functions.php:2529
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: include/functions.php:2583
+#: include/functions.php:2530
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: include/functions.php:2584
+#: include/functions.php:2531
 msgid "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form"
 msgstr ""
 
-#: include/functions.php:2585
+#: include/functions.php:2532
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: include/functions.php:2586
+#: include/functions.php:2533
 #, fuzzy
 msgid "No file was uploaded"
 msgstr "No se ha cargado ningún archivo."
 
-#: include/functions.php:2587
+#: include/functions.php:2534
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: include/functions.php:2588
+#: include/functions.php:2535
 msgid "Failed to write file to disk."
 msgstr ""
 
-#: include/functions.php:2589
+#: include/functions.php:2536
 msgid "A PHP extension stopped the file upload."
 msgstr ""
 
 #: include/login_form.php:107
-#: classes/handler/public.php:446
-#: classes/handler/public.php:708
+#: classes/handler/public.php:466
+#: classes/handler/public.php:732
 msgid "Login:"
 msgstr "Nombre de usuario:"
 
 #: include/login_form.php:117
-#: classes/handler/public.php:449
+#: classes/handler/public.php:469
 msgid "Password:"
 msgstr "Contraseña:"
 
@@ -790,9 +778,9 @@ msgid "Profile:"
 msgstr "Perfil:"
 
 #: include/login_form.php:133
-#: classes/handler/public.php:252
 #: classes/pref/prefs.php:1037
 #: classes/rpc.php:69
+#: classes/handler/public.php:272
 msgid "Default profile"
 msgstr "Perfil por defecto"
 
@@ -809,208 +797,26 @@ msgid "Remember me"
 msgstr "Recordarme"
 
 #: include/login_form.php:159
-#: classes/handler/public.php:454
+#: classes/handler/public.php:474
 msgid "Log in"
 msgstr "Iniciar sesión"
 
-#: include/sessions.php:46
+#: include/sessions.php:45
 msgid "Session failed to validate (schema version changed)"
 msgstr ""
 
-#: include/sessions.php:62
+#: include/sessions.php:53
+msgid "Session failed to validate (UA changed)."
+msgstr ""
+
+#: include/sessions.php:67
 msgid "Session failed to validate (password changed)"
 msgstr ""
 
-#: include/sessions.php:69
+#: include/sessions.php:74
 msgid "Session failed to validate (user not found)"
 msgstr ""
 
-#: classes/article.php:26
-msgid "Article not found."
-msgstr "Artículo no encontrado."
-
-#: classes/article.php:211
-msgid "Tags for this article (separated by commas):"
-msgstr ""
-
-#: classes/article.php:236
-#: classes/pref/labels.php:82
-#: classes/pref/users.php:103
-#: classes/pref/feeds.php:774
-#: classes/pref/feeds.php:914
-#: classes/pref/filters.php:525
-#: classes/pref/prefs.php:982
-#: plugins/nsfw/init.php:85
-#: plugins/note/init.php:58
-#: plugins/af_readability/init.php:80
-#: plugins/af_redditimgur/init.php:66
-#: plugins/af_psql_trgm/init.php:188
-#: plugins/mail/init.php:65
-#: plugins/af_zz_imgproxy/init.php:238
-msgid "Save"
-msgstr "Guardar"
-
-#: classes/article.php:238
-#: classes/handler/public.php:423
-#: classes/handler/public.php:457
-#: classes/pref/labels.php:84
-#: classes/pref/users.php:105
-#: classes/pref/feeds.php:775
-#: classes/pref/feeds.php:917
-#: classes/pref/feeds.php:1672
-#: classes/pref/filters.php:528
-#: classes/pref/filters.php:945
-#: classes/pref/filters.php:1022
-#: classes/pref/filters.php:1115
-#: classes/pref/prefs.php:984
-#: classes/feeds.php:1037
-#: classes/feeds.php:1089
-#: classes/feeds.php:1128
-#: plugins/note/init.php:60
-#: plugins/mail/init.php:179
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: classes/article.php:337
-#: classes/article.php:720
-#: classes/article.php:875
-msgid "no tags"
-msgstr "sin etiquetas"
-
-#: classes/article.php:448
-msgid "unknown type"
-msgstr "tipo desconocido"
-
-#: classes/article.php:525
-msgid "Attachments"
-msgstr "Adjuntos"
-
-#: classes/article.php:626
-#: classes/feeds.php:661
-#, fuzzy
-msgid "comment"
-msgid_plural "comments"
-msgstr[0] "comentarios"
-msgstr[1] "comentarios"
-
-#: classes/article.php:630
-#: classes/feeds.php:665
-msgid "comments"
-msgstr "comentarios"
-
-#: classes/article.php:689
-msgid " - "
-msgstr " - "
-
-#: classes/article.php:730
-#: classes/feeds.php:647
-msgid "Edit tags for this article"
-msgstr ""
-
-#: classes/article.php:763
-#: classes/feeds.php:602
-msgid "Originally from:"
-msgstr "Original de:"
-
-#: classes/article.php:774
-#: classes/pref/feeds.php:539
-#: classes/feeds.php:613
-msgid "Feed URL"
-msgstr "URL de la fuente"
-
-#: classes/article.php:811
-#: classes/backend.php:103
-#: classes/dlg.php:33
-#: classes/dlg.php:56
-#: classes/dlg.php:89
-#: classes/dlg.php:154
-#: classes/dlg.php:181
-#: classes/dlg.php:197
-#: classes/pref/feeds.php:1466
-#: classes/pref/feeds.php:1533
-#: classes/pref/filters.php:208
-#: classes/pref/prefs.php:1099
-#: plugins/af_psql_trgm/init.php:109
-#: plugins/import_export/init.php:446
-#: plugins/import_export/init.php:490
-#: plugins/share/init.php:128
-msgid "Close this window"
-msgstr "Cerrar esta ventana"
-
-#: classes/article.php:913
-msgid "(edit note)"
-msgstr "(editar nota)"
-
-#: classes/opml.php:31
-#: classes/opml.php:36
-msgid "OPML Utility"
-msgstr "Utilidad OPML"
-
-#: classes/opml.php:40
-msgid "Importing OPML..."
-msgstr "Importando OPML..."
-
-#: classes/opml.php:45
-msgid "Return to preferences"
-msgstr "Volver a las preferencias"
-
-#: classes/opml.php:301
-#, php-format
-msgid "Adding feed: %s"
-msgstr "Añadiendo fuente: %s"
-
-#: classes/opml.php:312
-#, php-format
-msgid "Duplicate feed: %s"
-msgstr "Duplicar fuente: %s"
-
-#: classes/opml.php:326
-#, php-format
-msgid "Adding label %s"
-msgstr "Añadiendo el marcador %s"
-
-#: classes/opml.php:329
-#, php-format
-msgid "Duplicate label: %s"
-msgstr "Duplicar marcador: %s"
-
-#: classes/opml.php:341
-#, php-format
-msgid "Setting preference key %s to %s"
-msgstr ""
-
-#: classes/opml.php:377
-msgid "Adding filter..."
-msgstr "Añadiendo filtro..."
-
-#: classes/opml.php:512
-#, php-format
-msgid "Processing category: %s"
-msgstr "Procesando categoría: %s"
-
-#: classes/opml.php:558
-#, php-format
-msgid "Upload failed with error code %d"
-msgstr ""
-
-#: classes/opml.php:570
-#: plugins/import_export/init.php:471
-msgid "Unable to move uploaded file."
-msgstr ""
-
-#: classes/opml.php:574
-#: plugins/import_export/init.php:475
-msgid "Error: please upload OPML file."
-msgstr ""
-
-#: classes/opml.php:585
-msgid "Error: unable to find moved OPML file."
-msgstr ""
-
-#: classes/opml.php:594
-msgid "Error while parsing document."
-msgstr "Error mientras se analizaba el documento."
-
 #: classes/backend.php:31
 msgid "Other interface tips are available in the Tiny Tiny RSS wiki."
 msgstr ""
@@ -1031,165 +837,355 @@ msgstr "Ctrl"
 msgid "Help topic not found."
 msgstr "Tema de ayuda no encontrado."
 
-#: 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/backend.php:103
+#: classes/pref/filters.php:208
+#: classes/pref/feeds.php:1465
+#: classes/pref/feeds.php:1532
+#: classes/pref/prefs.php:1099
+#: classes/dlg.php:33
+#: classes/dlg.php:56
+#: classes/dlg.php:89
+#: classes/dlg.php:154
+#: classes/dlg.php:181
+#: classes/dlg.php:197
+#: classes/article.php:810
+#: plugins/af_psql_trgm/init.php:109
+#: plugins/import_export/init.php:446
+#: plugins/import_export/init.php:490
+#: plugins/share/init.php:128
+msgid "Close this window"
+msgstr "Cerrar esta ventana"
 
-#: classes/dlg.php:44
-#, fuzzy
-msgid "Your Public OPML URL is:"
-msgstr "URL del archivo OPML público"
+#: classes/feeds.php:53
+msgid "View as RSS feed"
+msgstr "Ver como fuente RSS"
 
-#: classes/dlg.php:53
-#: classes/dlg.php:178
-#: plugins/share/init.php:125
-msgid "Generate new URL"
-msgstr "Generar URL nueva"
+#: classes/feeds.php:54
+#: classes/feeds.php:140
+#: classes/pref/feeds.php:1326
+msgid "View as RSS"
+msgstr "Ver como RSS"
 
-#: classes/dlg.php:67
-msgid "Update daemon is enabled in configuration, but daemon process is not running, which prevents all feeds from updating. Please start the daemon process or contact instance owner."
-msgstr ""
-
-#: classes/dlg.php:71
-#: classes/dlg.php:80
-msgid "Last update:"
-msgstr "Última actualización:"
-
-#: classes/dlg.php:76
-msgid "Update daemon is taking too long to perform a feed update. This could indicate a problem like crash or a hang. Please check the daemon process or contact instance owner."
-msgstr ""
-
-#: classes/dlg.php:169
-msgid "You can view this feed as RSS using the following URL:"
-msgstr ""
-
-#: classes/dlg.php:190
-msgid "You are using default tt-rss password. Please change it in the Preferences (Personal data / Authentication)."
-msgstr ""
-
-#: classes/dlg.php:194
-#, fuzzy
-msgid "Open Preferences"
-msgstr "Preferencias"
-
-#: classes/handler/public.php:387
-#: plugins/bookmarklets/init.php:40
-#, fuzzy
-msgid "Share with Tiny Tiny RSS"
-msgstr "Actualizar Tiny Tiny RSS"
-
-#: classes/handler/public.php:395
-msgid "Title:"
-msgstr "Título:"
-
-#: classes/handler/public.php:397
-#: classes/pref/feeds.php:537
-msgid "URL:"
-msgstr "URL:"
-
-#: classes/handler/public.php:399
-msgid "Content:"
-msgstr "Contenido:"
-
-#: classes/handler/public.php:401
-msgid "Labels:"
-msgstr "Marcadores:"
-
-#: classes/handler/public.php:420
-msgid "Shared article will appear in the Published feed."
-msgstr ""
-
-#: classes/handler/public.php:422
-msgid "Share"
-msgstr "Compartir"
-
-#: classes/handler/public.php:444
-msgid "Not logged in"
-msgstr "No ha iniciado sesión"
-
-#: classes/handler/public.php:504
-msgid "Incorrect username or password"
-msgstr "Nombre de usuario o contraseña incorrectos"
-
-#: classes/handler/public.php:557
-#, fuzzy, php-format
-msgid "Already subscribed to <b>%s</b>."
-msgstr "Se ha suscrito a %s"
-
-#: classes/handler/public.php:560
-#, fuzzy, php-format
-msgid "Subscribed to <b>%s</b>."
-msgstr "Se ha suscrito a %s"
-
-#: classes/handler/public.php:563
+#: classes/feeds.php:62
 #, php-format
-msgid "Could not subscribe to <b>%s</b>."
-msgstr ""
+msgid "Last updated: %s"
+msgstr "Última actualización: %s"
 
-#: classes/handler/public.php:566
-#, fuzzy, php-format
-msgid "No feeds found in <b>%s</b>."
-msgstr "No se han encontrado fuentes."
-
-#: classes/handler/public.php:569
-msgid "Multiple feed URLs found."
-msgstr "Múltiples fuentes encontradas."
-
-#: classes/handler/public.php:573
-#, php-format
-msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
-msgstr ""
-
-#: classes/handler/public.php:591
-msgid "Subscribe to selected feed"
-msgstr "Suscribirse a la fuente seleccionada"
-
-#: classes/handler/public.php:618
-msgid "Edit subscription options"
-msgstr "Editar las opciones de suscripción"
-
-#: classes/handler/public.php:656
-msgid "Password recovery"
-msgstr "Recuperación de contraseña"
-
-#: classes/handler/public.php:701
-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:723
-#: classes/pref/users.php:372
-msgid "Reset password"
-msgstr "Restablecer contraseña"
-
-#: classes/handler/public.php:733
-msgid "Some of the required form parameters are missing or incorrect."
-msgstr ""
-
-#: classes/handler/public.php:737
-#: classes/handler/public.php:806
-msgid "Go back"
-msgstr "Volver"
-
-#: classes/handler/public.php:775
+#: classes/feeds.php:100
 #, fuzzy
-msgid "[tt-rss] Password reset request"
-msgstr "[tt-rss] Notificación de cambio de contraseña"
+msgid "Select..."
+msgstr "Seleccionar"
 
-#: classes/handler/public.php:802
-msgid "Sorry, login and email combination not found."
+#: classes/feeds.php:102
+#: classes/pref/labels.php:273
+#: classes/pref/filters.php:391
+#: classes/pref/filters.php:449
+#: classes/pref/filters.php:795
+#: classes/pref/filters.php:878
+#: classes/pref/filters.php:905
+#: classes/pref/feeds.php:1185
+#: classes/pref/feeds.php:1416
+#: classes/pref/feeds.php:1481
+#: classes/pref/users.php:358
+#: classes/pref/prefs.php:996
+msgid "All"
+msgstr "Todos"
+
+#: classes/feeds.php:104
+msgid "Invert"
+msgstr "Invertir"
+
+#: classes/feeds.php:105
+#: classes/pref/labels.php:275
+#: classes/pref/filters.php:393
+#: classes/pref/filters.php:451
+#: classes/pref/filters.php:797
+#: classes/pref/filters.php:880
+#: classes/pref/filters.php:907
+#: classes/pref/feeds.php:1187
+#: classes/pref/feeds.php:1418
+#: classes/pref/feeds.php:1483
+#: classes/pref/users.php:360
+#: classes/pref/prefs.php:998
+msgid "None"
+msgstr "Ninguno"
+
+#: classes/feeds.php:107
+msgid "Selection toggle:"
+msgstr "Alternar la selección:"
+
+#: classes/feeds.php:113
+msgid "Selection:"
+msgstr "Selección:"
+
+#: classes/feeds.php:116
+msgid "Set score"
+msgstr "Definir puntuación"
+
+#: classes/feeds.php:119
+msgid "Archive"
+msgstr "Archivar"
+
+#: classes/feeds.php:121
+msgid "Move back"
+msgstr "Mover a la fuente original"
+
+#: classes/feeds.php:122
+#: classes/pref/filters.php:400
+#: classes/pref/filters.php:458
+#: classes/pref/filters.php:887
+#: classes/pref/filters.php:914
+msgid "Delete"
+msgstr "Eliminar"
+
+#: classes/feeds.php:127
+#: classes/feeds.php:132
+#: plugins/mailto/init.php:25
+#: plugins/mail/init.php:76
+msgid "Forward by email"
+msgstr "Enviar por correo electrónico"
+
+#: classes/feeds.php:136
+msgid "Feed:"
+msgstr "Fuente:"
+
+#: classes/feeds.php:193
+#: classes/feeds.php:802
+msgid "Feed not found."
+msgstr "Fuente no encontrada."
+
+#: classes/feeds.php:255
+msgid "Never"
+msgstr "Nunca"
+
+#: classes/feeds.php:341
+#, php-format
+msgid "Imported at %s"
+msgstr "Importado en %s"
+
+#: classes/feeds.php:391
+#: classes/feeds.php:484
+msgid "mark feed as read"
+msgstr "Marcar fuente como leída"
+
+#: classes/feeds.php:540
+msgid "Collapse article"
+msgstr "Cerrar artículo"
+
+#: classes/feeds.php:592
+#: classes/article.php:762
+msgid "Originally from:"
+msgstr "Original de:"
+
+#: classes/feeds.php:603
+#: classes/pref/feeds.php:538
+#: classes/article.php:773
+msgid "Feed URL"
+msgstr "URL de la fuente"
+
+#: classes/feeds.php:630
+#: classes/article.php:729
+msgid "Edit tags for this article"
 msgstr ""
 
-#: classes/handler/public.php:824
-msgid "Your access level is insufficient to run this script."
+#: classes/feeds.php:644
+#: classes/article.php:625
+#, fuzzy
+msgid "comment"
+msgid_plural "comments"
+msgstr[0] "comentarios"
+msgstr[1] "comentarios"
+
+#: classes/feeds.php:648
+#: classes/article.php:629
+msgid "comments"
+msgstr "comentarios"
+
+#: classes/feeds.php:686
+msgid "No unread articles found to display."
 msgstr ""
 
-#: classes/handler/public.php:850
-msgid "Database Updater"
-msgstr "Actualizador de la base de datos"
+#: classes/feeds.php:689
+msgid "No updated articles found to display."
+msgstr ""
 
-#: classes/handler/public.php:915
-msgid "Perform updates"
-msgstr "Actualizar"
+#: classes/feeds.php:692
+msgid "No starred articles found to display."
+msgstr ""
+
+#: classes/feeds.php:696
+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:698
+msgid "No articles found to display."
+msgstr ""
+
+#: classes/feeds.php:714
+#: classes/feeds.php:905
+#, fuzzy, php-format
+msgid "Feeds last updated at %s"
+msgstr "Última actualización: %s"
+
+#: classes/feeds.php:726
+#: classes/feeds.php:917
+msgid "Some feeds have update errors (click for details)"
+msgstr ""
+
+#: classes/feeds.php:894
+msgid "No feed selected."
+msgstr "No se ha seleccionado ninguna fuente."
+
+#: classes/feeds.php:958
+#: classes/feeds.php:966
+msgid "Feed or site URL"
+msgstr "URL de la fuente o del sitio"
+
+#: classes/feeds.php:972
+#: classes/pref/feeds.php:559
+#: classes/pref/feeds.php:800
+#: classes/pref/feeds.php:1632
+msgid "Place in category:"
+msgstr "Categoría:"
+
+#: classes/feeds.php:980
+msgid "Available feeds"
+msgstr "Fuentes disponibles"
+
+#: classes/feeds.php:992
+#: classes/pref/feeds.php:621
+#: classes/pref/feeds.php:848
+#: classes/pref/users.php:61
+msgid "Authentication"
+msgstr "Autenticación"
+
+#: classes/feeds.php:996
+#: classes/pref/feeds.php:625
+#: classes/pref/feeds.php:852
+#: classes/pref/feeds.php:1646
+#: classes/pref/users.php:403
+msgid "Login"
+msgstr "Iniciar sesión"
+
+#: classes/feeds.php:1000
+#: classes/pref/feeds.php:631
+#: classes/pref/feeds.php:860
+#: classes/pref/feeds.php:1649
+#: classes/pref/prefs.php:243
+msgid "Password"
+msgstr "Contraseña"
+
+#: classes/feeds.php:1011
+#: classes/pref/feeds.php:645
+msgid "This feed requires authentication."
+msgstr "Esta fuente requiere autenticación."
+
+#: classes/feeds.php:1014
+#: classes/feeds.php:1070
+#: classes/pref/feeds.php:1668
+msgid "Subscribe"
+msgstr "Suscribir"
+
+#: classes/feeds.php:1017
+msgid "More feeds"
+msgstr "Más fuentes"
+
+#: classes/feeds.php:1020
+#: classes/feeds.php:1072
+#: classes/feeds.php:1111
+#: classes/pref/labels.php:84
+#: classes/pref/filters.php:528
+#: classes/pref/filters.php:945
+#: classes/pref/filters.php:1022
+#: classes/pref/filters.php:1115
+#: classes/pref/feeds.php:774
+#: classes/pref/feeds.php:916
+#: classes/pref/feeds.php:1669
+#: classes/pref/users.php:105
+#: classes/pref/prefs.php:984
+#: classes/article.php:238
+#: classes/handler/public.php:443
+#: classes/handler/public.php:477
+#: plugins/mail/init.php:179
+#: plugins/note/init.php:60
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: classes/feeds.php:1042
+#: classes/feeds.php:1110
+#: classes/pref/filters.php:788
+#: classes/pref/feeds.php:1178
+#: classes/pref/users.php:345
+#: js/tt-rss.js:152
+msgid "Search"
+msgstr "Buscar"
+
+#: classes/feeds.php:1046
+msgid "Popular feeds"
+msgstr "Fuentes populares"
+
+#: classes/feeds.php:1047
+msgid "Feed archive"
+msgstr "Archivo de fuentes"
+
+#: classes/feeds.php:1050
+msgid "limit:"
+msgstr "límite:"
+
+#: classes/feeds.php:1071
+#: classes/pref/labels.php:282
+#: classes/pref/filters.php:518
+#: classes/pref/filters.php:814
+#: classes/pref/feeds.php:751
+#: classes/pref/users.php:369
+msgid "Remove"
+msgstr "Eliminar"
+
+#: classes/feeds.php:1084
+msgid "Look for"
+msgstr "Buscar"
+
+#: classes/feeds.php:1092
+#, php-format
+msgid "in %s"
+msgstr ""
+
+#: classes/feeds.php:1097
+msgid "Used for word stemming"
+msgstr ""
+
+#: classes/feeds.php:1106
+msgid "Search syntax"
+msgstr "Sintaxis de búsqueda"
+
+#: classes/feeds.php:1563
+msgid "Starred articles"
+msgstr "Favoritos"
+
+#: classes/feeds.php:1565
+msgid "Published articles"
+msgstr "Publicados"
+
+#: classes/feeds.php:1567
+msgid "Fresh articles"
+msgstr "Recientes"
+
+#: classes/feeds.php:1571
+msgid "Archived articles"
+msgstr "Artículos archivados"
+
+#: classes/feeds.php:1573
+msgid "Recently read"
+msgstr "Leídos recientemente"
+
+#: classes/feeds.php:1694
+msgid "Special"
+msgstr "Especial"
+
+#: classes/feeds.php:1951
+#, php-format
+msgid "Search results: %s"
+msgstr "Resultados de búsqueda: %s"
 
 #: classes/pref/labels.php:25
 #: classes/pref/filters.php:377
@@ -1209,201 +1205,194 @@ msgstr "Primer plano:"
 msgid "Background:"
 msgstr "Fondo:"
 
+#: classes/pref/labels.php:82
+#: classes/pref/filters.php:525
+#: classes/pref/feeds.php:773
+#: classes/pref/feeds.php:913
+#: classes/pref/users.php:103
+#: classes/pref/prefs.php:982
+#: classes/article.php:236
+#: plugins/af_zz_imgproxy/init.php:238
+#: plugins/af_redditimgur/init.php:66
+#: plugins/af_psql_trgm/init.php:188
+#: plugins/af_readability/init.php:80
+#: plugins/nsfw/init.php:85
+#: plugins/mail/init.php:65
+#: plugins/note/init.php:58
+msgid "Save"
+msgstr "Guardar"
+
 #: classes/pref/labels.php:244
 #, fuzzy, php-format
 msgid "Created label <b>%s</b>"
 msgstr "Crear marcador"
 
 #: classes/pref/labels.php:270
-#: classes/pref/users.php:356
-#: classes/pref/feeds.php:1183
-#: classes/pref/feeds.php:1414
-#: classes/pref/feeds.php:1479
 #: classes/pref/filters.php:388
 #: classes/pref/filters.php:446
 #: classes/pref/filters.php:792
 #: classes/pref/filters.php:875
 #: classes/pref/filters.php:902
+#: classes/pref/feeds.php:1182
+#: classes/pref/feeds.php:1413
+#: classes/pref/feeds.php:1478
+#: classes/pref/users.php:355
 #: classes/pref/prefs.php:993
 msgid "Select"
 msgstr "Seleccionar"
 
-#: classes/pref/labels.php:273
-#: classes/pref/users.php:359
-#: classes/pref/feeds.php:1186
-#: classes/pref/feeds.php:1417
-#: classes/pref/feeds.php:1482
-#: classes/pref/filters.php:391
-#: classes/pref/filters.php:449
-#: classes/pref/filters.php:795
-#: classes/pref/filters.php:878
-#: classes/pref/filters.php:905
-#: classes/pref/prefs.php:996
-#: classes/feeds.php:102
-msgid "All"
-msgstr "Todos"
-
-#: classes/pref/labels.php:275
-#: classes/pref/users.php:361
-#: classes/pref/feeds.php:1188
-#: classes/pref/feeds.php:1419
-#: classes/pref/feeds.php:1484
-#: classes/pref/filters.php:393
-#: classes/pref/filters.php:451
-#: classes/pref/filters.php:797
-#: classes/pref/filters.php:880
-#: classes/pref/filters.php:907
-#: classes/pref/prefs.php:998
-#: classes/feeds.php:105
-msgid "None"
-msgstr "Ninguno"
-
-#: classes/pref/labels.php:282
-#: classes/pref/users.php:370
-#: classes/pref/feeds.php:752
-#: classes/pref/filters.php:518
-#: classes/pref/filters.php:814
-#: classes/feeds.php:1088
-msgid "Remove"
-msgstr "Eliminar"
-
 #: classes/pref/labels.php:285
 msgid "Clear colors"
 msgstr "Limpiar los colores"
 
-#: classes/pref/users.php:6
-#: classes/pref/system.php:8
-msgid "Your access level is insufficient to open this tab."
-msgstr ""
-
-#: classes/pref/users.php:26
+#: classes/pref/filters.php:155
 #, fuzzy
-msgid "Edit user"
-msgstr "Editar regla"
+msgid "Preview article"
+msgstr "Recientes"
 
-#: classes/pref/users.php:61
-#: classes/pref/feeds.php:622
-#: classes/pref/feeds.php:849
-#: classes/feeds.php:1009
-msgid "Authentication"
-msgstr "Autenticación"
+#: classes/pref/filters.php:267
+#: classes/pref/filters.php:573
+msgid "(inverse)"
+msgstr "(inverso)"
 
-#: classes/pref/users.php:64
-msgid "Access level: "
-msgstr "Nivel de acceso: "
-
-#: classes/pref/users.php:82
-#: classes/pref/feeds.php:648
-#: classes/pref/feeds.php:867
-msgid "Options"
-msgstr "Opciones"
-
-#: classes/pref/users.php:96
-#: js/prefs.js:479
-msgid "User details"
-msgstr "Detalles del usuario"
-
-#: classes/pref/users.php:136
-#: classes/pref/users.php:407
-msgid "Registered"
-msgstr "Registrado"
-
-#: classes/pref/users.php:137
-msgid "Last logged in"
-msgstr "Última sesión el"
-
-#: classes/pref/users.php:145
-msgid "Subscribed feeds count"
-msgstr "Contador de fuentes suscritas"
-
-#: classes/pref/users.php:146
-#, fuzzy
-msgid "Stored articles"
-msgstr "Favoritos"
-
-#: classes/pref/users.php:150
-#: classes/pref/users.php:406
-msgid "Subscribed feeds"
-msgstr "Fuentes suscritas"
-
-#: classes/pref/users.php:176
-msgid "User not found"
-msgstr "Usuario no encontrado"
-
-#: classes/pref/users.php:246
+#: classes/pref/filters.php:263
+#: classes/pref/filters.php:572
 #, php-format
-msgid "Added user <b>%s</b> with password <b>%s</b>"
+msgid "%s on %s in %s %s"
 msgstr ""
 
-#: classes/pref/users.php:253
-#, php-format
-msgid "Could not create user <b>%s</b>"
-msgstr ""
+#: classes/pref/filters.php:383
+#: classes/pref/filters.php:870
+#: classes/pref/filters.php:977
+msgid "Match"
+msgstr "Coincidir"
 
-#: classes/pref/users.php:257
-#, php-format
-msgid "User <b>%s</b> already exists."
-msgstr ""
+#: classes/pref/filters.php:397
+#: classes/pref/filters.php:455
+#: classes/pref/filters.php:884
+#: classes/pref/filters.php:911
+msgid "Add"
+msgstr "Añadir"
 
-#: classes/pref/users.php:285
-#, php-format
-msgid "Changed password of user <b>%s</b> to <b>%s</b>"
-msgstr ""
+#: classes/pref/filters.php:441
+#: classes/pref/filters.php:897
+msgid "Apply actions"
+msgstr "Aplicar acciones"
 
-#: classes/pref/users.php:287
-#, php-format
-msgid "Sending new password of user <b>%s</b> to <b>%s</b>"
-msgstr ""
+#: classes/pref/filters.php:492
+#: classes/pref/filters.php:926
+msgid "Enabled"
+msgstr "Habilitado"
 
-#: classes/pref/users.php:311
-msgid "[tt-rss] Password change notification"
-msgstr "[tt-rss] Notificación de cambio de contraseña"
+#: classes/pref/filters.php:501
+#: classes/pref/filters.php:929
+msgid "Match any rule"
+msgstr "Coincidencia con cualquier regla"
 
-#: classes/pref/users.php:346
-#: classes/pref/feeds.php:1179
-#: classes/pref/filters.php:788
-#: classes/feeds.php:1059
-#: classes/feeds.php:1127
-#: js/tt-rss.js:165
-msgid "Search"
-msgstr "Buscar"
+#: classes/pref/filters.php:510
+#: classes/pref/filters.php:932
+msgid "Inverse matching"
+msgstr "Coincidencia inversa"
 
-#: classes/pref/users.php:364
-msgid "Create user"
-msgstr "Crear usuario"
+#: classes/pref/filters.php:522
+#: classes/pref/filters.php:939
+msgid "Test"
+msgstr "Probar"
+
+#: classes/pref/filters.php:804
+msgid "Combine"
+msgstr "Combinar"
 
-#: classes/pref/users.php:368
 #: classes/pref/filters.php:807
+#: classes/pref/users.php:367
 msgid "Edit"
 msgstr "Editar"
 
-#: classes/pref/users.php:404
-#: classes/pref/feeds.php:626
-#: classes/pref/feeds.php:853
-#: classes/pref/feeds.php:1649
-#: classes/feeds.php:1013
-msgid "Login"
-msgstr "Iniciar sesión"
+#: classes/pref/filters.php:810
+#: classes/pref/feeds.php:1198
+#: classes/pref/feeds.php:1212
+msgid "Reset sort order"
+msgstr "Reiniciar orden"
 
-#: classes/pref/users.php:405
-msgid "Access Level"
-msgstr "Nivel de acceso"
+#: classes/pref/filters.php:942
+msgid "Create"
+msgstr "Crear"
 
-#: classes/pref/users.php:408
-msgid "Last login"
-msgstr "Última sesión"
+#: classes/pref/filters.php:987
+msgid "Regular expression, without outer delimiters (i.e. slashes)"
+msgstr ""
 
-#: classes/pref/users.php:427
-msgid "Click to edit"
-msgstr "Haga clic para editar"
+#: classes/pref/filters.php:993
+msgid "Inverse regular expression matching"
+msgstr "Coincidencia inversa con la expresión regular"
 
-#: classes/pref/users.php:447
-msgid "No users defined."
-msgstr "No se han definido usuarios."
+#: classes/pref/filters.php:995
+msgid "on field"
+msgstr "en el campo"
 
-#: classes/pref/users.php:449
-msgid "No matching users found."
-msgstr "No se han encontrado usuarios coincidentes."
+#: classes/pref/filters.php:1001
+#: js/PrefFilterTree.js:44
+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:764
+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:786
+msgid "Add action"
+msgstr "Añadir acción"
+
+#: classes/pref/filters.php:1139
+msgid "[No caption]"
+msgstr "[Sin leyenda]"
+
+#: classes/pref/filters.php:1141
+#, 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:1155
+#, fuzzy
+msgid "matches any rule"
+msgstr "Coincidencia con cualquier regla"
+
+#: classes/pref/filters.php:1158
+#, 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/system.php:8
+#: classes/pref/users.php:6
+msgid "Your access level is insufficient to open this tab."
+msgstr ""
 
 #: classes/pref/system.php:29
 msgid "Error Log"
@@ -1448,386 +1437,317 @@ msgid_plural "(%d feeds)"
 msgstr[0] "Editar fuente"
 msgstr[1] "Editar fuente"
 
-#: classes/pref/feeds.php:514
+#: classes/pref/feeds.php:513
 #: classes/pref/prefs.php:18
 msgid "General"
 msgstr "General"
 
-#: classes/pref/feeds.php:528
+#: classes/pref/feeds.php:527
 msgid "Feed Title"
 msgstr "Título de la fuente"
 
-#: classes/pref/feeds.php:560
-#: classes/pref/feeds.php:801
-#: classes/pref/feeds.php:1635
-#: classes/feeds.php:989
-msgid "Place in category:"
-msgstr "Categoría:"
+#: classes/pref/feeds.php:536
+#: classes/handler/public.php:417
+msgid "URL:"
+msgstr "URL:"
 
-#: classes/pref/feeds.php:572
+#: classes/pref/feeds.php:571
 #, fuzzy
 msgid "Site URL:"
 msgstr "URL del artículo:"
 
-#: classes/pref/feeds.php:574
+#: classes/pref/feeds.php:573
 #, fuzzy
 msgid "Site URL"
 msgstr "URL de la fuente"
 
-#: classes/pref/feeds.php:585
-#: classes/pref/feeds.php:815
+#: classes/pref/feeds.php:584
+#: classes/pref/feeds.php:814
 #, fuzzy
 msgid "Language:"
 msgstr "Idioma"
 
-#: classes/pref/feeds.php:592
-#: classes/pref/feeds.php:824
+#: classes/pref/feeds.php:591
+#: classes/pref/feeds.php:823
 msgid "Update"
 msgstr "Actualizar"
 
-#: classes/pref/feeds.php:607
-#: classes/pref/feeds.php:840
+#: classes/pref/feeds.php:606
+#: classes/pref/feeds.php:839
 msgid "Article purging:"
 msgstr "Purga de artículos:"
 
-#: classes/pref/feeds.php:632
-#: classes/pref/feeds.php:861
-#: classes/pref/feeds.php:1652
-#: classes/pref/prefs.php:243
-#: classes/feeds.php:1017
-msgid "Password"
-msgstr "Contraseña"
-
-#: classes/pref/feeds.php:636
+#: classes/pref/feeds.php:635
 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:646
-#: classes/feeds.php:1028
-msgid "This feed requires authentication."
-msgstr "Esta fuente requiere autenticación."
+#: classes/pref/feeds.php:647
+#: classes/pref/feeds.php:866
+#: classes/pref/users.php:82
+msgid "Options"
+msgstr "Opciones"
 
-#: classes/pref/feeds.php:662
-#: classes/pref/feeds.php:871
+#: classes/pref/feeds.php:661
+#: classes/pref/feeds.php:870
 msgid "Hide from Popular feeds"
 msgstr "No incluir en fuentes populares"
 
-#: classes/pref/feeds.php:674
-#: classes/pref/feeds.php:877
+#: classes/pref/feeds.php:673
+#: classes/pref/feeds.php:876
 msgid "Include in e-mail digest"
 msgstr "Incluir en el correo recopilatorio"
 
-#: classes/pref/feeds.php:687
-#: classes/pref/feeds.php:883
+#: classes/pref/feeds.php:686
+#: classes/pref/feeds.php:882
 msgid "Always display image attachments"
 msgstr "Mostrar siempre imágenes adjuntas"
 
-#: classes/pref/feeds.php:700
-#: classes/pref/feeds.php:891
+#: classes/pref/feeds.php:699
+#: classes/pref/feeds.php:890
 #, fuzzy
 msgid "Do not embed media"
 msgstr "No mostrar imágenes"
 
-#: classes/pref/feeds.php:713
-#: classes/pref/feeds.php:899
+#: classes/pref/feeds.php:712
+#: classes/pref/feeds.php:898
 msgid "Cache media"
 msgstr ""
 
-#: classes/pref/feeds.php:725
-#: classes/pref/feeds.php:905
+#: classes/pref/feeds.php:724
+#: classes/pref/feeds.php:904
 #, fuzzy
 msgid "Mark updated articles as unread"
 msgstr "Marcar fuente como leída"
 
-#: classes/pref/feeds.php:729
+#: classes/pref/feeds.php:728
 msgid "Icon"
 msgstr "Icono"
 
-#: classes/pref/feeds.php:743
-#: classes/pref/feeds.php:1284
+#: classes/pref/feeds.php:742
+#: classes/pref/feeds.php:1283
 #: plugins/import_export/init.php:71
 #, fuzzy
 msgid "Choose file..."
 msgstr "Crear filtro..."
 
-#: classes/pref/feeds.php:750
+#: classes/pref/feeds.php:749
 msgid "Replace"
 msgstr "Reemplazar"
 
-#: classes/pref/feeds.php:757
+#: classes/pref/feeds.php:756
 #: classes/pref/prefs.php:679
 msgid "Plugins"
 msgstr "Plugins"
 
-#: classes/pref/feeds.php:1154
+#: classes/pref/feeds.php:1153
 msgid "Feeds with errors"
 msgstr "Fuentes con errores"
 
-#: classes/pref/feeds.php:1161
+#: classes/pref/feeds.php:1160
 msgid "Inactive feeds"
 msgstr "Fuentes inactivas"
 
-#: classes/pref/feeds.php:1197
+#: classes/pref/feeds.php:1196
 msgid "Edit selected feeds"
 msgstr "Editar fuentes seleccionadas"
 
-#: classes/pref/feeds.php:1199
-#: classes/pref/feeds.php:1213
-#: classes/pref/filters.php:810
-msgid "Reset sort order"
-msgstr "Reiniciar orden"
-
-#: classes/pref/feeds.php:1201
-#: js/prefs.js:1462
+#: classes/pref/feeds.php:1200
+#: js/prefs.js:1171
 msgid "Batch subscribe"
 msgstr "Suscripción en lote"
 
-#: classes/pref/feeds.php:1208
+#: classes/pref/feeds.php:1207
 msgid "Categories"
 msgstr "Categorías"
 
-#: classes/pref/feeds.php:1211
+#: classes/pref/feeds.php:1210
 msgid "Add category"
 msgstr "Añadir categoría"
 
-#: classes/pref/feeds.php:1215
+#: classes/pref/feeds.php:1214
 msgid "Remove selected"
 msgstr "Eliminar seleccionadas"
 
-#: classes/pref/feeds.php:1272
+#: classes/pref/feeds.php:1271
 msgid "OPML"
 msgstr "OPML"
 
-#: classes/pref/feeds.php:1274
+#: classes/pref/feeds.php:1273
 msgid "Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings."
 msgstr ""
 
-#: classes/pref/feeds.php:1275
+#: classes/pref/feeds.php:1274
 msgid "Only main settings profile can be migrated using OPML."
 msgstr ""
 
-#: classes/pref/feeds.php:1290
+#: classes/pref/feeds.php:1289
 msgid "Import my OPML"
 msgstr "Importar OPML"
 
-#: classes/pref/feeds.php:1296
+#: classes/pref/feeds.php:1295
 msgid "Filename:"
 msgstr "Nombre de archivo:"
 
-#: classes/pref/feeds.php:1298
+#: classes/pref/feeds.php:1297
 msgid "Include settings"
 msgstr "Incluir preferencias"
 
-#: classes/pref/feeds.php:1302
+#: classes/pref/feeds.php:1301
 msgid "Export OPML"
 msgstr "Exportar OPML"
 
-#: classes/pref/feeds.php:1306
+#: classes/pref/feeds.php:1305
 msgid "Your OPML can be published publicly and can be subscribed by anyone who knows the URL below."
 msgstr ""
 
-#: classes/pref/feeds.php:1310
+#: classes/pref/feeds.php:1309
 msgid "Public OPML URL"
 msgstr "URL del archivo OPML público"
 
-#: classes/pref/feeds.php:1311
+#: classes/pref/feeds.php:1310
 msgid "Display published OPML URL"
 msgstr "Mostrar la URL del OPML público"
 
-#: classes/pref/feeds.php:1318
+#: classes/pref/feeds.php:1317
 msgid "Published & shared articles / Generated feeds"
 msgstr ""
 
-#: classes/pref/feeds.php:1320
+#: classes/pref/feeds.php:1319
 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:1327
-#: classes/feeds.php:54
-#: classes/feeds.php:140
-msgid "View as RSS"
-msgstr "Ver como RSS"
-
-#: classes/pref/feeds.php:1328
 msgid "Display URL"
 msgstr "Mostrar URL"
 
-#: classes/pref/feeds.php:1331
+#: classes/pref/feeds.php:1330
 msgid "Clear all generated URLs"
 msgstr "Limpiar todas las URL generadas"
 
-#: classes/pref/feeds.php:1410
+#: classes/pref/feeds.php:1409
 msgid "These feeds have not been updated with new content for 3 months (oldest first):"
 msgstr ""
 
-#: classes/pref/feeds.php:1444
-#: classes/pref/feeds.php:1509
+#: classes/pref/feeds.php:1443
+#: classes/pref/feeds.php:1508
 msgid "Click to edit feed"
 msgstr "Haga clic para editar fuente"
 
-#: classes/pref/feeds.php:1462
-#: classes/pref/feeds.php:1529
+#: classes/pref/feeds.php:1461
+#: classes/pref/feeds.php:1528
 msgid "Unsubscribe from selected feeds"
 msgstr "Cancelar la suscripción a las fuentes seleccionadas"
 
-#: classes/pref/feeds.php:1632
+#: classes/pref/feeds.php:1629
 msgid "Add one valid RSS feed per line (no feed detection is done)"
 msgstr ""
 
-#: classes/pref/feeds.php:1641
+#: classes/pref/feeds.php:1638
 msgid "Feeds to subscribe, One per line"
 msgstr ""
 
-#: classes/pref/feeds.php:1664
+#: classes/pref/feeds.php:1661
 msgid "Feeds require authentication."
 msgstr "Las fuentes requieren autenticación."
 
-#: classes/pref/feeds.php:1671
-#: classes/feeds.php:1031
-#: classes/feeds.php:1087
-msgid "Subscribe"
-msgstr "Suscribir"
-
-#: classes/pref/filters.php:155
+#: classes/pref/users.php:26
 #, fuzzy
-msgid "Preview article"
-msgstr "Recientes"
+msgid "Edit user"
+msgstr "Editar regla"
 
-#: classes/pref/filters.php:267
-#: classes/pref/filters.php:573
-msgid "(inverse)"
-msgstr "(inverso)"
+#: classes/pref/users.php:64
+msgid "Access level: "
+msgstr "Nivel de acceso: "
 
-#: classes/pref/filters.php:263
-#: classes/pref/filters.php:572
+#: classes/pref/users.php:96
+#: js/prefs.js:403
+msgid "User details"
+msgstr "Detalles del usuario"
+
+#: classes/pref/users.php:136
+#: classes/pref/users.php:406
+msgid "Registered"
+msgstr "Registrado"
+
+#: classes/pref/users.php:137
+msgid "Last logged in"
+msgstr "Última sesión el"
+
+#: classes/pref/users.php:145
+msgid "Subscribed feeds count"
+msgstr "Contador de fuentes suscritas"
+
+#: classes/pref/users.php:146
+#, fuzzy
+msgid "Stored articles"
+msgstr "Favoritos"
+
+#: classes/pref/users.php:150
+#: classes/pref/users.php:405
+msgid "Subscribed feeds"
+msgstr "Fuentes suscritas"
+
+#: classes/pref/users.php:176
+msgid "User not found"
+msgstr "Usuario no encontrado"
+
+#: classes/pref/users.php:246
 #, php-format
-msgid "%s on %s in %s %s"
+msgid "Added user <b>%s</b> with password <b>%s</b>"
 msgstr ""
 
-#: classes/pref/filters.php:383
-#: classes/pref/filters.php:870
-#: classes/pref/filters.php:977
-msgid "Match"
-msgstr "Coincidir"
-
-#: classes/pref/filters.php:397
-#: classes/pref/filters.php:455
-#: classes/pref/filters.php:884
-#: classes/pref/filters.php:911
-msgid "Add"
-msgstr "Añadir"
-
-#: classes/pref/filters.php:400
-#: classes/pref/filters.php:458
-#: classes/pref/filters.php:887
-#: classes/pref/filters.php:914
-#: classes/feeds.php:122
-msgid "Delete"
-msgstr "Eliminar"
-
-#: classes/pref/filters.php:441
-#: classes/pref/filters.php:897
-msgid "Apply actions"
-msgstr "Aplicar acciones"
-
-#: classes/pref/filters.php:492
-#: classes/pref/filters.php:926
-msgid "Enabled"
-msgstr "Habilitado"
-
-#: classes/pref/filters.php:501
-#: classes/pref/filters.php:929
-msgid "Match any rule"
-msgstr "Coincidencia con cualquier regla"
-
-#: classes/pref/filters.php:510
-#: classes/pref/filters.php:932
-msgid "Inverse matching"
-msgstr "Coincidencia inversa"
-
-#: classes/pref/filters.php:522
-#: classes/pref/filters.php:939
-msgid "Test"
-msgstr "Probar"
-
-#: classes/pref/filters.php:804
-msgid "Combine"
-msgstr "Combinar"
-
-#: classes/pref/filters.php:942
-msgid "Create"
-msgstr "Crear"
-
-#: classes/pref/filters.php:987
-msgid "Regular expression, without outer delimiters (i.e. slashes)"
+#: classes/pref/users.php:253
+#, php-format
+msgid "Could not create user <b>%s</b>"
 msgstr ""
 
-#: classes/pref/filters.php:993
-msgid "Inverse regular expression matching"
-msgstr "Coincidencia inversa con la expresión regular"
+#: classes/pref/users.php:257
+#, php-format
+msgid "User <b>%s</b> already exists."
+msgstr ""
 
-#: classes/pref/filters.php:995
-msgid "on field"
-msgstr "en el campo"
+#: classes/pref/users.php:285
+#, php-format
+msgid "Changed password of user <b>%s</b> to <b>%s</b>"
+msgstr ""
 
-#: classes/pref/filters.php:1001
-#: js/PrefFilterTree.js:43
-msgid "in"
-msgstr "en"
+#: classes/pref/users.php:287
+#, php-format
+msgid "Sending new password of user <b>%s</b> to <b>%s</b>"
+msgstr ""
 
-#: classes/pref/filters.php:1014
-msgid "Wiki: Filters"
-msgstr "Wiki: Filtros"
+#: classes/pref/users.php:310
+msgid "[tt-rss] Password change notification"
+msgstr "[tt-rss] Notificación de cambio de contraseña"
 
-#: classes/pref/filters.php:1019
-msgid "Save rule"
-msgstr "Guardar regla"
+#: classes/pref/users.php:363
+msgid "Create user"
+msgstr "Crear usuario"
 
-#: classes/pref/filters.php:1019
-#: js/functions.js:797
-msgid "Add rule"
-msgstr "Añadir regla"
+#: classes/pref/users.php:371
+#: classes/handler/public.php:747
+msgid "Reset password"
+msgstr "Restablecer contraseña"
 
-#: classes/pref/filters.php:1042
-msgid "Perform Action"
-msgstr "Realizar la acción"
+#: classes/pref/users.php:404
+msgid "Access Level"
+msgstr "Nivel de acceso"
 
-#: classes/pref/filters.php:1093
-#, fuzzy
-msgid "No actions available"
-msgstr "¡Nueva versión disponible!"
+#: classes/pref/users.php:407
+msgid "Last login"
+msgstr "Última sesión"
 
-#: classes/pref/filters.php:1112
-msgid "Save action"
-msgstr "Guardar acción"
+#: classes/pref/users.php:426
+msgid "Click to edit"
+msgstr "Haga clic para editar"
 
-#: classes/pref/filters.php:1112
-#: js/functions.js:819
-msgid "Add action"
-msgstr "Añadir acción"
+#: classes/pref/users.php:446
+msgid "No users defined."
+msgstr "No se han definido usuarios."
 
-#: classes/pref/filters.php:1139
-msgid "[No caption]"
-msgstr "[Sin leyenda]"
-
-#: classes/pref/filters.php:1141
-#, 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:1155
-#, fuzzy
-msgid "matches any rule"
-msgstr "Coincidencia con cualquier regla"
-
-#: classes/pref/filters.php:1158
-#, 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:448
+msgid "No matching users found."
+msgstr "No se han encontrado usuarios coincidentes."
 
 #: classes/pref/prefs.php:19
 msgid "Interface"
@@ -2009,7 +1929,7 @@ msgid "Strip all but most common HTML tags when reading articles."
 msgstr ""
 
 #: classes/pref/prefs.php:53
-#: js/prefs.js:1424
+#: js/prefs.js:1136
 msgid "Customize stylesheet"
 msgstr "Personalizar hoja de estilo"
 
@@ -2254,256 +2174,303 @@ msgstr "Borrar los perfiles seleccionados"
 msgid "Activate profile"
 msgstr "Activar perfil"
 
-#: classes/feeds.php:53
-msgid "View as RSS feed"
-msgstr "Ver como fuente RSS"
+#: 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/feeds.php:62
-#, php-format
-msgid "Last updated: %s"
-msgstr "Última actualización: %s"
-
-#: classes/feeds.php:100
+#: classes/dlg.php:44
 #, fuzzy
-msgid "Select..."
-msgstr "Seleccionar"
+msgid "Your Public OPML URL is:"
+msgstr "URL del archivo OPML público"
 
-#: classes/feeds.php:104
-msgid "Invert"
-msgstr "Invertir"
+#: classes/dlg.php:53
+#: classes/dlg.php:178
+#: plugins/share/init.php:125
+msgid "Generate new URL"
+msgstr "Generar URL nueva"
 
-#: classes/feeds.php:107
-msgid "Selection toggle:"
-msgstr "Alternar la selección:"
+#: classes/dlg.php:67
+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/feeds.php:113
-msgid "Selection:"
-msgstr "Selección:"
+#: classes/dlg.php:71
+#: classes/dlg.php:80
+msgid "Last update:"
+msgstr "Última actualización:"
 
-#: classes/feeds.php:116
-msgid "Set score"
-msgstr "Definir puntuación"
+#: classes/dlg.php:76
+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/feeds.php:119
-msgid "Archive"
-msgstr "Archivar"
+#: classes/dlg.php:169
+msgid "You can view this feed as RSS using the following URL:"
+msgstr ""
 
-#: classes/feeds.php:121
-msgid "Move back"
-msgstr "Mover a la fuente original"
+#: classes/dlg.php:190
+msgid "You are using default tt-rss password. Please change it in the Preferences (Personal data / Authentication)."
+msgstr ""
 
-#: classes/feeds.php:127
-#: classes/feeds.php:132
-#: plugins/mail/init.php:76
-#: plugins/mailto/init.php:25
-msgid "Forward by email"
-msgstr "Enviar por correo electrónico"
+#: classes/dlg.php:194
+#, fuzzy
+msgid "Open Preferences"
+msgstr "Preferencias"
 
-#: classes/feeds.php:136
-msgid "Feed:"
-msgstr "Fuente:"
+#: classes/opml.php:31
+#: classes/opml.php:36
+msgid "OPML Utility"
+msgstr "Utilidad OPML"
 
-#: classes/feeds.php:193
-#: classes/feeds.php:819
-msgid "Feed not found."
-msgstr "Fuente no encontrada."
+#: classes/opml.php:40
+msgid "Importing OPML..."
+msgstr "Importando OPML..."
 
-#: classes/feeds.php:255
-msgid "Never"
-msgstr "Nunca"
+#: classes/opml.php:45
+msgid "Return to preferences"
+msgstr "Volver a las preferencias"
 
-#: classes/feeds.php:342
+#: classes/opml.php:301
 #, php-format
-msgid "Imported at %s"
-msgstr "Importado en %s"
+msgid "Adding feed: %s"
+msgstr "Añadiendo fuente: %s"
 
-#: classes/feeds.php:394
-#: classes/feeds.php:487
-msgid "mark feed as read"
-msgstr "Marcar fuente como leída"
+#: classes/opml.php:312
+#, php-format
+msgid "Duplicate feed: %s"
+msgstr "Duplicar fuente: %s"
 
-#: classes/feeds.php:542
-msgid "Collapse article"
-msgstr "Cerrar artículo"
+#: classes/opml.php:326
+#, php-format
+msgid "Adding label %s"
+msgstr "Añadiendo el marcador %s"
 
-#: classes/feeds.php:703
-msgid "No unread articles found to display."
+#: classes/opml.php:329
+#, php-format
+msgid "Duplicate label: %s"
+msgstr "Duplicar marcador: %s"
+
+#: classes/opml.php:341
+#, php-format
+msgid "Setting preference key %s to %s"
 msgstr ""
 
-#: classes/feeds.php:706
-msgid "No updated articles found to display."
+#: classes/opml.php:377
+msgid "Adding filter..."
+msgstr "Añadiendo filtro..."
+
+#: classes/opml.php:512
+#, php-format
+msgid "Processing category: %s"
+msgstr "Procesando categoría: %s"
+
+#: classes/opml.php:558
+#, php-format
+msgid "Upload failed with error code %d"
 msgstr ""
 
-#: classes/feeds.php:709
-msgid "No starred articles found to display."
+#: classes/opml.php:570
+#: plugins/import_export/init.php:471
+msgid "Unable to move uploaded file."
 msgstr ""
 
-#: classes/feeds.php:713
-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."
+#: classes/opml.php:574
+#: plugins/import_export/init.php:475
+msgid "Error: please upload OPML file."
 msgstr ""
 
-#: classes/feeds.php:715
-msgid "No articles found to display."
+#: classes/opml.php:585
+msgid "Error: unable to find moved OPML file."
 msgstr ""
 
-#: classes/feeds.php:731
-#: classes/feeds.php:922
+#: classes/opml.php:594
+msgid "Error while parsing document."
+msgstr "Error mientras se analizaba el documento."
+
+#: classes/article.php:26
+msgid "Article not found."
+msgstr "Artículo no encontrado."
+
+#: classes/article.php:211
+msgid "Tags for this article (separated by commas):"
+msgstr ""
+
+#: classes/article.php:337
+#: classes/article.php:719
+#: classes/article.php:874
+msgid "no tags"
+msgstr "sin etiquetas"
+
+#: classes/article.php:447
+msgid "unknown type"
+msgstr "tipo desconocido"
+
+#: classes/article.php:524
+msgid "Attachments"
+msgstr "Adjuntos"
+
+#: classes/article.php:688
+msgid " - "
+msgstr " - "
+
+#: classes/article.php:912
+msgid "(edit note)"
+msgstr "(editar nota)"
+
+#: classes/handler/public.php:407
+#: plugins/bookmarklets/init.php:40
+#, fuzzy
+msgid "Share with Tiny Tiny RSS"
+msgstr "Actualizar Tiny Tiny RSS"
+
+#: classes/handler/public.php:415
+msgid "Title:"
+msgstr "Título:"
+
+#: classes/handler/public.php:419
+msgid "Content:"
+msgstr "Contenido:"
+
+#: classes/handler/public.php:421
+msgid "Labels:"
+msgstr "Marcadores:"
+
+#: classes/handler/public.php:440
+msgid "Shared article will appear in the Published feed."
+msgstr ""
+
+#: classes/handler/public.php:442
+msgid "Share"
+msgstr "Compartir"
+
+#: classes/handler/public.php:464
+msgid "Not logged in"
+msgstr "No ha iniciado sesión"
+
+#: classes/handler/public.php:527
+msgid "Incorrect username or password"
+msgstr "Nombre de usuario o contraseña incorrectos"
+
+#: classes/handler/public.php:581
 #, fuzzy, php-format
-msgid "Feeds last updated at %s"
-msgstr "Última actualización: %s"
+msgid "Already subscribed to <b>%s</b>."
+msgstr "Se ha suscrito a %s"
 
-#: classes/feeds.php:743
-#: classes/feeds.php:934
-msgid "Some feeds have update errors (click for details)"
-msgstr ""
+#: classes/handler/public.php:584
+#, fuzzy, php-format
+msgid "Subscribed to <b>%s</b>."
+msgstr "Se ha suscrito a %s"
 
-#: classes/feeds.php:911
-msgid "No feed selected."
-msgstr "No se ha seleccionado ninguna fuente."
-
-#: classes/feeds.php:975
-#: classes/feeds.php:983
-msgid "Feed or site URL"
-msgstr "URL de la fuente o del sitio"
-
-#: classes/feeds.php:997
-msgid "Available feeds"
-msgstr "Fuentes disponibles"
-
-#: classes/feeds.php:1034
-msgid "More feeds"
-msgstr "Más fuentes"
-
-#: classes/feeds.php:1063
-msgid "Popular feeds"
-msgstr "Fuentes populares"
-
-#: classes/feeds.php:1064
-msgid "Feed archive"
-msgstr "Archivo de fuentes"
-
-#: classes/feeds.php:1067
-msgid "limit:"
-msgstr "límite:"
-
-#: classes/feeds.php:1101
-msgid "Look for"
-msgstr "Buscar"
-
-#: classes/feeds.php:1109
+#: classes/handler/public.php:587
 #, php-format
-msgid "in %s"
+msgid "Could not subscribe to <b>%s</b>."
 msgstr ""
 
-#: classes/feeds.php:1114
-msgid "Used for word stemming"
-msgstr ""
+#: classes/handler/public.php:590
+#, fuzzy, php-format
+msgid "No feeds found in <b>%s</b>."
+msgstr "No se han encontrado fuentes."
 
-#: classes/feeds.php:1123
-msgid "Search syntax"
-msgstr "Sintaxis de búsqueda"
+#: classes/handler/public.php:593
+msgid "Multiple feed URLs found."
+msgstr "Múltiples fuentes encontradas."
 
-#: classes/feeds.php:1577
-msgid "Starred articles"
-msgstr "Favoritos"
-
-#: classes/feeds.php:1579
-msgid "Published articles"
-msgstr "Publicados"
-
-#: classes/feeds.php:1581
-msgid "Fresh articles"
-msgstr "Recientes"
-
-#: classes/feeds.php:1585
-msgid "Archived articles"
-msgstr "Artículos archivados"
-
-#: classes/feeds.php:1587
-msgid "Recently read"
-msgstr "Leídos recientemente"
-
-#: classes/feeds.php:1708
-msgid "Special"
-msgstr "Especial"
-
-#: classes/feeds.php:1965
+#: classes/handler/public.php:597
 #, php-format
-msgid "Search results: %s"
-msgstr "Resultados de búsqueda: %s"
-
-#: plugins/nsfw/init.php:30
-#: plugins/nsfw/init.php:42
-msgid "Not work safe (click to toggle)"
+msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
 msgstr ""
 
-#: plugins/nsfw/init.php:52
-msgid "NSFW Plugin"
-msgstr "Plugin NSFW"
+#: classes/handler/public.php:615
+msgid "Subscribe to selected feed"
+msgstr "Suscribirse a la fuente seleccionada"
 
-#: plugins/nsfw/init.php:79
-msgid "Tags to consider NSFW (comma-separated)"
+#: classes/handler/public.php:642
+msgid "Edit subscription options"
+msgstr "Editar las opciones de suscripción"
+
+#: classes/handler/public.php:680
+msgid "Password recovery"
+msgstr "Recuperación de contraseña"
+
+#: classes/handler/public.php:725
+msgid "You will need to provide valid account name and email. A password reset link will be sent to your email address."
 msgstr ""
 
-#: plugins/nsfw/init.php:100
-msgid "Configuration saved."
+#: classes/handler/public.php:757
+msgid "Some of the required form parameters are missing or incorrect."
+msgstr ""
+
+#: classes/handler/public.php:761
+#: classes/handler/public.php:830
+msgid "Go back"
+msgstr "Volver"
+
+#: classes/handler/public.php:799
+#, fuzzy
+msgid "[tt-rss] Password reset request"
+msgstr "[tt-rss] Notificación de cambio de contraseña"
+
+#: classes/handler/public.php:826
+msgid "Sorry, login and email combination not found."
+msgstr ""
+
+#: classes/handler/public.php:848
+msgid "Your access level is insufficient to run this script."
+msgstr ""
+
+#: classes/handler/public.php:874
+msgid "Database Updater"
+msgstr "Actualizador de la base de datos"
+
+#: classes/handler/public.php:939
+msgid "Perform updates"
+msgstr "Actualizar"
+
+#: plugins/af_zz_imgproxy/init.php:208
+msgid "Image proxy settings (af_zz_imgproxy)"
+msgstr ""
+
+#: plugins/af_zz_imgproxy/init.php:232
+#, fuzzy
+msgid "Enable proxy for all remote images."
+msgstr "Habilitar categorías de fuentes"
+
+#: plugins/af_zz_imgproxy/init.php:236
+#, fuzzy
+msgid "Don't cache files locally."
+msgstr "Guardar las imágenes en la memoria caché local"
+
+#: plugins/af_zz_imgproxy/init.php:252
+#: plugins/af_redditimgur/init.php:79
+#, fuzzy
+msgid "Configuration saved"
 msgstr "Configuración guardada."
 
-#: plugins/note/init.php:28
-#: plugins/note/note.js:11
-msgid "Edit article note"
-msgstr "Editar nota del artículo"
-
 #: plugins/vf_shared/init.php:17
 #: plugins/vf_shared/init.php:73
 msgid "Shared articles"
 msgstr "Artículos compartidos"
 
-#: plugins/auth_internal/init.php:67
-#, fuzzy
-msgid "Please enter your one time password:"
-msgstr "Contraseña de un solo uso incorrecta"
+#: plugins/bookmarklets/init.php:20
+msgid "Bookmarklets"
+msgstr "Bookmarklets"
 
-#: plugins/auth_internal/init.php:208
-msgid "Password has been changed."
-msgstr "La contraseña ha sido cambiada."
-
-#: plugins/auth_internal/init.php:210
-msgid "Old password is incorrect."
-msgstr "La contraseña antigua es incorrecta."
-
-#: plugins/af_readability/init.php:25
-msgid "Data saved."
+#: 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_readability/init.php:41
+#: 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 "Inline content"
-msgstr "Editar nota del artículo"
+msgid "Subscribe in Tiny Tiny RSS"
+msgstr "Actualizar Tiny Tiny RSS"
 
-#: plugins/af_readability/init.php:47
-msgid "Readability settings (af_readability)"
+#: plugins/bookmarklets/init.php:34
+msgid "Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS"
 msgstr ""
 
-#: plugins/af_readability/init.php:78
-msgid "Use Readability for pages shared via bookmarklet."
-msgstr ""
-
-#: plugins/af_readability/init.php:90
-#: plugins/af_psql_trgm/init.php:198
-msgid "Currently enabled for (click to edit):"
-msgstr ""
-
-#: plugins/af_readability/init.php:107
-#, fuzzy
-msgid "Readability"
-msgstr "Comprobar la disponibilidad"
-
-#: plugins/af_readability/init.php:118
-#, fuzzy
-msgid "Inline article content"
-msgstr "Editar nota del artículo"
-
 #: plugins/af_redditimgur/init.php:30
 msgid "Reddit content settings (af_redditimgur)"
 msgstr ""
@@ -2516,11 +2483,21 @@ msgstr ""
 msgid "Enable additional duplicate checking"
 msgstr ""
 
-#: plugins/af_redditimgur/init.php:79
-#: plugins/af_zz_imgproxy/init.php:252
-#, fuzzy
-msgid "Configuration saved"
-msgstr "Configuración guardada."
+#: plugins/af_comics/init.php:49
+msgid "Feeds supported by af_comics"
+msgstr ""
+
+#: plugins/af_comics/init.php:51
+msgid "The following comics are currently supported:"
+msgstr ""
+
+#: plugins/af_comics/init.php:69
+msgid "To subscribe to GoComics use the comic's regular web page as the feed URL (e.g. for the <em>Garfield</em> comic use <code>http://www.gocomics.com/garfield</code>)."
+msgstr ""
+
+#: plugins/af_comics/init.php:71
+msgid "Drop any updated filters into <code>filters.local</code> in plugin directory."
+msgstr ""
 
 #: plugins/af_psql_trgm/init.php:29
 #, php-format
@@ -2560,26 +2537,88 @@ msgstr ""
 msgid "Enable for all feeds:"
 msgstr "Habilitar categorías de fuentes"
 
+#: plugins/af_psql_trgm/init.php:198
+#: plugins/af_readability/init.php:90
+msgid "Currently enabled for (click to edit):"
+msgstr ""
+
 #: plugins/af_psql_trgm/init.php:216
 msgid "Similarity (pg_trgm)"
 msgstr ""
 
-#: plugins/af_comics/init.php:49
-msgid "Feeds supported by af_comics"
+#: plugins/af_readability/init.php:25
+msgid "Data saved."
 msgstr ""
 
-#: plugins/af_comics/init.php:51
-msgid "The following comics are currently supported:"
+#: plugins/af_readability/init.php:41
+#, fuzzy
+msgid "Inline content"
+msgstr "Editar nota del artículo"
+
+#: plugins/af_readability/init.php:47
+msgid "Readability settings (af_readability)"
 msgstr ""
 
-#: plugins/af_comics/init.php:69
-msgid "To subscribe to GoComics use the comic's regular web page as the feed URL (e.g. for the <em>Garfield</em> comic use <code>http://www.gocomics.com/garfield</code>)."
+#: plugins/af_readability/init.php:78
+msgid "Use Readability for pages shared via bookmarklet."
 msgstr ""
 
-#: plugins/af_comics/init.php:71
-msgid "Drop any updated filters into <code>filters.local</code> in plugin directory."
+#: plugins/af_readability/init.php:107
+#, fuzzy
+msgid "Readability"
+msgstr "Comprobar la disponibilidad"
+
+#: plugins/af_readability/init.php:118
+#, fuzzy
+msgid "Inline article content"
+msgstr "Editar nota del artículo"
+
+#: plugins/mailto/init.php:50
+#: plugins/mailto/init.php:58
+#: plugins/mail/init.php:118
+#: plugins/mail/init.php:124
+msgid "[Forwarded]"
+msgstr "[Reenviado]"
+
+#: plugins/mailto/init.php:50
+#: plugins/mail/init.php:118
+msgid "Multiple articles"
+msgstr "Múltiples artículos"
+
+#: plugins/mailto/init.php:74
+msgid "Clicking the following link to invoke your mail client:"
 msgstr ""
 
+#: plugins/mailto/init.php:78
+#, fuzzy
+msgid "Forward selected article(s) by email."
+msgstr "Enviar artículo por correo electrónico"
+
+#: plugins/mailto/init.php:81
+msgid "You should be able to edit the message before sending in your mail client."
+msgstr ""
+
+#: plugins/mailto/init.php:86
+msgid "Close this dialog"
+msgstr "Cerrar este diálogo"
+
+#: 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 "Plugin NSFW"
+
+#: plugins/nsfw/init.php:79
+msgid "Tags to consider NSFW (comma-separated)"
+msgstr ""
+
+#: plugins/nsfw/init.php:100
+msgid "Configuration saved."
+msgstr "Configuración guardada."
+
 #: plugins/import_export/init.php:53
 msgid "Import and export"
 msgstr "Importar y exportar"
@@ -2646,104 +2685,6 @@ msgstr ""
 msgid "No file uploaded."
 msgstr "No se ha cargado ningún archivo."
 
-#: plugins/mail/init.php:29
-msgid "Mail addresses saved."
-msgstr ""
-
-#: plugins/mail/init.php:35
-#, fuzzy
-msgid "Mail plugin"
-msgstr "Plugins de usuario"
-
-#: plugins/mail/init.php:37
-msgid "You can set predefined email addressed here (comma-separated list):"
-msgstr ""
-
-#: plugins/mail/init.php:118
-#: plugins/mail/init.php:124
-#: plugins/mailto/init.php:50
-#: plugins/mailto/init.php:58
-msgid "[Forwarded]"
-msgstr "[Reenviado]"
-
-#: plugins/mail/init.php:118
-#: plugins/mailto/init.php:50
-msgid "Multiple articles"
-msgstr "Múltiples artículos"
-
-#: plugins/mail/init.php:146
-msgid "To:"
-msgstr "Para:"
-
-#: plugins/mail/init.php:161
-msgid "Subject:"
-msgstr "Asunto:"
-
-#: plugins/mail/init.php:178
-msgid "Send e-mail"
-msgstr "Enviar correo electrónico"
-
-#: plugins/close_button/init.php:25
-msgid "Close article"
-msgstr "Cerrar artículo"
-
-#: plugins/bookmarklets/init.php:20
-msgid "Bookmarklets"
-msgstr "Bookmarklets"
-
-#: plugins/bookmarklets/init.php:22
-msgid "Drag the link below to your browser toolbar, open the feed you're interested in in your browser and click on the link to subscribe to it."
-msgstr ""
-
-#: 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 "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/toggle_sidebar/init.php:23
-msgid "Collapse feedlist"
-msgstr "Cerrar la lista de fuentes"
-
-#: plugins/af_zz_imgproxy/init.php:208
-msgid "Image proxy settings (af_zz_imgproxy)"
-msgstr ""
-
-#: plugins/af_zz_imgproxy/init.php:232
-#, fuzzy
-msgid "Enable proxy for all remote images."
-msgstr "Habilitar categorías de fuentes"
-
-#: plugins/af_zz_imgproxy/init.php:236
-#, fuzzy
-msgid "Don't cache files locally."
-msgstr "Guardar las imágenes en la memoria caché local"
-
-#: plugins/mailto/init.php:74
-msgid "Clicking the following link to invoke your mail client:"
-msgstr ""
-
-#: plugins/mailto/init.php:78
-#, fuzzy
-msgid "Forward selected article(s) by email."
-msgstr "Enviar artículo por correo electrónico"
-
-#: plugins/mailto/init.php:81
-msgid "You should be able to edit the message before sending in your mail client."
-msgstr ""
-
-#: plugins/mailto/init.php:86
-msgid "Close this dialog"
-msgstr "Cerrar este diálogo"
-
 #: plugins/share/init.php:41
 msgid "You can disable all articles shared by unique URLs here."
 msgstr ""
@@ -2764,461 +2705,613 @@ msgstr ""
 msgid "Unshare article"
 msgstr "Dejar de compartir el artículo"
 
-#: js/FeedTree.js:75
+#: plugins/toggle_sidebar/init.php:23
+msgid "Collapse feedlist"
+msgstr "Cerrar la lista de fuentes"
+
+#: plugins/close_button/init.php:25
+msgid "Close article"
+msgstr "Cerrar artículo"
+
+#: plugins/mail/init.php:29
+msgid "Mail addresses saved."
+msgstr ""
+
+#: plugins/mail/init.php:35
+#, fuzzy
+msgid "Mail plugin"
+msgstr "Plugins de usuario"
+
+#: plugins/mail/init.php:37
+msgid "You can set predefined email addressed here (comma-separated list):"
+msgstr ""
+
+#: plugins/mail/init.php:146
+msgid "To:"
+msgstr "Para:"
+
+#: plugins/mail/init.php:161
+msgid "Subject:"
+msgstr "Asunto:"
+
+#: plugins/mail/init.php:178
+msgid "Send e-mail"
+msgstr "Enviar correo electrónico"
+
+#: plugins/note/init.php:28
+#: plugins/note/note.js:11
+msgid "Edit article note"
+msgstr "Editar nota del artículo"
+
+#: plugins/auth_internal/init.php:67
+#, fuzzy
+msgid "Please enter your one time password:"
+msgstr "Contraseña de un solo uso incorrecta"
+
+#: plugins/auth_internal/init.php:208
+msgid "Password has been changed."
+msgstr "La contraseña ha sido cambiada."
+
+#: plugins/auth_internal/init.php:210
+msgid "Old password is incorrect."
+msgstr "La contraseña antigua es incorrecta."
+
+#: js/FeedTree.js:76
 #, fuzzy
 msgid "(Un)collapse"
 msgstr "Mostrar/ocultar la barra lateral"
 
-#: js/PrefFeedTree.js:35
+#: js/PrefFeedTree.js:36
 msgid "Edit category"
 msgstr "Editar categoría"
 
-#: js/PrefFeedTree.js:42
+#: js/PrefFeedTree.js:43
 msgid "Remove category"
 msgstr "Borrar categoría"
 
-#: js/PrefFilterTree.js:46
+#: js/PrefFilterTree.js:47
 msgid "Inverse"
 msgstr "Inverso"
 
-#: js/feedlist.js:511
+#: js/feedlist.js:461
 #, fuzzy
 msgid "Mark %w in %s older than 1 day as read?"
 msgstr "¿Reiniciar la puntuación de los artículos en %?"
 
-#: js/feedlist.js:514
+#: js/feedlist.js:464
 #, fuzzy
 msgid "Mark %w in %s older than 1 week as read?"
 msgstr "¿Reiniciar la puntuación de los artículos en %?"
 
-#: js/feedlist.js:517
+#: js/feedlist.js:467
 #, fuzzy
 msgid "Mark %w in %s older than 2 weeks as read?"
 msgstr "¿Reiniciar la puntuación de los artículos en %?"
 
-#: js/feedlist.js:520
+#: js/feedlist.js:470
 #, fuzzy
 msgid "Mark %w in %s as read?"
 msgstr "¿Reiniciar la puntuación de los artículos en %?"
 
-#: js/feedlist.js:523
+#: js/feedlist.js:473
 #, fuzzy
 msgid "search results"
 msgstr "Resultados de búsqueda: %s"
 
-#: js/feedlist.js:523
+#: js/feedlist.js:473
 #, fuzzy
 msgid "all articles"
 msgstr "Todos"
 
-#: js/functions.js:74
+#: js/functions.js:100
 msgid "Close"
 msgstr ""
 
-#: js/functions.js:141
+#: js/functions.js:167
 msgid "Click to close"
 msgstr "Haga clic para cerrar"
 
-#: js/functions.js:448
+#: js/functions.js:456
 msgid "Error explained"
 msgstr "Error explicado"
 
-#: js/functions.js:592
+#: js/functions.js:490
+msgid "Upload complete."
+msgstr "Carga completa."
+
+#: js/functions.js:508
+msgid "Remove stored feed icon?"
+msgstr "¿Borrar el icono de la fuente?"
+
+#: js/functions.js:510
+msgid "Removing feed icon..."
+msgstr "Borrando el icono de la fuente..."
+
+#: js/functions.js:515
+msgid "Feed icon removed."
+msgstr "Icono de la fuente borrado."
+
+#: js/functions.js:532
+#, fuzzy
+msgid "Please select an image file to upload."
+msgstr "¿Eliminar los filtros seleccionados?"
+
+#: js/functions.js:533
+msgid "Upload new icon for this feed?"
+msgstr ""
+
+#: js/functions.js:534
+msgid "Uploading, please wait..."
+msgstr "Cargando. Por favor, espere..."
+
+#: js/functions.js:542
+msgid "Please enter label caption:"
+msgstr "Por favor, introduzca el nombre del marcador:"
+
+#: js/functions.js:575
 msgid "Subscribe to Feed"
 msgstr "Suscribirse a una fuente"
 
-#: js/functions.js:621
+#: js/functions.js:602
 msgid "Failed to parse output. This can indicate server timeout and/or network issues. Backend output was logged to browser console."
 msgstr ""
 
-#: js/functions.js:636
+#: js/functions.js:617
 #, perl-format
 msgid "Subscribed to %s"
 msgstr "Se ha suscrito a %s"
 
-#: js/functions.js:641
+#: js/functions.js:622
 msgid "Specified URL seems to be invalid."
 msgstr ""
 
-#: js/functions.js:644
+#: js/functions.js:625
 msgid "Specified URL doesn't seem to contain any feeds."
 msgstr ""
 
-#: js/functions.js:656
+#: js/functions.js:637
 msgid "Expand to select feed"
 msgstr "Expandir para seleccionar fuente"
 
-#: js/functions.js:668
+#: js/functions.js:649
 #, perl-format
 msgid "Couldn't download the specified URL: %s"
 msgstr ""
 
-#: js/functions.js:672
+#: js/functions.js:653
 #, perl-format
 msgid "XML validation failed: %s"
 msgstr "Fallo de validación de XML: %s"
 
-#: js/functions.js:676
+#: js/functions.js:657
 #, fuzzy
 msgid "You are already subscribed to this feed."
 msgstr "Se ha suscrito a %s"
 
-#: js/functions.js:1136
+#: js/functions.js:1098
 msgid "Generate new syndication address for this feed?"
 msgstr ""
 
-#: js/functions.js:1140
-#: js/prefs.js:1095
+#: js/functions.js:1100
+#: js/prefs.js:870
 msgid "Trying to change address..."
 msgstr "Intentando cambiar la dirección..."
 
-#: js/functions.js:1245
-#: js/tt-rss.js:446
-#: js/tt-rss.js:673
+#: js/functions.js:1199
+#: js/tt-rss.js:399
+#: js/tt-rss.js:612
 msgid "You can't edit this kind of feed."
 msgstr ""
 
-#: js/functions.js:1260
+#: js/functions.js:1213
 msgid "Edit Feed"
 msgstr "Editar fuente"
 
-#: js/functions.js:1266
-#: js/prefs.js:100
-#: js/prefs.js:209
-#: js/prefs.js:647
+#: js/functions.js:1217
+#: js/prefs.js:176
+#: js/prefs.js:523
+#: js/prefs.js:1139
+#: js/prefs.js:78
 msgid "Saving data..."
 msgstr "Guardando datos..."
 
-#: js/functions.js:1293
+#: js/functions.js:1243
 msgid "More Feeds"
 msgstr "Más fuentes"
 
-#: js/functions.js:1355
-#: js/functions.js:1464
-#: js/prefs.js:398
-#: js/prefs.js:540
-#: js/prefs.js:558
-#: js/prefs.js:1077
+#: js/functions.js:1297
+#: js/functions.js:1383
+#: js/prefs.js:332
+#: js/prefs.js:455
+#: js/prefs.js:473
+#: js/prefs.js:855
 msgid "No feeds are selected."
 msgstr "No se han seleccionado fuentes."
 
-#: js/functions.js:1398
+#: js/functions.js:1329
 msgid "Remove selected feeds from the archive? Feeds with stored articles will not be removed."
 msgstr ""
 
-#: js/functions.js:1435
+#: js/functions.js:1360
 msgid "Feeds with update errors"
 msgstr "Fuentes con errores de actualización"
 
-#: js/functions.js:1446
-#: js/prefs.js:1058
+#: js/functions.js:1369
+#: js/prefs.js:841
 msgid "Remove selected feeds?"
 msgstr "¿Borrar fuentes seleccionadas?"
 
-#: js/functions.js:1449
-#: js/prefs.js:1061
+#: js/functions.js:1370
+#: js/prefs.js:842
 msgid "Removing selected feeds..."
 msgstr "Borrando fuentes seleccionadas..."
 
-#: js/prefs.js:60
-msgid "Please enter login:"
-msgstr "Por favor, introduzca el nombre de usuario:"
-
-#: js/prefs.js:67
-msgid "Can't create user: no login specified."
-msgstr ""
-
-#: js/prefs.js:71
-msgid "Adding user..."
-msgstr "Añadiendo usuario..."
-
-#: js/prefs.js:96
-msgid "User Editor"
-msgstr "Editor de usuario"
-
-#: js/prefs.js:131
-msgid "Edit Filter"
-msgstr "Editar filtro"
-
-#: js/prefs.js:170
+#: js/prefs.js:143
 msgid "Remove filter?"
 msgstr "¿Borrar el filtro?"
 
-#: js/prefs.js:175
+#: js/prefs.js:148
 msgid "Removing filter..."
 msgstr "Eliminando el filtro..."
 
-#: js/prefs.js:292
+#: js/prefs.js:251
 msgid "Remove selected labels?"
 msgstr "¿Borrar los marcadores seleccionados?"
 
-#: js/prefs.js:295
+#: js/prefs.js:252
 msgid "Removing selected labels..."
 msgstr "Eliminando los marcadores seleccionados..."
 
-#: js/prefs.js:308
-#: js/prefs.js:1144
+#: js/prefs.js:262
+#: js/prefs.js:909
 msgid "No labels are selected."
 msgstr "No se han seleccionado marcadores."
 
-#: js/prefs.js:320
+#: js/prefs.js:274
 msgid "Remove selected users? Neither default admin nor your account will be removed."
 msgstr ""
 
-#: js/prefs.js:323
+#: js/prefs.js:275
 msgid "Removing selected users..."
 msgstr "Eliminando los usuarios seleccionados..."
 
-#: js/prefs.js:338
-#: js/prefs.js:408
-#: js/prefs.js:427
-#: js/prefs.js:461
+#: js/prefs.js:286
+#: js/prefs.js:342
+#: js/prefs.js:361
+#: js/prefs.js:387
 msgid "No users are selected."
 msgstr "No se han seleccionado usuarios."
 
-#: js/prefs.js:350
+#: js/prefs.js:297
 msgid "Remove selected filters?"
 msgstr "¿Eliminar los filtros seleccionados?"
 
-#: js/prefs.js:353
+#: js/prefs.js:298
 msgid "Removing selected filters..."
 msgstr "Eliminando los filtros seleccionados..."
 
-#: js/prefs.js:366
-#: js/prefs.js:495
-#: js/prefs.js:514
+#: js/prefs.js:308
+#: js/prefs.js:419
+#: js/prefs.js:438
 msgid "No filters are selected."
 msgstr "No se han seleccionado filtros."
 
-#: js/prefs.js:378
+#: js/prefs.js:319
 msgid "Unsubscribe from selected feeds?"
 msgstr "¿Cancelar la suscripción a las fuentes seleccionadas?"
 
-#: js/prefs.js:382
+#: js/prefs.js:321
 msgid "Unsubscribing from selected feeds..."
 msgstr "Cancelando la suscripción a las fuentes seleccionadas..."
 
-#: js/prefs.js:413
-#: js/prefs.js:432
-#: js/prefs.js:466
+#: js/prefs.js:347
+#: js/prefs.js:366
+#: js/prefs.js:392
 msgid "Please select only one user."
 msgstr ""
 
-#: js/prefs.js:436
+#: js/prefs.js:370
 #, fuzzy
 msgid "Reset password of selected user?"
 msgstr "Restablecer contraseña"
 
-#: js/prefs.js:439
+#: js/prefs.js:371
 #, fuzzy
 msgid "Resetting password for selected user..."
 msgstr "Eliminando los usuarios seleccionados..."
 
-#: js/prefs.js:500
+#: js/prefs.js:424
 #, fuzzy
 msgid "Please select only one filter."
 msgstr "¿Eliminar los filtros seleccionados?"
 
-#: js/prefs.js:518
+#: js/prefs.js:442
 msgid "Combine selected filters?"
 msgstr "¿Combinar los filtros seleccionados?"
 
-#: js/prefs.js:521
+#: js/prefs.js:443
 msgid "Joining filters..."
 msgstr "Uniendo filtros..."
 
-#: js/prefs.js:580
+#: js/prefs.js:487
 msgid "Edit Multiple Feeds"
 msgstr "Editar múltiples fuentes"
 
-#: js/prefs.js:604
+#: js/prefs.js:511
 #, fuzzy
 msgid "Save changes to selected feeds?"
 msgstr "Suscribirse a la fuente seleccionada"
 
-#: js/prefs.js:681
+#: js/prefs.js:552
 msgid "OPML Import"
 msgstr "Importar OPML"
 
-#: js/prefs.js:700
+#: js/prefs.js:571
 msgid "Please choose an OPML file first."
 msgstr ""
 
-#: js/prefs.js:703
+#: js/prefs.js:574
 #: plugins/import_export/import_export.js:115
 msgid "Importing, please wait..."
 msgstr "Importando. Por favor, espere..."
 
-#: js/prefs.js:869
+#: js/prefs.js:737
 msgid "Reset to defaults?"
 msgstr "¿Restaurar las opciones por defecto?"
 
-#: js/prefs.js:1468
-msgid "Subscribing to feeds..."
-msgstr "Suscribiéndose a las fuentes..."
-
-#: js/prefs.js:1487
-msgid "Clear stored data for this plugin?"
+#: js/prefs.js:777
+#, perl-format
+msgid "Remove category %s? Any nested feeds would be placed into Uncategorized."
 msgstr ""
 
-#: js/prefs.js:1501
-msgid "Clear all messages in the error log?"
+#: js/prefs.js:778
+msgid "Removing category..."
+msgstr "Eliminando categoría..."
+
+#: js/prefs.js:794
+msgid "Remove selected categories?"
+msgstr "¿Eliminar las categorías seleccionadas?"
+
+#: js/prefs.js:795
+msgid "Removing selected categories..."
+msgstr "Eliminando las categorías seleccionadas..."
+
+#: js/prefs.js:805
+msgid "No categories are selected."
+msgstr "No se han seleccionado categorías."
+
+#: js/prefs.js:812
+msgid "Category title:"
+msgstr "Nombre de la categoría:"
+
+#: js/prefs.js:815
+msgid "Creating category..."
+msgstr "Creando categoría..."
+
+#: js/prefs.js:832
+msgid "Feeds without recent updates"
+msgstr "Fuentes sin actualizaciones recientes"
+
+#: js/prefs.js:869
+msgid "Replace current OPML publishing address with a new one?"
 msgstr ""
 
-#: js/tt-rss.js:118
+#: js/prefs.js:898
+#, fuzzy
+msgid "Reset selected labels to default colors?"
+msgstr "¿Borrar los marcadores seleccionados?"
+
+#: js/prefs.js:926
+msgid "Settings Profiles"
+msgstr "Perfiles de preferencias"
+
+#: js/prefs.js:935
+msgid "Remove selected profiles? Active and default profiles will not be removed."
+msgstr ""
+
+#: js/prefs.js:936
+msgid "Removing selected profiles..."
+msgstr "Borrando los perfiles seleccionados..."
+
+#: js/prefs.js:948
+msgid "No profiles are selected."
+msgstr "No se ha seleccionado ningún perfil."
+
+#: js/prefs.js:955
+#: js/prefs.js:997
+msgid "Activate selected profile?"
+msgstr "¿Activar el perfil seleccionado?"
+
+#: js/prefs.js:964
+#: js/prefs.js:1008
+msgid "Please choose a profile to activate."
+msgstr ""
+
+#: js/prefs.js:969
+msgid "Creating profile..."
+msgstr "Creando perfil..."
+
+#: js/prefs.js:1016
+msgid "This will invalidate all previously generated feed URLs. Continue?"
+msgstr ""
+
+#: js/prefs.js:1017
+#: plugins/share/share_prefs.js:3
+msgid "Clearing URLs..."
+msgstr "Limpiando URL..."
+
+#: js/prefs.js:1020
+msgid "Generated URLs cleared."
+msgstr "Las URL generadas han sido borradas."
+
+#: js/prefs.js:1053
+#, fuzzy
+msgid "Rename category to:"
+msgstr "Borrar categoría"
+
+#: js/prefs.js:1074
+msgid "Label Editor"
+msgstr "Editor de marcadores"
+
+#: js/tt-rss.js:111
 #, fuzzy
 msgid "Mark all articles as read?"
 msgstr "Marcar artículos anteriores como leídos"
 
-#: js/tt-rss.js:124
+#: js/tt-rss.js:115
 #, fuzzy
 msgid "Marking all feeds as read..."
 msgstr "Marcar fuente como leída"
 
-#: js/tt-rss.js:398
+#: js/tt-rss.js:351
 msgid "Please enable mail plugin first."
 msgstr ""
 
-#: js/tt-rss.js:527
+#: js/tt-rss.js:477
 msgid "Please enable embed_original plugin first."
 msgstr ""
 
-#: js/tt-rss.js:540
-#: js/tt-rss.js:723
+#: js/tt-rss.js:490
+#: js/tt-rss.js:653
 msgid "Widescreen is not available in combined mode."
 msgstr ""
 
-#: js/tt-rss.js:821
-msgid "You can't rescore this kind of feed."
-msgstr ""
-
-#: js/tt-rss.js:826
-#: js/tt-rss.js:686
-#, fuzzy
-msgid "Please select some feed first."
-msgstr "Limpiando las fuentes seleccionadas..."
-
-#: js/tt-rss.js:831
-#, fuzzy, perl-format
-msgid "Rescore articles in %s?"
-msgstr "¿Reiniciar la puntuación de los artículos en %?"
-
-#: js/tt-rss.js:834
-msgid "Rescoring articles..."
-msgstr "Reiniciando la puntuación de los artículos..."
-
-#: js/viewfeed.js:917
-#: js/viewfeed.js:955
-#: js/viewfeed.js:1003
-#: js/viewfeed.js:1924
-#: plugins/mail/mail.js:7
+#: js/viewfeed.js:444
+#: js/viewfeed.js:461
+#: js/viewfeed.js:484
+#: js/viewfeed.js:521
+#: js/viewfeed.js:542
+#: js/viewfeed.js:651
+#: js/viewfeed.js:685
+#: js/viewfeed.js:727
+#: js/viewfeed.js:1564
 #: plugins/mailto/init.js:7
-#: js/viewfeed.js:675
-#: js/viewfeed.js:697
-#: js/viewfeed.js:718
-#: js/viewfeed.js:777
-#: js/viewfeed.js:805
+#: plugins/mail/mail.js:7
 msgid "No articles are selected."
 msgstr "No se han seleccionado artículos."
 
-#: js/viewfeed.js:925
+#: js/viewfeed.js:659
 #, 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:927
+#: js/viewfeed.js:661
 #, 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:964
+#: js/viewfeed.js:694
 #, 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:967
+#: js/viewfeed.js:697
 #, 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:969
+#: js/viewfeed.js:698
 msgid "Please note that unstarred articles might get purged on next feed update."
 msgstr ""
 
-#: js/viewfeed.js:1009
+#: js/viewfeed.js:733
 #, 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:1029
+#: js/viewfeed.js:753
 msgid "Edit article Tags"
 msgstr "Editar las etiquetas del artículo"
 
-#: js/viewfeed.js:1035
+#: js/viewfeed.js:757
 msgid "Saving article tags..."
 msgstr "Guardando las etiquetas del artículo..."
 
-#: js/viewfeed.js:1666
+#: js/viewfeed.js:1015
+msgid "No article is selected."
+msgstr "No se ha seleccionado ningún artículo."
+
+#: js/viewfeed.js:1050
+msgid "No articles found to mark"
+msgstr ""
+
+#: js/viewfeed.js:1052
+#, fuzzy, perl-format
+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"
+
+#: js/viewfeed.js:1312
 msgid "Open original article"
 msgstr "Abrir artículo original"
 
-#: js/viewfeed.js:1673
+#: js/viewfeed.js:1319
 msgid "Display article URL"
 msgstr "Mostrar la URL del artículo"
 
-#: js/viewfeed.js:1780
+#: js/viewfeed.js:1426
 msgid "Assign label"
 msgstr "Asignar marcador"
 
-#: js/viewfeed.js:1785
+#: js/viewfeed.js:1431
 msgid "Remove label"
 msgstr "Eliminar marcador"
 
-#: js/viewfeed.js:1817
+#: js/viewfeed.js:1463
 msgid "Select articles in group"
 msgstr "Seleccionar los artículos del grupo"
 
-#: js/viewfeed.js:1827
+#: js/viewfeed.js:1473
 msgid "Mark group as read"
 msgstr "Marcar grupo como leído"
 
-#: js/viewfeed.js:1839
+#: js/viewfeed.js:1485
 msgid "Mark feed as read"
 msgstr "Marcar fuente como leída"
 
-#: js/viewfeed.js:1892
+#: js/viewfeed.js:1538
 #, fuzzy
 msgid "Please enter new score for selected articles:"
 msgstr "Introduzca el nombre de la categoría:"
 
-#: js/viewfeed.js:1955
+#: js/viewfeed.js:1571
 #, fuzzy
 msgid "Please enter new score for this article:"
 msgstr "Introduzca el nombre de la categoría:"
 
-#: js/viewfeed.js:1986
+#: js/viewfeed.js:1591
 msgid "Article URL:"
 msgstr "URL del artículo:"
 
-#: plugins/note/note.js:17
-msgid "Saving article note..."
-msgstr "Guardando nota del artículo..."
+#: plugins/embed_original/init.js:6
+msgid "Sorry, your browser does not support sandboxed iframes."
+msgstr ""
 
 #: plugins/af_psql_trgm/init.js:11
 #, fuzzy
 msgid "Related articles"
 msgstr "Artículos compartidos"
 
+#: plugins/mailto/init.js:21
+#: plugins/mail/mail.js:21
+msgid "Forward article by email"
+msgstr "Enviar artículo por correo electrónico"
+
+#: plugins/shorten_expanded/init.js:43
+msgid "Click to expand article"
+msgstr "Desplegar el artículo"
+
 #: plugins/import_export/import_export.js:13
 msgid "Export Data"
 msgstr "Exportar datos"
@@ -3238,264 +3331,171 @@ msgstr "Importación de datos"
 msgid "Please choose the file first."
 msgstr ""
 
-#: plugins/mail/mail.js:21
-#: plugins/mailto/init.js:21
-msgid "Forward article by email"
-msgstr "Enviar artículo por correo electrónico"
-
-#: plugins/mail/mail.js:36
-msgid "Error sending email:"
+#: plugins/share/share_prefs.js:2
+msgid "This will invalidate all previously shared article URLs. Continue?"
 msgstr ""
 
-#: plugins/mail/mail.js:38
-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:45
-msgid "Click to expand article"
-msgstr "Desplegar el artículo"
+#: plugins/share/share_prefs.js:8
+msgid "Shared URLs cleared."
+msgstr "Las URL compartidas han sido borradas."
 
 #: plugins/share/share.js:10
 msgid "Share article by URL"
 msgstr "Compartir artículo mediante URL"
 
-#: plugins/share/share.js:14
+#: plugins/share/share.js:13
 msgid "Generate new share URL for this article?"
 msgstr ""
 
-#: plugins/share/share.js:18
+#: plugins/share/share.js:15
 msgid "Trying to change URL..."
 msgstr "Intentando cambiar la URL..."
 
-#: plugins/share/share.js:55
+#: plugins/share/share.js:48
 msgid "Remove sharing for this article?"
 msgstr ""
 
-#: plugins/share/share.js:59
+#: plugins/share/share.js:50
 msgid "Trying to unshare..."
 msgstr "Intentando dejar de compartir..."
 
-#: plugins/share/share_prefs.js:3
-msgid "This will invalidate all previously shared article URLs. Continue?"
+#: plugins/mail/mail.js:30
+msgid "Error sending email:"
 msgstr ""
 
-#: plugins/share/share_prefs.js:6
-#: js/prefs.js:1277
-msgid "Clearing URLs..."
-msgstr "Limpiando URL..."
+#: plugins/mail/mail.js:32
+msgid "Your message has been sent."
+msgstr ""
 
-#: plugins/share/share_prefs.js:13
-msgid "Shared URLs cleared."
-msgstr "Las URL compartidas han sido borradas."
+#: plugins/note/note.js:15
+msgid "Saving article note..."
+msgstr "Guardando nota del artículo..."
 
-#: js/feedlist.js:204
+#: js/feedlist.js:168
 msgid "Your password is at default value"
 msgstr ""
 
-#: js/feedlist.js:453
+#: js/feedlist.js:413
 #, fuzzy
 msgid "Mark all articles in %s as read?"
 msgstr "¿Reiniciar la puntuación de los artículos en %?"
 
-#: js/functions.js:494
-msgid "Upload complete."
-msgstr "Carga completa."
-
-#: js/functions.js:511
-msgid "Remove stored feed icon?"
-msgstr "¿Borrar el icono de la fuente?"
-
-#: js/functions.js:516
-msgid "Removing feed icon..."
-msgstr "Borrando el icono de la fuente..."
-
-#: js/functions.js:521
-msgid "Feed icon removed."
-msgstr "Icono de la fuente borrado."
-
-#: js/functions.js:537
-#, fuzzy
-msgid "Please select an image file to upload."
-msgstr "¿Eliminar los filtros seleccionados?"
-
-#: js/functions.js:539
-msgid "Upload new icon for this feed?"
-msgstr ""
-
-#: js/functions.js:540
-msgid "Uploading, please wait..."
-msgstr "Cargando. Por favor, espere..."
-
-#: js/functions.js:550
-msgid "Please enter label caption:"
-msgstr "Por favor, introduzca el nombre del marcador:"
-
-#: js/functions.js:555
-#, fuzzy
-msgid "Can't create label: missing caption."
-msgstr "Por favor, introduzca el nombre del marcador:"
-
-#: js/functions.js:797
+#: js/functions.js:764
 msgid "Edit rule"
 msgstr "Editar regla"
 
-#: js/functions.js:819
+#: js/functions.js:786
 msgid "Edit action"
 msgstr "Editar acción"
 
-#: js/functions.js:860
+#: js/functions.js:825
 msgid "Looking for articles (%d processed, %f found)..."
 msgstr ""
 
-#: js/functions.js:890
+#: js/functions.js:855
 #, fuzzy
 msgid "Found %d articles matching this filter:"
 msgstr "Artículos coincidentes con este filtro:"
 
-#: js/functions.js:942
+#: js/functions.js:907
 msgid "Create Filter"
 msgstr "Crear filtro"
 
-#: js/functions.js:1060
-#: js/tt-rss.js:692
+#: js/functions.js:1016
+#: js/tt-rss.js:631
 msgid "Unsubscribe from %s?"
 msgstr "¿Cancelar la suscripción a %s?"
 
-#: js/functions.js:1063
+#: js/functions.js:1019
 msgid "Removing feed..."
 msgstr "Eliminando la fuente..."
 
-#: js/functions.js:1489
+#: js/functions.js:1410
 msgid "Help"
 msgstr "Ayuda"
 
-#: js/prefs.js:973
-msgid "Remove category %s? Any nested feeds would be placed into Uncategorized."
+#: js/prefs.js:44
+msgid "Please enter login:"
+msgstr "Por favor, introduzca el nombre de usuario:"
+
+#: js/prefs.js:51
+msgid "Can't create user: no login specified."
 msgstr ""
 
-#: js/prefs.js:979
-msgid "Removing category..."
-msgstr "Eliminando categoría..."
+#: js/prefs.js:55
+msgid "Adding user..."
+msgstr "Añadiendo usuario..."
 
-#: js/prefs.js:997
-msgid "Remove selected categories?"
-msgstr "¿Eliminar las categorías seleccionadas?"
+#: js/prefs.js:74
+msgid "User Editor"
+msgstr "Editor de usuario"
 
-#: js/prefs.js:1000
-msgid "Removing selected categories..."
-msgstr "Eliminando las categorías seleccionadas..."
+#: js/prefs.js:104
+msgid "Edit Filter"
+msgstr "Editar filtro"
 
-#: js/prefs.js:1013
-msgid "No categories are selected."
-msgstr "No se han seleccionado categorías."
+#: js/prefs.js:1175
+msgid "Subscribing to feeds..."
+msgstr "Suscribiéndose a las fuentes..."
 
-#: js/prefs.js:1020
-msgid "Category title:"
-msgstr "Nombre de la categoría:"
-
-#: js/prefs.js:1024
-msgid "Creating category..."
-msgstr "Creando categoría..."
-
-#: js/prefs.js:1047
-msgid "Feeds without recent updates"
-msgstr "Fuentes sin actualizaciones recientes"
-
-#: js/prefs.js:1091
-msgid "Replace current OPML publishing address with a new one?"
+#: js/prefs.js:1191
+msgid "Clear stored data for this plugin?"
 msgstr ""
 
-#: js/prefs.js:1129
-#, fuzzy
-msgid "Reset selected labels to default colors?"
-msgstr "¿Borrar los marcadores seleccionados?"
-
-#: js/prefs.js:1161
-msgid "Settings Profiles"
-msgstr "Perfiles de preferencias"
-
-#: js/prefs.js:1170
-msgid "Remove selected profiles? Active and default profiles will not be removed."
+#: js/prefs.js:1203
+msgid "Clear all messages in the error log?"
 msgstr ""
 
-#: js/prefs.js:1173
-msgid "Removing selected profiles..."
-msgstr "Borrando los perfiles seleccionados..."
-
-#: js/prefs.js:1189
-msgid "No profiles are selected."
-msgstr "No se ha seleccionado ningún perfil."
-
-#: js/prefs.js:1197
-#: js/prefs.js:1250
-msgid "Activate selected profile?"
-msgstr "¿Activar el perfil seleccionado?"
-
-#: js/prefs.js:1214
-#: js/prefs.js:1266
-msgid "Please choose a profile to activate."
-msgstr ""
-
-#: js/prefs.js:1219
-msgid "Creating profile..."
-msgstr "Creando perfil..."
-
-#: js/prefs.js:1274
-msgid "This will invalidate all previously generated feed URLs. Continue?"
-msgstr ""
-
-#: js/prefs.js:1284
-msgid "Generated URLs cleared."
-msgstr "Las URL generadas han sido borradas."
-
-#: js/prefs.js:1356
-msgid "Label Editor"
-msgstr "Editor de marcadores"
-
-#: js/tt-rss.js:681
+#: js/tt-rss.js:620
 msgid "You can't unsubscribe from the category."
 msgstr ""
 
-#: js/viewfeed.js:127
-#: js/viewfeed.js:177
-#: js/viewfeed.js:194
+#: js/tt-rss.js:625
+#, fuzzy
+msgid "Please select some feed first."
+msgstr "Limpiando las fuentes seleccionadas..."
+
+#: js/viewfeed.js:89
+#: js/viewfeed.js:135
+#: js/viewfeed.js:152
 #, fuzzy
 msgid "Click to open next unread feed."
 msgstr "Haga clic para editar fuente"
 
-#: js/viewfeed.js:131
+#: js/viewfeed.js:93
 msgid "Cancel search"
 msgstr "Cancelar búsqueda"
 
-#: js/viewfeed.js:191
+#: js/viewfeed.js:149
 msgid "New articles found, reload feed to continue."
 msgstr ""
 
-#: js/viewfeed.js:620
+#: js/viewfeed.js:405
 #, 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:1284
-msgid "No article is selected."
-msgstr "No se ha seleccionado ningún artículo."
+#~ msgid "Rescore feed"
+#~ msgstr "Reiniciar la puntuación"
 
-#: js/viewfeed.js:1319
-msgid "No articles found to mark"
-msgstr ""
+#~ msgid "Create label..."
+#~ msgstr "Crear marcador..."
+
+#~ msgid "Create filter..."
+#~ msgstr "Crear filtro..."
 
-#: js/viewfeed.js:1321
 #, 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 "Rescore articles in %s?"
+#~ msgstr "¿Reiniciar la puntuación de los artículos en %?"
+
+#~ msgid "Rescoring articles..."
+#~ msgstr "Reiniciando la puntuación de los artículos..."
+
+#, fuzzy
+#~ msgid "Can't create label: missing caption."
+#~ msgstr "Por favor, introduzca el nombre del marcador:"
 
 #~ msgid "Firefox integration"
 #~ msgstr "Integración con Firefox"
diff --git a/locale/fi_FI/LC_MESSAGES/messages.mo b/locale/fi_FI/LC_MESSAGES/messages.mo
index 39bd77119..790548b7d 100644
Binary files a/locale/fi_FI/LC_MESSAGES/messages.mo and b/locale/fi_FI/LC_MESSAGES/messages.mo differ
diff --git a/locale/fi_FI/LC_MESSAGES/messages.po b/locale/fi_FI/LC_MESSAGES/messages.po
index 09e28c750..161a3f06b 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: 2018-10-10 08:24+0300\n"
+"POT-Creation-Date: 2018-12-01 12:59+0300\n"
 "PO-Revision-Date: 2015-06-25 22:05+0300\n"
 "Last-Translator: Henrik Ahlgren <pablo@seestieto.com>\n"
 "Language-Team: \n"
@@ -96,8 +96,8 @@ msgid "Weekly"
 msgstr "Viikoittain"
 
 #: backend.php:103
-#: classes/pref/users.php:47
 #: classes/pref/system.php:51
+#: classes/pref/users.php:47
 msgid "User"
 msgstr "Käyttäjä"
 
@@ -167,33 +167,33 @@ msgstr "Lisäosaa ei löydy"
 
 #: index.php:151
 #: index.php:167
-#: index.php:285
+#: index.php:282
 #: prefs.php:120
 #: classes/backend.php:5
 #: classes/pref/labels.php:294
-#: classes/pref/feeds.php:1230
 #: classes/pref/filters.php:822
-#: js/feedlist.js:148
-#: js/feedlist.js:491
-#: js/feedlist.js:539
-#: js/functions.js:314
-#: js/functions.js:1336
-#: js/prefs.js:562
-#: js/prefs.js:754
-#: js/prefs.js:1488
-#: js/prefs.js:1503
-#: js/tt-rss.js:547
-#: js/viewfeed.js:1180
+#: classes/pref/feeds.php:1229
+#: js/feedlist.js:118
+#: js/feedlist.js:446
+#: js/feedlist.js:487
+#: js/functions.js:328
+#: js/functions.js:551
+#: js/functions.js:1286
+#: js/prefs.js:477
+#: js/prefs.js:617
+#: js/prefs.js:956
+#: js/prefs.js:1000
+#: js/prefs.js:1028
+#: js/prefs.js:1037
+#: js/prefs.js:1045
+#: js/prefs.js:1057
+#: js/tt-rss.js:497
+#: js/viewfeed.js:509
+#: js/viewfeed.js:928
 #: plugins/import_export/import_export.js:17
-#: js/functions.js:565
-#: js/prefs.js:1200
-#: js/prefs.js:1253
-#: js/prefs.js:1292
-#: js/prefs.js:1305
-#: js/prefs.js:1316
-#: js/prefs.js:1331
-#: js/tt-rss.js:564
-#: js/viewfeed.js:760
+#: js/prefs.js:1192
+#: js/prefs.js:1205
+#: js/tt-rss.js:510
 msgid "Loading, please wait..."
 msgstr "Ladataan, odota..."
 
@@ -210,13 +210,13 @@ msgid "All Articles"
 msgstr "Kaikki artikkelit"
 
 #: index.php:194
-#: include/functions.php:1227
+#: include/functions.php:1172
 #: classes/feeds.php:110
 msgid "Starred"
 msgstr "Tähdelliset"
 
 #: index.php:195
-#: include/functions.php:1228
+#: include/functions.php:1173
 #: classes/feeds.php:111
 msgid "Published"
 msgstr "Julkiset"
@@ -256,11 +256,11 @@ msgid "Title"
 msgstr "Otsikko"
 
 #: index.php:211
-#: index.php:251
-#: include/functions.php:1215
+#: index.php:250
+#: include/functions.php:1160
 #: classes/feeds.php:115
-#: js/FeedTree.js:41
-#: js/FeedTree.js:69
+#: js/FeedTree.js:42
+#: js/FeedTree.js:70
 msgid "Mark as read"
 msgstr "Merkitse luetuiksi"
 
@@ -297,7 +297,7 @@ msgid "Feed actions:"
 msgstr "Syötetoiminnot:"
 
 #: index.php:246
-#: classes/handler/public.php:551
+#: classes/handler/public.php:575
 msgid "Subscribe to feed..."
 msgstr "Tilaa syöte..."
 
@@ -306,56 +306,44 @@ msgid "Edit this feed..."
 msgstr "Muokkaa tätä syötettä..."
 
 #: index.php:248
-msgid "Rescore feed"
-msgstr "Uudelleenpisteytä syöte"
-
-#: index.php:249
-#: classes/pref/feeds.php:770
-#: classes/pref/feeds.php:1203
-#: js/PrefFeedTree.js:61
+#: classes/pref/feeds.php:769
+#: classes/pref/feeds.php:1202
+#: js/PrefFeedTree.js:62
 msgid "Unsubscribe"
 msgstr "Peru tilaus"
 
-#: index.php:250
+#: index.php:249
 msgid "All feeds:"
 msgstr "Kaikki syötteet:"
 
-#: index.php:252
+#: index.php:251
 msgid "(Un)hide read feeds"
 msgstr "Piilota/näytä luetut syötteet"
 
-#: index.php:253
+#: index.php:252
 msgid "Other actions:"
 msgstr "Muut toiminnot:"
 
-#: index.php:254
-#: include/functions.php:1201
+#: index.php:253
+#: include/functions.php:1146
 msgid "Toggle widescreen mode"
 msgstr "Vaihda näkymä"
 
-#: index.php:255
-msgid "Create label..."
-msgstr "Luo tunniste..."
-
-#: index.php:256
-msgid "Create filter..."
-msgstr "Luo suodatin..."
-
-#: index.php:257
+#: index.php:254
 msgid "Keyboard shortcuts help"
 msgstr "Näytä pikanäppäimet"
 
-#: index.php:266
+#: index.php:263
 msgid "Logout"
 msgstr "Kirjaudu ulos"
 
-#: index.php:272
+#: index.php:269
 msgid "Updates are available from Git."
 msgstr "Päivityksiä saatavilla Gitistä."
 
 #: prefs.php:33
 #: prefs.php:138
-#: include/functions.php:1230
+#: include/functions.php:1175
 #: classes/pref/prefs.php:425
 msgid "Preferences"
 msgstr "Asetukset"
@@ -370,8 +358,8 @@ msgstr "Poistu asetuksista"
 
 #: prefs.php:141
 #: classes/pref/feeds.php:114
-#: classes/pref/feeds.php:1138
-#: classes/pref/feeds.php:1192
+#: classes/pref/feeds.php:1137
+#: classes/pref/feeds.php:1191
 msgid "Feeds"
 msgstr "Syötteet"
 
@@ -381,8 +369,8 @@ msgid "Filters"
 msgstr "Suodattimet"
 
 #: prefs.php:147
+#: classes/feeds.php:1696
 #: classes/pref/labels.php:94
-#: classes/feeds.php:1710
 msgid "Labels"
 msgstr "Tunnisteet"
 
@@ -394,80 +382,80 @@ msgstr "Käyttäjät"
 msgid "System"
 msgstr "Järjestelmä"
 
-#: register.php:186
+#: register.php:185
 #: include/login_form.php:162
 msgid "Create new account"
 msgstr "Luo uusi käyttäjätili"
 
-#: register.php:192
+#: register.php:191
 msgid "New user registrations are administratively disabled."
 msgstr "Uusien käyttäjien rekisteröityminen on hallinnollisesti estetty."
 
-#: register.php:196
-#: register.php:241
-#: register.php:254
-#: register.php:269
-#: register.php:288
-#: register.php:336
-#: register.php:346
-#: register.php:358
-#: classes/handler/public.php:623
-#: classes/handler/public.php:697
-#: classes/handler/public.php:798
-#: classes/handler/public.php:877
-#: classes/handler/public.php:891
-#: classes/handler/public.php:898
-#: classes/handler/public.php:923
+#: register.php:195
+#: register.php:240
+#: register.php:253
+#: register.php:268
+#: register.php:287
+#: register.php:334
+#: register.php:344
+#: register.php:356
+#: classes/handler/public.php:647
+#: classes/handler/public.php:721
+#: 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"
 
-#: register.php:217
+#: register.php:216
 msgid "Your temporary password will be sent to the specified email. Accounts, which were not logged in once, are erased automatically 24 hours after temporary password is sent."
 msgstr ""
 
-#: register.php:223
+#: register.php:222
 msgid "Desired login:"
 msgstr "Haluttu käyttäjätunnus:"
 
-#: register.php:226
+#: register.php:225
 msgid "Check availability"
 msgstr "Tarkasta saatavuus"
 
-#: register.php:228
-#: classes/handler/public.php:713
+#: register.php:227
+#: classes/handler/public.php:737
 msgid "Email:"
 msgstr "Sähköposti:"
 
-#: register.php:231
-#: classes/handler/public.php:718
+#: register.php:230
+#: classes/handler/public.php:742
 msgid "How much is two plus two:"
 msgstr "Paljonko on kaksi plus kaksi:"
 
-#: register.php:234
+#: register.php:233
 msgid "Submit registration"
 msgstr "Lähetä rekisteröinti"
 
-#: register.php:252
+#: register.php:251
 msgid "Your registration information is incomplete."
 msgstr "Antamasi rekisteröintitiedot ovat epätäydelliset."
 
-#: register.php:267
+#: register.php:266
 msgid "Sorry, this username is already taken."
 msgstr "Valitettavasti käyttäjätunnus on jo varattu."
 
-#: register.php:286
+#: register.php:285
 msgid "Registration failed."
 msgstr "Rekisteröinti epäonnistui."
 
-#: register.php:333
+#: register.php:331
 msgid "Account created successfully."
 msgstr "Käyttäjätunnus luotu onnistuneesti."
 
-#: register.php:355
+#: register.php:353
 msgid "New user registrations are currently closed."
 msgstr "Uusien käyttäjien rekisteröinti on tällä hetkellä suljettu."
 
-#: update.php:66
+#: update.php:67
 msgid "Tiny Tiny RSS data update script."
 msgstr "Tiny Tiny RSS:n datapäivitysskripti."
 
@@ -480,10 +468,10 @@ msgstr "Kaikki syötteet"
 
 #: include/controls.php:138
 #: include/controls.php:230
-#: classes/opml.php:512
-#: classes/digest.php:120
+#: classes/digest.php:124
+#: classes/feeds.php:1708
 #: classes/pref/feeds.php:233
-#: classes/feeds.php:1722
+#: classes/opml.php:512
 msgid "Uncategorized"
 msgstr "Luokittelemattomat"
 
@@ -498,287 +486,287 @@ msgstr[1] "%d arkistoitua artikkelia"
 msgid "No feeds found."
 msgstr "Syötteitä ei löytynyt."
 
-#: include/functions.php:983
+#: include/functions.php:928
 #, php-format
 msgid "%d min"
 msgstr ""
 
-#: include/functions.php:1177
+#: include/functions.php:1122
 msgid "Navigation"
 msgstr "Valikko"
 
-#: include/functions.php:1178
+#: include/functions.php:1123
 msgid "Open next feed"
 msgstr "Avaa seuraava syöte"
 
-#: include/functions.php:1179
+#: include/functions.php:1124
 msgid "Open previous feed"
 msgstr "Avaa edellinen syöte"
 
-#: include/functions.php:1180
+#: include/functions.php:1125
 msgid "Open next article"
 msgstr "Avaa seuraava artikkeli"
 
-#: include/functions.php:1181
+#: include/functions.php:1126
 msgid "Open previous article"
 msgstr "Avaa edellinen artikkeli"
 
-#: include/functions.php:1182
+#: include/functions.php:1127
 msgid "Open next article (don't scroll long articles)"
 msgstr "Avaa seuraava artikkeli (älä vieritä pitkiä artikkeleita)"
 
-#: include/functions.php:1183
+#: include/functions.php:1128
 msgid "Open previous article (don't scroll long articles)"
 msgstr "Avaa edellinen artikkeli (älä vieritä pitkiä artikkeleita)"
 
-#: include/functions.php:1184
+#: include/functions.php:1129
 msgid "Move to next article (don't expand or mark read)"
 msgstr "Siirry seuraavaan artikkeliin (älä laajenna tai merkitse luetuksi)"
 
-#: include/functions.php:1185
+#: include/functions.php:1130
 msgid "Move to previous article (don't expand or mark read)"
 msgstr "Siirry edelliseen artikkeliin (älä laajenna tai merkitse luetuksi)"
 
-#: include/functions.php:1186
+#: include/functions.php:1131
 msgid "Show search dialog"
 msgstr "Näytä hakudialogi"
 
-#: include/functions.php:1187
+#: include/functions.php:1132
 msgid "Article"
 msgstr "Artikkeli"
 
-#: include/functions.php:1188
-#: js/viewfeed.js:1695
+#: include/functions.php:1133
+#: js/viewfeed.js:1341
 msgid "Toggle starred"
 msgstr "Lisää/Poista tähti"
 
-#: include/functions.php:1189
-#: js/viewfeed.js:1707
+#: include/functions.php:1134
+#: js/viewfeed.js:1353
 msgid "Toggle published"
 msgstr "Vaihda julkinen-tilaa"
 
-#: include/functions.php:1190
-#: js/viewfeed.js:1682
+#: include/functions.php:1135
+#: js/viewfeed.js:1328
 msgid "Toggle unread"
 msgstr "Vaihda luettu/lukematon"
 
-#: include/functions.php:1191
+#: include/functions.php:1136
 msgid "Edit tags"
 msgstr "Muokkaa avainsanoja"
 
-#: include/functions.php:1192
+#: include/functions.php:1137
 msgid "Open in new window"
 msgstr "Avaa uudessa ikkunassa"
 
-#: include/functions.php:1193
-#: js/viewfeed.js:1728
+#: include/functions.php:1138
+#: js/viewfeed.js:1374
 msgid "Mark below as read"
 msgstr "Merkitse alla olevat luetuiksi"
 
-#: include/functions.php:1194
-#: js/viewfeed.js:1721
+#: include/functions.php:1139
+#: js/viewfeed.js:1367
 msgid "Mark above as read"
 msgstr "Merkitse yllä olevat luetuiksi"
 
-#: include/functions.php:1195
+#: include/functions.php:1140
 msgid "Scroll down"
 msgstr "Vieritä alas"
 
-#: include/functions.php:1196
+#: include/functions.php:1141
 msgid "Scroll up"
 msgstr "Vieritä ylös"
 
-#: include/functions.php:1197
+#: include/functions.php:1142
 msgid "Select article under cursor"
 msgstr "Valitse osoittimen kohdalla oleva artikkeli"
 
-#: include/functions.php:1198
+#: include/functions.php:1143
 msgid "Email article"
 msgstr "Lähetä artikkeli sähköpostilla"
 
-#: include/functions.php:1199
+#: include/functions.php:1144
 msgid "Close/collapse article"
 msgstr "Piilota/näytä artikkeli"
 
-#: include/functions.php:1200
+#: include/functions.php:1145
 #, fuzzy
 msgid "Toggle article expansion (combined mode)"
 msgstr "Vaihda automaattilaajennuksen tila (yhdistelmänäkymässä)"
 
-#: include/functions.php:1202
+#: include/functions.php:1147
 #: plugins/embed_original/init.php:33
 msgid "Toggle embed original"
 msgstr "Vaihda alkuperäinen liitetty"
 
-#: include/functions.php:1203
+#: include/functions.php:1148
 msgid "Article selection"
 msgstr "Artikkelin valinta"
 
-#: include/functions.php:1204
+#: include/functions.php:1149
 msgid "Select all articles"
 msgstr "Valitse kaikki artikkelit"
 
-#: include/functions.php:1205
+#: include/functions.php:1150
 msgid "Select unread"
 msgstr "Valitse lukemattomat"
 
-#: include/functions.php:1206
+#: include/functions.php:1151
 msgid "Select starred"
 msgstr "Valitse tähdellä merkityt"
 
-#: include/functions.php:1207
+#: include/functions.php:1152
 msgid "Select published"
 msgstr "Valitse julkaistu"
 
-#: include/functions.php:1208
+#: include/functions.php:1153
 msgid "Invert selection"
 msgstr "Vaihda valittujen tila"
 
-#: include/functions.php:1209
+#: include/functions.php:1154
 msgid "Deselect everything"
 msgstr "Poista valinnat"
 
-#: include/functions.php:1210
-#: classes/pref/feeds.php:522
-#: classes/pref/feeds.php:794
+#: include/functions.php:1155
+#: classes/pref/feeds.php:521
+#: classes/pref/feeds.php:793
 msgid "Feed"
 msgstr "Syöte"
 
-#: include/functions.php:1211
+#: include/functions.php:1156
 msgid "Refresh current feed"
 msgstr "Päivitä tämänhetkinen syöte"
 
-#: include/functions.php:1212
+#: include/functions.php:1157
 msgid "Un/hide read feeds"
 msgstr "Piilota/näytä luetut syötteet"
 
-#: include/functions.php:1213
-#: classes/pref/feeds.php:1195
+#: include/functions.php:1158
+#: classes/pref/feeds.php:1194
 msgid "Subscribe to feed"
 msgstr "Tilaa syöte"
 
-#: include/functions.php:1214
-#: js/FeedTree.js:48
-#: js/PrefFeedTree.js:55
-#: js/viewfeed.js:1846
+#: include/functions.php:1159
+#: js/FeedTree.js:49
+#: js/PrefFeedTree.js:56
+#: js/viewfeed.js:1492
 msgid "Edit feed"
 msgstr "Muokkaa syötettä"
 
-#: include/functions.php:1216
+#: include/functions.php:1161
 msgid "Reverse headlines"
 msgstr "Otsikot käänteisjärjestyksessä"
 
-#: include/functions.php:1217
+#: include/functions.php:1162
 msgid "Toggle headline grouping"
 msgstr ""
 
-#: include/functions.php:1218
+#: include/functions.php:1163
 msgid "Debug feed update"
 msgstr "Syötepäivityksen vianetsintä"
 
-#: include/functions.php:1219
+#: include/functions.php:1164
 #, fuzzy
 msgid "Debug viewfeed()"
 msgstr "Syötepäivityksen vianetsintä"
 
-#: include/functions.php:1220
-#: js/FeedTree.js:97
+#: include/functions.php:1165
+#: js/FeedTree.js:98
 msgid "Mark all feeds as read"
 msgstr "Merkitse kaikki syötteet luetuiksi"
 
-#: include/functions.php:1221
+#: include/functions.php:1166
 msgid "Un/collapse current category"
 msgstr "Piilota/näytä tämänhetkinen kansio"
 
-#: include/functions.php:1222
-msgid "Toggle combined mode"
-msgstr "Vaihda yhdistelmänäkymän tila"
-
-#: include/functions.php:1223
+#: include/functions.php:1167
 msgid "Toggle auto expand in combined mode"
 msgstr "Vaihda automaattilaajennuksen tila yhdistelmänäkymässä"
 
-#: include/functions.php:1224
+#: include/functions.php:1168
+msgid "Toggle combined mode"
+msgstr "Vaihda yhdistelmänäkymän tila"
+
+#: include/functions.php:1169
 msgid "Go to"
 msgstr "Mene"
 
-#: include/functions.php:1225
-#: classes/feeds.php:1583
+#: include/functions.php:1170
+#: classes/feeds.php:1569
 msgid "All articles"
 msgstr "Kaikki artikkelit"
 
-#: include/functions.php:1226
+#: include/functions.php:1171
 msgid "Fresh"
 msgstr "Päivitä"
 
-#: include/functions.php:1229
-#: js/tt-rss.js:491
-#: js/tt-rss.js:660
+#: include/functions.php:1174
+#: js/tt-rss.js:439
+#: js/tt-rss.js:599
 msgid "Tag cloud"
 msgstr "Avainsanapilvi"
 
-#: include/functions.php:1231
+#: include/functions.php:1176
 msgid "Other"
 msgstr "Muu"
 
-#: include/functions.php:1232
+#: include/functions.php:1177
 #: classes/pref/labels.php:279
 msgid "Create label"
 msgstr "Luo tunniste"
 
-#: include/functions.php:1233
+#: include/functions.php:1178
 #: classes/pref/filters.php:801
 msgid "Create filter"
 msgstr "Luo suodatin"
 
-#: include/functions.php:1234
+#: include/functions.php:1179
 msgid "Un/collapse sidebar"
 msgstr "Piilota/näytä sivupalkki"
 
-#: include/functions.php:1235
+#: include/functions.php:1180
 msgid "Show help dialog"
 msgstr "Näytä ohjeikkuna"
 
-#: include/functions.php:2582
+#: include/functions.php:2529
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: include/functions.php:2583
+#: include/functions.php:2530
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: include/functions.php:2584
+#: include/functions.php:2531
 msgid "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form"
 msgstr ""
 
-#: include/functions.php:2585
+#: include/functions.php:2532
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: include/functions.php:2586
+#: include/functions.php:2533
 msgid "No file was uploaded"
 msgstr ""
 
-#: include/functions.php:2587
+#: include/functions.php:2534
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: include/functions.php:2588
+#: include/functions.php:2535
 msgid "Failed to write file to disk."
 msgstr ""
 
-#: include/functions.php:2589
+#: include/functions.php:2536
 msgid "A PHP extension stopped the file upload."
 msgstr ""
 
 #: include/login_form.php:107
-#: classes/handler/public.php:446
-#: classes/handler/public.php:708
+#: classes/handler/public.php:466
+#: classes/handler/public.php:732
 msgid "Login:"
 msgstr "Käyttäjätunnus:"
 
 #: include/login_form.php:117
-#: classes/handler/public.php:449
+#: classes/handler/public.php:469
 msgid "Password:"
 msgstr "Salasana:"
 
@@ -791,9 +779,9 @@ msgid "Profile:"
 msgstr "Profiili:"
 
 #: include/login_form.php:133
-#: classes/handler/public.php:252
 #: classes/pref/prefs.php:1037
 #: classes/rpc.php:69
+#: classes/handler/public.php:272
 msgid "Default profile"
 msgstr "Oletusprofiili"
 
@@ -810,210 +798,27 @@ msgid "Remember me"
 msgstr "Muista kirjautumiseni"
 
 #: include/login_form.php:159
-#: classes/handler/public.php:454
+#: classes/handler/public.php:474
 msgid "Log in"
 msgstr "Kirjaudu sisään"
 
-#: include/sessions.php:46
+#: include/sessions.php:45
 msgid "Session failed to validate (schema version changed)"
 msgstr "Istunnon validointi epäonnistui (tietokantakaava muuttunut)"
 
-#: include/sessions.php:62
+#: include/sessions.php:53
+#, fuzzy
+msgid "Session failed to validate (UA changed)."
+msgstr "Session validointi epäonnistui (salasana vaihtunut)"
+
+#: include/sessions.php:67
 msgid "Session failed to validate (password changed)"
 msgstr "Session validointi epäonnistui (salasana vaihtunut)"
 
-#: include/sessions.php:69
+#: include/sessions.php:74
 msgid "Session failed to validate (user not found)"
 msgstr "Istunnon validointi epäonnistui (käyttäjää ei löydy)"
 
-#: classes/article.php:26
-msgid "Article not found."
-msgstr "Artikkelia ei löytynyt"
-
-#: classes/article.php:211
-msgid "Tags for this article (separated by commas):"
-msgstr "Tämän syötteen avainsanat (pilkulla erotettuina)"
-
-#: classes/article.php:236
-#: classes/pref/labels.php:82
-#: classes/pref/users.php:103
-#: classes/pref/feeds.php:774
-#: classes/pref/feeds.php:914
-#: classes/pref/filters.php:525
-#: classes/pref/prefs.php:982
-#: plugins/nsfw/init.php:85
-#: plugins/note/init.php:58
-#: plugins/af_readability/init.php:80
-#: plugins/af_redditimgur/init.php:66
-#: plugins/af_psql_trgm/init.php:188
-#: plugins/mail/init.php:65
-#: plugins/af_zz_imgproxy/init.php:238
-msgid "Save"
-msgstr "Tallenna"
-
-#: classes/article.php:238
-#: classes/handler/public.php:423
-#: classes/handler/public.php:457
-#: classes/pref/labels.php:84
-#: classes/pref/users.php:105
-#: classes/pref/feeds.php:775
-#: classes/pref/feeds.php:917
-#: classes/pref/feeds.php:1672
-#: classes/pref/filters.php:528
-#: classes/pref/filters.php:945
-#: classes/pref/filters.php:1022
-#: classes/pref/filters.php:1115
-#: classes/pref/prefs.php:984
-#: classes/feeds.php:1037
-#: classes/feeds.php:1089
-#: classes/feeds.php:1128
-#: plugins/note/init.php:60
-#: plugins/mail/init.php:179
-msgid "Cancel"
-msgstr "Peru"
-
-#: classes/article.php:337
-#: classes/article.php:720
-#: classes/article.php:875
-msgid "no tags"
-msgstr "ei avainsanoja"
-
-#: classes/article.php:448
-msgid "unknown type"
-msgstr "tuntematon tyyppi"
-
-#: classes/article.php:525
-msgid "Attachments"
-msgstr "Litteet"
-
-#: classes/article.php:626
-#: classes/feeds.php:661
-msgid "comment"
-msgid_plural "comments"
-msgstr[0] "kommentti"
-msgstr[1] "kommenttia"
-
-#: classes/article.php:630
-#: classes/feeds.php:665
-#, fuzzy
-msgid "comments"
-msgstr "Litteet"
-
-#: classes/article.php:689
-msgid " - "
-msgstr " - "
-
-#: classes/article.php:730
-#: classes/feeds.php:647
-msgid "Edit tags for this article"
-msgstr "Muokkaa tämän artikkelin avainsanoja"
-
-#: classes/article.php:763
-#: classes/feeds.php:602
-msgid "Originally from:"
-msgstr ""
-
-#: classes/article.php:774
-#: classes/pref/feeds.php:539
-#: classes/feeds.php:613
-msgid "Feed URL"
-msgstr "Syötteen osoite"
-
-#: classes/article.php:811
-#: classes/backend.php:103
-#: classes/dlg.php:33
-#: classes/dlg.php:56
-#: classes/dlg.php:89
-#: classes/dlg.php:154
-#: classes/dlg.php:181
-#: classes/dlg.php:197
-#: classes/pref/feeds.php:1466
-#: classes/pref/feeds.php:1533
-#: classes/pref/filters.php:208
-#: classes/pref/prefs.php:1099
-#: plugins/af_psql_trgm/init.php:109
-#: plugins/import_export/init.php:446
-#: plugins/import_export/init.php:490
-#: plugins/share/init.php:128
-msgid "Close this window"
-msgstr "Sulje ikkuna"
-
-#: classes/article.php:913
-msgid "(edit note)"
-msgstr "(muokkaa muistiinpanoa)"
-
-#: classes/opml.php:31
-#: classes/opml.php:36
-msgid "OPML Utility"
-msgstr "OPML-työkalu"
-
-#: classes/opml.php:40
-msgid "Importing OPML..."
-msgstr "Luetaan OPML-tiedostoa"
-
-#: classes/opml.php:45
-msgid "Return to preferences"
-msgstr "Palaa asetuksiin"
-
-#: classes/opml.php:301
-#, php-format
-msgid "Adding feed: %s"
-msgstr "Lisätään syöte: %s"
-
-#: classes/opml.php:312
-#, php-format
-msgid "Duplicate feed: %s"
-msgstr "Syötteen kaksoiskappale: %s"
-
-#: classes/opml.php:326
-#, php-format
-msgid "Adding label %s"
-msgstr "Lisätään tunniste %s"
-
-#: classes/opml.php:329
-#, php-format
-msgid "Duplicate label: %s"
-msgstr "Tunnisteen kaksoiskappale: %s"
-
-#: classes/opml.php:341
-#, php-format
-msgid "Setting preference key %s to %s"
-msgstr ""
-
-#: classes/opml.php:377
-msgid "Adding filter..."
-msgstr "Lisätään suodatin..."
-
-#: classes/opml.php:512
-#, php-format
-msgid "Processing category: %s"
-msgstr ""
-
-#: classes/opml.php:558
-#, php-format
-msgid "Upload failed with error code %d"
-msgstr "Lähettäminen epäonnistui virhekoodilla %d"
-
-#: classes/opml.php:570
-#: plugins/import_export/init.php:471
-#, fuzzy
-msgid "Unable to move uploaded file."
-msgstr "Ladatun tiedoston siirtäminen epäonnistui."
-
-#: classes/opml.php:574
-#: plugins/import_export/init.php:475
-msgid "Error: please upload OPML file."
-msgstr "Virhe: lähetä OPML-tiedosto."
-
-#: classes/opml.php:585
-#, fuzzy
-msgid "Error: unable to find moved OPML file."
-msgstr "Virhe: siirretty OPML-tiedosto katosi."
-
-#: classes/opml.php:594
-msgid "Error while parsing document."
-msgstr "Virhe tulkitessa dokumenttia."
-
 #: 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ä."
@@ -1034,164 +839,358 @@ msgstr "Ctrl"
 msgid "Help topic not found."
 msgstr "Aiheesta ei löytynyt ohjeita."
 
-#: 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/backend.php:103
+#: classes/pref/filters.php:208
+#: classes/pref/feeds.php:1465
+#: classes/pref/feeds.php:1532
+#: classes/pref/prefs.php:1099
+#: classes/dlg.php:33
+#: classes/dlg.php:56
+#: classes/dlg.php:89
+#: classes/dlg.php:154
+#: classes/dlg.php:181
+#: classes/dlg.php:197
+#: classes/article.php:810
+#: plugins/af_psql_trgm/init.php:109
+#: plugins/import_export/init.php:446
+#: plugins/import_export/init.php:490
+#: plugins/share/init.php:128
+msgid "Close this window"
+msgstr "Sulje ikkuna"
 
-#: classes/dlg.php:44
-msgid "Your Public OPML URL is:"
-msgstr "Julkinen OPML URL:isi on:"
+#: classes/feeds.php:53
+msgid "View as RSS feed"
+msgstr "Näytä RSS-syötteenä"
 
-#: classes/dlg.php:53
-#: classes/dlg.php:178
-#: plugins/share/init.php:125
-msgid "Generate new URL"
-msgstr "Luo uusi URL"
+#: classes/feeds.php:54
+#: classes/feeds.php:140
+#: classes/pref/feeds.php:1326
+msgid "View as RSS"
+msgstr "Näytä RSS-syötteenä"
 
-#: classes/dlg.php:67
-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/feeds.php:62
+#, php-format
+msgid "Last updated: %s"
+msgstr "Päivitetty viimeksi: %s"
 
-#: classes/dlg.php:71
-#: classes/dlg.php:80
-msgid "Last update:"
-msgstr "Viimeksi päivitetty:"
-
-#: classes/dlg.php:76
-msgid "Update daemon is taking too long to perform a feed update. This could indicate a problem like crash or a hang. Please check the daemon process or contact instance owner."
-msgstr ""
-
-#: classes/dlg.php:169
-msgid "You can view this feed as RSS using the following URL:"
-msgstr "Tämän RSS-syötteen julkinen osoite on:"
-
-#: classes/dlg.php:190
-msgid "You are using default tt-rss password. Please change it in the Preferences (Personal data / Authentication)."
-msgstr ""
-
-#: classes/dlg.php:194
+#: classes/feeds.php:100
 #, fuzzy
-msgid "Open Preferences"
-msgstr "Asetukset"
+msgid "Select..."
+msgstr "Valitse"
 
-#: classes/handler/public.php:387
-#: plugins/bookmarklets/init.php:40
-msgid "Share with Tiny Tiny RSS"
-msgstr "Jaa Tiny Tiny RSS:llä"
+#: classes/feeds.php:102
+#: classes/pref/labels.php:273
+#: classes/pref/filters.php:391
+#: classes/pref/filters.php:449
+#: classes/pref/filters.php:795
+#: classes/pref/filters.php:878
+#: classes/pref/filters.php:905
+#: classes/pref/feeds.php:1185
+#: classes/pref/feeds.php:1416
+#: classes/pref/feeds.php:1481
+#: classes/pref/users.php:358
+#: classes/pref/prefs.php:996
+msgid "All"
+msgstr "Kaikki"
 
-#: classes/handler/public.php:395
-msgid "Title:"
-msgstr "Otsikko:"
+#: classes/feeds.php:104
+msgid "Invert"
+msgstr "Käännä"
 
-#: classes/handler/public.php:397
-#: classes/pref/feeds.php:537
-msgid "URL:"
-msgstr "URL:"
+#: classes/feeds.php:105
+#: classes/pref/labels.php:275
+#: classes/pref/filters.php:393
+#: classes/pref/filters.php:451
+#: classes/pref/filters.php:797
+#: classes/pref/filters.php:880
+#: classes/pref/filters.php:907
+#: classes/pref/feeds.php:1187
+#: classes/pref/feeds.php:1418
+#: classes/pref/feeds.php:1483
+#: classes/pref/users.php:360
+#: classes/pref/prefs.php:998
+msgid "None"
+msgstr "Ei mikään"
 
-#: classes/handler/public.php:399
-msgid "Content:"
-msgstr "Sisältö:"
+#: classes/feeds.php:107
+msgid "Selection toggle:"
+msgstr "Vaihda valittujen tila:"
 
-#: classes/handler/public.php:401
-msgid "Labels:"
-msgstr "Tunnisteet"
+#: classes/feeds.php:113
+msgid "Selection:"
+msgstr "Valinta:"
 
-#: classes/handler/public.php:420
-msgid "Shared article will appear in the Published feed."
-msgstr "Jaetut artikkelit näkyvät 'Julkisissa syötteissä'."
+#: classes/feeds.php:116
+msgid "Set score"
+msgstr "Pisteytä"
 
-#: classes/handler/public.php:422
-msgid "Share"
-msgstr "Jaa"
+#: classes/feeds.php:119
+msgid "Archive"
+msgstr "Arkistoi"
 
-#: classes/handler/public.php:444
-msgid "Not logged in"
-msgstr "Et ole kirjautunut"
+#: classes/feeds.php:121
+msgid "Move back"
+msgstr "Siirrä takaisin"
 
-#: classes/handler/public.php:504
-msgid "Incorrect username or password"
-msgstr "Väärä käyttäjätunnus tai salasana"
+#: classes/feeds.php:122
+#: classes/pref/filters.php:400
+#: classes/pref/filters.php:458
+#: classes/pref/filters.php:887
+#: classes/pref/filters.php:914
+msgid "Delete"
+msgstr "Poista"
 
-#: classes/handler/public.php:557
-#, php-format
-msgid "Already subscribed to <b>%s</b>."
-msgstr "Olet jo tilannut syötteen <b>%s</b>."
+#: classes/feeds.php:127
+#: classes/feeds.php:132
+#: plugins/mailto/init.php:25
+#: plugins/mail/init.php:76
+msgid "Forward by email"
+msgstr "Lähetä sähköpostilla"
 
-#: classes/handler/public.php:560
-#, php-format
-msgid "Subscribed to <b>%s</b>."
-msgstr "Tilattu syöte <b>%s</b>."
+#: classes/feeds.php:136
+msgid "Feed:"
+msgstr "Syöte:"
 
-#: classes/handler/public.php:563
-#, php-format
-msgid "Could not subscribe to <b>%s</b>."
-msgstr "Tätä syötettä ei voitu tilata <b>%s</b>."
+#: classes/feeds.php:193
+#: classes/feeds.php:802
+msgid "Feed not found."
+msgstr "Syötettä ei löydy"
 
-#: classes/handler/public.php:566
-#, php-format
-msgid "No feeds found in <b>%s</b>."
-msgstr "<b>%s</b> ei sisällä syötteitä."
-
-#: classes/handler/public.php:569
-msgid "Multiple feed URLs found."
-msgstr "Useita syöteosoitteita löytyi."
-
-#: classes/handler/public.php:573
-#, 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:591
-msgid "Subscribe to selected feed"
-msgstr "Tilaa valittu syöte"
-
-#: classes/handler/public.php:618
-msgid "Edit subscription options"
-msgstr "Muokkaa syötteen asetuksia"
-
-#: classes/handler/public.php:656
-msgid "Password recovery"
-msgstr "Salasanan palautus"
-
-#: classes/handler/public.php:701
+#: classes/feeds.php:255
 #, 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."
+msgid "Never"
+msgstr "Älä poista koskaan"
 
-#: classes/handler/public.php:723
-#: classes/pref/users.php:372
-msgid "Reset password"
-msgstr "Palauta salasana"
+#: classes/feeds.php:341
+#, php-format
+msgid "Imported at %s"
+msgstr "Tuotu %s"
 
-#: classes/handler/public.php:733
-msgid "Some of the required form parameters are missing or incorrect."
-msgstr "Jotkin vaadituista parametreistä puuttuvat tai ovat väärin."
+#: classes/feeds.php:391
+#: classes/feeds.php:484
+#, fuzzy
+msgid "mark feed as read"
+msgstr "Merkitse syöte luetuksi"
 
-#: classes/handler/public.php:737
-#: classes/handler/public.php:806
-msgid "Go back"
-msgstr "Takaisin"
+#: classes/feeds.php:540
+msgid "Collapse article"
+msgstr "Sulje artikkeli"
 
-#: classes/handler/public.php:775
-msgid "[tt-rss] Password reset request"
+#: classes/feeds.php:592
+#: classes/article.php:762
+msgid "Originally from:"
 msgstr ""
 
-#: classes/handler/public.php:802
-msgid "Sorry, login and email combination not found."
-msgstr "Tätä käyttäjätunnus-sähköposti -yhdistelmää ei valitettavasti löydy."
+#: classes/feeds.php:603
+#: classes/pref/feeds.php:538
+#: classes/article.php:773
+msgid "Feed URL"
+msgstr "Syötteen osoite"
 
-# Better this way...
-#: classes/handler/public.php:824
-msgid "Your access level is insufficient to run this script."
-msgstr "Käyttäjäoikeutesi eivät riitä päivitysscriptin suorittamiseen."
+#: classes/feeds.php:630
+#: classes/article.php:729
+msgid "Edit tags for this article"
+msgstr "Muokkaa tämän artikkelin avainsanoja"
 
-#: classes/handler/public.php:850
-msgid "Database Updater"
-msgstr "Tietokannan päivitys"
+#: classes/feeds.php:644
+#: classes/article.php:625
+msgid "comment"
+msgid_plural "comments"
+msgstr[0] "kommentti"
+msgstr[1] "kommenttia"
 
-#: classes/handler/public.php:915
-msgid "Perform updates"
-msgstr "Suorita päivityksiä"
+#: classes/feeds.php:648
+#: classes/article.php:629
+#, fuzzy
+msgid "comments"
+msgstr "Litteet"
+
+#: classes/feeds.php:686
+msgid "No unread articles found to display."
+msgstr "Lukemattomia artikkeleita ei ole näytettäväksi"
+
+#: classes/feeds.php:689
+msgid "No updated articles found to display."
+msgstr "Päivitettyjä artikkeleita ei ole näytettäväksi"
+
+#: classes/feeds.php:692
+msgid "No starred articles found to display."
+msgstr "Tähdellä merkittyjä artikkeleita ei ole näytettäväksi"
+
+#: classes/feeds.php:696
+#, 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:698
+msgid "No articles found to display."
+msgstr "Ei näytettäviä artikkeleita."
+
+#: classes/feeds.php:714
+#: classes/feeds.php:905
+#, php-format
+msgid "Feeds last updated at %s"
+msgstr "Syötteet päivitetty viimeksi %s"
+
+#: classes/feeds.php:726
+#: classes/feeds.php:917
+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:894
+msgid "No feed selected."
+msgstr "Yhtään syötettä ei ole valittuna"
+
+#: classes/feeds.php:958
+#: classes/feeds.php:966
+msgid "Feed or site URL"
+msgstr "Syötteen/sivuston osoite"
+
+#: classes/feeds.php:972
+#: classes/pref/feeds.php:559
+#: classes/pref/feeds.php:800
+#: classes/pref/feeds.php:1632
+msgid "Place in category:"
+msgstr "Siirrä kansioon:"
+
+#: classes/feeds.php:980
+msgid "Available feeds"
+msgstr "Saatavilla olevat syötteet"
+
+#: classes/feeds.php:992
+#: classes/pref/feeds.php:621
+#: classes/pref/feeds.php:848
+#: classes/pref/users.php:61
+msgid "Authentication"
+msgstr "Tunnistautuminen"
+
+#: classes/feeds.php:996
+#: classes/pref/feeds.php:625
+#: classes/pref/feeds.php:852
+#: classes/pref/feeds.php:1646
+#: classes/pref/users.php:403
+msgid "Login"
+msgstr "Käyttäjätunnus"
+
+#: classes/feeds.php:1000
+#: classes/pref/feeds.php:631
+#: classes/pref/feeds.php:860
+#: classes/pref/feeds.php:1649
+#: classes/pref/prefs.php:243
+msgid "Password"
+msgstr "Salasana"
+
+#: classes/feeds.php:1011
+#: classes/pref/feeds.php:645
+msgid "This feed requires authentication."
+msgstr "Tämä syöte vaatii kirjautumisen"
+
+#: classes/feeds.php:1014
+#: classes/feeds.php:1070
+#: classes/pref/feeds.php:1668
+msgid "Subscribe"
+msgstr "Tilaa"
+
+#: classes/feeds.php:1017
+msgid "More feeds"
+msgstr "Lisää syötteitä"
+
+#: classes/feeds.php:1020
+#: classes/feeds.php:1072
+#: classes/feeds.php:1111
+#: classes/pref/labels.php:84
+#: classes/pref/filters.php:528
+#: classes/pref/filters.php:945
+#: classes/pref/filters.php:1022
+#: classes/pref/filters.php:1115
+#: classes/pref/feeds.php:774
+#: classes/pref/feeds.php:916
+#: classes/pref/feeds.php:1669
+#: classes/pref/users.php:105
+#: classes/pref/prefs.php:984
+#: classes/article.php:238
+#: classes/handler/public.php:443
+#: classes/handler/public.php:477
+#: plugins/mail/init.php:179
+#: plugins/note/init.php:60
+msgid "Cancel"
+msgstr "Peru"
+
+#: classes/feeds.php:1042
+#: classes/feeds.php:1110
+#: classes/pref/filters.php:788
+#: classes/pref/feeds.php:1178
+#: classes/pref/users.php:345
+#: js/tt-rss.js:152
+msgid "Search"
+msgstr "Etsi"
+
+#: classes/feeds.php:1046
+msgid "Popular feeds"
+msgstr "Suositut syötteet"
+
+#: classes/feeds.php:1047
+msgid "Feed archive"
+msgstr "Syötearkisto"
+
+#: classes/feeds.php:1050
+msgid "limit:"
+msgstr "raja:"
+
+#: classes/feeds.php:1071
+#: classes/pref/labels.php:282
+#: classes/pref/filters.php:518
+#: classes/pref/filters.php:814
+#: classes/pref/feeds.php:751
+#: classes/pref/users.php:369
+msgid "Remove"
+msgstr "Poista"
+
+#: classes/feeds.php:1084
+msgid "Look for"
+msgstr "Etsi"
+
+#: classes/feeds.php:1092
+#, php-format
+msgid "in %s"
+msgstr ""
+
+#: classes/feeds.php:1097
+msgid "Used for word stemming"
+msgstr ""
+
+#: classes/feeds.php:1106
+msgid "Search syntax"
+msgstr "Haun syntaksi"
+
+#: classes/feeds.php:1563
+msgid "Starred articles"
+msgstr "Tähdelliset artikkelit"
+
+#: classes/feeds.php:1565
+msgid "Published articles"
+msgstr "Julkiset artikkelit"
+
+#: classes/feeds.php:1567
+msgid "Fresh articles"
+msgstr "Tuoreet artikkelit"
+
+#: classes/feeds.php:1571
+msgid "Archived articles"
+msgstr "Arkistoidut artikkelit"
+
+#: classes/feeds.php:1573
+msgid "Recently read"
+msgstr "Viimeksi luetut"
+
+#: classes/feeds.php:1694
+msgid "Special"
+msgstr "Erikoiset"
+
+#: classes/feeds.php:1951
+#, php-format
+msgid "Search results: %s"
+msgstr "Hakutulokset: %s"
 
 #: classes/pref/labels.php:25
 #: classes/pref/filters.php:377
@@ -1211,201 +1210,196 @@ msgstr "Kirjasin:"
 msgid "Background:"
 msgstr "Tausta:"
 
+#: classes/pref/labels.php:82
+#: classes/pref/filters.php:525
+#: classes/pref/feeds.php:773
+#: classes/pref/feeds.php:913
+#: classes/pref/users.php:103
+#: classes/pref/prefs.php:982
+#: classes/article.php:236
+#: plugins/af_zz_imgproxy/init.php:238
+#: plugins/af_redditimgur/init.php:66
+#: plugins/af_psql_trgm/init.php:188
+#: plugins/af_readability/init.php:80
+#: plugins/nsfw/init.php:85
+#: plugins/mail/init.php:65
+#: plugins/note/init.php:58
+msgid "Save"
+msgstr "Tallenna"
+
 #: classes/pref/labels.php:244
 #, php-format
 msgid "Created label <b>%s</b>"
 msgstr "Luotiin tunniste <b>%s</b>"
 
 #: classes/pref/labels.php:270
-#: classes/pref/users.php:356
-#: classes/pref/feeds.php:1183
-#: classes/pref/feeds.php:1414
-#: classes/pref/feeds.php:1479
 #: classes/pref/filters.php:388
 #: classes/pref/filters.php:446
 #: classes/pref/filters.php:792
 #: classes/pref/filters.php:875
 #: classes/pref/filters.php:902
+#: classes/pref/feeds.php:1182
+#: classes/pref/feeds.php:1413
+#: classes/pref/feeds.php:1478
+#: classes/pref/users.php:355
 #: classes/pref/prefs.php:993
 msgid "Select"
 msgstr "Valitse"
 
-#: classes/pref/labels.php:273
-#: classes/pref/users.php:359
-#: classes/pref/feeds.php:1186
-#: classes/pref/feeds.php:1417
-#: classes/pref/feeds.php:1482
-#: classes/pref/filters.php:391
-#: classes/pref/filters.php:449
-#: classes/pref/filters.php:795
-#: classes/pref/filters.php:878
-#: classes/pref/filters.php:905
-#: classes/pref/prefs.php:996
-#: classes/feeds.php:102
-msgid "All"
-msgstr "Kaikki"
-
-#: classes/pref/labels.php:275
-#: classes/pref/users.php:361
-#: classes/pref/feeds.php:1188
-#: classes/pref/feeds.php:1419
-#: classes/pref/feeds.php:1484
-#: classes/pref/filters.php:393
-#: classes/pref/filters.php:451
-#: classes/pref/filters.php:797
-#: classes/pref/filters.php:880
-#: classes/pref/filters.php:907
-#: classes/pref/prefs.php:998
-#: classes/feeds.php:105
-msgid "None"
-msgstr "Ei mikään"
-
-#: classes/pref/labels.php:282
-#: classes/pref/users.php:370
-#: classes/pref/feeds.php:752
-#: classes/pref/filters.php:518
-#: classes/pref/filters.php:814
-#: classes/feeds.php:1088
-msgid "Remove"
-msgstr "Poista"
-
 #: classes/pref/labels.php:285
 msgid "Clear colors"
 msgstr "Poista värit"
 
-#: classes/pref/users.php:6
-#: classes/pref/system.php:8
-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."
-
-#: classes/pref/users.php:26
+#: classes/pref/filters.php:155
 #, fuzzy
-msgid "Edit user"
-msgstr "Muokkaa sääntöä"
+msgid "Preview article"
+msgstr "Tuoreet artikkelit"
 
-#: classes/pref/users.php:61
-#: classes/pref/feeds.php:622
-#: classes/pref/feeds.php:849
-#: classes/feeds.php:1009
-msgid "Authentication"
-msgstr "Tunnistautuminen"
+#: classes/pref/filters.php:267
+#: classes/pref/filters.php:573
+msgid "(inverse)"
+msgstr "(käänteinen)"
 
-#: classes/pref/users.php:64
-msgid "Access level: "
-msgstr "Käyttäjäoikeudet:"
-
-#: classes/pref/users.php:82
-#: classes/pref/feeds.php:648
-#: classes/pref/feeds.php:867
-msgid "Options"
-msgstr "Valinnat"
-
-#: classes/pref/users.php:96
-#: js/prefs.js:479
-msgid "User details"
-msgstr "Käyttäjätiedot"
-
-#: classes/pref/users.php:136
-#: classes/pref/users.php:407
-msgid "Registered"
-msgstr "Rekisteröity"
-
-#: classes/pref/users.php:137
-msgid "Last logged in"
-msgstr "Viimeksi kirjautunut"
-
-#: classes/pref/users.php:145
-msgid "Subscribed feeds count"
-msgstr "Tilattujen syötteiden määrä"
-
-#: classes/pref/users.php:146
-#, fuzzy
-msgid "Stored articles"
-msgstr "Tähdelliset artikkelit"
-
-#: classes/pref/users.php:150
-#: classes/pref/users.php:406
-msgid "Subscribed feeds"
-msgstr "Tilatut syötteet"
-
-#: classes/pref/users.php:176
-msgid "User not found"
-msgstr "Käyttäjätunnusta ei löydy"
-
-#: classes/pref/users.php:246
+#: classes/pref/filters.php:263
+#: classes/pref/filters.php:572
 #, php-format
-msgid "Added user <b>%s</b> with password <b>%s</b>"
-msgstr "Käyttäjätunnus <b>%s</b> lisätty salasanalla <b>%s</b>"
-
-#: classes/pref/users.php:253
-#, php-format
-msgid "Could not create user <b>%s</b>"
-msgstr "Käyttäjää <b>%s</b> ei voitu luoda"
-
-#: classes/pref/users.php:257
-#, php-format
-msgid "User <b>%s</b> already exists."
-msgstr "Käyttäjätunnus <b>%s</b> on jo olemassa."
-
-#: classes/pref/users.php:285
-#, 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:287
-#, 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:311
-msgid "[tt-rss] Password change notification"
+msgid "%s on %s in %s %s"
 msgstr ""
 
-#: classes/pref/users.php:346
-#: classes/pref/feeds.php:1179
-#: classes/pref/filters.php:788
-#: classes/feeds.php:1059
-#: classes/feeds.php:1127
-#: js/tt-rss.js:165
-msgid "Search"
-msgstr "Etsi"
+#: classes/pref/filters.php:383
+#: classes/pref/filters.php:870
+#: classes/pref/filters.php:977
+msgid "Match"
+msgstr "Täsmäys"
 
-#: classes/pref/users.php:364
-msgid "Create user"
-msgstr "Luo käyttäjätunnus"
+#: classes/pref/filters.php:397
+#: classes/pref/filters.php:455
+#: classes/pref/filters.php:884
+#: classes/pref/filters.php:911
+msgid "Add"
+msgstr "Lisää"
+
+#: classes/pref/filters.php:441
+#: classes/pref/filters.php:897
+msgid "Apply actions"
+msgstr "Suorita toiminnot"
+
+#: classes/pref/filters.php:492
+#: classes/pref/filters.php:926
+msgid "Enabled"
+msgstr "Aktivoitu"
+
+#: classes/pref/filters.php:501
+#: classes/pref/filters.php:929
+msgid "Match any rule"
+msgstr "Täsmää ainakin yhteen säännöistä"
+
+#: classes/pref/filters.php:510
+#: classes/pref/filters.php:932
+msgid "Inverse matching"
+msgstr "Käänteinen täsmäys"
+
+#: classes/pref/filters.php:522
+#: classes/pref/filters.php:939
+msgid "Test"
+msgstr "Kokeilu"
+
+#: classes/pref/filters.php:804
+msgid "Combine"
+msgstr "Yhdistä"
 
-#: classes/pref/users.php:368
 #: classes/pref/filters.php:807
+#: classes/pref/users.php:367
 msgid "Edit"
 msgstr "Muokkaa"
 
-#: classes/pref/users.php:404
-#: classes/pref/feeds.php:626
-#: classes/pref/feeds.php:853
-#: classes/pref/feeds.php:1649
-#: classes/feeds.php:1013
-msgid "Login"
-msgstr "Käyttäjätunnus"
+#: classes/pref/filters.php:810
+#: classes/pref/feeds.php:1198
+#: classes/pref/feeds.php:1212
+msgid "Reset sort order"
+msgstr "Järjestä oletuksen mukaisesti"
 
-#: classes/pref/users.php:405
-msgid "Access Level"
-msgstr "Käyttäjäoikeudet"
+#: classes/pref/filters.php:942
+msgid "Create"
+msgstr "Luo"
 
-#: classes/pref/users.php:408
-msgid "Last login"
-msgstr "Viimeisin kirjautuminen"
+#: classes/pref/filters.php:987
+msgid "Regular expression, without outer delimiters (i.e. slashes)"
+msgstr ""
 
-#: classes/pref/users.php:427
-msgid "Click to edit"
-msgstr "Napsauta muokataksesi"
+#: classes/pref/filters.php:993
+msgid "Inverse regular expression matching"
+msgstr "Käänteinen täsmäys säännöllisellä lausekkeella"
 
-#: classes/pref/users.php:447
-msgid "No users defined."
-msgstr "Käyttäjätunnuksia ei määritelty."
+#: classes/pref/filters.php:995
+msgid "on field"
+msgstr "kentässä"
 
-#: classes/pref/users.php:449
-msgid "No matching users found."
-msgstr "Hakua vastaavia käyttäjätunnuksia ei löytynyt"
+#: classes/pref/filters.php:1001
+#: js/PrefFilterTree.js:44
+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:764
+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:786
+msgid "Add action"
+msgstr "Lisää toiminto"
+
+#: classes/pref/filters.php:1139
+#, fuzzy
+msgid "[No caption]"
+msgstr "Nimi"
+
+#: classes/pref/filters.php:1141
+#, 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:1155
+#, fuzzy
+msgid "matches any rule"
+msgstr "Täsmää ainakin yhteen säännöistä"
+
+#: classes/pref/filters.php:1158
+#, fuzzy, php-format
+msgid "%s (+%d action)"
+msgid_plural "%s (+%d actions)"
+msgstr[0] "Lisää toiminto"
+msgstr[1] "Lisää toiminto"
+
+#: classes/pref/system.php:8
+#: classes/pref/users.php:6
+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."
 
 #: classes/pref/system.php:29
 msgid "Error Log"
@@ -1450,387 +1444,316 @@ msgid_plural "(%d feeds)"
 msgstr[0] "Muokkaa syötettä"
 msgstr[1] "Muokkaa syötettä"
 
-#: classes/pref/feeds.php:514
+#: classes/pref/feeds.php:513
 #: classes/pref/prefs.php:18
 msgid "General"
 msgstr "Yleinen"
 
-#: classes/pref/feeds.php:528
+#: classes/pref/feeds.php:527
 msgid "Feed Title"
 msgstr "Syötteen otsikko"
 
-#: classes/pref/feeds.php:560
-#: classes/pref/feeds.php:801
-#: classes/pref/feeds.php:1635
-#: classes/feeds.php:989
-msgid "Place in category:"
-msgstr "Siirrä kansioon:"
+#: classes/pref/feeds.php:536
+#: classes/handler/public.php:417
+msgid "URL:"
+msgstr "URL:"
 
-#: classes/pref/feeds.php:572
+#: classes/pref/feeds.php:571
 #, fuzzy
 msgid "Site URL:"
 msgstr "Artikkelin osoite:"
 
-#: classes/pref/feeds.php:574
+#: classes/pref/feeds.php:573
 #, fuzzy
 msgid "Site URL"
 msgstr "Syötteen osoite"
 
-#: classes/pref/feeds.php:585
-#: classes/pref/feeds.php:815
+#: classes/pref/feeds.php:584
+#: classes/pref/feeds.php:814
 #, fuzzy
 msgid "Language:"
 msgstr "Kieli"
 
-#: classes/pref/feeds.php:592
-#: classes/pref/feeds.php:824
+#: classes/pref/feeds.php:591
+#: classes/pref/feeds.php:823
 msgid "Update"
 msgstr "Päivitä"
 
-#: classes/pref/feeds.php:607
-#: classes/pref/feeds.php:840
+#: classes/pref/feeds.php:606
+#: classes/pref/feeds.php:839
 msgid "Article purging:"
 msgstr "Artikkeleiden siivous"
 
-#: classes/pref/feeds.php:632
-#: classes/pref/feeds.php:861
-#: classes/pref/feeds.php:1652
-#: classes/pref/prefs.php:243
-#: classes/feeds.php:1017
-msgid "Password"
-msgstr "Salasana"
-
-#: classes/pref/feeds.php:636
+#: classes/pref/feeds.php:635
 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:646
-#: classes/feeds.php:1028
-msgid "This feed requires authentication."
-msgstr "Tämä syöte vaatii kirjautumisen"
+#: classes/pref/feeds.php:647
+#: classes/pref/feeds.php:866
+#: classes/pref/users.php:82
+msgid "Options"
+msgstr "Valinnat"
 
-#: classes/pref/feeds.php:662
-#: classes/pref/feeds.php:871
+#: classes/pref/feeds.php:661
+#: classes/pref/feeds.php:870
 msgid "Hide from Popular feeds"
 msgstr "Piilota suosituista syötteistä"
 
-#: classes/pref/feeds.php:674
-#: classes/pref/feeds.php:877
+#: classes/pref/feeds.php:673
+#: classes/pref/feeds.php:876
 msgid "Include in e-mail digest"
 msgstr "Sisällytä sähköpostitiivistelmään"
 
-#: classes/pref/feeds.php:687
-#: classes/pref/feeds.php:883
+#: classes/pref/feeds.php:686
+#: classes/pref/feeds.php:882
 msgid "Always display image attachments"
 msgstr "Näytä aina liitetyt kuvat"
 
-#: classes/pref/feeds.php:700
-#: classes/pref/feeds.php:891
+#: classes/pref/feeds.php:699
+#: classes/pref/feeds.php:890
 #, fuzzy
 msgid "Do not embed media"
 msgstr "Älä näytä kuvia"
 
-#: classes/pref/feeds.php:713
-#: classes/pref/feeds.php:899
+#: classes/pref/feeds.php:712
+#: classes/pref/feeds.php:898
 msgid "Cache media"
 msgstr ""
 
-#: classes/pref/feeds.php:725
-#: classes/pref/feeds.php:905
+#: classes/pref/feeds.php:724
+#: classes/pref/feeds.php:904
 msgid "Mark updated articles as unread"
 msgstr "Merkitse päivitetyt artikkelit lukemattomiksi"
 
-#: classes/pref/feeds.php:729
+#: classes/pref/feeds.php:728
 msgid "Icon"
 msgstr "Suosikkikuvake"
 
-#: classes/pref/feeds.php:743
-#: classes/pref/feeds.php:1284
+#: classes/pref/feeds.php:742
+#: classes/pref/feeds.php:1283
 #: plugins/import_export/init.php:71
 #, fuzzy
 msgid "Choose file..."
 msgstr "Luo suodatin..."
 
-#: classes/pref/feeds.php:750
+#: classes/pref/feeds.php:749
 msgid "Replace"
 msgstr "Vaihda"
 
-#: classes/pref/feeds.php:757
+#: classes/pref/feeds.php:756
 #: classes/pref/prefs.php:679
 msgid "Plugins"
 msgstr "Lisäosat"
 
-#: classes/pref/feeds.php:1154
+#: classes/pref/feeds.php:1153
 msgid "Feeds with errors"
 msgstr "Virheelliset syötteet"
 
-#: classes/pref/feeds.php:1161
+#: classes/pref/feeds.php:1160
 msgid "Inactive feeds"
 msgstr "Passiiviset syötteet"
 
-#: classes/pref/feeds.php:1197
+#: classes/pref/feeds.php:1196
 msgid "Edit selected feeds"
 msgstr "Muokkaa valittuja syötteitä"
 
-#: classes/pref/feeds.php:1199
-#: classes/pref/feeds.php:1213
-#: classes/pref/filters.php:810
-msgid "Reset sort order"
-msgstr "Järjestä oletuksen mukaisesti"
-
-#: classes/pref/feeds.php:1201
-#: js/prefs.js:1462
+#: classes/pref/feeds.php:1200
+#: js/prefs.js:1171
 msgid "Batch subscribe"
 msgstr "Tilaa useita"
 
-#: classes/pref/feeds.php:1208
+#: classes/pref/feeds.php:1207
 msgid "Categories"
 msgstr "Kansiot"
 
-#: classes/pref/feeds.php:1211
+#: classes/pref/feeds.php:1210
 msgid "Add category"
 msgstr "Lisää kansio"
 
-#: classes/pref/feeds.php:1215
+#: classes/pref/feeds.php:1214
 msgid "Remove selected"
 msgstr "Poista valittu"
 
-#: classes/pref/feeds.php:1272
+#: classes/pref/feeds.php:1271
 msgid "OPML"
 msgstr "OPML"
 
-#: classes/pref/feeds.php:1274
+#: classes/pref/feeds.php:1273
 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:1275
+#: classes/pref/feeds.php:1274
 msgid "Only main settings profile can be migrated using OPML."
 msgstr "Vain pääasetusprofiili voidaan siirtää OPML:ää käyttäen."
 
-#: classes/pref/feeds.php:1290
+#: classes/pref/feeds.php:1289
 msgid "Import my OPML"
 msgstr "Tuo OPML"
 
-#: classes/pref/feeds.php:1296
+#: classes/pref/feeds.php:1295
 msgid "Filename:"
 msgstr "Tiedosto:"
 
-#: classes/pref/feeds.php:1298
+#: classes/pref/feeds.php:1297
 msgid "Include settings"
 msgstr "Sisältäen asetukset"
 
-#: classes/pref/feeds.php:1302
+#: classes/pref/feeds.php:1301
 msgid "Export OPML"
 msgstr "Vie OMPL"
 
-#: classes/pref/feeds.php:1306
+#: classes/pref/feeds.php:1305
 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:1310
+#: classes/pref/feeds.php:1309
 msgid "Public OPML URL"
 msgstr "Julkinen OPML URL"
 
-#: classes/pref/feeds.php:1311
+#: classes/pref/feeds.php:1310
 msgid "Display published OPML URL"
 msgstr "Näytä julkaistu OPML URL"
 
-#: classes/pref/feeds.php:1318
+#: classes/pref/feeds.php:1317
 msgid "Published & shared articles / Generated feeds"
 msgstr "Julkaistut ja jaetut artikkelit / Luodut syötteet"
 
-#: classes/pref/feeds.php:1320
+#: classes/pref/feeds.php:1319
 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:1327
-#: classes/feeds.php:54
-#: classes/feeds.php:140
-msgid "View as RSS"
-msgstr "Näytä RSS-syötteenä"
-
-#: classes/pref/feeds.php:1328
 msgid "Display URL"
 msgstr "Näytä osoite"
 
-#: classes/pref/feeds.php:1331
+#: classes/pref/feeds.php:1330
 msgid "Clear all generated URLs"
 msgstr "Poista kaikki luodut osoitteet"
 
-#: classes/pref/feeds.php:1410
+#: classes/pref/feeds.php:1409
 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:1444
-#: classes/pref/feeds.php:1509
+#: classes/pref/feeds.php:1443
+#: classes/pref/feeds.php:1508
 msgid "Click to edit feed"
 msgstr "Napsauta muokataksesi syötettä"
 
-#: classes/pref/feeds.php:1462
-#: classes/pref/feeds.php:1529
+#: classes/pref/feeds.php:1461
+#: classes/pref/feeds.php:1528
 msgid "Unsubscribe from selected feeds"
 msgstr "Lopeta valittujen syötteiden tilaukset"
 
-#: classes/pref/feeds.php:1632
+#: classes/pref/feeds.php:1629
 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:1641
+#: classes/pref/feeds.php:1638
 msgid "Feeds to subscribe, One per line"
 msgstr "Tilattavat syötteet, yksi syöte riviä kohden"
 
-#: classes/pref/feeds.php:1664
+#: classes/pref/feeds.php:1661
 msgid "Feeds require authentication."
 msgstr "Syötteet vaativat kirjautumisen."
 
-#: classes/pref/feeds.php:1671
-#: classes/feeds.php:1031
-#: classes/feeds.php:1087
-msgid "Subscribe"
-msgstr "Tilaa"
-
-#: classes/pref/filters.php:155
+#: classes/pref/users.php:26
 #, fuzzy
-msgid "Preview article"
-msgstr "Tuoreet artikkelit"
+msgid "Edit user"
+msgstr "Muokkaa sääntöä"
 
-#: classes/pref/filters.php:267
-#: classes/pref/filters.php:573
-msgid "(inverse)"
-msgstr "(käänteinen)"
+#: classes/pref/users.php:64
+msgid "Access level: "
+msgstr "Käyttäjäoikeudet:"
 
-#: classes/pref/filters.php:263
-#: classes/pref/filters.php:572
+#: classes/pref/users.php:96
+#: js/prefs.js:403
+msgid "User details"
+msgstr "Käyttäjätiedot"
+
+#: classes/pref/users.php:136
+#: classes/pref/users.php:406
+msgid "Registered"
+msgstr "Rekisteröity"
+
+#: classes/pref/users.php:137
+msgid "Last logged in"
+msgstr "Viimeksi kirjautunut"
+
+#: classes/pref/users.php:145
+msgid "Subscribed feeds count"
+msgstr "Tilattujen syötteiden määrä"
+
+#: classes/pref/users.php:146
+#, fuzzy
+msgid "Stored articles"
+msgstr "Tähdelliset artikkelit"
+
+#: classes/pref/users.php:150
+#: classes/pref/users.php:405
+msgid "Subscribed feeds"
+msgstr "Tilatut syötteet"
+
+#: classes/pref/users.php:176
+msgid "User not found"
+msgstr "Käyttäjätunnusta ei löydy"
+
+#: classes/pref/users.php:246
 #, php-format
-msgid "%s on %s in %s %s"
+msgid "Added user <b>%s</b> with password <b>%s</b>"
+msgstr "Käyttäjätunnus <b>%s</b> lisätty salasanalla <b>%s</b>"
+
+#: classes/pref/users.php:253
+#, php-format
+msgid "Could not create user <b>%s</b>"
+msgstr "Käyttäjää <b>%s</b> ei voitu luoda"
+
+#: classes/pref/users.php:257
+#, php-format
+msgid "User <b>%s</b> already exists."
+msgstr "Käyttäjätunnus <b>%s</b> on jo olemassa."
+
+#: classes/pref/users.php:285
+#, 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:287
+#, 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:310
+msgid "[tt-rss] Password change notification"
 msgstr ""
 
-#: classes/pref/filters.php:383
-#: classes/pref/filters.php:870
-#: classes/pref/filters.php:977
-msgid "Match"
-msgstr "Täsmäys"
+#: classes/pref/users.php:363
+msgid "Create user"
+msgstr "Luo käyttäjätunnus"
 
-#: classes/pref/filters.php:397
-#: classes/pref/filters.php:455
-#: classes/pref/filters.php:884
-#: classes/pref/filters.php:911
-msgid "Add"
-msgstr "Lisää"
+#: classes/pref/users.php:371
+#: classes/handler/public.php:747
+msgid "Reset password"
+msgstr "Palauta salasana"
 
-#: classes/pref/filters.php:400
-#: classes/pref/filters.php:458
-#: classes/pref/filters.php:887
-#: classes/pref/filters.php:914
-#: classes/feeds.php:122
-msgid "Delete"
-msgstr "Poista"
+#: classes/pref/users.php:404
+msgid "Access Level"
+msgstr "Käyttäjäoikeudet"
 
-#: classes/pref/filters.php:441
-#: classes/pref/filters.php:897
-msgid "Apply actions"
-msgstr "Suorita toiminnot"
+#: classes/pref/users.php:407
+msgid "Last login"
+msgstr "Viimeisin kirjautuminen"
 
-#: classes/pref/filters.php:492
-#: classes/pref/filters.php:926
-msgid "Enabled"
-msgstr "Aktivoitu"
+#: classes/pref/users.php:426
+msgid "Click to edit"
+msgstr "Napsauta muokataksesi"
 
-#: classes/pref/filters.php:501
-#: classes/pref/filters.php:929
-msgid "Match any rule"
-msgstr "Täsmää ainakin yhteen säännöistä"
+#: classes/pref/users.php:446
+msgid "No users defined."
+msgstr "Käyttäjätunnuksia ei määritelty."
 
-#: classes/pref/filters.php:510
-#: classes/pref/filters.php:932
-msgid "Inverse matching"
-msgstr "Käänteinen täsmäys"
-
-#: classes/pref/filters.php:522
-#: classes/pref/filters.php:939
-msgid "Test"
-msgstr "Kokeilu"
-
-#: classes/pref/filters.php:804
-msgid "Combine"
-msgstr "Yhdistä"
-
-#: classes/pref/filters.php:942
-msgid "Create"
-msgstr "Luo"
-
-#: classes/pref/filters.php:987
-msgid "Regular expression, without outer delimiters (i.e. slashes)"
-msgstr ""
-
-#: 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:43
-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:797
-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:819
-msgid "Add action"
-msgstr "Lisää toiminto"
-
-#: classes/pref/filters.php:1139
-#, fuzzy
-msgid "[No caption]"
-msgstr "Nimi"
-
-#: classes/pref/filters.php:1141
-#, 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:1155
-#, fuzzy
-msgid "matches any rule"
-msgstr "Täsmää ainakin yhteen säännöistä"
-
-#: classes/pref/filters.php:1158
-#, fuzzy, php-format
-msgid "%s (+%d action)"
-msgid_plural "%s (+%d actions)"
-msgstr[0] "Lisää toiminto"
-msgstr[1] "Lisää toiminto"
+#: classes/pref/users.php:448
+msgid "No matching users found."
+msgstr "Hakua vastaavia käyttäjätunnuksia ei löytynyt"
 
 #: classes/pref/prefs.php:19
 msgid "Interface"
@@ -2007,7 +1930,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:1424
+#: js/prefs.js:1136
 msgid "Customize stylesheet"
 msgstr "Muokkaa CSS-tyylitiedostoa"
 
@@ -2250,258 +2173,302 @@ msgstr "Poista valitut profiilit"
 msgid "Activate profile"
 msgstr "Aktivoi profiili"
 
-#: classes/feeds.php:53
-msgid "View as RSS feed"
-msgstr "Näytä RSS-syötteenä"
+#: 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/feeds.php:62
-#, php-format
-msgid "Last updated: %s"
-msgstr "Päivitetty viimeksi: %s"
+#: classes/dlg.php:44
+msgid "Your Public OPML URL is:"
+msgstr "Julkinen OPML URL:isi on:"
 
-#: classes/feeds.php:100
+#: classes/dlg.php:53
+#: classes/dlg.php:178
+#: plugins/share/init.php:125
+msgid "Generate new URL"
+msgstr "Luo uusi URL"
+
+#: classes/dlg.php:67
+msgid "Update daemon is enabled in configuration, but daemon process is not running, which prevents all feeds from updating. Please start the daemon process or contact instance owner."
+msgstr ""
+
+#: classes/dlg.php:71
+#: classes/dlg.php:80
+msgid "Last update:"
+msgstr "Viimeksi päivitetty:"
+
+#: classes/dlg.php:76
+msgid "Update daemon is taking too long to perform a feed update. This could indicate a problem like crash or a hang. Please check the daemon process or contact instance owner."
+msgstr ""
+
+#: classes/dlg.php:169
+msgid "You can view this feed as RSS using the following URL:"
+msgstr "Tämän RSS-syötteen julkinen osoite on:"
+
+#: classes/dlg.php:190
+msgid "You are using default tt-rss password. Please change it in the Preferences (Personal data / Authentication)."
+msgstr ""
+
+#: classes/dlg.php:194
 #, fuzzy
-msgid "Select..."
-msgstr "Valitse"
+msgid "Open Preferences"
+msgstr "Asetukset"
 
-#: classes/feeds.php:104
-msgid "Invert"
-msgstr "Käännä"
+#: classes/opml.php:31
+#: classes/opml.php:36
+msgid "OPML Utility"
+msgstr "OPML-työkalu"
 
-#: classes/feeds.php:107
-msgid "Selection toggle:"
-msgstr "Vaihda valittujen tila:"
+#: classes/opml.php:40
+msgid "Importing OPML..."
+msgstr "Luetaan OPML-tiedostoa"
 
-#: classes/feeds.php:113
-msgid "Selection:"
-msgstr "Valinta:"
+#: classes/opml.php:45
+msgid "Return to preferences"
+msgstr "Palaa asetuksiin"
 
-#: classes/feeds.php:116
-msgid "Set score"
-msgstr "Pisteytä"
+#: classes/opml.php:301
+#, php-format
+msgid "Adding feed: %s"
+msgstr "Lisätään syöte: %s"
 
-#: classes/feeds.php:119
-msgid "Archive"
-msgstr "Arkistoi"
+#: classes/opml.php:312
+#, php-format
+msgid "Duplicate feed: %s"
+msgstr "Syötteen kaksoiskappale: %s"
 
-#: classes/feeds.php:121
-msgid "Move back"
-msgstr "Siirrä takaisin"
+#: classes/opml.php:326
+#, php-format
+msgid "Adding label %s"
+msgstr "Lisätään tunniste %s"
 
-#: classes/feeds.php:127
-#: classes/feeds.php:132
-#: plugins/mail/init.php:76
-#: plugins/mailto/init.php:25
-msgid "Forward by email"
-msgstr "Lähetä sähköpostilla"
+#: classes/opml.php:329
+#, php-format
+msgid "Duplicate label: %s"
+msgstr "Tunnisteen kaksoiskappale: %s"
 
-#: classes/feeds.php:136
-msgid "Feed:"
-msgstr "Syöte:"
+#: classes/opml.php:341
+#, php-format
+msgid "Setting preference key %s to %s"
+msgstr ""
 
-#: classes/feeds.php:193
-#: classes/feeds.php:819
-msgid "Feed not found."
-msgstr "Syötettä ei löydy"
+#: classes/opml.php:377
+msgid "Adding filter..."
+msgstr "Lisätään suodatin..."
 
-#: classes/feeds.php:255
+#: classes/opml.php:512
+#, php-format
+msgid "Processing category: %s"
+msgstr ""
+
+#: classes/opml.php:558
+#, php-format
+msgid "Upload failed with error code %d"
+msgstr "Lähettäminen epäonnistui virhekoodilla %d"
+
+#: classes/opml.php:570
+#: plugins/import_export/init.php:471
 #, fuzzy
-msgid "Never"
-msgstr "Älä poista koskaan"
+msgid "Unable to move uploaded file."
+msgstr "Ladatun tiedoston siirtäminen epäonnistui."
 
-#: classes/feeds.php:342
-#, php-format
-msgid "Imported at %s"
-msgstr "Tuotu %s"
+#: classes/opml.php:574
+#: plugins/import_export/init.php:475
+msgid "Error: please upload OPML file."
+msgstr "Virhe: lähetä OPML-tiedosto."
 
-#: classes/feeds.php:394
-#: classes/feeds.php:487
+#: classes/opml.php:585
 #, fuzzy
-msgid "mark feed as read"
-msgstr "Merkitse syöte luetuksi"
+msgid "Error: unable to find moved OPML file."
+msgstr "Virhe: siirretty OPML-tiedosto katosi."
 
-#: classes/feeds.php:542
-msgid "Collapse article"
-msgstr "Sulje artikkeli"
+#: classes/opml.php:594
+msgid "Error while parsing document."
+msgstr "Virhe tulkitessa dokumenttia."
 
-#: classes/feeds.php:703
-msgid "No unread articles found to display."
-msgstr "Lukemattomia artikkeleita ei ole näytettäväksi"
+#: classes/article.php:26
+msgid "Article not found."
+msgstr "Artikkelia ei löytynyt"
 
-#: classes/feeds.php:706
-msgid "No updated articles found to display."
-msgstr "Päivitettyjä artikkeleita ei ole näytettäväksi"
+#: classes/article.php:211
+msgid "Tags for this article (separated by commas):"
+msgstr "Tämän syötteen avainsanat (pilkulla erotettuina)"
 
-#: classes/feeds.php:709
-msgid "No starred articles found to display."
-msgstr "Tähdellä merkittyjä artikkeleita ei ole näytettäväksi"
+#: classes/article.php:337
+#: classes/article.php:719
+#: classes/article.php:874
+msgid "no tags"
+msgstr "ei avainsanoja"
 
-#: classes/feeds.php:713
+#: classes/article.php:447
+msgid "unknown type"
+msgstr "tuntematon tyyppi"
+
+#: classes/article.php:524
+msgid "Attachments"
+msgstr "Litteet"
+
+#: classes/article.php:688
+msgid " - "
+msgstr " - "
+
+#: classes/article.php:912
+msgid "(edit note)"
+msgstr "(muokkaa muistiinpanoa)"
+
+#: classes/handler/public.php:407
+#: plugins/bookmarklets/init.php:40
+msgid "Share with Tiny Tiny RSS"
+msgstr "Jaa Tiny Tiny RSS:llä"
+
+#: classes/handler/public.php:415
+msgid "Title:"
+msgstr "Otsikko:"
+
+#: classes/handler/public.php:419
+msgid "Content:"
+msgstr "Sisältö:"
+
+#: classes/handler/public.php:421
+msgid "Labels:"
+msgstr "Tunnisteet"
+
+#: classes/handler/public.php:440
+msgid "Shared article will appear in the Published feed."
+msgstr "Jaetut artikkelit näkyvät 'Julkisissa syötteissä'."
+
+#: classes/handler/public.php:442
+msgid "Share"
+msgstr "Jaa"
+
+#: classes/handler/public.php:464
+msgid "Not logged in"
+msgstr "Et ole kirjautunut"
+
+#: classes/handler/public.php:527
+msgid "Incorrect username or password"
+msgstr "Väärä käyttäjätunnus tai salasana"
+
+#: classes/handler/public.php:581
+#, php-format
+msgid "Already subscribed to <b>%s</b>."
+msgstr "Olet jo tilannut syötteen <b>%s</b>."
+
+#: classes/handler/public.php:584
+#, php-format
+msgid "Subscribed to <b>%s</b>."
+msgstr "Tilattu syöte <b>%s</b>."
+
+#: classes/handler/public.php:587
+#, 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:590
+#, php-format
+msgid "No feeds found in <b>%s</b>."
+msgstr "<b>%s</b> ei sisällä syötteitä."
+
+#: classes/handler/public.php:593
+msgid "Multiple feed URLs found."
+msgstr "Useita syöteosoitteita löytyi."
+
+#: classes/handler/public.php:597
+#, 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:615
+msgid "Subscribe to selected feed"
+msgstr "Tilaa valittu syöte"
+
+#: classes/handler/public.php:642
+msgid "Edit subscription options"
+msgstr "Muokkaa syötteen asetuksia"
+
+#: classes/handler/public.php:680
+msgid "Password recovery"
+msgstr "Salasanan palautus"
+
+#: classes/handler/public.php:725
 #, 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."
+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/feeds.php:715
-msgid "No articles found to display."
-msgstr "Ei näytettäviä artikkeleita."
+#: classes/handler/public.php:757
+msgid "Some of the required form parameters are missing or incorrect."
+msgstr "Jotkin vaadituista parametreistä puuttuvat tai ovat väärin."
 
-#: classes/feeds.php:731
-#: classes/feeds.php:922
-#, php-format
-msgid "Feeds last updated at %s"
-msgstr "Syötteet päivitetty viimeksi %s"
+#: classes/handler/public.php:761
+#: classes/handler/public.php:830
+msgid "Go back"
+msgstr "Takaisin"
 
-#: classes/feeds.php:743
-#: classes/feeds.php:934
-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:911
-msgid "No feed selected."
-msgstr "Yhtään syötettä ei ole valittuna"
-
-#: classes/feeds.php:975
-#: classes/feeds.php:983
-msgid "Feed or site URL"
-msgstr "Syötteen/sivuston osoite"
-
-#: classes/feeds.php:997
-msgid "Available feeds"
-msgstr "Saatavilla olevat syötteet"
-
-#: classes/feeds.php:1034
-msgid "More feeds"
-msgstr "Lisää syötteitä"
-
-#: classes/feeds.php:1063
-msgid "Popular feeds"
-msgstr "Suositut syötteet"
-
-#: classes/feeds.php:1064
-msgid "Feed archive"
-msgstr "Syötearkisto"
-
-#: classes/feeds.php:1067
-msgid "limit:"
-msgstr "raja:"
-
-#: classes/feeds.php:1101
-msgid "Look for"
-msgstr "Etsi"
-
-#: classes/feeds.php:1109
-#, php-format
-msgid "in %s"
+#: classes/handler/public.php:799
+msgid "[tt-rss] Password reset request"
 msgstr ""
 
-#: classes/feeds.php:1114
-msgid "Used for word stemming"
+#: 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: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:874
+msgid "Database Updater"
+msgstr "Tietokannan päivitys"
+
+#: classes/handler/public.php:939
+msgid "Perform updates"
+msgstr "Suorita päivityksiä"
+
+#: plugins/af_zz_imgproxy/init.php:208
+msgid "Image proxy settings (af_zz_imgproxy)"
 msgstr ""
 
-#: classes/feeds.php:1123
-msgid "Search syntax"
-msgstr "Haun syntaksi"
+#: plugins/af_zz_imgproxy/init.php:232
+#, fuzzy
+msgid "Enable proxy for all remote images."
+msgstr "Käytä syötekansioita"
 
-#: classes/feeds.php:1577
-msgid "Starred articles"
-msgstr "Tähdelliset artikkelit"
+#: plugins/af_zz_imgproxy/init.php:236
+#, fuzzy
+msgid "Don't cache files locally."
+msgstr "Tallenna kuvat välimuistiin"
 
-#: classes/feeds.php:1579
-msgid "Published articles"
-msgstr "Julkiset artikkelit"
-
-#: classes/feeds.php:1581
-msgid "Fresh articles"
-msgstr "Tuoreet artikkelit"
-
-#: classes/feeds.php:1585
-msgid "Archived articles"
-msgstr "Arkistoidut artikkelit"
-
-#: classes/feeds.php:1587
-msgid "Recently read"
-msgstr "Viimeksi luetut"
-
-#: classes/feeds.php:1708
-msgid "Special"
-msgstr "Erikoiset"
-
-#: classes/feeds.php:1965
-#, php-format
-msgid "Search results: %s"
-msgstr "Hakutulokset: %s"
-
-#: 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."
+#: plugins/af_zz_imgproxy/init.php:252
+#: plugins/af_redditimgur/init.php:79
+#, fuzzy
+msgid "Configuration saved"
 msgstr "Asetukset tallennettiin."
 
-#: plugins/note/init.php:28
-#: plugins/note/note.js:11
-msgid "Edit article note"
-msgstr "Muokkaa artikkelin muistiinpanoa"
-
 #: plugins/vf_shared/init.php:17
 #: plugins/vf_shared/init.php:73
 msgid "Shared articles"
 msgstr "Jaetut artikkelit"
 
-#: plugins/auth_internal/init.php:67
-msgid "Please enter your one time password:"
-msgstr "Syötä kertakäyttösalasanasi:"
-
-#: plugins/auth_internal/init.php:208
-msgid "Password has been changed."
-msgstr "Salasana on vaihdettu."
-
-#: plugins/auth_internal/init.php:210
-msgid "Old password is incorrect."
-msgstr "Vanha salasana on virheellinen."
-
-#: plugins/af_readability/init.php:25
-#, fuzzy
-msgid "Data saved."
-msgstr "Tiedot talletettu (%s, %d)"
-
-#: plugins/af_readability/init.php:41
-#, fuzzy
-msgid "Inline content"
-msgstr "Muokkaa artikkelin muistiinpanoa"
-
-#: plugins/af_readability/init.php:47
-msgid "Readability settings (af_readability)"
+#: plugins/bookmarklets/init.php:20
+msgid "Bookmarklets"
 msgstr ""
 
-#: plugins/af_readability/init.php:78
-msgid "Use Readability for pages shared via bookmarklet."
-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_readability/init.php:90
-#: plugins/af_psql_trgm/init.php:198
-msgid "Currently enabled for (click to edit):"
-msgstr ""
+#: plugins/bookmarklets/init.php:26
+#, php-format
+msgid "Subscribe to %s in Tiny Tiny RSS?"
+msgstr "TIlataanko %s Tiny Tiny RSS:ssä?"
 
-#: plugins/af_readability/init.php:107
-#, fuzzy
-msgid "Readability"
-msgstr "Tarkasta saatavuus"
+#: plugins/bookmarklets/init.php:31
+msgid "Subscribe in Tiny Tiny RSS"
+msgstr "Tilaa Tiny Tiny RSS:ssä"
 
-#: plugins/af_readability/init.php:118
-#, fuzzy
-msgid "Inline article content"
-msgstr "Muokkaa artikkelin muistiinpanoa"
+#: 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_redditimgur/init.php:30
 msgid "Reddit content settings (af_redditimgur)"
@@ -2515,11 +2482,21 @@ msgstr ""
 msgid "Enable additional duplicate checking"
 msgstr ""
 
-#: plugins/af_redditimgur/init.php:79
-#: plugins/af_zz_imgproxy/init.php:252
-#, fuzzy
-msgid "Configuration saved"
-msgstr "Asetukset tallennettiin."
+#: plugins/af_comics/init.php:49
+msgid "Feeds supported by af_comics"
+msgstr "af_comics:n tukemat syötteet"
+
+#: plugins/af_comics/init.php:51
+msgid "The following comics are currently supported:"
+msgstr "Seuraavat sarjakuvat ovat tuettuja:"
+
+#: plugins/af_comics/init.php:69
+msgid "To subscribe to GoComics use the comic's regular web page as the feed URL (e.g. for the <em>Garfield</em> comic use <code>http://www.gocomics.com/garfield</code>)."
+msgstr ""
+
+#: plugins/af_comics/init.php:71
+msgid "Drop any updated filters into <code>filters.local</code> in plugin directory."
+msgstr ""
 
 #: plugins/af_psql_trgm/init.php:29
 #, php-format
@@ -2557,26 +2534,88 @@ msgstr ""
 msgid "Enable for all feeds:"
 msgstr "Käytä syötekansioita"
 
+#: plugins/af_psql_trgm/init.php:198
+#: plugins/af_readability/init.php:90
+msgid "Currently enabled for (click to edit):"
+msgstr ""
+
 #: plugins/af_psql_trgm/init.php:216
 msgid "Similarity (pg_trgm)"
 msgstr ""
 
-#: plugins/af_comics/init.php:49
-msgid "Feeds supported by af_comics"
-msgstr "af_comics:n tukemat syötteet"
+#: plugins/af_readability/init.php:25
+#, fuzzy
+msgid "Data saved."
+msgstr "Tiedot talletettu (%s, %d)"
 
-#: plugins/af_comics/init.php:51
-msgid "The following comics are currently supported:"
-msgstr "Seuraavat sarjakuvat ovat tuettuja:"
+#: plugins/af_readability/init.php:41
+#, fuzzy
+msgid "Inline content"
+msgstr "Muokkaa artikkelin muistiinpanoa"
 
-#: plugins/af_comics/init.php:69
-msgid "To subscribe to GoComics use the comic's regular web page as the feed URL (e.g. for the <em>Garfield</em> comic use <code>http://www.gocomics.com/garfield</code>)."
+#: plugins/af_readability/init.php:47
+msgid "Readability settings (af_readability)"
 msgstr ""
 
-#: plugins/af_comics/init.php:71
-msgid "Drop any updated filters into <code>filters.local</code> in plugin directory."
+#: plugins/af_readability/init.php:78
+msgid "Use Readability for pages shared via bookmarklet."
 msgstr ""
 
+#: plugins/af_readability/init.php:107
+#, fuzzy
+msgid "Readability"
+msgstr "Tarkasta saatavuus"
+
+#: plugins/af_readability/init.php:118
+#, fuzzy
+msgid "Inline article content"
+msgstr "Muokkaa artikkelin muistiinpanoa"
+
+#: plugins/mailto/init.php:50
+#: plugins/mailto/init.php:58
+#: plugins/mail/init.php:118
+#: plugins/mail/init.php:124
+msgid "[Forwarded]"
+msgstr ""
+
+#: plugins/mailto/init.php:50
+#: plugins/mail/init.php:118
+msgid "Multiple articles"
+msgstr "Monta artikkelia"
+
+#: plugins/mailto/init.php:74
+msgid "Clicking the following link to invoke your mail client:"
+msgstr ""
+
+#: plugins/mailto/init.php:78
+msgid "Forward selected article(s) by email."
+msgstr "Lähetä valitut artikkeli(t) sähköpostitse."
+
+#: plugins/mailto/init.php:81
+msgid "You should be able to edit the message before sending in your mail client."
+msgstr ""
+
+#: plugins/mailto/init.php:86
+msgid "Close this dialog"
+msgstr "Sulje"
+
+#: 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 "Asetukset tallennettiin."
+
 #: plugins/import_export/init.php:53
 msgid "Import and export"
 msgstr "Tuonti ja vienti"
@@ -2643,101 +2682,6 @@ msgstr "Lähettäminen epäonnistui virhekoodilla %d"
 msgid "No file uploaded."
 msgstr ""
 
-#: plugins/mail/init.php:29
-msgid "Mail addresses saved."
-msgstr "Sähköpostiosoite on tallennettu."
-
-#: plugins/mail/init.php:35
-msgid "Mail plugin"
-msgstr "Sähköpostilisäosa"
-
-#: plugins/mail/init.php:37
-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:118
-#: plugins/mail/init.php:124
-#: plugins/mailto/init.php:50
-#: plugins/mailto/init.php:58
-msgid "[Forwarded]"
-msgstr ""
-
-#: plugins/mail/init.php:118
-#: plugins/mailto/init.php:50
-msgid "Multiple articles"
-msgstr "Monta artikkelia"
-
-#: plugins/mail/init.php:146
-msgid "To:"
-msgstr "Vastaanottaja:"
-
-#: plugins/mail/init.php:161
-msgid "Subject:"
-msgstr "Otsikko:"
-
-#: plugins/mail/init.php:178
-msgid "Send e-mail"
-msgstr "Lähetä sähköposti"
-
-#: plugins/close_button/init.php:25
-msgid "Close article"
-msgstr "Sulje artikkeli"
-
-#: 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 "Raahaa allaoleva linkki selaimesi työkaluriville, avaa syöte josta olet kiinnsotunut selaimessasi ja klikkaa linkkiä tilataksesi syötteen."
-
-#: 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/toggle_sidebar/init.php:23
-msgid "Collapse feedlist"
-msgstr "Sulje syöteluettelo"
-
-#: plugins/af_zz_imgproxy/init.php:208
-msgid "Image proxy settings (af_zz_imgproxy)"
-msgstr ""
-
-#: plugins/af_zz_imgproxy/init.php:232
-#, fuzzy
-msgid "Enable proxy for all remote images."
-msgstr "Käytä syötekansioita"
-
-#: plugins/af_zz_imgproxy/init.php:236
-#, fuzzy
-msgid "Don't cache files locally."
-msgstr "Tallenna kuvat välimuistiin"
-
-#: plugins/mailto/init.php:74
-msgid "Clicking the following link to invoke your mail client:"
-msgstr ""
-
-#: plugins/mailto/init.php:78
-msgid "Forward selected article(s) by email."
-msgstr "Lähetä valitut artikkeli(t) sähköpostitse."
-
-#: plugins/mailto/init.php:81
-msgid "You should be able to edit the message before sending in your mail client."
-msgstr ""
-
-#: plugins/mailto/init.php:86
-msgid "Close this dialog"
-msgstr "Sulje"
-
 #: plugins/share/init.php:41
 msgid "You can disable all articles shared by unique URLs here."
 msgstr "Tässä voit perua kaikki osoitteen kautta jaettujen artikkeleiden julkistukset."
@@ -2758,453 +2702,602 @@ msgstr "Voit jakaa tämän artikkelin seuraavalla uniikilla osoitteella:"
 msgid "Unshare article"
 msgstr "Poista artikkelin jako"
 
-#: js/FeedTree.js:75
+#: plugins/toggle_sidebar/init.php:23
+msgid "Collapse feedlist"
+msgstr "Sulje syöteluettelo"
+
+#: plugins/close_button/init.php:25
+msgid "Close article"
+msgstr "Sulje artikkeli"
+
+#: plugins/mail/init.php:29
+msgid "Mail addresses saved."
+msgstr "Sähköpostiosoite on tallennettu."
+
+#: plugins/mail/init.php:35
+msgid "Mail plugin"
+msgstr "Sähköpostilisäosa"
+
+#: plugins/mail/init.php:37
+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:146
+msgid "To:"
+msgstr "Vastaanottaja:"
+
+#: plugins/mail/init.php:161
+msgid "Subject:"
+msgstr "Otsikko:"
+
+#: plugins/mail/init.php:178
+msgid "Send e-mail"
+msgstr "Lähetä sähköposti"
+
+#: plugins/note/init.php:28
+#: plugins/note/note.js:11
+msgid "Edit article note"
+msgstr "Muokkaa artikkelin muistiinpanoa"
+
+#: plugins/auth_internal/init.php:67
+msgid "Please enter your one time password:"
+msgstr "Syötä kertakäyttösalasanasi:"
+
+#: plugins/auth_internal/init.php:208
+msgid "Password has been changed."
+msgstr "Salasana on vaihdettu."
+
+#: plugins/auth_internal/init.php:210
+msgid "Old password is incorrect."
+msgstr "Vanha salasana on virheellinen."
+
+#: js/FeedTree.js:76
 #, fuzzy
 msgid "(Un)collapse"
 msgstr "Piilota/näytä sivupalkki"
 
-#: js/PrefFeedTree.js:35
+#: js/PrefFeedTree.js:36
 msgid "Edit category"
 msgstr "Muokkaa kansiota"
 
-#: js/PrefFeedTree.js:42
+#: js/PrefFeedTree.js:43
 msgid "Remove category"
 msgstr "Poista kansio"
 
-#: js/PrefFilterTree.js:46
+#: js/PrefFilterTree.js:47
 msgid "Inverse"
 msgstr "Käänteiset valinnat"
 
-#: js/feedlist.js:511
+#: js/feedlist.js:461
 #, 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:514
+#: js/feedlist.js:464
 #, 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:517
+#: js/feedlist.js:467
 #, 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:520
+#: js/feedlist.js:470
 #, fuzzy
 msgid "Mark %w in %s as read?"
 msgstr "Merkitäänkö kaikki artikkelit syötteessä %s luetuiksi?"
 
-#: js/feedlist.js:523
+#: js/feedlist.js:473
 #, fuzzy
 msgid "search results"
 msgstr "Hakutulokset: %s"
 
-#: js/feedlist.js:523
+#: js/feedlist.js:473
 #, fuzzy
 msgid "all articles"
 msgstr "Kaikki artikkelit"
 
-#: js/functions.js:74
+#: js/functions.js:100
 msgid "Close"
 msgstr "Sulje"
 
-#: js/functions.js:141
+#: js/functions.js:167
 #, fuzzy
 msgid "Click to close"
 msgstr "Napsauta muokataksesi"
 
-#: js/functions.js:448
+#: js/functions.js:456
 msgid "Error explained"
 msgstr "Virheet selitettynä"
 
-#: js/functions.js:592
+#: js/functions.js:490
+msgid "Upload complete."
+msgstr "Lataus valmis."
+
+#: js/functions.js:508
+msgid "Remove stored feed icon?"
+msgstr "Poista suosikkikuvake?"
+
+#: js/functions.js:510
+msgid "Removing feed icon..."
+msgstr "Poistetaan suosikkikuvake..."
+
+#: js/functions.js:515
+msgid "Feed icon removed."
+msgstr "Suosikkikuvake poistettu."
+
+#: js/functions.js:532
+msgid "Please select an image file to upload."
+msgstr "Valitse ladattava kuvatiedosto."
+
+#: js/functions.js:533
+msgid "Upload new icon for this feed?"
+msgstr "Ladataanko uusi suosikkikuvake tälle syötteelle?"
+
+#: js/functions.js:534
+msgid "Uploading, please wait..."
+msgstr "Ladataan, odota..."
+
+#: js/functions.js:542
+msgid "Please enter label caption:"
+msgstr "Syötä tunnisteen nimi:"
+
+#: js/functions.js:575
 msgid "Subscribe to Feed"
 msgstr "Tilaa syöte"
 
-#: js/functions.js:621
+#: js/functions.js:602
 msgid "Failed to parse output. This can indicate server timeout and/or network issues. Backend output was logged to browser console."
 msgstr ""
 
-#: js/functions.js:636
+#: js/functions.js:617
 #, perl-format
 msgid "Subscribed to %s"
 msgstr "Tilattiin syöte %s"
 
-#: js/functions.js:641
+#: js/functions.js:622
 msgid "Specified URL seems to be invalid."
 msgstr "Antamasi osoite on viallinen."
 
-#: js/functions.js:644
+#: js/functions.js:625
 msgid "Specified URL doesn't seem to contain any feeds."
 msgstr "Antamassasi osoitteessa ei ole syötteitä."
 
-#: js/functions.js:656
+#: js/functions.js:637
 #, fuzzy
 msgid "Expand to select feed"
 msgstr "Muokkaa valittuja syötteitä"
 
-#: js/functions.js:668
+#: js/functions.js:649
 #, perl-format
 msgid "Couldn't download the specified URL: %s"
 msgstr "Osoitteen %s lataaminen epäonnistui"
 
-#: js/functions.js:672
+#: js/functions.js:653
 #, perl-format
 msgid "XML validation failed: %s"
 msgstr ""
 
-#: js/functions.js:676
+#: js/functions.js:657
 msgid "You are already subscribed to this feed."
 msgstr "Olet jo tilannut tämän syötteen."
 
-#: js/functions.js:1136
+#: js/functions.js:1098
 msgid "Generate new syndication address for this feed?"
 msgstr ""
 
-#: js/functions.js:1140
-#: js/prefs.js:1095
+#: js/functions.js:1100
+#: js/prefs.js:870
 msgid "Trying to change address..."
 msgstr "Vaihdetaan osoitetta..."
 
-#: js/functions.js:1245
-#: js/tt-rss.js:446
-#: js/tt-rss.js:673
+#: js/functions.js:1199
+#: js/tt-rss.js:399
+#: js/tt-rss.js:612
 msgid "You can't edit this kind of feed."
 msgstr "Et voi muokata tämäntyyppistä syötettä."
 
-#: js/functions.js:1260
+#: js/functions.js:1213
 msgid "Edit Feed"
 msgstr "Muokkaa syötettä"
 
-#: js/functions.js:1266
-#: js/prefs.js:100
-#: js/prefs.js:209
-#: js/prefs.js:647
+#: js/functions.js:1217
+#: js/prefs.js:176
+#: js/prefs.js:523
+#: js/prefs.js:1139
+#: js/prefs.js:78
 msgid "Saving data..."
 msgstr "Tallennetaan tiedot..."
 
-#: js/functions.js:1293
+#: js/functions.js:1243
 msgid "More Feeds"
 msgstr "Lisää syötteitä"
 
-#: js/functions.js:1355
-#: js/functions.js:1464
-#: js/prefs.js:398
-#: js/prefs.js:540
-#: js/prefs.js:558
-#: js/prefs.js:1077
+#: js/functions.js:1297
+#: js/functions.js:1383
+#: js/prefs.js:332
+#: js/prefs.js:455
+#: js/prefs.js:473
+#: js/prefs.js:855
 msgid "No feeds are selected."
 msgstr "Yhtään syötettä ei ole valittuna."
 
-#: js/functions.js:1398
+#: js/functions.js:1329
 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:1435
+#: js/functions.js:1360
 msgid "Feeds with update errors"
 msgstr "Virheelliset syötteet"
 
-#: js/functions.js:1446
-#: js/prefs.js:1058
+#: js/functions.js:1369
+#: js/prefs.js:841
 msgid "Remove selected feeds?"
 msgstr "Poistetaanko valitut syötteet?"
 
-#: js/functions.js:1449
-#: js/prefs.js:1061
+#: js/functions.js:1370
+#: js/prefs.js:842
 msgid "Removing selected feeds..."
 msgstr "Poistetaan valitut syötteet..."
 
-#: js/prefs.js:60
-msgid "Please enter login:"
-msgstr "Syötä käyttäjätunnus:"
-
-#: js/prefs.js:67
-msgid "Can't create user: no login specified."
-msgstr "Uutta käyttäjätunnusta ei voi luoda: käyttäjätunnus puuttuu."
-
-#: js/prefs.js:71
-msgid "Adding user..."
-msgstr "Lisätään käyttäjä"
-
-#: js/prefs.js:96
-msgid "User Editor"
-msgstr "Käyttäjätunnusten muokkaus"
-
-#: js/prefs.js:131
-msgid "Edit Filter"
-msgstr "Muokkaa suodatinta"
-
-#: js/prefs.js:170
+#: js/prefs.js:143
 msgid "Remove filter?"
 msgstr "Poista suodatin?"
 
-#: js/prefs.js:175
+#: js/prefs.js:148
 msgid "Removing filter..."
 msgstr "Poistetaan suodatin..."
 
-#: js/prefs.js:292
+#: js/prefs.js:251
 msgid "Remove selected labels?"
 msgstr "Poistetaanko valitut tunnisteet?"
 
-#: js/prefs.js:295
+#: js/prefs.js:252
 msgid "Removing selected labels..."
 msgstr "Poistetaan valitut tunnisteet..."
 
-#: js/prefs.js:308
-#: js/prefs.js:1144
+#: js/prefs.js:262
+#: js/prefs.js:909
 msgid "No labels are selected."
 msgstr "Yhtään tunnistetta ei ole valittuna"
 
-#: js/prefs.js:320
+#: js/prefs.js:274
 msgid "Remove selected users? Neither default admin nor your account will be removed."
 msgstr "Poistetaanko valitut käyttäjät? Ylläpitäjän tai sinun tunnustasi ei poisteta."
 
-#: js/prefs.js:323
+#: js/prefs.js:275
 msgid "Removing selected users..."
 msgstr "Poistetaan valitut käyttäjätunnukset..."
 
-#: js/prefs.js:338
-#: js/prefs.js:408
-#: js/prefs.js:427
-#: js/prefs.js:461
+#: js/prefs.js:286
+#: js/prefs.js:342
+#: js/prefs.js:361
+#: js/prefs.js:387
 msgid "No users are selected."
 msgstr "Käyttäjätunnuksia ei ole valittu."
 
-#: js/prefs.js:350
+#: js/prefs.js:297
 msgid "Remove selected filters?"
 msgstr "Poistetaanko valitut suodattimet?"
 
-#: js/prefs.js:353
+#: js/prefs.js:298
 msgid "Removing selected filters..."
 msgstr "Poistetaan valitut suodattimet..."
 
-#: js/prefs.js:366
-#: js/prefs.js:495
-#: js/prefs.js:514
+#: js/prefs.js:308
+#: js/prefs.js:419
+#: js/prefs.js:438
 msgid "No filters are selected."
 msgstr "Yhtään suodatinta ei ole valittuna."
 
-#: js/prefs.js:378
+#: js/prefs.js:319
 msgid "Unsubscribe from selected feeds?"
 msgstr "Perutaanko valittujen syötteiden tilaukset?"
 
-#: js/prefs.js:382
+#: js/prefs.js:321
 msgid "Unsubscribing from selected feeds..."
 msgstr "Perutaan valittujen syötteiden tilaukset..."
 
-#: js/prefs.js:413
-#: js/prefs.js:432
-#: js/prefs.js:466
+#: js/prefs.js:347
+#: js/prefs.js:366
+#: js/prefs.js:392
 msgid "Please select only one user."
 msgstr "Valitse ainakin yksi käyttäjätunnus."
 
-#: js/prefs.js:436
+#: js/prefs.js:370
 msgid "Reset password of selected user?"
 msgstr "Nollaa valittujen käyttäjien salasanat?"
 
-#: js/prefs.js:439
+#: js/prefs.js:371
 msgid "Resetting password for selected user..."
 msgstr "Nollataan valittujen käyttäjien salasanat..."
 
-#: js/prefs.js:500
+#: js/prefs.js:424
 msgid "Please select only one filter."
 msgstr "Valitse vain yksi syöte."
 
-#: js/prefs.js:518
+#: js/prefs.js:442
 msgid "Combine selected filters?"
 msgstr "Yhdistetäänkö valitut suodattimet?"
 
-#: js/prefs.js:521
+#: js/prefs.js:443
 msgid "Joining filters..."
 msgstr "Yhdistetään suodattimet..."
 
-#: js/prefs.js:580
+#: js/prefs.js:487
 msgid "Edit Multiple Feeds"
 msgstr "Muokkaa useampaa syötettä"
 
-#: js/prefs.js:604
+#: js/prefs.js:511
 msgid "Save changes to selected feeds?"
 msgstr "Tallenna valittujen syötteiden muutokset?"
 
-#: js/prefs.js:681
+#: js/prefs.js:552
 msgid "OPML Import"
 msgstr ""
 
-#: js/prefs.js:700
+#: js/prefs.js:571
 msgid "Please choose an OPML file first."
 msgstr "Valitse ensin OPML-tiedosto."
 
-#: js/prefs.js:703
+#: js/prefs.js:574
 #: plugins/import_export/import_export.js:115
 msgid "Importing, please wait..."
 msgstr "Importoidaan, odota..."
 
-#: js/prefs.js:869
+#: js/prefs.js:737
 msgid "Reset to defaults?"
 msgstr "Palautetaanko oletusasetukset?"
 
-#: js/prefs.js:1468
-msgid "Subscribing to feeds..."
-msgstr "Tilataan syötteet..."
+#: js/prefs.js:777
+#, perl-format
+msgid "Remove category %s? Any nested feeds would be placed into Uncategorized."
+msgstr ""
 
-#: js/prefs.js:1487
-msgid "Clear stored data for this plugin?"
-msgstr "Poistetaanko kaikki tämän lisäosan tallentamat tiedot?"
+#: js/prefs.js:778
+msgid "Removing category..."
+msgstr "Poistetaan kansio..."
 
-#: js/prefs.js:1501
-msgid "Clear all messages in the error log?"
-msgstr "Tyhjätäänkö kaikki viestit virhelokista?"
+#: js/prefs.js:794
+msgid "Remove selected categories?"
+msgstr "Haluatko poistaa valitun kansion?"
 
-#: js/tt-rss.js:118
+#: js/prefs.js:795
+msgid "Removing selected categories..."
+msgstr "Poistetaan valitut kansiot..."
+
+#: js/prefs.js:805
+msgid "No categories are selected."
+msgstr "Yhtään kansiota ei ole valittuna."
+
+#: js/prefs.js:812
+msgid "Category title:"
+msgstr "Kansion nimi:"
+
+#: js/prefs.js:815
+msgid "Creating category..."
+msgstr "Luodaan kansio..."
+
+#: js/prefs.js:832
+msgid "Feeds without recent updates"
+msgstr "Syötteet joissa ei ole tuoreita artikkeleita"
+
+#: js/prefs.js:869
+msgid "Replace current OPML publishing address with a new one?"
+msgstr "Korvataanko nykyinen OPML-julkaisuosoite uudella?"
+
+#: js/prefs.js:898
+msgid "Reset selected labels to default colors?"
+msgstr "Palautetaanko oletusväri valituille tunnisteille?"
+
+#: js/prefs.js:926
+msgid "Settings Profiles"
+msgstr "Profiilien asetukset"
+
+#: js/prefs.js:935
+msgid "Remove selected profiles? Active and default profiles will not be removed."
+msgstr "Poistetaanko valitut profiilit? Aktiivisia ja oletusprofiilia ei poisteta."
+
+#: js/prefs.js:936
+msgid "Removing selected profiles..."
+msgstr "Poistetaan valitut profiilit..."
+
+#: js/prefs.js:948
+msgid "No profiles are selected."
+msgstr "Yhtään profiilia ei ole valittuna."
+
+#: js/prefs.js:955
+#: js/prefs.js:997
+msgid "Activate selected profile?"
+msgstr "Aktivoidaanko valittu profiili?"
+
+#: js/prefs.js:964
+#: js/prefs.js:1008
+msgid "Please choose a profile to activate."
+msgstr "Valitse profiili jonka haluat aktivoida."
+
+#: js/prefs.js:969
+msgid "Creating profile..."
+msgstr "Luodaan profiili..."
+
+#: js/prefs.js:1016
+msgid "This will invalidate all previously generated feed URLs. Continue?"
+msgstr "Kaikki luodut syöteosoitteet poistetaan. Jatketaanko?"
+
+#: js/prefs.js:1017
+#: plugins/share/share_prefs.js:3
+msgid "Clearing URLs..."
+msgstr "Poistetaan osoitteita..."
+
+#: js/prefs.js:1020
+msgid "Generated URLs cleared."
+msgstr "Luodut osoitteet poistettiin."
+
+#: js/prefs.js:1053
+#, fuzzy
+msgid "Rename category to:"
+msgstr "Poista kansio"
+
+#: js/prefs.js:1074
+msgid "Label Editor"
+msgstr "Tunnisteiden muokkaus"
+
+#: js/tt-rss.js:111
 msgid "Mark all articles as read?"
 msgstr "Merkitäänkö kaikki artikkelit luetuksi?"
 
-#: js/tt-rss.js:124
+#: js/tt-rss.js:115
 msgid "Marking all feeds as read..."
 msgstr "Merkitään kaikki syötteet luetuiksi..."
 
-#: js/tt-rss.js:398
+#: js/tt-rss.js:351
 msgid "Please enable mail plugin first."
 msgstr "Aktivoi ensin email-lisäosa."
 
-#: js/tt-rss.js:527
+#: js/tt-rss.js:477
 msgid "Please enable embed_original plugin first."
 msgstr ""
 
-#: js/tt-rss.js:540
-#: js/tt-rss.js:723
+#: js/tt-rss.js:490
+#: js/tt-rss.js:653
 msgid "Widescreen is not available in combined mode."
 msgstr "Leveä näyttö ei käytössä yhdistelmätilassa."
 
-#: js/tt-rss.js:821
-msgid "You can't rescore this kind of feed."
-msgstr ""
-
-#: js/tt-rss.js:826
-#: js/tt-rss.js:686
-msgid "Please select some feed first."
-msgstr "Valitse syötteet ensin."
-
-#: js/tt-rss.js:831
-#, perl-format
-msgid "Rescore articles in %s?"
-msgstr "Uudelleenpisteytä artikkelit kansiossa %s?"
-
-#: js/tt-rss.js:834
-msgid "Rescoring articles..."
-msgstr "Uudelleenpisteytetään artikkelit..."
-
-#: js/viewfeed.js:917
-#: js/viewfeed.js:955
-#: js/viewfeed.js:1003
-#: js/viewfeed.js:1924
-#: plugins/mail/mail.js:7
+#: js/viewfeed.js:444
+#: js/viewfeed.js:461
+#: js/viewfeed.js:484
+#: js/viewfeed.js:521
+#: js/viewfeed.js:542
+#: js/viewfeed.js:651
+#: js/viewfeed.js:685
+#: js/viewfeed.js:727
+#: js/viewfeed.js:1564
 #: plugins/mailto/init.js:7
-#: js/viewfeed.js:675
-#: js/viewfeed.js:697
-#: js/viewfeed.js:718
-#: js/viewfeed.js:777
-#: js/viewfeed.js:805
+#: plugins/mail/mail.js:7
 msgid "No articles are selected."
 msgstr "Yhtään artikkelia ei ole valittuna."
 
-#: js/viewfeed.js:925
+#: js/viewfeed.js:659
 #, 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:927
+#: js/viewfeed.js:661
 #, 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:964
+#: js/viewfeed.js:694
 #, 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:967
+#: js/viewfeed.js:697
 #, 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:969
+#: js/viewfeed.js:698
 msgid "Please note that unstarred articles might get purged on next feed update."
 msgstr ""
 
-#: js/viewfeed.js:1009
+#: js/viewfeed.js:733
 #, 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:1029
+#: js/viewfeed.js:753
 msgid "Edit article Tags"
 msgstr "Muokkaa artikkelin avainsanoja"
 
-#: js/viewfeed.js:1035
+#: js/viewfeed.js:757
 msgid "Saving article tags..."
 msgstr "Tallennetaan artikkelin avainsanat..."
 
-#: js/viewfeed.js:1666
+#: js/viewfeed.js:1015
+msgid "No article is selected."
+msgstr "Yhtään artikkelia ei ole valittuna."
+
+#: js/viewfeed.js:1050
+msgid "No articles found to mark"
+msgstr "Artikkeleita ei ole merkittäväksi"
+
+#: js/viewfeed.js:1052
+#, perl-format
+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?"
+
+#: js/viewfeed.js:1312
 msgid "Open original article"
 msgstr "Avaa alkuperäinen artikkeli"
 
-#: js/viewfeed.js:1673
+#: js/viewfeed.js:1319
 msgid "Display article URL"
 msgstr "Näytä artikkelin osoite"
 
-#: js/viewfeed.js:1780
+#: js/viewfeed.js:1426
 msgid "Assign label"
 msgstr "Liitä tunniste"
 
-#: js/viewfeed.js:1785
+#: js/viewfeed.js:1431
 msgid "Remove label"
 msgstr "Poista tunniste"
 
-#: js/viewfeed.js:1817
+#: js/viewfeed.js:1463
 #, fuzzy
 msgid "Select articles in group"
 msgstr "Valitse osoittimen kohdalla oleva artikkeli"
 
-#: js/viewfeed.js:1827
+#: js/viewfeed.js:1473
 msgid "Mark group as read"
 msgstr "Merkitse ryhmä luetuiksi"
 
-#: js/viewfeed.js:1839
+#: js/viewfeed.js:1485
 msgid "Mark feed as read"
 msgstr "Merkitse syöte luetuksi"
 
-#: js/viewfeed.js:1892
+#: js/viewfeed.js:1538
 msgid "Please enter new score for selected articles:"
 msgstr "Anna uusi pistemäärä valituille artikkeleille:"
 
-#: js/viewfeed.js:1955
+#: js/viewfeed.js:1571
 msgid "Please enter new score for this article:"
 msgstr "Anna uusi pistemäärä tälle artikkelille:"
 
-#: js/viewfeed.js:1986
+#: js/viewfeed.js:1591
 msgid "Article URL:"
 msgstr "Artikkelin osoite:"
 
-#: 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/mailto/init.js:21
+#: plugins/mail/mail.js:21
+msgid "Forward article by email"
+msgstr "Lähetä sähköpostilla"
+
+#: plugins/shorten_expanded/init.js:43
+msgid "Click to expand article"
+msgstr "Napsauta nähdäksesi koko artikkelin."
+
 #: plugins/import_export/import_export.js:13
 msgid "Export Data"
 msgstr "Vie tiedot"
@@ -3224,259 +3317,167 @@ msgstr "Tuo tiedot"
 msgid "Please choose the file first."
 msgstr "Valitse ensin tiedosto."
 
-#: plugins/mail/mail.js:21
-#: plugins/mailto/init.js:21
-msgid "Forward article by email"
-msgstr "Lähetä sähköpostilla"
+#: plugins/share/share_prefs.js:2
+msgid "This will invalidate all previously shared article URLs. Continue?"
+msgstr "Kaikki jaettujen artikkeleiden osoitteet poistetaan. Jatketaanko?"
 
-#: plugins/mail/mail.js:36
-msgid "Error sending email:"
-msgstr "Virhe lähtettäessä sähköpostia:"
-
-#: plugins/mail/mail.js:38
-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:45
-msgid "Click to expand article"
-msgstr "Napsauta nähdäksesi koko artikkelin."
+#: plugins/share/share_prefs.js:8
+msgid "Shared URLs cleared."
+msgstr "Jaetut osoitteet poistettiin."
 
 #: plugins/share/share.js:10
 msgid "Share article by URL"
 msgstr "Jaa artikkeli URL:lla"
 
-#: plugins/share/share.js:14
+#: plugins/share/share.js:13
 msgid "Generate new share URL for this article?"
 msgstr "Luodaanko uusi jako-URL tälle artikkelille?"
 
-#: plugins/share/share.js:18
+#: plugins/share/share.js:15
 msgid "Trying to change URL..."
 msgstr "Vaihdetaan osoitetta..."
 
-#: plugins/share/share.js:55
+#: plugins/share/share.js:48
 msgid "Remove sharing for this article?"
 msgstr "Poistetaanko tämän artikkelin jakaminen?"
 
-#: plugins/share/share.js:59
+#: plugins/share/share.js:50
 msgid "Trying to unshare..."
 msgstr "Poistetaan jakaminen..."
 
-#: plugins/share/share_prefs.js:3
-msgid "This will invalidate all previously shared article URLs. Continue?"
-msgstr "Kaikki jaettujen artikkeleiden osoitteet poistetaan. Jatketaanko?"
+#: plugins/mail/mail.js:30
+msgid "Error sending email:"
+msgstr "Virhe lähtettäessä sähköpostia:"
 
-#: plugins/share/share_prefs.js:6
-#: js/prefs.js:1277
-msgid "Clearing URLs..."
-msgstr "Poistetaan osoitteita..."
+#: plugins/mail/mail.js:32
+msgid "Your message has been sent."
+msgstr "Viestisi lähetettiin."
 
-#: plugins/share/share_prefs.js:13
-msgid "Shared URLs cleared."
-msgstr "Jaetut osoitteet poistettiin."
+#: plugins/note/note.js:15
+msgid "Saving article note..."
+msgstr ""
 
-#: js/feedlist.js:204
+#: js/feedlist.js:168
 #, fuzzy
 msgid "Your password is at default value"
 msgstr "Käytät vieläkin oletussalasanaa, se kannattaa vaihtaa."
 
-#: js/feedlist.js:453
+#: js/feedlist.js:413
 msgid "Mark all articles in %s as read?"
 msgstr "Merkitäänkö kaikki artikkelit syötteessä %s luetuiksi?"
 
-#: js/functions.js:494
-msgid "Upload complete."
-msgstr "Lataus valmis."
-
-#: js/functions.js:511
-msgid "Remove stored feed icon?"
-msgstr "Poista suosikkikuvake?"
-
-#: js/functions.js:516
-msgid "Removing feed icon..."
-msgstr "Poistetaan suosikkikuvake..."
-
-#: js/functions.js:521
-msgid "Feed icon removed."
-msgstr "Suosikkikuvake poistettu."
-
-#: js/functions.js:537
-msgid "Please select an image file to upload."
-msgstr "Valitse ladattava kuvatiedosto."
-
-#: js/functions.js:539
-msgid "Upload new icon for this feed?"
-msgstr "Ladataanko uusi suosikkikuvake tälle syötteelle?"
-
-#: js/functions.js:540
-msgid "Uploading, please wait..."
-msgstr "Ladataan, odota..."
-
-#: js/functions.js:550
-msgid "Please enter label caption:"
-msgstr "Syötä tunnisteen nimi:"
-
-#: js/functions.js:555
-msgid "Can't create label: missing caption."
-msgstr "Tunnistetta ei luotu: nimi puuttuu."
-
-#: js/functions.js:797
+#: js/functions.js:764
 msgid "Edit rule"
 msgstr "Muokkaa sääntöä"
 
-#: js/functions.js:819
+#: js/functions.js:786
 msgid "Edit action"
 msgstr "Muokkaa toimintoa"
 
-#: js/functions.js:860
+#: js/functions.js:825
 msgid "Looking for articles (%d processed, %f found)..."
 msgstr ""
 
-#: js/functions.js:890
+#: js/functions.js:855
 #, fuzzy
 msgid "Found %d articles matching this filter:"
 msgstr "Suodatinta vastaavat artikkelit:"
 
-#: js/functions.js:942
+#: js/functions.js:907
 msgid "Create Filter"
 msgstr "Luo suodatin"
 
-#: js/functions.js:1060
-#: js/tt-rss.js:692
+#: js/functions.js:1016
+#: js/tt-rss.js:631
 msgid "Unsubscribe from %s?"
 msgstr "Perutaanko syötteen %s tilaus?"
 
-#: js/functions.js:1063
+#: js/functions.js:1019
 msgid "Removing feed..."
 msgstr "Poistetaan syöte..."
 
-#: js/functions.js:1489
+#: js/functions.js:1410
 msgid "Help"
 msgstr "Apua"
 
-#: js/prefs.js:973
-msgid "Remove category %s? Any nested feeds would be placed into Uncategorized."
-msgstr ""
+#: js/prefs.js:44
+msgid "Please enter login:"
+msgstr "Syötä käyttäjätunnus:"
 
-#: js/prefs.js:979
-msgid "Removing category..."
-msgstr "Poistetaan kansio..."
+#: js/prefs.js:51
+msgid "Can't create user: no login specified."
+msgstr "Uutta käyttäjätunnusta ei voi luoda: käyttäjätunnus puuttuu."
 
-#: js/prefs.js:997
-msgid "Remove selected categories?"
-msgstr "Haluatko poistaa valitun kansion?"
+#: js/prefs.js:55
+msgid "Adding user..."
+msgstr "Lisätään käyttäjä"
 
-#: js/prefs.js:1000
-msgid "Removing selected categories..."
-msgstr "Poistetaan valitut kansiot..."
+#: js/prefs.js:74
+msgid "User Editor"
+msgstr "Käyttäjätunnusten muokkaus"
 
-#: js/prefs.js:1013
-msgid "No categories are selected."
-msgstr "Yhtään kansiota ei ole valittuna."
+#: js/prefs.js:104
+msgid "Edit Filter"
+msgstr "Muokkaa suodatinta"
 
-#: js/prefs.js:1020
-msgid "Category title:"
-msgstr "Kansion nimi:"
+#: js/prefs.js:1175
+msgid "Subscribing to feeds..."
+msgstr "Tilataan syötteet..."
 
-#: js/prefs.js:1024
-msgid "Creating category..."
-msgstr "Luodaan kansio..."
+#: js/prefs.js:1191
+msgid "Clear stored data for this plugin?"
+msgstr "Poistetaanko kaikki tämän lisäosan tallentamat tiedot?"
 
-#: js/prefs.js:1047
-msgid "Feeds without recent updates"
-msgstr "Syötteet joissa ei ole tuoreita artikkeleita"
+#: js/prefs.js:1203
+msgid "Clear all messages in the error log?"
+msgstr "Tyhjätäänkö kaikki viestit virhelokista?"
 
-#: js/prefs.js:1091
-msgid "Replace current OPML publishing address with a new one?"
-msgstr "Korvataanko nykyinen OPML-julkaisuosoite uudella?"
-
-#: js/prefs.js:1129
-msgid "Reset selected labels to default colors?"
-msgstr "Palautetaanko oletusväri valituille tunnisteille?"
-
-#: js/prefs.js:1161
-msgid "Settings Profiles"
-msgstr "Profiilien asetukset"
-
-#: js/prefs.js:1170
-msgid "Remove selected profiles? Active and default profiles will not be removed."
-msgstr "Poistetaanko valitut profiilit? Aktiivisia ja oletusprofiilia ei poisteta."
-
-#: js/prefs.js:1173
-msgid "Removing selected profiles..."
-msgstr "Poistetaan valitut profiilit..."
-
-#: js/prefs.js:1189
-msgid "No profiles are selected."
-msgstr "Yhtään profiilia ei ole valittuna."
-
-#: js/prefs.js:1197
-#: js/prefs.js:1250
-msgid "Activate selected profile?"
-msgstr "Aktivoidaanko valittu profiili?"
-
-#: js/prefs.js:1214
-#: js/prefs.js:1266
-msgid "Please choose a profile to activate."
-msgstr "Valitse profiili jonka haluat aktivoida."
-
-#: js/prefs.js:1219
-msgid "Creating profile..."
-msgstr "Luodaan profiili..."
-
-#: js/prefs.js:1274
-msgid "This will invalidate all previously generated feed URLs. Continue?"
-msgstr "Kaikki luodut syöteosoitteet poistetaan. Jatketaanko?"
-
-#: js/prefs.js:1284
-msgid "Generated URLs cleared."
-msgstr "Luodut osoitteet poistettiin."
-
-#: js/prefs.js:1356
-msgid "Label Editor"
-msgstr "Tunnisteiden muokkaus"
-
-#: js/tt-rss.js:681
+#: js/tt-rss.js:620
 msgid "You can't unsubscribe from the category."
 msgstr "Et voi perua tämän kansion tilausta."
 
-#: js/viewfeed.js:127
-#: js/viewfeed.js:177
-#: js/viewfeed.js:194
+#: js/tt-rss.js:625
+msgid "Please select some feed first."
+msgstr "Valitse syötteet ensin."
+
+#: js/viewfeed.js:89
+#: js/viewfeed.js:135
+#: js/viewfeed.js:152
 msgid "Click to open next unread feed."
 msgstr "Napsauta avataksesi seuraavan lukemattoman syötteen."
 
-#: js/viewfeed.js:131
+#: js/viewfeed.js:93
 msgid "Cancel search"
 msgstr "Peru haku"
 
-#: js/viewfeed.js:191
+#: js/viewfeed.js:149
 #, fuzzy
 msgid "New articles found, reload feed to continue."
 msgstr "Ei näytettäviä artikkeleita."
 
-#: js/viewfeed.js:620
+#: js/viewfeed.js:405
 msgid "%d article selected"
 msgid_plural "%d articles selected"
 msgstr[0] "%d artikkeli valittu"
 msgstr[1] "%d artikkelia valittu"
 
-#: js/viewfeed.js:1284
-msgid "No article is selected."
-msgstr "Yhtään artikkelia ei ole valittuna."
+#~ msgid "Rescore feed"
+#~ msgstr "Uudelleenpisteytä syöte"
 
-#: js/viewfeed.js:1319
-msgid "No articles found to mark"
-msgstr "Artikkeleita ei ole merkittäväksi"
+#~ msgid "Create label..."
+#~ msgstr "Luo tunniste..."
 
-#: js/viewfeed.js:1321
-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 "Create filter..."
+#~ msgstr "Luo suodatin..."
+
+#~ msgid "Rescore articles in %s?"
+#~ msgstr "Uudelleenpisteytä artikkelit kansiossa %s?"
+
+#~ msgid "Rescoring articles..."
+#~ msgstr "Uudelleenpisteytetään artikkelit..."
+
+#~ msgid "Can't create label: missing caption."
+#~ msgstr "Tunnistetta ei luotu: nimi puuttuu."
 
 #~ msgid "Firefox integration"
 #~ msgstr "Firefox-integraatio"
diff --git a/locale/fr_FR/LC_MESSAGES/messages.mo b/locale/fr_FR/LC_MESSAGES/messages.mo
index a1d758e2a..ba346d5e0 100644
Binary files a/locale/fr_FR/LC_MESSAGES/messages.mo and b/locale/fr_FR/LC_MESSAGES/messages.mo differ
diff --git a/locale/fr_FR/LC_MESSAGES/messages.po b/locale/fr_FR/LC_MESSAGES/messages.po
index a63fbfc20..b93c35056 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: 2018-10-10 08:24+0300\n"
+"POT-Creation-Date: 2018-12-01 12:59+0300\n"
 "PO-Revision-Date: 2015-11-30 09:29+0100\n"
 "Last-Translator: Raphael Rochet <raphael@rri.fr>\n"
 "Language-Team: French\n"
@@ -96,8 +96,8 @@ msgid "Weekly"
 msgstr "Une fois par semaine"
 
 #: backend.php:103
-#: classes/pref/users.php:47
 #: classes/pref/system.php:51
+#: classes/pref/users.php:47
 msgid "User"
 msgstr "Utilisateur"
 
@@ -167,33 +167,33 @@ msgstr "Plugin non trouvé"
 
 #: index.php:151
 #: index.php:167
-#: index.php:285
+#: index.php:282
 #: prefs.php:120
 #: classes/backend.php:5
 #: classes/pref/labels.php:294
-#: classes/pref/feeds.php:1230
 #: classes/pref/filters.php:822
-#: js/feedlist.js:148
-#: js/feedlist.js:491
-#: js/feedlist.js:539
-#: js/functions.js:314
-#: js/functions.js:1336
-#: js/prefs.js:562
-#: js/prefs.js:754
-#: js/prefs.js:1488
-#: js/prefs.js:1503
-#: js/tt-rss.js:547
-#: js/viewfeed.js:1180
+#: classes/pref/feeds.php:1229
+#: js/feedlist.js:118
+#: js/feedlist.js:446
+#: js/feedlist.js:487
+#: js/functions.js:328
+#: js/functions.js:551
+#: js/functions.js:1286
+#: js/prefs.js:477
+#: js/prefs.js:617
+#: js/prefs.js:956
+#: js/prefs.js:1000
+#: js/prefs.js:1028
+#: js/prefs.js:1037
+#: js/prefs.js:1045
+#: js/prefs.js:1057
+#: js/tt-rss.js:497
+#: js/viewfeed.js:509
+#: js/viewfeed.js:928
 #: plugins/import_export/import_export.js:17
-#: js/functions.js:565
-#: js/prefs.js:1200
-#: js/prefs.js:1253
-#: js/prefs.js:1292
-#: js/prefs.js:1305
-#: js/prefs.js:1316
-#: js/prefs.js:1331
-#: js/tt-rss.js:564
-#: js/viewfeed.js:760
+#: js/prefs.js:1192
+#: js/prefs.js:1205
+#: js/tt-rss.js:510
 msgid "Loading, please wait..."
 msgstr "Chargement en cours, veuillez patienter..."
 
@@ -210,13 +210,13 @@ msgid "All Articles"
 msgstr "Tous les articles"
 
 #: index.php:194
-#: include/functions.php:1227
+#: include/functions.php:1172
 #: classes/feeds.php:110
 msgid "Starred"
 msgstr "Remarquables"
 
 #: index.php:195
-#: include/functions.php:1228
+#: include/functions.php:1173
 #: classes/feeds.php:111
 msgid "Published"
 msgstr "Publiés"
@@ -256,11 +256,11 @@ msgid "Title"
 msgstr "Titre"
 
 #: index.php:211
-#: index.php:251
-#: include/functions.php:1215
+#: index.php:250
+#: include/functions.php:1160
 #: classes/feeds.php:115
-#: js/FeedTree.js:41
-#: js/FeedTree.js:69
+#: js/FeedTree.js:42
+#: js/FeedTree.js:70
 msgid "Mark as read"
 msgstr "Marquer comme lu"
 
@@ -297,7 +297,7 @@ msgid "Feed actions:"
 msgstr "Actions sur ce flux :"
 
 #: index.php:246
-#: classes/handler/public.php:551
+#: classes/handler/public.php:575
 msgid "Subscribe to feed..."
 msgstr "S'abonner au flux..."
 
@@ -306,56 +306,44 @@ msgid "Edit this feed..."
 msgstr "Modifier ce flux..."
 
 #: index.php:248
-msgid "Rescore feed"
-msgstr "Recalculer le score du flux"
-
-#: index.php:249
-#: classes/pref/feeds.php:770
-#: classes/pref/feeds.php:1203
-#: js/PrefFeedTree.js:61
+#: classes/pref/feeds.php:769
+#: classes/pref/feeds.php:1202
+#: js/PrefFeedTree.js:62
 msgid "Unsubscribe"
 msgstr "Se désabonner"
 
-#: index.php:250
+#: index.php:249
 msgid "All feeds:"
 msgstr "Tous les flux :"
 
-#: index.php:252
+#: index.php:251
 msgid "(Un)hide read feeds"
 msgstr "Masquer/afficher les flux lus"
 
-#: index.php:253
+#: index.php:252
 msgid "Other actions:"
 msgstr "Autres actions :"
 
-#: index.php:254
-#: include/functions.php:1201
+#: index.php:253
+#: include/functions.php:1146
 msgid "Toggle widescreen mode"
 msgstr "Basculer le mode écran large"
 
-#: index.php:255
-msgid "Create label..."
-msgstr "Créer une étiquette..."
-
-#: index.php:256
-msgid "Create filter..."
-msgstr "Créer un filtre..."
-
-#: index.php:257
+#: index.php:254
 msgid "Keyboard shortcuts help"
 msgstr "Aide sur les raccourcis clavier"
 
-#: index.php:266
+#: index.php:263
 msgid "Logout"
 msgstr "Déconnexion"
 
-#: index.php:272
+#: index.php:269
 msgid "Updates are available from Git."
 msgstr "Des mises à jour sont disponibles via Git"
 
 #: prefs.php:33
 #: prefs.php:138
-#: include/functions.php:1230
+#: include/functions.php:1175
 #: classes/pref/prefs.php:425
 msgid "Preferences"
 msgstr "Configuration"
@@ -370,8 +358,8 @@ msgstr "Quitter la configuration"
 
 #: prefs.php:141
 #: classes/pref/feeds.php:114
-#: classes/pref/feeds.php:1138
-#: classes/pref/feeds.php:1192
+#: classes/pref/feeds.php:1137
+#: classes/pref/feeds.php:1191
 msgid "Feeds"
 msgstr "Flux"
 
@@ -381,8 +369,8 @@ msgid "Filters"
 msgstr "Filtres"
 
 #: prefs.php:147
+#: classes/feeds.php:1696
 #: classes/pref/labels.php:94
-#: classes/feeds.php:1710
 msgid "Labels"
 msgstr "Etiquettes"
 
@@ -394,80 +382,80 @@ msgstr "Utilisateurs"
 msgid "System"
 msgstr "Système"
 
-#: register.php:186
+#: register.php:185
 #: include/login_form.php:162
 msgid "Create new account"
 msgstr "Créer un nouveau compte"
 
-#: register.php:192
+#: register.php:191
 msgid "New user registrations are administratively disabled."
 msgstr "L'inscription de nouveaux utilisateurs est désactivée par l'administrateur."
 
-#: register.php:196
-#: register.php:241
-#: register.php:254
-#: register.php:269
-#: register.php:288
-#: register.php:336
-#: register.php:346
-#: register.php:358
-#: classes/handler/public.php:623
-#: classes/handler/public.php:697
-#: classes/handler/public.php:798
-#: classes/handler/public.php:877
-#: classes/handler/public.php:891
-#: classes/handler/public.php:898
-#: classes/handler/public.php:923
+#: register.php:195
+#: register.php:240
+#: register.php:253
+#: register.php:268
+#: register.php:287
+#: register.php:334
+#: register.php:344
+#: register.php:356
+#: classes/handler/public.php:647
+#: classes/handler/public.php:721
+#: 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"
 
-#: register.php:217
+#: register.php:216
 msgid "Your temporary password will be sent to the specified email. Accounts, which were not logged in once, are erased automatically 24 hours after temporary password is sent."
 msgstr "Votre mot de passe temporaire va être envoyé à l'adresse mail indiquée. Les comptes ne s'étant pas connectés au moins une fois dans les 24 heures qui suivent l'envoi du mail seront supprimés."
 
-#: register.php:223
+#: register.php:222
 msgid "Desired login:"
 msgstr "Identifiant souhaité :"
 
-#: register.php:226
+#: register.php:225
 msgid "Check availability"
 msgstr "Vérifier la disponibilité"
 
-#: register.php:228
-#: classes/handler/public.php:713
+#: register.php:227
+#: classes/handler/public.php:737
 msgid "Email:"
 msgstr "Adresse mail :"
 
-#: register.php:231
-#: classes/handler/public.php:718
+#: register.php:230
+#: classes/handler/public.php:742
 msgid "How much is two plus two:"
 msgstr "Combien font 2 plus 2 :"
 
-#: register.php:234
+#: register.php:233
 msgid "Submit registration"
 msgstr "Envoyer l'inscription"
 
-#: register.php:252
+#: register.php:251
 msgid "Your registration information is incomplete."
 msgstr "Vos informations d'inscription sont incomplètes."
 
-#: register.php:267
+#: register.php:266
 msgid "Sorry, this username is already taken."
 msgstr "Désolé, cet identifiant est déjà utilisé."
 
-#: register.php:286
+#: register.php:285
 msgid "Registration failed."
 msgstr "L'inscription a échoué."
 
-#: register.php:333
+#: register.php:331
 msgid "Account created successfully."
 msgstr "Compte créé avec succès."
 
-#: register.php:355
+#: register.php:353
 msgid "New user registrations are currently closed."
 msgstr "L'inscription de nouveaux utilisateurs est actuellement fermée."
 
-#: update.php:66
+#: update.php:67
 msgid "Tiny Tiny RSS data update script."
 msgstr "Script de mise à jour des données de Tiny Tiny RSS."
 
@@ -480,10 +468,10 @@ msgstr "Tous les flux"
 
 #: include/controls.php:138
 #: include/controls.php:230
-#: classes/opml.php:512
-#: classes/digest.php:120
+#: classes/digest.php:124
+#: classes/feeds.php:1708
 #: classes/pref/feeds.php:233
-#: classes/feeds.php:1722
+#: classes/opml.php:512
 msgid "Uncategorized"
 msgstr "Sans catégorie"
 
@@ -498,286 +486,286 @@ msgstr[1] "%d articles archivés"
 msgid "No feeds found."
 msgstr "Aucun flux trouvé."
 
-#: include/functions.php:983
+#: include/functions.php:928
 #, php-format
 msgid "%d min"
 msgstr "%d min"
 
-#: include/functions.php:1177
+#: include/functions.php:1122
 msgid "Navigation"
 msgstr "Navigation"
 
-#: include/functions.php:1178
+#: include/functions.php:1123
 msgid "Open next feed"
 msgstr "Ouvrir le flux suivant"
 
-#: include/functions.php:1179
+#: include/functions.php:1124
 msgid "Open previous feed"
 msgstr "Ouvrir le flux précédent"
 
-#: include/functions.php:1180
+#: include/functions.php:1125
 msgid "Open next article"
 msgstr "Ouvrir l'article suivant"
 
-#: include/functions.php:1181
+#: include/functions.php:1126
 msgid "Open previous article"
 msgstr "Ouvrir l'article précédent"
 
-#: include/functions.php:1182
+#: include/functions.php:1127
 msgid "Open next article (don't scroll long articles)"
 msgstr "Ouvrir l'article suivant (ne pas faire défiler les articles longs)"
 
-#: include/functions.php:1183
+#: include/functions.php:1128
 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/functions.php:1184
+#: include/functions.php:1129
 msgid "Move to next article (don't expand or mark read)"
 msgstr "Aller à l'article suivant (ne pas développer ou marquer comme lu)"
 
-#: include/functions.php:1185
+#: include/functions.php:1130
 msgid "Move to previous article (don't expand or mark read)"
 msgstr "Aller à l'article précédent (ne pas développer ou marquer comme lu)"
 
-#: include/functions.php:1186
+#: include/functions.php:1131
 msgid "Show search dialog"
 msgstr "Afficher la fenêtre de recherche"
 
-#: include/functions.php:1187
+#: include/functions.php:1132
 msgid "Article"
 msgstr "Article"
 
-#: include/functions.php:1188
-#: js/viewfeed.js:1695
+#: include/functions.php:1133
+#: js/viewfeed.js:1341
 msgid "Toggle starred"
 msgstr "Marquer comme (non) remarquable"
 
-#: include/functions.php:1189
-#: js/viewfeed.js:1707
+#: include/functions.php:1134
+#: js/viewfeed.js:1353
 msgid "Toggle published"
 msgstr "Marquer comme (non) publié"
 
-#: include/functions.php:1190
-#: js/viewfeed.js:1682
+#: include/functions.php:1135
+#: js/viewfeed.js:1328
 msgid "Toggle unread"
 msgstr "Marquer comme (non) lu"
 
-#: include/functions.php:1191
+#: include/functions.php:1136
 msgid "Edit tags"
 msgstr "Modifier les tags"
 
-#: include/functions.php:1192
+#: include/functions.php:1137
 msgid "Open in new window"
 msgstr "Ouvrir dans une nouvelle fenêtre"
 
-#: include/functions.php:1193
-#: js/viewfeed.js:1728
+#: include/functions.php:1138
+#: js/viewfeed.js:1374
 msgid "Mark below as read"
 msgstr "Marquer les articles en-dessous comme lus"
 
-#: include/functions.php:1194
-#: js/viewfeed.js:1721
+#: include/functions.php:1139
+#: js/viewfeed.js:1367
 msgid "Mark above as read"
 msgstr "Marquer les articles au-dessus comme lus"
 
-#: include/functions.php:1195
+#: include/functions.php:1140
 msgid "Scroll down"
 msgstr "Défiler vers le bas"
 
-#: include/functions.php:1196
+#: include/functions.php:1141
 msgid "Scroll up"
 msgstr "Défiler vers le haut"
 
-#: include/functions.php:1197
+#: include/functions.php:1142
 msgid "Select article under cursor"
 msgstr "Sélectionner l'article sous le curseur"
 
-#: include/functions.php:1198
+#: include/functions.php:1143
 msgid "Email article"
 msgstr "Envoyer l'article par mail"
 
-#: include/functions.php:1199
+#: include/functions.php:1144
 msgid "Close/collapse article"
 msgstr "Contracter l'article"
 
-#: include/functions.php:1200
+#: include/functions.php:1145
 msgid "Toggle article expansion (combined mode)"
 msgstr "Basculer le développement (mode combiné)"
 
-#: include/functions.php:1202
+#: include/functions.php:1147
 #: plugins/embed_original/init.php:33
 msgid "Toggle embed original"
 msgstr "Basculer l'intégration de l'article original"
 
-#: include/functions.php:1203
+#: include/functions.php:1148
 msgid "Article selection"
 msgstr "Sélection d'article"
 
-#: include/functions.php:1204
+#: include/functions.php:1149
 msgid "Select all articles"
 msgstr "Sélectionner tous les articles"
 
-#: include/functions.php:1205
+#: include/functions.php:1150
 msgid "Select unread"
 msgstr "Sélectionner les articles non-lus"
 
-#: include/functions.php:1206
+#: include/functions.php:1151
 msgid "Select starred"
 msgstr "Sélectionner les articles remarquables"
 
-#: include/functions.php:1207
+#: include/functions.php:1152
 msgid "Select published"
 msgstr "Sélectionner les articles publiés"
 
-#: include/functions.php:1208
+#: include/functions.php:1153
 msgid "Invert selection"
 msgstr "Inverser la sélection"
 
-#: include/functions.php:1209
+#: include/functions.php:1154
 msgid "Deselect everything"
 msgstr "Tout désélectionner"
 
-#: include/functions.php:1210
-#: classes/pref/feeds.php:522
-#: classes/pref/feeds.php:794
+#: include/functions.php:1155
+#: classes/pref/feeds.php:521
+#: classes/pref/feeds.php:793
 msgid "Feed"
 msgstr "Flux"
 
-#: include/functions.php:1211
+#: include/functions.php:1156
 msgid "Refresh current feed"
 msgstr "Actualiser le flux actif"
 
-#: include/functions.php:1212
+#: include/functions.php:1157
 msgid "Un/hide read feeds"
 msgstr "Masquer/afficher les flux lus"
 
-#: include/functions.php:1213
-#: classes/pref/feeds.php:1195
+#: include/functions.php:1158
+#: classes/pref/feeds.php:1194
 msgid "Subscribe to feed"
 msgstr "S'abonner au flux"
 
-#: include/functions.php:1214
-#: js/FeedTree.js:48
-#: js/PrefFeedTree.js:55
-#: js/viewfeed.js:1846
+#: include/functions.php:1159
+#: js/FeedTree.js:49
+#: js/PrefFeedTree.js:56
+#: js/viewfeed.js:1492
 msgid "Edit feed"
 msgstr "Modifier le flux"
 
-#: include/functions.php:1216
+#: include/functions.php:1161
 msgid "Reverse headlines"
 msgstr "Inverser l'ordre des en-têtes"
 
-#: include/functions.php:1217
+#: include/functions.php:1162
 msgid "Toggle headline grouping"
 msgstr ""
 
-#: include/functions.php:1218
+#: include/functions.php:1163
 msgid "Debug feed update"
 msgstr "Déboguer les mises à jour"
 
-#: include/functions.php:1219
+#: include/functions.php:1164
 msgid "Debug viewfeed()"
 msgstr "Déboguer viewfeed()"
 
-#: include/functions.php:1220
-#: js/FeedTree.js:97
+#: include/functions.php:1165
+#: js/FeedTree.js:98
 msgid "Mark all feeds as read"
 msgstr "Marquer tous les flux comme lus"
 
-#: include/functions.php:1221
+#: include/functions.php:1166
 msgid "Un/collapse current category"
 msgstr "Étendre/contracter la catégorie"
 
-#: include/functions.php:1222
-msgid "Toggle combined mode"
-msgstr "Basculer le mode combiné"
-
-#: include/functions.php:1223
+#: include/functions.php:1167
 msgid "Toggle auto expand in combined mode"
 msgstr "Basculer le développement automatique en mode combiné"
 
-#: include/functions.php:1224
+#: include/functions.php:1168
+msgid "Toggle combined mode"
+msgstr "Basculer le mode combiné"
+
+#: include/functions.php:1169
 msgid "Go to"
 msgstr "Aller à"
 
-#: include/functions.php:1225
-#: classes/feeds.php:1583
+#: include/functions.php:1170
+#: classes/feeds.php:1569
 msgid "All articles"
 msgstr "Tous les articles"
 
-#: include/functions.php:1226
+#: include/functions.php:1171
 msgid "Fresh"
 msgstr "Nouveaux"
 
-#: include/functions.php:1229
-#: js/tt-rss.js:491
-#: js/tt-rss.js:660
+#: include/functions.php:1174
+#: js/tt-rss.js:439
+#: js/tt-rss.js:599
 msgid "Tag cloud"
 msgstr "Nuage de tags"
 
-#: include/functions.php:1231
+#: include/functions.php:1176
 msgid "Other"
 msgstr "Autre"
 
-#: include/functions.php:1232
+#: include/functions.php:1177
 #: classes/pref/labels.php:279
 msgid "Create label"
 msgstr "Créer une étiquette"
 
-#: include/functions.php:1233
+#: include/functions.php:1178
 #: classes/pref/filters.php:801
 msgid "Create filter"
 msgstr "Créer un filtre"
 
-#: include/functions.php:1234
+#: include/functions.php:1179
 msgid "Un/collapse sidebar"
 msgstr "Ouvrir/fermer la barre latérale"
 
-#: include/functions.php:1235
+#: include/functions.php:1180
 msgid "Show help dialog"
 msgstr "Afficher la fenêtre d'aide"
 
-#: include/functions.php:2582
+#: include/functions.php:2529
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: include/functions.php:2583
+#: include/functions.php:2530
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: include/functions.php:2584
+#: include/functions.php:2531
 msgid "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form"
 msgstr ""
 
-#: include/functions.php:2585
+#: include/functions.php:2532
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: include/functions.php:2586
+#: include/functions.php:2533
 #, fuzzy
 msgid "No file was uploaded"
 msgstr "Aucun fichier envoyé."
 
-#: include/functions.php:2587
+#: include/functions.php:2534
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: include/functions.php:2588
+#: include/functions.php:2535
 msgid "Failed to write file to disk."
 msgstr ""
 
-#: include/functions.php:2589
+#: include/functions.php:2536
 msgid "A PHP extension stopped the file upload."
 msgstr ""
 
 #: include/login_form.php:107
-#: classes/handler/public.php:446
-#: classes/handler/public.php:708
+#: classes/handler/public.php:466
+#: classes/handler/public.php:732
 msgid "Login:"
 msgstr "Identifiant :"
 
 #: include/login_form.php:117
-#: classes/handler/public.php:449
+#: classes/handler/public.php:469
 msgid "Password:"
 msgstr "Mot de passe :"
 
@@ -790,9 +778,9 @@ msgid "Profile:"
 msgstr "Profil :"
 
 #: include/login_form.php:133
-#: classes/handler/public.php:252
 #: classes/pref/prefs.php:1037
 #: classes/rpc.php:69
+#: classes/handler/public.php:272
 msgid "Default profile"
 msgstr "Profil par défaut"
 
@@ -809,207 +797,27 @@ msgid "Remember me"
 msgstr "Se souvenir de moi"
 
 #: include/login_form.php:159
-#: classes/handler/public.php:454
+#: classes/handler/public.php:474
 msgid "Log in"
 msgstr "Se connecter"
 
-#: include/sessions.php:46
+#: include/sessions.php:45
 msgid "Session failed to validate (schema version changed)"
 msgstr "Échec de la validation de la session (la base a changé)"
 
-#: include/sessions.php:62
+#: include/sessions.php:53
+#, fuzzy
+msgid "Session failed to validate (UA changed)."
+msgstr "Échec de la validation de la session (mot de passe changé)"
+
+#: include/sessions.php:67
 msgid "Session failed to validate (password changed)"
 msgstr "Échec de la validation de la session (mot de passe changé)"
 
-#: include/sessions.php:69
+#: include/sessions.php:74
 msgid "Session failed to validate (user not found)"
 msgstr "Échec de la validation de la session (utilisateur introuvable)"
 
-#: classes/article.php:26
-msgid "Article not found."
-msgstr "Article non trouvé."
-
-#: classes/article.php:211
-msgid "Tags for this article (separated by commas):"
-msgstr "Tags pour cet article (séparés par des virgules) :"
-
-#: classes/article.php:236
-#: classes/pref/labels.php:82
-#: classes/pref/users.php:103
-#: classes/pref/feeds.php:774
-#: classes/pref/feeds.php:914
-#: classes/pref/filters.php:525
-#: classes/pref/prefs.php:982
-#: plugins/nsfw/init.php:85
-#: plugins/note/init.php:58
-#: plugins/af_readability/init.php:80
-#: plugins/af_redditimgur/init.php:66
-#: plugins/af_psql_trgm/init.php:188
-#: plugins/mail/init.php:65
-#: plugins/af_zz_imgproxy/init.php:238
-msgid "Save"
-msgstr "Enregistrer"
-
-#: classes/article.php:238
-#: classes/handler/public.php:423
-#: classes/handler/public.php:457
-#: classes/pref/labels.php:84
-#: classes/pref/users.php:105
-#: classes/pref/feeds.php:775
-#: classes/pref/feeds.php:917
-#: classes/pref/feeds.php:1672
-#: classes/pref/filters.php:528
-#: classes/pref/filters.php:945
-#: classes/pref/filters.php:1022
-#: classes/pref/filters.php:1115
-#: classes/pref/prefs.php:984
-#: classes/feeds.php:1037
-#: classes/feeds.php:1089
-#: classes/feeds.php:1128
-#: plugins/note/init.php:60
-#: plugins/mail/init.php:179
-msgid "Cancel"
-msgstr "Annuler"
-
-#: classes/article.php:337
-#: classes/article.php:720
-#: classes/article.php:875
-msgid "no tags"
-msgstr "aucun tag"
-
-#: classes/article.php:448
-msgid "unknown type"
-msgstr "type inconnu"
-
-#: classes/article.php:525
-msgid "Attachments"
-msgstr "Fichier attaché"
-
-#: classes/article.php:626
-#: classes/feeds.php:661
-msgid "comment"
-msgid_plural "comments"
-msgstr[0] "Commentaire"
-msgstr[1] "Commentaires"
-
-#: classes/article.php:630
-#: classes/feeds.php:665
-msgid "comments"
-msgstr "Commentaires"
-
-#: classes/article.php:689
-msgid " - "
-msgstr " - "
-
-#: classes/article.php:730
-#: classes/feeds.php:647
-msgid "Edit tags for this article"
-msgstr "Modifier les tags pour cet article"
-
-#: classes/article.php:763
-#: classes/feeds.php:602
-msgid "Originally from:"
-msgstr "Origine :"
-
-#: classes/article.php:774
-#: classes/pref/feeds.php:539
-#: classes/feeds.php:613
-msgid "Feed URL"
-msgstr "URL du flux"
-
-#: classes/article.php:811
-#: classes/backend.php:103
-#: classes/dlg.php:33
-#: classes/dlg.php:56
-#: classes/dlg.php:89
-#: classes/dlg.php:154
-#: classes/dlg.php:181
-#: classes/dlg.php:197
-#: classes/pref/feeds.php:1466
-#: classes/pref/feeds.php:1533
-#: classes/pref/filters.php:208
-#: classes/pref/prefs.php:1099
-#: plugins/af_psql_trgm/init.php:109
-#: plugins/import_export/init.php:446
-#: plugins/import_export/init.php:490
-#: plugins/share/init.php:128
-msgid "Close this window"
-msgstr "Fermer cette fenêtre"
-
-#: classes/article.php:913
-msgid "(edit note)"
-msgstr "(modifier l'annotation)"
-
-#: classes/opml.php:31
-#: classes/opml.php:36
-msgid "OPML Utility"
-msgstr "Outil OPML"
-
-#: classes/opml.php:40
-msgid "Importing OPML..."
-msgstr "Import OPML en cours..."
-
-#: classes/opml.php:45
-msgid "Return to preferences"
-msgstr "Revenir à la configuration"
-
-#: classes/opml.php:301
-#, php-format
-msgid "Adding feed: %s"
-msgstr "Ajout du flux : %s"
-
-#: classes/opml.php:312
-#, php-format
-msgid "Duplicate feed: %s"
-msgstr "Flux en doublon : %s"
-
-#: classes/opml.php:326
-#, php-format
-msgid "Adding label %s"
-msgstr "Ajout de l'étiquette %s"
-
-#: classes/opml.php:329
-#, php-format
-msgid "Duplicate label: %s"
-msgstr "Étiquette en doublon: %s"
-
-#: classes/opml.php:341
-#, php-format
-msgid "Setting preference key %s to %s"
-msgstr "Paramétrage de la préférence %s à %s"
-
-#: classes/opml.php:377
-msgid "Adding filter..."
-msgstr "Créer un filtre..."
-
-#: classes/opml.php:512
-#, php-format
-msgid "Processing category: %s"
-msgstr "Placer dans la catégorie : %s"
-
-#: classes/opml.php:558
-#, php-format
-msgid "Upload failed with error code %d"
-msgstr "Échec de l'envoi, code d'erreur %d"
-
-#: classes/opml.php:570
-#: plugins/import_export/init.php:471
-msgid "Unable to move uploaded file."
-msgstr "Impossible de déplacer le fichier envoyé."
-
-#: classes/opml.php:574
-#: plugins/import_export/init.php:475
-msgid "Error: please upload OPML file."
-msgstr "Erreur : veuillez envoyer un document OPML."
-
-#: classes/opml.php:585
-msgid "Error: unable to find moved OPML file."
-msgstr "Erreur : impossible de trouver le fichier OPML déplacé."
-
-#: classes/opml.php:594
-msgid "Error while parsing document."
-msgstr "Erreur lors de l'analyse du document."
-
 #: 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."
@@ -1030,162 +838,354 @@ msgstr "Ctrl"
 msgid "Help topic not found."
 msgstr "Sujet non trouvé dans l'aide."
 
-#: 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."
+#: classes/backend.php:103
+#: classes/pref/filters.php:208
+#: classes/pref/feeds.php:1465
+#: classes/pref/feeds.php:1532
+#: classes/pref/prefs.php:1099
+#: classes/dlg.php:33
+#: classes/dlg.php:56
+#: classes/dlg.php:89
+#: classes/dlg.php:154
+#: classes/dlg.php:181
+#: classes/dlg.php:197
+#: classes/article.php:810
+#: plugins/af_psql_trgm/init.php:109
+#: plugins/import_export/init.php:446
+#: plugins/import_export/init.php:490
+#: plugins/share/init.php:128
+msgid "Close this window"
+msgstr "Fermer cette fenêtre"
 
-#: classes/dlg.php:44
-msgid "Your Public OPML URL is:"
-msgstr "Votre URL OPML publique est :"
+#: classes/feeds.php:53
+msgid "View as RSS feed"
+msgstr "Voir comme flux RSS"
 
-#: classes/dlg.php:53
-#: classes/dlg.php:178
-#: plugins/share/init.php:125
-msgid "Generate new URL"
-msgstr "Générer une nouvelle URL"
+#: classes/feeds.php:54
+#: classes/feeds.php:140
+#: classes/pref/feeds.php:1326
+msgid "View as RSS"
+msgstr "Voir comme RSS"
 
-#: classes/dlg.php:67
-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 "Le démon de mise à jour est activé dans la configuration mais le processus n'est pas lancé et les flux ne sont donc pas mis à jour. Veuillez le démarrer ou contacter l'administrateur."
+#: classes/feeds.php:62
+#, php-format
+msgid "Last updated: %s"
+msgstr "Dernière mise à jour : %s"
 
-#: classes/dlg.php:71
-#: classes/dlg.php:80
-msgid "Last update:"
-msgstr "Dernière mise à jour :"
-
-#: classes/dlg.php:76
-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 "Le démon de mise à jour prend trop de temps pour effectuer une mise à jour de flux. Cela peut indiquer un problème comme un crash ou une suspension du processus. Veuillez vérifier son état ou bien contacter l'administrateur."
-
-#: classes/dlg.php:169
-msgid "You can view this feed as RSS using the following URL:"
-msgstr "Vous pouvez consulter ce flux comme RSS en utilisant l'URL suivante :"
-
-#: classes/dlg.php:190
-msgid "You are using default tt-rss password. Please change it in the Preferences (Personal data / Authentication)."
-msgstr ""
-
-#: classes/dlg.php:194
+#: classes/feeds.php:100
 #, fuzzy
-msgid "Open Preferences"
-msgstr "Configuration"
+msgid "Select..."
+msgstr "Sélectionner"
 
-#: classes/handler/public.php:387
-#: plugins/bookmarklets/init.php:40
-msgid "Share with Tiny Tiny RSS"
-msgstr "Partager avec Tiny Tiny RSS"
+#: classes/feeds.php:102
+#: classes/pref/labels.php:273
+#: classes/pref/filters.php:391
+#: classes/pref/filters.php:449
+#: classes/pref/filters.php:795
+#: classes/pref/filters.php:878
+#: classes/pref/filters.php:905
+#: classes/pref/feeds.php:1185
+#: classes/pref/feeds.php:1416
+#: classes/pref/feeds.php:1481
+#: classes/pref/users.php:358
+#: classes/pref/prefs.php:996
+msgid "All"
+msgstr "Tout"
 
-#: classes/handler/public.php:395
-msgid "Title:"
-msgstr "Titre :"
+#: classes/feeds.php:104
+msgid "Invert"
+msgstr "Inverse"
 
-#: classes/handler/public.php:397
-#: classes/pref/feeds.php:537
-msgid "URL:"
-msgstr "URL :"
+#: classes/feeds.php:105
+#: classes/pref/labels.php:275
+#: classes/pref/filters.php:393
+#: classes/pref/filters.php:451
+#: classes/pref/filters.php:797
+#: classes/pref/filters.php:880
+#: classes/pref/filters.php:907
+#: classes/pref/feeds.php:1187
+#: classes/pref/feeds.php:1418
+#: classes/pref/feeds.php:1483
+#: classes/pref/users.php:360
+#: classes/pref/prefs.php:998
+msgid "None"
+msgstr "Aucun"
 
-#: classes/handler/public.php:399
-msgid "Content:"
-msgstr "Contenu :"
+#: classes/feeds.php:107
+msgid "Selection toggle:"
+msgstr "Sélectionner :"
 
-#: classes/handler/public.php:401
-msgid "Labels:"
-msgstr "Étiquettes :"
+#: classes/feeds.php:113
+msgid "Selection:"
+msgstr "Sélection :"
 
-#: classes/handler/public.php:420
-msgid "Shared article will appear in the Published feed."
-msgstr "Les articles partagés apparaîtront dans le flux Publiés."
+#: classes/feeds.php:116
+msgid "Set score"
+msgstr "Changer le score"
 
-#: classes/handler/public.php:422
-msgid "Share"
-msgstr "Partager"
+#: classes/feeds.php:119
+msgid "Archive"
+msgstr "Archive"
 
-#: classes/handler/public.php:444
-msgid "Not logged in"
-msgstr "Non connecté"
-
-#: classes/handler/public.php:504
-msgid "Incorrect username or password"
-msgstr "Identifiant ou mot de passe incorrect"
-
-#: classes/handler/public.php:557
-#, php-format
-msgid "Already subscribed to <b>%s</b>."
-msgstr "Déjà abonné à <b>%s</b>."
-
-#: classes/handler/public.php:560
-#, php-format
-msgid "Subscribed to <b>%s</b>."
-msgstr "Abonné à <b>%s</b>."
-
-#: classes/handler/public.php:563
-#, php-format
-msgid "Could not subscribe to <b>%s</b>."
-msgstr "Impossible de s'abonner à <b>%s</b>."
-
-#: classes/handler/public.php:566
-#, php-format
-msgid "No feeds found in <b>%s</b>."
-msgstr "Aucun flux trouvé dans <b>%s</b>."
-
-#: classes/handler/public.php:569
-msgid "Multiple feed URLs found."
-msgstr "Plusieurs flux trouvés."
-
-#: classes/handler/public.php:573
-#, 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:591
-msgid "Subscribe to selected feed"
-msgstr "S'abonner au flux sélectionné"
-
-#: classes/handler/public.php:618
-msgid "Edit subscription options"
-msgstr "Modifier les options d'abonnement"
-
-#: classes/handler/public.php:656
-msgid "Password recovery"
-msgstr "Récupération de mot de passe"
-
-#: classes/handler/public.php:701
-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:723
-#: classes/pref/users.php:372
-msgid "Reset password"
-msgstr "Réinitialiser le mot de passe"
-
-#: classes/handler/public.php:733
-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:737
-#: classes/handler/public.php:806
-msgid "Go back"
+#: classes/feeds.php:121
+msgid "Move back"
 msgstr "Revenir"
 
-#: classes/handler/public.php:775
-msgid "[tt-rss] Password reset request"
-msgstr "[tt-rss] Demande de réinitialisation de mot de passe"
+#: classes/feeds.php:122
+#: classes/pref/filters.php:400
+#: classes/pref/filters.php:458
+#: classes/pref/filters.php:887
+#: classes/pref/filters.php:914
+msgid "Delete"
+msgstr "Supprimer"
 
-#: classes/handler/public.php:802
-msgid "Sorry, login and email combination not found."
-msgstr "Désolé, ce couple identifiant et mail n'a pas été trouvé."
+#: classes/feeds.php:127
+#: classes/feeds.php:132
+#: plugins/mailto/init.php:25
+#: plugins/mail/init.php:76
+msgid "Forward by email"
+msgstr "Transférer par email"
 
-#: classes/handler/public.php:824
-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/feeds.php:136
+msgid "Feed:"
+msgstr "Flux :"
 
-#: classes/handler/public.php:850
-msgid "Database Updater"
-msgstr "Outil de mise à jour de la base de données"
+#: classes/feeds.php:193
+#: classes/feeds.php:802
+msgid "Feed not found."
+msgstr "Flux non trouvé."
 
-#: classes/handler/public.php:915
-msgid "Perform updates"
-msgstr "Exécuter les mises à jour"
+#: classes/feeds.php:255
+msgid "Never"
+msgstr "Jamais"
+
+#: classes/feeds.php:341
+#, php-format
+msgid "Imported at %s"
+msgstr "Importé à %s"
+
+#: classes/feeds.php:391
+#: classes/feeds.php:484
+msgid "mark feed as read"
+msgstr "Marquer le flux comme lu"
+
+#: classes/feeds.php:540
+msgid "Collapse article"
+msgstr "Fermer l'article"
+
+#: classes/feeds.php:592
+#: classes/article.php:762
+msgid "Originally from:"
+msgstr "Origine :"
+
+#: classes/feeds.php:603
+#: classes/pref/feeds.php:538
+#: classes/article.php:773
+msgid "Feed URL"
+msgstr "URL du flux"
+
+#: classes/feeds.php:630
+#: classes/article.php:729
+msgid "Edit tags for this article"
+msgstr "Modifier les tags pour cet article"
+
+#: classes/feeds.php:644
+#: classes/article.php:625
+msgid "comment"
+msgid_plural "comments"
+msgstr[0] "Commentaire"
+msgstr[1] "Commentaires"
+
+#: classes/feeds.php:648
+#: classes/article.php:629
+msgid "comments"
+msgstr "Commentaires"
+
+#: classes/feeds.php:686
+msgid "No unread articles found to display."
+msgstr "Aucun article non lu à afficher."
+
+#: classes/feeds.php:689
+msgid "No updated articles found to display."
+msgstr "Aucun article mis à jour à afficher."
+
+#: classes/feeds.php:692
+msgid "No starred articles found to display."
+msgstr "Aucun article remarquable à afficher."
+
+#: classes/feeds.php:696
+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:698
+msgid "No articles found to display."
+msgstr "Aucun article à afficher."
+
+#: classes/feeds.php:714
+#: classes/feeds.php:905
+#, php-format
+msgid "Feeds last updated at %s"
+msgstr "Flux mis à jour à %s"
+
+#: classes/feeds.php:726
+#: classes/feeds.php:917
+msgid "Some feeds have update errors (click for details)"
+msgstr "Des erreurs sont survenues pendant la mise à jour de certains flux (cliquer ici pour les détails)"
+
+#: classes/feeds.php:894
+msgid "No feed selected."
+msgstr "Aucun flux sélectionné."
+
+#: classes/feeds.php:958
+#: classes/feeds.php:966
+msgid "Feed or site URL"
+msgstr "URL du flux"
+
+#: classes/feeds.php:972
+#: classes/pref/feeds.php:559
+#: classes/pref/feeds.php:800
+#: classes/pref/feeds.php:1632
+msgid "Place in category:"
+msgstr "Placer dans la catégorie :"
+
+#: classes/feeds.php:980
+msgid "Available feeds"
+msgstr "Flux disponibles"
+
+#: classes/feeds.php:992
+#: classes/pref/feeds.php:621
+#: classes/pref/feeds.php:848
+#: classes/pref/users.php:61
+msgid "Authentication"
+msgstr "Identification"
+
+#: classes/feeds.php:996
+#: classes/pref/feeds.php:625
+#: classes/pref/feeds.php:852
+#: classes/pref/feeds.php:1646
+#: classes/pref/users.php:403
+msgid "Login"
+msgstr "Se connecter"
+
+#: classes/feeds.php:1000
+#: classes/pref/feeds.php:631
+#: classes/pref/feeds.php:860
+#: classes/pref/feeds.php:1649
+#: classes/pref/prefs.php:243
+msgid "Password"
+msgstr "Mot de passe"
+
+#: classes/feeds.php:1011
+#: classes/pref/feeds.php:645
+msgid "This feed requires authentication."
+msgstr "Ce flux nécessite une identification."
+
+#: classes/feeds.php:1014
+#: classes/feeds.php:1070
+#: classes/pref/feeds.php:1668
+msgid "Subscribe"
+msgstr "S'abonner"
+
+#: classes/feeds.php:1017
+msgid "More feeds"
+msgstr "D'autres flux"
+
+#: classes/feeds.php:1020
+#: classes/feeds.php:1072
+#: classes/feeds.php:1111
+#: classes/pref/labels.php:84
+#: classes/pref/filters.php:528
+#: classes/pref/filters.php:945
+#: classes/pref/filters.php:1022
+#: classes/pref/filters.php:1115
+#: classes/pref/feeds.php:774
+#: classes/pref/feeds.php:916
+#: classes/pref/feeds.php:1669
+#: classes/pref/users.php:105
+#: classes/pref/prefs.php:984
+#: classes/article.php:238
+#: classes/handler/public.php:443
+#: classes/handler/public.php:477
+#: plugins/mail/init.php:179
+#: plugins/note/init.php:60
+msgid "Cancel"
+msgstr "Annuler"
+
+#: classes/feeds.php:1042
+#: classes/feeds.php:1110
+#: classes/pref/filters.php:788
+#: classes/pref/feeds.php:1178
+#: classes/pref/users.php:345
+#: js/tt-rss.js:152
+msgid "Search"
+msgstr "Rechercher"
+
+#: classes/feeds.php:1046
+msgid "Popular feeds"
+msgstr "Flux populaires"
+
+#: classes/feeds.php:1047
+msgid "Feed archive"
+msgstr "Archive du flux"
+
+#: classes/feeds.php:1050
+msgid "limit:"
+msgstr "limite :"
+
+#: classes/feeds.php:1071
+#: classes/pref/labels.php:282
+#: classes/pref/filters.php:518
+#: classes/pref/filters.php:814
+#: classes/pref/feeds.php:751
+#: classes/pref/users.php:369
+msgid "Remove"
+msgstr "Supprimer"
+
+#: classes/feeds.php:1084
+msgid "Look for"
+msgstr "Rechercher"
+
+#: classes/feeds.php:1092
+#, php-format
+msgid "in %s"
+msgstr "dans %s"
+
+#: classes/feeds.php:1097
+msgid "Used for word stemming"
+msgstr "Utilisé pour la racinisation des mots"
+
+#: classes/feeds.php:1106
+msgid "Search syntax"
+msgstr "Syntaxe de la recherche"
+
+#: classes/feeds.php:1563
+msgid "Starred articles"
+msgstr "Articles remarquables"
+
+#: classes/feeds.php:1565
+msgid "Published articles"
+msgstr "Articles publiés"
+
+#: classes/feeds.php:1567
+msgid "Fresh articles"
+msgstr "Nouveaux articles"
+
+#: classes/feeds.php:1571
+msgid "Archived articles"
+msgstr "Articles archivés"
+
+#: classes/feeds.php:1573
+msgid "Recently read"
+msgstr "Lus récemment"
+
+#: classes/feeds.php:1694
+msgid "Special"
+msgstr "Spécial"
+
+#: classes/feeds.php:1951
+#, php-format
+msgid "Search results: %s"
+msgstr "Résultats de recherche : %s"
 
 #: classes/pref/labels.php:25
 #: classes/pref/filters.php:377
@@ -1205,199 +1205,191 @@ msgstr "Premier plan :"
 msgid "Background:"
 msgstr "Arrière-plan :"
 
+#: classes/pref/labels.php:82
+#: classes/pref/filters.php:525
+#: classes/pref/feeds.php:773
+#: classes/pref/feeds.php:913
+#: classes/pref/users.php:103
+#: classes/pref/prefs.php:982
+#: classes/article.php:236
+#: plugins/af_zz_imgproxy/init.php:238
+#: plugins/af_redditimgur/init.php:66
+#: plugins/af_psql_trgm/init.php:188
+#: plugins/af_readability/init.php:80
+#: plugins/nsfw/init.php:85
+#: plugins/mail/init.php:65
+#: plugins/note/init.php:58
+msgid "Save"
+msgstr "Enregistrer"
+
 #: classes/pref/labels.php:244
 #, php-format
 msgid "Created label <b>%s</b>"
 msgstr "Étiquette <b>%s</b> créé"
 
 #: classes/pref/labels.php:270
-#: classes/pref/users.php:356
-#: classes/pref/feeds.php:1183
-#: classes/pref/feeds.php:1414
-#: classes/pref/feeds.php:1479
 #: classes/pref/filters.php:388
 #: classes/pref/filters.php:446
 #: classes/pref/filters.php:792
 #: classes/pref/filters.php:875
 #: classes/pref/filters.php:902
+#: classes/pref/feeds.php:1182
+#: classes/pref/feeds.php:1413
+#: classes/pref/feeds.php:1478
+#: classes/pref/users.php:355
 #: classes/pref/prefs.php:993
 msgid "Select"
 msgstr "Sélectionner"
 
-#: classes/pref/labels.php:273
-#: classes/pref/users.php:359
-#: classes/pref/feeds.php:1186
-#: classes/pref/feeds.php:1417
-#: classes/pref/feeds.php:1482
-#: classes/pref/filters.php:391
-#: classes/pref/filters.php:449
-#: classes/pref/filters.php:795
-#: classes/pref/filters.php:878
-#: classes/pref/filters.php:905
-#: classes/pref/prefs.php:996
-#: classes/feeds.php:102
-msgid "All"
-msgstr "Tout"
-
-#: classes/pref/labels.php:275
-#: classes/pref/users.php:361
-#: classes/pref/feeds.php:1188
-#: classes/pref/feeds.php:1419
-#: classes/pref/feeds.php:1484
-#: classes/pref/filters.php:393
-#: classes/pref/filters.php:451
-#: classes/pref/filters.php:797
-#: classes/pref/filters.php:880
-#: classes/pref/filters.php:907
-#: classes/pref/prefs.php:998
-#: classes/feeds.php:105
-msgid "None"
-msgstr "Aucun"
-
-#: classes/pref/labels.php:282
-#: classes/pref/users.php:370
-#: classes/pref/feeds.php:752
-#: classes/pref/filters.php:518
-#: classes/pref/filters.php:814
-#: classes/feeds.php:1088
-msgid "Remove"
-msgstr "Supprimer"
-
 #: classes/pref/labels.php:285
 msgid "Clear colors"
 msgstr "Ré-initialiser les couleurs"
 
-#: classes/pref/users.php:6
-#: classes/pref/system.php:8
-msgid "Your access level is insufficient to open this tab."
-msgstr "Vous n'avez pas les permissions nécessaires pour ouvrir cet onglet."
+#: classes/pref/filters.php:155
+msgid "Preview article"
+msgstr "Prévisualiser l'article"
 
-#: classes/pref/users.php:26
-msgid "Edit user"
-msgstr "Modifier Utilisateur"
+#: classes/pref/filters.php:267
+#: classes/pref/filters.php:573
+msgid "(inverse)"
+msgstr "(inversé)"
 
-#: classes/pref/users.php:61
-#: classes/pref/feeds.php:622
-#: classes/pref/feeds.php:849
-#: classes/feeds.php:1009
-msgid "Authentication"
-msgstr "Identification"
-
-#: classes/pref/users.php:64
-msgid "Access level: "
-msgstr "Permissions : "
-
-#: classes/pref/users.php:82
-#: classes/pref/feeds.php:648
-#: classes/pref/feeds.php:867
-msgid "Options"
-msgstr "Options"
-
-#: classes/pref/users.php:96
-#: js/prefs.js:479
-msgid "User details"
-msgstr "Détails de l'utilisateur"
-
-#: classes/pref/users.php:136
-#: classes/pref/users.php:407
-msgid "Registered"
-msgstr "Inscrit"
-
-#: classes/pref/users.php:137
-msgid "Last logged in"
-msgstr "Dernière connexion"
-
-#: classes/pref/users.php:145
-msgid "Subscribed feeds count"
-msgstr "Nombre d'abonnements à des flux"
-
-#: classes/pref/users.php:146
-msgid "Stored articles"
-msgstr "Articles stockés"
-
-#: classes/pref/users.php:150
-#: classes/pref/users.php:406
-msgid "Subscribed feeds"
-msgstr "Flux abonnés"
-
-#: classes/pref/users.php:176
-msgid "User not found"
-msgstr "Utilisateur non trouvé"
-
-#: classes/pref/users.php:246
+#: classes/pref/filters.php:263
+#: classes/pref/filters.php:572
 #, php-format
-msgid "Added user <b>%s</b> with password <b>%s</b>"
-msgstr "Utilisateur <b>%s</b> ajouté avec le mot de passe <b>%s</b>"
+msgid "%s on %s in %s %s"
+msgstr "%s sur %s dans %s %s"
 
-#: classes/pref/users.php:253
-#, php-format
-msgid "Could not create user <b>%s</b>"
-msgstr "Impossible de créer l'utilisateur <b>%s</b>"
+#: classes/pref/filters.php:383
+#: classes/pref/filters.php:870
+#: classes/pref/filters.php:977
+msgid "Match"
+msgstr "Correspondance"
 
-#: classes/pref/users.php:257
-#, php-format
-msgid "User <b>%s</b> already exists."
-msgstr "L'utilisateur <b>%s</b> existe déjà."
+#: classes/pref/filters.php:397
+#: classes/pref/filters.php:455
+#: classes/pref/filters.php:884
+#: classes/pref/filters.php:911
+msgid "Add"
+msgstr "Ajouter"
 
-#: classes/pref/users.php:285
-#, 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/filters.php:441
+#: classes/pref/filters.php:897
+msgid "Apply actions"
+msgstr "Actions effectuées"
 
-#: classes/pref/users.php:287
-#, 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/filters.php:492
+#: classes/pref/filters.php:926
+msgid "Enabled"
+msgstr "Activé"
 
-#: classes/pref/users.php:311
-msgid "[tt-rss] Password change notification"
-msgstr "[tt-rss] Notification de changement de mot de passe"
+#: classes/pref/filters.php:501
+#: classes/pref/filters.php:929
+msgid "Match any rule"
+msgstr "Au moins une correspondance"
 
-#: classes/pref/users.php:346
-#: classes/pref/feeds.php:1179
-#: classes/pref/filters.php:788
-#: classes/feeds.php:1059
-#: classes/feeds.php:1127
-#: js/tt-rss.js:165
-msgid "Search"
-msgstr "Rechercher"
+#: classes/pref/filters.php:510
+#: classes/pref/filters.php:932
+msgid "Inverse matching"
+msgstr "Correspondance inverse"
 
-#: classes/pref/users.php:364
-msgid "Create user"
-msgstr "Créer l'utilisateur"
+#: classes/pref/filters.php:522
+#: classes/pref/filters.php:939
+msgid "Test"
+msgstr "Test"
+
+#: classes/pref/filters.php:804
+msgid "Combine"
+msgstr "Combiner"
 
-#: classes/pref/users.php:368
 #: classes/pref/filters.php:807
+#: classes/pref/users.php:367
 msgid "Edit"
 msgstr "Modifier"
 
-#: classes/pref/users.php:404
-#: classes/pref/feeds.php:626
-#: classes/pref/feeds.php:853
-#: classes/pref/feeds.php:1649
-#: classes/feeds.php:1013
-msgid "Login"
-msgstr "Se connecter"
+#: classes/pref/filters.php:810
+#: classes/pref/feeds.php:1198
+#: classes/pref/feeds.php:1212
+msgid "Reset sort order"
+msgstr "Réinitialiser le critère de tri"
 
-#: classes/pref/users.php:405
-msgid "Access Level"
-msgstr "Permissions"
+#: classes/pref/filters.php:942
+msgid "Create"
+msgstr "Créer"
 
-#: classes/pref/users.php:408
-msgid "Last login"
-msgstr "Dernière connexion"
+#: classes/pref/filters.php:987
+msgid "Regular expression, without outer delimiters (i.e. slashes)"
+msgstr ""
 
-#: classes/pref/users.php:427
-msgid "Click to edit"
-msgstr "Cliquer pour modifier"
+#: classes/pref/filters.php:993
+msgid "Inverse regular expression matching"
+msgstr "Inverser le résultat de l'expression rationnelle"
 
-#: classes/pref/users.php:447
-msgid "No users defined."
-msgstr "Aucun utilisateur défini."
+#: classes/pref/filters.php:995
+msgid "on field"
+msgstr "sur le champ"
 
-#: classes/pref/users.php:449
-msgid "No matching users found."
-msgstr "Aucun utilisateur correspondant trouvé."
+#: classes/pref/filters.php:1001
+#: js/PrefFilterTree.js:44
+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:764
+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:786
+msgid "Add action"
+msgstr "Ajouter une action"
+
+#: classes/pref/filters.php:1139
+msgid "[No caption]"
+msgstr "[Pas de titre]"
+
+#: classes/pref/filters.php:1141
+#, 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:1155
+msgid "matches any rule"
+msgstr "Au moins une correspondance"
+
+#: classes/pref/filters.php:1158
+#, php-format
+msgid "%s (+%d action)"
+msgid_plural "%s (+%d actions)"
+msgstr[0] "%s (+%d action)"
+msgstr[1] "%s (+%d actions)"
+
+#: classes/pref/system.php:8
+#: classes/pref/users.php:6
+msgid "Your access level is insufficient to open this tab."
+msgstr "Vous n'avez pas les permissions nécessaires pour ouvrir cet onglet."
 
 #: classes/pref/system.php:29
 msgid "Error Log"
@@ -1442,381 +1434,313 @@ msgid_plural "(%d feeds)"
 msgstr[0] "(%d flux)"
 msgstr[1] "(%d flux)"
 
-#: classes/pref/feeds.php:514
+#: classes/pref/feeds.php:513
 #: classes/pref/prefs.php:18
 msgid "General"
 msgstr "Général"
 
-#: classes/pref/feeds.php:528
+#: classes/pref/feeds.php:527
 msgid "Feed Title"
 msgstr "Titre du flux"
 
-#: classes/pref/feeds.php:560
-#: classes/pref/feeds.php:801
-#: classes/pref/feeds.php:1635
-#: classes/feeds.php:989
-msgid "Place in category:"
-msgstr "Placer dans la catégorie :"
+#: classes/pref/feeds.php:536
+#: classes/handler/public.php:417
+msgid "URL:"
+msgstr "URL :"
 
-#: classes/pref/feeds.php:572
+#: classes/pref/feeds.php:571
 #, fuzzy
 msgid "Site URL:"
 msgstr "URL de l'article :"
 
-#: classes/pref/feeds.php:574
+#: classes/pref/feeds.php:573
 #, fuzzy
 msgid "Site URL"
 msgstr "URL du flux"
 
-#: classes/pref/feeds.php:585
-#: classes/pref/feeds.php:815
+#: classes/pref/feeds.php:584
+#: classes/pref/feeds.php:814
 msgid "Language:"
 msgstr "Langue:"
 
-#: classes/pref/feeds.php:592
-#: classes/pref/feeds.php:824
+#: classes/pref/feeds.php:591
+#: classes/pref/feeds.php:823
 msgid "Update"
 msgstr "Mettre à jour"
 
-#: classes/pref/feeds.php:607
-#: classes/pref/feeds.php:840
+#: classes/pref/feeds.php:606
+#: classes/pref/feeds.php:839
 msgid "Article purging:"
 msgstr "Purge des articles :"
 
-#: classes/pref/feeds.php:632
-#: classes/pref/feeds.php:861
-#: classes/pref/feeds.php:1652
-#: classes/pref/prefs.php:243
-#: classes/feeds.php:1017
-msgid "Password"
-msgstr "Mot de passe"
-
-#: classes/pref/feeds.php:636
+#: classes/pref/feeds.php:635
 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:646
-#: classes/feeds.php:1028
-msgid "This feed requires authentication."
-msgstr "Ce flux nécessite une identification."
+#: classes/pref/feeds.php:647
+#: classes/pref/feeds.php:866
+#: classes/pref/users.php:82
+msgid "Options"
+msgstr "Options"
 
-#: classes/pref/feeds.php:662
-#: classes/pref/feeds.php:871
+#: classes/pref/feeds.php:661
+#: classes/pref/feeds.php:870
 msgid "Hide from Popular feeds"
 msgstr "Masquer dans la liste des flux populaires"
 
-#: classes/pref/feeds.php:674
-#: classes/pref/feeds.php:877
+#: classes/pref/feeds.php:673
+#: classes/pref/feeds.php:876
 msgid "Include in e-mail digest"
 msgstr "Inclure dans la synthèse quotidienne par courrier électronique"
 
-#: classes/pref/feeds.php:687
-#: classes/pref/feeds.php:883
+#: classes/pref/feeds.php:686
+#: classes/pref/feeds.php:882
 msgid "Always display image attachments"
 msgstr "Toujours afficher les images jointes"
 
-#: classes/pref/feeds.php:700
-#: classes/pref/feeds.php:891
+#: classes/pref/feeds.php:699
+#: classes/pref/feeds.php:890
 #, fuzzy
 msgid "Do not embed media"
 msgstr "Ne pas intégrer les images"
 
-#: classes/pref/feeds.php:713
-#: classes/pref/feeds.php:899
+#: classes/pref/feeds.php:712
+#: classes/pref/feeds.php:898
 msgid "Cache media"
 msgstr ""
 
-#: classes/pref/feeds.php:725
-#: classes/pref/feeds.php:905
+#: classes/pref/feeds.php:724
+#: classes/pref/feeds.php:904
 msgid "Mark updated articles as unread"
 msgstr "Marquer les article mis à jour comme non lus"
 
-#: classes/pref/feeds.php:729
+#: classes/pref/feeds.php:728
 msgid "Icon"
 msgstr "Icône"
 
-#: classes/pref/feeds.php:743
-#: classes/pref/feeds.php:1284
+#: classes/pref/feeds.php:742
+#: classes/pref/feeds.php:1283
 #: plugins/import_export/init.php:71
 #, fuzzy
 msgid "Choose file..."
 msgstr "Créer un filtre..."
 
-#: classes/pref/feeds.php:750
+#: classes/pref/feeds.php:749
 msgid "Replace"
 msgstr "Remplacer"
 
-#: classes/pref/feeds.php:757
+#: classes/pref/feeds.php:756
 #: classes/pref/prefs.php:679
 msgid "Plugins"
 msgstr "Plugins"
 
-#: classes/pref/feeds.php:1154
+#: classes/pref/feeds.php:1153
 msgid "Feeds with errors"
 msgstr "Flux avec des erreurs"
 
-#: classes/pref/feeds.php:1161
+#: classes/pref/feeds.php:1160
 msgid "Inactive feeds"
 msgstr "Flux inactifs"
 
-#: classes/pref/feeds.php:1197
+#: classes/pref/feeds.php:1196
 msgid "Edit selected feeds"
 msgstr "Modifier les flux sélectionnés"
 
-#: classes/pref/feeds.php:1199
-#: classes/pref/feeds.php:1213
-#: classes/pref/filters.php:810
-msgid "Reset sort order"
-msgstr "Réinitialiser le critère de tri"
-
-#: classes/pref/feeds.php:1201
-#: js/prefs.js:1462
+#: classes/pref/feeds.php:1200
+#: js/prefs.js:1171
 msgid "Batch subscribe"
 msgstr "Abonnement par lots"
 
-#: classes/pref/feeds.php:1208
+#: classes/pref/feeds.php:1207
 msgid "Categories"
 msgstr "Catégories"
 
-#: classes/pref/feeds.php:1211
+#: classes/pref/feeds.php:1210
 msgid "Add category"
 msgstr "Ajouter une catégorie"
 
-#: classes/pref/feeds.php:1215
+#: classes/pref/feeds.php:1214
 msgid "Remove selected"
 msgstr "Supprimer les flux sélectionnés"
 
-#: classes/pref/feeds.php:1272
+#: classes/pref/feeds.php:1271
 msgid "OPML"
 msgstr "OPML"
 
-#: classes/pref/feeds.php:1274
+#: classes/pref/feeds.php:1273
 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:1275
+#: classes/pref/feeds.php:1274
 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:1290
+#: classes/pref/feeds.php:1289
 msgid "Import my OPML"
 msgstr "Importer mon OPML"
 
-#: classes/pref/feeds.php:1296
+#: classes/pref/feeds.php:1295
 msgid "Filename:"
 msgstr "Nom du fichier :"
 
-#: classes/pref/feeds.php:1298
+#: classes/pref/feeds.php:1297
 msgid "Include settings"
 msgstr "Inclure les paramètres"
 
-#: classes/pref/feeds.php:1302
+#: classes/pref/feeds.php:1301
 msgid "Export OPML"
 msgstr "Exporter en OPML"
 
-#: classes/pref/feeds.php:1306
+#: classes/pref/feeds.php:1305
 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:1310
+#: classes/pref/feeds.php:1309
 msgid "Public OPML URL"
 msgstr "URL OPML publique"
 
-#: classes/pref/feeds.php:1311
+#: classes/pref/feeds.php:1310
 msgid "Display published OPML URL"
 msgstr "Afficher l'URL de l'OPML public"
 
-#: classes/pref/feeds.php:1318
+#: classes/pref/feeds.php:1317
 msgid "Published & shared articles / Generated feeds"
 msgstr "Articles publiés et partagés / Flux générés"
 
-#: classes/pref/feeds.php:1320
+#: classes/pref/feeds.php:1319
 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:1327
-#: classes/feeds.php:54
-#: classes/feeds.php:140
-msgid "View as RSS"
-msgstr "Voir comme RSS"
-
-#: classes/pref/feeds.php:1328
 msgid "Display URL"
 msgstr "Afficher l'URL"
 
-#: classes/pref/feeds.php:1331
+#: classes/pref/feeds.php:1330
 msgid "Clear all generated URLs"
 msgstr "Supprimer toutes les URL générées"
 
-#: classes/pref/feeds.php:1410
+#: classes/pref/feeds.php:1409
 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:1444
-#: classes/pref/feeds.php:1509
+#: classes/pref/feeds.php:1443
+#: classes/pref/feeds.php:1508
 msgid "Click to edit feed"
 msgstr "Cliquez pour modifier le flux"
 
-#: classes/pref/feeds.php:1462
-#: classes/pref/feeds.php:1529
+#: classes/pref/feeds.php:1461
+#: classes/pref/feeds.php:1528
 msgid "Unsubscribe from selected feeds"
 msgstr "Se désabonner des flux sélectionnés"
 
-#: classes/pref/feeds.php:1632
+#: classes/pref/feeds.php:1629
 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:1641
+#: classes/pref/feeds.php:1638
 msgid "Feeds to subscribe, One per line"
 msgstr "Flux auxquels s'abonner, un par ligne"
 
-#: classes/pref/feeds.php:1664
+#: classes/pref/feeds.php:1661
 msgid "Feeds require authentication."
 msgstr "Les flux requièrent une identification."
 
-#: classes/pref/feeds.php:1671
-#: classes/feeds.php:1031
-#: classes/feeds.php:1087
-msgid "Subscribe"
-msgstr "S'abonner"
+#: classes/pref/users.php:26
+msgid "Edit user"
+msgstr "Modifier Utilisateur"
 
-#: classes/pref/filters.php:155
-msgid "Preview article"
-msgstr "Prévisualiser l'article"
+#: classes/pref/users.php:64
+msgid "Access level: "
+msgstr "Permissions : "
 
-#: classes/pref/filters.php:267
-#: classes/pref/filters.php:573
-msgid "(inverse)"
-msgstr "(inversé)"
+#: classes/pref/users.php:96
+#: js/prefs.js:403
+msgid "User details"
+msgstr "Détails de l'utilisateur"
 
-#: classes/pref/filters.php:263
-#: classes/pref/filters.php:572
+#: classes/pref/users.php:136
+#: classes/pref/users.php:406
+msgid "Registered"
+msgstr "Inscrit"
+
+#: classes/pref/users.php:137
+msgid "Last logged in"
+msgstr "Dernière connexion"
+
+#: classes/pref/users.php:145
+msgid "Subscribed feeds count"
+msgstr "Nombre d'abonnements à des flux"
+
+#: classes/pref/users.php:146
+msgid "Stored articles"
+msgstr "Articles stockés"
+
+#: classes/pref/users.php:150
+#: classes/pref/users.php:405
+msgid "Subscribed feeds"
+msgstr "Flux abonnés"
+
+#: classes/pref/users.php:176
+msgid "User not found"
+msgstr "Utilisateur non trouvé"
+
+#: classes/pref/users.php:246
 #, php-format
-msgid "%s on %s in %s %s"
-msgstr "%s sur %s dans %s %s"
+msgid "Added user <b>%s</b> with password <b>%s</b>"
+msgstr "Utilisateur <b>%s</b> ajouté avec le mot de passe <b>%s</b>"
 
-#: classes/pref/filters.php:383
-#: classes/pref/filters.php:870
-#: classes/pref/filters.php:977
-msgid "Match"
-msgstr "Correspondance"
-
-#: classes/pref/filters.php:397
-#: classes/pref/filters.php:455
-#: classes/pref/filters.php:884
-#: classes/pref/filters.php:911
-msgid "Add"
-msgstr "Ajouter"
-
-#: classes/pref/filters.php:400
-#: classes/pref/filters.php:458
-#: classes/pref/filters.php:887
-#: classes/pref/filters.php:914
-#: classes/feeds.php:122
-msgid "Delete"
-msgstr "Supprimer"
-
-#: classes/pref/filters.php:441
-#: classes/pref/filters.php:897
-msgid "Apply actions"
-msgstr "Actions effectuées"
-
-#: classes/pref/filters.php:492
-#: classes/pref/filters.php:926
-msgid "Enabled"
-msgstr "Activé"
-
-#: classes/pref/filters.php:501
-#: classes/pref/filters.php:929
-msgid "Match any rule"
-msgstr "Au moins une correspondance"
-
-#: classes/pref/filters.php:510
-#: classes/pref/filters.php:932
-msgid "Inverse matching"
-msgstr "Correspondance inverse"
-
-#: classes/pref/filters.php:522
-#: classes/pref/filters.php:939
-msgid "Test"
-msgstr "Test"
-
-#: classes/pref/filters.php:804
-msgid "Combine"
-msgstr "Combiner"
-
-#: classes/pref/filters.php:942
-msgid "Create"
-msgstr "Créer"
-
-#: classes/pref/filters.php:987
-msgid "Regular expression, without outer delimiters (i.e. slashes)"
-msgstr ""
-
-#: 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:43
-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:797
-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:819
-msgid "Add action"
-msgstr "Ajouter une action"
-
-#: classes/pref/filters.php:1139
-msgid "[No caption]"
-msgstr "[Pas de titre]"
-
-#: classes/pref/filters.php:1141
+#: classes/pref/users.php:253
 #, php-format
-msgid "%s (%d rule)"
-msgid_plural "%s (%d rules)"
-msgstr[0] "%s (%d règle)"
-msgstr[1] "%s (%d règles)"
+msgid "Could not create user <b>%s</b>"
+msgstr "Impossible de créer l'utilisateur <b>%s</b>"
 
-#: classes/pref/filters.php:1155
-msgid "matches any rule"
-msgstr "Au moins une correspondance"
-
-#: classes/pref/filters.php:1158
+#: classes/pref/users.php:257
 #, php-format
-msgid "%s (+%d action)"
-msgid_plural "%s (+%d actions)"
-msgstr[0] "%s (+%d action)"
-msgstr[1] "%s (+%d actions)"
+msgid "User <b>%s</b> already exists."
+msgstr "L'utilisateur <b>%s</b> existe déjà."
+
+#: classes/pref/users.php:285
+#, 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:287
+#, 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:310
+msgid "[tt-rss] Password change notification"
+msgstr "[tt-rss] Notification de changement de mot de passe"
+
+#: classes/pref/users.php:363
+msgid "Create user"
+msgstr "Créer l'utilisateur"
+
+#: classes/pref/users.php:371
+#: classes/handler/public.php:747
+msgid "Reset password"
+msgstr "Réinitialiser le mot de passe"
+
+#: classes/pref/users.php:404
+msgid "Access Level"
+msgstr "Permissions"
+
+#: classes/pref/users.php:407
+msgid "Last login"
+msgstr "Dernière connexion"
+
+#: classes/pref/users.php:426
+msgid "Click to edit"
+msgstr "Cliquer pour modifier"
+
+#: classes/pref/users.php:446
+msgid "No users defined."
+msgstr "Aucun utilisateur défini."
+
+#: classes/pref/users.php:448
+msgid "No matching users found."
+msgstr "Aucun utilisateur correspondant trouvé."
 
 #: classes/pref/prefs.php:19
 msgid "Interface"
@@ -1992,7 +1916,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:1424
+#: js/prefs.js:1136
 msgid "Customize stylesheet"
 msgstr "Personnaliser la feuille de style"
 
@@ -2235,253 +2159,297 @@ msgstr "Supprimer les profils sélectionnés"
 msgid "Activate profile"
 msgstr "Activer le profil"
 
-#: classes/feeds.php:53
-msgid "View as RSS feed"
-msgstr "Voir comme flux RSS"
+#: 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."
 
-#: classes/feeds.php:62
-#, php-format
-msgid "Last updated: %s"
-msgstr "Dernière mise à jour : %s"
+#: classes/dlg.php:44
+msgid "Your Public OPML URL is:"
+msgstr "Votre URL OPML publique est :"
 
-#: classes/feeds.php:100
+#: classes/dlg.php:53
+#: classes/dlg.php:178
+#: plugins/share/init.php:125
+msgid "Generate new URL"
+msgstr "Générer une nouvelle URL"
+
+#: classes/dlg.php:67
+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 "Le démon de mise à jour est activé dans la configuration mais le processus n'est pas lancé et les flux ne sont donc pas mis à jour. Veuillez le démarrer ou contacter l'administrateur."
+
+#: classes/dlg.php:71
+#: classes/dlg.php:80
+msgid "Last update:"
+msgstr "Dernière mise à jour :"
+
+#: classes/dlg.php:76
+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 "Le démon de mise à jour prend trop de temps pour effectuer une mise à jour de flux. Cela peut indiquer un problème comme un crash ou une suspension du processus. Veuillez vérifier son état ou bien contacter l'administrateur."
+
+#: classes/dlg.php:169
+msgid "You can view this feed as RSS using the following URL:"
+msgstr "Vous pouvez consulter ce flux comme RSS en utilisant l'URL suivante :"
+
+#: classes/dlg.php:190
+msgid "You are using default tt-rss password. Please change it in the Preferences (Personal data / Authentication)."
+msgstr ""
+
+#: classes/dlg.php:194
 #, fuzzy
-msgid "Select..."
-msgstr "Sélectionner"
+msgid "Open Preferences"
+msgstr "Configuration"
 
-#: classes/feeds.php:104
-msgid "Invert"
-msgstr "Inverse"
+#: classes/opml.php:31
+#: classes/opml.php:36
+msgid "OPML Utility"
+msgstr "Outil OPML"
 
-#: classes/feeds.php:107
-msgid "Selection toggle:"
-msgstr "Sélectionner :"
+#: classes/opml.php:40
+msgid "Importing OPML..."
+msgstr "Import OPML en cours..."
 
-#: classes/feeds.php:113
-msgid "Selection:"
-msgstr "Sélection :"
+#: classes/opml.php:45
+msgid "Return to preferences"
+msgstr "Revenir à la configuration"
 
-#: classes/feeds.php:116
-msgid "Set score"
-msgstr "Changer le score"
+#: classes/opml.php:301
+#, php-format
+msgid "Adding feed: %s"
+msgstr "Ajout du flux : %s"
 
-#: classes/feeds.php:119
-msgid "Archive"
-msgstr "Archive"
+#: classes/opml.php:312
+#, php-format
+msgid "Duplicate feed: %s"
+msgstr "Flux en doublon : %s"
 
-#: classes/feeds.php:121
-msgid "Move back"
+#: classes/opml.php:326
+#, php-format
+msgid "Adding label %s"
+msgstr "Ajout de l'étiquette %s"
+
+#: classes/opml.php:329
+#, php-format
+msgid "Duplicate label: %s"
+msgstr "Étiquette en doublon: %s"
+
+#: classes/opml.php:341
+#, php-format
+msgid "Setting preference key %s to %s"
+msgstr "Paramétrage de la préférence %s à %s"
+
+#: classes/opml.php:377
+msgid "Adding filter..."
+msgstr "Créer un filtre..."
+
+#: classes/opml.php:512
+#, php-format
+msgid "Processing category: %s"
+msgstr "Placer dans la catégorie : %s"
+
+#: classes/opml.php:558
+#, php-format
+msgid "Upload failed with error code %d"
+msgstr "Échec de l'envoi, code d'erreur %d"
+
+#: classes/opml.php:570
+#: plugins/import_export/init.php:471
+msgid "Unable to move uploaded file."
+msgstr "Impossible de déplacer le fichier envoyé."
+
+#: classes/opml.php:574
+#: plugins/import_export/init.php:475
+msgid "Error: please upload OPML file."
+msgstr "Erreur : veuillez envoyer un document OPML."
+
+#: classes/opml.php:585
+msgid "Error: unable to find moved OPML file."
+msgstr "Erreur : impossible de trouver le fichier OPML déplacé."
+
+#: classes/opml.php:594
+msgid "Error while parsing document."
+msgstr "Erreur lors de l'analyse du document."
+
+#: classes/article.php:26
+msgid "Article not found."
+msgstr "Article non trouvé."
+
+#: classes/article.php:211
+msgid "Tags for this article (separated by commas):"
+msgstr "Tags pour cet article (séparés par des virgules) :"
+
+#: classes/article.php:337
+#: classes/article.php:719
+#: classes/article.php:874
+msgid "no tags"
+msgstr "aucun tag"
+
+#: classes/article.php:447
+msgid "unknown type"
+msgstr "type inconnu"
+
+#: classes/article.php:524
+msgid "Attachments"
+msgstr "Fichier attaché"
+
+#: classes/article.php:688
+msgid " - "
+msgstr " - "
+
+#: classes/article.php:912
+msgid "(edit note)"
+msgstr "(modifier l'annotation)"
+
+#: classes/handler/public.php:407
+#: plugins/bookmarklets/init.php:40
+msgid "Share with Tiny Tiny RSS"
+msgstr "Partager avec Tiny Tiny RSS"
+
+#: classes/handler/public.php:415
+msgid "Title:"
+msgstr "Titre :"
+
+#: classes/handler/public.php:419
+msgid "Content:"
+msgstr "Contenu :"
+
+#: classes/handler/public.php:421
+msgid "Labels:"
+msgstr "Étiquettes :"
+
+#: classes/handler/public.php:440
+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:442
+msgid "Share"
+msgstr "Partager"
+
+#: classes/handler/public.php:464
+msgid "Not logged in"
+msgstr "Non connecté"
+
+#: classes/handler/public.php:527
+msgid "Incorrect username or password"
+msgstr "Identifiant ou mot de passe incorrect"
+
+#: classes/handler/public.php:581
+#, php-format
+msgid "Already subscribed to <b>%s</b>."
+msgstr "Déjà abonné à <b>%s</b>."
+
+#: classes/handler/public.php:584
+#, php-format
+msgid "Subscribed to <b>%s</b>."
+msgstr "Abonné à <b>%s</b>."
+
+#: classes/handler/public.php:587
+#, php-format
+msgid "Could not subscribe to <b>%s</b>."
+msgstr "Impossible de s'abonner à <b>%s</b>."
+
+#: classes/handler/public.php:590
+#, php-format
+msgid "No feeds found in <b>%s</b>."
+msgstr "Aucun flux trouvé dans <b>%s</b>."
+
+#: classes/handler/public.php:593
+msgid "Multiple feed URLs found."
+msgstr "Plusieurs flux trouvés."
+
+#: classes/handler/public.php:597
+#, 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:615
+msgid "Subscribe to selected feed"
+msgstr "S'abonner au flux sélectionné"
+
+#: classes/handler/public.php:642
+msgid "Edit subscription options"
+msgstr "Modifier les options d'abonnement"
+
+#: classes/handler/public.php:680
+msgid "Password recovery"
+msgstr "Récupération de mot de passe"
+
+#: classes/handler/public.php:725
+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:757
+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:761
+#: classes/handler/public.php:830
+msgid "Go back"
 msgstr "Revenir"
 
-#: classes/feeds.php:127
-#: classes/feeds.php:132
-#: plugins/mail/init.php:76
-#: plugins/mailto/init.php:25
-msgid "Forward by email"
-msgstr "Transférer par email"
+#: classes/handler/public.php:799
+msgid "[tt-rss] Password reset request"
+msgstr "[tt-rss] Demande de réinitialisation de mot de passe"
 
-#: classes/feeds.php:136
-msgid "Feed:"
-msgstr "Flux :"
+#: 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/feeds.php:193
-#: classes/feeds.php:819
-msgid "Feed not found."
-msgstr "Flux non trouvé."
+#: 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/feeds.php:255
-msgid "Never"
-msgstr "Jamais"
+#: classes/handler/public.php:874
+msgid "Database Updater"
+msgstr "Outil de mise à jour de la base de données"
 
-#: classes/feeds.php:342
-#, php-format
-msgid "Imported at %s"
-msgstr "Importé à %s"
+#: classes/handler/public.php:939
+msgid "Perform updates"
+msgstr "Exécuter les mises à jour"
 
-#: classes/feeds.php:394
-#: classes/feeds.php:487
-msgid "mark feed as read"
-msgstr "Marquer le flux comme lu"
+#: plugins/af_zz_imgproxy/init.php:208
+msgid "Image proxy settings (af_zz_imgproxy)"
+msgstr ""
 
-#: classes/feeds.php:542
-msgid "Collapse article"
-msgstr "Fermer l'article"
+#: plugins/af_zz_imgproxy/init.php:232
+#, fuzzy
+msgid "Enable proxy for all remote images."
+msgstr "Activer pour tous les flux:"
 
-#: classes/feeds.php:703
-msgid "No unread articles found to display."
-msgstr "Aucun article non lu à afficher."
+#: plugins/af_zz_imgproxy/init.php:236
+#, fuzzy
+msgid "Don't cache files locally."
+msgstr "Enregistrer localement les images"
 
-#: classes/feeds.php:706
-msgid "No updated articles found to display."
-msgstr "Aucun article mis à jour à afficher."
-
-#: classes/feeds.php:709
-msgid "No starred articles found to display."
-msgstr "Aucun article remarquable à afficher."
-
-#: classes/feeds.php:713
-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:715
-msgid "No articles found to display."
-msgstr "Aucun article à afficher."
-
-#: classes/feeds.php:731
-#: classes/feeds.php:922
-#, php-format
-msgid "Feeds last updated at %s"
-msgstr "Flux mis à jour à %s"
-
-#: classes/feeds.php:743
-#: classes/feeds.php:934
-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:911
-msgid "No feed selected."
-msgstr "Aucun flux sélectionné."
-
-#: classes/feeds.php:975
-#: classes/feeds.php:983
-msgid "Feed or site URL"
-msgstr "URL du flux"
-
-#: classes/feeds.php:997
-msgid "Available feeds"
-msgstr "Flux disponibles"
-
-#: classes/feeds.php:1034
-msgid "More feeds"
-msgstr "D'autres flux"
-
-#: classes/feeds.php:1063
-msgid "Popular feeds"
-msgstr "Flux populaires"
-
-#: classes/feeds.php:1064
-msgid "Feed archive"
-msgstr "Archive du flux"
-
-#: classes/feeds.php:1067
-msgid "limit:"
-msgstr "limite :"
-
-#: classes/feeds.php:1101
-msgid "Look for"
-msgstr "Rechercher"
-
-#: classes/feeds.php:1109
-#, php-format
-msgid "in %s"
-msgstr "dans %s"
-
-#: classes/feeds.php:1114
-msgid "Used for word stemming"
-msgstr "Utilisé pour la racinisation des mots"
-
-#: classes/feeds.php:1123
-msgid "Search syntax"
-msgstr "Syntaxe de la recherche"
-
-#: classes/feeds.php:1577
-msgid "Starred articles"
-msgstr "Articles remarquables"
-
-#: classes/feeds.php:1579
-msgid "Published articles"
-msgstr "Articles publiés"
-
-#: classes/feeds.php:1581
-msgid "Fresh articles"
-msgstr "Nouveaux articles"
-
-#: classes/feeds.php:1585
-msgid "Archived articles"
-msgstr "Articles archivés"
-
-#: classes/feeds.php:1587
-msgid "Recently read"
-msgstr "Lus récemment"
-
-#: classes/feeds.php:1708
-msgid "Special"
-msgstr "Spécial"
-
-#: classes/feeds.php:1965
-#, php-format
-msgid "Search results: %s"
-msgstr "Résultats de recherche : %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)"
-
-#: 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/note/init.php:28
-#: plugins/note/note.js:11
-msgid "Edit article note"
-msgstr "Modifier l'annotation de l'article"
+#: plugins/af_zz_imgproxy/init.php:252
+#: plugins/af_redditimgur/init.php:79
+msgid "Configuration saved"
+msgstr "La configuration a été enregistrée"
 
 #: plugins/vf_shared/init.php:17
 #: plugins/vf_shared/init.php:73
 msgid "Shared articles"
 msgstr "Articles partagés"
 
-#: plugins/auth_internal/init.php:67
-msgid "Please enter your one time password:"
-msgstr "Veuillez saisir votre mot de passe à usage unique :"
+#: plugins/bookmarklets/init.php:20
+msgid "Bookmarklets"
+msgstr "Bookmarklets"
 
-#: plugins/auth_internal/init.php:208
-msgid "Password has been changed."
-msgstr "Le mot de passe a été modifié."
+#: 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 "Glissez le lien ci-dessous dans la barre d'outil de votre navigateur, ouvrez le flux qui vous intéresse et cliquez sur le lien pour vous abonner à ce flux."
 
-#: plugins/auth_internal/init.php:210
-msgid "Old password is incorrect."
-msgstr "L'ancien mot de passe n'est pas correct."
+#: plugins/bookmarklets/init.php:26
+#, php-format
+msgid "Subscribe to %s in Tiny Tiny RSS?"
+msgstr "S'abonner à %s dans Tiny Tiny RSS ?"
 
-#: plugins/af_readability/init.php:25
-#, fuzzy
-msgid "Data saved."
-msgstr "Donnée enregistrée (%s, %d)"
+#: plugins/bookmarklets/init.php:31
+msgid "Subscribe in Tiny Tiny RSS"
+msgstr "S'abonner dans Tiny Tiny RSS"
 
-#: plugins/af_readability/init.php:41
-msgid "Inline content"
-msgstr "Contenu intégré"
-
-#: plugins/af_readability/init.php:47
-#, fuzzy
-msgid "Readability settings (af_readability)"
-msgstr "Réglages af_readability"
-
-#: plugins/af_readability/init.php:78
-msgid "Use Readability for pages shared via bookmarklet."
-msgstr ""
-
-#: plugins/af_readability/init.php:90
-#: plugins/af_psql_trgm/init.php:198
-msgid "Currently enabled for (click to edit):"
-msgstr "Actuellement activé pour (cliquer pour modifier):"
-
-#: plugins/af_readability/init.php:107
-msgid "Readability"
-msgstr "Readability"
-
-#: plugins/af_readability/init.php:118
-msgid "Inline article content"
-msgstr "Simplifier le contenu de l'article"
+#: plugins/bookmarklets/init.php:34
+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_redditimgur/init.php:30
 msgid "Reddit content settings (af_redditimgur)"
@@ -2495,10 +2463,21 @@ msgstr "Extraire le contenu manquant avec Readability"
 msgid "Enable additional duplicate checking"
 msgstr ""
 
-#: plugins/af_redditimgur/init.php:79
-#: plugins/af_zz_imgproxy/init.php:252
-msgid "Configuration saved"
-msgstr "La configuration a été enregistrée"
+#: plugins/af_comics/init.php:49
+msgid "Feeds supported by af_comics"
+msgstr "Flux supportés par af_comics"
+
+#: plugins/af_comics/init.php:51
+msgid "The following comics are currently supported:"
+msgstr "Les comics suivants sont actuellement supportés :"
+
+#: plugins/af_comics/init.php:69
+msgid "To subscribe to GoComics use the comic's regular web page as the feed URL (e.g. for the <em>Garfield</em> comic use <code>http://www.gocomics.com/garfield</code>)."
+msgstr ""
+
+#: plugins/af_comics/init.php:71
+msgid "Drop any updated filters into <code>filters.local</code> in plugin directory."
+msgstr ""
 
 #: plugins/af_psql_trgm/init.php:29
 #, php-format
@@ -2534,25 +2513,85 @@ msgstr "Longueur minimale du titre:"
 msgid "Enable for all feeds:"
 msgstr "Activer pour tous les flux:"
 
+#: plugins/af_psql_trgm/init.php:198
+#: plugins/af_readability/init.php:90
+msgid "Currently enabled for (click to edit):"
+msgstr "Actuellement activé pour (cliquer pour modifier):"
+
 #: plugins/af_psql_trgm/init.php:216
 msgid "Similarity (pg_trgm)"
 msgstr "Similarité (pg_trgm)"
 
-#: plugins/af_comics/init.php:49
-msgid "Feeds supported by af_comics"
-msgstr "Flux supportés par af_comics"
+#: plugins/af_readability/init.php:25
+#, fuzzy
+msgid "Data saved."
+msgstr "Donnée enregistrée (%s, %d)"
 
-#: plugins/af_comics/init.php:51
-msgid "The following comics are currently supported:"
-msgstr "Les comics suivants sont actuellement supportés :"
+#: plugins/af_readability/init.php:41
+msgid "Inline content"
+msgstr "Contenu intégré"
 
-#: plugins/af_comics/init.php:69
-msgid "To subscribe to GoComics use the comic's regular web page as the feed URL (e.g. for the <em>Garfield</em> comic use <code>http://www.gocomics.com/garfield</code>)."
+#: plugins/af_readability/init.php:47
+#, fuzzy
+msgid "Readability settings (af_readability)"
+msgstr "Réglages af_readability"
+
+#: plugins/af_readability/init.php:78
+msgid "Use Readability for pages shared via bookmarklet."
 msgstr ""
 
-#: plugins/af_comics/init.php:71
-msgid "Drop any updated filters into <code>filters.local</code> in plugin directory."
-msgstr ""
+#: plugins/af_readability/init.php:107
+msgid "Readability"
+msgstr "Readability"
+
+#: plugins/af_readability/init.php:118
+msgid "Inline article content"
+msgstr "Simplifier le contenu de l'article"
+
+#: plugins/mailto/init.php:50
+#: plugins/mailto/init.php:58
+#: plugins/mail/init.php:118
+#: plugins/mail/init.php:124
+msgid "[Forwarded]"
+msgstr "[Transféré]"
+
+#: plugins/mailto/init.php:50
+#: plugins/mail/init.php:118
+msgid "Multiple articles"
+msgstr "Articles multiples"
+
+#: plugins/mailto/init.php:74
+msgid "Clicking the following link to invoke your mail client:"
+msgstr "Cliquez sur le lien suivant pour ouvrir votre client de messagerie :"
+
+#: plugins/mailto/init.php:78
+msgid "Forward selected article(s) by email."
+msgstr "Transférer le ou les article(s) par mail."
+
+#: plugins/mailto/init.php:81
+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/mailto/init.php:86
+msgid "Close this dialog"
+msgstr "Fermer ce dialogue"
+
+#: 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/import_export/init.php:53
 msgid "Import and export"
@@ -2620,101 +2659,6 @@ msgstr "Échec de l'envoi, code d'erreur %d"
 msgid "No file uploaded."
 msgstr "Aucun fichier envoyé."
 
-#: plugins/mail/init.php:29
-msgid "Mail addresses saved."
-msgstr "Adresses de courriel enregistrées."
-
-#: plugins/mail/init.php:35
-msgid "Mail plugin"
-msgstr "Plugin de courriel"
-
-#: plugins/mail/init.php:37
-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:118
-#: plugins/mail/init.php:124
-#: plugins/mailto/init.php:50
-#: plugins/mailto/init.php:58
-msgid "[Forwarded]"
-msgstr "[Transféré]"
-
-#: plugins/mail/init.php:118
-#: plugins/mailto/init.php:50
-msgid "Multiple articles"
-msgstr "Articles multiples"
-
-#: plugins/mail/init.php:146
-msgid "To:"
-msgstr "À :"
-
-#: plugins/mail/init.php:161
-msgid "Subject:"
-msgstr "Sujet :"
-
-#: plugins/mail/init.php:178
-msgid "Send e-mail"
-msgstr "Envoyer le mail"
-
-#: plugins/close_button/init.php:25
-msgid "Close article"
-msgstr "Fermer l'article"
-
-#: plugins/bookmarklets/init.php:20
-msgid "Bookmarklets"
-msgstr "Bookmarklets"
-
-#: plugins/bookmarklets/init.php:22
-msgid "Drag the link below to your browser toolbar, open the feed you're interested in in your browser and click on the link to subscribe to it."
-msgstr "Glissez le lien ci-dessous dans la barre d'outil de votre navigateur, ouvrez le flux qui vous intéresse et cliquez sur le lien pour vous abonner à ce flux."
-
-#: plugins/bookmarklets/init.php:26
-#, php-format
-msgid "Subscribe to %s in Tiny Tiny RSS?"
-msgstr "S'abonner à %s dans Tiny Tiny RSS ?"
-
-#: plugins/bookmarklets/init.php:31
-msgid "Subscribe in Tiny Tiny RSS"
-msgstr "S'abonner dans Tiny Tiny RSS"
-
-#: plugins/bookmarklets/init.php:34
-msgid "Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS"
-msgstr "Utilisez ce bookmarklet pour publier des pages avec Tiny Tiny RSS"
-
-#: plugins/toggle_sidebar/init.php:23
-msgid "Collapse feedlist"
-msgstr "Contracter la liste des flux"
-
-#: plugins/af_zz_imgproxy/init.php:208
-msgid "Image proxy settings (af_zz_imgproxy)"
-msgstr ""
-
-#: plugins/af_zz_imgproxy/init.php:232
-#, fuzzy
-msgid "Enable proxy for all remote images."
-msgstr "Activer pour tous les flux:"
-
-#: plugins/af_zz_imgproxy/init.php:236
-#, fuzzy
-msgid "Don't cache files locally."
-msgstr "Enregistrer localement les images"
-
-#: plugins/mailto/init.php:74
-msgid "Clicking the following link to invoke your mail client:"
-msgstr "Cliquez sur le lien suivant pour ouvrir votre client de messagerie :"
-
-#: plugins/mailto/init.php:78
-msgid "Forward selected article(s) by email."
-msgstr "Transférer le ou les article(s) par mail."
-
-#: plugins/mailto/init.php:81
-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/mailto/init.php:86
-msgid "Close this dialog"
-msgstr "Fermer ce dialogue"
-
 #: plugins/share/init.php:41
 msgid "You can disable all articles shared by unique URLs here."
 msgstr "Vous pouvez désactiver tous les articles partagés par URL unique ici."
@@ -2735,450 +2679,599 @@ msgstr "Vous pouvez partager cet article avec l'URL unique suivante :"
 msgid "Unshare article"
 msgstr "Annuler le partage de l'article"
 
-#: js/FeedTree.js:75
+#: plugins/toggle_sidebar/init.php:23
+msgid "Collapse feedlist"
+msgstr "Contracter la liste des flux"
+
+#: plugins/close_button/init.php:25
+msgid "Close article"
+msgstr "Fermer l'article"
+
+#: plugins/mail/init.php:29
+msgid "Mail addresses saved."
+msgstr "Adresses de courriel enregistrées."
+
+#: plugins/mail/init.php:35
+msgid "Mail plugin"
+msgstr "Plugin de courriel"
+
+#: plugins/mail/init.php:37
+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:146
+msgid "To:"
+msgstr "À :"
+
+#: plugins/mail/init.php:161
+msgid "Subject:"
+msgstr "Sujet :"
+
+#: plugins/mail/init.php:178
+msgid "Send e-mail"
+msgstr "Envoyer le mail"
+
+#: plugins/note/init.php:28
+#: plugins/note/note.js:11
+msgid "Edit article note"
+msgstr "Modifier l'annotation de l'article"
+
+#: plugins/auth_internal/init.php:67
+msgid "Please enter your one time password:"
+msgstr "Veuillez saisir votre mot de passe à usage unique :"
+
+#: plugins/auth_internal/init.php:208
+msgid "Password has been changed."
+msgstr "Le mot de passe a été modifié."
+
+#: plugins/auth_internal/init.php:210
+msgid "Old password is incorrect."
+msgstr "L'ancien mot de passe n'est pas correct."
+
+#: js/FeedTree.js:76
 #, fuzzy
 msgid "(Un)collapse"
 msgstr "Ouvrir/fermer la barre latérale"
 
-#: js/PrefFeedTree.js:35
+#: js/PrefFeedTree.js:36
 msgid "Edit category"
 msgstr "Modifier la catégorie"
 
-#: js/PrefFeedTree.js:42
+#: js/PrefFeedTree.js:43
 msgid "Remove category"
 msgstr "Supprimer la catégorie"
 
-#: js/PrefFilterTree.js:46
+#: js/PrefFilterTree.js:47
 msgid "Inverse"
 msgstr "Inverser"
 
-#: js/feedlist.js:511
+#: js/feedlist.js:461
 #, 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:514
+#: js/feedlist.js:464
 #, 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:517
+#: js/feedlist.js:467
 #, 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:520
+#: js/feedlist.js:470
 #, fuzzy
 msgid "Mark %w in %s as read?"
 msgstr "Marquer tous les articles de %s comme lus ?"
 
-#: js/feedlist.js:523
+#: js/feedlist.js:473
 #, fuzzy
 msgid "search results"
 msgstr "Résultats de recherche : %s"
 
-#: js/feedlist.js:523
+#: js/feedlist.js:473
 #, fuzzy
 msgid "all articles"
 msgstr "Tous les articles"
 
-#: js/functions.js:74
+#: js/functions.js:100
 msgid "Close"
 msgstr "Fermer"
 
-#: js/functions.js:141
+#: js/functions.js:167
 msgid "Click to close"
 msgstr "Cliquez pour fermer"
 
-#: js/functions.js:448
+#: js/functions.js:456
 msgid "Error explained"
 msgstr "Erreur expliquée"
 
-#: js/functions.js:592
+#: js/functions.js:490
+msgid "Upload complete."
+msgstr "Envoi terminé."
+
+#: js/functions.js:508
+msgid "Remove stored feed icon?"
+msgstr "Supprimer l'icône de flux stockée ?"
+
+#: js/functions.js:510
+msgid "Removing feed icon..."
+msgstr "Suppression de l'icône du flux..."
+
+#: js/functions.js:515
+msgid "Feed icon removed."
+msgstr "Icône du flux supprimée."
+
+#: js/functions.js:532
+msgid "Please select an image file to upload."
+msgstr "Veuillez sélectionner une image à envoyer."
+
+#: js/functions.js:533
+msgid "Upload new icon for this feed?"
+msgstr "Envoyer une nouvelle icône pour ce flux ?"
+
+#: js/functions.js:534
+msgid "Uploading, please wait..."
+msgstr "Envoi en cours, veuillez patienter..."
+
+#: js/functions.js:542
+msgid "Please enter label caption:"
+msgstr "Veuillez saisir le libellé de l'étiquette :"
+
+#: js/functions.js:575
 msgid "Subscribe to Feed"
 msgstr "S'abonner au flux"
 
-#: js/functions.js:621
+#: js/functions.js:602
 msgid "Failed to parse output. This can indicate server timeout and/or network issues. Backend output was logged to browser console."
 msgstr "Erreur lors de la lecture de la réponse. Cela peut être dû à une expiration de la requête au serveur et/ou à des problèmes du réseau. La réponse du serveur a été tracé dans la console du navigateur."
 
-#: js/functions.js:636
+#: js/functions.js:617
 #, perl-format
 msgid "Subscribed to %s"
 msgstr "Abonné à %s"
 
-#: js/functions.js:641
+#: js/functions.js:622
 msgid "Specified URL seems to be invalid."
 msgstr "L'URL spécifiée semble invalide."
 
-#: js/functions.js:644
+#: js/functions.js:625
 msgid "Specified URL doesn't seem to contain any feeds."
 msgstr "L'URL spécifiée ne semble pas contenir de flux."
 
-#: js/functions.js:656
+#: js/functions.js:637
 msgid "Expand to select feed"
 msgstr "Développer jusqu'au flux sélectionné"
 
-#: js/functions.js:668
+#: js/functions.js:649
 #, perl-format
 msgid "Couldn't download the specified URL: %s"
 msgstr "L'URL spécifiée n'a pas pu être téléchargée : %s"
 
-#: js/functions.js:672
+#: js/functions.js:653
 #, perl-format
 msgid "XML validation failed: %s"
 msgstr "Erreur de validation XML: %s"
 
-#: js/functions.js:676
+#: js/functions.js:657
 msgid "You are already subscribed to this feed."
 msgstr "Vous êtes déjà abonné à ce flux."
 
-#: js/functions.js:1136
+#: js/functions.js:1098
 msgid "Generate new syndication address for this feed?"
 msgstr "Générer une nouvelle adresse d'abonnement pour ce flux ?"
 
-#: js/functions.js:1140
-#: js/prefs.js:1095
+#: js/functions.js:1100
+#: js/prefs.js:870
 msgid "Trying to change address..."
 msgstr "Changement de l'adresse..."
 
-#: js/functions.js:1245
-#: js/tt-rss.js:446
-#: js/tt-rss.js:673
+#: js/functions.js:1199
+#: js/tt-rss.js:399
+#: js/tt-rss.js:612
 msgid "You can't edit this kind of feed."
 msgstr "Vous ne pouvez pas modifier ce type de flux."
 
-#: js/functions.js:1260
+#: js/functions.js:1213
 msgid "Edit Feed"
 msgstr "Modifier le flux"
 
-#: js/functions.js:1266
-#: js/prefs.js:100
-#: js/prefs.js:209
-#: js/prefs.js:647
+#: js/functions.js:1217
+#: js/prefs.js:176
+#: js/prefs.js:523
+#: js/prefs.js:1139
+#: js/prefs.js:78
 msgid "Saving data..."
 msgstr "Enregistrement des données..."
 
-#: js/functions.js:1293
+#: js/functions.js:1243
 msgid "More Feeds"
 msgstr "D'autres flux"
 
-#: js/functions.js:1355
-#: js/functions.js:1464
-#: js/prefs.js:398
-#: js/prefs.js:540
-#: js/prefs.js:558
-#: js/prefs.js:1077
+#: js/functions.js:1297
+#: js/functions.js:1383
+#: js/prefs.js:332
+#: js/prefs.js:455
+#: js/prefs.js:473
+#: js/prefs.js:855
 msgid "No feeds are selected."
 msgstr "Aucun flux sélectionné."
 
-#: js/functions.js:1398
+#: js/functions.js:1329
 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:1435
+#: js/functions.js:1360
 msgid "Feeds with update errors"
 msgstr "Flux avec des erreurs de mise à jour"
 
-#: js/functions.js:1446
-#: js/prefs.js:1058
+#: js/functions.js:1369
+#: js/prefs.js:841
 msgid "Remove selected feeds?"
 msgstr "Supprimer les flux sélectionnés ?"
 
-#: js/functions.js:1449
-#: js/prefs.js:1061
+#: js/functions.js:1370
+#: js/prefs.js:842
 msgid "Removing selected feeds..."
 msgstr "Suppression des flux sélectionnés..."
 
-#: js/prefs.js:60
-msgid "Please enter login:"
-msgstr "Veuillez saisir l'identifiant :"
-
-#: js/prefs.js:67
-msgid "Can't create user: no login specified."
-msgstr "Impossible de créer l'utilisateur : aucun identifiant n'a été spécifié."
-
-#: js/prefs.js:71
-msgid "Adding user..."
-msgstr "Ajout de l'utilisateur..."
-
-#: js/prefs.js:96
-msgid "User Editor"
-msgstr "Éditeur d'utilisateur"
-
-#: js/prefs.js:131
-msgid "Edit Filter"
-msgstr "Modifier le filtre"
-
-#: js/prefs.js:170
+#: js/prefs.js:143
 msgid "Remove filter?"
 msgstr "Supprimer le filtre ?"
 
-#: js/prefs.js:175
+#: js/prefs.js:148
 msgid "Removing filter..."
 msgstr "Suppression du filtre..."
 
-#: js/prefs.js:292
+#: js/prefs.js:251
 msgid "Remove selected labels?"
 msgstr "Supprimer les étiquettes sélectionnées ?"
 
-#: js/prefs.js:295
+#: js/prefs.js:252
 msgid "Removing selected labels..."
 msgstr "Suppression des étiquettes sélectionnées..."
 
-#: js/prefs.js:308
-#: js/prefs.js:1144
+#: js/prefs.js:262
+#: js/prefs.js:909
 msgid "No labels are selected."
 msgstr "Aucune étiquette sélectionnée."
 
-#: js/prefs.js:320
+#: js/prefs.js:274
 msgid "Remove selected users? Neither default admin nor your account will be removed."
 msgstr "Supprimer les utilisateurs sélectionnés ? L'administrateur par défaut et votre compte utilisateur ne seront pas supprimés."
 
-#: js/prefs.js:323
+#: js/prefs.js:275
 msgid "Removing selected users..."
 msgstr "Suppression des utilisateurs sélectionnés..."
 
-#: js/prefs.js:338
-#: js/prefs.js:408
-#: js/prefs.js:427
-#: js/prefs.js:461
+#: js/prefs.js:286
+#: js/prefs.js:342
+#: js/prefs.js:361
+#: js/prefs.js:387
 msgid "No users are selected."
 msgstr "Aucun utilisateur sélectionné."
 
-#: js/prefs.js:350
+#: js/prefs.js:297
 msgid "Remove selected filters?"
 msgstr "Supprimer les filtres sélectionnés ?"
 
-#: js/prefs.js:353
+#: js/prefs.js:298
 msgid "Removing selected filters..."
 msgstr "Suppression des filtres sélectionnés..."
 
-#: js/prefs.js:366
-#: js/prefs.js:495
-#: js/prefs.js:514
+#: js/prefs.js:308
+#: js/prefs.js:419
+#: js/prefs.js:438
 msgid "No filters are selected."
 msgstr "Aucun filtre sélectionné."
 
-#: js/prefs.js:378
+#: js/prefs.js:319
 msgid "Unsubscribe from selected feeds?"
 msgstr "Se désabonner des flux sélectionnés ?"
 
-#: js/prefs.js:382
+#: js/prefs.js:321
 msgid "Unsubscribing from selected feeds..."
 msgstr "Désabonnement des flux sélectionnés..."
 
-#: js/prefs.js:413
-#: js/prefs.js:432
-#: js/prefs.js:466
+#: js/prefs.js:347
+#: js/prefs.js:366
+#: js/prefs.js:392
 msgid "Please select only one user."
 msgstr "Veuillez sélectionner un seul utilisateur."
 
-#: js/prefs.js:436
+#: js/prefs.js:370
 msgid "Reset password of selected user?"
 msgstr "Ré-initialiser le mot de passe de l'utilisateur sélectionné ?"
 
-#: js/prefs.js:439
+#: js/prefs.js:371
 msgid "Resetting password for selected user..."
 msgstr "Ré-initialisation du mot de passe de l'utilisateur sélectionné..."
 
-#: js/prefs.js:500
+#: js/prefs.js:424
 msgid "Please select only one filter."
 msgstr "Veuillez sélectionner un seul filtre."
 
-#: js/prefs.js:518
+#: js/prefs.js:442
 msgid "Combine selected filters?"
 msgstr "Combiner les filtres sélectionnés ?"
 
-#: js/prefs.js:521
+#: js/prefs.js:443
 msgid "Joining filters..."
 msgstr "Rapprochement des filtres..."
 
-#: js/prefs.js:580
+#: js/prefs.js:487
 msgid "Edit Multiple Feeds"
 msgstr "Modifier plusieurs flux"
 
-#: js/prefs.js:604
+#: js/prefs.js:511
 msgid "Save changes to selected feeds?"
 msgstr "Enregistrer les modifications aux flux sélectionnés ?"
 
-#: js/prefs.js:681
+#: js/prefs.js:552
 msgid "OPML Import"
 msgstr "Import OPML"
 
-#: js/prefs.js:700
+#: js/prefs.js:571
 msgid "Please choose an OPML file first."
 msgstr "Veuillez d'abord sélectionner un fichier OPML."
 
-#: js/prefs.js:703
+#: js/prefs.js:574
 #: plugins/import_export/import_export.js:115
 msgid "Importing, please wait..."
 msgstr "Import en cours, veuillez patienter..."
 
-#: js/prefs.js:869
+#: js/prefs.js:737
 msgid "Reset to defaults?"
 msgstr "Revenir aux valeurs par défaut ?"
 
-#: js/prefs.js:1468
-msgid "Subscribing to feeds..."
-msgstr "Abonnement aux flux..."
+#: js/prefs.js:777
+#, perl-format
+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:1487
-msgid "Clear stored data for this plugin?"
-msgstr "Effacer les données pour ce plugin ?"
+#: js/prefs.js:778
+msgid "Removing category..."
+msgstr "Suppression de la catégorie..."
 
-#: js/prefs.js:1501
-msgid "Clear all messages in the error log?"
-msgstr "Vider le journal des erreurs ?"
+#: js/prefs.js:794
+msgid "Remove selected categories?"
+msgstr "Supprimer les catégories sélectionnées ?"
 
-#: js/tt-rss.js:118
+#: js/prefs.js:795
+msgid "Removing selected categories..."
+msgstr "Suppression des catégories sélectionnées..."
+
+#: js/prefs.js:805
+msgid "No categories are selected."
+msgstr "Aucune catégorie sélectionnée."
+
+#: js/prefs.js:812
+msgid "Category title:"
+msgstr "Titre de la catégorie :"
+
+#: js/prefs.js:815
+msgid "Creating category..."
+msgstr "Création de la catégorie..."
+
+#: js/prefs.js:832
+msgid "Feeds without recent updates"
+msgstr "Flux sans mise à jour récente"
+
+#: js/prefs.js:869
+msgid "Replace current OPML publishing address with a new one?"
+msgstr "Remplacer l'adresse de publication OPML actuelle par une nouvelle ?"
+
+#: js/prefs.js:898
+msgid "Reset selected labels to default colors?"
+msgstr "Ré-initialiser les couleurs des étiquettes aux couleurs par défaut ?"
+
+#: js/prefs.js:926
+msgid "Settings Profiles"
+msgstr "Paramètres des profils"
+
+#: js/prefs.js:935
+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:936
+msgid "Removing selected profiles..."
+msgstr "Suppression des profils sélectionnés..."
+
+#: js/prefs.js:948
+msgid "No profiles are selected."
+msgstr "Aucun profil sélectionné."
+
+#: js/prefs.js:955
+#: js/prefs.js:997
+msgid "Activate selected profile?"
+msgstr "Activer le profil sélectionné ?"
+
+#: js/prefs.js:964
+#: js/prefs.js:1008
+msgid "Please choose a profile to activate."
+msgstr "Veuillez sélectionner un profil à activer."
+
+#: js/prefs.js:969
+msgid "Creating profile..."
+msgstr "Création d'un profil..."
+
+#: js/prefs.js:1016
+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:1017
+#: plugins/share/share_prefs.js:3
+msgid "Clearing URLs..."
+msgstr "Nettoyage des URL..."
+
+#: js/prefs.js:1020
+msgid "Generated URLs cleared."
+msgstr "URL générées supprimées."
+
+#: js/prefs.js:1053
+#, fuzzy
+msgid "Rename category to:"
+msgstr "Supprimer la catégorie"
+
+#: js/prefs.js:1074
+msgid "Label Editor"
+msgstr "Éditeur d'étiquette"
+
+#: js/tt-rss.js:111
 msgid "Mark all articles as read?"
 msgstr "Marquer tous les articles comme lus ?"
 
-#: js/tt-rss.js:124
+#: js/tt-rss.js:115
 msgid "Marking all feeds as read..."
 msgstr "Marquage de tous les flux comme lus..."
 
-#: js/tt-rss.js:398
+#: js/tt-rss.js:351
 msgid "Please enable mail plugin first."
 msgstr "Veuillez d'abord activer le plugin mail."
 
-#: js/tt-rss.js:527
+#: js/tt-rss.js:477
 msgid "Please enable embed_original plugin first."
 msgstr "Veuillez d'abord activer le plugin embed_original."
 
-#: js/tt-rss.js:540
-#: js/tt-rss.js:723
+#: js/tt-rss.js:490
+#: js/tt-rss.js:653
 msgid "Widescreen is not available in combined mode."
 msgstr "L'écran large n'est pas disponible en mode combiné."
 
-#: js/tt-rss.js:821
-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:826
-#: js/tt-rss.js:686
-msgid "Please select some feed first."
-msgstr "Veuillez d'abord sélectionner un flux."
-
-#: js/tt-rss.js:831
-#, perl-format
-msgid "Rescore articles in %s?"
-msgstr "Recalculer le score des articles de %s ?"
-
-#: js/tt-rss.js:834
-msgid "Rescoring articles..."
-msgstr "Recalcul des scores des articles..."
-
-#: js/viewfeed.js:917
-#: js/viewfeed.js:955
-#: js/viewfeed.js:1003
-#: js/viewfeed.js:1924
-#: plugins/mail/mail.js:7
+#: js/viewfeed.js:444
+#: js/viewfeed.js:461
+#: js/viewfeed.js:484
+#: js/viewfeed.js:521
+#: js/viewfeed.js:542
+#: js/viewfeed.js:651
+#: js/viewfeed.js:685
+#: js/viewfeed.js:727
+#: js/viewfeed.js:1564
 #: plugins/mailto/init.js:7
-#: js/viewfeed.js:675
-#: js/viewfeed.js:697
-#: js/viewfeed.js:718
-#: js/viewfeed.js:777
-#: js/viewfeed.js:805
+#: plugins/mail/mail.js:7
 msgid "No articles are selected."
 msgstr "Aucun article sélectionné."
 
-#: js/viewfeed.js:925
+#: js/viewfeed.js:659
 #, 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:927
+#: js/viewfeed.js:661
 #, 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:964
+#: js/viewfeed.js:694
 #, 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:967
+#: js/viewfeed.js:697
 #, 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:969
+#: js/viewfeed.js:698
 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:1009
+#: js/viewfeed.js:733
 #, 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:1029
+#: js/viewfeed.js:753
 msgid "Edit article Tags"
 msgstr "Modifier les tags de l'article"
 
-#: js/viewfeed.js:1035
+#: js/viewfeed.js:757
 msgid "Saving article tags..."
 msgstr "Sauvegarde des tags de l'article..."
 
-#: js/viewfeed.js:1666
+#: js/viewfeed.js:1015
+msgid "No article is selected."
+msgstr "Aucun article sélectionné."
+
+#: js/viewfeed.js:1050
+msgid "No articles found to mark"
+msgstr "Aucun article à marquer"
+
+#: js/viewfeed.js:1052
+#, perl-format
+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 ?"
+
+#: js/viewfeed.js:1312
 msgid "Open original article"
 msgstr "Ouvrir l'article original"
 
-#: js/viewfeed.js:1673
+#: js/viewfeed.js:1319
 msgid "Display article URL"
 msgstr "Afficher l'URL"
 
-#: js/viewfeed.js:1780
+#: js/viewfeed.js:1426
 msgid "Assign label"
 msgstr "Assigner l'étiquette"
 
-#: js/viewfeed.js:1785
+#: js/viewfeed.js:1431
 msgid "Remove label"
 msgstr "Supprimer l'étiquette"
 
-#: js/viewfeed.js:1817
+#: js/viewfeed.js:1463
 msgid "Select articles in group"
 msgstr "Sélectionner les articles du groupe"
 
-#: js/viewfeed.js:1827
+#: js/viewfeed.js:1473
 msgid "Mark group as read"
 msgstr "Marquer le groupe comme lu"
 
-#: js/viewfeed.js:1839
+#: js/viewfeed.js:1485
 msgid "Mark feed as read"
 msgstr "Marquer le flux comme lu"
 
-#: js/viewfeed.js:1892
+#: js/viewfeed.js:1538
 msgid "Please enter new score for selected articles:"
 msgstr "Nouveau score des articles sélectionnés :"
 
-#: js/viewfeed.js:1955
+#: js/viewfeed.js:1571
 msgid "Please enter new score for this article:"
 msgstr "Nouveau score pour cet article :"
 
-#: js/viewfeed.js:1986
+#: js/viewfeed.js:1591
 msgid "Article URL:"
 msgstr "URL de l'article :"
 
-#: plugins/note/note.js:17
-msgid "Saving article note..."
-msgstr "Sauvegarde de l'annotation de l'article..."
+#: 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/af_psql_trgm/init.js:11
 msgid "Related articles"
 msgstr "Articles liés"
 
+#: plugins/mailto/init.js:21
+#: plugins/mail/mail.js:21
+msgid "Forward article by email"
+msgstr "Transférer l'article par email"
+
+#: plugins/shorten_expanded/init.js:43
+msgid "Click to expand article"
+msgstr "Cliquer pour développer l'article"
+
 #: plugins/import_export/import_export.js:13
 msgid "Export Data"
 msgstr "Exporter les données"
@@ -3198,257 +3291,168 @@ 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
-msgid "Forward article by email"
-msgstr "Transférer l'article par email"
+#: plugins/share/share_prefs.js:2
+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/mail/mail.js:36
-msgid "Error sending email:"
-msgstr "Erreur à l'envoi du courriel:"
-
-#: plugins/mail/mail.js:38
-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:45
-msgid "Click to expand article"
-msgstr "Cliquer pour développer l'article"
+#: plugins/share/share_prefs.js:8
+msgid "Shared URLs cleared."
+msgstr "URL partagées supprimées."
 
 #: plugins/share/share.js:10
 msgid "Share article by URL"
 msgstr "Partager l'article par URL"
 
-#: plugins/share/share.js:14
+#: plugins/share/share.js:13
 msgid "Generate new share URL for this article?"
 msgstr "Générer une nouvelle adresse de partage pour cet article ?"
 
-#: plugins/share/share.js:18
+#: plugins/share/share.js:15
 msgid "Trying to change URL..."
 msgstr "Tentative de changement de l'adresse..."
 
-#: plugins/share/share.js:55
+#: plugins/share/share.js:48
 msgid "Remove sharing for this article?"
 msgstr "Annuler le partage de cet article ?"
 
-#: plugins/share/share.js:59
+#: plugins/share/share.js:50
 msgid "Trying to unshare..."
 msgstr "Tentative d'annulation de partage ..."
 
-#: plugins/share/share_prefs.js:3
-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/mail/mail.js:30
+msgid "Error sending email:"
+msgstr "Erreur à l'envoi du courriel:"
 
-#: plugins/share/share_prefs.js:6
-#: js/prefs.js:1277
-msgid "Clearing URLs..."
-msgstr "Nettoyage des URL..."
+#: plugins/mail/mail.js:32
+msgid "Your message has been sent."
+msgstr "Votre message a été envoyé."
 
-#: plugins/share/share_prefs.js:13
-msgid "Shared URLs cleared."
-msgstr "URL partagées supprimées."
+#: plugins/note/note.js:15
+msgid "Saving article note..."
+msgstr "Sauvegarde de l'annotation de l'article..."
 
-#: js/feedlist.js:204
+#: js/feedlist.js:168
 #, fuzzy
 msgid "Your password is at default value"
 msgstr "Votre mot de passe est celui par défaut, veuillez le modifier."
 
-#: js/feedlist.js:453
+#: js/feedlist.js:413
 msgid "Mark all articles in %s as read?"
 msgstr "Marquer tous les articles de %s comme lus ?"
 
-#: js/functions.js:494
-msgid "Upload complete."
-msgstr "Envoi terminé."
-
-#: js/functions.js:511
-msgid "Remove stored feed icon?"
-msgstr "Supprimer l'icône de flux stockée ?"
-
-#: js/functions.js:516
-msgid "Removing feed icon..."
-msgstr "Suppression de l'icône du flux..."
-
-#: js/functions.js:521
-msgid "Feed icon removed."
-msgstr "Icône du flux supprimée."
-
-#: js/functions.js:537
-msgid "Please select an image file to upload."
-msgstr "Veuillez sélectionner une image à envoyer."
-
-#: js/functions.js:539
-msgid "Upload new icon for this feed?"
-msgstr "Envoyer une nouvelle icône pour ce flux ?"
-
-#: js/functions.js:540
-msgid "Uploading, please wait..."
-msgstr "Envoi en cours, veuillez patienter..."
-
-#: js/functions.js:550
-msgid "Please enter label caption:"
-msgstr "Veuillez saisir le libellé de l'étiquette :"
-
-#: js/functions.js:555
-msgid "Can't create label: missing caption."
-msgstr "Impossible de créer une étiquette : libellé manquant."
-
-#: js/functions.js:797
+#: js/functions.js:764
 msgid "Edit rule"
 msgstr "Modifier la règle"
 
-#: js/functions.js:819
+#: js/functions.js:786
 msgid "Edit action"
 msgstr "Modifier l'action"
 
-#: js/functions.js:860
+#: js/functions.js:825
 msgid "Looking for articles (%d processed, %f found)..."
 msgstr "Recherche d'articles (%d traités, %f trouvés)..."
 
-#: js/functions.js:890
+#: js/functions.js:855
 msgid "Found %d articles matching this filter:"
 msgstr "%d articles correspondent à ce filtre :"
 
-#: js/functions.js:942
+#: js/functions.js:907
 msgid "Create Filter"
 msgstr "Créer un filtre"
 
-#: js/functions.js:1060
-#: js/tt-rss.js:692
+#: js/functions.js:1016
+#: js/tt-rss.js:631
 msgid "Unsubscribe from %s?"
 msgstr "Se désabonner de %s ?"
 
-#: js/functions.js:1063
+#: js/functions.js:1019
 msgid "Removing feed..."
 msgstr "Suppression du flux..."
 
-#: js/functions.js:1489
+#: js/functions.js:1410
 msgid "Help"
 msgstr "Aide"
 
-#: js/prefs.js:973
-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:44
+msgid "Please enter login:"
+msgstr "Veuillez saisir l'identifiant :"
 
-#: js/prefs.js:979
-msgid "Removing category..."
-msgstr "Suppression de la catégorie..."
+#: js/prefs.js:51
+msgid "Can't create user: no login specified."
+msgstr "Impossible de créer l'utilisateur : aucun identifiant n'a été spécifié."
 
-#: js/prefs.js:997
-msgid "Remove selected categories?"
-msgstr "Supprimer les catégories sélectionnées ?"
+#: js/prefs.js:55
+msgid "Adding user..."
+msgstr "Ajout de l'utilisateur..."
 
-#: js/prefs.js:1000
-msgid "Removing selected categories..."
-msgstr "Suppression des catégories sélectionnées..."
+#: js/prefs.js:74
+msgid "User Editor"
+msgstr "Éditeur d'utilisateur"
 
-#: js/prefs.js:1013
-msgid "No categories are selected."
-msgstr "Aucune catégorie sélectionnée."
+#: js/prefs.js:104
+msgid "Edit Filter"
+msgstr "Modifier le filtre"
 
-#: js/prefs.js:1020
-msgid "Category title:"
-msgstr "Titre de la catégorie :"
+#: js/prefs.js:1175
+msgid "Subscribing to feeds..."
+msgstr "Abonnement aux flux..."
 
-#: js/prefs.js:1024
-msgid "Creating category..."
-msgstr "Création de la catégorie..."
+#: js/prefs.js:1191
+msgid "Clear stored data for this plugin?"
+msgstr "Effacer les données pour ce plugin ?"
 
-#: js/prefs.js:1047
-msgid "Feeds without recent updates"
-msgstr "Flux sans mise à jour récente"
+#: js/prefs.js:1203
+msgid "Clear all messages in the error log?"
+msgstr "Vider le journal des erreurs ?"
 
-#: js/prefs.js:1091
-msgid "Replace current OPML publishing address with a new one?"
-msgstr "Remplacer l'adresse de publication OPML actuelle par une nouvelle ?"
-
-#: js/prefs.js:1129
-msgid "Reset selected labels to default colors?"
-msgstr "Ré-initialiser les couleurs des étiquettes aux couleurs par défaut ?"
-
-#: js/prefs.js:1161
-msgid "Settings Profiles"
-msgstr "Paramètres des profils"
-
-#: js/prefs.js:1170
-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:1173
-msgid "Removing selected profiles..."
-msgstr "Suppression des profils sélectionnés..."
-
-#: js/prefs.js:1189
-msgid "No profiles are selected."
-msgstr "Aucun profil sélectionné."
-
-#: js/prefs.js:1197
-#: js/prefs.js:1250
-msgid "Activate selected profile?"
-msgstr "Activer le profil sélectionné ?"
-
-#: js/prefs.js:1214
-#: js/prefs.js:1266
-msgid "Please choose a profile to activate."
-msgstr "Veuillez sélectionner un profil à activer."
-
-#: js/prefs.js:1219
-msgid "Creating profile..."
-msgstr "Création d'un profil..."
-
-#: js/prefs.js:1274
-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:1284
-msgid "Generated URLs cleared."
-msgstr "URL générées supprimées."
-
-#: js/prefs.js:1356
-msgid "Label Editor"
-msgstr "Éditeur d'étiquette"
-
-#: js/tt-rss.js:681
+#: js/tt-rss.js:620
 msgid "You can't unsubscribe from the category."
 msgstr "Vous ne pouvez pas vous désabonner de la catégorie."
 
-#: js/viewfeed.js:127
-#: js/viewfeed.js:177
-#: js/viewfeed.js:194
+#: js/tt-rss.js:625
+msgid "Please select some feed first."
+msgstr "Veuillez d'abord sélectionner un flux."
+
+#: js/viewfeed.js:89
+#: js/viewfeed.js:135
+#: js/viewfeed.js:152
 msgid "Click to open next unread feed."
 msgstr "Cliquez pour aller au prochain flux non lu"
 
-#: js/viewfeed.js:131
+#: js/viewfeed.js:93
 msgid "Cancel search"
 msgstr "Annuler la recherche"
 
-#: js/viewfeed.js:191
+#: js/viewfeed.js:149
 msgid "New articles found, reload feed to continue."
 msgstr "Nouveaux articles trouvés, rechargez le flux pour continuer."
 
-#: js/viewfeed.js:620
+#: js/viewfeed.js:405
 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:1284
-msgid "No article is selected."
-msgstr "Aucun article sélectionné."
+#~ msgid "Rescore feed"
+#~ msgstr "Recalculer le score du flux"
 
-#: js/viewfeed.js:1319
-msgid "No articles found to mark"
-msgstr "Aucun article à marquer"
+#~ msgid "Create label..."
+#~ msgstr "Créer une étiquette..."
 
-#: js/viewfeed.js:1321
-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 "Create filter..."
+#~ msgstr "Créer un filtre..."
+
+#~ msgid "You can't rescore this kind of feed."
+#~ msgstr "Vous ne pouvez pas recalculer le score de ce type de flux."
+
+#~ msgid "Rescore articles in %s?"
+#~ msgstr "Recalculer le score des articles de %s ?"
+
+#~ msgid "Rescoring articles..."
+#~ msgstr "Recalcul des scores des articles..."
+
+#~ msgid "Can't create label: missing caption."
+#~ msgstr "Impossible de créer une étiquette : libellé manquant."
 
 #~ 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>"
diff --git a/locale/hu_HU/LC_MESSAGES/messages.mo b/locale/hu_HU/LC_MESSAGES/messages.mo
index da5695209..cb8ccc006 100644
Binary files a/locale/hu_HU/LC_MESSAGES/messages.mo and b/locale/hu_HU/LC_MESSAGES/messages.mo differ
diff --git a/locale/hu_HU/LC_MESSAGES/messages.po b/locale/hu_HU/LC_MESSAGES/messages.po
index cc8e09450..413fdf238 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: 2018-10-10 08:24+0300\n"
+"POT-Creation-Date: 2018-12-01 12:59+0300\n"
 "PO-Revision-Date: 2013-05-15 01:19+0100\n"
 "Last-Translator: Faludi Zoltán <zoltan.faludi@gmail.com>\n"
 "Language-Team: HUNGARIAN\n"
@@ -95,8 +95,8 @@ msgid "Weekly"
 msgstr "Heti"
 
 #: backend.php:103
-#: classes/pref/users.php:47
 #: classes/pref/system.php:51
+#: classes/pref/users.php:47
 msgid "User"
 msgstr "Felhasználó"
 
@@ -168,33 +168,33 @@ msgstr "Felhasználó nem találhat"
 
 #: index.php:151
 #: index.php:167
-#: index.php:285
+#: index.php:282
 #: prefs.php:120
 #: classes/backend.php:5
 #: classes/pref/labels.php:294
-#: classes/pref/feeds.php:1230
 #: classes/pref/filters.php:822
-#: js/feedlist.js:148
-#: js/feedlist.js:491
-#: js/feedlist.js:539
-#: js/functions.js:314
-#: js/functions.js:1336
-#: js/prefs.js:562
-#: js/prefs.js:754
-#: js/prefs.js:1488
-#: js/prefs.js:1503
-#: js/tt-rss.js:547
-#: js/viewfeed.js:1180
+#: classes/pref/feeds.php:1229
+#: js/feedlist.js:118
+#: js/feedlist.js:446
+#: js/feedlist.js:487
+#: js/functions.js:328
+#: js/functions.js:551
+#: js/functions.js:1286
+#: js/prefs.js:477
+#: js/prefs.js:617
+#: js/prefs.js:956
+#: js/prefs.js:1000
+#: js/prefs.js:1028
+#: js/prefs.js:1037
+#: js/prefs.js:1045
+#: js/prefs.js:1057
+#: js/tt-rss.js:497
+#: js/viewfeed.js:509
+#: js/viewfeed.js:928
 #: plugins/import_export/import_export.js:17
-#: js/functions.js:565
-#: js/prefs.js:1200
-#: js/prefs.js:1253
-#: js/prefs.js:1292
-#: js/prefs.js:1305
-#: js/prefs.js:1316
-#: js/prefs.js:1331
-#: js/tt-rss.js:564
-#: js/viewfeed.js:760
+#: js/prefs.js:1192
+#: js/prefs.js:1205
+#: js/tt-rss.js:510
 msgid "Loading, please wait..."
 msgstr "Betöltés, kérem várjon..."
 
@@ -211,13 +211,13 @@ msgid "All Articles"
 msgstr "Minden hír"
 
 #: index.php:194
-#: include/functions.php:1227
+#: include/functions.php:1172
 #: classes/feeds.php:110
 msgid "Starred"
 msgstr "Csillagozott"
 
 #: index.php:195
-#: include/functions.php:1228
+#: include/functions.php:1173
 #: classes/feeds.php:111
 msgid "Published"
 msgstr "Publikált"
@@ -257,11 +257,11 @@ msgid "Title"
 msgstr "Cím"
 
 #: index.php:211
-#: index.php:251
-#: include/functions.php:1215
+#: index.php:250
+#: include/functions.php:1160
 #: classes/feeds.php:115
-#: js/FeedTree.js:41
-#: js/FeedTree.js:69
+#: js/FeedTree.js:42
+#: js/FeedTree.js:70
 msgid "Mark as read"
 msgstr "Megjelölés olvasottként"
 
@@ -298,7 +298,7 @@ msgid "Feed actions:"
 msgstr "Műveletek hírcsatornákkal:"
 
 #: index.php:246
-#: classes/handler/public.php:551
+#: classes/handler/public.php:575
 msgid "Subscribe to feed..."
 msgstr "Feliratkozás hírcsatornára..."
 
@@ -307,56 +307,44 @@ msgid "Edit this feed..."
 msgstr "Hírcsatorna szerkesztése..."
 
 #: index.php:248
-msgid "Rescore feed"
-msgstr "Hírcsatorna újrapontozása"
-
-#: index.php:249
-#: classes/pref/feeds.php:770
-#: classes/pref/feeds.php:1203
-#: js/PrefFeedTree.js:61
+#: classes/pref/feeds.php:769
+#: classes/pref/feeds.php:1202
+#: js/PrefFeedTree.js:62
 msgid "Unsubscribe"
 msgstr "Leiratkozás"
 
-#: index.php:250
+#: index.php:249
 msgid "All feeds:"
 msgstr "Az összes hírcsatorna:"
 
-#: index.php:252
+#: index.php:251
 msgid "(Un)hide read feeds"
 msgstr "Olvasottak rejtése/mutatása"
 
-#: index.php:253
+#: index.php:252
 msgid "Other actions:"
 msgstr "Egyéb műveletek:"
 
-#: index.php:254
-#: include/functions.php:1201
+#: index.php:253
+#: include/functions.php:1146
 msgid "Toggle widescreen mode"
 msgstr "Szélesvásznú mód váltása"
 
-#: index.php:255
-msgid "Create label..."
-msgstr "Új címke létrehozása..."
-
-#: index.php:256
-msgid "Create filter..."
-msgstr "Szűrő létrehozása..."
-
-#: index.php:257
+#: index.php:254
 msgid "Keyboard shortcuts help"
 msgstr "Billentyűparancsok súgója"
 
-#: index.php:266
+#: index.php:263
 msgid "Logout"
 msgstr "Kijelentkezés"
 
-#: index.php:272
+#: index.php:269
 msgid "Updates are available from Git."
 msgstr ""
 
 #: prefs.php:33
 #: prefs.php:138
-#: include/functions.php:1230
+#: include/functions.php:1175
 #: classes/pref/prefs.php:425
 msgid "Preferences"
 msgstr "Beállítások"
@@ -371,8 +359,8 @@ msgstr "Kilépés a beállításokból"
 
 #: prefs.php:141
 #: classes/pref/feeds.php:114
-#: classes/pref/feeds.php:1138
-#: classes/pref/feeds.php:1192
+#: classes/pref/feeds.php:1137
+#: classes/pref/feeds.php:1191
 msgid "Feeds"
 msgstr "Hírcsatornák"
 
@@ -382,8 +370,8 @@ msgid "Filters"
 msgstr "Szűrők"
 
 #: prefs.php:147
+#: classes/feeds.php:1696
 #: classes/pref/labels.php:94
-#: classes/feeds.php:1710
 msgid "Labels"
 msgstr "Címkék"
 
@@ -395,80 +383,80 @@ msgstr "Felhasználók"
 msgid "System"
 msgstr "Rendszer"
 
-#: register.php:186
+#: register.php:185
 #: include/login_form.php:162
 msgid "Create new account"
 msgstr "Új felhasználói fiók létrehozása"
 
-#: register.php:192
+#: register.php:191
 msgid "New user registrations are administratively disabled."
 msgstr "Új felhasználók regisztrációja adminisztrátor által letilva."
 
-#: register.php:196
-#: register.php:241
-#: register.php:254
-#: register.php:269
-#: register.php:288
-#: register.php:336
-#: register.php:346
-#: register.php:358
-#: classes/handler/public.php:623
-#: classes/handler/public.php:697
-#: classes/handler/public.php:798
-#: classes/handler/public.php:877
-#: classes/handler/public.php:891
-#: classes/handler/public.php:898
-#: classes/handler/public.php:923
+#: register.php:195
+#: register.php:240
+#: register.php:253
+#: register.php:268
+#: register.php:287
+#: register.php:334
+#: register.php:344
+#: register.php:356
+#: classes/handler/public.php:647
+#: classes/handler/public.php:721
+#: 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"
 
-#: register.php:217
+#: register.php:216
 msgid "Your temporary password will be sent to the specified email. Accounts, which were not logged in once, are erased automatically 24 hours after temporary password is sent."
 msgstr "Ideiglenes jelszavát elküdljük a megadott e-mail címre. Azok a felhasználói fiókok, amelyekbe az ideiglenes jelszó kipostázásától számított 24 órán belül nem lépnek be, automatikusan törlődnek."
 
-#: register.php:223
+#: register.php:222
 msgid "Desired login:"
 msgstr "Felhasználói név:"
 
-#: register.php:226
+#: register.php:225
 msgid "Check availability"
 msgstr "Ellenőrizze, hogy nem foglalt-e már:"
 
-#: register.php:228
-#: classes/handler/public.php:713
+#: register.php:227
+#: classes/handler/public.php:737
 msgid "Email:"
 msgstr "E-mail:"
 
-#: register.php:231
-#: classes/handler/public.php:718
+#: register.php:230
+#: classes/handler/public.php:742
 msgid "How much is two plus two:"
 msgstr "Mennyi kettő meg kettő?"
 
-#: register.php:234
+#: register.php:233
 msgid "Submit registration"
 msgstr "Regisztráció elküldése"
 
-#: register.php:252
+#: register.php:251
 msgid "Your registration information is incomplete."
 msgstr "Regisztrációs adatai hiányosak"
 
-#: register.php:267
+#: register.php:266
 msgid "Sorry, this username is already taken."
 msgstr "Ez a felhasználónév már foglalt."
 
-#: register.php:286
+#: register.php:285
 msgid "Registration failed."
 msgstr "Regisztráció sikertelen."
 
-#: register.php:333
+#: register.php:331
 msgid "Account created successfully."
 msgstr "Felhasználói fiók sikeresen létrehozva"
 
-#: register.php:355
+#: register.php:353
 msgid "New user registrations are currently closed."
 msgstr "Új felhasználók regisztrációja jelenleg nem engedélyezett."
 
-#: update.php:66
+#: update.php:67
 msgid "Tiny Tiny RSS data update script."
 msgstr "A Tiny Tiny RSS adatbázis frissítő szkript."
 
@@ -481,10 +469,10 @@ msgstr "Összes hírcsatorna"
 
 #: include/controls.php:138
 #: include/controls.php:230
-#: classes/opml.php:512
-#: classes/digest.php:120
+#: classes/digest.php:124
+#: classes/feeds.php:1708
 #: classes/pref/feeds.php:233
-#: classes/feeds.php:1722
+#: classes/opml.php:512
 msgid "Uncategorized"
 msgstr "Kategorizálatlan"
 
@@ -499,287 +487,287 @@ msgstr[1] "%d archivált hír"
 msgid "No feeds found."
 msgstr "Nem található hírcsatorna."
 
-#: include/functions.php:983
+#: include/functions.php:928
 #, php-format
 msgid "%d min"
 msgstr ""
 
-#: include/functions.php:1177
+#: include/functions.php:1122
 msgid "Navigation"
 msgstr "Navigáció"
 
-#: include/functions.php:1178
+#: include/functions.php:1123
 msgid "Open next feed"
 msgstr "Következő hírcsatorna megnyitása"
 
-#: include/functions.php:1179
+#: include/functions.php:1124
 msgid "Open previous feed"
 msgstr "Előző hírcsatorna megnyitása"
 
-#: include/functions.php:1180
+#: include/functions.php:1125
 msgid "Open next article"
 msgstr "Következő hír megnyitása"
 
-#: include/functions.php:1181
+#: include/functions.php:1126
 msgid "Open previous article"
 msgstr "Előző hír megjelenítése"
 
-#: include/functions.php:1182
+#: include/functions.php:1127
 msgid "Open next article (don't scroll long articles)"
 msgstr "Következő hír megnyitása (nem görgeti a hosszú híreket)"
 
-#: include/functions.php:1183
+#: include/functions.php:1128
 msgid "Open previous article (don't scroll long articles)"
 msgstr "Előző hír megnyitása (nem görgeti a hosszú híreket)"
 
-#: include/functions.php:1184
+#: include/functions.php:1129
 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/functions.php:1185
+#: include/functions.php:1130
 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/functions.php:1186
+#: include/functions.php:1131
 msgid "Show search dialog"
 msgstr "Keresőmező megjelenítése"
 
-#: include/functions.php:1187
+#: include/functions.php:1132
 msgid "Article"
 msgstr "Hír"
 
-#: include/functions.php:1188
-#: js/viewfeed.js:1695
+#: include/functions.php:1133
+#: js/viewfeed.js:1341
 msgid "Toggle starred"
 msgstr "Csillagoz"
 
-#: include/functions.php:1189
-#: js/viewfeed.js:1707
+#: include/functions.php:1134
+#: js/viewfeed.js:1353
 msgid "Toggle published"
 msgstr "Publikált"
 
-#: include/functions.php:1190
-#: js/viewfeed.js:1682
+#: include/functions.php:1135
+#: js/viewfeed.js:1328
 msgid "Toggle unread"
 msgstr "Olvasatlannak jelöl"
 
-#: include/functions.php:1191
+#: include/functions.php:1136
 msgid "Edit tags"
 msgstr "Címkék szerkesztése"
 
-#: include/functions.php:1192
+#: include/functions.php:1137
 msgid "Open in new window"
 msgstr "Megnyitás új ablakban"
 
-#: include/functions.php:1193
-#: js/viewfeed.js:1728
+#: include/functions.php:1138
+#: js/viewfeed.js:1374
 msgid "Mark below as read"
 msgstr "Olvasottnak jel ez alatt"
 
-#: include/functions.php:1194
-#: js/viewfeed.js:1721
+#: include/functions.php:1139
+#: js/viewfeed.js:1367
 msgid "Mark above as read"
 msgstr "Olvasottnak jel ez fölött"
 
-#: include/functions.php:1195
+#: include/functions.php:1140
 msgid "Scroll down"
 msgstr "Legördítés"
 
-#: include/functions.php:1196
+#: include/functions.php:1141
 msgid "Scroll up"
 msgstr "Felgördítés"
 
-#: include/functions.php:1197
+#: include/functions.php:1142
 msgid "Select article under cursor"
 msgstr "Az kurzor alatti hír kiválasztása"
 
-#: include/functions.php:1198
+#: include/functions.php:1143
 msgid "Email article"
 msgstr "Hír küldése emailben"
 
-#: include/functions.php:1199
+#: include/functions.php:1144
 msgid "Close/collapse article"
 msgstr "Hír bezárása"
 
-#: include/functions.php:1200
+#: include/functions.php:1145
 msgid "Toggle article expansion (combined mode)"
 msgstr "Hír kibontás váltása (kombinált módban)"
 
-#: include/functions.php:1202
+#: include/functions.php:1147
 #: plugins/embed_original/init.php:33
 msgid "Toggle embed original"
 msgstr "Eredeti megjelenítésének váltása"
 
-#: include/functions.php:1203
+#: include/functions.php:1148
 msgid "Article selection"
 msgstr "Hír kijelölés"
 
-#: include/functions.php:1204
+#: include/functions.php:1149
 msgid "Select all articles"
 msgstr "Minden hír kijelölése"
 
-#: include/functions.php:1205
+#: include/functions.php:1150
 msgid "Select unread"
 msgstr "Olvasatlan hírek kijelölése"
 
-#: include/functions.php:1206
+#: include/functions.php:1151
 msgid "Select starred"
 msgstr "Csillagozott hírek kijelölése"
 
-#: include/functions.php:1207
+#: include/functions.php:1152
 msgid "Select published"
 msgstr "Publikált hírek kijlölése"
 
-#: include/functions.php:1208
+#: include/functions.php:1153
 msgid "Invert selection"
 msgstr "Fordított kijelölés"
 
-#: include/functions.php:1209
+#: include/functions.php:1154
 msgid "Deselect everything"
 msgstr "Kijelölés eltávolítása"
 
-#: include/functions.php:1210
-#: classes/pref/feeds.php:522
-#: classes/pref/feeds.php:794
+#: include/functions.php:1155
+#: classes/pref/feeds.php:521
+#: classes/pref/feeds.php:793
 msgid "Feed"
 msgstr "Hírcsatorna"
 
-#: include/functions.php:1211
+#: include/functions.php:1156
 msgid "Refresh current feed"
 msgstr "Aktuális hírcsatorna frissítése"
 
-#: include/functions.php:1212
+#: include/functions.php:1157
 msgid "Un/hide read feeds"
 msgstr "Olvasott hírcsatornák rejtése/mutatása"
 
-#: include/functions.php:1213
-#: classes/pref/feeds.php:1195
+#: include/functions.php:1158
+#: classes/pref/feeds.php:1194
 msgid "Subscribe to feed"
 msgstr "Feliratkozás hírcsatornára"
 
-#: include/functions.php:1214
-#: js/FeedTree.js:48
-#: js/PrefFeedTree.js:55
-#: js/viewfeed.js:1846
+#: include/functions.php:1159
+#: js/FeedTree.js:49
+#: js/PrefFeedTree.js:56
+#: js/viewfeed.js:1492
 msgid "Edit feed"
 msgstr "Hírcsatorna szerkesztése"
 
-#: include/functions.php:1216
+#: include/functions.php:1161
 msgid "Reverse headlines"
 msgstr "Címek fordított sorrendben"
 
-#: include/functions.php:1217
+#: include/functions.php:1162
 msgid "Toggle headline grouping"
 msgstr ""
 
-#: include/functions.php:1218
+#: include/functions.php:1163
 msgid "Debug feed update"
 msgstr "Hírcsatorna frissítés hibakaresés"
 
-#: include/functions.php:1219
+#: include/functions.php:1164
 #, fuzzy
 msgid "Debug viewfeed()"
 msgstr "Hírcsatorna frissítés hibakaresés"
 
-#: include/functions.php:1220
-#: js/FeedTree.js:97
+#: include/functions.php:1165
+#: js/FeedTree.js:98
 msgid "Mark all feeds as read"
 msgstr "Minden hírcsatornát olvasottként jelöl"
 
-#: include/functions.php:1221
+#: include/functions.php:1166
 msgid "Un/collapse current category"
 msgstr "Kategória kinyitás/összecsukás"
 
-#: include/functions.php:1222
-msgid "Toggle combined mode"
-msgstr "Váltás kombinált módba"
-
-#: include/functions.php:1223
+#: include/functions.php:1167
 msgid "Toggle auto expand in combined mode"
 msgstr "Automatikus kibontás kombinált módban"
 
-#: include/functions.php:1224
+#: include/functions.php:1168
+msgid "Toggle combined mode"
+msgstr "Váltás kombinált módba"
+
+#: include/functions.php:1169
 msgid "Go to"
 msgstr "Ugrás ide"
 
-#: include/functions.php:1225
-#: classes/feeds.php:1583
+#: include/functions.php:1170
+#: classes/feeds.php:1569
 msgid "All articles"
 msgstr "Az összes hír"
 
-#: include/functions.php:1226
+#: include/functions.php:1171
 msgid "Fresh"
 msgstr "Friss"
 
-#: include/functions.php:1229
-#: js/tt-rss.js:491
-#: js/tt-rss.js:660
+#: include/functions.php:1174
+#: js/tt-rss.js:439
+#: js/tt-rss.js:599
 msgid "Tag cloud"
 msgstr "Címkefelhő"
 
-#: include/functions.php:1231
+#: include/functions.php:1176
 msgid "Other"
 msgstr "Egyéb"
 
-#: include/functions.php:1232
+#: include/functions.php:1177
 #: classes/pref/labels.php:279
 msgid "Create label"
 msgstr "Címke létrehozása"
 
-#: include/functions.php:1233
+#: include/functions.php:1178
 #: classes/pref/filters.php:801
 msgid "Create filter"
 msgstr "Szűrő létrehozása"
 
-#: include/functions.php:1234
+#: include/functions.php:1179
 msgid "Un/collapse sidebar"
 msgstr "Oldalsáv megjelenítés/elrejtés"
 
-#: include/functions.php:1235
+#: include/functions.php:1180
 msgid "Show help dialog"
 msgstr "Súgó ablak megjelenítése"
 
-#: include/functions.php:2582
+#: include/functions.php:2529
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: include/functions.php:2583
+#: include/functions.php:2530
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: include/functions.php:2584
+#: include/functions.php:2531
 msgid "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form"
 msgstr ""
 
-#: include/functions.php:2585
+#: include/functions.php:2532
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: include/functions.php:2586
+#: include/functions.php:2533
 #, fuzzy
 msgid "No file was uploaded"
 msgstr "Nincs felöltött fájl."
 
-#: include/functions.php:2587
+#: include/functions.php:2534
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: include/functions.php:2588
+#: include/functions.php:2535
 msgid "Failed to write file to disk."
 msgstr ""
 
-#: include/functions.php:2589
+#: include/functions.php:2536
 msgid "A PHP extension stopped the file upload."
 msgstr ""
 
 #: include/login_form.php:107
-#: classes/handler/public.php:446
-#: classes/handler/public.php:708
+#: classes/handler/public.php:466
+#: classes/handler/public.php:732
 msgid "Login:"
 msgstr "Felhasználó:"
 
 #: include/login_form.php:117
-#: classes/handler/public.php:449
+#: classes/handler/public.php:469
 msgid "Password:"
 msgstr "Jelszó:"
 
@@ -792,9 +780,9 @@ msgid "Profile:"
 msgstr "Profil:"
 
 #: include/login_form.php:133
-#: classes/handler/public.php:252
 #: classes/pref/prefs.php:1037
 #: classes/rpc.php:69
+#: classes/handler/public.php:272
 msgid "Default profile"
 msgstr "Alapértelmezett profil"
 
@@ -811,207 +799,27 @@ msgid "Remember me"
 msgstr "Emlékezzen rám"
 
 #: include/login_form.php:159
-#: classes/handler/public.php:454
+#: classes/handler/public.php:474
 msgid "Log in"
 msgstr "Belépés"
 
-#: include/sessions.php:46
+#: include/sessions.php:45
 msgid "Session failed to validate (schema version changed)"
 msgstr "Nem sikerült érvényesíteni a munkamenetet (séma verzió megváltozott)"
 
-#: include/sessions.php:62
+#: include/sessions.php:53
+#, fuzzy
+msgid "Session failed to validate (UA changed)."
+msgstr "Nem sikerült érvényesíteni a munkamenetet (megváltozott a jelszó)"
+
+#: include/sessions.php:67
 msgid "Session failed to validate (password changed)"
 msgstr "Nem sikerült érvényesíteni a munkamenetet (megváltozott a jelszó)"
 
-#: include/sessions.php:69
+#: include/sessions.php:74
 msgid "Session failed to validate (user not found)"
 msgstr "Nem sikerült érvényesíteni a munkamenetet (felhasználó nem található)"
 
-#: classes/article.php:26
-msgid "Article not found."
-msgstr "Hír nem található."
-
-#: classes/article.php:211
-msgid "Tags for this article (separated by commas):"
-msgstr "A hír címkéi (vesszőkkel elválasztva):"
-
-#: classes/article.php:236
-#: classes/pref/labels.php:82
-#: classes/pref/users.php:103
-#: classes/pref/feeds.php:774
-#: classes/pref/feeds.php:914
-#: classes/pref/filters.php:525
-#: classes/pref/prefs.php:982
-#: plugins/nsfw/init.php:85
-#: plugins/note/init.php:58
-#: plugins/af_readability/init.php:80
-#: plugins/af_redditimgur/init.php:66
-#: plugins/af_psql_trgm/init.php:188
-#: plugins/mail/init.php:65
-#: plugins/af_zz_imgproxy/init.php:238
-msgid "Save"
-msgstr "Mentés"
-
-#: classes/article.php:238
-#: classes/handler/public.php:423
-#: classes/handler/public.php:457
-#: classes/pref/labels.php:84
-#: classes/pref/users.php:105
-#: classes/pref/feeds.php:775
-#: classes/pref/feeds.php:917
-#: classes/pref/feeds.php:1672
-#: classes/pref/filters.php:528
-#: classes/pref/filters.php:945
-#: classes/pref/filters.php:1022
-#: classes/pref/filters.php:1115
-#: classes/pref/prefs.php:984
-#: classes/feeds.php:1037
-#: classes/feeds.php:1089
-#: classes/feeds.php:1128
-#: plugins/note/init.php:60
-#: plugins/mail/init.php:179
-msgid "Cancel"
-msgstr "Mégsem"
-
-#: classes/article.php:337
-#: classes/article.php:720
-#: classes/article.php:875
-msgid "no tags"
-msgstr "nincs címke"
-
-#: classes/article.php:448
-msgid "unknown type"
-msgstr "ismeretlen hírcsatornatípus"
-
-#: classes/article.php:525
-msgid "Attachments"
-msgstr "Csatolmányok:"
-
-#: classes/article.php:626
-#: classes/feeds.php:661
-msgid "comment"
-msgid_plural "comments"
-msgstr[0] "megjegyzés"
-msgstr[1] "megjegyzés"
-
-#: classes/article.php:630
-#: classes/feeds.php:665
-msgid "comments"
-msgstr "megjegyzések"
-
-#: classes/article.php:689
-msgid " - "
-msgstr "-"
-
-#: classes/article.php:730
-#: classes/feeds.php:647
-msgid "Edit tags for this article"
-msgstr "Címkék hozzáadása a hírhez"
-
-#: classes/article.php:763
-#: classes/feeds.php:602
-msgid "Originally from:"
-msgstr "Eredeti innen:"
-
-#: classes/article.php:774
-#: classes/pref/feeds.php:539
-#: classes/feeds.php:613
-msgid "Feed URL"
-msgstr "Hírcsatorna URL"
-
-#: classes/article.php:811
-#: classes/backend.php:103
-#: classes/dlg.php:33
-#: classes/dlg.php:56
-#: classes/dlg.php:89
-#: classes/dlg.php:154
-#: classes/dlg.php:181
-#: classes/dlg.php:197
-#: classes/pref/feeds.php:1466
-#: classes/pref/feeds.php:1533
-#: classes/pref/filters.php:208
-#: classes/pref/prefs.php:1099
-#: plugins/af_psql_trgm/init.php:109
-#: plugins/import_export/init.php:446
-#: plugins/import_export/init.php:490
-#: plugins/share/init.php:128
-msgid "Close this window"
-msgstr "Ablak bezárása"
-
-#: classes/article.php:913
-msgid "(edit note)"
-msgstr "(jegyzet szerkesztése)"
-
-#: classes/opml.php:31
-#: classes/opml.php:36
-msgid "OPML Utility"
-msgstr "OMPL-segédprogram"
-
-#: classes/opml.php:40
-msgid "Importing OPML..."
-msgstr "OPML importálás..."
-
-#: classes/opml.php:45
-msgid "Return to preferences"
-msgstr "Vissza a beállításokhoz"
-
-#: classes/opml.php:301
-#, php-format
-msgid "Adding feed: %s"
-msgstr "Hírcsatorna hozzáadása: %s"
-
-#: classes/opml.php:312
-#, php-format
-msgid "Duplicate feed: %s"
-msgstr "Duplikált hírcsatorna: %s"
-
-#: classes/opml.php:326
-#, php-format
-msgid "Adding label %s"
-msgstr "Címke hozzáadása %s"
-
-#: classes/opml.php:329
-#, php-format
-msgid "Duplicate label: %s"
-msgstr "Dupla címke: %s"
-
-#: classes/opml.php:341
-#, php-format
-msgid "Setting preference key %s to %s"
-msgstr "%s kulcs beállítása erre: %s"
-
-#: classes/opml.php:377
-msgid "Adding filter..."
-msgstr "Szűrő hozzáadása..."
-
-#: classes/opml.php:512
-#, php-format
-msgid "Processing category: %s"
-msgstr "%s kategória feldolgozása"
-
-#: classes/opml.php:558
-#, php-format
-msgid "Upload failed with error code %d"
-msgstr "Feltöltés sikertelen. Hibakód: %d"
-
-#: classes/opml.php:570
-#: plugins/import_export/init.php:471
-msgid "Unable to move uploaded file."
-msgstr "A feltöltött fájl nem helyezhető át."
-
-#: classes/opml.php:574
-#: plugins/import_export/init.php:475
-msgid "Error: please upload OPML file."
-msgstr "Hiba: kérem töltse fel az OPML fájlt!"
-
-#: classes/opml.php:585
-msgid "Error: unable to find moved OPML file."
-msgstr "Hiba: nem található az áthelyezett OPML fájl."
-
-#: classes/opml.php:594
-msgid "Error while parsing document."
-msgstr "Hiba történt a dokuementum feldoglozása közben"
-
 #: 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."
@@ -1032,164 +840,356 @@ msgstr "Ctrl"
 msgid "Help topic not found."
 msgstr "Súgótéma nem tlálható."
 
-#: 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."
+#: classes/backend.php:103
+#: classes/pref/filters.php:208
+#: classes/pref/feeds.php:1465
+#: classes/pref/feeds.php:1532
+#: classes/pref/prefs.php:1099
+#: classes/dlg.php:33
+#: classes/dlg.php:56
+#: classes/dlg.php:89
+#: classes/dlg.php:154
+#: classes/dlg.php:181
+#: classes/dlg.php:197
+#: classes/article.php:810
+#: plugins/af_psql_trgm/init.php:109
+#: plugins/import_export/init.php:446
+#: plugins/import_export/init.php:490
+#: plugins/share/init.php:128
+msgid "Close this window"
+msgstr "Ablak bezárása"
 
-#: classes/dlg.php:44
-msgid "Your Public OPML URL is:"
-msgstr "A publikus OPML URL címe:"
+#: classes/feeds.php:53
+msgid "View as RSS feed"
+msgstr "Megtekintés RSS feedként"
 
-#: classes/dlg.php:53
-#: classes/dlg.php:178
-#: plugins/share/init.php:125
-msgid "Generate new URL"
-msgstr "Új URL generálás"
+#: classes/feeds.php:54
+#: classes/feeds.php:140
+#: classes/pref/feeds.php:1326
+msgid "View as RSS"
+msgstr "Megtekintés RSS-ként"
 
-#: classes/dlg.php:67
-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 "A frissítő daemon a beállításokban engedélyezve van, ám a daemon folyamat nem fut, így a hírcsatornák nem tudnak frissülni. Kérem indítsa el a daemon folyamatot, vagy lépjen kapcsolatba az oldal/szerver tulajdonosával."
+#: classes/feeds.php:62
+#, php-format
+msgid "Last updated: %s"
+msgstr "Legutóbbi frissítés: %s"
 
-#: classes/dlg.php:71
-#: classes/dlg.php:80
-msgid "Last update:"
-msgstr "Legutóbbi frissítés:"
-
-#: classes/dlg.php:76
-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 "A frissítő daemon túl régóta próbálkozik a hírcsatornák frissítésével. Ez összeomlás vagy hiba jele is lehet, kérem lépjen kapcsolatba az oldal/szerver tulajdonosával!"
-
-#: classes/dlg.php:169
-msgid "You can view this feed as RSS using the following URL:"
-msgstr "Ezt a hírcsatornát megtekintheti RSS-ként a következő URL-en:"
-
-#: classes/dlg.php:190
-msgid "You are using default tt-rss password. Please change it in the Preferences (Personal data / Authentication)."
-msgstr ""
-
-#: classes/dlg.php:194
+#: classes/feeds.php:100
 #, fuzzy
-msgid "Open Preferences"
-msgstr "Beállítások"
+msgid "Select..."
+msgstr "Kiválasztás"
 
-#: classes/handler/public.php:387
-#: plugins/bookmarklets/init.php:40
-msgid "Share with Tiny Tiny RSS"
-msgstr "Megosztás Tiny Tiny RSS-el"
+#: classes/feeds.php:102
+#: classes/pref/labels.php:273
+#: classes/pref/filters.php:391
+#: classes/pref/filters.php:449
+#: classes/pref/filters.php:795
+#: classes/pref/filters.php:878
+#: classes/pref/filters.php:905
+#: classes/pref/feeds.php:1185
+#: classes/pref/feeds.php:1416
+#: classes/pref/feeds.php:1481
+#: classes/pref/users.php:358
+#: classes/pref/prefs.php:996
+msgid "All"
+msgstr "Mind"
 
-#: classes/handler/public.php:395
-msgid "Title:"
-msgstr "Cím:"
+#: classes/feeds.php:104
+msgid "Invert"
+msgstr "Fordított"
 
-#: classes/handler/public.php:397
-#: classes/pref/feeds.php:537
-msgid "URL:"
-msgstr "Hírcsatorna URL:"
+#: classes/feeds.php:105
+#: classes/pref/labels.php:275
+#: classes/pref/filters.php:393
+#: classes/pref/filters.php:451
+#: classes/pref/filters.php:797
+#: classes/pref/filters.php:880
+#: classes/pref/filters.php:907
+#: classes/pref/feeds.php:1187
+#: classes/pref/feeds.php:1418
+#: classes/pref/feeds.php:1483
+#: classes/pref/users.php:360
+#: classes/pref/prefs.php:998
+msgid "None"
+msgstr "Kijelölés törlése"
 
-#: classes/handler/public.php:399
-msgid "Content:"
-msgstr "Tartalom:"
+#: classes/feeds.php:107
+msgid "Selection toggle:"
+msgstr "Kiválasztott legyen:"
 
-#: classes/handler/public.php:401
-msgid "Labels:"
-msgstr "Címkék:"
+#: classes/feeds.php:113
+msgid "Selection:"
+msgstr "Kiválasztott hírcsatornák:"
 
-#: classes/handler/public.php:420
-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/feeds.php:116
+msgid "Set score"
+msgstr "Pontszám megadás"
 
-#: classes/handler/public.php:422
-msgid "Share"
-msgstr "Megosztás"
+#: classes/feeds.php:119
+msgid "Archive"
+msgstr "Archivál"
 
-#: classes/handler/public.php:444
-msgid "Not logged in"
-msgstr "Nincs belépve"
-
-#: classes/handler/public.php:504
-msgid "Incorrect username or password"
-msgstr "Hibás felhasználói név vagy jelszó"
-
-#: classes/handler/public.php:557
-#, 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:560
-#, php-format
-msgid "Subscribed to <b>%s</b>."
-msgstr "Feliratkozva erre a hírcsatornára: <b>%s</b>."
-
-#: classes/handler/public.php:563
-#, php-format
-msgid "Could not subscribe to <b>%s</b>."
-msgstr "Nem lehet feliratkozni ide: <b>%s</b>."
-
-#: classes/handler/public.php:566
-#, php-format
-msgid "No feeds found in <b>%s</b>."
-msgstr "Nem található hírcsatorna itt: <b>%s</b>."
-
-#: classes/handler/public.php:569
-msgid "Multiple feed URLs found."
-msgstr "Több hírcsatorna URL-t találtam."
-
-#: classes/handler/public.php:573
-#, 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:591
-msgid "Subscribe to selected feed"
-msgstr "Feliratkozás a kiválasztott hírcsatornára"
-
-#: classes/handler/public.php:618
-msgid "Edit subscription options"
-msgstr "Feliratkozási beállítások szerkesztése"
-
-#: classes/handler/public.php:656
-msgid "Password recovery"
-msgstr "Jelszó helyreállítás"
-
-#: classes/handler/public.php:701
-#, 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:723
-#: classes/pref/users.php:372
-msgid "Reset password"
-msgstr "Jelszó visszaállítás"
-
-#: classes/handler/public.php:733
-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:737
-#: classes/handler/public.php:806
-msgid "Go back"
+#: classes/feeds.php:121
+msgid "Move back"
 msgstr "Visszalépés"
 
-#: classes/handler/public.php:775
+#: classes/feeds.php:122
+#: classes/pref/filters.php:400
+#: classes/pref/filters.php:458
+#: classes/pref/filters.php:887
+#: classes/pref/filters.php:914
+msgid "Delete"
+msgstr "Törlés"
+
+#: classes/feeds.php:127
+#: classes/feeds.php:132
+#: plugins/mailto/init.php:25
+#: plugins/mail/init.php:76
+msgid "Forward by email"
+msgstr "Továbbítás emaiben"
+
+#: classes/feeds.php:136
+msgid "Feed:"
+msgstr "Hírcsatorna:"
+
+#: classes/feeds.php:193
+#: classes/feeds.php:802
+msgid "Feed not found."
+msgstr "Hírcsatorna nem található"
+
+#: classes/feeds.php:255
+msgid "Never"
+msgstr "Soha"
+
+#: classes/feeds.php:341
+#, php-format
+msgid "Imported at %s"
+msgstr "Importálás %s"
+
+#: classes/feeds.php:391
+#: classes/feeds.php:484
 #, fuzzy
-msgid "[tt-rss] Password reset request"
-msgstr "[tt-rss] Értesítés jelszó megváltoztatásáról."
+msgid "mark feed as read"
+msgstr "olvasottként jelöl"
 
-#: classes/handler/public.php:802
-msgid "Sorry, login and email combination not found."
-msgstr "Sajnálom, a belépési és email kombináció nem található."
+#: classes/feeds.php:540
+msgid "Collapse article"
+msgstr "Hír bezárása"
 
-#: classes/handler/public.php:824
-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/feeds.php:592
+#: classes/article.php:762
+msgid "Originally from:"
+msgstr "Eredeti innen:"
 
-#: classes/handler/public.php:850
-msgid "Database Updater"
-msgstr "Adatbázis-frissítő"
+#: classes/feeds.php:603
+#: classes/pref/feeds.php:538
+#: classes/article.php:773
+msgid "Feed URL"
+msgstr "Hírcsatorna URL"
 
-#: classes/handler/public.php:915
-msgid "Perform updates"
-msgstr "Frissítések végrehajtása"
+#: classes/feeds.php:630
+#: classes/article.php:729
+msgid "Edit tags for this article"
+msgstr "Címkék hozzáadása a hírhez"
+
+#: classes/feeds.php:644
+#: classes/article.php:625
+msgid "comment"
+msgid_plural "comments"
+msgstr[0] "megjegyzés"
+msgstr[1] "megjegyzés"
+
+#: classes/feeds.php:648
+#: classes/article.php:629
+msgid "comments"
+msgstr "megjegyzések"
+
+#: classes/feeds.php:686
+msgid "No unread articles found to display."
+msgstr "Nincs megjeleníthető olvasatlan hír."
+
+#: classes/feeds.php:689
+msgid "No updated articles found to display."
+msgstr "Nincs megjeleníthető friss hír."
+
+#: classes/feeds.php:692
+msgid "No starred articles found to display."
+msgstr "Nincs megjeleníthető csillagozott hír."
+
+#: classes/feeds.php:696
+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:698
+msgid "No articles found to display."
+msgstr "Nincs megjeleníthető hír."
+
+#: classes/feeds.php:714
+#: classes/feeds.php:905
+#, php-format
+msgid "Feeds last updated at %s"
+msgstr "Hírcsatornák utolsó frissítése: %s"
+
+#: classes/feeds.php:726
+#: classes/feeds.php:917
+msgid "Some feeds have update errors (click for details)"
+msgstr "Néhány hírcsatorna frissítésével gond akadt. (Kattints ide a részletekhez!)"
+
+#: classes/feeds.php:894
+msgid "No feed selected."
+msgstr "Nincs kiválasztott hírcsatorna."
+
+#: classes/feeds.php:958
+#: classes/feeds.php:966
+msgid "Feed or site URL"
+msgstr "Hírcsatorna vagy weboldal URL"
+
+#: classes/feeds.php:972
+#: classes/pref/feeds.php:559
+#: classes/pref/feeds.php:800
+#: classes/pref/feeds.php:1632
+msgid "Place in category:"
+msgstr "Hozzáadás a következő kategóriához:"
+
+#: classes/feeds.php:980
+msgid "Available feeds"
+msgstr "Elérhető hírcsatornák"
+
+#: classes/feeds.php:992
+#: classes/pref/feeds.php:621
+#: classes/pref/feeds.php:848
+#: classes/pref/users.php:61
+msgid "Authentication"
+msgstr "Azonosítás"
+
+#: classes/feeds.php:996
+#: classes/pref/feeds.php:625
+#: classes/pref/feeds.php:852
+#: classes/pref/feeds.php:1646
+#: classes/pref/users.php:403
+msgid "Login"
+msgstr "Belépés"
+
+#: classes/feeds.php:1000
+#: classes/pref/feeds.php:631
+#: classes/pref/feeds.php:860
+#: classes/pref/feeds.php:1649
+#: classes/pref/prefs.php:243
+msgid "Password"
+msgstr "Jelszó"
+
+#: classes/feeds.php:1011
+#: classes/pref/feeds.php:645
+msgid "This feed requires authentication."
+msgstr "Ez a hírcsatorna azonosítást igényel."
+
+#: classes/feeds.php:1014
+#: classes/feeds.php:1070
+#: classes/pref/feeds.php:1668
+msgid "Subscribe"
+msgstr "Feliratkozás"
+
+#: classes/feeds.php:1017
+msgid "More feeds"
+msgstr "További hírcsatornák"
+
+#: classes/feeds.php:1020
+#: classes/feeds.php:1072
+#: classes/feeds.php:1111
+#: classes/pref/labels.php:84
+#: classes/pref/filters.php:528
+#: classes/pref/filters.php:945
+#: classes/pref/filters.php:1022
+#: classes/pref/filters.php:1115
+#: classes/pref/feeds.php:774
+#: classes/pref/feeds.php:916
+#: classes/pref/feeds.php:1669
+#: classes/pref/users.php:105
+#: classes/pref/prefs.php:984
+#: classes/article.php:238
+#: classes/handler/public.php:443
+#: classes/handler/public.php:477
+#: plugins/mail/init.php:179
+#: plugins/note/init.php:60
+msgid "Cancel"
+msgstr "Mégsem"
+
+#: classes/feeds.php:1042
+#: classes/feeds.php:1110
+#: classes/pref/filters.php:788
+#: classes/pref/feeds.php:1178
+#: classes/pref/users.php:345
+#: js/tt-rss.js:152
+msgid "Search"
+msgstr "Keresés"
+
+#: classes/feeds.php:1046
+msgid "Popular feeds"
+msgstr "Népszerű hírcsatornák"
+
+#: classes/feeds.php:1047
+msgid "Feed archive"
+msgstr "Hírcsatorna archívum"
+
+#: classes/feeds.php:1050
+msgid "limit:"
+msgstr "határ:"
+
+#: classes/feeds.php:1071
+#: classes/pref/labels.php:282
+#: classes/pref/filters.php:518
+#: classes/pref/filters.php:814
+#: classes/pref/feeds.php:751
+#: classes/pref/users.php:369
+msgid "Remove"
+msgstr "Eltávolít"
+
+#: classes/feeds.php:1084
+msgid "Look for"
+msgstr "Keresés"
+
+#: classes/feeds.php:1092
+#, php-format
+msgid "in %s"
+msgstr ""
+
+#: classes/feeds.php:1097
+msgid "Used for word stemming"
+msgstr ""
+
+#: classes/feeds.php:1106
+#, fuzzy
+msgid "Search syntax"
+msgstr "Keresés"
+
+#: classes/feeds.php:1563
+msgid "Starred articles"
+msgstr "Csillagozott hírek"
+
+#: classes/feeds.php:1565
+msgid "Published articles"
+msgstr "Publikált hírek"
+
+#: classes/feeds.php:1567
+msgid "Fresh articles"
+msgstr "Friss hírek"
+
+#: classes/feeds.php:1571
+msgid "Archived articles"
+msgstr "Archivált hírek"
+
+#: classes/feeds.php:1573
+msgid "Recently read"
+msgstr "Legutóbb olvasott"
+
+#: classes/feeds.php:1694
+msgid "Special"
+msgstr "Kiemelt"
+
+#: classes/feeds.php:1951
+#, php-format
+msgid "Search results: %s"
+msgstr "Keresési eredmények: %s"
 
 #: classes/pref/labels.php:25
 #: classes/pref/filters.php:377
@@ -1209,201 +1209,195 @@ msgstr "Előtér:"
 msgid "Background:"
 msgstr "Háttér:"
 
+#: classes/pref/labels.php:82
+#: classes/pref/filters.php:525
+#: classes/pref/feeds.php:773
+#: classes/pref/feeds.php:913
+#: classes/pref/users.php:103
+#: classes/pref/prefs.php:982
+#: classes/article.php:236
+#: plugins/af_zz_imgproxy/init.php:238
+#: plugins/af_redditimgur/init.php:66
+#: plugins/af_psql_trgm/init.php:188
+#: plugins/af_readability/init.php:80
+#: plugins/nsfw/init.php:85
+#: plugins/mail/init.php:65
+#: plugins/note/init.php:58
+msgid "Save"
+msgstr "Mentés"
+
 #: classes/pref/labels.php:244
 #, php-format
 msgid "Created label <b>%s</b>"
 msgstr "Címke létrehozva: <b>%s</b>"
 
 #: classes/pref/labels.php:270
-#: classes/pref/users.php:356
-#: classes/pref/feeds.php:1183
-#: classes/pref/feeds.php:1414
-#: classes/pref/feeds.php:1479
 #: classes/pref/filters.php:388
 #: classes/pref/filters.php:446
 #: classes/pref/filters.php:792
 #: classes/pref/filters.php:875
 #: classes/pref/filters.php:902
+#: classes/pref/feeds.php:1182
+#: classes/pref/feeds.php:1413
+#: classes/pref/feeds.php:1478
+#: classes/pref/users.php:355
 #: classes/pref/prefs.php:993
 msgid "Select"
 msgstr "Kiválasztás"
 
-#: classes/pref/labels.php:273
-#: classes/pref/users.php:359
-#: classes/pref/feeds.php:1186
-#: classes/pref/feeds.php:1417
-#: classes/pref/feeds.php:1482
-#: classes/pref/filters.php:391
-#: classes/pref/filters.php:449
-#: classes/pref/filters.php:795
-#: classes/pref/filters.php:878
-#: classes/pref/filters.php:905
-#: classes/pref/prefs.php:996
-#: classes/feeds.php:102
-msgid "All"
-msgstr "Mind"
-
-#: classes/pref/labels.php:275
-#: classes/pref/users.php:361
-#: classes/pref/feeds.php:1188
-#: classes/pref/feeds.php:1419
-#: classes/pref/feeds.php:1484
-#: classes/pref/filters.php:393
-#: classes/pref/filters.php:451
-#: classes/pref/filters.php:797
-#: classes/pref/filters.php:880
-#: classes/pref/filters.php:907
-#: classes/pref/prefs.php:998
-#: classes/feeds.php:105
-msgid "None"
-msgstr "Kijelölés törlése"
-
-#: classes/pref/labels.php:282
-#: classes/pref/users.php:370
-#: classes/pref/feeds.php:752
-#: classes/pref/filters.php:518
-#: classes/pref/filters.php:814
-#: classes/feeds.php:1088
-msgid "Remove"
-msgstr "Eltávolít"
-
 #: classes/pref/labels.php:285
 msgid "Clear colors"
 msgstr "Színek visszaállítása"
 
-#: classes/pref/users.php:6
-#: classes/pref/system.php:8
-msgid "Your access level is insufficient to open this tab."
-msgstr "Hozzáférési szintje elégtelen ehhez a művelethez."
-
-#: classes/pref/users.php:26
+#: classes/pref/filters.php:155
 #, fuzzy
-msgid "Edit user"
-msgstr "Szabály szerkesztése"
+msgid "Preview article"
+msgstr "Friss hírek"
 
-#: classes/pref/users.php:61
-#: classes/pref/feeds.php:622
-#: classes/pref/feeds.php:849
-#: classes/feeds.php:1009
-msgid "Authentication"
-msgstr "Azonosítás"
+#: classes/pref/filters.php:267
+#: classes/pref/filters.php:573
+msgid "(inverse)"
+msgstr "(fordított)"
 
-#: classes/pref/users.php:64
-msgid "Access level: "
-msgstr "Hozzáférési szint:"
-
-#: classes/pref/users.php:82
-#: classes/pref/feeds.php:648
-#: classes/pref/feeds.php:867
-msgid "Options"
-msgstr "Beállítások"
-
-#: classes/pref/users.php:96
-#: js/prefs.js:479
-msgid "User details"
-msgstr "Felhasználói adatok"
-
-#: classes/pref/users.php:136
-#: classes/pref/users.php:407
-msgid "Registered"
-msgstr "Regisztrált"
-
-#: classes/pref/users.php:137
-msgid "Last logged in"
-msgstr "Utolsó belépés"
-
-#: classes/pref/users.php:145
-msgid "Subscribed feeds count"
-msgstr "Olvasott hírcsatornák száma"
-
-#: classes/pref/users.php:146
-#, fuzzy
-msgid "Stored articles"
-msgstr "Csillagozott hírek"
-
-#: classes/pref/users.php:150
-#: classes/pref/users.php:406
-msgid "Subscribed feeds"
-msgstr "Feliratkozott a következő hírcsatornákra:"
-
-#: classes/pref/users.php:176
-msgid "User not found"
-msgstr "Felhasználó nem találhat"
-
-#: classes/pref/users.php:246
+#: classes/pref/filters.php:263
+#: classes/pref/filters.php:572
 #, php-format
-msgid "Added user <b>%s</b> with password <b>%s</b>"
-msgstr "A következő felhasználó hozzáadva <b>%s</b> ezzel a jelszóval <b>%s</b>"
+msgid "%s on %s in %s %s"
+msgstr "%s ebben: %s itt: %s %s"
 
-#: classes/pref/users.php:253
-#, php-format
-msgid "Could not create user <b>%s</b>"
-msgstr "A következő felhasználó létrehozása sikertelen <b>%s</b>"
+#: classes/pref/filters.php:383
+#: classes/pref/filters.php:870
+#: classes/pref/filters.php:977
+msgid "Match"
+msgstr "Szabály"
 
-#: classes/pref/users.php:257
-#, php-format
-msgid "User <b>%s</b> already exists."
-msgstr "A következő felhasználó már létezik <b>%s</b>."
+#: classes/pref/filters.php:397
+#: classes/pref/filters.php:455
+#: classes/pref/filters.php:884
+#: classes/pref/filters.php:911
+msgid "Add"
+msgstr "Hozzáad"
 
-#: classes/pref/users.php:285
-#, 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/filters.php:441
+#: classes/pref/filters.php:897
+msgid "Apply actions"
+msgstr "Műveletek alkalmazása"
 
-#: classes/pref/users.php:287
-#, 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/filters.php:492
+#: classes/pref/filters.php:926
+msgid "Enabled"
+msgstr "Engedélyezve"
 
-#: classes/pref/users.php:311
-msgid "[tt-rss] Password change notification"
-msgstr "[tt-rss] Értesítés jelszó megváltoztatásáról."
+#: classes/pref/filters.php:501
+#: classes/pref/filters.php:929
+msgid "Match any rule"
+msgstr "Minden szabálynak megfeleljen"
 
-#: classes/pref/users.php:346
-#: classes/pref/feeds.php:1179
-#: classes/pref/filters.php:788
-#: classes/feeds.php:1059
-#: classes/feeds.php:1127
-#: js/tt-rss.js:165
-msgid "Search"
-msgstr "Keresés"
+#: classes/pref/filters.php:510
+#: classes/pref/filters.php:932
+msgid "Inverse matching"
+msgstr "Fordított egyezés"
 
-#: classes/pref/users.php:364
-msgid "Create user"
-msgstr "Felhasználó létrehozás"
+#: classes/pref/filters.php:522
+#: classes/pref/filters.php:939
+msgid "Test"
+msgstr "Teszt"
+
+#: classes/pref/filters.php:804
+msgid "Combine"
+msgstr "Egyesít"
 
-#: classes/pref/users.php:368
 #: classes/pref/filters.php:807
+#: classes/pref/users.php:367
 msgid "Edit"
 msgstr "Szerkesztés"
 
-#: classes/pref/users.php:404
-#: classes/pref/feeds.php:626
-#: classes/pref/feeds.php:853
-#: classes/pref/feeds.php:1649
-#: classes/feeds.php:1013
-msgid "Login"
-msgstr "Belépés"
+#: classes/pref/filters.php:810
+#: classes/pref/feeds.php:1198
+#: classes/pref/feeds.php:1212
+msgid "Reset sort order"
+msgstr "Rendezési sorren visszaállítása"
 
-#: classes/pref/users.php:405
-msgid "Access Level"
-msgstr "Hozzáférési szint"
+#: classes/pref/filters.php:942
+msgid "Create"
+msgstr "Létrehoz"
 
-#: classes/pref/users.php:408
-msgid "Last login"
-msgstr "Utolsó belépés"
+#: classes/pref/filters.php:987
+msgid "Regular expression, without outer delimiters (i.e. slashes)"
+msgstr ""
 
-#: classes/pref/users.php:427
-msgid "Click to edit"
-msgstr "Kattintson ide a szerkesztéshez"
+#: classes/pref/filters.php:993
+msgid "Inverse regular expression matching"
+msgstr "Fordított reguláris kifejezés egyezés"
 
-#: classes/pref/users.php:447
-msgid "No users defined."
-msgstr "Nincs megadva felhasználó."
+#: classes/pref/filters.php:995
+msgid "on field"
+msgstr "...szerepeljen ebben a mezőben: "
 
-#: classes/pref/users.php:449
-msgid "No matching users found."
-msgstr "Nem található a feltételeknek megfelelő felhasználó."
+#: classes/pref/filters.php:1001
+#: js/PrefFilterTree.js:44
+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:764
+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:786
+msgid "Add action"
+msgstr "Művelet hozzáadás"
+
+#: classes/pref/filters.php:1139
+msgid "[No caption]"
+msgstr "[Nincs cím]"
+
+#: classes/pref/filters.php:1141
+#, 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:1155
+#, fuzzy
+msgid "matches any rule"
+msgstr "Minden szabálynak megfeleljen"
+
+#: classes/pref/filters.php:1158
+#, 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/system.php:8
+#: classes/pref/users.php:6
+msgid "Your access level is insufficient to open this tab."
+msgstr "Hozzáférési szintje elégtelen ehhez a művelethez."
 
 #: classes/pref/system.php:29
 msgid "Error Log"
@@ -1448,386 +1442,316 @@ msgid_plural "(%d feeds)"
 msgstr[0] "(%d hírcsatorna)"
 msgstr[1] "(%d hírcsatorna)"
 
-#: classes/pref/feeds.php:514
+#: classes/pref/feeds.php:513
 #: classes/pref/prefs.php:18
 msgid "General"
 msgstr "Általános"
 
-#: classes/pref/feeds.php:528
+#: classes/pref/feeds.php:527
 msgid "Feed Title"
 msgstr "Hírcsatorna címe"
 
-#: classes/pref/feeds.php:560
-#: classes/pref/feeds.php:801
-#: classes/pref/feeds.php:1635
-#: classes/feeds.php:989
-msgid "Place in category:"
-msgstr "Hozzáadás a következő kategóriához:"
+#: classes/pref/feeds.php:536
+#: classes/handler/public.php:417
+msgid "URL:"
+msgstr "Hírcsatorna URL:"
 
-#: classes/pref/feeds.php:572
+#: classes/pref/feeds.php:571
 #, fuzzy
 msgid "Site URL:"
 msgstr "Hír URL:"
 
-#: classes/pref/feeds.php:574
+#: classes/pref/feeds.php:573
 #, fuzzy
 msgid "Site URL"
 msgstr "Hírcsatorna URL"
 
-#: classes/pref/feeds.php:585
-#: classes/pref/feeds.php:815
+#: classes/pref/feeds.php:584
+#: classes/pref/feeds.php:814
 #, fuzzy
 msgid "Language:"
 msgstr "Nyelv"
 
-#: classes/pref/feeds.php:592
-#: classes/pref/feeds.php:824
+#: classes/pref/feeds.php:591
+#: classes/pref/feeds.php:823
 msgid "Update"
 msgstr "Frissítés"
 
-#: classes/pref/feeds.php:607
-#: classes/pref/feeds.php:840
+#: classes/pref/feeds.php:606
+#: classes/pref/feeds.php:839
 msgid "Article purging:"
 msgstr "Régi hírek törlése:"
 
-#: classes/pref/feeds.php:632
-#: classes/pref/feeds.php:861
-#: classes/pref/feeds.php:1652
-#: classes/pref/prefs.php:243
-#: classes/feeds.php:1017
-msgid "Password"
-msgstr "Jelszó"
-
-#: classes/pref/feeds.php:636
+#: classes/pref/feeds.php:635
 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:646
-#: classes/feeds.php:1028
-msgid "This feed requires authentication."
-msgstr "Ez a hírcsatorna azonosítást igényel."
+#: classes/pref/feeds.php:647
+#: classes/pref/feeds.php:866
+#: classes/pref/users.php:82
+msgid "Options"
+msgstr "Beállítások"
 
-#: classes/pref/feeds.php:662
-#: classes/pref/feeds.php:871
+#: classes/pref/feeds.php:661
+#: classes/pref/feeds.php:870
 msgid "Hide from Popular feeds"
 msgstr "Elrejtés a Népszerű hírcsatornákból"
 
-#: classes/pref/feeds.php:674
-#: classes/pref/feeds.php:877
+#: classes/pref/feeds.php:673
+#: classes/pref/feeds.php:876
 msgid "Include in e-mail digest"
 msgstr "Hozzáadás az e-mail összefoglalóhoz"
 
-#: classes/pref/feeds.php:687
-#: classes/pref/feeds.php:883
+#: classes/pref/feeds.php:686
+#: classes/pref/feeds.php:882
 msgid "Always display image attachments"
 msgstr "Kép csatolmányokat mindig jelenítse meg"
 
-#: classes/pref/feeds.php:700
-#: classes/pref/feeds.php:891
+#: classes/pref/feeds.php:699
+#: classes/pref/feeds.php:890
 #, fuzzy
 msgid "Do not embed media"
 msgstr "Ne ágyazza be a képeket"
 
-#: classes/pref/feeds.php:713
-#: classes/pref/feeds.php:899
+#: classes/pref/feeds.php:712
+#: classes/pref/feeds.php:898
 msgid "Cache media"
 msgstr ""
 
-#: classes/pref/feeds.php:725
-#: classes/pref/feeds.php:905
+#: classes/pref/feeds.php:724
+#: classes/pref/feeds.php:904
 msgid "Mark updated articles as unread"
 msgstr "Frissült hírek megjelölése olvasatlanként"
 
-#: classes/pref/feeds.php:729
+#: classes/pref/feeds.php:728
 msgid "Icon"
 msgstr "Ikon"
 
-#: classes/pref/feeds.php:743
-#: classes/pref/feeds.php:1284
+#: classes/pref/feeds.php:742
+#: classes/pref/feeds.php:1283
 #: plugins/import_export/init.php:71
 #, fuzzy
 msgid "Choose file..."
 msgstr "Szűrő létrehozása..."
 
-#: classes/pref/feeds.php:750
+#: classes/pref/feeds.php:749
 msgid "Replace"
 msgstr "Csere"
 
-#: classes/pref/feeds.php:757
+#: classes/pref/feeds.php:756
 #: classes/pref/prefs.php:679
 msgid "Plugins"
 msgstr "Beépülők"
 
-#: classes/pref/feeds.php:1154
+#: classes/pref/feeds.php:1153
 msgid "Feeds with errors"
 msgstr "Hibás hírcsatornák"
 
-#: classes/pref/feeds.php:1161
+#: classes/pref/feeds.php:1160
 msgid "Inactive feeds"
 msgstr "Inaktív hírcsatornák"
 
-#: classes/pref/feeds.php:1197
+#: classes/pref/feeds.php:1196
 msgid "Edit selected feeds"
 msgstr "Kijelölt hírcsatornák szerkeztése"
 
-#: classes/pref/feeds.php:1199
-#: classes/pref/feeds.php:1213
-#: classes/pref/filters.php:810
-msgid "Reset sort order"
-msgstr "Rendezési sorren visszaállítása"
-
-#: classes/pref/feeds.php:1201
-#: js/prefs.js:1462
+#: classes/pref/feeds.php:1200
+#: js/prefs.js:1171
 msgid "Batch subscribe"
 msgstr "Kötegelt feliratkozás"
 
-#: classes/pref/feeds.php:1208
+#: classes/pref/feeds.php:1207
 msgid "Categories"
 msgstr "Kategóriák"
 
-#: classes/pref/feeds.php:1211
+#: classes/pref/feeds.php:1210
 msgid "Add category"
 msgstr "Kategória hozzáadás"
 
-#: classes/pref/feeds.php:1215
+#: classes/pref/feeds.php:1214
 msgid "Remove selected"
 msgstr "Kijelölt eltávolítása"
 
-#: classes/pref/feeds.php:1272
+#: classes/pref/feeds.php:1271
 msgid "OPML"
 msgstr "OPML"
 
-#: classes/pref/feeds.php:1274
+#: classes/pref/feeds.php:1273
 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:1275
+#: classes/pref/feeds.php:1274
 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:1290
+#: classes/pref/feeds.php:1289
 msgid "Import my OPML"
 msgstr "OPML importálása"
 
-#: classes/pref/feeds.php:1296
+#: classes/pref/feeds.php:1295
 msgid "Filename:"
 msgstr "Fájlnév:"
 
-#: classes/pref/feeds.php:1298
+#: classes/pref/feeds.php:1297
 msgid "Include settings"
 msgstr "Beállításokkal együtt"
 
-#: classes/pref/feeds.php:1302
+#: classes/pref/feeds.php:1301
 msgid "Export OPML"
 msgstr "Exportálás OPML-be"
 
-#: classes/pref/feeds.php:1306
+#: classes/pref/feeds.php:1305
 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:1310
+#: classes/pref/feeds.php:1309
 msgid "Public OPML URL"
 msgstr "Publikus OPML URL"
 
-#: classes/pref/feeds.php:1311
+#: classes/pref/feeds.php:1310
 msgid "Display published OPML URL"
 msgstr "Publikált OPML URL mejelenítése"
 
-#: classes/pref/feeds.php:1318
+#: classes/pref/feeds.php:1317
 msgid "Published & shared articles / Generated feeds"
 msgstr "Publikált és megosztott hírek / Generált hírcsatornák"
 
-#: classes/pref/feeds.php:1320
+#: classes/pref/feeds.php:1319
 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:1327
-#: classes/feeds.php:54
-#: classes/feeds.php:140
-msgid "View as RSS"
-msgstr "Megtekintés RSS-ként"
-
-#: classes/pref/feeds.php:1328
 msgid "Display URL"
 msgstr "URL megjelenítés"
 
-#: classes/pref/feeds.php:1331
+#: classes/pref/feeds.php:1330
 msgid "Clear all generated URLs"
 msgstr "Minden generált URL törlése"
 
-#: classes/pref/feeds.php:1410
+#: classes/pref/feeds.php:1409
 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:1444
-#: classes/pref/feeds.php:1509
+#: classes/pref/feeds.php:1443
+#: classes/pref/feeds.php:1508
 msgid "Click to edit feed"
 msgstr "Kattintson a hírcsatorna szerkesztéséhez"
 
-#: classes/pref/feeds.php:1462
-#: classes/pref/feeds.php:1529
+#: classes/pref/feeds.php:1461
+#: classes/pref/feeds.php:1528
 msgid "Unsubscribe from selected feeds"
 msgstr "Leiratkozás a kiválasztott hírcsatornákról"
 
-#: classes/pref/feeds.php:1632
+#: classes/pref/feeds.php:1629
 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:1641
+#: classes/pref/feeds.php:1638
 msgid "Feeds to subscribe, One per line"
 msgstr "Feliratkozás hírcsatornákra, soronként egy"
 
-#: classes/pref/feeds.php:1664
+#: classes/pref/feeds.php:1661
 msgid "Feeds require authentication."
 msgstr "Ez a hírcsatorna azonosítást igényel."
 
-#: classes/pref/feeds.php:1671
-#: classes/feeds.php:1031
-#: classes/feeds.php:1087
-msgid "Subscribe"
-msgstr "Feliratkozás"
-
-#: classes/pref/filters.php:155
+#: classes/pref/users.php:26
 #, fuzzy
-msgid "Preview article"
-msgstr "Friss hírek"
+msgid "Edit user"
+msgstr "Szabály szerkesztése"
 
-#: classes/pref/filters.php:267
-#: classes/pref/filters.php:573
-msgid "(inverse)"
-msgstr "(fordított)"
+#: classes/pref/users.php:64
+msgid "Access level: "
+msgstr "Hozzáférési szint:"
 
-#: classes/pref/filters.php:263
-#: classes/pref/filters.php:572
+#: classes/pref/users.php:96
+#: js/prefs.js:403
+msgid "User details"
+msgstr "Felhasználói adatok"
+
+#: classes/pref/users.php:136
+#: classes/pref/users.php:406
+msgid "Registered"
+msgstr "Regisztrált"
+
+#: classes/pref/users.php:137
+msgid "Last logged in"
+msgstr "Utolsó belépés"
+
+#: classes/pref/users.php:145
+msgid "Subscribed feeds count"
+msgstr "Olvasott hírcsatornák száma"
+
+#: classes/pref/users.php:146
+#, fuzzy
+msgid "Stored articles"
+msgstr "Csillagozott hírek"
+
+#: classes/pref/users.php:150
+#: classes/pref/users.php:405
+msgid "Subscribed feeds"
+msgstr "Feliratkozott a következő hírcsatornákra:"
+
+#: classes/pref/users.php:176
+msgid "User not found"
+msgstr "Felhasználó nem találhat"
+
+#: classes/pref/users.php:246
 #, php-format
-msgid "%s on %s in %s %s"
-msgstr "%s ebben: %s itt: %s %s"
+msgid "Added user <b>%s</b> with password <b>%s</b>"
+msgstr "A következő felhasználó hozzáadva <b>%s</b> ezzel a jelszóval <b>%s</b>"
 
-#: classes/pref/filters.php:383
-#: classes/pref/filters.php:870
-#: classes/pref/filters.php:977
-msgid "Match"
-msgstr "Szabály"
-
-#: classes/pref/filters.php:397
-#: classes/pref/filters.php:455
-#: classes/pref/filters.php:884
-#: classes/pref/filters.php:911
-msgid "Add"
-msgstr "Hozzáad"
-
-#: classes/pref/filters.php:400
-#: classes/pref/filters.php:458
-#: classes/pref/filters.php:887
-#: classes/pref/filters.php:914
-#: classes/feeds.php:122
-msgid "Delete"
-msgstr "Törlés"
-
-#: classes/pref/filters.php:441
-#: classes/pref/filters.php:897
-msgid "Apply actions"
-msgstr "Műveletek alkalmazása"
-
-#: classes/pref/filters.php:492
-#: classes/pref/filters.php:926
-msgid "Enabled"
-msgstr "Engedélyezve"
-
-#: classes/pref/filters.php:501
-#: classes/pref/filters.php:929
-msgid "Match any rule"
-msgstr "Minden szabálynak megfeleljen"
-
-#: classes/pref/filters.php:510
-#: classes/pref/filters.php:932
-msgid "Inverse matching"
-msgstr "Fordított egyezés"
-
-#: classes/pref/filters.php:522
-#: classes/pref/filters.php:939
-msgid "Test"
-msgstr "Teszt"
-
-#: classes/pref/filters.php:804
-msgid "Combine"
-msgstr "Egyesít"
-
-#: classes/pref/filters.php:942
-msgid "Create"
-msgstr "Létrehoz"
-
-#: classes/pref/filters.php:987
-msgid "Regular expression, without outer delimiters (i.e. slashes)"
-msgstr ""
-
-#: 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:43
-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:797
-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:819
-msgid "Add action"
-msgstr "Művelet hozzáadás"
-
-#: classes/pref/filters.php:1139
-msgid "[No caption]"
-msgstr "[Nincs cím]"
-
-#: classes/pref/filters.php:1141
+#: classes/pref/users.php:253
 #, php-format
-msgid "%s (%d rule)"
-msgid_plural "%s (%d rules)"
-msgstr[0] "%s (%d szabály)"
-msgstr[1] "%s (%d szabály)"
+msgid "Could not create user <b>%s</b>"
+msgstr "A következő felhasználó létrehozása sikertelen <b>%s</b>"
 
-#: classes/pref/filters.php:1155
-#, fuzzy
-msgid "matches any rule"
-msgstr "Minden szabálynak megfeleljen"
-
-#: classes/pref/filters.php:1158
+#: classes/pref/users.php:257
 #, php-format
-msgid "%s (+%d action)"
-msgid_plural "%s (+%d actions)"
-msgstr[0] "%s (+%d művelet)"
-msgstr[1] "%s (+%d művelet)"
+msgid "User <b>%s</b> already exists."
+msgstr "A következő felhasználó már létezik <b>%s</b>."
+
+#: classes/pref/users.php:285
+#, 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:287
+#, 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:310
+msgid "[tt-rss] Password change notification"
+msgstr "[tt-rss] Értesítés jelszó megváltoztatásáról."
+
+#: classes/pref/users.php:363
+msgid "Create user"
+msgstr "Felhasználó létrehozás"
+
+#: classes/pref/users.php:371
+#: classes/handler/public.php:747
+msgid "Reset password"
+msgstr "Jelszó visszaállítás"
+
+#: classes/pref/users.php:404
+msgid "Access Level"
+msgstr "Hozzáférési szint"
+
+#: classes/pref/users.php:407
+msgid "Last login"
+msgstr "Utolsó belépés"
+
+#: classes/pref/users.php:426
+msgid "Click to edit"
+msgstr "Kattintson ide a szerkesztéshez"
+
+#: classes/pref/users.php:446
+msgid "No users defined."
+msgstr "Nincs megadva felhasználó."
+
+#: classes/pref/users.php:448
+msgid "No matching users found."
+msgstr "Nem található a feltételeknek megfelelő felhasználó."
 
 #: classes/pref/prefs.php:19
 msgid "Interface"
@@ -2003,7 +1927,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:1424
+#: js/prefs.js:1136
 msgid "Customize stylesheet"
 msgstr "Stíluslap testreszabása"
 
@@ -2246,256 +2170,300 @@ msgstr "Eltávolítja a kiválasztott profilokat?"
 msgid "Activate profile"
 msgstr "Profil aktiválás"
 
-#: classes/feeds.php:53
-msgid "View as RSS feed"
-msgstr "Megtekintés RSS feedként"
+#: 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."
 
-#: classes/feeds.php:62
-#, php-format
-msgid "Last updated: %s"
-msgstr "Legutóbbi frissítés: %s"
+#: classes/dlg.php:44
+msgid "Your Public OPML URL is:"
+msgstr "A publikus OPML URL címe:"
 
-#: classes/feeds.php:100
+#: classes/dlg.php:53
+#: classes/dlg.php:178
+#: plugins/share/init.php:125
+msgid "Generate new URL"
+msgstr "Új URL generálás"
+
+#: classes/dlg.php:67
+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 "A frissítő daemon a beállításokban engedélyezve van, ám a daemon folyamat nem fut, így a hírcsatornák nem tudnak frissülni. Kérem indítsa el a daemon folyamatot, vagy lépjen kapcsolatba az oldal/szerver tulajdonosával."
+
+#: classes/dlg.php:71
+#: classes/dlg.php:80
+msgid "Last update:"
+msgstr "Legutóbbi frissítés:"
+
+#: classes/dlg.php:76
+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 "A frissítő daemon túl régóta próbálkozik a hírcsatornák frissítésével. Ez összeomlás vagy hiba jele is lehet, kérem lépjen kapcsolatba az oldal/szerver tulajdonosával!"
+
+#: classes/dlg.php:169
+msgid "You can view this feed as RSS using the following URL:"
+msgstr "Ezt a hírcsatornát megtekintheti RSS-ként a következő URL-en:"
+
+#: classes/dlg.php:190
+msgid "You are using default tt-rss password. Please change it in the Preferences (Personal data / Authentication)."
+msgstr ""
+
+#: classes/dlg.php:194
 #, fuzzy
-msgid "Select..."
-msgstr "Kiválasztás"
+msgid "Open Preferences"
+msgstr "Beállítások"
 
-#: classes/feeds.php:104
-msgid "Invert"
-msgstr "Fordított"
+#: classes/opml.php:31
+#: classes/opml.php:36
+msgid "OPML Utility"
+msgstr "OMPL-segédprogram"
 
-#: classes/feeds.php:107
-msgid "Selection toggle:"
-msgstr "Kiválasztott legyen:"
+#: classes/opml.php:40
+msgid "Importing OPML..."
+msgstr "OPML importálás..."
 
-#: classes/feeds.php:113
-msgid "Selection:"
-msgstr "Kiválasztott hírcsatornák:"
+#: classes/opml.php:45
+msgid "Return to preferences"
+msgstr "Vissza a beállításokhoz"
 
-#: classes/feeds.php:116
-msgid "Set score"
-msgstr "Pontszám megadás"
+#: classes/opml.php:301
+#, php-format
+msgid "Adding feed: %s"
+msgstr "Hírcsatorna hozzáadása: %s"
 
-#: classes/feeds.php:119
-msgid "Archive"
-msgstr "Archivál"
+#: classes/opml.php:312
+#, php-format
+msgid "Duplicate feed: %s"
+msgstr "Duplikált hírcsatorna: %s"
 
-#: classes/feeds.php:121
-msgid "Move back"
+#: classes/opml.php:326
+#, php-format
+msgid "Adding label %s"
+msgstr "Címke hozzáadása %s"
+
+#: classes/opml.php:329
+#, php-format
+msgid "Duplicate label: %s"
+msgstr "Dupla címke: %s"
+
+#: classes/opml.php:341
+#, php-format
+msgid "Setting preference key %s to %s"
+msgstr "%s kulcs beállítása erre: %s"
+
+#: classes/opml.php:377
+msgid "Adding filter..."
+msgstr "Szűrő hozzáadása..."
+
+#: classes/opml.php:512
+#, php-format
+msgid "Processing category: %s"
+msgstr "%s kategória feldolgozása"
+
+#: classes/opml.php:558
+#, php-format
+msgid "Upload failed with error code %d"
+msgstr "Feltöltés sikertelen. Hibakód: %d"
+
+#: classes/opml.php:570
+#: plugins/import_export/init.php:471
+msgid "Unable to move uploaded file."
+msgstr "A feltöltött fájl nem helyezhető át."
+
+#: classes/opml.php:574
+#: plugins/import_export/init.php:475
+msgid "Error: please upload OPML file."
+msgstr "Hiba: kérem töltse fel az OPML fájlt!"
+
+#: classes/opml.php:585
+msgid "Error: unable to find moved OPML file."
+msgstr "Hiba: nem található az áthelyezett OPML fájl."
+
+#: classes/opml.php:594
+msgid "Error while parsing document."
+msgstr "Hiba történt a dokuementum feldoglozása közben"
+
+#: classes/article.php:26
+msgid "Article not found."
+msgstr "Hír nem található."
+
+#: classes/article.php:211
+msgid "Tags for this article (separated by commas):"
+msgstr "A hír címkéi (vesszőkkel elválasztva):"
+
+#: classes/article.php:337
+#: classes/article.php:719
+#: classes/article.php:874
+msgid "no tags"
+msgstr "nincs címke"
+
+#: classes/article.php:447
+msgid "unknown type"
+msgstr "ismeretlen hírcsatornatípus"
+
+#: classes/article.php:524
+msgid "Attachments"
+msgstr "Csatolmányok:"
+
+#: classes/article.php:688
+msgid " - "
+msgstr "-"
+
+#: classes/article.php:912
+msgid "(edit note)"
+msgstr "(jegyzet szerkesztése)"
+
+#: classes/handler/public.php:407
+#: plugins/bookmarklets/init.php:40
+msgid "Share with Tiny Tiny RSS"
+msgstr "Megosztás Tiny Tiny RSS-el"
+
+#: classes/handler/public.php:415
+msgid "Title:"
+msgstr "Cím:"
+
+#: classes/handler/public.php:419
+msgid "Content:"
+msgstr "Tartalom:"
+
+#: classes/handler/public.php:421
+msgid "Labels:"
+msgstr "Címkék:"
+
+#: classes/handler/public.php:440
+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:442
+msgid "Share"
+msgstr "Megosztás"
+
+#: classes/handler/public.php:464
+msgid "Not logged in"
+msgstr "Nincs belépve"
+
+#: classes/handler/public.php:527
+msgid "Incorrect username or password"
+msgstr "Hibás felhasználói név vagy jelszó"
+
+#: classes/handler/public.php:581
+#, 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:584
+#, php-format
+msgid "Subscribed to <b>%s</b>."
+msgstr "Feliratkozva erre a hírcsatornára: <b>%s</b>."
+
+#: classes/handler/public.php:587
+#, php-format
+msgid "Could not subscribe to <b>%s</b>."
+msgstr "Nem lehet feliratkozni ide: <b>%s</b>."
+
+#: classes/handler/public.php:590
+#, php-format
+msgid "No feeds found in <b>%s</b>."
+msgstr "Nem található hírcsatorna itt: <b>%s</b>."
+
+#: classes/handler/public.php:593
+msgid "Multiple feed URLs found."
+msgstr "Több hírcsatorna URL-t találtam."
+
+#: classes/handler/public.php:597
+#, 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:615
+msgid "Subscribe to selected feed"
+msgstr "Feliratkozás a kiválasztott hírcsatornára"
+
+#: classes/handler/public.php:642
+msgid "Edit subscription options"
+msgstr "Feliratkozási beállítások szerkesztése"
+
+#: classes/handler/public.php:680
+msgid "Password recovery"
+msgstr "Jelszó helyreállítás"
+
+#: classes/handler/public.php:725
+#, 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:757
+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:761
+#: classes/handler/public.php:830
+msgid "Go back"
 msgstr "Visszalépés"
 
-#: classes/feeds.php:127
-#: classes/feeds.php:132
-#: plugins/mail/init.php:76
-#: plugins/mailto/init.php:25
-msgid "Forward by email"
-msgstr "Továbbítás emaiben"
-
-#: classes/feeds.php:136
-msgid "Feed:"
-msgstr "Hírcsatorna:"
-
-#: classes/feeds.php:193
-#: classes/feeds.php:819
-msgid "Feed not found."
-msgstr "Hírcsatorna nem található"
-
-#: classes/feeds.php:255
-msgid "Never"
-msgstr "Soha"
-
-#: classes/feeds.php:342
-#, php-format
-msgid "Imported at %s"
-msgstr "Importálás %s"
-
-#: classes/feeds.php:394
-#: classes/feeds.php:487
+#: classes/handler/public.php:799
 #, fuzzy
-msgid "mark feed as read"
-msgstr "olvasottként jelöl"
+msgid "[tt-rss] Password reset request"
+msgstr "[tt-rss] Értesítés jelszó megváltoztatásáról."
 
-#: classes/feeds.php:542
-msgid "Collapse article"
-msgstr "Hír bezárása"
+#: 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/feeds.php:703
-msgid "No unread articles found to display."
-msgstr "Nincs megjeleníthető olvasatlan hír."
+#: 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/feeds.php:706
-msgid "No updated articles found to display."
-msgstr "Nincs megjeleníthető friss hír."
+#: classes/handler/public.php:874
+msgid "Database Updater"
+msgstr "Adatbázis-frissítő"
 
-#: classes/feeds.php:709
-msgid "No starred articles found to display."
-msgstr "Nincs megjeleníthető csillagozott hír."
+#: classes/handler/public.php:939
+msgid "Perform updates"
+msgstr "Frissítések végrehajtása"
 
-#: classes/feeds.php:713
-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:715
-msgid "No articles found to display."
-msgstr "Nincs megjeleníthető hír."
-
-#: classes/feeds.php:731
-#: classes/feeds.php:922
-#, php-format
-msgid "Feeds last updated at %s"
-msgstr "Hírcsatornák utolsó frissítése: %s"
-
-#: classes/feeds.php:743
-#: classes/feeds.php:934
-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:911
-msgid "No feed selected."
-msgstr "Nincs kiválasztott hírcsatorna."
-
-#: classes/feeds.php:975
-#: classes/feeds.php:983
-msgid "Feed or site URL"
-msgstr "Hírcsatorna vagy weboldal URL"
-
-#: classes/feeds.php:997
-msgid "Available feeds"
-msgstr "Elérhető hírcsatornák"
-
-#: classes/feeds.php:1034
-msgid "More feeds"
-msgstr "További hírcsatornák"
-
-#: classes/feeds.php:1063
-msgid "Popular feeds"
-msgstr "Népszerű hírcsatornák"
-
-#: classes/feeds.php:1064
-msgid "Feed archive"
-msgstr "Hírcsatorna archívum"
-
-#: classes/feeds.php:1067
-msgid "limit:"
-msgstr "határ:"
-
-#: classes/feeds.php:1101
-msgid "Look for"
-msgstr "Keresés"
-
-#: classes/feeds.php:1109
-#, php-format
-msgid "in %s"
+#: plugins/af_zz_imgproxy/init.php:208
+msgid "Image proxy settings (af_zz_imgproxy)"
 msgstr ""
 
-#: classes/feeds.php:1114
-msgid "Used for word stemming"
-msgstr ""
-
-#: classes/feeds.php:1123
+#: plugins/af_zz_imgproxy/init.php:232
 #, fuzzy
-msgid "Search syntax"
-msgstr "Keresés"
+msgid "Enable proxy for all remote images."
+msgstr "Hírcsatornák kategorizálásának engedélyezése"
 
-#: classes/feeds.php:1577
-msgid "Starred articles"
-msgstr "Csillagozott hírek"
+#: plugins/af_zz_imgproxy/init.php:236
+#, fuzzy
+msgid "Don't cache files locally."
+msgstr "Képek helyi tárolása"
 
-#: classes/feeds.php:1579
-msgid "Published articles"
-msgstr "Publikált hírek"
-
-#: classes/feeds.php:1581
-msgid "Fresh articles"
-msgstr "Friss hírek"
-
-#: classes/feeds.php:1585
-msgid "Archived articles"
-msgstr "Archivált hírek"
-
-#: classes/feeds.php:1587
-msgid "Recently read"
-msgstr "Legutóbb olvasott"
-
-#: classes/feeds.php:1708
-msgid "Special"
-msgstr "Kiemelt"
-
-#: classes/feeds.php:1965
-#, php-format
-msgid "Search results: %s"
-msgstr "Keresési eredmények: %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."
+#: plugins/af_zz_imgproxy/init.php:252
+#: plugins/af_redditimgur/init.php:79
+#, fuzzy
+msgid "Configuration saved"
 msgstr "Beállítások elmentve."
 
-#: plugins/note/init.php:28
-#: plugins/note/note.js:11
-msgid "Edit article note"
-msgstr "Megjegyzés"
-
 #: plugins/vf_shared/init.php:17
 #: plugins/vf_shared/init.php:73
 msgid "Shared articles"
 msgstr "Megosztott hírek"
 
-#: plugins/auth_internal/init.php:67
-msgid "Please enter your one time password:"
-msgstr "Adja meg az egyszer használatos jelszót:"
+#: plugins/bookmarklets/init.php:20
+msgid "Bookmarklets"
+msgstr "Bookmarkletek"
 
-#: plugins/auth_internal/init.php:208
-msgid "Password has been changed."
-msgstr "A jelszó megváltoztatva."
+#: 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 "Húzza a linket a böngésző eszköztára alá, nyissa meg a böngészőjében a hírcsatornát és kattintson a linkre a feliratkozáshoz."
 
-#: plugins/auth_internal/init.php:210
-msgid "Old password is incorrect."
-msgstr "A régi jelszó helytelen."
+#: plugins/bookmarklets/init.php:26
+#, php-format
+msgid "Subscribe to %s in Tiny Tiny RSS?"
+msgstr "Feliratkozás %s hírcsatornára a Tiny Tiny RSS-ben?"
 
-#: plugins/af_readability/init.php:25
-msgid "Data saved."
-msgstr ""
+#: plugins/bookmarklets/init.php:31
+msgid "Subscribe in Tiny Tiny RSS"
+msgstr "Feliratkozás a Tiny Tiny RSS-ben?"
 
-#: plugins/af_readability/init.php:41
-#, fuzzy
-msgid "Inline content"
-msgstr "Megjegyzés"
-
-#: plugins/af_readability/init.php:47
-msgid "Readability settings (af_readability)"
-msgstr ""
-
-#: plugins/af_readability/init.php:78
-msgid "Use Readability for pages shared via bookmarklet."
-msgstr ""
-
-#: plugins/af_readability/init.php:90
-#: plugins/af_psql_trgm/init.php:198
-msgid "Currently enabled for (click to edit):"
-msgstr ""
-
-#: plugins/af_readability/init.php:107
-#, fuzzy
-msgid "Readability"
-msgstr "Ellenőrizze, hogy nem foglalt-e már:"
-
-#: plugins/af_readability/init.php:118
-#, fuzzy
-msgid "Inline article content"
-msgstr "Megjegyzés"
+#: plugins/bookmarklets/init.php:34
+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_redditimgur/init.php:30
 msgid "Reddit content settings (af_redditimgur)"
@@ -2509,11 +2477,21 @@ msgstr ""
 msgid "Enable additional duplicate checking"
 msgstr ""
 
-#: plugins/af_redditimgur/init.php:79
-#: plugins/af_zz_imgproxy/init.php:252
-#, fuzzy
-msgid "Configuration saved"
-msgstr "Beállítások elmentve."
+#: plugins/af_comics/init.php:49
+msgid "Feeds supported by af_comics"
+msgstr ""
+
+#: plugins/af_comics/init.php:51
+msgid "The following comics are currently supported:"
+msgstr ""
+
+#: plugins/af_comics/init.php:69
+msgid "To subscribe to GoComics use the comic's regular web page as the feed URL (e.g. for the <em>Garfield</em> comic use <code>http://www.gocomics.com/garfield</code>)."
+msgstr ""
+
+#: plugins/af_comics/init.php:71
+msgid "Drop any updated filters into <code>filters.local</code> in plugin directory."
+msgstr ""
 
 #: plugins/af_psql_trgm/init.php:29
 #, php-format
@@ -2553,25 +2531,86 @@ msgstr ""
 msgid "Enable for all feeds:"
 msgstr "Hírcsatornák kategorizálásának engedélyezése"
 
+#: plugins/af_psql_trgm/init.php:198
+#: plugins/af_readability/init.php:90
+msgid "Currently enabled for (click to edit):"
+msgstr ""
+
 #: plugins/af_psql_trgm/init.php:216
 msgid "Similarity (pg_trgm)"
 msgstr ""
 
-#: plugins/af_comics/init.php:49
-msgid "Feeds supported by af_comics"
+#: plugins/af_readability/init.php:25
+msgid "Data saved."
 msgstr ""
 
-#: plugins/af_comics/init.php:51
-msgid "The following comics are currently supported:"
+#: plugins/af_readability/init.php:41
+#, fuzzy
+msgid "Inline content"
+msgstr "Megjegyzés"
+
+#: plugins/af_readability/init.php:47
+msgid "Readability settings (af_readability)"
 msgstr ""
 
-#: plugins/af_comics/init.php:69
-msgid "To subscribe to GoComics use the comic's regular web page as the feed URL (e.g. for the <em>Garfield</em> comic use <code>http://www.gocomics.com/garfield</code>)."
+#: plugins/af_readability/init.php:78
+msgid "Use Readability for pages shared via bookmarklet."
 msgstr ""
 
-#: plugins/af_comics/init.php:71
-msgid "Drop any updated filters into <code>filters.local</code> in plugin directory."
-msgstr ""
+#: plugins/af_readability/init.php:107
+#, fuzzy
+msgid "Readability"
+msgstr "Ellenőrizze, hogy nem foglalt-e már:"
+
+#: plugins/af_readability/init.php:118
+#, fuzzy
+msgid "Inline article content"
+msgstr "Megjegyzés"
+
+#: plugins/mailto/init.php:50
+#: plugins/mailto/init.php:58
+#: plugins/mail/init.php:118
+#: plugins/mail/init.php:124
+msgid "[Forwarded]"
+msgstr "[Továbbítva]"
+
+#: plugins/mailto/init.php:50
+#: plugins/mail/init.php:118
+msgid "Multiple articles"
+msgstr "Többszörös hírek"
+
+#: plugins/mailto/init.php:74
+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/mailto/init.php:78
+msgid "Forward selected article(s) by email."
+msgstr "Kijelölt hírek továbbítása e-mailben."
+
+#: plugins/mailto/init.php:81
+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/mailto/init.php:86
+msgid "Close this dialog"
+msgstr "Ablak bezárása"
+
+#: 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/import_export/init.php:53
 msgid "Import and export"
@@ -2639,102 +2678,6 @@ msgstr "Feltöltés sikertelen. Hibakód: %d"
 msgid "No file uploaded."
 msgstr "Nincs felöltött fájl."
 
-#: plugins/mail/init.php:29
-msgid "Mail addresses saved."
-msgstr ""
-
-#: plugins/mail/init.php:35
-#, fuzzy
-msgid "Mail plugin"
-msgstr "Felhasználói beépülők"
-
-#: plugins/mail/init.php:37
-msgid "You can set predefined email addressed here (comma-separated list):"
-msgstr ""
-
-#: plugins/mail/init.php:118
-#: plugins/mail/init.php:124
-#: plugins/mailto/init.php:50
-#: plugins/mailto/init.php:58
-msgid "[Forwarded]"
-msgstr "[Továbbítva]"
-
-#: plugins/mail/init.php:118
-#: plugins/mailto/init.php:50
-msgid "Multiple articles"
-msgstr "Többszörös hírek"
-
-#: plugins/mail/init.php:146
-msgid "To:"
-msgstr "Címzett:"
-
-#: plugins/mail/init.php:161
-msgid "Subject:"
-msgstr "Tárgy:"
-
-#: plugins/mail/init.php:178
-msgid "Send e-mail"
-msgstr "Email küldés"
-
-#: plugins/close_button/init.php:25
-msgid "Close article"
-msgstr "Hír bezárása"
-
-#: plugins/bookmarklets/init.php:20
-msgid "Bookmarklets"
-msgstr "Bookmarkletek"
-
-#: 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 "Húzza a linket a böngésző eszköztára alá, nyissa meg a böngészőjében a hírcsatornát és kattintson a linkre a feliratkozáshoz."
-
-#: plugins/bookmarklets/init.php:26
-#, php-format
-msgid "Subscribe to %s in Tiny Tiny RSS?"
-msgstr "Feliratkozás %s hírcsatornára a Tiny Tiny RSS-ben?"
-
-#: plugins/bookmarklets/init.php:31
-msgid "Subscribe in Tiny Tiny RSS"
-msgstr "Feliratkozás a Tiny Tiny RSS-ben?"
-
-#: plugins/bookmarklets/init.php:34
-msgid "Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS"
-msgstr "Használja ezt a bookmarkletet tetszőleges oldalak közzétételére a Tiny Tiny RSS használatával"
-
-#: plugins/toggle_sidebar/init.php:23
-msgid "Collapse feedlist"
-msgstr "Hírcsatornalista összecsukása"
-
-#: plugins/af_zz_imgproxy/init.php:208
-msgid "Image proxy settings (af_zz_imgproxy)"
-msgstr ""
-
-#: plugins/af_zz_imgproxy/init.php:232
-#, 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:236
-#, fuzzy
-msgid "Don't cache files locally."
-msgstr "Képek helyi tárolása"
-
-#: plugins/mailto/init.php:74
-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/mailto/init.php:78
-msgid "Forward selected article(s) by email."
-msgstr "Kijelölt hírek továbbítása e-mailben."
-
-#: plugins/mailto/init.php:81
-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/mailto/init.php:86
-msgid "Close this dialog"
-msgstr "Ablak bezárása"
-
 #: plugins/share/init.php:41
 msgid "You can disable all articles shared by unique URLs here."
 msgstr "Itt minden egyedi URL-el megosztott hírt le lehet tiltani."
@@ -2755,454 +2698,604 @@ msgstr "Ezt a hírt megoszthatja a következő egyedi URL segítségével:"
 msgid "Unshare article"
 msgstr "Hír megosztásának visszavonása"
 
-#: js/FeedTree.js:75
+#: plugins/toggle_sidebar/init.php:23
+msgid "Collapse feedlist"
+msgstr "Hírcsatornalista összecsukása"
+
+#: plugins/close_button/init.php:25
+msgid "Close article"
+msgstr "Hír bezárása"
+
+#: plugins/mail/init.php:29
+msgid "Mail addresses saved."
+msgstr ""
+
+#: plugins/mail/init.php:35
+#, fuzzy
+msgid "Mail plugin"
+msgstr "Felhasználói beépülők"
+
+#: plugins/mail/init.php:37
+msgid "You can set predefined email addressed here (comma-separated list):"
+msgstr ""
+
+#: plugins/mail/init.php:146
+msgid "To:"
+msgstr "Címzett:"
+
+#: plugins/mail/init.php:161
+msgid "Subject:"
+msgstr "Tárgy:"
+
+#: plugins/mail/init.php:178
+msgid "Send e-mail"
+msgstr "Email küldés"
+
+#: plugins/note/init.php:28
+#: plugins/note/note.js:11
+msgid "Edit article note"
+msgstr "Megjegyzés"
+
+#: plugins/auth_internal/init.php:67
+msgid "Please enter your one time password:"
+msgstr "Adja meg az egyszer használatos jelszót:"
+
+#: plugins/auth_internal/init.php:208
+msgid "Password has been changed."
+msgstr "A jelszó megváltoztatva."
+
+#: plugins/auth_internal/init.php:210
+msgid "Old password is incorrect."
+msgstr "A régi jelszó helytelen."
+
+#: js/FeedTree.js:76
 #, fuzzy
 msgid "(Un)collapse"
 msgstr "Oldalsáv megjelenítés/elrejtés"
 
-#: js/PrefFeedTree.js:35
+#: js/PrefFeedTree.js:36
 msgid "Edit category"
 msgstr "Kategória szerkesztése"
 
-#: js/PrefFeedTree.js:42
+#: js/PrefFeedTree.js:43
 msgid "Remove category"
 msgstr "Kategória eltávolítása"
 
-#: js/PrefFilterTree.js:46
+#: js/PrefFilterTree.js:47
 msgid "Inverse"
 msgstr "Fordított"
 
-#: js/feedlist.js:511
+#: js/feedlist.js:461
 #, 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:514
+#: js/feedlist.js:464
 #, 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:517
+#: js/feedlist.js:467
 #, 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:520
+#: js/feedlist.js:470
 #, fuzzy
 msgid "Mark %w in %s as read?"
 msgstr "Minden hírt megjelöl olvasottként itt: %s?"
 
-#: js/feedlist.js:523
+#: js/feedlist.js:473
 #, fuzzy
 msgid "search results"
 msgstr "Keresési eredmények: %s"
 
-#: js/feedlist.js:523
+#: js/feedlist.js:473
 #, fuzzy
 msgid "all articles"
 msgstr "Az összes hír"
 
-#: js/functions.js:74
+#: js/functions.js:100
 msgid "Close"
 msgstr ""
 
-#: js/functions.js:141
+#: js/functions.js:167
 msgid "Click to close"
 msgstr "Kattintson a bezáráshoz"
 
-#: js/functions.js:448
+#: js/functions.js:456
 msgid "Error explained"
 msgstr "Hiba magyarázata"
 
-#: js/functions.js:592
+#: js/functions.js:490
+msgid "Upload complete."
+msgstr "Feltöltés kész"
+
+#: js/functions.js:508
+msgid "Remove stored feed icon?"
+msgstr "Eltávolítja a hírcsatorna tárolt ikonját?"
+
+#: js/functions.js:510
+msgid "Removing feed icon..."
+msgstr "Hírcsatorna ikon eltávolítása..."
+
+#: js/functions.js:515
+msgid "Feed icon removed."
+msgstr "Hírcsatorna ikon eltávolítva."
+
+#: js/functions.js:532
+msgid "Please select an image file to upload."
+msgstr "Kérem válasszon egy feltöltendő képet."
+
+#: js/functions.js:533
+msgid "Upload new icon for this feed?"
+msgstr "Új ikon tölt fel ehhez a hírcsatornához?"
+
+#: js/functions.js:534
+msgid "Uploading, please wait..."
+msgstr "Feltöltés, kérem várjon..."
+
+#: js/functions.js:542
+msgid "Please enter label caption:"
+msgstr "Adja meg a címke nevét:"
+
+#: js/functions.js:575
 msgid "Subscribe to Feed"
 msgstr "Feliratkozás hírcsatornára"
 
-#: js/functions.js:621
+#: js/functions.js:602
 msgid "Failed to parse output. This can indicate server timeout and/or network issues. Backend output was logged to browser console."
 msgstr ""
 
-#: js/functions.js:636
+#: js/functions.js:617
 #, perl-format
 msgid "Subscribed to %s"
 msgstr "Feliratkozva ide: %s"
 
-#: js/functions.js:641
+#: js/functions.js:622
 msgid "Specified URL seems to be invalid."
 msgstr "A megadott URL érvénytelennek tűnik."
 
-#: js/functions.js:644
+#: js/functions.js:625
 msgid "Specified URL doesn't seem to contain any feeds."
 msgstr "A megadott URL nem tartalmaz hírcsatornákat."
 
-#: js/functions.js:656
+#: js/functions.js:637
 msgid "Expand to select feed"
 msgstr "Kibontás a hírcsatorna kiválasztásához"
 
-#: js/functions.js:668
+#: js/functions.js:649
 #, perl-format
 msgid "Couldn't download the specified URL: %s"
 msgstr "A megadott URL nem tölthető be: %s"
 
-#: js/functions.js:672
+#: js/functions.js:653
 #, perl-format
 msgid "XML validation failed: %s"
 msgstr "XML ellenőrzés sikertelen: %s"
 
-#: js/functions.js:676
+#: js/functions.js:657
 msgid "You are already subscribed to this feed."
 msgstr "Már feliratkozott erre a hírcsatornára."
 
-#: js/functions.js:1136
+#: js/functions.js:1098
 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:1140
-#: js/prefs.js:1095
+#: js/functions.js:1100
+#: js/prefs.js:870
 msgid "Trying to change address..."
 msgstr "Cím cseréje..."
 
-#: js/functions.js:1245
-#: js/tt-rss.js:446
-#: js/tt-rss.js:673
+#: js/functions.js:1199
+#: js/tt-rss.js:399
+#: js/tt-rss.js:612
 msgid "You can't edit this kind of feed."
 msgstr "Ezt a hírcsatornatípust nem szerkesztheted."
 
-#: js/functions.js:1260
+#: js/functions.js:1213
 msgid "Edit Feed"
 msgstr "Hírcsatorna szerkesztése"
 
-#: js/functions.js:1266
-#: js/prefs.js:100
-#: js/prefs.js:209
-#: js/prefs.js:647
+#: js/functions.js:1217
+#: js/prefs.js:176
+#: js/prefs.js:523
+#: js/prefs.js:1139
+#: js/prefs.js:78
 msgid "Saving data..."
 msgstr "Adatok mentése..."
 
-#: js/functions.js:1293
+#: js/functions.js:1243
 msgid "More Feeds"
 msgstr "További hírcsatornák"
 
-#: js/functions.js:1355
-#: js/functions.js:1464
-#: js/prefs.js:398
-#: js/prefs.js:540
-#: js/prefs.js:558
-#: js/prefs.js:1077
+#: js/functions.js:1297
+#: js/functions.js:1383
+#: js/prefs.js:332
+#: js/prefs.js:455
+#: js/prefs.js:473
+#: js/prefs.js:855
 msgid "No feeds are selected."
 msgstr "Nincs kiválasztott hírcsatorna."
 
-#: js/functions.js:1398
+#: js/functions.js:1329
 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:1435
+#: js/functions.js:1360
 msgid "Feeds with update errors"
 msgstr "Hírcsatornák frissítési hibával"
 
-#: js/functions.js:1446
-#: js/prefs.js:1058
+#: js/functions.js:1369
+#: js/prefs.js:841
 msgid "Remove selected feeds?"
 msgstr "Eltávolítja a kiválasztott hírcsatornákat?"
 
-#: js/functions.js:1449
-#: js/prefs.js:1061
+#: js/functions.js:1370
+#: js/prefs.js:842
 msgid "Removing selected feeds..."
 msgstr "Kiválasztott hírcsatornák eltávolítása..."
 
-#: js/prefs.js:60
-msgid "Please enter login:"
-msgstr "Kérem adja meg a felhasználói nevét:"
-
-#: js/prefs.js:67
-msgid "Can't create user: no login specified."
-msgstr "Felhasználó létrehozása sikertelen, nincs megadva felhasználói név."
-
-#: js/prefs.js:71
-msgid "Adding user..."
-msgstr "Felhasználó hozzáadása..."
-
-#: js/prefs.js:96
-msgid "User Editor"
-msgstr "Felhasználó-szerkesztő"
-
-#: js/prefs.js:131
-msgid "Edit Filter"
-msgstr "Szűrő szerkesztése"
-
-#: js/prefs.js:170
+#: js/prefs.js:143
 msgid "Remove filter?"
 msgstr "Eltávolítja szűrőt?"
 
-#: js/prefs.js:175
+#: js/prefs.js:148
 msgid "Removing filter..."
 msgstr "Szűrő eltávolítása..."
 
-#: js/prefs.js:292
+#: js/prefs.js:251
 msgid "Remove selected labels?"
 msgstr "Eltávolítja a kiválasztott címkéket?"
 
-#: js/prefs.js:295
+#: js/prefs.js:252
 msgid "Removing selected labels..."
 msgstr "Kiválasztott címkék eltávolítása..."
 
-#: js/prefs.js:308
-#: js/prefs.js:1144
+#: js/prefs.js:262
+#: js/prefs.js:909
 msgid "No labels are selected."
 msgstr "Nincs kiválasztott címke."
 
-#: js/prefs.js:320
+#: js/prefs.js:274
 msgid "Remove selected users? Neither default admin nor your account will be removed."
 msgstr "Eltávolítja a kijelölt felhasználókat? Az alapértelmezett admin és az ön fiókja nem lesz törölve."
 
-#: js/prefs.js:323
+#: js/prefs.js:275
 msgid "Removing selected users..."
 msgstr "Kiválasztott felhasználók eltávolítása..."
 
-#: js/prefs.js:338
-#: js/prefs.js:408
-#: js/prefs.js:427
-#: js/prefs.js:461
+#: js/prefs.js:286
+#: js/prefs.js:342
+#: js/prefs.js:361
+#: js/prefs.js:387
 msgid "No users are selected."
 msgstr "Nincs kijelölt felhasználó."
 
-#: js/prefs.js:350
+#: js/prefs.js:297
 msgid "Remove selected filters?"
 msgstr "Eltávolítja a kiválasztott szűrőket?"
 
-#: js/prefs.js:353
+#: js/prefs.js:298
 msgid "Removing selected filters..."
 msgstr "Kiválasztott szűrők eltávolítása..."
 
-#: js/prefs.js:366
-#: js/prefs.js:495
-#: js/prefs.js:514
+#: js/prefs.js:308
+#: js/prefs.js:419
+#: js/prefs.js:438
 msgid "No filters are selected."
 msgstr "Nincs kiválasztott szűrő."
 
-#: js/prefs.js:378
+#: js/prefs.js:319
 msgid "Unsubscribe from selected feeds?"
 msgstr "Leiratkozik a kiválasztott hírcsatornákról?"
 
-#: js/prefs.js:382
+#: js/prefs.js:321
 msgid "Unsubscribing from selected feeds..."
 msgstr "Leiratkozás a kiválasztott hírcsatornákról..."
 
-#: js/prefs.js:413
-#: js/prefs.js:432
-#: js/prefs.js:466
+#: js/prefs.js:347
+#: js/prefs.js:366
+#: js/prefs.js:392
 msgid "Please select only one user."
 msgstr "Kérem csak egy felhasználót jelöljön meg!"
 
-#: js/prefs.js:436
+#: js/prefs.js:370
 msgid "Reset password of selected user?"
 msgstr "Visszaállítja a kiválasztott felhasználók jelszavait?"
 
-#: js/prefs.js:439
+#: js/prefs.js:371
 msgid "Resetting password for selected user..."
 msgstr "A kiválasztott felhasználó jelszavának visszaállítása..."
 
-#: js/prefs.js:500
+#: js/prefs.js:424
 msgid "Please select only one filter."
 msgstr "Kérem csak egy szűrőt jelöljön meg!"
 
-#: js/prefs.js:518
+#: js/prefs.js:442
 msgid "Combine selected filters?"
 msgstr "Egyesíti a kiválasztott szűrőket?"
 
-#: js/prefs.js:521
+#: js/prefs.js:443
 msgid "Joining filters..."
 msgstr "Szűrők egyesítése..."
 
-#: js/prefs.js:580
+#: js/prefs.js:487
 msgid "Edit Multiple Feeds"
 msgstr "Több hírcsatorna szerkesztése"
 
-#: js/prefs.js:604
+#: js/prefs.js:511
 msgid "Save changes to selected feeds?"
 msgstr "Leiratkozik a kiválasztott hírcsatornákról?"
 
-#: js/prefs.js:681
+#: js/prefs.js:552
 msgid "OPML Import"
 msgstr "OPML importálás"
 
-#: js/prefs.js:700
+#: js/prefs.js:571
 msgid "Please choose an OPML file first."
 msgstr "Először válasszon egy OPML fjlt."
 
-#: js/prefs.js:703
+#: js/prefs.js:574
 #: plugins/import_export/import_export.js:115
 msgid "Importing, please wait..."
 msgstr "Importálás, kérem várjon..."
 
-#: js/prefs.js:869
+#: js/prefs.js:737
 msgid "Reset to defaults?"
 msgstr "Visszaállítja a gyári beállításokat?"
 
-#: js/prefs.js:1468
-msgid "Subscribing to feeds..."
-msgstr "Feliratkozás a hírcsatornákra..."
+#: js/prefs.js:777
+#, perl-format
+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:1487
-msgid "Clear stored data for this plugin?"
-msgstr "Törli a beépülő tárolt adatait?"
+#: js/prefs.js:778
+msgid "Removing category..."
+msgstr "Kategória eltávolítása..."
 
-#: js/prefs.js:1501
-msgid "Clear all messages in the error log?"
-msgstr "Töröl minden bejegyzést a hibanaplóból?"
+#: js/prefs.js:794
+msgid "Remove selected categories?"
+msgstr "Kiválasztott kategóriák eltávolítása?"
 
-#: js/tt-rss.js:118
+#: js/prefs.js:795
+msgid "Removing selected categories..."
+msgstr "Kiválasztott kategóriák eltávolítása..."
+
+#: js/prefs.js:805
+msgid "No categories are selected."
+msgstr "Nincs kategória kiválaszta."
+
+#: js/prefs.js:812
+msgid "Category title:"
+msgstr "Kategória címe:"
+
+#: js/prefs.js:815
+msgid "Creating category..."
+msgstr "Kategória létrehozása..."
+
+#: js/prefs.js:832
+msgid "Feeds without recent updates"
+msgstr "Hírcsatornák frissítések nélkül"
+
+#: js/prefs.js:869
+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:898
+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:926
+msgid "Settings Profiles"
+msgstr "Beállítási profilok"
+
+#: js/prefs.js:935
+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:936
+msgid "Removing selected profiles..."
+msgstr "Kiválasztott profilok eltávolítása..."
+
+#: js/prefs.js:948
+msgid "No profiles are selected."
+msgstr "Nincsenek kiválasztott profilok."
+
+#: js/prefs.js:955
+#: js/prefs.js:997
+msgid "Activate selected profile?"
+msgstr "Aktiválja a kiválasztott profilt?"
+
+#: js/prefs.js:964
+#: js/prefs.js:1008
+msgid "Please choose a profile to activate."
+msgstr "Válasszon egy aktiválandó profilt."
+
+#: js/prefs.js:969
+msgid "Creating profile..."
+msgstr "Profil létrehozás..."
+
+#: js/prefs.js:1016
+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:1017
+#: plugins/share/share_prefs.js:3
+msgid "Clearing URLs..."
+msgstr "URL-ek törlése..."
+
+#: js/prefs.js:1020
+msgid "Generated URLs cleared."
+msgstr "Generált URL-ek törölve."
+
+#: js/prefs.js:1053
+#, fuzzy
+msgid "Rename category to:"
+msgstr "Kategória eltávolítása"
+
+#: js/prefs.js:1074
+msgid "Label Editor"
+msgstr "Címke Szerkesztő"
+
+#: js/tt-rss.js:111
 msgid "Mark all articles as read?"
 msgstr "Minden hírt megjelöl olvasottként?"
 
-#: js/tt-rss.js:124
+#: js/tt-rss.js:115
 msgid "Marking all feeds as read..."
 msgstr "Minden hírcsatornát megjelölése olvasottként..."
 
-#: js/tt-rss.js:398
+#: js/tt-rss.js:351
 msgid "Please enable mail plugin first."
 msgstr "Először engedélyezze a mail beépülőt."
 
-#: js/tt-rss.js:527
+#: js/tt-rss.js:477
 msgid "Please enable embed_original plugin first."
 msgstr "Először engedélyezze az embed_original beépülőt."
 
-#: js/tt-rss.js:540
-#: js/tt-rss.js:723
+#: js/tt-rss.js:490
+#: js/tt-rss.js:653
 msgid "Widescreen is not available in combined mode."
 msgstr ""
 
-#: js/tt-rss.js:821
-msgid "You can't rescore this kind of feed."
-msgstr "Ez a hírcsatorna típust nem lehet újraponszámozni."
-
-#: js/tt-rss.js:826
-#: js/tt-rss.js:686
-msgid "Please select some feed first."
-msgstr "Válasszon hírcsatorná(ka)t!"
-
-#: js/tt-rss.js:831
-#, perl-format
-msgid "Rescore articles in %s?"
-msgstr "Újrapontszámozza %s híreit?"
-
-#: js/tt-rss.js:834
-msgid "Rescoring articles..."
-msgstr "Hírek újrapontozása..."
-
-#: js/viewfeed.js:917
-#: js/viewfeed.js:955
-#: js/viewfeed.js:1003
-#: js/viewfeed.js:1924
-#: plugins/mail/mail.js:7
+#: js/viewfeed.js:444
+#: js/viewfeed.js:461
+#: js/viewfeed.js:484
+#: js/viewfeed.js:521
+#: js/viewfeed.js:542
+#: js/viewfeed.js:651
+#: js/viewfeed.js:685
+#: js/viewfeed.js:727
+#: js/viewfeed.js:1564
 #: plugins/mailto/init.js:7
-#: js/viewfeed.js:675
-#: js/viewfeed.js:697
-#: js/viewfeed.js:718
-#: js/viewfeed.js:777
-#: js/viewfeed.js:805
+#: plugins/mail/mail.js:7
 msgid "No articles are selected."
 msgstr "Nincsen kiválasztott hír."
 
-#: js/viewfeed.js:925
+#: js/viewfeed.js:659
 #, 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:927
+#: js/viewfeed.js:661
 #, 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:964
+#: js/viewfeed.js:694
 #, 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:967
+#: js/viewfeed.js:697
 #, 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:969
+#: js/viewfeed.js:698
 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:1009
+#: js/viewfeed.js:733
 #, 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:1029
+#: js/viewfeed.js:753
 msgid "Edit article Tags"
 msgstr "Hír címkéinek szerkesztése"
 
-#: js/viewfeed.js:1035
+#: js/viewfeed.js:757
 msgid "Saving article tags..."
 msgstr "Hír címkéinek mentése..."
 
-#: js/viewfeed.js:1666
+#: js/viewfeed.js:1015
+msgid "No article is selected."
+msgstr "Nincs kiválasztott hír."
+
+#: js/viewfeed.js:1050
+msgid "No articles found to mark"
+msgstr "Nincs megjelölendő hír."
+
+#: js/viewfeed.js:1052
+#, perl-format
+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?"
+
+#: js/viewfeed.js:1312
 msgid "Open original article"
 msgstr "Eredeti hír megjelenítése"
 
-#: js/viewfeed.js:1673
+#: js/viewfeed.js:1319
 msgid "Display article URL"
 msgstr "URL megjelenítése"
 
-#: js/viewfeed.js:1780
+#: js/viewfeed.js:1426
 msgid "Assign label"
 msgstr "Címke hozzáadása"
 
-#: js/viewfeed.js:1785
+#: js/viewfeed.js:1431
 msgid "Remove label"
 msgstr "Címke eltávolítás"
 
-#: js/viewfeed.js:1817
+#: js/viewfeed.js:1463
 #, fuzzy
 msgid "Select articles in group"
 msgstr "Az kurzor alatti hír kiválasztása"
 
-#: js/viewfeed.js:1827
+#: js/viewfeed.js:1473
 #, fuzzy
 msgid "Mark group as read"
 msgstr "Megjelölés olvasottként"
 
-#: js/viewfeed.js:1839
+#: js/viewfeed.js:1485
 #, fuzzy
 msgid "Mark feed as read"
 msgstr "Minden hírcsatornát olvasottként jelöl"
 
-#: js/viewfeed.js:1892
+#: js/viewfeed.js:1538
 msgid "Please enter new score for selected articles:"
 msgstr "Adjon meg egy új pontszámot a kijelölt hírekhez:"
 
-#: js/viewfeed.js:1955
+#: js/viewfeed.js:1571
 msgid "Please enter new score for this article:"
 msgstr "Adjon meg egy új pontszámot a hírhez:"
 
-#: js/viewfeed.js:1986
+#: js/viewfeed.js:1591
 msgid "Article URL:"
 msgstr "Hír URL:"
 
-#: plugins/note/note.js:17
-msgid "Saving article note..."
-msgstr "Megjegyzés mentése..."
+#: 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/af_psql_trgm/init.js:11
 #, fuzzy
 msgid "Related articles"
 msgstr "Megosztott hírek"
 
+#: plugins/mailto/init.js:21
+#: plugins/mail/mail.js:21
+msgid "Forward article by email"
+msgstr "Továbbítás emaiben"
+
+#: plugins/shorten_expanded/init.js:43
+msgid "Click to expand article"
+msgstr "Kattints a hír kibontásához"
+
 #: plugins/import_export/import_export.js:13
 msgid "Export Data"
 msgstr "Adatok exportálása"
@@ -3222,261 +3315,172 @@ 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
-msgid "Forward article by email"
-msgstr "Továbbítás emaiben"
+#: plugins/share/share_prefs.js:2
+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/mail/mail.js:36
-msgid "Error sending email:"
-msgstr ""
-
-#: plugins/mail/mail.js:38
-#, fuzzy
-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:45
-msgid "Click to expand article"
-msgstr "Kattints a hír kibontásához"
+#: plugins/share/share_prefs.js:8
+msgid "Shared URLs cleared."
+msgstr "Megosztott URL-ek törölve."
 
 #: plugins/share/share.js:10
 msgid "Share article by URL"
 msgstr "Megosztás URL-el"
 
-#: plugins/share/share.js:14
+#: plugins/share/share.js:13
 msgid "Generate new share URL for this article?"
 msgstr "Új URL generálása a hírhez?"
 
-#: plugins/share/share.js:18
+#: plugins/share/share.js:15
 msgid "Trying to change URL..."
 msgstr "URL módosítása..."
 
-#: plugins/share/share.js:55
+#: plugins/share/share.js:48
 msgid "Remove sharing for this article?"
 msgstr "Eltávolítod a hír megosztását?"
 
-#: plugins/share/share.js:59
+#: plugins/share/share.js:50
 msgid "Trying to unshare..."
 msgstr "Megosztás visszavonása..."
 
-#: plugins/share/share_prefs.js:3
-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/mail/mail.js:30
+msgid "Error sending email:"
+msgstr ""
 
-#: plugins/share/share_prefs.js:6
-#: js/prefs.js:1277
-msgid "Clearing URLs..."
-msgstr "URL-ek törlése..."
+#: plugins/mail/mail.js:32
+#, fuzzy
+msgid "Your message has been sent."
+msgstr "A személyes adatai el lettek mentve."
 
-#: plugins/share/share_prefs.js:13
-msgid "Shared URLs cleared."
-msgstr "Megosztott URL-ek törölve."
+#: plugins/note/note.js:15
+msgid "Saving article note..."
+msgstr "Megjegyzés mentése..."
 
-#: js/feedlist.js:204
+#: js/feedlist.js:168
 #, fuzzy
 msgid "Your password is at default value"
 msgstr "A jelszava még az alapértelmezett, kérem változtassa meg."
 
-#: js/feedlist.js:453
+#: js/feedlist.js:413
 msgid "Mark all articles in %s as read?"
 msgstr "Minden hírt megjelöl olvasottként itt: %s?"
 
-#: js/functions.js:494
-msgid "Upload complete."
-msgstr "Feltöltés kész"
-
-#: js/functions.js:511
-msgid "Remove stored feed icon?"
-msgstr "Eltávolítja a hírcsatorna tárolt ikonját?"
-
-#: js/functions.js:516
-msgid "Removing feed icon..."
-msgstr "Hírcsatorna ikon eltávolítása..."
-
-#: js/functions.js:521
-msgid "Feed icon removed."
-msgstr "Hírcsatorna ikon eltávolítva."
-
-#: js/functions.js:537
-msgid "Please select an image file to upload."
-msgstr "Kérem válasszon egy feltöltendő képet."
-
-#: js/functions.js:539
-msgid "Upload new icon for this feed?"
-msgstr "Új ikon tölt fel ehhez a hírcsatornához?"
-
-#: js/functions.js:540
-msgid "Uploading, please wait..."
-msgstr "Feltöltés, kérem várjon..."
-
-#: js/functions.js:550
-msgid "Please enter label caption:"
-msgstr "Adja meg a címke nevét:"
-
-#: js/functions.js:555
-msgid "Can't create label: missing caption."
-msgstr "Címke létrehozása sikertelen: nincs megadva név."
-
-#: js/functions.js:797
+#: js/functions.js:764
 msgid "Edit rule"
 msgstr "Szabály szerkesztése"
 
-#: js/functions.js:819
+#: js/functions.js:786
 msgid "Edit action"
 msgstr "Művelet szerkesztése"
 
-#: js/functions.js:860
+#: js/functions.js:825
 msgid "Looking for articles (%d processed, %f found)..."
 msgstr ""
 
-#: js/functions.js:890
+#: js/functions.js:855
 #, fuzzy
 msgid "Found %d articles matching this filter:"
 msgstr "A szűrőnek megfelelő hírek:"
 
-#: js/functions.js:942
+#: js/functions.js:907
 msgid "Create Filter"
 msgstr "Szűrő létrehozás"
 
-#: js/functions.js:1060
-#: js/tt-rss.js:692
+#: js/functions.js:1016
+#: js/tt-rss.js:631
 msgid "Unsubscribe from %s?"
 msgstr "Leiratkozik innen: %s?"
 
-#: js/functions.js:1063
+#: js/functions.js:1019
 msgid "Removing feed..."
 msgstr "Hírcsatorna eltávolítás..."
 
-#: js/functions.js:1489
+#: js/functions.js:1410
 msgid "Help"
 msgstr "Súgó"
 
-#: js/prefs.js:973
-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:44
+msgid "Please enter login:"
+msgstr "Kérem adja meg a felhasználói nevét:"
 
-#: js/prefs.js:979
-msgid "Removing category..."
-msgstr "Kategória eltávolítása..."
+#: js/prefs.js:51
+msgid "Can't create user: no login specified."
+msgstr "Felhasználó létrehozása sikertelen, nincs megadva felhasználói név."
 
-#: js/prefs.js:997
-msgid "Remove selected categories?"
-msgstr "Kiválasztott kategóriák eltávolítása?"
+#: js/prefs.js:55
+msgid "Adding user..."
+msgstr "Felhasználó hozzáadása..."
 
-#: js/prefs.js:1000
-msgid "Removing selected categories..."
-msgstr "Kiválasztott kategóriák eltávolítása..."
+#: js/prefs.js:74
+msgid "User Editor"
+msgstr "Felhasználó-szerkesztő"
 
-#: js/prefs.js:1013
-msgid "No categories are selected."
-msgstr "Nincs kategória kiválaszta."
+#: js/prefs.js:104
+msgid "Edit Filter"
+msgstr "Szűrő szerkesztése"
 
-#: js/prefs.js:1020
-msgid "Category title:"
-msgstr "Kategória címe:"
+#: js/prefs.js:1175
+msgid "Subscribing to feeds..."
+msgstr "Feliratkozás a hírcsatornákra..."
 
-#: js/prefs.js:1024
-msgid "Creating category..."
-msgstr "Kategória létrehozása..."
+#: js/prefs.js:1191
+msgid "Clear stored data for this plugin?"
+msgstr "Törli a beépülő tárolt adatait?"
 
-#: js/prefs.js:1047
-msgid "Feeds without recent updates"
-msgstr "Hírcsatornák frissítések nélkül"
+#: js/prefs.js:1203
+msgid "Clear all messages in the error log?"
+msgstr "Töröl minden bejegyzést a hibanaplóból?"
 
-#: js/prefs.js:1091
-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:1129
-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:1161
-msgid "Settings Profiles"
-msgstr "Beállítási profilok"
-
-#: js/prefs.js:1170
-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:1173
-msgid "Removing selected profiles..."
-msgstr "Kiválasztott profilok eltávolítása..."
-
-#: js/prefs.js:1189
-msgid "No profiles are selected."
-msgstr "Nincsenek kiválasztott profilok."
-
-#: js/prefs.js:1197
-#: js/prefs.js:1250
-msgid "Activate selected profile?"
-msgstr "Aktiválja a kiválasztott profilt?"
-
-#: js/prefs.js:1214
-#: js/prefs.js:1266
-msgid "Please choose a profile to activate."
-msgstr "Válasszon egy aktiválandó profilt."
-
-#: js/prefs.js:1219
-msgid "Creating profile..."
-msgstr "Profil létrehozás..."
-
-#: js/prefs.js:1274
-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:1284
-msgid "Generated URLs cleared."
-msgstr "Generált URL-ek törölve."
-
-#: js/prefs.js:1356
-msgid "Label Editor"
-msgstr "Címke Szerkesztő"
-
-#: js/tt-rss.js:681
+#: js/tt-rss.js:620
 msgid "You can't unsubscribe from the category."
 msgstr "Ebből a kategóriából nem ."
 
-#: js/viewfeed.js:127
-#: js/viewfeed.js:177
-#: js/viewfeed.js:194
+#: js/tt-rss.js:625
+msgid "Please select some feed first."
+msgstr "Válasszon hírcsatorná(ka)t!"
+
+#: js/viewfeed.js:89
+#: js/viewfeed.js:135
+#: js/viewfeed.js:152
 #, fuzzy
 msgid "Click to open next unread feed."
 msgstr "Kattintson a hírcsatorna szerkesztéséhez"
 
-#: js/viewfeed.js:131
+#: js/viewfeed.js:93
 msgid "Cancel search"
 msgstr "Keresés megszakítása"
 
-#: js/viewfeed.js:191
+#: js/viewfeed.js:149
 #, fuzzy
 msgid "New articles found, reload feed to continue."
 msgstr "Nincs megjeleníthető hír."
 
-#: js/viewfeed.js:620
+#: js/viewfeed.js:405
 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:1284
-msgid "No article is selected."
-msgstr "Nincs kiválasztott hír."
+#~ msgid "Rescore feed"
+#~ msgstr "Hírcsatorna újrapontozása"
 
-#: js/viewfeed.js:1319
-msgid "No articles found to mark"
-msgstr "Nincs megjelölendő hír."
+#~ msgid "Create label..."
+#~ msgstr "Új címke létrehozása..."
 
-#: js/viewfeed.js:1321
-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 "Create filter..."
+#~ msgstr "Szűrő létrehozása..."
+
+#~ msgid "You can't rescore this kind of feed."
+#~ msgstr "Ez a hírcsatorna típust nem lehet újraponszámozni."
+
+#~ msgid "Rescore articles in %s?"
+#~ msgstr "Újrapontszámozza %s híreit?"
+
+#~ msgid "Rescoring articles..."
+#~ msgstr "Hírek újrapontozása..."
+
+#~ msgid "Can't create label: missing caption."
+#~ msgstr "Címke létrehozása sikertelen: nincs megadva név."
 
 #~ msgid "Firefox integration"
 #~ msgstr "Firefox integráció"
diff --git a/locale/it_IT/LC_MESSAGES/messages.mo b/locale/it_IT/LC_MESSAGES/messages.mo
index 0d6940b28..1d8f48777 100644
Binary files a/locale/it_IT/LC_MESSAGES/messages.mo and b/locale/it_IT/LC_MESSAGES/messages.mo differ
diff --git a/locale/it_IT/LC_MESSAGES/messages.po b/locale/it_IT/LC_MESSAGES/messages.po
index e00d0730a..c3a77b97b 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: 2018-10-10 08:24+0300\n"
+"POT-Creation-Date: 2018-12-01 12:59+0300\n"
 "PO-Revision-Date: 2017-03-29 22:05+0200\n"
 "Last-Translator: dedioste <dedioste@gmail.com>\n"
 "Language-Team: \n"
@@ -93,8 +93,8 @@ msgid "Weekly"
 msgstr "Ogni settimana"
 
 #: backend.php:103
-#: classes/pref/users.php:47
 #: classes/pref/system.php:51
+#: classes/pref/users.php:47
 msgid "User"
 msgstr "Utente"
 
@@ -164,33 +164,33 @@ msgstr "Plugin non trovato"
 
 #: index.php:151
 #: index.php:167
-#: index.php:285
+#: index.php:282
 #: prefs.php:120
 #: classes/backend.php:5
 #: classes/pref/labels.php:294
-#: classes/pref/feeds.php:1230
 #: classes/pref/filters.php:822
-#: js/feedlist.js:148
-#: js/feedlist.js:491
-#: js/feedlist.js:539
-#: js/functions.js:314
-#: js/functions.js:1336
-#: js/prefs.js:562
-#: js/prefs.js:754
-#: js/prefs.js:1488
-#: js/prefs.js:1503
-#: js/tt-rss.js:547
-#: js/viewfeed.js:1180
+#: classes/pref/feeds.php:1229
+#: js/feedlist.js:118
+#: js/feedlist.js:446
+#: js/feedlist.js:487
+#: js/functions.js:328
+#: js/functions.js:551
+#: js/functions.js:1286
+#: js/prefs.js:477
+#: js/prefs.js:617
+#: js/prefs.js:956
+#: js/prefs.js:1000
+#: js/prefs.js:1028
+#: js/prefs.js:1037
+#: js/prefs.js:1045
+#: js/prefs.js:1057
+#: js/tt-rss.js:497
+#: js/viewfeed.js:509
+#: js/viewfeed.js:928
 #: plugins/import_export/import_export.js:17
-#: js/functions.js:565
-#: js/prefs.js:1200
-#: js/prefs.js:1253
-#: js/prefs.js:1292
-#: js/prefs.js:1305
-#: js/prefs.js:1316
-#: js/prefs.js:1331
-#: js/tt-rss.js:564
-#: js/viewfeed.js:760
+#: js/prefs.js:1192
+#: js/prefs.js:1205
+#: js/tt-rss.js:510
 msgid "Loading, please wait..."
 msgstr "Caricamento, attendere prego..."
 
@@ -207,13 +207,13 @@ msgid "All Articles"
 msgstr "Tutti gli articoli"
 
 #: index.php:194
-#: include/functions.php:1227
+#: include/functions.php:1172
 #: classes/feeds.php:110
 msgid "Starred"
 msgstr "Con stella"
 
 #: index.php:195
-#: include/functions.php:1228
+#: include/functions.php:1173
 #: classes/feeds.php:111
 msgid "Published"
 msgstr "Pubblicati"
@@ -253,11 +253,11 @@ msgid "Title"
 msgstr "Titolo"
 
 #: index.php:211
-#: index.php:251
-#: include/functions.php:1215
+#: index.php:250
+#: include/functions.php:1160
 #: classes/feeds.php:115
-#: js/FeedTree.js:41
-#: js/FeedTree.js:69
+#: js/FeedTree.js:42
+#: js/FeedTree.js:70
 msgid "Mark as read"
 msgstr "Segna come letto"
 
@@ -294,7 +294,7 @@ msgid "Feed actions:"
 msgstr "Azioni sul notiziario:"
 
 #: index.php:246
-#: classes/handler/public.php:551
+#: classes/handler/public.php:575
 msgid "Subscribe to feed..."
 msgstr "Sottoscrivi il notiziario..."
 
@@ -303,56 +303,44 @@ msgid "Edit this feed..."
 msgstr "Modifica questo notiziario..."
 
 #: index.php:248
-msgid "Rescore feed"
-msgstr "Cambia punteggio notiziario"
-
-#: index.php:249
-#: classes/pref/feeds.php:770
-#: classes/pref/feeds.php:1203
-#: js/PrefFeedTree.js:61
+#: classes/pref/feeds.php:769
+#: classes/pref/feeds.php:1202
+#: js/PrefFeedTree.js:62
 msgid "Unsubscribe"
 msgstr "Annulla sottoscrizione"
 
-#: index.php:250
+#: index.php:249
 msgid "All feeds:"
 msgstr "Tutti i notiziari:"
 
-#: index.php:252
+#: index.php:251
 msgid "(Un)hide read feeds"
 msgstr "Visualizza/Nascondi notiziari letti"
 
-#: index.php:253
+#: index.php:252
 msgid "Other actions:"
 msgstr "Altre azioni:"
 
-#: index.php:254
-#: include/functions.php:1201
+#: index.php:253
+#: include/functions.php:1146
 msgid "Toggle widescreen mode"
 msgstr "Modalità widescreen"
 
-#: index.php:255
-msgid "Create label..."
-msgstr "Crea etichetta..."
-
-#: index.php:256
-msgid "Create filter..."
-msgstr "Crea filtro..."
-
-#: index.php:257
+#: index.php:254
 msgid "Keyboard shortcuts help"
 msgstr "Aiuto scorciatoie da tastiera"
 
-#: index.php:266
+#: index.php:263
 msgid "Logout"
 msgstr "Esci"
 
-#: index.php:272
+#: index.php:269
 msgid "Updates are available from Git."
 msgstr "Gli aggiornamenti sono disponibili via Git."
 
 #: prefs.php:33
 #: prefs.php:138
-#: include/functions.php:1230
+#: include/functions.php:1175
 #: classes/pref/prefs.php:425
 msgid "Preferences"
 msgstr "Preferenze"
@@ -367,8 +355,8 @@ msgstr "Esci dalle preferenze"
 
 #: prefs.php:141
 #: classes/pref/feeds.php:114
-#: classes/pref/feeds.php:1138
-#: classes/pref/feeds.php:1192
+#: classes/pref/feeds.php:1137
+#: classes/pref/feeds.php:1191
 msgid "Feeds"
 msgstr "Notiziari"
 
@@ -378,8 +366,8 @@ msgid "Filters"
 msgstr "Filtri"
 
 #: prefs.php:147
+#: classes/feeds.php:1696
 #: classes/pref/labels.php:94
-#: classes/feeds.php:1710
 msgid "Labels"
 msgstr "Etichette"
 
@@ -391,80 +379,80 @@ msgstr "Utenti"
 msgid "System"
 msgstr "Sistema"
 
-#: register.php:186
+#: register.php:185
 #: include/login_form.php:162
 msgid "Create new account"
 msgstr "Crea un nuovo account"
 
-#: register.php:192
+#: register.php:191
 msgid "New user registrations are administratively disabled."
 msgstr "La registrazione di nuovi utenti è disattivata dall'amministratore."
 
-#: register.php:196
-#: register.php:241
-#: register.php:254
-#: register.php:269
-#: register.php:288
-#: register.php:336
-#: register.php:346
-#: register.php:358
-#: classes/handler/public.php:623
-#: classes/handler/public.php:697
-#: classes/handler/public.php:798
-#: classes/handler/public.php:877
-#: classes/handler/public.php:891
-#: classes/handler/public.php:898
-#: classes/handler/public.php:923
+#: register.php:195
+#: register.php:240
+#: register.php:253
+#: register.php:268
+#: register.php:287
+#: register.php:334
+#: register.php:344
+#: register.php:356
+#: classes/handler/public.php:647
+#: classes/handler/public.php:721
+#: 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"
 
-#: register.php:217
+#: register.php:216
 msgid "Your temporary password will be sent to the specified email. Accounts, which were not logged in once, are erased automatically 24 hours after temporary password is sent."
 msgstr "La password temporanea verrà inviata all'email specificata. Gli utenti che non eseguono l'accesso almeno una volta vengono cancellati automaticamente 24 ore dopo che la password temporanea è stata inviata."
 
-#: register.php:223
+#: register.php:222
 msgid "Desired login:"
 msgstr "Nome utente desiderato:"
 
-#: register.php:226
+#: register.php:225
 msgid "Check availability"
 msgstr "Controlla disponibilità"
 
-#: register.php:228
-#: classes/handler/public.php:713
+#: register.php:227
+#: classes/handler/public.php:737
 msgid "Email:"
 msgstr "Email:"
 
-#: register.php:231
-#: classes/handler/public.php:718
+#: register.php:230
+#: classes/handler/public.php:742
 msgid "How much is two plus two:"
 msgstr "Quanto fa due più due:"
 
-#: register.php:234
+#: register.php:233
 msgid "Submit registration"
 msgstr "Invia registrazione"
 
-#: register.php:252
+#: register.php:251
 msgid "Your registration information is incomplete."
 msgstr "Le informazioni di registrazione sono incomplete."
 
-#: register.php:267
+#: register.php:266
 msgid "Sorry, this username is already taken."
 msgstr "Il nome utente esiste già."
 
-#: register.php:286
+#: register.php:285
 msgid "Registration failed."
 msgstr "Registrazione fallita."
 
-#: register.php:333
+#: register.php:331
 msgid "Account created successfully."
 msgstr "Account creato con successo."
 
-#: register.php:355
+#: register.php:353
 msgid "New user registrations are currently closed."
 msgstr "La registrazione di nuovi utenti è attualmente chiusa."
 
-#: update.php:66
+#: update.php:67
 msgid "Tiny Tiny RSS data update script."
 msgstr "Script di aggiornamento dei dati di Tiny Tiny RSS."
 
@@ -477,10 +465,10 @@ msgstr "Tutti i notiziari"
 
 #: include/controls.php:138
 #: include/controls.php:230
-#: classes/opml.php:512
-#: classes/digest.php:120
+#: classes/digest.php:124
+#: classes/feeds.php:1708
 #: classes/pref/feeds.php:233
-#: classes/feeds.php:1722
+#: classes/opml.php:512
 msgid "Uncategorized"
 msgstr "Senza categoria"
 
@@ -495,285 +483,285 @@ msgstr[1] "%d articoli archiviati"
 msgid "No feeds found."
 msgstr "Nessun notiziario trovato."
 
-#: include/functions.php:983
+#: include/functions.php:928
 #, php-format
 msgid "%d min"
 msgstr "%d min"
 
-#: include/functions.php:1177
+#: include/functions.php:1122
 msgid "Navigation"
 msgstr "Navigazione"
 
-#: include/functions.php:1178
+#: include/functions.php:1123
 msgid "Open next feed"
 msgstr "Apri il notiziario successivo"
 
-#: include/functions.php:1179
+#: include/functions.php:1124
 msgid "Open previous feed"
 msgstr "Apri il notiziario precedente"
 
-#: include/functions.php:1180
+#: include/functions.php:1125
 msgid "Open next article"
 msgstr "Apri il prossimo articolo"
 
-#: include/functions.php:1181
+#: include/functions.php:1126
 msgid "Open previous article"
 msgstr "Apri l'articolo precedente"
 
-#: include/functions.php:1182
+#: include/functions.php:1127
 msgid "Open next article (don't scroll long articles)"
 msgstr "Apri il prossimo articolo (non scorrere gli articoli lunghi)"
 
-#: include/functions.php:1183
+#: include/functions.php:1128
 msgid "Open previous article (don't scroll long articles)"
 msgstr "Apri l'articolo precedente (non scorrere gli articoli lunghi)"
 
-#: include/functions.php:1184
+#: include/functions.php:1129
 msgid "Move to next article (don't expand or mark read)"
 msgstr "Passa al prossimo articolo (senza espandere o segnare come letto)"
 
-#: include/functions.php:1185
+#: include/functions.php:1130
 msgid "Move to previous article (don't expand or mark read)"
 msgstr "Passa all'articolo precedente (senza espandere o segnare come letto)"
 
-#: include/functions.php:1186
+#: include/functions.php:1131
 msgid "Show search dialog"
 msgstr "Mostra il campo di ricerca"
 
-#: include/functions.php:1187
+#: include/functions.php:1132
 msgid "Article"
 msgstr "Articolo"
 
-#: include/functions.php:1188
-#: js/viewfeed.js:1695
+#: include/functions.php:1133
+#: js/viewfeed.js:1341
 msgid "Toggle starred"
 msgstr "Inverti articoli con stella"
 
-#: include/functions.php:1189
-#: js/viewfeed.js:1707
+#: include/functions.php:1134
+#: js/viewfeed.js:1353
 msgid "Toggle published"
 msgstr "Inverti articoli pubblicati"
 
-#: include/functions.php:1190
-#: js/viewfeed.js:1682
+#: include/functions.php:1135
+#: js/viewfeed.js:1328
 msgid "Toggle unread"
 msgstr "Inverti articoli non letti"
 
-#: include/functions.php:1191
+#: include/functions.php:1136
 msgid "Edit tags"
 msgstr "Modifica etichette"
 
-#: include/functions.php:1192
+#: include/functions.php:1137
 msgid "Open in new window"
 msgstr "Apri in una nuova finestra"
 
-#: include/functions.php:1193
-#: js/viewfeed.js:1728
+#: include/functions.php:1138
+#: js/viewfeed.js:1374
 msgid "Mark below as read"
 msgstr "Segna gli articoli sotto come letti"
 
-#: include/functions.php:1194
-#: js/viewfeed.js:1721
+#: include/functions.php:1139
+#: js/viewfeed.js:1367
 msgid "Mark above as read"
 msgstr "Segna gli articoli sopra come letti"
 
-#: include/functions.php:1195
+#: include/functions.php:1140
 msgid "Scroll down"
 msgstr "Scorri giù"
 
-#: include/functions.php:1196
+#: include/functions.php:1141
 msgid "Scroll up"
 msgstr "Scorri sù"
 
-#: include/functions.php:1197
+#: include/functions.php:1142
 msgid "Select article under cursor"
 msgstr "Seleziona l'articolo sotto il cursore del mouse"
 
-#: include/functions.php:1198
+#: include/functions.php:1143
 msgid "Email article"
 msgstr "Invia articolo per email"
 
-#: include/functions.php:1199
+#: include/functions.php:1144
 msgid "Close/collapse article"
 msgstr "Chiudi / collassa articolo"
 
-#: include/functions.php:1200
+#: include/functions.php:1145
 msgid "Toggle article expansion (combined mode)"
 msgstr "Attiva/disattiva l'espansione degli articoli (modalità combinata)"
 
-#: include/functions.php:1202
+#: include/functions.php:1147
 #: plugins/embed_original/init.php:33
 msgid "Toggle embed original"
 msgstr "Attiva/disattiva gli originali"
 
-#: include/functions.php:1203
+#: include/functions.php:1148
 msgid "Article selection"
 msgstr "Seleziona articolo"
 
-#: include/functions.php:1204
+#: include/functions.php:1149
 msgid "Select all articles"
 msgstr "Seleziona tutti gli articoli"
 
-#: include/functions.php:1205
+#: include/functions.php:1150
 msgid "Select unread"
 msgstr "Seleziona articoli non letti"
 
-#: include/functions.php:1206
+#: include/functions.php:1151
 msgid "Select starred"
 msgstr "Seleziona articoli con stella"
 
-#: include/functions.php:1207
+#: include/functions.php:1152
 msgid "Select published"
 msgstr "Seleziona articoli pubblicati"
 
-#: include/functions.php:1208
+#: include/functions.php:1153
 msgid "Invert selection"
 msgstr "Inverti la selezione"
 
-#: include/functions.php:1209
+#: include/functions.php:1154
 msgid "Deselect everything"
 msgstr "Deseleziona tutto"
 
-#: include/functions.php:1210
-#: classes/pref/feeds.php:522
-#: classes/pref/feeds.php:794
+#: include/functions.php:1155
+#: classes/pref/feeds.php:521
+#: classes/pref/feeds.php:793
 msgid "Feed"
 msgstr "Notiziario"
 
-#: include/functions.php:1211
+#: include/functions.php:1156
 msgid "Refresh current feed"
 msgstr "Aggiorna notiziario attivo"
 
-#: include/functions.php:1212
+#: include/functions.php:1157
 msgid "Un/hide read feeds"
 msgstr "Visualizza/Nascondi notiziari letti"
 
-#: include/functions.php:1213
-#: classes/pref/feeds.php:1195
+#: include/functions.php:1158
+#: classes/pref/feeds.php:1194
 msgid "Subscribe to feed"
 msgstr "Sottoscrivi il notiziario"
 
-#: include/functions.php:1214
-#: js/FeedTree.js:48
-#: js/PrefFeedTree.js:55
-#: js/viewfeed.js:1846
+#: include/functions.php:1159
+#: js/FeedTree.js:49
+#: js/PrefFeedTree.js:56
+#: js/viewfeed.js:1492
 msgid "Edit feed"
 msgstr "Modifica notiziario"
 
-#: include/functions.php:1216
+#: include/functions.php:1161
 msgid "Reverse headlines"
 msgstr "Invertire l'ordine dei sommari"
 
-#: include/functions.php:1217
+#: include/functions.php:1162
 msgid "Toggle headline grouping"
 msgstr "Attiva/disattiva il raggruppamento dei titoli"
 
-#: include/functions.php:1218
+#: include/functions.php:1163
 msgid "Debug feed update"
 msgstr "Debug aggiornamenti dei feed"
 
-#: include/functions.php:1219
+#: include/functions.php:1164
 msgid "Debug viewfeed()"
 msgstr "Debug vista del feed (viewfeed())"
 
-#: include/functions.php:1220
-#: js/FeedTree.js:97
+#: include/functions.php:1165
+#: js/FeedTree.js:98
 msgid "Mark all feeds as read"
 msgstr "Segna tutti i notiziari come letti"
 
-#: include/functions.php:1221
+#: include/functions.php:1166
 msgid "Un/collapse current category"
 msgstr "Contrai la categoria corrente"
 
-#: include/functions.php:1222
-msgid "Toggle combined mode"
-msgstr "Attiva/disattiva modalità combinata"
-
-#: include/functions.php:1223
+#: include/functions.php:1167
 msgid "Toggle auto expand in combined mode"
 msgstr "Attiva/disattiva espansione automatica in modalità combinata"
 
-#: include/functions.php:1224
+#: include/functions.php:1168
+msgid "Toggle combined mode"
+msgstr "Attiva/disattiva modalità combinata"
+
+#: include/functions.php:1169
 msgid "Go to"
 msgstr "Vai a"
 
-#: include/functions.php:1225
-#: classes/feeds.php:1583
+#: include/functions.php:1170
+#: classes/feeds.php:1569
 msgid "All articles"
 msgstr "Tutti gli articoli"
 
-#: include/functions.php:1226
+#: include/functions.php:1171
 msgid "Fresh"
 msgstr "Recenti"
 
-#: include/functions.php:1229
-#: js/tt-rss.js:491
-#: js/tt-rss.js:660
+#: include/functions.php:1174
+#: js/tt-rss.js:439
+#: js/tt-rss.js:599
 msgid "Tag cloud"
 msgstr "Nuvola etichette"
 
-#: include/functions.php:1231
+#: include/functions.php:1176
 msgid "Other"
 msgstr "Altri"
 
-#: include/functions.php:1232
+#: include/functions.php:1177
 #: classes/pref/labels.php:279
 msgid "Create label"
 msgstr "Crea etichetta"
 
-#: include/functions.php:1233
+#: include/functions.php:1178
 #: classes/pref/filters.php:801
 msgid "Create filter"
 msgstr "Crea filtro"
 
-#: include/functions.php:1234
+#: include/functions.php:1179
 msgid "Un/collapse sidebar"
 msgstr "Espandi/Riduci la barra laterale"
 
-#: include/functions.php:1235
+#: include/functions.php:1180
 msgid "Show help dialog"
 msgstr "Mostra la sezione di aiuto"
 
-#: include/functions.php:2582
+#: include/functions.php:2529
 msgid "There is no error, the file uploaded with success"
 msgstr "Nessun errore, file caricato correttamente"
 
-#: include/functions.php:2583
+#: include/functions.php:2530
 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/functions.php:2584
+#: include/functions.php:2531
 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/functions.php:2585
+#: include/functions.php:2532
 msgid "The uploaded file was only partially uploaded"
 msgstr "Il file selezionato per il caricamento è stato trasferito solo parzialmente"
 
-#: include/functions.php:2586
+#: include/functions.php:2533
 msgid "No file was uploaded"
 msgstr "Nessun file caricato"
 
-#: include/functions.php:2587
+#: include/functions.php:2534
 msgid "Missing a temporary folder"
 msgstr "Cartella temporanea mancante"
 
-#: include/functions.php:2588
+#: include/functions.php:2535
 msgid "Failed to write file to disk."
 msgstr "Scrittura su disko fallita."
 
-#: include/functions.php:2589
+#: include/functions.php:2536
 msgid "A PHP extension stopped the file upload."
 msgstr "Una estensione di PHP ha bloccato il caricamento del file."
 
 #: include/login_form.php:107
-#: classes/handler/public.php:446
-#: classes/handler/public.php:708
+#: classes/handler/public.php:466
+#: classes/handler/public.php:732
 msgid "Login:"
 msgstr "Nome utente:"
 
 #: include/login_form.php:117
-#: classes/handler/public.php:449
+#: classes/handler/public.php:469
 msgid "Password:"
 msgstr "Password:"
 
@@ -786,9 +774,9 @@ msgid "Profile:"
 msgstr "Profilo:"
 
 #: include/login_form.php:133
-#: classes/handler/public.php:252
 #: classes/pref/prefs.php:1037
 #: classes/rpc.php:69
+#: classes/handler/public.php:272
 msgid "Default profile"
 msgstr "Profilo predefinito"
 
@@ -805,207 +793,27 @@ msgid "Remember me"
 msgstr "Ricordami"
 
 #: include/login_form.php:159
-#: classes/handler/public.php:454
+#: classes/handler/public.php:474
 msgid "Log in"
 msgstr "Accedi"
 
-#: include/sessions.php:46
+#: include/sessions.php:45
 msgid "Session failed to validate (schema version changed)"
 msgstr "La validazione della sessione è fallita (schema del database cambiato)"
 
-#: include/sessions.php:62
+#: include/sessions.php:53
+#, fuzzy
+msgid "Session failed to validate (UA changed)."
+msgstr "La validazione della sessione è fallita (password cambiata)"
+
+#: include/sessions.php:67
 msgid "Session failed to validate (password changed)"
 msgstr "La validazione della sessione è fallita (password cambiata)"
 
-#: include/sessions.php:69
+#: include/sessions.php:74
 msgid "Session failed to validate (user not found)"
 msgstr "La validazione della sessione è fallita (utente non trovato)"
 
-#: classes/article.php:26
-msgid "Article not found."
-msgstr "Articolo non trovato."
-
-#: classes/article.php:211
-msgid "Tags for this article (separated by commas):"
-msgstr "Etichette per questo articolo (separate da virgole):"
-
-#: classes/article.php:236
-#: classes/pref/labels.php:82
-#: classes/pref/users.php:103
-#: classes/pref/feeds.php:774
-#: classes/pref/feeds.php:914
-#: classes/pref/filters.php:525
-#: classes/pref/prefs.php:982
-#: plugins/nsfw/init.php:85
-#: plugins/note/init.php:58
-#: plugins/af_readability/init.php:80
-#: plugins/af_redditimgur/init.php:66
-#: plugins/af_psql_trgm/init.php:188
-#: plugins/mail/init.php:65
-#: plugins/af_zz_imgproxy/init.php:238
-msgid "Save"
-msgstr "Salva"
-
-#: classes/article.php:238
-#: classes/handler/public.php:423
-#: classes/handler/public.php:457
-#: classes/pref/labels.php:84
-#: classes/pref/users.php:105
-#: classes/pref/feeds.php:775
-#: classes/pref/feeds.php:917
-#: classes/pref/feeds.php:1672
-#: classes/pref/filters.php:528
-#: classes/pref/filters.php:945
-#: classes/pref/filters.php:1022
-#: classes/pref/filters.php:1115
-#: classes/pref/prefs.php:984
-#: classes/feeds.php:1037
-#: classes/feeds.php:1089
-#: classes/feeds.php:1128
-#: plugins/note/init.php:60
-#: plugins/mail/init.php:179
-msgid "Cancel"
-msgstr "Annulla"
-
-#: classes/article.php:337
-#: classes/article.php:720
-#: classes/article.php:875
-msgid "no tags"
-msgstr "nessuna etichetta"
-
-#: classes/article.php:448
-msgid "unknown type"
-msgstr "tipo sconosciuto"
-
-#: classes/article.php:525
-msgid "Attachments"
-msgstr "Allegati"
-
-#: classes/article.php:626
-#: classes/feeds.php:661
-msgid "comment"
-msgid_plural "comments"
-msgstr[0] "commento"
-msgstr[1] "commenti"
-
-#: classes/article.php:630
-#: classes/feeds.php:665
-msgid "comments"
-msgstr "commenti"
-
-#: classes/article.php:689
-msgid " - "
-msgstr " - "
-
-#: classes/article.php:730
-#: classes/feeds.php:647
-msgid "Edit tags for this article"
-msgstr "Modifica le etichette per questo articolo"
-
-#: classes/article.php:763
-#: classes/feeds.php:602
-msgid "Originally from:"
-msgstr "Originariamente da:"
-
-#: classes/article.php:774
-#: classes/pref/feeds.php:539
-#: classes/feeds.php:613
-msgid "Feed URL"
-msgstr "URL del notiziario"
-
-#: classes/article.php:811
-#: classes/backend.php:103
-#: classes/dlg.php:33
-#: classes/dlg.php:56
-#: classes/dlg.php:89
-#: classes/dlg.php:154
-#: classes/dlg.php:181
-#: classes/dlg.php:197
-#: classes/pref/feeds.php:1466
-#: classes/pref/feeds.php:1533
-#: classes/pref/filters.php:208
-#: classes/pref/prefs.php:1099
-#: plugins/af_psql_trgm/init.php:109
-#: plugins/import_export/init.php:446
-#: plugins/import_export/init.php:490
-#: plugins/share/init.php:128
-msgid "Close this window"
-msgstr "Chiudi questa finestra"
-
-#: classes/article.php:913
-msgid "(edit note)"
-msgstr "(modifica nota)"
-
-#: classes/opml.php:31
-#: classes/opml.php:36
-msgid "OPML Utility"
-msgstr "Utility OPML"
-
-#: classes/opml.php:40
-msgid "Importing OPML..."
-msgstr "Importazione OPML..."
-
-#: classes/opml.php:45
-msgid "Return to preferences"
-msgstr "Ritorna alle preferenze"
-
-#: classes/opml.php:301
-#, php-format
-msgid "Adding feed: %s"
-msgstr "Aggiungendo notiziario: %s"
-
-#: classes/opml.php:312
-#, php-format
-msgid "Duplicate feed: %s"
-msgstr "Notiziario duplicato: %s"
-
-#: classes/opml.php:326
-#, php-format
-msgid "Adding label %s"
-msgstr "Aggiunta etichetta %s"
-
-#: classes/opml.php:329
-#, php-format
-msgid "Duplicate label: %s"
-msgstr "Etichetta duplicata: %s"
-
-#: classes/opml.php:341
-#, php-format
-msgid "Setting preference key %s to %s"
-msgstr "Impostazione della voce delle preferenze %s a %s"
-
-#: classes/opml.php:377
-msgid "Adding filter..."
-msgstr "Aggiungendo filtro..."
-
-#: classes/opml.php:512
-#, php-format
-msgid "Processing category: %s"
-msgstr "Elaborando categoria: %s"
-
-#: classes/opml.php:558
-#, php-format
-msgid "Upload failed with error code %d"
-msgstr "Caricamento fallito con codice errore %d"
-
-#: classes/opml.php:570
-#: plugins/import_export/init.php:471
-msgid "Unable to move uploaded file."
-msgstr "Non è possibile spostare il file caricato."
-
-#: classes/opml.php:574
-#: plugins/import_export/init.php:475
-msgid "Error: please upload OPML file."
-msgstr "Errore: caricare il file OPML."
-
-#: classes/opml.php:585
-msgid "Error: unable to find moved OPML file."
-msgstr "Errore: non trovato il file OPML spostato."
-
-#: classes/opml.php:594
-msgid "Error while parsing document."
-msgstr "Errore durante l'analisi del documento."
-
 #: 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."
@@ -1026,162 +834,353 @@ msgstr "Ctrl"
 msgid "Help topic not found."
 msgstr "Argomento dell'aiuto non trovato."
 
-#: classes/dlg.php:17
-msgid "If you have imported labels and/or filters, you might need to reload preferences to see your new data."
-msgstr "Se sono stati importati etichette e/o filtri, ricaricare le preferenze per visualizzare i nuovi dati."
+#: classes/backend.php:103
+#: classes/pref/filters.php:208
+#: classes/pref/feeds.php:1465
+#: classes/pref/feeds.php:1532
+#: classes/pref/prefs.php:1099
+#: classes/dlg.php:33
+#: classes/dlg.php:56
+#: classes/dlg.php:89
+#: classes/dlg.php:154
+#: classes/dlg.php:181
+#: classes/dlg.php:197
+#: classes/article.php:810
+#: plugins/af_psql_trgm/init.php:109
+#: plugins/import_export/init.php:446
+#: plugins/import_export/init.php:490
+#: plugins/share/init.php:128
+msgid "Close this window"
+msgstr "Chiudi questa finestra"
 
-#: classes/dlg.php:44
-msgid "Your Public OPML URL is:"
-msgstr "L'URL OPML pubblico è:"
+#: classes/feeds.php:53
+msgid "View as RSS feed"
+msgstr "Visualizza come notiziario RSS"
 
-#: classes/dlg.php:53
-#: classes/dlg.php:178
-#: plugins/share/init.php:125
-msgid "Generate new URL"
-msgstr "Genera nuovo URL"
+#: classes/feeds.php:54
+#: classes/feeds.php:140
+#: classes/pref/feeds.php:1326
+msgid "View as RSS"
+msgstr "Visualizza come RSS"
 
-#: classes/dlg.php:67
-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:71
-#: classes/dlg.php:80
-msgid "Last update:"
-msgstr "Ultimo aggiornamento:"
-
-#: classes/dlg.php:76
-msgid "Update daemon is taking too long to perform a feed update. This could indicate a problem like crash or a hang. Please check the daemon process or contact instance owner."
-msgstr "Il demone di aggiornamento sta impiegando troppo tempo a eseguire l'aggiornamento del notiziario. Questo potrebbe indicare un problema come un crash o uno stallo. Controllare il processo del demone o contattare il proprietario dell'istanza."
-
-#: classes/dlg.php:169
-msgid "You can view this feed as RSS using the following URL:"
-msgstr "È possibile vedere questo notiziario come RSS usando il seguente URL:"
-
-#: classes/dlg.php:190
-msgid "You are using default tt-rss password. Please change it in the Preferences (Personal data / Authentication)."
-msgstr ""
-
-#: classes/dlg.php:194
-#, fuzzy
-msgid "Open Preferences"
-msgstr "Preferenze"
-
-#: classes/handler/public.php:387
-#: plugins/bookmarklets/init.php:40
-msgid "Share with Tiny Tiny RSS"
-msgstr "Condividi con Tiny Tiny RSS"
-
-#: classes/handler/public.php:395
-msgid "Title:"
-msgstr "Titolo:"
-
-#: classes/handler/public.php:397
-#: classes/pref/feeds.php:537
-msgid "URL:"
-msgstr "URL:"
-
-#: classes/handler/public.php:399
-msgid "Content:"
-msgstr "Contenuto:"
-
-#: classes/handler/public.php:401
-msgid "Labels:"
-msgstr "Etichette:"
-
-#: classes/handler/public.php:420
-msgid "Shared article will appear in the Published feed."
-msgstr "Gli articoli condivisi appariranno nel notiziario Pubblicati."
-
-#: classes/handler/public.php:422
-msgid "Share"
-msgstr "Condividi"
-
-#: classes/handler/public.php:444
-msgid "Not logged in"
-msgstr "Non connesso"
-
-#: classes/handler/public.php:504
-msgid "Incorrect username or password"
-msgstr "Nome utente o password sbagliati"
-
-#: classes/handler/public.php:557
+#: classes/feeds.php:62
 #, php-format
-msgid "Already subscribed to <b>%s</b>."
-msgstr "Notiziario <b>%s</b> già sottoscritto."
+msgid "Last updated: %s"
+msgstr "Ultimo aggiornamento: %s"
 
-#: classes/handler/public.php:560
+#: classes/feeds.php:100
+msgid "Select..."
+msgstr "Seleziona..."
+
+#: classes/feeds.php:102
+#: classes/pref/labels.php:273
+#: classes/pref/filters.php:391
+#: classes/pref/filters.php:449
+#: classes/pref/filters.php:795
+#: classes/pref/filters.php:878
+#: classes/pref/filters.php:905
+#: classes/pref/feeds.php:1185
+#: classes/pref/feeds.php:1416
+#: classes/pref/feeds.php:1481
+#: classes/pref/users.php:358
+#: classes/pref/prefs.php:996
+msgid "All"
+msgstr "Tutti"
+
+#: classes/feeds.php:104
+msgid "Invert"
+msgstr "Inverti"
+
+#: classes/feeds.php:105
+#: classes/pref/labels.php:275
+#: classes/pref/filters.php:393
+#: classes/pref/filters.php:451
+#: classes/pref/filters.php:797
+#: classes/pref/filters.php:880
+#: classes/pref/filters.php:907
+#: classes/pref/feeds.php:1187
+#: classes/pref/feeds.php:1418
+#: classes/pref/feeds.php:1483
+#: classes/pref/users.php:360
+#: classes/pref/prefs.php:998
+msgid "None"
+msgstr "Nessuno"
+
+#: classes/feeds.php:107
+msgid "Selection toggle:"
+msgstr "Inverti selezione:"
+
+#: classes/feeds.php:113
+msgid "Selection:"
+msgstr "Selezione:"
+
+#: classes/feeds.php:116
+msgid "Set score"
+msgstr "Imposta punteggio"
+
+#: classes/feeds.php:119
+msgid "Archive"
+msgstr "Archivio"
+
+#: classes/feeds.php:121
+msgid "Move back"
+msgstr "Sposta indietro"
+
+#: classes/feeds.php:122
+#: classes/pref/filters.php:400
+#: classes/pref/filters.php:458
+#: classes/pref/filters.php:887
+#: classes/pref/filters.php:914
+msgid "Delete"
+msgstr "Elimina"
+
+#: classes/feeds.php:127
+#: classes/feeds.php:132
+#: plugins/mailto/init.php:25
+#: plugins/mail/init.php:76
+msgid "Forward by email"
+msgstr "Inoltra per email"
+
+#: classes/feeds.php:136
+msgid "Feed:"
+msgstr "Notiziario:"
+
+#: classes/feeds.php:193
+#: classes/feeds.php:802
+msgid "Feed not found."
+msgstr "Notiziario non trovato."
+
+#: classes/feeds.php:255
+msgid "Never"
+msgstr "Mai"
+
+#: classes/feeds.php:341
 #, php-format
-msgid "Subscribed to <b>%s</b>."
-msgstr "Notiziario <b>%s</b> sottoscritto."
+msgid "Imported at %s"
+msgstr "Importato alle %s"
 
-#: classes/handler/public.php:563
+#: classes/feeds.php:391
+#: classes/feeds.php:484
+msgid "mark feed as read"
+msgstr "Segna notiziario come letto"
+
+#: classes/feeds.php:540
+msgid "Collapse article"
+msgstr "Riduci articoli"
+
+#: classes/feeds.php:592
+#: classes/article.php:762
+msgid "Originally from:"
+msgstr "Originariamente da:"
+
+#: classes/feeds.php:603
+#: classes/pref/feeds.php:538
+#: classes/article.php:773
+msgid "Feed URL"
+msgstr "URL del notiziario"
+
+#: classes/feeds.php:630
+#: classes/article.php:729
+msgid "Edit tags for this article"
+msgstr "Modifica le etichette per questo articolo"
+
+#: classes/feeds.php:644
+#: classes/article.php:625
+msgid "comment"
+msgid_plural "comments"
+msgstr[0] "commento"
+msgstr[1] "commenti"
+
+#: classes/feeds.php:648
+#: classes/article.php:629
+msgid "comments"
+msgstr "commenti"
+
+#: classes/feeds.php:686
+msgid "No unread articles found to display."
+msgstr "Nessun articolo non letto trovato da visualizzare."
+
+#: classes/feeds.php:689
+msgid "No updated articles found to display."
+msgstr "Nessun articolo aggiornato trovato da visualizzare."
+
+#: classes/feeds.php:692
+msgid "No starred articles found to display."
+msgstr "Nessun articolo con stella trovato da visualizzare."
+
+#: classes/feeds.php:696
+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:698
+msgid "No articles found to display."
+msgstr "Nessun articolo trovato da visualizzare."
+
+#: classes/feeds.php:714
+#: classes/feeds.php:905
 #, php-format
-msgid "Could not subscribe to <b>%s</b>."
-msgstr "Impossibile sottoscrivere <b>%s</b>."
+msgid "Feeds last updated at %s"
+msgstr "Ultimo aggiornamento notiziari alle %s"
 
-#: classes/handler/public.php:566
+#: classes/feeds.php:726
+#: classes/feeds.php:917
+msgid "Some feeds have update errors (click for details)"
+msgstr "Qualche notiziario ha degli errori di aggiornamento (fare clic per dettagli)"
+
+#: classes/feeds.php:894
+msgid "No feed selected."
+msgstr "Nessun notiziario selezionato."
+
+#: classes/feeds.php:958
+#: classes/feeds.php:966
+msgid "Feed or site URL"
+msgstr "URL del sito o del notiziario"
+
+#: classes/feeds.php:972
+#: classes/pref/feeds.php:559
+#: classes/pref/feeds.php:800
+#: classes/pref/feeds.php:1632
+msgid "Place in category:"
+msgstr "Mettere nella categoria:"
+
+#: classes/feeds.php:980
+msgid "Available feeds"
+msgstr "Notiziari disponibili"
+
+#: classes/feeds.php:992
+#: classes/pref/feeds.php:621
+#: classes/pref/feeds.php:848
+#: classes/pref/users.php:61
+msgid "Authentication"
+msgstr "Autenticazione"
+
+#: classes/feeds.php:996
+#: classes/pref/feeds.php:625
+#: classes/pref/feeds.php:852
+#: classes/pref/feeds.php:1646
+#: classes/pref/users.php:403
+msgid "Login"
+msgstr "Nome utente"
+
+#: classes/feeds.php:1000
+#: classes/pref/feeds.php:631
+#: classes/pref/feeds.php:860
+#: classes/pref/feeds.php:1649
+#: classes/pref/prefs.php:243
+msgid "Password"
+msgstr "Password"
+
+#: classes/feeds.php:1011
+#: classes/pref/feeds.php:645
+msgid "This feed requires authentication."
+msgstr "Questo notiziario richiede l'autenticazione."
+
+#: classes/feeds.php:1014
+#: classes/feeds.php:1070
+#: classes/pref/feeds.php:1668
+msgid "Subscribe"
+msgstr "Sottoscrivi"
+
+#: classes/feeds.php:1017
+msgid "More feeds"
+msgstr "Altri notiziari"
+
+#: classes/feeds.php:1020
+#: classes/feeds.php:1072
+#: classes/feeds.php:1111
+#: classes/pref/labels.php:84
+#: classes/pref/filters.php:528
+#: classes/pref/filters.php:945
+#: classes/pref/filters.php:1022
+#: classes/pref/filters.php:1115
+#: classes/pref/feeds.php:774
+#: classes/pref/feeds.php:916
+#: classes/pref/feeds.php:1669
+#: classes/pref/users.php:105
+#: classes/pref/prefs.php:984
+#: classes/article.php:238
+#: classes/handler/public.php:443
+#: classes/handler/public.php:477
+#: plugins/mail/init.php:179
+#: plugins/note/init.php:60
+msgid "Cancel"
+msgstr "Annulla"
+
+#: classes/feeds.php:1042
+#: classes/feeds.php:1110
+#: classes/pref/filters.php:788
+#: classes/pref/feeds.php:1178
+#: classes/pref/users.php:345
+#: js/tt-rss.js:152
+msgid "Search"
+msgstr "Cerca"
+
+#: classes/feeds.php:1046
+msgid "Popular feeds"
+msgstr "Notiziari popolari"
+
+#: classes/feeds.php:1047
+msgid "Feed archive"
+msgstr "Archivio notiziari"
+
+#: classes/feeds.php:1050
+msgid "limit:"
+msgstr "Limite:"
+
+#: classes/feeds.php:1071
+#: classes/pref/labels.php:282
+#: classes/pref/filters.php:518
+#: classes/pref/filters.php:814
+#: classes/pref/feeds.php:751
+#: classes/pref/users.php:369
+msgid "Remove"
+msgstr "Rimuovi"
+
+#: classes/feeds.php:1084
+msgid "Look for"
+msgstr "Cerca"
+
+#: classes/feeds.php:1092
 #, php-format
-msgid "No feeds found in <b>%s</b>."
-msgstr "Nessun notiziario trovato in <b>%s</b>."
+msgid "in %s"
+msgstr "in %s"
 
-#: classes/handler/public.php:569
-msgid "Multiple feed URLs found."
-msgstr "Trovati più URL di notiziari."
+#: classes/feeds.php:1097
+msgid "Used for word stemming"
+msgstr "Usato per determinare la radice delle parole"
 
-#: classes/handler/public.php:573
+#: classes/feeds.php:1106
+msgid "Search syntax"
+msgstr "Sintassi di ricerca"
+
+#: classes/feeds.php:1563
+msgid "Starred articles"
+msgstr "Articoli con stella"
+
+#: classes/feeds.php:1565
+msgid "Published articles"
+msgstr "Articoli pubblicati"
+
+#: classes/feeds.php:1567
+msgid "Fresh articles"
+msgstr "Articoli nuovi"
+
+#: classes/feeds.php:1571
+msgid "Archived articles"
+msgstr "Articoli archiviati"
+
+#: classes/feeds.php:1573
+msgid "Recently read"
+msgstr "Letti di recente"
+
+#: classes/feeds.php:1694
+msgid "Special"
+msgstr "Speciale"
+
+#: classes/feeds.php:1951
 #, 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:591
-msgid "Subscribe to selected feed"
-msgstr "Sottoscrivi il notiziario selezionato"
-
-#: classes/handler/public.php:618
-msgid "Edit subscription options"
-msgstr "Modifica opzioni di sottoscrizione"
-
-#: classes/handler/public.php:656
-msgid "Password recovery"
-msgstr "Recupera password"
-
-#: classes/handler/public.php:701
-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:723
-#: classes/pref/users.php:372
-msgid "Reset password"
-msgstr "Reimposta password"
-
-#: classes/handler/public.php:733
-msgid "Some of the required form parameters are missing or incorrect."
-msgstr "Alcuni dei parametri richiesti sono mancanti o scorretti."
-
-#: classes/handler/public.php:737
-#: classes/handler/public.php:806
-msgid "Go back"
-msgstr "Torna indietro"
-
-#: classes/handler/public.php:775
-msgid "[tt-rss] Password reset request"
-msgstr "[tt-rss] Richiesta di reset password"
-
-#: classes/handler/public.php:802
-msgid "Sorry, login and email combination not found."
-msgstr "Mi dispiace, nome utente e email non trovati."
-
-#: classes/handler/public.php:824
-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:850
-msgid "Database Updater"
-msgstr "Aggiornatore database"
-
-#: classes/handler/public.php:915
-msgid "Perform updates"
-msgstr "Effettua gli aggiornamenti"
+msgid "Search results: %s"
+msgstr "Risultati di ricerca: %s"
 
 #: classes/pref/labels.php:25
 #: classes/pref/filters.php:377
@@ -1201,199 +1200,191 @@ msgstr "Primo piano:"
 msgid "Background:"
 msgstr "Sfondo:"
 
+#: classes/pref/labels.php:82
+#: classes/pref/filters.php:525
+#: classes/pref/feeds.php:773
+#: classes/pref/feeds.php:913
+#: classes/pref/users.php:103
+#: classes/pref/prefs.php:982
+#: classes/article.php:236
+#: plugins/af_zz_imgproxy/init.php:238
+#: plugins/af_redditimgur/init.php:66
+#: plugins/af_psql_trgm/init.php:188
+#: plugins/af_readability/init.php:80
+#: plugins/nsfw/init.php:85
+#: plugins/mail/init.php:65
+#: plugins/note/init.php:58
+msgid "Save"
+msgstr "Salva"
+
 #: classes/pref/labels.php:244
 #, php-format
 msgid "Created label <b>%s</b>"
 msgstr "Etichetta <b>%s</b> creata"
 
 #: classes/pref/labels.php:270
-#: classes/pref/users.php:356
-#: classes/pref/feeds.php:1183
-#: classes/pref/feeds.php:1414
-#: classes/pref/feeds.php:1479
 #: classes/pref/filters.php:388
 #: classes/pref/filters.php:446
 #: classes/pref/filters.php:792
 #: classes/pref/filters.php:875
 #: classes/pref/filters.php:902
+#: classes/pref/feeds.php:1182
+#: classes/pref/feeds.php:1413
+#: classes/pref/feeds.php:1478
+#: classes/pref/users.php:355
 #: classes/pref/prefs.php:993
 msgid "Select"
 msgstr "Seleziona"
 
-#: classes/pref/labels.php:273
-#: classes/pref/users.php:359
-#: classes/pref/feeds.php:1186
-#: classes/pref/feeds.php:1417
-#: classes/pref/feeds.php:1482
-#: classes/pref/filters.php:391
-#: classes/pref/filters.php:449
-#: classes/pref/filters.php:795
-#: classes/pref/filters.php:878
-#: classes/pref/filters.php:905
-#: classes/pref/prefs.php:996
-#: classes/feeds.php:102
-msgid "All"
-msgstr "Tutti"
-
-#: classes/pref/labels.php:275
-#: classes/pref/users.php:361
-#: classes/pref/feeds.php:1188
-#: classes/pref/feeds.php:1419
-#: classes/pref/feeds.php:1484
-#: classes/pref/filters.php:393
-#: classes/pref/filters.php:451
-#: classes/pref/filters.php:797
-#: classes/pref/filters.php:880
-#: classes/pref/filters.php:907
-#: classes/pref/prefs.php:998
-#: classes/feeds.php:105
-msgid "None"
-msgstr "Nessuno"
-
-#: classes/pref/labels.php:282
-#: classes/pref/users.php:370
-#: classes/pref/feeds.php:752
-#: classes/pref/filters.php:518
-#: classes/pref/filters.php:814
-#: classes/feeds.php:1088
-msgid "Remove"
-msgstr "Rimuovi"
-
 #: classes/pref/labels.php:285
 msgid "Clear colors"
 msgstr "Cancella colori"
 
-#: 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."
+#: classes/pref/filters.php:155
+msgid "Preview article"
+msgstr "Anteprima articolo"
 
-#: classes/pref/users.php:26
-msgid "Edit user"
-msgstr "Modifica utente"
+#: classes/pref/filters.php:267
+#: classes/pref/filters.php:573
+msgid "(inverse)"
+msgstr "(inverso)"
 
-#: classes/pref/users.php:61
-#: classes/pref/feeds.php:622
-#: classes/pref/feeds.php:849
-#: classes/feeds.php:1009
-msgid "Authentication"
-msgstr "Autenticazione"
-
-#: classes/pref/users.php:64
-msgid "Access level: "
-msgstr "Livello di accesso: "
-
-#: classes/pref/users.php:82
-#: classes/pref/feeds.php:648
-#: classes/pref/feeds.php:867
-msgid "Options"
-msgstr "Opzioni"
-
-#: classes/pref/users.php:96
-#: js/prefs.js:479
-msgid "User details"
-msgstr "Dettagli utente"
-
-#: classes/pref/users.php:136
-#: classes/pref/users.php:407
-msgid "Registered"
-msgstr "Registrato"
-
-#: classes/pref/users.php:137
-msgid "Last logged in"
-msgstr "Ultimo accesso"
-
-#: classes/pref/users.php:145
-msgid "Subscribed feeds count"
-msgstr "Numero notiziari sottoscritti"
-
-#: classes/pref/users.php:146
-msgid "Stored articles"
-msgstr "Articoli memorizzati"
-
-#: classes/pref/users.php:150
-#: classes/pref/users.php:406
-msgid "Subscribed feeds"
-msgstr "Notiziari sottoscritti"
-
-#: classes/pref/users.php:176
-msgid "User not found"
-msgstr "Utente non trovato"
-
-#: classes/pref/users.php:246
+#: classes/pref/filters.php:263
+#: classes/pref/filters.php:572
 #, php-format
-msgid "Added user <b>%s</b> with password <b>%s</b>"
-msgstr "Aggiunto l'utente <b>%s</b> con password <b>%s</b>"
+msgid "%s on %s in %s %s"
+msgstr "%s su %s in %s %s"
 
-#: classes/pref/users.php:253
-#, php-format
-msgid "Could not create user <b>%s</b>"
-msgstr "Impossibile creare l'utente <b>%s<b>"
+#: classes/pref/filters.php:383
+#: classes/pref/filters.php:870
+#: classes/pref/filters.php:977
+msgid "Match"
+msgstr "Corrisponde"
 
-#: classes/pref/users.php:257
-#, php-format
-msgid "User <b>%s</b> already exists."
-msgstr "L'utente <b>%s</b> esiste già."
+#: classes/pref/filters.php:397
+#: classes/pref/filters.php:455
+#: classes/pref/filters.php:884
+#: classes/pref/filters.php:911
+msgid "Add"
+msgstr "Aggiungi"
 
-#: classes/pref/users.php:285
-#, 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/filters.php:441
+#: classes/pref/filters.php:897
+msgid "Apply actions"
+msgstr "Applica azioni"
 
-#: classes/pref/users.php:287
-#, 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/filters.php:492
+#: classes/pref/filters.php:926
+msgid "Enabled"
+msgstr "Attivato"
 
-#: classes/pref/users.php:311
-msgid "[tt-rss] Password change notification"
-msgstr "[tt-rss] Notifica di cambio password"
+#: classes/pref/filters.php:501
+#: classes/pref/filters.php:929
+msgid "Match any rule"
+msgstr "Corrisponde a una qualsiasi regola"
 
-#: classes/pref/users.php:346
-#: classes/pref/feeds.php:1179
-#: classes/pref/filters.php:788
-#: classes/feeds.php:1059
-#: classes/feeds.php:1127
-#: js/tt-rss.js:165
-msgid "Search"
-msgstr "Cerca"
+#: classes/pref/filters.php:510
+#: classes/pref/filters.php:932
+msgid "Inverse matching"
+msgstr "Corrispondenza inversa"
 
-#: classes/pref/users.php:364
-msgid "Create user"
-msgstr "Crea utente"
+#: classes/pref/filters.php:522
+#: classes/pref/filters.php:939
+msgid "Test"
+msgstr "Prova"
+
+#: classes/pref/filters.php:804
+msgid "Combine"
+msgstr "Combina"
 
-#: classes/pref/users.php:368
 #: classes/pref/filters.php:807
+#: classes/pref/users.php:367
 msgid "Edit"
 msgstr "Modifica"
 
-#: classes/pref/users.php:404
-#: classes/pref/feeds.php:626
-#: classes/pref/feeds.php:853
-#: classes/pref/feeds.php:1649
-#: classes/feeds.php:1013
-msgid "Login"
-msgstr "Nome utente"
+#: classes/pref/filters.php:810
+#: classes/pref/feeds.php:1198
+#: classes/pref/feeds.php:1212
+msgid "Reset sort order"
+msgstr "Reimposta ordinamento"
 
-#: classes/pref/users.php:405
-msgid "Access Level"
-msgstr "Livello di accesso"
+#: classes/pref/filters.php:942
+msgid "Create"
+msgstr "Crea"
 
-#: classes/pref/users.php:408
-msgid "Last login"
-msgstr "Ultimo accesso"
+#: classes/pref/filters.php:987
+msgid "Regular expression, without outer delimiters (i.e. slashes)"
+msgstr ""
 
-#: classes/pref/users.php:427
-msgid "Click to edit"
-msgstr "Fai clic per modificare"
+#: classes/pref/filters.php:993
+msgid "Inverse regular expression matching"
+msgstr "Corrispondenza inversa delle espressioni regolari"
 
-#: classes/pref/users.php:447
-msgid "No users defined."
-msgstr "Nessun utente definito."
+#: classes/pref/filters.php:995
+msgid "on field"
+msgstr "al campo"
 
-#: classes/pref/users.php:449
-msgid "No matching users found."
-msgstr "Nessun utente corrispondente trovato."
+#: classes/pref/filters.php:1001
+#: js/PrefFilterTree.js:44
+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:764
+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:786
+msgid "Add action"
+msgstr "Aggiungi azione"
+
+#: classes/pref/filters.php:1139
+msgid "[No caption]"
+msgstr "[Nessuna etichetta]"
+
+#: classes/pref/filters.php:1141
+#, 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:1155
+msgid "matches any rule"
+msgstr "Corrisponde a una qualsiasi regola"
+
+#: classes/pref/filters.php:1158
+#, php-format
+msgid "%s (+%d action)"
+msgid_plural "%s (+%d actions)"
+msgstr[0] "%s (+%d azione)"
+msgstr[1] "%s (+%d azioni)"
+
+#: classes/pref/system.php:8
+#: classes/pref/users.php:6
+msgid "Your access level is insufficient to open this tab."
+msgstr "Il livello di accesso non è sufficiente per aprire questa scheda."
 
 #: classes/pref/system.php:29
 msgid "Error Log"
@@ -1438,381 +1429,313 @@ msgid_plural "(%d feeds)"
 msgstr[0] "(%d notiziario)"
 msgstr[1] "(%d notiziari)"
 
-#: classes/pref/feeds.php:514
+#: classes/pref/feeds.php:513
 #: classes/pref/prefs.php:18
 msgid "General"
 msgstr "Generale"
 
-#: classes/pref/feeds.php:528
+#: classes/pref/feeds.php:527
 msgid "Feed Title"
 msgstr "Titolo del notiziario"
 
-#: classes/pref/feeds.php:560
-#: classes/pref/feeds.php:801
-#: classes/pref/feeds.php:1635
-#: classes/feeds.php:989
-msgid "Place in category:"
-msgstr "Mettere nella categoria:"
+#: classes/pref/feeds.php:536
+#: classes/handler/public.php:417
+msgid "URL:"
+msgstr "URL:"
 
-#: classes/pref/feeds.php:572
+#: classes/pref/feeds.php:571
 #, fuzzy
 msgid "Site URL:"
 msgstr "URL dell'articolo:"
 
-#: classes/pref/feeds.php:574
+#: classes/pref/feeds.php:573
 #, fuzzy
 msgid "Site URL"
 msgstr "URL del notiziario"
 
-#: classes/pref/feeds.php:585
-#: classes/pref/feeds.php:815
+#: classes/pref/feeds.php:584
+#: classes/pref/feeds.php:814
 msgid "Language:"
 msgstr "Lingua:"
 
-#: classes/pref/feeds.php:592
-#: classes/pref/feeds.php:824
+#: classes/pref/feeds.php:591
+#: classes/pref/feeds.php:823
 msgid "Update"
 msgstr "Aggiorna"
 
-#: classes/pref/feeds.php:607
-#: classes/pref/feeds.php:840
+#: classes/pref/feeds.php:606
+#: classes/pref/feeds.php:839
 msgid "Article purging:"
 msgstr "Eliminazione articoli:"
 
-#: classes/pref/feeds.php:632
-#: classes/pref/feeds.php:861
-#: classes/pref/feeds.php:1652
-#: classes/pref/prefs.php:243
-#: classes/feeds.php:1017
-msgid "Password"
-msgstr "Password"
-
-#: classes/pref/feeds.php:636
+#: classes/pref/feeds.php:635
 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:646
-#: classes/feeds.php:1028
-msgid "This feed requires authentication."
-msgstr "Questo notiziario richiede l'autenticazione."
+#: classes/pref/feeds.php:647
+#: classes/pref/feeds.php:866
+#: classes/pref/users.php:82
+msgid "Options"
+msgstr "Opzioni"
 
-#: classes/pref/feeds.php:662
-#: classes/pref/feeds.php:871
+#: classes/pref/feeds.php:661
+#: classes/pref/feeds.php:870
 msgid "Hide from Popular feeds"
 msgstr "Nascondere dai notiziari Popolari"
 
-#: classes/pref/feeds.php:674
-#: classes/pref/feeds.php:877
+#: classes/pref/feeds.php:673
+#: classes/pref/feeds.php:876
 msgid "Include in e-mail digest"
 msgstr "Includere nell'email riassunto"
 
-#: classes/pref/feeds.php:687
-#: classes/pref/feeds.php:883
+#: classes/pref/feeds.php:686
+#: classes/pref/feeds.php:882
 msgid "Always display image attachments"
 msgstr "Mostrare sempre le immagini allegate"
 
-#: classes/pref/feeds.php:700
-#: classes/pref/feeds.php:891
+#: classes/pref/feeds.php:699
+#: classes/pref/feeds.php:890
 #, fuzzy
 msgid "Do not embed media"
 msgstr "Non includere le immagini"
 
-#: classes/pref/feeds.php:713
-#: classes/pref/feeds.php:899
+#: classes/pref/feeds.php:712
+#: classes/pref/feeds.php:898
 msgid "Cache media"
 msgstr "Fai la cache degli elementi media"
 
-#: classes/pref/feeds.php:725
-#: classes/pref/feeds.php:905
+#: classes/pref/feeds.php:724
+#: classes/pref/feeds.php:904
 msgid "Mark updated articles as unread"
 msgstr "Segnare gli articoli aggiornati come non letti"
 
-#: classes/pref/feeds.php:729
+#: classes/pref/feeds.php:728
 msgid "Icon"
 msgstr "Icona"
 
-#: classes/pref/feeds.php:743
-#: classes/pref/feeds.php:1284
+#: classes/pref/feeds.php:742
+#: classes/pref/feeds.php:1283
 #: plugins/import_export/init.php:71
 #, fuzzy
 msgid "Choose file..."
 msgstr "Crea filtro..."
 
-#: classes/pref/feeds.php:750
+#: classes/pref/feeds.php:749
 msgid "Replace"
 msgstr "Sostituisci"
 
-#: classes/pref/feeds.php:757
+#: classes/pref/feeds.php:756
 #: classes/pref/prefs.php:679
 msgid "Plugins"
 msgstr "Plugin"
 
-#: classes/pref/feeds.php:1154
+#: classes/pref/feeds.php:1153
 msgid "Feeds with errors"
 msgstr "Notiziari con errori"
 
-#: classes/pref/feeds.php:1161
+#: classes/pref/feeds.php:1160
 msgid "Inactive feeds"
 msgstr "Notiziari non attivi"
 
-#: classes/pref/feeds.php:1197
+#: classes/pref/feeds.php:1196
 msgid "Edit selected feeds"
 msgstr "Modifica i notiziari selezionati"
 
-#: classes/pref/feeds.php:1199
-#: classes/pref/feeds.php:1213
-#: classes/pref/filters.php:810
-msgid "Reset sort order"
-msgstr "Reimposta ordinamento"
-
-#: classes/pref/feeds.php:1201
-#: js/prefs.js:1462
+#: classes/pref/feeds.php:1200
+#: js/prefs.js:1171
 msgid "Batch subscribe"
 msgstr "Sottoscrivi in gruppo"
 
-#: classes/pref/feeds.php:1208
+#: classes/pref/feeds.php:1207
 msgid "Categories"
 msgstr "Categorie"
 
-#: classes/pref/feeds.php:1211
+#: classes/pref/feeds.php:1210
 msgid "Add category"
 msgstr "Aggiungi categoria"
 
-#: classes/pref/feeds.php:1215
+#: classes/pref/feeds.php:1214
 msgid "Remove selected"
 msgstr "Rimuovere i selezionati"
 
-#: classes/pref/feeds.php:1272
+#: classes/pref/feeds.php:1271
 msgid "OPML"
 msgstr "OPML"
 
-#: classes/pref/feeds.php:1274
+#: classes/pref/feeds.php:1273
 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:1275
+#: classes/pref/feeds.php:1274
 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:1290
+#: classes/pref/feeds.php:1289
 msgid "Import my OPML"
 msgstr "Importa il mio OPML"
 
-#: classes/pref/feeds.php:1296
+#: classes/pref/feeds.php:1295
 msgid "Filename:"
 msgstr "Nome del file:"
 
-#: classes/pref/feeds.php:1298
+#: classes/pref/feeds.php:1297
 msgid "Include settings"
 msgstr "Includi le impostazioni"
 
-#: classes/pref/feeds.php:1302
+#: classes/pref/feeds.php:1301
 msgid "Export OPML"
 msgstr "Esporta OPML"
 
-#: classes/pref/feeds.php:1306
+#: classes/pref/feeds.php:1305
 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:1310
+#: classes/pref/feeds.php:1309
 msgid "Public OPML URL"
 msgstr "URL OPML pubblico"
 
-#: classes/pref/feeds.php:1311
+#: classes/pref/feeds.php:1310
 msgid "Display published OPML URL"
 msgstr "Mostra URL pubblico dell'OPML"
 
-#: classes/pref/feeds.php:1318
+#: classes/pref/feeds.php:1317
 msgid "Published & shared articles / Generated feeds"
 msgstr "Articoli pubblicati e condivisi / Notiziari generati"
 
-#: classes/pref/feeds.php:1320
+#: classes/pref/feeds.php:1319
 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:1327
-#: classes/feeds.php:54
-#: classes/feeds.php:140
-msgid "View as RSS"
-msgstr "Visualizza come RSS"
-
-#: classes/pref/feeds.php:1328
 msgid "Display URL"
 msgstr "Visualizza URL"
 
-#: classes/pref/feeds.php:1331
+#: classes/pref/feeds.php:1330
 msgid "Clear all generated URLs"
 msgstr "Cancella tutti gli URL generati"
 
-#: classes/pref/feeds.php:1410
+#: classes/pref/feeds.php:1409
 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:1444
-#: classes/pref/feeds.php:1509
+#: classes/pref/feeds.php:1443
+#: classes/pref/feeds.php:1508
 msgid "Click to edit feed"
 msgstr "Fare clic per modificare il notiziario"
 
-#: classes/pref/feeds.php:1462
-#: classes/pref/feeds.php:1529
+#: classes/pref/feeds.php:1461
+#: classes/pref/feeds.php:1528
 msgid "Unsubscribe from selected feeds"
 msgstr "Annulla la sottoscrizione ai notiziari selezionati"
 
-#: classes/pref/feeds.php:1632
+#: classes/pref/feeds.php:1629
 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:1641
+#: classes/pref/feeds.php:1638
 msgid "Feeds to subscribe, One per line"
 msgstr "Notiziari da sottoscrivere, uno per linea"
 
-#: classes/pref/feeds.php:1664
+#: classes/pref/feeds.php:1661
 msgid "Feeds require authentication."
 msgstr "I notiziari richiedono autenticazione."
 
-#: classes/pref/feeds.php:1671
-#: classes/feeds.php:1031
-#: classes/feeds.php:1087
-msgid "Subscribe"
-msgstr "Sottoscrivi"
+#: classes/pref/users.php:26
+msgid "Edit user"
+msgstr "Modifica utente"
 
-#: classes/pref/filters.php:155
-msgid "Preview article"
-msgstr "Anteprima articolo"
+#: classes/pref/users.php:64
+msgid "Access level: "
+msgstr "Livello di accesso: "
 
-#: classes/pref/filters.php:267
-#: classes/pref/filters.php:573
-msgid "(inverse)"
-msgstr "(inverso)"
+#: classes/pref/users.php:96
+#: js/prefs.js:403
+msgid "User details"
+msgstr "Dettagli utente"
 
-#: classes/pref/filters.php:263
-#: classes/pref/filters.php:572
+#: classes/pref/users.php:136
+#: classes/pref/users.php:406
+msgid "Registered"
+msgstr "Registrato"
+
+#: classes/pref/users.php:137
+msgid "Last logged in"
+msgstr "Ultimo accesso"
+
+#: classes/pref/users.php:145
+msgid "Subscribed feeds count"
+msgstr "Numero notiziari sottoscritti"
+
+#: classes/pref/users.php:146
+msgid "Stored articles"
+msgstr "Articoli memorizzati"
+
+#: classes/pref/users.php:150
+#: classes/pref/users.php:405
+msgid "Subscribed feeds"
+msgstr "Notiziari sottoscritti"
+
+#: classes/pref/users.php:176
+msgid "User not found"
+msgstr "Utente non trovato"
+
+#: classes/pref/users.php:246
 #, php-format
-msgid "%s on %s in %s %s"
-msgstr "%s su %s in %s %s"
+msgid "Added user <b>%s</b> with password <b>%s</b>"
+msgstr "Aggiunto l'utente <b>%s</b> con password <b>%s</b>"
 
-#: classes/pref/filters.php:383
-#: classes/pref/filters.php:870
-#: classes/pref/filters.php:977
-msgid "Match"
-msgstr "Corrisponde"
-
-#: classes/pref/filters.php:397
-#: classes/pref/filters.php:455
-#: classes/pref/filters.php:884
-#: classes/pref/filters.php:911
-msgid "Add"
-msgstr "Aggiungi"
-
-#: classes/pref/filters.php:400
-#: classes/pref/filters.php:458
-#: classes/pref/filters.php:887
-#: classes/pref/filters.php:914
-#: classes/feeds.php:122
-msgid "Delete"
-msgstr "Elimina"
-
-#: classes/pref/filters.php:441
-#: classes/pref/filters.php:897
-msgid "Apply actions"
-msgstr "Applica azioni"
-
-#: classes/pref/filters.php:492
-#: classes/pref/filters.php:926
-msgid "Enabled"
-msgstr "Attivato"
-
-#: classes/pref/filters.php:501
-#: classes/pref/filters.php:929
-msgid "Match any rule"
-msgstr "Corrisponde a una qualsiasi regola"
-
-#: classes/pref/filters.php:510
-#: classes/pref/filters.php:932
-msgid "Inverse matching"
-msgstr "Corrispondenza inversa"
-
-#: classes/pref/filters.php:522
-#: classes/pref/filters.php:939
-msgid "Test"
-msgstr "Prova"
-
-#: classes/pref/filters.php:804
-msgid "Combine"
-msgstr "Combina"
-
-#: classes/pref/filters.php:942
-msgid "Create"
-msgstr "Crea"
-
-#: classes/pref/filters.php:987
-msgid "Regular expression, without outer delimiters (i.e. slashes)"
-msgstr ""
-
-#: 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:43
-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:797
-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:819
-msgid "Add action"
-msgstr "Aggiungi azione"
-
-#: classes/pref/filters.php:1139
-msgid "[No caption]"
-msgstr "[Nessuna etichetta]"
-
-#: classes/pref/filters.php:1141
+#: classes/pref/users.php:253
 #, php-format
-msgid "%s (%d rule)"
-msgid_plural "%s (%d rules)"
-msgstr[0] "%s (%d regola)"
-msgstr[1] "%s (%d regole)"
+msgid "Could not create user <b>%s</b>"
+msgstr "Impossibile creare l'utente <b>%s<b>"
 
-#: classes/pref/filters.php:1155
-msgid "matches any rule"
-msgstr "Corrisponde a una qualsiasi regola"
-
-#: classes/pref/filters.php:1158
+#: classes/pref/users.php:257
 #, php-format
-msgid "%s (+%d action)"
-msgid_plural "%s (+%d actions)"
-msgstr[0] "%s (+%d azione)"
-msgstr[1] "%s (+%d azioni)"
+msgid "User <b>%s</b> already exists."
+msgstr "L'utente <b>%s</b> esiste già."
+
+#: classes/pref/users.php:285
+#, 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:287
+#, 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:310
+msgid "[tt-rss] Password change notification"
+msgstr "[tt-rss] Notifica di cambio password"
+
+#: classes/pref/users.php:363
+msgid "Create user"
+msgstr "Crea utente"
+
+#: classes/pref/users.php:371
+#: classes/handler/public.php:747
+msgid "Reset password"
+msgstr "Reimposta password"
+
+#: classes/pref/users.php:404
+msgid "Access Level"
+msgstr "Livello di accesso"
+
+#: classes/pref/users.php:407
+msgid "Last login"
+msgstr "Ultimo accesso"
+
+#: classes/pref/users.php:426
+msgid "Click to edit"
+msgstr "Fai clic per modificare"
+
+#: classes/pref/users.php:446
+msgid "No users defined."
+msgstr "Nessun utente definito."
+
+#: classes/pref/users.php:448
+msgid "No matching users found."
+msgstr "Nessun utente corrispondente trovato."
 
 #: classes/pref/prefs.php:19
 msgid "Interface"
@@ -1988,7 +1911,7 @@ 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:1424
+#: js/prefs.js:1136
 msgid "Customize stylesheet"
 msgstr "Personalizza il foglio di stile"
 
@@ -2231,250 +2154,296 @@ msgstr "Rimuovi i profili selezionati"
 msgid "Activate profile"
 msgstr "Attiva profilo"
 
-#: classes/feeds.php:53
-msgid "View as RSS feed"
-msgstr "Visualizza come notiziario RSS"
+#: 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."
 
-#: classes/feeds.php:62
+#: classes/dlg.php:44
+msgid "Your Public OPML URL is:"
+msgstr "L'URL OPML pubblico è:"
+
+#: classes/dlg.php:53
+#: classes/dlg.php:178
+#: plugins/share/init.php:125
+msgid "Generate new URL"
+msgstr "Genera nuovo URL"
+
+#: classes/dlg.php:67
+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:71
+#: classes/dlg.php:80
+msgid "Last update:"
+msgstr "Ultimo aggiornamento:"
+
+#: classes/dlg.php:76
+msgid "Update daemon is taking too long to perform a feed update. This could indicate a problem like crash or a hang. Please check the daemon process or contact instance owner."
+msgstr "Il demone di aggiornamento sta impiegando troppo tempo a eseguire l'aggiornamento del notiziario. Questo potrebbe indicare un problema come un crash o uno stallo. Controllare il processo del demone o contattare il proprietario dell'istanza."
+
+#: classes/dlg.php:169
+msgid "You can view this feed as RSS using the following URL:"
+msgstr "È possibile vedere questo notiziario come RSS usando il seguente URL:"
+
+#: classes/dlg.php:190
+msgid "You are using default tt-rss password. Please change it in the Preferences (Personal data / Authentication)."
+msgstr ""
+
+#: classes/dlg.php:194
+#, fuzzy
+msgid "Open Preferences"
+msgstr "Preferenze"
+
+#: classes/opml.php:31
+#: classes/opml.php:36
+msgid "OPML Utility"
+msgstr "Utility OPML"
+
+#: classes/opml.php:40
+msgid "Importing OPML..."
+msgstr "Importazione OPML..."
+
+#: classes/opml.php:45
+msgid "Return to preferences"
+msgstr "Ritorna alle preferenze"
+
+#: classes/opml.php:301
 #, php-format
-msgid "Last updated: %s"
-msgstr "Ultimo aggiornamento: %s"
+msgid "Adding feed: %s"
+msgstr "Aggiungendo notiziario: %s"
 
-#: classes/feeds.php:100
-msgid "Select..."
-msgstr "Seleziona..."
-
-#: classes/feeds.php:104
-msgid "Invert"
-msgstr "Inverti"
-
-#: classes/feeds.php:107
-msgid "Selection toggle:"
-msgstr "Inverti selezione:"
-
-#: classes/feeds.php:113
-msgid "Selection:"
-msgstr "Selezione:"
-
-#: classes/feeds.php:116
-msgid "Set score"
-msgstr "Imposta punteggio"
-
-#: classes/feeds.php:119
-msgid "Archive"
-msgstr "Archivio"
-
-#: classes/feeds.php:121
-msgid "Move back"
-msgstr "Sposta indietro"
-
-#: classes/feeds.php:127
-#: classes/feeds.php:132
-#: plugins/mail/init.php:76
-#: plugins/mailto/init.php:25
-msgid "Forward by email"
-msgstr "Inoltra per email"
-
-#: classes/feeds.php:136
-msgid "Feed:"
-msgstr "Notiziario:"
-
-#: classes/feeds.php:193
-#: classes/feeds.php:819
-msgid "Feed not found."
-msgstr "Notiziario non trovato."
-
-#: classes/feeds.php:255
-msgid "Never"
-msgstr "Mai"
-
-#: classes/feeds.php:342
+#: classes/opml.php:312
 #, php-format
-msgid "Imported at %s"
-msgstr "Importato alle %s"
+msgid "Duplicate feed: %s"
+msgstr "Notiziario duplicato: %s"
 
-#: classes/feeds.php:394
-#: classes/feeds.php:487
-msgid "mark feed as read"
-msgstr "Segna notiziario come letto"
-
-#: classes/feeds.php:542
-msgid "Collapse article"
-msgstr "Riduci articoli"
-
-#: classes/feeds.php:703
-msgid "No unread articles found to display."
-msgstr "Nessun articolo non letto trovato da visualizzare."
-
-#: classes/feeds.php:706
-msgid "No updated articles found to display."
-msgstr "Nessun articolo aggiornato trovato da visualizzare."
-
-#: classes/feeds.php:709
-msgid "No starred articles found to display."
-msgstr "Nessun articolo con stella trovato da visualizzare."
-
-#: classes/feeds.php:713
-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:715
-msgid "No articles found to display."
-msgstr "Nessun articolo trovato da visualizzare."
-
-#: classes/feeds.php:731
-#: classes/feeds.php:922
+#: classes/opml.php:326
 #, php-format
-msgid "Feeds last updated at %s"
-msgstr "Ultimo aggiornamento notiziari alle %s"
+msgid "Adding label %s"
+msgstr "Aggiunta etichetta %s"
 
-#: classes/feeds.php:743
-#: classes/feeds.php:934
-msgid "Some feeds have update errors (click for details)"
-msgstr "Qualche notiziario ha degli errori di aggiornamento (fare clic per dettagli)"
-
-#: classes/feeds.php:911
-msgid "No feed selected."
-msgstr "Nessun notiziario selezionato."
-
-#: classes/feeds.php:975
-#: classes/feeds.php:983
-msgid "Feed or site URL"
-msgstr "URL del sito o del notiziario"
-
-#: classes/feeds.php:997
-msgid "Available feeds"
-msgstr "Notiziari disponibili"
-
-#: classes/feeds.php:1034
-msgid "More feeds"
-msgstr "Altri notiziari"
-
-#: classes/feeds.php:1063
-msgid "Popular feeds"
-msgstr "Notiziari popolari"
-
-#: classes/feeds.php:1064
-msgid "Feed archive"
-msgstr "Archivio notiziari"
-
-#: classes/feeds.php:1067
-msgid "limit:"
-msgstr "Limite:"
-
-#: classes/feeds.php:1101
-msgid "Look for"
-msgstr "Cerca"
-
-#: classes/feeds.php:1109
+#: classes/opml.php:329
 #, php-format
-msgid "in %s"
-msgstr "in %s"
+msgid "Duplicate label: %s"
+msgstr "Etichetta duplicata: %s"
 
-#: classes/feeds.php:1114
-msgid "Used for word stemming"
-msgstr "Usato per determinare la radice delle parole"
-
-#: classes/feeds.php:1123
-msgid "Search syntax"
-msgstr "Sintassi di ricerca"
-
-#: classes/feeds.php:1577
-msgid "Starred articles"
-msgstr "Articoli con stella"
-
-#: classes/feeds.php:1579
-msgid "Published articles"
-msgstr "Articoli pubblicati"
-
-#: classes/feeds.php:1581
-msgid "Fresh articles"
-msgstr "Articoli nuovi"
-
-#: classes/feeds.php:1585
-msgid "Archived articles"
-msgstr "Articoli archiviati"
-
-#: classes/feeds.php:1587
-msgid "Recently read"
-msgstr "Letti di recente"
-
-#: classes/feeds.php:1708
-msgid "Special"
-msgstr "Speciale"
-
-#: classes/feeds.php:1965
+#: classes/opml.php:341
 #, php-format
-msgid "Search results: %s"
-msgstr "Risultati di ricerca: %s"
+msgid "Setting preference key %s to %s"
+msgstr "Impostazione della voce delle preferenze %s a %s"
 
-#: 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/opml.php:377
+msgid "Adding filter..."
+msgstr "Aggiungendo filtro..."
 
-#: plugins/nsfw/init.php:52
-msgid "NSFW Plugin"
-msgstr "Plugin NSFW"
+#: classes/opml.php:512
+#, php-format
+msgid "Processing category: %s"
+msgstr "Elaborando categoria: %s"
 
-#: plugins/nsfw/init.php:79
-msgid "Tags to consider NSFW (comma-separated)"
-msgstr "Tag da considerare NSFW (divisi da virgole)"
+#: classes/opml.php:558
+#, php-format
+msgid "Upload failed with error code %d"
+msgstr "Caricamento fallito con codice errore %d"
 
-#: plugins/nsfw/init.php:100
-msgid "Configuration saved."
-msgstr "La configurazione è stata salvata."
+#: classes/opml.php:570
+#: plugins/import_export/init.php:471
+msgid "Unable to move uploaded file."
+msgstr "Non è possibile spostare il file caricato."
 
-#: plugins/note/init.php:28
-#: plugins/note/note.js:11
-msgid "Edit article note"
-msgstr "Modifica note articolo"
+#: classes/opml.php:574
+#: plugins/import_export/init.php:475
+msgid "Error: please upload OPML file."
+msgstr "Errore: caricare il file OPML."
+
+#: classes/opml.php:585
+msgid "Error: unable to find moved OPML file."
+msgstr "Errore: non trovato il file OPML spostato."
+
+#: classes/opml.php:594
+msgid "Error while parsing document."
+msgstr "Errore durante l'analisi del documento."
+
+#: classes/article.php:26
+msgid "Article not found."
+msgstr "Articolo non trovato."
+
+#: classes/article.php:211
+msgid "Tags for this article (separated by commas):"
+msgstr "Etichette per questo articolo (separate da virgole):"
+
+#: classes/article.php:337
+#: classes/article.php:719
+#: classes/article.php:874
+msgid "no tags"
+msgstr "nessuna etichetta"
+
+#: classes/article.php:447
+msgid "unknown type"
+msgstr "tipo sconosciuto"
+
+#: classes/article.php:524
+msgid "Attachments"
+msgstr "Allegati"
+
+#: classes/article.php:688
+msgid " - "
+msgstr " - "
+
+#: classes/article.php:912
+msgid "(edit note)"
+msgstr "(modifica nota)"
+
+#: classes/handler/public.php:407
+#: plugins/bookmarklets/init.php:40
+msgid "Share with Tiny Tiny RSS"
+msgstr "Condividi con Tiny Tiny RSS"
+
+#: classes/handler/public.php:415
+msgid "Title:"
+msgstr "Titolo:"
+
+#: classes/handler/public.php:419
+msgid "Content:"
+msgstr "Contenuto:"
+
+#: classes/handler/public.php:421
+msgid "Labels:"
+msgstr "Etichette:"
+
+#: classes/handler/public.php:440
+msgid "Shared article will appear in the Published feed."
+msgstr "Gli articoli condivisi appariranno nel notiziario Pubblicati."
+
+#: classes/handler/public.php:442
+msgid "Share"
+msgstr "Condividi"
+
+#: classes/handler/public.php:464
+msgid "Not logged in"
+msgstr "Non connesso"
+
+#: classes/handler/public.php:527
+msgid "Incorrect username or password"
+msgstr "Nome utente o password sbagliati"
+
+#: classes/handler/public.php:581
+#, php-format
+msgid "Already subscribed to <b>%s</b>."
+msgstr "Notiziario <b>%s</b> già sottoscritto."
+
+#: classes/handler/public.php:584
+#, php-format
+msgid "Subscribed to <b>%s</b>."
+msgstr "Notiziario <b>%s</b> sottoscritto."
+
+#: classes/handler/public.php:587
+#, php-format
+msgid "Could not subscribe to <b>%s</b>."
+msgstr "Impossibile sottoscrivere <b>%s</b>."
+
+#: classes/handler/public.php:590
+#, php-format
+msgid "No feeds found in <b>%s</b>."
+msgstr "Nessun notiziario trovato in <b>%s</b>."
+
+#: classes/handler/public.php:593
+msgid "Multiple feed URLs found."
+msgstr "Trovati più URL di notiziari."
+
+#: classes/handler/public.php:597
+#, 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:615
+msgid "Subscribe to selected feed"
+msgstr "Sottoscrivi il notiziario selezionato"
+
+#: classes/handler/public.php:642
+msgid "Edit subscription options"
+msgstr "Modifica opzioni di sottoscrizione"
+
+#: classes/handler/public.php:680
+msgid "Password recovery"
+msgstr "Recupera password"
+
+#: classes/handler/public.php:725
+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:757
+msgid "Some of the required form parameters are missing or incorrect."
+msgstr "Alcuni dei parametri richiesti sono mancanti o scorretti."
+
+#: classes/handler/public.php:761
+#: classes/handler/public.php:830
+msgid "Go back"
+msgstr "Torna indietro"
+
+#: classes/handler/public.php:799
+msgid "[tt-rss] Password reset request"
+msgstr "[tt-rss] Richiesta di reset password"
+
+#: 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: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:874
+msgid "Database Updater"
+msgstr "Aggiornatore database"
+
+#: classes/handler/public.php:939
+msgid "Perform updates"
+msgstr "Effettua gli aggiornamenti"
+
+#: plugins/af_zz_imgproxy/init.php:208
+msgid "Image proxy settings (af_zz_imgproxy)"
+msgstr "Impostazioni per il proxy delle immagini (af_zz_imgproxy)"
+
+#: plugins/af_zz_imgproxy/init.php:232
+msgid "Enable proxy for all remote images."
+msgstr "Attiva il proxy delle immagini per tutte le immagini remote."
+
+#: plugins/af_zz_imgproxy/init.php:236
+#, fuzzy
+msgid "Don't cache files locally."
+msgstr "Memorizzare le immagini localmente"
+
+#: plugins/af_zz_imgproxy/init.php:252
+#: plugins/af_redditimgur/init.php:79
+msgid "Configuration saved"
+msgstr "La configurazione è stata salvata"
 
 #: plugins/vf_shared/init.php:17
 #: plugins/vf_shared/init.php:73
 msgid "Shared articles"
 msgstr "Articoli condivisi"
 
-#: plugins/auth_internal/init.php:67
-msgid "Please enter your one time password:"
-msgstr "Inserisci la password usa e getta:"
+#: plugins/bookmarklets/init.php:20
+msgid "Bookmarklets"
+msgstr "Bookmarklets"
 
-#: plugins/auth_internal/init.php:208
-msgid "Password has been changed."
-msgstr "La password è stata cambiata."
+#: plugins/bookmarklets/init.php:22
+msgid "Drag the link below to your browser toolbar, open the feed you're interested in in your browser and click on the link to subscribe to it."
+msgstr "Trascinare il collegamento seguente nella barra degli strumenti del browser; aprire il notiziario al quale si è interessati nel browser e fare clic sul collegamento per sottoscriverlo."
 
-#: plugins/auth_internal/init.php:210
-msgid "Old password is incorrect."
-msgstr "La vecchia password non è corretta."
+#: plugins/bookmarklets/init.php:26
+#, php-format
+msgid "Subscribe to %s in Tiny Tiny RSS?"
+msgstr "Sottoscrivi %s in Tiny Tiny RSS?"
 
-#: plugins/af_readability/init.php:25
-msgid "Data saved."
-msgstr "Data salvata."
+#: plugins/bookmarklets/init.php:31
+msgid "Subscribe in Tiny Tiny RSS"
+msgstr "Sottoscrivi in Tiny Tiny RSS"
 
-#: plugins/af_readability/init.php:41
-msgid "Inline content"
-msgstr "Contenuto completo dell'articolo"
-
-#: plugins/af_readability/init.php:47
-msgid "Readability settings (af_readability)"
-msgstr "Impostazioni di Readability (af_readability)"
-
-#: plugins/af_readability/init.php:78
-msgid "Use Readability for pages shared via bookmarklet."
-msgstr "Usa Readability per i contenuti condivisi via bookmarklet."
-
-#: plugins/af_readability/init.php:90
-#: plugins/af_psql_trgm/init.php:198
-msgid "Currently enabled for (click to edit):"
-msgstr "Attualmente attivo per (clicca per modificare):"
-
-#: plugins/af_readability/init.php:107
-msgid "Readability"
-msgstr "Readability"
-
-#: plugins/af_readability/init.php:118
-msgid "Inline article content"
-msgstr "Contenuto completo dell'articolo."
+#: plugins/bookmarklets/init.php:34
+msgid "Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS"
+msgstr "Usa questo bookmarklet per condividere qualsiasi pagina usando Tiny Tiny RSS"
 
 #: plugins/af_redditimgur/init.php:30
 msgid "Reddit content settings (af_redditimgur)"
@@ -2488,10 +2457,21 @@ msgstr "Estrai il contenuto mancante usando Readability"
 msgid "Enable additional duplicate checking"
 msgstr "Abilita un controllo addizionale sui post duplicati"
 
-#: plugins/af_redditimgur/init.php:79
-#: plugins/af_zz_imgproxy/init.php:252
-msgid "Configuration saved"
-msgstr "La configurazione è stata salvata"
+#: plugins/af_comics/init.php:49
+msgid "Feeds supported by af_comics"
+msgstr "Notiziari supportati da af_comics"
+
+#: plugins/af_comics/init.php:51
+msgid "The following comics are currently supported:"
+msgstr "I seguenti fumetti sono attualmente supportati:"
+
+#: plugins/af_comics/init.php:69
+msgid "To subscribe to GoComics use the comic's regular web page as the feed URL (e.g. for the <em>Garfield</em> comic use <code>http://www.gocomics.com/garfield</code>)."
+msgstr ""
+
+#: plugins/af_comics/init.php:71
+msgid "Drop any updated filters into <code>filters.local</code> in plugin directory."
+msgstr ""
 
 #: plugins/af_psql_trgm/init.php:29
 #, php-format
@@ -2527,25 +2507,83 @@ msgstr "Lunghezza del titolo minima:"
 msgid "Enable for all feeds:"
 msgstr "Attiva per tutti i notiziari:"
 
+#: plugins/af_psql_trgm/init.php:198
+#: plugins/af_readability/init.php:90
+msgid "Currently enabled for (click to edit):"
+msgstr "Attualmente attivo per (clicca per modificare):"
+
 #: plugins/af_psql_trgm/init.php:216
 msgid "Similarity (pg_trgm)"
 msgstr "Somiglianza (pg_trgm)"
 
-#: plugins/af_comics/init.php:49
-msgid "Feeds supported by af_comics"
-msgstr "Notiziari supportati da af_comics"
+#: plugins/af_readability/init.php:25
+msgid "Data saved."
+msgstr "Data salvata."
 
-#: plugins/af_comics/init.php:51
-msgid "The following comics are currently supported:"
-msgstr "I seguenti fumetti sono attualmente supportati:"
+#: plugins/af_readability/init.php:41
+msgid "Inline content"
+msgstr "Contenuto completo dell'articolo"
 
-#: plugins/af_comics/init.php:69
-msgid "To subscribe to GoComics use the comic's regular web page as the feed URL (e.g. for the <em>Garfield</em> comic use <code>http://www.gocomics.com/garfield</code>)."
-msgstr ""
+#: plugins/af_readability/init.php:47
+msgid "Readability settings (af_readability)"
+msgstr "Impostazioni di Readability (af_readability)"
 
-#: plugins/af_comics/init.php:71
-msgid "Drop any updated filters into <code>filters.local</code> in plugin directory."
-msgstr ""
+#: plugins/af_readability/init.php:78
+msgid "Use Readability for pages shared via bookmarklet."
+msgstr "Usa Readability per i contenuti condivisi via bookmarklet."
+
+#: plugins/af_readability/init.php:107
+msgid "Readability"
+msgstr "Readability"
+
+#: plugins/af_readability/init.php:118
+msgid "Inline article content"
+msgstr "Contenuto completo dell'articolo."
+
+#: plugins/mailto/init.php:50
+#: plugins/mailto/init.php:58
+#: plugins/mail/init.php:118
+#: plugins/mail/init.php:124
+msgid "[Forwarded]"
+msgstr "[Inoltrato]"
+
+#: plugins/mailto/init.php:50
+#: plugins/mail/init.php:118
+msgid "Multiple articles"
+msgstr "Articoli multipli"
+
+#: plugins/mailto/init.php:74
+msgid "Clicking the following link to invoke your mail client:"
+msgstr "Clicca il link seguente per aprire il tuo client di posta:"
+
+#: plugins/mailto/init.php:78
+msgid "Forward selected article(s) by email."
+msgstr "Inoltra l'articolo per email."
+
+#: plugins/mailto/init.php:81
+msgid "You should be able to edit the message before sending in your mail client."
+msgstr "Puoi modificare l'articolo nel tuo client di posta prima di inviarlo."
+
+#: plugins/mailto/init.php:86
+msgid "Close this dialog"
+msgstr "Chiudi questa finestra"
+
+#: 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/import_export/init.php:53
 msgid "Import and export"
@@ -2613,100 +2651,6 @@ msgstr "Caricamento fallito con codice errore %d (%s)"
 msgid "No file uploaded."
 msgstr "Nessun file caricato."
 
-#: plugins/mail/init.php:29
-msgid "Mail addresses saved."
-msgstr "Indirizzi email salvati."
-
-#: plugins/mail/init.php:35
-msgid "Mail plugin"
-msgstr "Plugin Mail"
-
-#: plugins/mail/init.php:37
-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:118
-#: plugins/mail/init.php:124
-#: plugins/mailto/init.php:50
-#: plugins/mailto/init.php:58
-msgid "[Forwarded]"
-msgstr "[Inoltrato]"
-
-#: plugins/mail/init.php:118
-#: plugins/mailto/init.php:50
-msgid "Multiple articles"
-msgstr "Articoli multipli"
-
-#: plugins/mail/init.php:146
-msgid "To:"
-msgstr "A:"
-
-#: plugins/mail/init.php:161
-msgid "Subject:"
-msgstr "Oggetto:"
-
-#: plugins/mail/init.php:178
-msgid "Send e-mail"
-msgstr "Invia email"
-
-#: plugins/close_button/init.php:25
-msgid "Close article"
-msgstr "Chiudi articolo"
-
-#: plugins/bookmarklets/init.php:20
-msgid "Bookmarklets"
-msgstr "Bookmarklets"
-
-#: plugins/bookmarklets/init.php:22
-msgid "Drag the link below to your browser toolbar, open the feed you're interested in in your browser and click on the link to subscribe to it."
-msgstr "Trascinare il collegamento seguente nella barra degli strumenti del browser; aprire il notiziario al quale si è interessati nel browser e fare clic sul collegamento per sottoscriverlo."
-
-#: plugins/bookmarklets/init.php:26
-#, php-format
-msgid "Subscribe to %s in Tiny Tiny RSS?"
-msgstr "Sottoscrivi %s in Tiny Tiny RSS?"
-
-#: plugins/bookmarklets/init.php:31
-msgid "Subscribe in Tiny Tiny RSS"
-msgstr "Sottoscrivi in Tiny Tiny RSS"
-
-#: plugins/bookmarklets/init.php:34
-msgid "Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS"
-msgstr "Usa questo bookmarklet per condividere qualsiasi pagina usando Tiny Tiny RSS"
-
-#: plugins/toggle_sidebar/init.php:23
-msgid "Collapse feedlist"
-msgstr "Riduci elenco notiziari"
-
-#: plugins/af_zz_imgproxy/init.php:208
-msgid "Image proxy settings (af_zz_imgproxy)"
-msgstr "Impostazioni per il proxy delle immagini (af_zz_imgproxy)"
-
-#: plugins/af_zz_imgproxy/init.php:232
-msgid "Enable proxy for all remote images."
-msgstr "Attiva il proxy delle immagini per tutte le immagini remote."
-
-#: plugins/af_zz_imgproxy/init.php:236
-#, fuzzy
-msgid "Don't cache files locally."
-msgstr "Memorizzare le immagini localmente"
-
-#: plugins/mailto/init.php:74
-msgid "Clicking the following link to invoke your mail client:"
-msgstr "Clicca il link seguente per aprire il tuo client di posta:"
-
-#: plugins/mailto/init.php:78
-msgid "Forward selected article(s) by email."
-msgstr "Inoltra l'articolo per email."
-
-#: plugins/mailto/init.php:81
-msgid "You should be able to edit the message before sending in your mail client."
-msgstr "Puoi modificare l'articolo nel tuo client di posta prima di inviarlo."
-
-#: plugins/mailto/init.php:86
-msgid "Close this dialog"
-msgstr "Chiudi questa finestra"
-
 #: plugins/share/init.php:41
 msgid "You can disable all articles shared by unique URLs here."
 msgstr "Puoi cancellare tutti gli articoli condivisi per Url unico qui."
@@ -2727,449 +2671,598 @@ msgstr "Puoi condividere questo articolo usando il seguente URL unico:"
 msgid "Unshare article"
 msgstr "Togli la condivisione all'articolo"
 
-#: js/FeedTree.js:75
+#: plugins/toggle_sidebar/init.php:23
+msgid "Collapse feedlist"
+msgstr "Riduci elenco notiziari"
+
+#: plugins/close_button/init.php:25
+msgid "Close article"
+msgstr "Chiudi articolo"
+
+#: plugins/mail/init.php:29
+msgid "Mail addresses saved."
+msgstr "Indirizzi email salvati."
+
+#: plugins/mail/init.php:35
+msgid "Mail plugin"
+msgstr "Plugin Mail"
+
+#: plugins/mail/init.php:37
+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:146
+msgid "To:"
+msgstr "A:"
+
+#: plugins/mail/init.php:161
+msgid "Subject:"
+msgstr "Oggetto:"
+
+#: plugins/mail/init.php:178
+msgid "Send e-mail"
+msgstr "Invia email"
+
+#: plugins/note/init.php:28
+#: plugins/note/note.js:11
+msgid "Edit article note"
+msgstr "Modifica note articolo"
+
+#: plugins/auth_internal/init.php:67
+msgid "Please enter your one time password:"
+msgstr "Inserisci la password usa e getta:"
+
+#: plugins/auth_internal/init.php:208
+msgid "Password has been changed."
+msgstr "La password è stata cambiata."
+
+#: plugins/auth_internal/init.php:210
+msgid "Old password is incorrect."
+msgstr "La vecchia password non è corretta."
+
+#: js/FeedTree.js:76
 msgid "(Un)collapse"
 msgstr "Espandi/Riduci la barra laterale"
 
-#: js/PrefFeedTree.js:35
+#: js/PrefFeedTree.js:36
 msgid "Edit category"
 msgstr "Modifica categoria"
 
-#: js/PrefFeedTree.js:42
+#: js/PrefFeedTree.js:43
 msgid "Remove category"
 msgstr "Rimuovi la categoria"
 
-#: js/PrefFilterTree.js:46
+#: js/PrefFilterTree.js:47
 msgid "Inverse"
 msgstr "Inverso"
 
-#: js/feedlist.js:511
+#: js/feedlist.js:461
 #, 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:514
+#: js/feedlist.js:464
 #, 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:517
+#: js/feedlist.js:467
 #, 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:520
+#: js/feedlist.js:470
 #, fuzzy
 msgid "Mark %w in %s as read?"
 msgstr "Segnare tutti gli articoli in %s come letti?"
 
-#: js/feedlist.js:523
+#: js/feedlist.js:473
 #, fuzzy
 msgid "search results"
 msgstr "Risultati di ricerca: %s"
 
-#: js/feedlist.js:523
+#: js/feedlist.js:473
 #, fuzzy
 msgid "all articles"
 msgstr "Tutti gli articoli"
 
-#: js/functions.js:74
+#: js/functions.js:100
 msgid "Close"
 msgstr "Chiudi"
 
-#: js/functions.js:141
+#: js/functions.js:167
 msgid "Click to close"
 msgstr "Clicca per chiudere"
 
-#: js/functions.js:448
+#: js/functions.js:456
 msgid "Error explained"
 msgstr "Errore spiegato"
 
-#: js/functions.js:592
+#: js/functions.js:490
+msgid "Upload complete."
+msgstr "Caricamento completato."
+
+#: js/functions.js:508
+msgid "Remove stored feed icon?"
+msgstr "Rimuovi l'icona del notiziario salvata?"
+
+#: js/functions.js:510
+msgid "Removing feed icon..."
+msgstr "Rimuovendo l'icona del notiziario salvata..."
+
+#: js/functions.js:515
+msgid "Feed icon removed."
+msgstr "Icona del notiziario rimossa."
+
+#: js/functions.js:532
+msgid "Please select an image file to upload."
+msgstr "Selezionare un file immagine da caricare."
+
+#: js/functions.js:533
+msgid "Upload new icon for this feed?"
+msgstr "Caricare una nuova icona per questo notiziario?"
+
+#: js/functions.js:534
+msgid "Uploading, please wait..."
+msgstr "Caricamento, attendere prego..."
+
+#: js/functions.js:542
+msgid "Please enter label caption:"
+msgstr "Inserire il nome dell'etichetta:"
+
+#: js/functions.js:575
 msgid "Subscribe to Feed"
 msgstr "Sottoscrivi il notiziario"
 
-#: js/functions.js:621
+#: js/functions.js:602
 msgid "Failed to parse output. This can indicate server timeout and/or network issues. Backend output was logged to browser console."
 msgstr "Errore nella creazione dell'output. Questo può essere dovuto a un timeout del server o a altri problemi di rete. Il messaggio del backend è stato inviato alla console del browser."
 
-#: js/functions.js:636
+#: js/functions.js:617
 #, perl-format
 msgid "Subscribed to %s"
 msgstr "Sottoscrizione effettuata a %s"
 
-#: js/functions.js:641
+#: js/functions.js:622
 msgid "Specified URL seems to be invalid."
 msgstr "L'URL indicata sembra non essere valida."
 
-#: js/functions.js:644
+#: js/functions.js:625
 msgid "Specified URL doesn't seem to contain any feeds."
 msgstr "L'URL indicata non sembra contenere alcun notiziario."
 
-#: js/functions.js:656
+#: js/functions.js:637
 msgid "Expand to select feed"
 msgstr "Espandi per selezionare i notiziari"
 
-#: js/functions.js:668
+#: js/functions.js:649
 #, fuzzy, perl-format
 msgid "Couldn't download the specified URL: %s"
 msgstr "Impossibile scaricare l'URL: $s"
 
-#: js/functions.js:672
+#: js/functions.js:653
 #, perl-format
 msgid "XML validation failed: %s"
 msgstr "Validazione dell'XML fallita: %s"
 
-#: js/functions.js:676
+#: js/functions.js:657
 msgid "You are already subscribed to this feed."
 msgstr "Hai già sottoscritto questo notiziario."
 
-#: js/functions.js:1136
+#: js/functions.js:1098
 msgid "Generate new syndication address for this feed?"
 msgstr "Generare un nuovo indirizzo per questo notiziario?"
 
-#: js/functions.js:1140
-#: js/prefs.js:1095
+#: js/functions.js:1100
+#: js/prefs.js:870
 msgid "Trying to change address..."
 msgstr "Provo a cambiare indirizzo..."
 
-#: js/functions.js:1245
-#: js/tt-rss.js:446
-#: js/tt-rss.js:673
+#: js/functions.js:1199
+#: js/tt-rss.js:399
+#: js/tt-rss.js:612
 msgid "You can't edit this kind of feed."
 msgstr "Impossibile modificare questo tipo di notiziario."
 
-#: js/functions.js:1260
+#: js/functions.js:1213
 msgid "Edit Feed"
 msgstr "Modifica notiziario"
 
-#: js/functions.js:1266
-#: js/prefs.js:100
-#: js/prefs.js:209
-#: js/prefs.js:647
+#: js/functions.js:1217
+#: js/prefs.js:176
+#: js/prefs.js:523
+#: js/prefs.js:1139
+#: js/prefs.js:78
 msgid "Saving data..."
 msgstr "Salvando dati..."
 
-#: js/functions.js:1293
+#: js/functions.js:1243
 msgid "More Feeds"
 msgstr "Altri notiziari"
 
-#: js/functions.js:1355
-#: js/functions.js:1464
-#: js/prefs.js:398
-#: js/prefs.js:540
-#: js/prefs.js:558
-#: js/prefs.js:1077
+#: js/functions.js:1297
+#: js/functions.js:1383
+#: js/prefs.js:332
+#: js/prefs.js:455
+#: js/prefs.js:473
+#: js/prefs.js:855
 msgid "No feeds are selected."
 msgstr "Nessun notiziario selezionato."
 
-#: js/functions.js:1398
+#: js/functions.js:1329
 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:1435
+#: js/functions.js:1360
 msgid "Feeds with update errors"
 msgstr "Notiziari con errori di aggiornamento"
 
-#: js/functions.js:1446
-#: js/prefs.js:1058
+#: js/functions.js:1369
+#: js/prefs.js:841
 msgid "Remove selected feeds?"
 msgstr "Rimuovere i notiziari selezionati?"
 
-#: js/functions.js:1449
-#: js/prefs.js:1061
+#: js/functions.js:1370
+#: js/prefs.js:842
 msgid "Removing selected feeds..."
 msgstr "Rimuovendo i notiziari selezionati..."
 
-#: js/prefs.js:60
-msgid "Please enter login:"
-msgstr "Inserire il nome utente:"
-
-#: js/prefs.js:67
-msgid "Can't create user: no login specified."
-msgstr "Impossibile creare l'utente: nessun nome utente specificato."
-
-#: js/prefs.js:71
-msgid "Adding user..."
-msgstr "Creando utente..."
-
-#: js/prefs.js:96
-msgid "User Editor"
-msgstr "Editor utente"
-
-#: js/prefs.js:131
-msgid "Edit Filter"
-msgstr "Modifica filtro"
-
-#: js/prefs.js:170
+#: js/prefs.js:143
 msgid "Remove filter?"
 msgstr "Rimuovere il filtro?"
 
-#: js/prefs.js:175
+#: js/prefs.js:148
 msgid "Removing filter..."
 msgstr "Rimuovendo il filtro..."
 
-#: js/prefs.js:292
+#: js/prefs.js:251
 msgid "Remove selected labels?"
 msgstr "Rimuovere le etichette selezionate?"
 
-#: js/prefs.js:295
+#: js/prefs.js:252
 msgid "Removing selected labels..."
 msgstr "Rimuovendo le etichette selezionate..."
 
-#: js/prefs.js:308
-#: js/prefs.js:1144
+#: js/prefs.js:262
+#: js/prefs.js:909
 msgid "No labels are selected."
 msgstr "Nessuna etichetta selezionata."
 
-#: js/prefs.js:320
+#: js/prefs.js:274
 msgid "Remove selected users? Neither default admin nor your account will be removed."
 msgstr "Rimuovere gli utenti selezionati? Non saranno rimossi l'amministratore predefinito e il proprio utente."
 
-#: js/prefs.js:323
+#: js/prefs.js:275
 msgid "Removing selected users..."
 msgstr "Rimuovendo gli utenti selezionati..."
 
-#: js/prefs.js:338
-#: js/prefs.js:408
-#: js/prefs.js:427
-#: js/prefs.js:461
+#: js/prefs.js:286
+#: js/prefs.js:342
+#: js/prefs.js:361
+#: js/prefs.js:387
 msgid "No users are selected."
 msgstr "Nessun utente selezionato."
 
-#: js/prefs.js:350
+#: js/prefs.js:297
 msgid "Remove selected filters?"
 msgstr "Rimuovere i filtri selezionati?"
 
-#: js/prefs.js:353
+#: js/prefs.js:298
 msgid "Removing selected filters..."
 msgstr "Rimuovendo i filtri selezionati..."
 
-#: js/prefs.js:366
-#: js/prefs.js:495
-#: js/prefs.js:514
+#: js/prefs.js:308
+#: js/prefs.js:419
+#: js/prefs.js:438
 msgid "No filters are selected."
 msgstr "Nessun filtro selezionato."
 
-#: js/prefs.js:378
+#: js/prefs.js:319
 msgid "Unsubscribe from selected feeds?"
 msgstr "Annullare la sottoscrizione ai notiziari selezionati?"
 
-#: js/prefs.js:382
+#: js/prefs.js:321
 msgid "Unsubscribing from selected feeds..."
 msgstr "Annullando la sottoscrizione ai notiziari selezionati..."
 
-#: js/prefs.js:413
-#: js/prefs.js:432
-#: js/prefs.js:466
+#: js/prefs.js:347
+#: js/prefs.js:366
+#: js/prefs.js:392
 msgid "Please select only one user."
 msgstr "Selezionare un solo utente."
 
-#: js/prefs.js:436
+#: js/prefs.js:370
 msgid "Reset password of selected user?"
 msgstr "Reimpostare la password per l'utente selezionato?"
 
-#: js/prefs.js:439
+#: js/prefs.js:371
 msgid "Resetting password for selected user..."
 msgstr "Reimpostando la password per l'utente selezionato..."
 
-#: js/prefs.js:500
+#: js/prefs.js:424
 msgid "Please select only one filter."
 msgstr "Selezionare solo un filtro."
 
-#: js/prefs.js:518
+#: js/prefs.js:442
 msgid "Combine selected filters?"
 msgstr "Unire i filtri selezionati?"
 
-#: js/prefs.js:521
+#: js/prefs.js:443
 msgid "Joining filters..."
 msgstr "Unendo filtri..."
 
-#: js/prefs.js:580
+#: js/prefs.js:487
 msgid "Edit Multiple Feeds"
 msgstr "Modifica notiziari multipli"
 
-#: js/prefs.js:604
+#: js/prefs.js:511
 msgid "Save changes to selected feeds?"
 msgstr "Salvare i cambiamenti ai notiziari selezionati?"
 
-#: js/prefs.js:681
+#: js/prefs.js:552
 msgid "OPML Import"
 msgstr "Importazione OPML"
 
-#: js/prefs.js:700
+#: js/prefs.js:571
 msgid "Please choose an OPML file first."
 msgstr "Scegliere prima un file OPML."
 
-#: js/prefs.js:703
+#: js/prefs.js:574
 #: plugins/import_export/import_export.js:115
 msgid "Importing, please wait..."
 msgstr "Importando, attendere prego..."
 
-#: js/prefs.js:869
+#: js/prefs.js:737
 msgid "Reset to defaults?"
 msgstr "Reimpostare ai valori predefiniti?"
 
-#: js/prefs.js:1468
-msgid "Subscribing to feeds..."
-msgstr "Sottoscrivendo i notiziari..."
+#: js/prefs.js:777
+#, perl-format
+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:1487
-msgid "Clear stored data for this plugin?"
-msgstr "Cancellare i dati salvati dei plugin?"
+#: js/prefs.js:778
+msgid "Removing category..."
+msgstr "Rimuovendo la categoria..."
 
-#: js/prefs.js:1501
-msgid "Clear all messages in the error log?"
-msgstr "Cancellare tutti i messaggi nel log degli errori?"
+#: js/prefs.js:794
+msgid "Remove selected categories?"
+msgstr "Rimuovere le categorie selezionate?"
 
-#: js/tt-rss.js:118
+#: js/prefs.js:795
+msgid "Removing selected categories..."
+msgstr "Rimuovendo le categorie selezionate..."
+
+#: js/prefs.js:805
+msgid "No categories are selected."
+msgstr "Nessuna categoria selezionata."
+
+#: js/prefs.js:812
+msgid "Category title:"
+msgstr "Titolo categoria: "
+
+#: js/prefs.js:815
+msgid "Creating category..."
+msgstr "Creando categoria..."
+
+#: js/prefs.js:832
+msgid "Feeds without recent updates"
+msgstr "Notiziari senza aggiornamenti recenti"
+
+#: js/prefs.js:869
+msgid "Replace current OPML publishing address with a new one?"
+msgstr "Sostituire l'indirizzo di pubblicazione OPML attuale con uno nuovo?"
+
+#: js/prefs.js:898
+msgid "Reset selected labels to default colors?"
+msgstr "Reimpostare le etichette selezionate ai colori predefiniti?"
+
+#: js/prefs.js:926
+msgid "Settings Profiles"
+msgstr "Impostazioni dei profili"
+
+#: js/prefs.js:935
+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:936
+msgid "Removing selected profiles..."
+msgstr "Rimuovendo i profili selezionati..."
+
+#: js/prefs.js:948
+msgid "No profiles are selected."
+msgstr "Nessun profilo selezionato."
+
+#: js/prefs.js:955
+#: js/prefs.js:997
+msgid "Activate selected profile?"
+msgstr "Attivare il profilo selezionato?"
+
+#: js/prefs.js:964
+#: js/prefs.js:1008
+msgid "Please choose a profile to activate."
+msgstr "Scegliere un profilo da attivare."
+
+#: js/prefs.js:969
+msgid "Creating profile..."
+msgstr "Creando profilo..."
+
+#: js/prefs.js:1016
+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:1017
+#: plugins/share/share_prefs.js:3
+msgid "Clearing URLs..."
+msgstr "Cancellando gli URL..."
+
+#: js/prefs.js:1020
+msgid "Generated URLs cleared."
+msgstr "URL generati cancellati."
+
+#: js/prefs.js:1053
+#, fuzzy
+msgid "Rename category to:"
+msgstr "Rimuovi la categoria"
+
+#: js/prefs.js:1074
+msgid "Label Editor"
+msgstr "Editor etichette"
+
+#: js/tt-rss.js:111
 msgid "Mark all articles as read?"
 msgstr "Segnare tutti gli articoli come letti?"
 
-#: js/tt-rss.js:124
+#: js/tt-rss.js:115
 msgid "Marking all feeds as read..."
 msgstr "Segnando tutti i notiziari come letti..."
 
-#: js/tt-rss.js:398
+#: js/tt-rss.js:351
 msgid "Please enable mail plugin first."
 msgstr "Per favore, prima attiva il plugin email."
 
-#: js/tt-rss.js:527
+#: js/tt-rss.js:477
 msgid "Please enable embed_original plugin first."
 msgstr "Per favore, prima attiva il plugin embed_original."
 
-#: js/tt-rss.js:540
-#: js/tt-rss.js:723
+#: js/tt-rss.js:490
+#: js/tt-rss.js:653
 msgid "Widescreen is not available in combined mode."
 msgstr "Widescreen non disponibile nella modalità combinata."
 
-#: js/tt-rss.js:821
-msgid "You can't rescore this kind of feed."
-msgstr "Impossibile cambiare il punteggio a questo tipo di notiziari."
-
-#: js/tt-rss.js:826
-#: js/tt-rss.js:686
-msgid "Please select some feed first."
-msgstr "Selezionare prima qualche notiziario."
-
-#: js/tt-rss.js:831
-#, perl-format
-msgid "Rescore articles in %s?"
-msgstr "Cambiare il punteggio degli articoli in %s ?"
-
-#: js/tt-rss.js:834
-msgid "Rescoring articles..."
-msgstr "Cambiando punteggio degli articoli..."
-
-#: js/viewfeed.js:917
-#: js/viewfeed.js:955
-#: js/viewfeed.js:1003
-#: js/viewfeed.js:1924
-#: plugins/mail/mail.js:7
+#: js/viewfeed.js:444
+#: js/viewfeed.js:461
+#: js/viewfeed.js:484
+#: js/viewfeed.js:521
+#: js/viewfeed.js:542
+#: js/viewfeed.js:651
+#: js/viewfeed.js:685
+#: js/viewfeed.js:727
+#: js/viewfeed.js:1564
 #: plugins/mailto/init.js:7
-#: js/viewfeed.js:675
-#: js/viewfeed.js:697
-#: js/viewfeed.js:718
-#: js/viewfeed.js:777
-#: js/viewfeed.js:805
+#: plugins/mail/mail.js:7
 msgid "No articles are selected."
 msgstr "Nessun articolo selezionato."
 
-#: js/viewfeed.js:925
+#: js/viewfeed.js:659
 #, 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:927
+#: js/viewfeed.js:661
 #, 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:964
+#: js/viewfeed.js:694
 #, 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:967
+#: js/viewfeed.js:697
 #, 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:969
+#: js/viewfeed.js:698
 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:1009
+#: js/viewfeed.js:733
 #, 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:1029
+#: js/viewfeed.js:753
 msgid "Edit article Tags"
 msgstr "Modifica etichette articolo"
 
-#: js/viewfeed.js:1035
+#: js/viewfeed.js:757
 msgid "Saving article tags..."
 msgstr "Salvando le etichette degli articoli..."
 
-#: js/viewfeed.js:1666
+#: js/viewfeed.js:1015
+msgid "No article is selected."
+msgstr "Nessun articolo selezionato."
+
+#: js/viewfeed.js:1050
+msgid "No articles found to mark"
+msgstr "Nessun articolo trovato da segnare"
+
+#: js/viewfeed.js:1052
+#, perl-format
+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?"
+
+#: js/viewfeed.js:1312
 msgid "Open original article"
 msgstr "Apri articolo originale"
 
-#: js/viewfeed.js:1673
+#: js/viewfeed.js:1319
 msgid "Display article URL"
 msgstr "Visualizza URL articolo"
 
-#: js/viewfeed.js:1780
+#: js/viewfeed.js:1426
 msgid "Assign label"
 msgstr "Assegna etichetta"
 
-#: js/viewfeed.js:1785
+#: js/viewfeed.js:1431
 msgid "Remove label"
 msgstr "Rimuovi etichetta"
 
-#: js/viewfeed.js:1817
+#: js/viewfeed.js:1463
 msgid "Select articles in group"
 msgstr "Seleziona gli articoli in gruppo"
 
-#: js/viewfeed.js:1827
+#: js/viewfeed.js:1473
 msgid "Mark group as read"
 msgstr "Segna il gruppo come letto"
 
-#: js/viewfeed.js:1839
+#: js/viewfeed.js:1485
 msgid "Mark feed as read"
 msgstr "Segna il notiziario come letto"
 
-#: js/viewfeed.js:1892
+#: js/viewfeed.js:1538
 msgid "Please enter new score for selected articles:"
 msgstr "Inserire il nuovo punteggio per gli articoli selezionati:"
 
-#: js/viewfeed.js:1955
+#: js/viewfeed.js:1571
 msgid "Please enter new score for this article:"
 msgstr "Inserire il nuovo punteggio per questo articolo:"
 
-#: js/viewfeed.js:1986
+#: js/viewfeed.js:1591
 msgid "Article URL:"
 msgstr "URL dell'articolo:"
 
-#: plugins/note/note.js:17
-msgid "Saving article note..."
-msgstr "Salvando le note dell'articolo..."
+#: 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/af_psql_trgm/init.js:11
 msgid "Related articles"
 msgstr "Articoli collegati"
 
+#: plugins/mailto/init.js:21
+#: plugins/mail/mail.js:21
+msgid "Forward article by email"
+msgstr "Inoltra l'articolo per email"
+
+#: plugins/shorten_expanded/init.js:43
+msgid "Click to expand article"
+msgstr "Fare clic per espandere l'articolo."
+
 #: plugins/import_export/import_export.js:13
 msgid "Export Data"
 msgstr "Esporta dati"
@@ -3189,257 +3282,168 @@ 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
-msgid "Forward article by email"
-msgstr "Inoltra l'articolo per email"
+#: plugins/share/share_prefs.js:2
+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/mail/mail.js:36
-msgid "Error sending email:"
-msgstr "Errore nell'invio email:"
-
-#: plugins/mail/mail.js:38
-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:45
-msgid "Click to expand article"
-msgstr "Fare clic per espandere l'articolo."
+#: plugins/share/share_prefs.js:8
+msgid "Shared URLs cleared."
+msgstr "ULR condivisi cancellati."
 
 #: plugins/share/share.js:10
 msgid "Share article by URL"
 msgstr "Condividi l'articolo con l'URL"
 
-#: plugins/share/share.js:14
+#: plugins/share/share.js:13
 msgid "Generate new share URL for this article?"
 msgstr "Generare un nuovo URL di condivisione per questo articolo?"
 
-#: plugins/share/share.js:18
+#: plugins/share/share.js:15
 msgid "Trying to change URL..."
 msgstr "Provo a cambiare URL..."
 
-#: plugins/share/share.js:55
+#: plugins/share/share.js:48
 msgid "Remove sharing for this article?"
 msgstr "Togliere la condivisione per questo articolo?"
 
-#: plugins/share/share.js:59
+#: plugins/share/share.js:50
 msgid "Trying to unshare..."
 msgstr "Provando a togliere la condivisione..."
 
-#: plugins/share/share_prefs.js:3
-msgid "This will invalidate all previously shared article URLs. Continue?"
-msgstr "Questo renderà non più accessibili tutti gli URL degli articoli precedentemente condivisi. Procedere?"
+#: plugins/mail/mail.js:30
+msgid "Error sending email:"
+msgstr "Errore nell'invio email:"
 
-#: plugins/share/share_prefs.js:6
-#: js/prefs.js:1277
-msgid "Clearing URLs..."
-msgstr "Cancellando gli URL..."
+#: plugins/mail/mail.js:32
+msgid "Your message has been sent."
+msgstr "Il messaggio è stato inviato."
 
-#: plugins/share/share_prefs.js:13
-msgid "Shared URLs cleared."
-msgstr "ULR condivisi cancellati."
+#: plugins/note/note.js:15
+msgid "Saving article note..."
+msgstr "Salvando le note dell'articolo..."
 
-#: js/feedlist.js:204
+#: js/feedlist.js:168
 #, fuzzy
 msgid "Your password is at default value"
 msgstr "La password è impostata al valore predefinito, cambiala, per favore."
 
-#: js/feedlist.js:453
+#: js/feedlist.js:413
 msgid "Mark all articles in %s as read?"
 msgstr "Segnare tutti gli articoli in %s come letti?"
 
-#: js/functions.js:494
-msgid "Upload complete."
-msgstr "Caricamento completato."
-
-#: js/functions.js:511
-msgid "Remove stored feed icon?"
-msgstr "Rimuovi l'icona del notiziario salvata?"
-
-#: js/functions.js:516
-msgid "Removing feed icon..."
-msgstr "Rimuovendo l'icona del notiziario salvata..."
-
-#: js/functions.js:521
-msgid "Feed icon removed."
-msgstr "Icona del notiziario rimossa."
-
-#: js/functions.js:537
-msgid "Please select an image file to upload."
-msgstr "Selezionare un file immagine da caricare."
-
-#: js/functions.js:539
-msgid "Upload new icon for this feed?"
-msgstr "Caricare una nuova icona per questo notiziario?"
-
-#: js/functions.js:540
-msgid "Uploading, please wait..."
-msgstr "Caricamento, attendere prego..."
-
-#: js/functions.js:550
-msgid "Please enter label caption:"
-msgstr "Inserire il nome dell'etichetta:"
-
-#: js/functions.js:555
-msgid "Can't create label: missing caption."
-msgstr "Impossibile creare l'etichetta: nome mancante."
-
-#: js/functions.js:797
+#: js/functions.js:764
 msgid "Edit rule"
 msgstr "Modifica regola"
 
-#: js/functions.js:819
+#: js/functions.js:786
 msgid "Edit action"
 msgstr "Modifica azioni"
 
-#: js/functions.js:860
+#: js/functions.js:825
 msgid "Looking for articles (%d processed, %f found)..."
 msgstr "Cercando articoli (%d processati, %f trovati)..."
 
-#: js/functions.js:890
+#: js/functions.js:855
 msgid "Found %d articles matching this filter:"
 msgstr "Trovati %d articoli che corrispondono a questo filtro:"
 
-#: js/functions.js:942
+#: js/functions.js:907
 msgid "Create Filter"
 msgstr "Crea filtro"
 
-#: js/functions.js:1060
-#: js/tt-rss.js:692
+#: js/functions.js:1016
+#: js/tt-rss.js:631
 msgid "Unsubscribe from %s?"
 msgstr "Annullare la sottoscrizione a %s?"
 
-#: js/functions.js:1063
+#: js/functions.js:1019
 msgid "Removing feed..."
 msgstr "Notiziario in cancellazione..."
 
-#: js/functions.js:1489
+#: js/functions.js:1410
 msgid "Help"
 msgstr "Aiuto"
 
-#: js/prefs.js:973
-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:44
+msgid "Please enter login:"
+msgstr "Inserire il nome utente:"
 
-#: js/prefs.js:979
-msgid "Removing category..."
-msgstr "Rimuovendo la categoria..."
+#: js/prefs.js:51
+msgid "Can't create user: no login specified."
+msgstr "Impossibile creare l'utente: nessun nome utente specificato."
 
-#: js/prefs.js:997
-msgid "Remove selected categories?"
-msgstr "Rimuovere le categorie selezionate?"
+#: js/prefs.js:55
+msgid "Adding user..."
+msgstr "Creando utente..."
 
-#: js/prefs.js:1000
-msgid "Removing selected categories..."
-msgstr "Rimuovendo le categorie selezionate..."
+#: js/prefs.js:74
+msgid "User Editor"
+msgstr "Editor utente"
 
-#: js/prefs.js:1013
-msgid "No categories are selected."
-msgstr "Nessuna categoria selezionata."
+#: js/prefs.js:104
+msgid "Edit Filter"
+msgstr "Modifica filtro"
 
-#: js/prefs.js:1020
-msgid "Category title:"
-msgstr "Titolo categoria: "
+#: js/prefs.js:1175
+msgid "Subscribing to feeds..."
+msgstr "Sottoscrivendo i notiziari..."
 
-#: js/prefs.js:1024
-msgid "Creating category..."
-msgstr "Creando categoria..."
+#: js/prefs.js:1191
+msgid "Clear stored data for this plugin?"
+msgstr "Cancellare i dati salvati dei plugin?"
 
-#: js/prefs.js:1047
-msgid "Feeds without recent updates"
-msgstr "Notiziari senza aggiornamenti recenti"
+#: js/prefs.js:1203
+msgid "Clear all messages in the error log?"
+msgstr "Cancellare tutti i messaggi nel log degli errori?"
 
-#: js/prefs.js:1091
-msgid "Replace current OPML publishing address with a new one?"
-msgstr "Sostituire l'indirizzo di pubblicazione OPML attuale con uno nuovo?"
-
-#: js/prefs.js:1129
-msgid "Reset selected labels to default colors?"
-msgstr "Reimpostare le etichette selezionate ai colori predefiniti?"
-
-#: js/prefs.js:1161
-msgid "Settings Profiles"
-msgstr "Impostazioni dei profili"
-
-#: js/prefs.js:1170
-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:1173
-msgid "Removing selected profiles..."
-msgstr "Rimuovendo i profili selezionati..."
-
-#: js/prefs.js:1189
-msgid "No profiles are selected."
-msgstr "Nessun profilo selezionato."
-
-#: js/prefs.js:1197
-#: js/prefs.js:1250
-msgid "Activate selected profile?"
-msgstr "Attivare il profilo selezionato?"
-
-#: js/prefs.js:1214
-#: js/prefs.js:1266
-msgid "Please choose a profile to activate."
-msgstr "Scegliere un profilo da attivare."
-
-#: js/prefs.js:1219
-msgid "Creating profile..."
-msgstr "Creando profilo..."
-
-#: js/prefs.js:1274
-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:1284
-msgid "Generated URLs cleared."
-msgstr "URL generati cancellati."
-
-#: js/prefs.js:1356
-msgid "Label Editor"
-msgstr "Editor etichette"
-
-#: js/tt-rss.js:681
+#: js/tt-rss.js:620
 msgid "You can't unsubscribe from the category."
 msgstr "Impossibile annullare la sottoscrizione alla categoria."
 
-#: js/viewfeed.js:127
-#: js/viewfeed.js:177
-#: js/viewfeed.js:194
+#: js/tt-rss.js:625
+msgid "Please select some feed first."
+msgstr "Selezionare prima qualche notiziario."
+
+#: js/viewfeed.js:89
+#: js/viewfeed.js:135
+#: js/viewfeed.js:152
 msgid "Click to open next unread feed."
 msgstr "Clicca per passare al prossimo notiziario da leggere."
 
-#: js/viewfeed.js:131
+#: js/viewfeed.js:93
 msgid "Cancel search"
 msgstr "Annulla ricerca"
 
-#: js/viewfeed.js:191
+#: js/viewfeed.js:149
 msgid "New articles found, reload feed to continue."
 msgstr "Nuovi articoli ricevuti, ricarica il notiziario per continuare."
 
-#: js/viewfeed.js:620
+#: js/viewfeed.js:405
 msgid "%d article selected"
 msgid_plural "%d articles selected"
 msgstr[0] "%d articolo selezionato"
 msgstr[1] "%d articoli selezionati"
 
-#: js/viewfeed.js:1284
-msgid "No article is selected."
-msgstr "Nessun articolo selezionato."
+#~ msgid "Rescore feed"
+#~ msgstr "Cambia punteggio notiziario"
 
-#: js/viewfeed.js:1319
-msgid "No articles found to mark"
-msgstr "Nessun articolo trovato da segnare"
+#~ msgid "Create label..."
+#~ msgstr "Crea etichetta..."
 
-#: js/viewfeed.js:1321
-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 "Create filter..."
+#~ msgstr "Crea filtro..."
+
+#~ msgid "You can't rescore this kind of feed."
+#~ msgstr "Impossibile cambiare il punteggio a questo tipo di notiziari."
+
+#~ msgid "Rescore articles in %s?"
+#~ msgstr "Cambiare il punteggio degli articoli in %s ?"
+
+#~ msgid "Rescoring articles..."
+#~ msgstr "Cambiando punteggio degli articoli..."
+
+#~ msgid "Can't create label: missing caption."
+#~ msgstr "Impossibile creare l'etichetta: nome mancante."
 
 #~ 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>"
diff --git a/locale/ja_JP/LC_MESSAGES/messages.mo b/locale/ja_JP/LC_MESSAGES/messages.mo
index 8e4d276d4..951ab34d1 100644
Binary files a/locale/ja_JP/LC_MESSAGES/messages.mo and b/locale/ja_JP/LC_MESSAGES/messages.mo differ
diff --git a/locale/ja_JP/LC_MESSAGES/messages.po b/locale/ja_JP/LC_MESSAGES/messages.po
index 50137c7d8..bdf4b5224 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: 2018-10-10 08:24+0300\n"
+"POT-Creation-Date: 2018-12-01 12:59+0300\n"
 "PO-Revision-Date: 2013-07-13 11:05+0900\n"
 "Last-Translator: Yak! <yak_ex@mx.scn.tv>\n"
 "Language-Team: \n"
@@ -94,8 +94,8 @@ msgid "Weekly"
 msgstr "毎週"
 
 #: backend.php:103
-#: classes/pref/users.php:47
 #: classes/pref/system.php:51
+#: classes/pref/users.php:47
 msgid "User"
 msgstr "ユーザー"
 
@@ -167,33 +167,33 @@ msgstr "ユーザーが見つかりません"
 
 #: index.php:151
 #: index.php:167
-#: index.php:285
+#: index.php:282
 #: prefs.php:120
 #: classes/backend.php:5
 #: classes/pref/labels.php:294
-#: classes/pref/feeds.php:1230
 #: classes/pref/filters.php:822
-#: js/feedlist.js:148
-#: js/feedlist.js:491
-#: js/feedlist.js:539
-#: js/functions.js:314
-#: js/functions.js:1336
-#: js/prefs.js:562
-#: js/prefs.js:754
-#: js/prefs.js:1488
-#: js/prefs.js:1503
-#: js/tt-rss.js:547
-#: js/viewfeed.js:1180
+#: classes/pref/feeds.php:1229
+#: js/feedlist.js:118
+#: js/feedlist.js:446
+#: js/feedlist.js:487
+#: js/functions.js:328
+#: js/functions.js:551
+#: js/functions.js:1286
+#: js/prefs.js:477
+#: js/prefs.js:617
+#: js/prefs.js:956
+#: js/prefs.js:1000
+#: js/prefs.js:1028
+#: js/prefs.js:1037
+#: js/prefs.js:1045
+#: js/prefs.js:1057
+#: js/tt-rss.js:497
+#: js/viewfeed.js:509
+#: js/viewfeed.js:928
 #: plugins/import_export/import_export.js:17
-#: js/functions.js:565
-#: js/prefs.js:1200
-#: js/prefs.js:1253
-#: js/prefs.js:1292
-#: js/prefs.js:1305
-#: js/prefs.js:1316
-#: js/prefs.js:1331
-#: js/tt-rss.js:564
-#: js/viewfeed.js:760
+#: js/prefs.js:1192
+#: js/prefs.js:1205
+#: js/tt-rss.js:510
 msgid "Loading, please wait..."
 msgstr "読み込みんでいます。しばらくお待ちください..."
 
@@ -210,13 +210,13 @@ msgid "All Articles"
 msgstr "すべての記事"
 
 #: index.php:194
-#: include/functions.php:1227
+#: include/functions.php:1172
 #: classes/feeds.php:110
 msgid "Starred"
 msgstr "お気に入り"
 
 #: index.php:195
-#: include/functions.php:1228
+#: include/functions.php:1173
 #: classes/feeds.php:111
 msgid "Published"
 msgstr "公開済み"
@@ -256,11 +256,11 @@ msgid "Title"
 msgstr "題名"
 
 #: index.php:211
-#: index.php:251
-#: include/functions.php:1215
+#: index.php:250
+#: include/functions.php:1160
 #: classes/feeds.php:115
-#: js/FeedTree.js:41
-#: js/FeedTree.js:69
+#: js/FeedTree.js:42
+#: js/FeedTree.js:70
 msgid "Mark as read"
 msgstr "既読にする"
 
@@ -297,7 +297,7 @@ msgid "Feed actions:"
 msgstr "フィード操作:"
 
 #: index.php:246
-#: classes/handler/public.php:551
+#: classes/handler/public.php:575
 msgid "Subscribe to feed..."
 msgstr "フィードを購読する..."
 
@@ -306,56 +306,44 @@ msgid "Edit this feed..."
 msgstr "フィードを編集する..."
 
 #: index.php:248
-msgid "Rescore feed"
-msgstr "フィードのスコアを再計算しています..."
-
-#: index.php:249
-#: classes/pref/feeds.php:770
-#: classes/pref/feeds.php:1203
-#: js/PrefFeedTree.js:61
+#: classes/pref/feeds.php:769
+#: classes/pref/feeds.php:1202
+#: js/PrefFeedTree.js:62
 msgid "Unsubscribe"
 msgstr "購読をやめる"
 
-#: index.php:250
+#: index.php:249
 msgid "All feeds:"
 msgstr "すべてのフィード:"
 
-#: index.php:252
+#: index.php:251
 msgid "(Un)hide read feeds"
 msgstr "読んだフィードを隠す/再表示する"
 
-#: index.php:253
+#: index.php:252
 msgid "Other actions:"
 msgstr "その他の操作:"
 
-#: index.php:254
-#: include/functions.php:1201
+#: index.php:253
+#: include/functions.php:1146
 msgid "Toggle widescreen mode"
 msgstr "ワイド表示モードの切り替え"
 
-#: index.php:255
-msgid "Create label..."
-msgstr "ラベルを作成する..."
-
-#: index.php:256
-msgid "Create filter..."
-msgstr "フィルターを作成しています..."
-
-#: index.php:257
+#: index.php:254
 msgid "Keyboard shortcuts help"
 msgstr "キーボードショートカット"
 
-#: index.php:266
+#: index.php:263
 msgid "Logout"
 msgstr "ログアウト"
 
-#: index.php:272
+#: index.php:269
 msgid "Updates are available from Git."
 msgstr ""
 
 #: prefs.php:33
 #: prefs.php:138
-#: include/functions.php:1230
+#: include/functions.php:1175
 #: classes/pref/prefs.php:425
 msgid "Preferences"
 msgstr "設定"
@@ -370,8 +358,8 @@ msgstr "設定を終了する"
 
 #: prefs.php:141
 #: classes/pref/feeds.php:114
-#: classes/pref/feeds.php:1138
-#: classes/pref/feeds.php:1192
+#: classes/pref/feeds.php:1137
+#: classes/pref/feeds.php:1191
 msgid "Feeds"
 msgstr "フィード"
 
@@ -381,8 +369,8 @@ msgid "Filters"
 msgstr "フィルター"
 
 #: prefs.php:147
+#: classes/feeds.php:1696
 #: classes/pref/labels.php:94
-#: classes/feeds.php:1710
 msgid "Labels"
 msgstr "ラベル"
 
@@ -394,80 +382,80 @@ msgstr "ユーザー"
 msgid "System"
 msgstr "システム"
 
-#: register.php:186
+#: register.php:185
 #: include/login_form.php:162
 msgid "Create new account"
 msgstr "新規アカウントの作成"
 
-#: register.php:192
+#: register.php:191
 msgid "New user registrations are administratively disabled."
 msgstr "新規ユーザーの登録は管理者によって無効になっています。"
 
-#: register.php:196
-#: register.php:241
-#: register.php:254
-#: register.php:269
-#: register.php:288
-#: register.php:336
-#: register.php:346
-#: register.php:358
-#: classes/handler/public.php:623
-#: classes/handler/public.php:697
-#: classes/handler/public.php:798
-#: classes/handler/public.php:877
-#: classes/handler/public.php:891
-#: classes/handler/public.php:898
-#: classes/handler/public.php:923
+#: register.php:195
+#: register.php:240
+#: register.php:253
+#: register.php:268
+#: register.php:287
+#: register.php:334
+#: register.php:344
+#: register.php:356
+#: classes/handler/public.php:647
+#: classes/handler/public.php:721
+#: 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 に戻る"
 
-#: register.php:217
+#: register.php:216
 msgid "Your temporary password will be sent to the specified email. Accounts, which were not logged in once, are erased automatically 24 hours after temporary password is sent."
 msgstr "一時的なパスワードをメールで送りました。一時的なパスワードが送信されてから一度もログインされていないアカウントは24時間後に自動的に削除されます。"
 
-#: register.php:223
+#: register.php:222
 msgid "Desired login:"
 msgstr "ご希望のlogin名:"
 
-#: register.php:226
+#: register.php:225
 msgid "Check availability"
 msgstr "有効性の確認"
 
-#: register.php:228
-#: classes/handler/public.php:713
+#: register.php:227
+#: classes/handler/public.php:737
 msgid "Email:"
 msgstr "メールアドレス:"
 
-#: register.php:231
-#: classes/handler/public.php:718
+#: register.php:230
+#: classes/handler/public.php:742
 msgid "How much is two plus two:"
 msgstr "2 + 2 = ？"
 
-#: register.php:234
+#: register.php:233
 msgid "Submit registration"
 msgstr "登録を送信する"
 
-#: register.php:252
+#: register.php:251
 msgid "Your registration information is incomplete."
 msgstr "登録情報が完成していません。"
 
-#: register.php:267
+#: register.php:266
 msgid "Sorry, this username is already taken."
 msgstr "すみませんがこのユーザー名は既にいます。"
 
-#: register.php:286
+#: register.php:285
 msgid "Registration failed."
 msgstr "登録に失敗しました。"
 
-#: register.php:333
+#: register.php:331
 msgid "Account created successfully."
 msgstr "アカウントの作成に成功しました。"
 
-#: register.php:355
+#: register.php:353
 msgid "New user registrations are currently closed."
 msgstr "新規ユーザーの登録は現在行っていません。"
 
-#: update.php:66
+#: update.php:67
 msgid "Tiny Tiny RSS data update script."
 msgstr "Tiny Tiny RSS データ更新スクリプト。"
 
@@ -480,10 +468,10 @@ msgstr "すべてのフィード"
 
 #: include/controls.php:138
 #: include/controls.php:230
-#: classes/opml.php:512
-#: classes/digest.php:120
+#: classes/digest.php:124
+#: classes/feeds.php:1708
 #: classes/pref/feeds.php:233
-#: classes/feeds.php:1722
+#: classes/opml.php:512
 msgid "Uncategorized"
 msgstr "カテゴリー割り当てなし"
 
@@ -497,287 +485,287 @@ msgstr[0] "保管された記事 %d 件"
 msgid "No feeds found."
 msgstr "フィードがありません。"
 
-#: include/functions.php:983
+#: include/functions.php:928
 #, php-format
 msgid "%d min"
 msgstr ""
 
-#: include/functions.php:1177
+#: include/functions.php:1122
 msgid "Navigation"
 msgstr "ナビゲーション"
 
-#: include/functions.php:1178
+#: include/functions.php:1123
 msgid "Open next feed"
 msgstr "次のフィードを開く"
 
-#: include/functions.php:1179
+#: include/functions.php:1124
 msgid "Open previous feed"
 msgstr "前のフィードを開く"
 
-#: include/functions.php:1180
+#: include/functions.php:1125
 msgid "Open next article"
 msgstr "次の記事を開く"
 
-#: include/functions.php:1181
+#: include/functions.php:1126
 msgid "Open previous article"
 msgstr "前の記事を開く"
 
-#: include/functions.php:1182
+#: include/functions.php:1127
 msgid "Open next article (don't scroll long articles)"
 msgstr "次の記事を開く(スクロールしない)"
 
-#: include/functions.php:1183
+#: include/functions.php:1128
 msgid "Open previous article (don't scroll long articles)"
 msgstr "前の記事を開く(スクロールしない)"
 
-#: include/functions.php:1184
+#: include/functions.php:1129
 msgid "Move to next article (don't expand or mark read)"
 msgstr "次の記事へ移動する(展開せず既読にもしない)"
 
-#: include/functions.php:1185
+#: include/functions.php:1130
 msgid "Move to previous article (don't expand or mark read)"
 msgstr "前の記事へ移動する(展開せず既読にもしない)"
 
-#: include/functions.php:1186
+#: include/functions.php:1131
 msgid "Show search dialog"
 msgstr "検索ダイアログを表示する"
 
-#: include/functions.php:1187
+#: include/functions.php:1132
 msgid "Article"
 msgstr "記事"
 
-#: include/functions.php:1188
-#: js/viewfeed.js:1695
+#: include/functions.php:1133
+#: js/viewfeed.js:1341
 msgid "Toggle starred"
 msgstr "お気に入りを切り替える"
 
-#: include/functions.php:1189
-#: js/viewfeed.js:1707
+#: include/functions.php:1134
+#: js/viewfeed.js:1353
 msgid "Toggle published"
 msgstr "公開を切り替える"
 
-#: include/functions.php:1190
-#: js/viewfeed.js:1682
+#: include/functions.php:1135
+#: js/viewfeed.js:1328
 msgid "Toggle unread"
 msgstr "未読/既読を切り替える"
 
-#: include/functions.php:1191
+#: include/functions.php:1136
 msgid "Edit tags"
 msgstr "タグを編集する"
 
-#: include/functions.php:1192
+#: include/functions.php:1137
 msgid "Open in new window"
 msgstr "新しいウィンドウで開く"
 
-#: include/functions.php:1193
-#: js/viewfeed.js:1728
+#: include/functions.php:1138
+#: js/viewfeed.js:1374
 msgid "Mark below as read"
 msgstr "これより下を既読にする"
 
-#: include/functions.php:1194
-#: js/viewfeed.js:1721
+#: include/functions.php:1139
+#: js/viewfeed.js:1367
 msgid "Mark above as read"
 msgstr "これより上を既読にする"
 
-#: include/functions.php:1195
+#: include/functions.php:1140
 msgid "Scroll down"
 msgstr "下にスクロール"
 
-#: include/functions.php:1196
+#: include/functions.php:1141
 msgid "Scroll up"
 msgstr "上にスクロール"
 
-#: include/functions.php:1197
+#: include/functions.php:1142
 msgid "Select article under cursor"
 msgstr "マウスカーソルの下の記事を選択する"
 
-#: include/functions.php:1198
+#: include/functions.php:1143
 msgid "Email article"
 msgstr "記事をメールする"
 
-#: include/functions.php:1199
+#: include/functions.php:1144
 msgid "Close/collapse article"
 msgstr "記事を閉じる"
 
-#: include/functions.php:1200
+#: include/functions.php:1145
 msgid "Toggle article expansion (combined mode)"
 msgstr "記事の展開状態の切り替え(組み合わせモード)"
 
-#: include/functions.php:1202
+#: include/functions.php:1147
 #: plugins/embed_original/init.php:33
 msgid "Toggle embed original"
 msgstr "元の記事の埋め込みモードの切り替え"
 
-#: include/functions.php:1203
+#: include/functions.php:1148
 msgid "Article selection"
 msgstr "記事の選択"
 
-#: include/functions.php:1204
+#: include/functions.php:1149
 msgid "Select all articles"
 msgstr "すべての記事を選択する"
 
-#: include/functions.php:1205
+#: include/functions.php:1150
 msgid "Select unread"
 msgstr "未読記事を選択する"
 
-#: include/functions.php:1206
+#: include/functions.php:1151
 msgid "Select starred"
 msgstr "お気に入りの記事を選択する"
 
-#: include/functions.php:1207
+#: include/functions.php:1152
 msgid "Select published"
 msgstr "公開済みの記事を選択する"
 
-#: include/functions.php:1208
+#: include/functions.php:1153
 msgid "Invert selection"
 msgstr "選択を反転する"
 
-#: include/functions.php:1209
+#: include/functions.php:1154
 msgid "Deselect everything"
 msgstr "選択を全て解除する"
 
-#: include/functions.php:1210
-#: classes/pref/feeds.php:522
-#: classes/pref/feeds.php:794
+#: include/functions.php:1155
+#: classes/pref/feeds.php:521
+#: classes/pref/feeds.php:793
 msgid "Feed"
 msgstr "フィード"
 
-#: include/functions.php:1211
+#: include/functions.php:1156
 msgid "Refresh current feed"
 msgstr "現在のフィードを更新する"
 
-#: include/functions.php:1212
+#: include/functions.php:1157
 msgid "Un/hide read feeds"
 msgstr "読んだフィードを隠す/再表示する"
 
-#: include/functions.php:1213
-#: classes/pref/feeds.php:1195
+#: include/functions.php:1158
+#: classes/pref/feeds.php:1194
 msgid "Subscribe to feed"
 msgstr "フィードを購読する"
 
-#: include/functions.php:1214
-#: js/FeedTree.js:48
-#: js/PrefFeedTree.js:55
-#: js/viewfeed.js:1846
+#: include/functions.php:1159
+#: js/FeedTree.js:49
+#: js/PrefFeedTree.js:56
+#: js/viewfeed.js:1492
 msgid "Edit feed"
 msgstr "フィードを編集する"
 
-#: include/functions.php:1216
+#: include/functions.php:1161
 msgid "Reverse headlines"
 msgstr "ヘッドラインの順序を逆転する"
 
-#: include/functions.php:1217
+#: include/functions.php:1162
 msgid "Toggle headline grouping"
 msgstr ""
 
-#: include/functions.php:1218
+#: include/functions.php:1163
 msgid "Debug feed update"
 msgstr "フィードの更新を確認する"
 
-#: include/functions.php:1219
+#: include/functions.php:1164
 #, fuzzy
 msgid "Debug viewfeed()"
 msgstr "フィードの更新を確認する"
 
-#: include/functions.php:1220
-#: js/FeedTree.js:97
+#: include/functions.php:1165
+#: js/FeedTree.js:98
 msgid "Mark all feeds as read"
 msgstr "すべてのフィードを既読に設定する"
 
-#: include/functions.php:1221
+#: include/functions.php:1166
 msgid "Un/collapse current category"
 msgstr "カテゴリーの開閉"
 
-#: include/functions.php:1222
-msgid "Toggle combined mode"
-msgstr "組み合わせモードの切り替え"
-
-#: include/functions.php:1223
+#: include/functions.php:1167
 msgid "Toggle auto expand in combined mode"
 msgstr "組み合わせモードでの自動展開の切り替え"
 
-#: include/functions.php:1224
+#: include/functions.php:1168
+msgid "Toggle combined mode"
+msgstr "組み合わせモードの切り替え"
+
+#: include/functions.php:1169
 msgid "Go to"
 msgstr "移動"
 
-#: include/functions.php:1225
-#: classes/feeds.php:1583
+#: include/functions.php:1170
+#: classes/feeds.php:1569
 msgid "All articles"
 msgstr "すべての記事"
 
-#: include/functions.php:1226
+#: include/functions.php:1171
 msgid "Fresh"
 msgstr "新しい記事"
 
-#: include/functions.php:1229
-#: js/tt-rss.js:491
-#: js/tt-rss.js:660
+#: include/functions.php:1174
+#: js/tt-rss.js:439
+#: js/tt-rss.js:599
 msgid "Tag cloud"
 msgstr "タグクラウド"
 
-#: include/functions.php:1231
+#: include/functions.php:1176
 msgid "Other"
 msgstr "その他"
 
-#: include/functions.php:1232
+#: include/functions.php:1177
 #: classes/pref/labels.php:279
 msgid "Create label"
 msgstr "ラベルを作成する"
 
-#: include/functions.php:1233
+#: include/functions.php:1178
 #: classes/pref/filters.php:801
 msgid "Create filter"
 msgstr "フィルターを作成する"
 
-#: include/functions.php:1234
+#: include/functions.php:1179
 msgid "Un/collapse sidebar"
 msgstr "サイドバーを開閉する"
 
-#: include/functions.php:1235
+#: include/functions.php:1180
 msgid "Show help dialog"
 msgstr "ヘルプダイアログを表示する"
 
-#: include/functions.php:2582
+#: include/functions.php:2529
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: include/functions.php:2583
+#: include/functions.php:2530
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: include/functions.php:2584
+#: include/functions.php:2531
 msgid "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form"
 msgstr ""
 
-#: include/functions.php:2585
+#: include/functions.php:2532
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: include/functions.php:2586
+#: include/functions.php:2533
 #, fuzzy
 msgid "No file was uploaded"
 msgstr "ファイルがアップロードされていません。"
 
-#: include/functions.php:2587
+#: include/functions.php:2534
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: include/functions.php:2588
+#: include/functions.php:2535
 msgid "Failed to write file to disk."
 msgstr ""
 
-#: include/functions.php:2589
+#: include/functions.php:2536
 msgid "A PHP extension stopped the file upload."
 msgstr ""
 
 #: include/login_form.php:107
-#: classes/handler/public.php:446
-#: classes/handler/public.php:708
+#: classes/handler/public.php:466
+#: classes/handler/public.php:732
 msgid "Login:"
 msgstr "ログイン:"
 
 #: include/login_form.php:117
-#: classes/handler/public.php:449
+#: classes/handler/public.php:469
 msgid "Password:"
 msgstr "パスワード:"
 
@@ -790,9 +778,9 @@ msgid "Profile:"
 msgstr "プロファイル:"
 
 #: include/login_form.php:133
-#: classes/handler/public.php:252
 #: classes/pref/prefs.php:1037
 #: classes/rpc.php:69
+#: classes/handler/public.php:272
 msgid "Default profile"
 msgstr "標準のプロファイル"
 
@@ -809,207 +797,27 @@ msgid "Remember me"
 msgstr "ログイン状態を記憶する"
 
 #: include/login_form.php:159
-#: classes/handler/public.php:454
+#: classes/handler/public.php:474
 msgid "Log in"
 msgstr "ログイン"
 
-#: include/sessions.php:46
+#: include/sessions.php:45
 msgid "Session failed to validate (schema version changed)"
 msgstr "セッションの検査に失敗しました (スキーマのバージョンが変更されました)"
 
-#: include/sessions.php:62
+#: include/sessions.php:53
+#, fuzzy
+msgid "Session failed to validate (UA changed)."
+msgstr "セッションの検査に失敗しました (パスワードが変更されました)"
+
+#: include/sessions.php:67
 msgid "Session failed to validate (password changed)"
 msgstr "セッションの検査に失敗しました (パスワードが変更されました)"
 
-#: include/sessions.php:69
+#: include/sessions.php:74
 msgid "Session failed to validate (user not found)"
 msgstr "セッションの検査に失敗しました (ユーザーが見つかりません)"
 
-#: classes/article.php:26
-msgid "Article not found."
-msgstr "記事が見つかりません。"
-
-#: classes/article.php:211
-msgid "Tags for this article (separated by commas):"
-msgstr "この記事のタグ (カンマで区切ります):"
-
-#: classes/article.php:236
-#: classes/pref/labels.php:82
-#: classes/pref/users.php:103
-#: classes/pref/feeds.php:774
-#: classes/pref/feeds.php:914
-#: classes/pref/filters.php:525
-#: classes/pref/prefs.php:982
-#: plugins/nsfw/init.php:85
-#: plugins/note/init.php:58
-#: plugins/af_readability/init.php:80
-#: plugins/af_redditimgur/init.php:66
-#: plugins/af_psql_trgm/init.php:188
-#: plugins/mail/init.php:65
-#: plugins/af_zz_imgproxy/init.php:238
-msgid "Save"
-msgstr "保存"
-
-#: classes/article.php:238
-#: classes/handler/public.php:423
-#: classes/handler/public.php:457
-#: classes/pref/labels.php:84
-#: classes/pref/users.php:105
-#: classes/pref/feeds.php:775
-#: classes/pref/feeds.php:917
-#: classes/pref/feeds.php:1672
-#: classes/pref/filters.php:528
-#: classes/pref/filters.php:945
-#: classes/pref/filters.php:1022
-#: classes/pref/filters.php:1115
-#: classes/pref/prefs.php:984
-#: classes/feeds.php:1037
-#: classes/feeds.php:1089
-#: classes/feeds.php:1128
-#: plugins/note/init.php:60
-#: plugins/mail/init.php:179
-msgid "Cancel"
-msgstr "取り消し"
-
-#: classes/article.php:337
-#: classes/article.php:720
-#: classes/article.php:875
-msgid "no tags"
-msgstr "タグがありません"
-
-#: classes/article.php:448
-msgid "unknown type"
-msgstr "未知の種類"
-
-#: classes/article.php:525
-msgid "Attachments"
-msgstr "添付"
-
-#: classes/article.php:626
-#: classes/feeds.php:661
-msgid "comment"
-msgid_plural "comments"
-msgstr[0] ""
-
-#: classes/article.php:630
-#: classes/feeds.php:665
-#, fuzzy
-msgid "comments"
-msgstr "添付"
-
-#: classes/article.php:689
-msgid " - "
-msgstr " - "
-
-#: classes/article.php:730
-#: classes/feeds.php:647
-msgid "Edit tags for this article"
-msgstr "この記事のタグを編集する"
-
-#: classes/article.php:763
-#: classes/feeds.php:602
-msgid "Originally from:"
-msgstr "元の記事:"
-
-#: classes/article.php:774
-#: classes/pref/feeds.php:539
-#: classes/feeds.php:613
-msgid "Feed URL"
-msgstr "フィード URL"
-
-#: classes/article.php:811
-#: classes/backend.php:103
-#: classes/dlg.php:33
-#: classes/dlg.php:56
-#: classes/dlg.php:89
-#: classes/dlg.php:154
-#: classes/dlg.php:181
-#: classes/dlg.php:197
-#: classes/pref/feeds.php:1466
-#: classes/pref/feeds.php:1533
-#: classes/pref/filters.php:208
-#: classes/pref/prefs.php:1099
-#: plugins/af_psql_trgm/init.php:109
-#: plugins/import_export/init.php:446
-#: plugins/import_export/init.php:490
-#: plugins/share/init.php:128
-msgid "Close this window"
-msgstr "このウィンドウを閉じる"
-
-#: classes/article.php:913
-msgid "(edit note)"
-msgstr "(ノートの編集)"
-
-#: classes/opml.php:31
-#: classes/opml.php:36
-msgid "OPML Utility"
-msgstr "OPML ユーティリティ"
-
-#: classes/opml.php:40
-msgid "Importing OPML..."
-msgstr "OPML のインポート中..."
-
-#: classes/opml.php:45
-msgid "Return to preferences"
-msgstr "設定に戻る"
-
-#: classes/opml.php:301
-#, php-format
-msgid "Adding feed: %s"
-msgstr "フィード追加: %s"
-
-#: classes/opml.php:312
-#, php-format
-msgid "Duplicate feed: %s"
-msgstr "重複したフィード: %s"
-
-#: classes/opml.php:326
-#, php-format
-msgid "Adding label %s"
-msgstr "ラベル %s の割り当て"
-
-#: classes/opml.php:329
-#, php-format
-msgid "Duplicate label: %s"
-msgstr "重複したラベル: %s"
-
-#: classes/opml.php:341
-#, php-format
-msgid "Setting preference key %s to %s"
-msgstr "%s を %s に設定"
-
-#: classes/opml.php:377
-msgid "Adding filter..."
-msgstr "フィルタを追加しています..."
-
-#: classes/opml.php:512
-#, php-format
-msgid "Processing category: %s"
-msgstr "処理中のカテゴリ: %s"
-
-#: classes/opml.php:558
-#, php-format
-msgid "Upload failed with error code %d"
-msgstr "エラーコード %d でアップロードが失敗しました"
-
-#: classes/opml.php:570
-#: plugins/import_export/init.php:471
-msgid "Unable to move uploaded file."
-msgstr "アップロードされたファイルを移動できません。"
-
-#: classes/opml.php:574
-#: plugins/import_export/init.php:475
-msgid "Error: please upload OPML file."
-msgstr "エラー: OPML ファイルをアップロードしてください。"
-
-#: classes/opml.php:585
-msgid "Error: unable to find moved OPML file."
-msgstr "エラー: 移動された OPML ファイルが見つかりません。"
-
-#: classes/opml.php:594
-msgid "Error while parsing document."
-msgstr "ドキュメントの解析中のエラーです。"
-
 #: classes/backend.php:31
 msgid "Other interface tips are available in the Tiny Tiny RSS wiki."
 msgstr "インタフェースに関する他のヒントが Tiny Tiny RSS の Wiki にあります。"
@@ -1030,164 +838,356 @@ msgstr "Ctrl"
 msgid "Help topic not found."
 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/backend.php:103
+#: classes/pref/filters.php:208
+#: classes/pref/feeds.php:1465
+#: classes/pref/feeds.php:1532
+#: classes/pref/prefs.php:1099
+#: classes/dlg.php:33
+#: classes/dlg.php:56
+#: classes/dlg.php:89
+#: classes/dlg.php:154
+#: classes/dlg.php:181
+#: classes/dlg.php:197
+#: classes/article.php:810
+#: plugins/af_psql_trgm/init.php:109
+#: plugins/import_export/init.php:446
+#: plugins/import_export/init.php:490
+#: plugins/share/init.php:128
+msgid "Close this window"
+msgstr "このウィンドウを閉じる"
 
-#: classes/dlg.php:44
-msgid "Your Public OPML URL is:"
-msgstr "あなたの公開 OPML の URL:"
+#: classes/feeds.php:53
+msgid "View as RSS feed"
+msgstr "RSS フィードとして閲覧する"
 
-#: classes/dlg.php:53
-#: classes/dlg.php:178
-#: plugins/share/init.php:125
-msgid "Generate new URL"
-msgstr "新しい URL を生成する"
+#: classes/feeds.php:54
+#: classes/feeds.php:140
+#: classes/pref/feeds.php:1326
+msgid "View as RSS"
+msgstr "RSS として閲覧する"
 
-#: classes/dlg.php:67
-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/feeds.php:62
+#, php-format
+msgid "Last updated: %s"
+msgstr "最終更新: %s"
 
-#: classes/dlg.php:71
-#: classes/dlg.php:80
-msgid "Last update:"
-msgstr "最終更新:"
-
-#: classes/dlg.php:76
-msgid "Update daemon is taking too long to perform a feed update. This could indicate a problem like crash or a hang. Please check the daemon process or contact instance owner."
-msgstr "更新デーモンがフィードを更新するのに非常に長い時間がかかっています。クラッシュかハングのような問題が起こっているのかもしれません。デーモンプロセスを確認するか、管理者に連絡してください。"
-
-#: classes/dlg.php:169
-msgid "You can view this feed as RSS using the following URL:"
-msgstr "このフィードは以下の URL で RSS として見られます:"
-
-#: classes/dlg.php:190
-msgid "You are using default tt-rss password. Please change it in the Preferences (Personal data / Authentication)."
-msgstr ""
-
-#: classes/dlg.php:194
+#: classes/feeds.php:100
 #, fuzzy
-msgid "Open Preferences"
-msgstr "設定"
+msgid "Select..."
+msgstr "選択"
 
-#: classes/handler/public.php:387
-#: plugins/bookmarklets/init.php:40
-msgid "Share with Tiny Tiny RSS"
-msgstr "Tiny Tiny RSS で共有する"
+#: classes/feeds.php:102
+#: classes/pref/labels.php:273
+#: classes/pref/filters.php:391
+#: classes/pref/filters.php:449
+#: classes/pref/filters.php:795
+#: classes/pref/filters.php:878
+#: classes/pref/filters.php:905
+#: classes/pref/feeds.php:1185
+#: classes/pref/feeds.php:1416
+#: classes/pref/feeds.php:1481
+#: classes/pref/users.php:358
+#: classes/pref/prefs.php:996
+msgid "All"
+msgstr "すべて"
 
-#: classes/handler/public.php:395
-msgid "Title:"
-msgstr "題名:"
+#: classes/feeds.php:104
+msgid "Invert"
+msgstr "反転"
 
-#: classes/handler/public.php:397
-#: classes/pref/feeds.php:537
-msgid "URL:"
-msgstr "URL:"
+#: classes/feeds.php:105
+#: classes/pref/labels.php:275
+#: classes/pref/filters.php:393
+#: classes/pref/filters.php:451
+#: classes/pref/filters.php:797
+#: classes/pref/filters.php:880
+#: classes/pref/filters.php:907
+#: classes/pref/feeds.php:1187
+#: classes/pref/feeds.php:1418
+#: classes/pref/feeds.php:1483
+#: classes/pref/users.php:360
+#: classes/pref/prefs.php:998
+msgid "None"
+msgstr "なし"
 
-#: classes/handler/public.php:399
-msgid "Content:"
-msgstr "内容:"
+#: classes/feeds.php:107
+msgid "Selection toggle:"
+msgstr "選択の切り替え:"
 
-#: classes/handler/public.php:401
-msgid "Labels:"
-msgstr "ラベル:"
+#: classes/feeds.php:113
+msgid "Selection:"
+msgstr "選択:"
 
-#: classes/handler/public.php:420
-msgid "Shared article will appear in the Published feed."
-msgstr "共有した記事は「公開済みの記事」に表示されます。"
+#: classes/feeds.php:116
+msgid "Set score"
+msgstr "スコアを設定"
 
-#: classes/handler/public.php:422
-msgid "Share"
-msgstr "共有"
+#: classes/feeds.php:119
+msgid "Archive"
+msgstr "保管"
 
-#: classes/handler/public.php:444
-msgid "Not logged in"
-msgstr "ログインしていません"
-
-#: classes/handler/public.php:504
-msgid "Incorrect username or password"
-msgstr "ユーザー名かパスワードが正しくありません"
-
-#: classes/handler/public.php:557
-#, php-format
-msgid "Already subscribed to <b>%s</b>."
-msgstr "<b>%s</b> は既に購読しています。"
-
-#: classes/handler/public.php:560
-#, php-format
-msgid "Subscribed to <b>%s</b>."
-msgstr "<b>%s</b> を購読しました。"
-
-#: classes/handler/public.php:563
-#, php-format
-msgid "Could not subscribe to <b>%s</b>."
-msgstr "<b>%s</b> は購読できませんでした。"
-
-#: classes/handler/public.php:566
-#, php-format
-msgid "No feeds found in <b>%s</b>."
-msgstr "<b>%s</b>にフィードが見つかりません。"
-
-#: classes/handler/public.php:569
-msgid "Multiple feed URLs found."
-msgstr "複数のフィードの URL が見つかりました。"
-
-#: classes/handler/public.php:573
-#, 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:591
-msgid "Subscribe to selected feed"
-msgstr "選択したフィードを購読する"
-
-#: classes/handler/public.php:618
-msgid "Edit subscription options"
-msgstr "購読オプションの編集"
-
-#: classes/handler/public.php:656
-msgid "Password recovery"
-msgstr "パスワードの復旧"
-
-#: classes/handler/public.php:701
-#, 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:723
-#: classes/pref/users.php:372
-msgid "Reset password"
-msgstr "パスワードのリセット"
-
-#: classes/handler/public.php:733
-msgid "Some of the required form parameters are missing or incorrect."
-msgstr "いくつかの必須項目が入力されていないか、正しくありません"
-
-#: classes/handler/public.php:737
-#: classes/handler/public.php:806
-msgid "Go back"
+#: classes/feeds.php:121
+msgid "Move back"
 msgstr "戻る"
 
-#: classes/handler/public.php:775
+#: classes/feeds.php:122
+#: classes/pref/filters.php:400
+#: classes/pref/filters.php:458
+#: classes/pref/filters.php:887
+#: classes/pref/filters.php:914
+msgid "Delete"
+msgstr "削除"
+
+#: classes/feeds.php:127
+#: classes/feeds.php:132
+#: plugins/mailto/init.php:25
+#: plugins/mail/init.php:76
+msgid "Forward by email"
+msgstr "メールで転送する"
+
+#: classes/feeds.php:136
+msgid "Feed:"
+msgstr "フィード:"
+
+#: classes/feeds.php:193
+#: classes/feeds.php:802
+msgid "Feed not found."
+msgstr "フィードが見つかりません。"
+
+#: classes/feeds.php:255
+msgid "Never"
+msgstr "未更新"
+
+#: classes/feeds.php:341
+#, php-format
+msgid "Imported at %s"
+msgstr "%s にインポート"
+
+#: classes/feeds.php:391
+#: classes/feeds.php:484
 #, fuzzy
-msgid "[tt-rss] Password reset request"
-msgstr "[tt-rss] パスワード変更通知"
+msgid "mark feed as read"
+msgstr "既読にする"
 
-#: classes/handler/public.php:802
-msgid "Sorry, login and email combination not found."
-msgstr "ログイン名とメールアドレスの組み合わせが組み合わせが見つかりませんでした"
+#: classes/feeds.php:540
+msgid "Collapse article"
+msgstr "記事を閉じる"
 
-#: classes/handler/public.php:824
-msgid "Your access level is insufficient to run this script."
-msgstr "あなたの権限では、このスクリプトを実行できません。"
+#: classes/feeds.php:592
+#: classes/article.php:762
+msgid "Originally from:"
+msgstr "元の記事:"
 
-#: classes/handler/public.php:850
-msgid "Database Updater"
-msgstr "データベースアップデーター"
+#: classes/feeds.php:603
+#: classes/pref/feeds.php:538
+#: classes/article.php:773
+msgid "Feed URL"
+msgstr "フィード URL"
 
-#: classes/handler/public.php:915
-msgid "Perform updates"
-msgstr "更新の実行"
+#: classes/feeds.php:630
+#: classes/article.php:729
+msgid "Edit tags for this article"
+msgstr "この記事のタグを編集する"
+
+#: classes/feeds.php:644
+#: classes/article.php:625
+msgid "comment"
+msgid_plural "comments"
+msgstr[0] ""
+
+#: classes/feeds.php:648
+#: classes/article.php:629
+#, fuzzy
+msgid "comments"
+msgstr "添付"
+
+#: classes/feeds.php:686
+msgid "No unread articles found to display."
+msgstr "表示する未読記事が見つかりませんでした。"
+
+#: classes/feeds.php:689
+msgid "No updated articles found to display."
+msgstr "表示する更新された記事が見つかりませんでした。"
+
+#: classes/feeds.php:692
+msgid "No starred articles found to display."
+msgstr "表示するお気に入りの記事が見つかりませんでした。"
+
+#: classes/feeds.php:696
+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:698
+msgid "No articles found to display."
+msgstr "表示する記事が見つかりません。"
+
+#: classes/feeds.php:714
+#: classes/feeds.php:905
+#, php-format
+msgid "Feeds last updated at %s"
+msgstr "%s に最終更新されたフィード"
+
+#: classes/feeds.php:726
+#: classes/feeds.php:917
+msgid "Some feeds have update errors (click for details)"
+msgstr "いくつかのフィードの更新エラーです (詳細はクリックしてください)"
+
+#: classes/feeds.php:894
+msgid "No feed selected."
+msgstr "フィードが選択されていません。"
+
+#: classes/feeds.php:958
+#: classes/feeds.php:966
+msgid "Feed or site URL"
+msgstr "フィードかサイトの URL"
+
+#: classes/feeds.php:972
+#: classes/pref/feeds.php:559
+#: classes/pref/feeds.php:800
+#: classes/pref/feeds.php:1632
+msgid "Place in category:"
+msgstr "カテゴリーの場所:"
+
+#: classes/feeds.php:980
+msgid "Available feeds"
+msgstr "利用可能なフィード"
+
+#: classes/feeds.php:992
+#: classes/pref/feeds.php:621
+#: classes/pref/feeds.php:848
+#: classes/pref/users.php:61
+msgid "Authentication"
+msgstr "認証"
+
+#: classes/feeds.php:996
+#: classes/pref/feeds.php:625
+#: classes/pref/feeds.php:852
+#: classes/pref/feeds.php:1646
+#: classes/pref/users.php:403
+msgid "Login"
+msgstr "ログイン"
+
+#: classes/feeds.php:1000
+#: classes/pref/feeds.php:631
+#: classes/pref/feeds.php:860
+#: classes/pref/feeds.php:1649
+#: classes/pref/prefs.php:243
+msgid "Password"
+msgstr "パスワード"
+
+#: classes/feeds.php:1011
+#: classes/pref/feeds.php:645
+msgid "This feed requires authentication."
+msgstr "このフィードは認証を要求します。"
+
+#: classes/feeds.php:1014
+#: classes/feeds.php:1070
+#: classes/pref/feeds.php:1668
+msgid "Subscribe"
+msgstr "購読"
+
+#: classes/feeds.php:1017
+msgid "More feeds"
+msgstr "さらなるフィード"
+
+#: classes/feeds.php:1020
+#: classes/feeds.php:1072
+#: classes/feeds.php:1111
+#: classes/pref/labels.php:84
+#: classes/pref/filters.php:528
+#: classes/pref/filters.php:945
+#: classes/pref/filters.php:1022
+#: classes/pref/filters.php:1115
+#: classes/pref/feeds.php:774
+#: classes/pref/feeds.php:916
+#: classes/pref/feeds.php:1669
+#: classes/pref/users.php:105
+#: classes/pref/prefs.php:984
+#: classes/article.php:238
+#: classes/handler/public.php:443
+#: classes/handler/public.php:477
+#: plugins/mail/init.php:179
+#: plugins/note/init.php:60
+msgid "Cancel"
+msgstr "取り消し"
+
+#: classes/feeds.php:1042
+#: classes/feeds.php:1110
+#: classes/pref/filters.php:788
+#: classes/pref/feeds.php:1178
+#: classes/pref/users.php:345
+#: js/tt-rss.js:152
+msgid "Search"
+msgstr "検索"
+
+#: classes/feeds.php:1046
+msgid "Popular feeds"
+msgstr "人気のあるフィード"
+
+#: classes/feeds.php:1047
+msgid "Feed archive"
+msgstr "フィード保管庫"
+
+#: classes/feeds.php:1050
+msgid "limit:"
+msgstr "制限:"
+
+#: classes/feeds.php:1071
+#: classes/pref/labels.php:282
+#: classes/pref/filters.php:518
+#: classes/pref/filters.php:814
+#: classes/pref/feeds.php:751
+#: classes/pref/users.php:369
+msgid "Remove"
+msgstr "削除"
+
+#: classes/feeds.php:1084
+msgid "Look for"
+msgstr "検索"
+
+#: classes/feeds.php:1092
+#, php-format
+msgid "in %s"
+msgstr ""
+
+#: classes/feeds.php:1097
+msgid "Used for word stemming"
+msgstr ""
+
+#: classes/feeds.php:1106
+#, fuzzy
+msgid "Search syntax"
+msgstr "検索"
+
+#: classes/feeds.php:1563
+msgid "Starred articles"
+msgstr "お気に入りの記事"
+
+#: classes/feeds.php:1565
+msgid "Published articles"
+msgstr "公開済みの記事"
+
+#: classes/feeds.php:1567
+msgid "Fresh articles"
+msgstr "新しい記事"
+
+#: classes/feeds.php:1571
+msgid "Archived articles"
+msgstr "保管された記事"
+
+#: classes/feeds.php:1573
+msgid "Recently read"
+msgstr "最近読んだ"
+
+#: classes/feeds.php:1694
+msgid "Special"
+msgstr "特別"
+
+#: classes/feeds.php:1951
+#, php-format
+msgid "Search results: %s"
+msgstr "検索結果: %s"
 
 #: classes/pref/labels.php:25
 #: classes/pref/filters.php:377
@@ -1207,201 +1207,193 @@ msgstr "前景色:"
 msgid "Background:"
 msgstr "背景色:"
 
+#: classes/pref/labels.php:82
+#: classes/pref/filters.php:525
+#: classes/pref/feeds.php:773
+#: classes/pref/feeds.php:913
+#: classes/pref/users.php:103
+#: classes/pref/prefs.php:982
+#: classes/article.php:236
+#: plugins/af_zz_imgproxy/init.php:238
+#: plugins/af_redditimgur/init.php:66
+#: plugins/af_psql_trgm/init.php:188
+#: plugins/af_readability/init.php:80
+#: plugins/nsfw/init.php:85
+#: plugins/mail/init.php:65
+#: plugins/note/init.php:58
+msgid "Save"
+msgstr "保存"
+
 #: classes/pref/labels.php:244
 #, php-format
 msgid "Created label <b>%s</b>"
 msgstr "ラベル <b>%s</b> を作成しました"
 
 #: classes/pref/labels.php:270
-#: classes/pref/users.php:356
-#: classes/pref/feeds.php:1183
-#: classes/pref/feeds.php:1414
-#: classes/pref/feeds.php:1479
 #: classes/pref/filters.php:388
 #: classes/pref/filters.php:446
 #: classes/pref/filters.php:792
 #: classes/pref/filters.php:875
 #: classes/pref/filters.php:902
+#: classes/pref/feeds.php:1182
+#: classes/pref/feeds.php:1413
+#: classes/pref/feeds.php:1478
+#: classes/pref/users.php:355
 #: classes/pref/prefs.php:993
 msgid "Select"
 msgstr "選択"
 
-#: classes/pref/labels.php:273
-#: classes/pref/users.php:359
-#: classes/pref/feeds.php:1186
-#: classes/pref/feeds.php:1417
-#: classes/pref/feeds.php:1482
-#: classes/pref/filters.php:391
-#: classes/pref/filters.php:449
-#: classes/pref/filters.php:795
-#: classes/pref/filters.php:878
-#: classes/pref/filters.php:905
-#: classes/pref/prefs.php:996
-#: classes/feeds.php:102
-msgid "All"
-msgstr "すべて"
-
-#: classes/pref/labels.php:275
-#: classes/pref/users.php:361
-#: classes/pref/feeds.php:1188
-#: classes/pref/feeds.php:1419
-#: classes/pref/feeds.php:1484
-#: classes/pref/filters.php:393
-#: classes/pref/filters.php:451
-#: classes/pref/filters.php:797
-#: classes/pref/filters.php:880
-#: classes/pref/filters.php:907
-#: classes/pref/prefs.php:998
-#: classes/feeds.php:105
-msgid "None"
-msgstr "なし"
-
-#: classes/pref/labels.php:282
-#: classes/pref/users.php:370
-#: classes/pref/feeds.php:752
-#: classes/pref/filters.php:518
-#: classes/pref/filters.php:814
-#: classes/feeds.php:1088
-msgid "Remove"
-msgstr "削除"
-
 #: classes/pref/labels.php:285
 msgid "Clear colors"
 msgstr "色の消去"
 
-#: classes/pref/users.php:6
-#: classes/pref/system.php:8
-msgid "Your access level is insufficient to open this tab."
-msgstr "あなたの権限では、このタブを開ません。"
-
-#: classes/pref/users.php:26
+#: classes/pref/filters.php:155
 #, fuzzy
-msgid "Edit user"
-msgstr "ルールの編集"
+msgid "Preview article"
+msgstr "新しい記事"
 
-#: classes/pref/users.php:61
-#: classes/pref/feeds.php:622
-#: classes/pref/feeds.php:849
-#: classes/feeds.php:1009
-msgid "Authentication"
-msgstr "認証"
+#: classes/pref/filters.php:267
+#: classes/pref/filters.php:573
+msgid "(inverse)"
+msgstr "(反転)"
 
-#: classes/pref/users.php:64
-msgid "Access level: "
-msgstr "アクセスレベル: "
-
-#: classes/pref/users.php:82
-#: classes/pref/feeds.php:648
-#: classes/pref/feeds.php:867
-msgid "Options"
-msgstr "オプション"
-
-#: classes/pref/users.php:96
-#: js/prefs.js:479
-msgid "User details"
-msgstr "ユーザーの詳細"
-
-#: classes/pref/users.php:136
-#: classes/pref/users.php:407
-msgid "Registered"
-msgstr "登録済み"
-
-#: classes/pref/users.php:137
-msgid "Last logged in"
-msgstr "最終ログイン"
-
-#: classes/pref/users.php:145
-msgid "Subscribed feeds count"
-msgstr "購読フィード数"
-
-#: classes/pref/users.php:146
-#, fuzzy
-msgid "Stored articles"
-msgstr "お気に入りの記事"
-
-#: classes/pref/users.php:150
-#: classes/pref/users.php:406
-msgid "Subscribed feeds"
-msgstr "購読したフィード"
-
-#: classes/pref/users.php:176
-msgid "User not found"
-msgstr "ユーザーが見つかりません"
-
-#: classes/pref/users.php:246
+#: classes/pref/filters.php:263
+#: classes/pref/filters.php:572
 #, php-format
-msgid "Added user <b>%s</b> with password <b>%s</b>"
-msgstr "ユーザー名 <b>%s</b> とパスワード <b>%s</b> で追加しました"
+msgid "%s on %s in %s %s"
+msgstr "「%3$s」の %2$s に対して %1$s %4$s"
 
-#: classes/pref/users.php:253
-#, php-format
-msgid "Could not create user <b>%s</b>"
-msgstr "ユーザー <b>%s</b> の追加中です。"
+#: classes/pref/filters.php:383
+#: classes/pref/filters.php:870
+#: classes/pref/filters.php:977
+msgid "Match"
+msgstr "一致"
 
-#: classes/pref/users.php:257
-#, php-format
-msgid "User <b>%s</b> already exists."
-msgstr "ユーザー <b>%s</b> は既に存在します。"
+#: classes/pref/filters.php:397
+#: classes/pref/filters.php:455
+#: classes/pref/filters.php:884
+#: classes/pref/filters.php:911
+msgid "Add"
+msgstr "追加"
 
-#: classes/pref/users.php:285
-#, php-format
-msgid "Changed password of user <b>%s</b> to <b>%s</b>"
-msgstr "ユーザー <b>%s</b> のパスワードを <b>%s</b> に変更しました"
+#: classes/pref/filters.php:441
+#: classes/pref/filters.php:897
+msgid "Apply actions"
+msgstr "適用する操作"
 
-#: classes/pref/users.php:287
-#, php-format
-msgid "Sending new password of user <b>%s</b> to <b>%s</b>"
-msgstr "ユーザー <b>%s</b> の新しいパスワードを <b>%s</b> に送信しています"
+#: classes/pref/filters.php:492
+#: classes/pref/filters.php:926
+msgid "Enabled"
+msgstr "有効にする"
 
-#: classes/pref/users.php:311
-msgid "[tt-rss] Password change notification"
-msgstr "[tt-rss] パスワード変更通知"
+#: classes/pref/filters.php:501
+#: classes/pref/filters.php:929
+msgid "Match any rule"
+msgstr "いずれかのルールに一致"
 
-#: classes/pref/users.php:346
-#: classes/pref/feeds.php:1179
-#: classes/pref/filters.php:788
-#: classes/feeds.php:1059
-#: classes/feeds.php:1127
-#: js/tt-rss.js:165
-msgid "Search"
-msgstr "検索"
+#: classes/pref/filters.php:510
+#: classes/pref/filters.php:932
+msgid "Inverse matching"
+msgstr "一致結果の反転"
 
-#: classes/pref/users.php:364
-msgid "Create user"
-msgstr "ユーザーの作成"
+#: classes/pref/filters.php:522
+#: classes/pref/filters.php:939
+msgid "Test"
+msgstr "テスト"
+
+#: classes/pref/filters.php:804
+msgid "Combine"
+msgstr "組み合わせ"
 
-#: classes/pref/users.php:368
 #: classes/pref/filters.php:807
+#: classes/pref/users.php:367
 msgid "Edit"
 msgstr "編集"
 
-#: classes/pref/users.php:404
-#: classes/pref/feeds.php:626
-#: classes/pref/feeds.php:853
-#: classes/pref/feeds.php:1649
-#: classes/feeds.php:1013
-msgid "Login"
-msgstr "ログイン"
+#: classes/pref/filters.php:810
+#: classes/pref/feeds.php:1198
+#: classes/pref/feeds.php:1212
+msgid "Reset sort order"
+msgstr "ソート順のリセット"
 
-#: classes/pref/users.php:405
-msgid "Access Level"
-msgstr "アクセスレベル"
+#: classes/pref/filters.php:942
+msgid "Create"
+msgstr "作成"
 
-#: classes/pref/users.php:408
-msgid "Last login"
-msgstr "最終ログイン"
+#: classes/pref/filters.php:987
+msgid "Regular expression, without outer delimiters (i.e. slashes)"
+msgstr ""
 
-#: classes/pref/users.php:427
-msgid "Click to edit"
-msgstr "編集するにはクリック"
+#: classes/pref/filters.php:993
+msgid "Inverse regular expression matching"
+msgstr "正規表現の一致結果を反転する"
 
-#: classes/pref/users.php:447
-msgid "No users defined."
-msgstr "ユーザーが定義されていません。"
+#: classes/pref/filters.php:995
+msgid "on field"
+msgstr "対象項目"
 
-#: classes/pref/users.php:449
-msgid "No matching users found."
-msgstr "ユーザーが見つかりません。"
+#: classes/pref/filters.php:1001
+#: js/PrefFilterTree.js:44
+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:764
+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:786
+msgid "Add action"
+msgstr "操作の追加"
+
+#: classes/pref/filters.php:1139
+msgid "[No caption]"
+msgstr "[キャプションなし]"
+
+#: classes/pref/filters.php:1141
+#, fuzzy, php-format
+msgid "%s (%d rule)"
+msgid_plural "%s (%d rules)"
+msgstr[0] "ルールの追加"
+
+#: classes/pref/filters.php:1155
+#, fuzzy
+msgid "matches any rule"
+msgstr "いずれかのルールに一致"
+
+#: classes/pref/filters.php:1158
+#, fuzzy, php-format
+msgid "%s (+%d action)"
+msgid_plural "%s (+%d actions)"
+msgstr[0] "操作の追加"
+
+#: classes/pref/system.php:8
+#: classes/pref/users.php:6
+msgid "Your access level is insufficient to open this tab."
+msgstr "あなたの権限では、このタブを開ません。"
 
 #: classes/pref/system.php:29
 msgid "Error Log"
@@ -1445,384 +1437,316 @@ msgid "(%d feed)"
 msgid_plural "(%d feeds)"
 msgstr[0] "フィードを編集する"
 
-#: classes/pref/feeds.php:514
+#: classes/pref/feeds.php:513
 #: classes/pref/prefs.php:18
 msgid "General"
 msgstr "全体"
 
-#: classes/pref/feeds.php:528
+#: classes/pref/feeds.php:527
 msgid "Feed Title"
 msgstr "フィードの題名"
 
-#: classes/pref/feeds.php:560
-#: classes/pref/feeds.php:801
-#: classes/pref/feeds.php:1635
-#: classes/feeds.php:989
-msgid "Place in category:"
-msgstr "カテゴリーの場所:"
+#: classes/pref/feeds.php:536
+#: classes/handler/public.php:417
+msgid "URL:"
+msgstr "URL:"
 
-#: classes/pref/feeds.php:572
+#: classes/pref/feeds.php:571
 #, fuzzy
 msgid "Site URL:"
 msgstr "記事の URL:"
 
-#: classes/pref/feeds.php:574
+#: classes/pref/feeds.php:573
 #, fuzzy
 msgid "Site URL"
 msgstr "フィード URL"
 
-#: classes/pref/feeds.php:585
-#: classes/pref/feeds.php:815
+#: classes/pref/feeds.php:584
+#: classes/pref/feeds.php:814
 #, fuzzy
 msgid "Language:"
 msgstr "言語"
 
-#: classes/pref/feeds.php:592
-#: classes/pref/feeds.php:824
+#: classes/pref/feeds.php:591
+#: classes/pref/feeds.php:823
 msgid "Update"
 msgstr "更新"
 
-#: classes/pref/feeds.php:607
-#: classes/pref/feeds.php:840
+#: classes/pref/feeds.php:606
+#: classes/pref/feeds.php:839
 msgid "Article purging:"
 msgstr "記事の削除:"
 
-#: classes/pref/feeds.php:632
-#: classes/pref/feeds.php:861
-#: classes/pref/feeds.php:1652
-#: classes/pref/prefs.php:243
-#: classes/feeds.php:1017
-msgid "Password"
-msgstr "パスワード"
-
-#: classes/pref/feeds.php:636
+#: classes/pref/feeds.php:635
 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:646
-#: classes/feeds.php:1028
-msgid "This feed requires authentication."
-msgstr "このフィードは認証を要求します。"
+#: classes/pref/feeds.php:647
+#: classes/pref/feeds.php:866
+#: classes/pref/users.php:82
+msgid "Options"
+msgstr "オプション"
 
-#: classes/pref/feeds.php:662
-#: classes/pref/feeds.php:871
+#: classes/pref/feeds.php:661
+#: classes/pref/feeds.php:870
 msgid "Hide from Popular feeds"
 msgstr "人気のあるフィードから隠す"
 
-#: classes/pref/feeds.php:674
-#: classes/pref/feeds.php:877
+#: classes/pref/feeds.php:673
+#: classes/pref/feeds.php:876
 msgid "Include in e-mail digest"
 msgstr "電子メールダイジェストに含む"
 
-#: classes/pref/feeds.php:687
-#: classes/pref/feeds.php:883
+#: classes/pref/feeds.php:686
+#: classes/pref/feeds.php:882
 msgid "Always display image attachments"
 msgstr "常に添付画像を表示する"
 
-#: classes/pref/feeds.php:700
-#: classes/pref/feeds.php:891
+#: classes/pref/feeds.php:699
+#: classes/pref/feeds.php:890
 #, fuzzy
 msgid "Do not embed media"
 msgstr "画像を埋め込まない"
 
-#: classes/pref/feeds.php:713
-#: classes/pref/feeds.php:899
+#: classes/pref/feeds.php:712
+#: classes/pref/feeds.php:898
 msgid "Cache media"
 msgstr ""
 
-#: classes/pref/feeds.php:725
-#: classes/pref/feeds.php:905
+#: classes/pref/feeds.php:724
+#: classes/pref/feeds.php:904
 msgid "Mark updated articles as unread"
 msgstr "更新された記事を既読にする"
 
-#: classes/pref/feeds.php:729
+#: classes/pref/feeds.php:728
 msgid "Icon"
 msgstr "アイコン"
 
-#: classes/pref/feeds.php:743
-#: classes/pref/feeds.php:1284
+#: classes/pref/feeds.php:742
+#: classes/pref/feeds.php:1283
 #: plugins/import_export/init.php:71
 #, fuzzy
 msgid "Choose file..."
 msgstr "フィルターを作成しています..."
 
-#: classes/pref/feeds.php:750
+#: classes/pref/feeds.php:749
 msgid "Replace"
 msgstr "置き換え"
 
-#: classes/pref/feeds.php:757
+#: classes/pref/feeds.php:756
 #: classes/pref/prefs.php:679
 msgid "Plugins"
 msgstr "プラグイン"
 
-#: classes/pref/feeds.php:1154
+#: classes/pref/feeds.php:1153
 msgid "Feeds with errors"
 msgstr "エラーのあったフィード"
 
-#: classes/pref/feeds.php:1161
+#: classes/pref/feeds.php:1160
 msgid "Inactive feeds"
 msgstr "活発でないフィード"
 
-#: classes/pref/feeds.php:1197
+#: classes/pref/feeds.php:1196
 msgid "Edit selected feeds"
 msgstr "選択したフィードを編集"
 
-#: classes/pref/feeds.php:1199
-#: classes/pref/feeds.php:1213
-#: classes/pref/filters.php:810
-msgid "Reset sort order"
-msgstr "ソート順のリセット"
-
-#: classes/pref/feeds.php:1201
-#: js/prefs.js:1462
+#: classes/pref/feeds.php:1200
+#: js/prefs.js:1171
 msgid "Batch subscribe"
 msgstr "一括購読"
 
-#: classes/pref/feeds.php:1208
+#: classes/pref/feeds.php:1207
 msgid "Categories"
 msgstr "カテゴリー"
 
-#: classes/pref/feeds.php:1211
+#: classes/pref/feeds.php:1210
 msgid "Add category"
 msgstr "カテゴリーを追加"
 
-#: classes/pref/feeds.php:1215
+#: classes/pref/feeds.php:1214
 msgid "Remove selected"
 msgstr "選択したカテゴリーを削除"
 
-#: classes/pref/feeds.php:1272
+#: classes/pref/feeds.php:1271
 msgid "OPML"
 msgstr "OPML"
 
-#: classes/pref/feeds.php:1274
+#: classes/pref/feeds.php:1273
 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:1275
+#: classes/pref/feeds.php:1274
 msgid "Only main settings profile can be migrated using OPML."
 msgstr "OPML を使って移行できるのはメインの設定プロファイルのみです。"
 
-#: classes/pref/feeds.php:1290
+#: classes/pref/feeds.php:1289
 msgid "Import my OPML"
 msgstr "OPML インポート"
 
-#: classes/pref/feeds.php:1296
+#: classes/pref/feeds.php:1295
 msgid "Filename:"
 msgstr "ファイル名:"
 
-#: classes/pref/feeds.php:1298
+#: classes/pref/feeds.php:1297
 msgid "Include settings"
 msgstr "設定を含める"
 
-#: classes/pref/feeds.php:1302
+#: classes/pref/feeds.php:1301
 msgid "Export OPML"
 msgstr "OPML エクスポート"
 
-#: classes/pref/feeds.php:1306
+#: classes/pref/feeds.php:1305
 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:1310
+#: classes/pref/feeds.php:1309
 msgid "Public OPML URL"
 msgstr "公開 OPML URL"
 
-#: classes/pref/feeds.php:1311
+#: classes/pref/feeds.php:1310
 msgid "Display published OPML URL"
 msgstr "公開 OPML URL を表示"
 
-#: classes/pref/feeds.php:1318
+#: classes/pref/feeds.php:1317
 msgid "Published & shared articles / Generated feeds"
 msgstr "公開・共有した記事 / 生成したフィード"
 
-#: classes/pref/feeds.php:1320
+#: classes/pref/feeds.php:1319
 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:1327
-#: classes/feeds.php:54
-#: classes/feeds.php:140
-msgid "View as RSS"
-msgstr "RSS として閲覧する"
-
-#: classes/pref/feeds.php:1328
 msgid "Display URL"
 msgstr "URL の表示"
 
-#: classes/pref/feeds.php:1331
+#: classes/pref/feeds.php:1330
 msgid "Clear all generated URLs"
 msgstr "生成された URL をすべて消去する"
 
-#: classes/pref/feeds.php:1410
+#: classes/pref/feeds.php:1409
 msgid "These feeds have not been updated with new content for 3 months (oldest first):"
 msgstr "3 ヶ月間更新されていないフィード(古いもの順):"
 
-#: classes/pref/feeds.php:1444
-#: classes/pref/feeds.php:1509
+#: classes/pref/feeds.php:1443
+#: classes/pref/feeds.php:1508
 msgid "Click to edit feed"
 msgstr "編集するにはクリック"
 
-#: classes/pref/feeds.php:1462
-#: classes/pref/feeds.php:1529
+#: classes/pref/feeds.php:1461
+#: classes/pref/feeds.php:1528
 msgid "Unsubscribe from selected feeds"
 msgstr "選択したフィードの購読をやめる"
 
-#: classes/pref/feeds.php:1632
+#: classes/pref/feeds.php:1629
 msgid "Add one valid RSS feed per line (no feed detection is done)"
 msgstr "1 行に 1 フィードずつ有効な RSS フィードを追加(フィードの自動検出は行われません)"
 
-#: classes/pref/feeds.php:1641
+#: classes/pref/feeds.php:1638
 msgid "Feeds to subscribe, One per line"
 msgstr "購読するフィード(1 行 1 フィード)"
 
-#: classes/pref/feeds.php:1664
+#: classes/pref/feeds.php:1661
 msgid "Feeds require authentication."
 msgstr "このフィードは認証を要求します。"
 
-#: classes/pref/feeds.php:1671
-#: classes/feeds.php:1031
-#: classes/feeds.php:1087
-msgid "Subscribe"
-msgstr "購読"
-
-#: classes/pref/filters.php:155
+#: classes/pref/users.php:26
 #, fuzzy
-msgid "Preview article"
-msgstr "新しい記事"
+msgid "Edit user"
+msgstr "ルールの編集"
 
-#: classes/pref/filters.php:267
-#: classes/pref/filters.php:573
-msgid "(inverse)"
-msgstr "(反転)"
+#: classes/pref/users.php:64
+msgid "Access level: "
+msgstr "アクセスレベル: "
 
-#: classes/pref/filters.php:263
-#: classes/pref/filters.php:572
+#: classes/pref/users.php:96
+#: js/prefs.js:403
+msgid "User details"
+msgstr "ユーザーの詳細"
+
+#: classes/pref/users.php:136
+#: classes/pref/users.php:406
+msgid "Registered"
+msgstr "登録済み"
+
+#: classes/pref/users.php:137
+msgid "Last logged in"
+msgstr "最終ログイン"
+
+#: classes/pref/users.php:145
+msgid "Subscribed feeds count"
+msgstr "購読フィード数"
+
+#: classes/pref/users.php:146
+#, fuzzy
+msgid "Stored articles"
+msgstr "お気に入りの記事"
+
+#: classes/pref/users.php:150
+#: classes/pref/users.php:405
+msgid "Subscribed feeds"
+msgstr "購読したフィード"
+
+#: classes/pref/users.php:176
+msgid "User not found"
+msgstr "ユーザーが見つかりません"
+
+#: classes/pref/users.php:246
 #, php-format
-msgid "%s on %s in %s %s"
-msgstr "「%3$s」の %2$s に対して %1$s %4$s"
+msgid "Added user <b>%s</b> with password <b>%s</b>"
+msgstr "ユーザー名 <b>%s</b> とパスワード <b>%s</b> で追加しました"
 
-#: classes/pref/filters.php:383
-#: classes/pref/filters.php:870
-#: classes/pref/filters.php:977
-msgid "Match"
-msgstr "一致"
+#: classes/pref/users.php:253
+#, php-format
+msgid "Could not create user <b>%s</b>"
+msgstr "ユーザー <b>%s</b> の追加中です。"
 
-#: classes/pref/filters.php:397
-#: classes/pref/filters.php:455
-#: classes/pref/filters.php:884
-#: classes/pref/filters.php:911
-msgid "Add"
-msgstr "追加"
+#: classes/pref/users.php:257
+#, php-format
+msgid "User <b>%s</b> already exists."
+msgstr "ユーザー <b>%s</b> は既に存在します。"
 
-#: classes/pref/filters.php:400
-#: classes/pref/filters.php:458
-#: classes/pref/filters.php:887
-#: classes/pref/filters.php:914
-#: classes/feeds.php:122
-msgid "Delete"
-msgstr "削除"
+#: classes/pref/users.php:285
+#, php-format
+msgid "Changed password of user <b>%s</b> to <b>%s</b>"
+msgstr "ユーザー <b>%s</b> のパスワードを <b>%s</b> に変更しました"
 
-#: classes/pref/filters.php:441
-#: classes/pref/filters.php:897
-msgid "Apply actions"
-msgstr "適用する操作"
+#: classes/pref/users.php:287
+#, php-format
+msgid "Sending new password of user <b>%s</b> to <b>%s</b>"
+msgstr "ユーザー <b>%s</b> の新しいパスワードを <b>%s</b> に送信しています"
 
-#: classes/pref/filters.php:492
-#: classes/pref/filters.php:926
-msgid "Enabled"
-msgstr "有効にする"
+#: classes/pref/users.php:310
+msgid "[tt-rss] Password change notification"
+msgstr "[tt-rss] パスワード変更通知"
 
-#: classes/pref/filters.php:501
-#: classes/pref/filters.php:929
-msgid "Match any rule"
-msgstr "いずれかのルールに一致"
+#: classes/pref/users.php:363
+msgid "Create user"
+msgstr "ユーザーの作成"
 
-#: classes/pref/filters.php:510
-#: classes/pref/filters.php:932
-msgid "Inverse matching"
-msgstr "一致結果の反転"
+#: classes/pref/users.php:371
+#: classes/handler/public.php:747
+msgid "Reset password"
+msgstr "パスワードのリセット"
 
-#: classes/pref/filters.php:522
-#: classes/pref/filters.php:939
-msgid "Test"
-msgstr "テスト"
+#: classes/pref/users.php:404
+msgid "Access Level"
+msgstr "アクセスレベル"
 
-#: classes/pref/filters.php:804
-msgid "Combine"
-msgstr "組み合わせ"
+#: classes/pref/users.php:407
+msgid "Last login"
+msgstr "最終ログイン"
 
-#: classes/pref/filters.php:942
-msgid "Create"
-msgstr "作成"
+#: classes/pref/users.php:426
+msgid "Click to edit"
+msgstr "編集するにはクリック"
 
-#: classes/pref/filters.php:987
-msgid "Regular expression, without outer delimiters (i.e. slashes)"
-msgstr ""
+#: classes/pref/users.php:446
+msgid "No users defined."
+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:43
-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:797
-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:819
-msgid "Add action"
-msgstr "操作の追加"
-
-#: classes/pref/filters.php:1139
-msgid "[No caption]"
-msgstr "[キャプションなし]"
-
-#: classes/pref/filters.php:1141
-#, fuzzy, php-format
-msgid "%s (%d rule)"
-msgid_plural "%s (%d rules)"
-msgstr[0] "ルールの追加"
-
-#: classes/pref/filters.php:1155
-#, fuzzy
-msgid "matches any rule"
-msgstr "いずれかのルールに一致"
-
-#: classes/pref/filters.php:1158
-#, fuzzy, php-format
-msgid "%s (+%d action)"
-msgid_plural "%s (+%d actions)"
-msgstr[0] "操作の追加"
+#: classes/pref/users.php:448
+msgid "No matching users found."
+msgstr "ユーザーが見つかりません。"
 
 #: classes/pref/prefs.php:19
 msgid "Interface"
@@ -1998,7 +1922,7 @@ msgid "Strip all but most common HTML tags when reading articles."
 msgstr "記事を読み込む際、最も一般的な HTML タグ以外を除去する。"
 
 #: classes/pref/prefs.php:53
-#: js/prefs.js:1424
+#: js/prefs.js:1136
 msgid "Customize stylesheet"
 msgstr "スタイルシートのカスタマイズ"
 
@@ -2241,256 +2165,300 @@ msgstr "選択したプロファイルを削除しますか"
 msgid "Activate profile"
 msgstr "プロファイルを有効にする"
 
-#: classes/feeds.php:53
-msgid "View as RSS feed"
-msgstr "RSS フィードとして閲覧する"
+#: 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/feeds.php:62
-#, php-format
-msgid "Last updated: %s"
-msgstr "最終更新: %s"
+#: classes/dlg.php:44
+msgid "Your Public OPML URL is:"
+msgstr "あなたの公開 OPML の URL:"
 
-#: classes/feeds.php:100
+#: classes/dlg.php:53
+#: classes/dlg.php:178
+#: plugins/share/init.php:125
+msgid "Generate new URL"
+msgstr "新しい URL を生成する"
+
+#: classes/dlg.php:67
+msgid "Update daemon is enabled in configuration, but daemon process is not running, which prevents all feeds from updating. Please start the daemon process or contact instance owner."
+msgstr "更新デーモンが設定で有効になっていますが、デーモンが起動していないため全てのフィードが更新されません。デーモンプロセスを起動するか、管理者に連絡してください。"
+
+#: classes/dlg.php:71
+#: classes/dlg.php:80
+msgid "Last update:"
+msgstr "最終更新:"
+
+#: classes/dlg.php:76
+msgid "Update daemon is taking too long to perform a feed update. This could indicate a problem like crash or a hang. Please check the daemon process or contact instance owner."
+msgstr "更新デーモンがフィードを更新するのに非常に長い時間がかかっています。クラッシュかハングのような問題が起こっているのかもしれません。デーモンプロセスを確認するか、管理者に連絡してください。"
+
+#: classes/dlg.php:169
+msgid "You can view this feed as RSS using the following URL:"
+msgstr "このフィードは以下の URL で RSS として見られます:"
+
+#: classes/dlg.php:190
+msgid "You are using default tt-rss password. Please change it in the Preferences (Personal data / Authentication)."
+msgstr ""
+
+#: classes/dlg.php:194
 #, fuzzy
-msgid "Select..."
-msgstr "選択"
+msgid "Open Preferences"
+msgstr "設定"
 
-#: classes/feeds.php:104
-msgid "Invert"
-msgstr "反転"
+#: classes/opml.php:31
+#: classes/opml.php:36
+msgid "OPML Utility"
+msgstr "OPML ユーティリティ"
 
-#: classes/feeds.php:107
-msgid "Selection toggle:"
-msgstr "選択の切り替え:"
+#: classes/opml.php:40
+msgid "Importing OPML..."
+msgstr "OPML のインポート中..."
 
-#: classes/feeds.php:113
-msgid "Selection:"
-msgstr "選択:"
+#: classes/opml.php:45
+msgid "Return to preferences"
+msgstr "設定に戻る"
 
-#: classes/feeds.php:116
-msgid "Set score"
-msgstr "スコアを設定"
+#: classes/opml.php:301
+#, php-format
+msgid "Adding feed: %s"
+msgstr "フィード追加: %s"
 
-#: classes/feeds.php:119
-msgid "Archive"
-msgstr "保管"
+#: classes/opml.php:312
+#, php-format
+msgid "Duplicate feed: %s"
+msgstr "重複したフィード: %s"
 
-#: classes/feeds.php:121
-msgid "Move back"
+#: classes/opml.php:326
+#, php-format
+msgid "Adding label %s"
+msgstr "ラベル %s の割り当て"
+
+#: classes/opml.php:329
+#, php-format
+msgid "Duplicate label: %s"
+msgstr "重複したラベル: %s"
+
+#: classes/opml.php:341
+#, php-format
+msgid "Setting preference key %s to %s"
+msgstr "%s を %s に設定"
+
+#: classes/opml.php:377
+msgid "Adding filter..."
+msgstr "フィルタを追加しています..."
+
+#: classes/opml.php:512
+#, php-format
+msgid "Processing category: %s"
+msgstr "処理中のカテゴリ: %s"
+
+#: classes/opml.php:558
+#, php-format
+msgid "Upload failed with error code %d"
+msgstr "エラーコード %d でアップロードが失敗しました"
+
+#: classes/opml.php:570
+#: plugins/import_export/init.php:471
+msgid "Unable to move uploaded file."
+msgstr "アップロードされたファイルを移動できません。"
+
+#: classes/opml.php:574
+#: plugins/import_export/init.php:475
+msgid "Error: please upload OPML file."
+msgstr "エラー: OPML ファイルをアップロードしてください。"
+
+#: classes/opml.php:585
+msgid "Error: unable to find moved OPML file."
+msgstr "エラー: 移動された OPML ファイルが見つかりません。"
+
+#: classes/opml.php:594
+msgid "Error while parsing document."
+msgstr "ドキュメントの解析中のエラーです。"
+
+#: classes/article.php:26
+msgid "Article not found."
+msgstr "記事が見つかりません。"
+
+#: classes/article.php:211
+msgid "Tags for this article (separated by commas):"
+msgstr "この記事のタグ (カンマで区切ります):"
+
+#: classes/article.php:337
+#: classes/article.php:719
+#: classes/article.php:874
+msgid "no tags"
+msgstr "タグがありません"
+
+#: classes/article.php:447
+msgid "unknown type"
+msgstr "未知の種類"
+
+#: classes/article.php:524
+msgid "Attachments"
+msgstr "添付"
+
+#: classes/article.php:688
+msgid " - "
+msgstr " - "
+
+#: classes/article.php:912
+msgid "(edit note)"
+msgstr "(ノートの編集)"
+
+#: classes/handler/public.php:407
+#: plugins/bookmarklets/init.php:40
+msgid "Share with Tiny Tiny RSS"
+msgstr "Tiny Tiny RSS で共有する"
+
+#: classes/handler/public.php:415
+msgid "Title:"
+msgstr "題名:"
+
+#: classes/handler/public.php:419
+msgid "Content:"
+msgstr "内容:"
+
+#: classes/handler/public.php:421
+msgid "Labels:"
+msgstr "ラベル:"
+
+#: classes/handler/public.php:440
+msgid "Shared article will appear in the Published feed."
+msgstr "共有した記事は「公開済みの記事」に表示されます。"
+
+#: classes/handler/public.php:442
+msgid "Share"
+msgstr "共有"
+
+#: classes/handler/public.php:464
+msgid "Not logged in"
+msgstr "ログインしていません"
+
+#: classes/handler/public.php:527
+msgid "Incorrect username or password"
+msgstr "ユーザー名かパスワードが正しくありません"
+
+#: classes/handler/public.php:581
+#, php-format
+msgid "Already subscribed to <b>%s</b>."
+msgstr "<b>%s</b> は既に購読しています。"
+
+#: classes/handler/public.php:584
+#, php-format
+msgid "Subscribed to <b>%s</b>."
+msgstr "<b>%s</b> を購読しました。"
+
+#: classes/handler/public.php:587
+#, php-format
+msgid "Could not subscribe to <b>%s</b>."
+msgstr "<b>%s</b> は購読できませんでした。"
+
+#: classes/handler/public.php:590
+#, php-format
+msgid "No feeds found in <b>%s</b>."
+msgstr "<b>%s</b>にフィードが見つかりません。"
+
+#: classes/handler/public.php:593
+msgid "Multiple feed URLs found."
+msgstr "複数のフィードの URL が見つかりました。"
+
+#: classes/handler/public.php:597
+#, 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:615
+msgid "Subscribe to selected feed"
+msgstr "選択したフィードを購読する"
+
+#: classes/handler/public.php:642
+msgid "Edit subscription options"
+msgstr "購読オプションの編集"
+
+#: classes/handler/public.php:680
+msgid "Password recovery"
+msgstr "パスワードの復旧"
+
+#: classes/handler/public.php:725
+#, 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:757
+msgid "Some of the required form parameters are missing or incorrect."
+msgstr "いくつかの必須項目が入力されていないか、正しくありません"
+
+#: classes/handler/public.php:761
+#: classes/handler/public.php:830
+msgid "Go back"
 msgstr "戻る"
 
-#: classes/feeds.php:127
-#: classes/feeds.php:132
-#: plugins/mail/init.php:76
-#: plugins/mailto/init.php:25
-msgid "Forward by email"
-msgstr "メールで転送する"
-
-#: classes/feeds.php:136
-msgid "Feed:"
-msgstr "フィード:"
-
-#: classes/feeds.php:193
-#: classes/feeds.php:819
-msgid "Feed not found."
-msgstr "フィードが見つかりません。"
-
-#: classes/feeds.php:255
-msgid "Never"
-msgstr "未更新"
-
-#: classes/feeds.php:342
-#, php-format
-msgid "Imported at %s"
-msgstr "%s にインポート"
-
-#: classes/feeds.php:394
-#: classes/feeds.php:487
+#: classes/handler/public.php:799
 #, fuzzy
-msgid "mark feed as read"
-msgstr "既読にする"
+msgid "[tt-rss] Password reset request"
+msgstr "[tt-rss] パスワード変更通知"
 
-#: classes/feeds.php:542
-msgid "Collapse article"
-msgstr "記事を閉じる"
+#: classes/handler/public.php:826
+msgid "Sorry, login and email combination not found."
+msgstr "ログイン名とメールアドレスの組み合わせが組み合わせが見つかりませんでした"
 
-#: classes/feeds.php:703
-msgid "No unread articles found to display."
-msgstr "表示する未読記事が見つかりませんでした。"
+#: classes/handler/public.php:848
+msgid "Your access level is insufficient to run this script."
+msgstr "あなたの権限では、このスクリプトを実行できません。"
 
-#: classes/feeds.php:706
-msgid "No updated articles found to display."
-msgstr "表示する更新された記事が見つかりませんでした。"
+#: classes/handler/public.php:874
+msgid "Database Updater"
+msgstr "データベースアップデーター"
 
-#: classes/feeds.php:709
-msgid "No starred articles found to display."
-msgstr "表示するお気に入りの記事が見つかりませんでした。"
+#: classes/handler/public.php:939
+msgid "Perform updates"
+msgstr "更新の実行"
 
-#: classes/feeds.php:713
-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:715
-msgid "No articles found to display."
-msgstr "表示する記事が見つかりません。"
-
-#: classes/feeds.php:731
-#: classes/feeds.php:922
-#, php-format
-msgid "Feeds last updated at %s"
-msgstr "%s に最終更新されたフィード"
-
-#: classes/feeds.php:743
-#: classes/feeds.php:934
-msgid "Some feeds have update errors (click for details)"
-msgstr "いくつかのフィードの更新エラーです (詳細はクリックしてください)"
-
-#: classes/feeds.php:911
-msgid "No feed selected."
-msgstr "フィードが選択されていません。"
-
-#: classes/feeds.php:975
-#: classes/feeds.php:983
-msgid "Feed or site URL"
-msgstr "フィードかサイトの URL"
-
-#: classes/feeds.php:997
-msgid "Available feeds"
-msgstr "利用可能なフィード"
-
-#: classes/feeds.php:1034
-msgid "More feeds"
-msgstr "さらなるフィード"
-
-#: classes/feeds.php:1063
-msgid "Popular feeds"
-msgstr "人気のあるフィード"
-
-#: classes/feeds.php:1064
-msgid "Feed archive"
-msgstr "フィード保管庫"
-
-#: classes/feeds.php:1067
-msgid "limit:"
-msgstr "制限:"
-
-#: classes/feeds.php:1101
-msgid "Look for"
-msgstr "検索"
-
-#: classes/feeds.php:1109
-#, php-format
-msgid "in %s"
+#: plugins/af_zz_imgproxy/init.php:208
+msgid "Image proxy settings (af_zz_imgproxy)"
 msgstr ""
 
-#: classes/feeds.php:1114
-msgid "Used for word stemming"
-msgstr ""
-
-#: classes/feeds.php:1123
+#: plugins/af_zz_imgproxy/init.php:232
 #, fuzzy
-msgid "Search syntax"
-msgstr "検索"
+msgid "Enable proxy for all remote images."
+msgstr "フィードカテゴリーを有効にする"
 
-#: classes/feeds.php:1577
-msgid "Starred articles"
-msgstr "お気に入りの記事"
+#: plugins/af_zz_imgproxy/init.php:236
+#, fuzzy
+msgid "Don't cache files locally."
+msgstr "ローカルに画像をキャッシュする"
 
-#: classes/feeds.php:1579
-msgid "Published articles"
-msgstr "公開済みの記事"
-
-#: classes/feeds.php:1581
-msgid "Fresh articles"
-msgstr "新しい記事"
-
-#: classes/feeds.php:1585
-msgid "Archived articles"
-msgstr "保管された記事"
-
-#: classes/feeds.php:1587
-msgid "Recently read"
-msgstr "最近読んだ"
-
-#: classes/feeds.php:1708
-msgid "Special"
-msgstr "特別"
-
-#: classes/feeds.php:1965
-#, php-format
-msgid "Search results: %s"
-msgstr "検索結果: %s"
-
-#: 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."
+#: plugins/af_zz_imgproxy/init.php:252
+#: plugins/af_redditimgur/init.php:79
+#, fuzzy
+msgid "Configuration saved"
 msgstr "設定を保存しました。"
 
-#: plugins/note/init.php:28
-#: plugins/note/note.js:11
-msgid "Edit article note"
-msgstr "記事のノートを編集する"
-
 #: plugins/vf_shared/init.php:17
 #: plugins/vf_shared/init.php:73
 msgid "Shared articles"
 msgstr "共有した記事"
 
-#: plugins/auth_internal/init.php:67
-msgid "Please enter your one time password:"
-msgstr "ワンタイムパスワードを入力してください:"
+#: plugins/bookmarklets/init.php:20
+msgid "Bookmarklets"
+msgstr "ブックマークレット"
 
-#: plugins/auth_internal/init.php:208
-msgid "Password has been changed."
-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/auth_internal/init.php:210
-msgid "Old password is incorrect."
-msgstr "古いパスワードが不正確です。"
+#: plugins/bookmarklets/init.php:26
+#, php-format
+msgid "Subscribe to %s in Tiny Tiny RSS?"
+msgstr "%s を Tiny Tiny RSS で購読しますか?"
 
-#: plugins/af_readability/init.php:25
-msgid "Data saved."
-msgstr ""
+#: plugins/bookmarklets/init.php:31
+msgid "Subscribe in Tiny Tiny RSS"
+msgstr "Tiny Tiny RSS で購読する"
 
-#: plugins/af_readability/init.php:41
-#, fuzzy
-msgid "Inline content"
-msgstr "記事のノートを編集する"
-
-#: plugins/af_readability/init.php:47
-msgid "Readability settings (af_readability)"
-msgstr ""
-
-#: plugins/af_readability/init.php:78
-msgid "Use Readability for pages shared via bookmarklet."
-msgstr ""
-
-#: plugins/af_readability/init.php:90
-#: plugins/af_psql_trgm/init.php:198
-msgid "Currently enabled for (click to edit):"
-msgstr ""
-
-#: plugins/af_readability/init.php:107
-#, fuzzy
-msgid "Readability"
-msgstr "有効性の確認"
-
-#: plugins/af_readability/init.php:118
-#, fuzzy
-msgid "Inline article content"
-msgstr "記事のノートを編集する"
+#: plugins/bookmarklets/init.php:34
+msgid "Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS"
+msgstr "Tiny Tiny RSS を使って任意のページを公開するためにこのブックマークレットを使ってください。"
 
 #: plugins/af_redditimgur/init.php:30
 msgid "Reddit content settings (af_redditimgur)"
@@ -2504,11 +2472,21 @@ msgstr ""
 msgid "Enable additional duplicate checking"
 msgstr ""
 
-#: plugins/af_redditimgur/init.php:79
-#: plugins/af_zz_imgproxy/init.php:252
-#, fuzzy
-msgid "Configuration saved"
-msgstr "設定を保存しました。"
+#: plugins/af_comics/init.php:49
+msgid "Feeds supported by af_comics"
+msgstr ""
+
+#: plugins/af_comics/init.php:51
+msgid "The following comics are currently supported:"
+msgstr ""
+
+#: plugins/af_comics/init.php:69
+msgid "To subscribe to GoComics use the comic's regular web page as the feed URL (e.g. for the <em>Garfield</em> comic use <code>http://www.gocomics.com/garfield</code>)."
+msgstr ""
+
+#: plugins/af_comics/init.php:71
+msgid "Drop any updated filters into <code>filters.local</code> in plugin directory."
+msgstr ""
 
 #: plugins/af_psql_trgm/init.php:29
 #, php-format
@@ -2548,25 +2526,86 @@ msgstr ""
 msgid "Enable for all feeds:"
 msgstr "フィードカテゴリーを有効にする"
 
+#: plugins/af_psql_trgm/init.php:198
+#: plugins/af_readability/init.php:90
+msgid "Currently enabled for (click to edit):"
+msgstr ""
+
 #: plugins/af_psql_trgm/init.php:216
 msgid "Similarity (pg_trgm)"
 msgstr ""
 
-#: plugins/af_comics/init.php:49
-msgid "Feeds supported by af_comics"
+#: plugins/af_readability/init.php:25
+msgid "Data saved."
 msgstr ""
 
-#: plugins/af_comics/init.php:51
-msgid "The following comics are currently supported:"
+#: plugins/af_readability/init.php:41
+#, fuzzy
+msgid "Inline content"
+msgstr "記事のノートを編集する"
+
+#: plugins/af_readability/init.php:47
+msgid "Readability settings (af_readability)"
 msgstr ""
 
-#: plugins/af_comics/init.php:69
-msgid "To subscribe to GoComics use the comic's regular web page as the feed URL (e.g. for the <em>Garfield</em> comic use <code>http://www.gocomics.com/garfield</code>)."
+#: plugins/af_readability/init.php:78
+msgid "Use Readability for pages shared via bookmarklet."
 msgstr ""
 
-#: plugins/af_comics/init.php:71
-msgid "Drop any updated filters into <code>filters.local</code> in plugin directory."
-msgstr ""
+#: plugins/af_readability/init.php:107
+#, fuzzy
+msgid "Readability"
+msgstr "有効性の確認"
+
+#: plugins/af_readability/init.php:118
+#, fuzzy
+msgid "Inline article content"
+msgstr "記事のノートを編集する"
+
+#: plugins/mailto/init.php:50
+#: plugins/mailto/init.php:58
+#: plugins/mail/init.php:118
+#: plugins/mail/init.php:124
+msgid "[Forwarded]"
+msgstr "[Forwarded]"
+
+#: plugins/mailto/init.php:50
+#: plugins/mail/init.php:118
+msgid "Multiple articles"
+msgstr "複数記事"
+
+#: plugins/mailto/init.php:74
+msgid "Clicking the following link to invoke your mail client:"
+msgstr "以下のリンクをクリックするとメールクライアントが起動されます:"
+
+#: plugins/mailto/init.php:78
+msgid "Forward selected article(s) by email."
+msgstr "選択した記事を電子メールで転送する"
+
+#: plugins/mailto/init.php:81
+msgid "You should be able to edit the message before sending in your mail client."
+msgstr "送信前にあなたの電子メールクライアントでメッセージの編集が可能です。"
+
+#: plugins/mailto/init.php:86
+msgid "Close this dialog"
+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/import_export/init.php:53
 msgid "Import and export"
@@ -2631,102 +2670,6 @@ msgstr "エラーコード %d でアップロードが失敗しました"
 msgid "No file uploaded."
 msgstr "ファイルがアップロードされていません。"
 
-#: plugins/mail/init.php:29
-msgid "Mail addresses saved."
-msgstr ""
-
-#: plugins/mail/init.php:35
-#, fuzzy
-msgid "Mail plugin"
-msgstr "ユーザープラグイン"
-
-#: plugins/mail/init.php:37
-msgid "You can set predefined email addressed here (comma-separated list):"
-msgstr ""
-
-#: plugins/mail/init.php:118
-#: plugins/mail/init.php:124
-#: plugins/mailto/init.php:50
-#: plugins/mailto/init.php:58
-msgid "[Forwarded]"
-msgstr "[Forwarded]"
-
-#: plugins/mail/init.php:118
-#: plugins/mailto/init.php:50
-msgid "Multiple articles"
-msgstr "複数記事"
-
-#: plugins/mail/init.php:146
-msgid "To:"
-msgstr "To:"
-
-#: plugins/mail/init.php:161
-msgid "Subject:"
-msgstr "題名:"
-
-#: plugins/mail/init.php:178
-msgid "Send e-mail"
-msgstr "電子メールを送信する"
-
-#: plugins/close_button/init.php:25
-msgid "Close article"
-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 "%s を Tiny Tiny RSS で購読しますか?"
-
-#: 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 "Tiny Tiny RSS を使って任意のページを公開するためにこのブックマークレットを使ってください。"
-
-#: plugins/toggle_sidebar/init.php:23
-msgid "Collapse feedlist"
-msgstr "フィード一覧を閉じる"
-
-#: plugins/af_zz_imgproxy/init.php:208
-msgid "Image proxy settings (af_zz_imgproxy)"
-msgstr ""
-
-#: plugins/af_zz_imgproxy/init.php:232
-#, fuzzy
-msgid "Enable proxy for all remote images."
-msgstr "フィードカテゴリーを有効にする"
-
-#: plugins/af_zz_imgproxy/init.php:236
-#, fuzzy
-msgid "Don't cache files locally."
-msgstr "ローカルに画像をキャッシュする"
-
-#: plugins/mailto/init.php:74
-msgid "Clicking the following link to invoke your mail client:"
-msgstr "以下のリンクをクリックするとメールクライアントが起動されます:"
-
-#: plugins/mailto/init.php:78
-msgid "Forward selected article(s) by email."
-msgstr "選択した記事を電子メールで転送する"
-
-#: plugins/mailto/init.php:81
-msgid "You should be able to edit the message before sending in your mail client."
-msgstr "送信前にあなたの電子メールクライアントでメッセージの編集が可能です。"
-
-#: plugins/mailto/init.php:86
-msgid "Close this dialog"
-msgstr "このダイアログを閉じる"
-
 #: plugins/share/init.php:41
 msgid "You can disable all articles shared by unique URLs here."
 msgstr "ユニーク URL で共有された全ての記事をここで無効化できます。"
@@ -2747,449 +2690,599 @@ msgstr "以下のユニーク URL によってこの記事を共有できます
 msgid "Unshare article"
 msgstr "記事の共有を解除"
 
-#: js/FeedTree.js:75
+#: plugins/toggle_sidebar/init.php:23
+msgid "Collapse feedlist"
+msgstr "フィード一覧を閉じる"
+
+#: plugins/close_button/init.php:25
+msgid "Close article"
+msgstr "記事を閉じる"
+
+#: plugins/mail/init.php:29
+msgid "Mail addresses saved."
+msgstr ""
+
+#: plugins/mail/init.php:35
+#, fuzzy
+msgid "Mail plugin"
+msgstr "ユーザープラグイン"
+
+#: plugins/mail/init.php:37
+msgid "You can set predefined email addressed here (comma-separated list):"
+msgstr ""
+
+#: plugins/mail/init.php:146
+msgid "To:"
+msgstr "To:"
+
+#: plugins/mail/init.php:161
+msgid "Subject:"
+msgstr "題名:"
+
+#: plugins/mail/init.php:178
+msgid "Send e-mail"
+msgstr "電子メールを送信する"
+
+#: plugins/note/init.php:28
+#: plugins/note/note.js:11
+msgid "Edit article note"
+msgstr "記事のノートを編集する"
+
+#: plugins/auth_internal/init.php:67
+msgid "Please enter your one time password:"
+msgstr "ワンタイムパスワードを入力してください:"
+
+#: plugins/auth_internal/init.php:208
+msgid "Password has been changed."
+msgstr "パスワードを変更しました。"
+
+#: plugins/auth_internal/init.php:210
+msgid "Old password is incorrect."
+msgstr "古いパスワードが不正確です。"
+
+#: js/FeedTree.js:76
 #, fuzzy
 msgid "(Un)collapse"
 msgstr "サイドバーを開閉する"
 
-#: js/PrefFeedTree.js:35
+#: js/PrefFeedTree.js:36
 msgid "Edit category"
 msgstr "カテゴリーの編集"
 
-#: js/PrefFeedTree.js:42
+#: js/PrefFeedTree.js:43
 msgid "Remove category"
 msgstr "カテゴリーの削除"
 
-#: js/PrefFilterTree.js:46
+#: js/PrefFilterTree.js:47
 msgid "Inverse"
 msgstr "反転"
 
-#: js/feedlist.js:511
+#: js/feedlist.js:461
 #, fuzzy
 msgid "Mark %w in %s older than 1 day as read?"
 msgstr "「%s」の 1 日以上前の記事を既読に設定しますか?"
 
-#: js/feedlist.js:514
+#: js/feedlist.js:464
 #, fuzzy
 msgid "Mark %w in %s older than 1 week as read?"
 msgstr "「%s」の 1 週間以上前の記事を既読に設定しますか?"
 
-#: js/feedlist.js:517
+#: js/feedlist.js:467
 #, fuzzy
 msgid "Mark %w in %s older than 2 weeks as read?"
 msgstr "「%s」の 2 週間以上前の記事を既読に設定しますか?"
 
-#: js/feedlist.js:520
+#: js/feedlist.js:470
 #, fuzzy
 msgid "Mark %w in %s as read?"
 msgstr "「%s」のすべての記事を既読に設定しますか?"
 
-#: js/feedlist.js:523
+#: js/feedlist.js:473
 #, fuzzy
 msgid "search results"
 msgstr "検索結果: %s"
 
-#: js/feedlist.js:523
+#: js/feedlist.js:473
 #, fuzzy
 msgid "all articles"
 msgstr "すべての記事"
 
-#: js/functions.js:74
+#: js/functions.js:100
 msgid "Close"
 msgstr ""
 
-#: js/functions.js:141
+#: js/functions.js:167
 msgid "Click to close"
 msgstr "閉じるにはクリック"
 
-#: js/functions.js:448
+#: js/functions.js:456
 msgid "Error explained"
 msgstr "エラーの説明"
 
-#: js/functions.js:592
+#: js/functions.js:490
+msgid "Upload complete."
+msgstr "アップロードが完了しました。"
+
+#: js/functions.js:508
+msgid "Remove stored feed icon?"
+msgstr "保存したフィードアイコンを削除しますか?"
+
+#: js/functions.js:510
+msgid "Removing feed icon..."
+msgstr "フィードアイコンを削除しています..."
+
+#: js/functions.js:515
+msgid "Feed icon removed."
+msgstr "フィードアイコンを削除しました。"
+
+#: js/functions.js:532
+msgid "Please select an image file to upload."
+msgstr "アップロードする画像ファイルをひとつ選択してください。"
+
+#: js/functions.js:533
+msgid "Upload new icon for this feed?"
+msgstr "このフィードに対して新しいアイコンをアップロードしますか?"
+
+#: js/functions.js:534
+msgid "Uploading, please wait..."
+msgstr "アップロードしています。しばらくお待ちください..."
+
+#: js/functions.js:542
+msgid "Please enter label caption:"
+msgstr "ラベルのキャプションを入力してください:"
+
+#: js/functions.js:575
 msgid "Subscribe to Feed"
 msgstr "フィードを購読する"
 
-#: js/functions.js:621
+#: js/functions.js:602
 msgid "Failed to parse output. This can indicate server timeout and/or network issues. Backend output was logged to browser console."
 msgstr ""
 
-#: js/functions.js:636
+#: js/functions.js:617
 #, perl-format
 msgid "Subscribed to %s"
 msgstr "%s を購読しました"
 
-#: js/functions.js:641
+#: js/functions.js:622
 msgid "Specified URL seems to be invalid."
 msgstr "指定された URL は無効のようです。"
 
-#: js/functions.js:644
+#: js/functions.js:625
 msgid "Specified URL doesn't seem to contain any feeds."
 msgstr "指定された URL にはフィードが含まれていなようです。"
 
-#: js/functions.js:656
+#: js/functions.js:637
 msgid "Expand to select feed"
 msgstr "選択したフィードを展開する"
 
-#: js/functions.js:668
+#: js/functions.js:649
 #, perl-format
 msgid "Couldn't download the specified URL: %s"
 msgstr "指定された URL がダウンロードできません: %s"
 
-#: js/functions.js:672
+#: js/functions.js:653
 #, perl-format
 msgid "XML validation failed: %s"
 msgstr "XML の検証に失敗しました: %s"
 
-#: js/functions.js:676
+#: js/functions.js:657
 msgid "You are already subscribed to this feed."
 msgstr "このフィードは購読済みです。"
 
-#: js/functions.js:1136
+#: js/functions.js:1098
 msgid "Generate new syndication address for this feed?"
 msgstr "このフィードに対して新しいシンジケートアドレスを生成しますか?"
 
-#: js/functions.js:1140
-#: js/prefs.js:1095
+#: js/functions.js:1100
+#: js/prefs.js:870
 msgid "Trying to change address..."
 msgstr "アドレスの変更をしようとしています..."
 
-#: js/functions.js:1245
-#: js/tt-rss.js:446
-#: js/tt-rss.js:673
+#: js/functions.js:1199
+#: js/tt-rss.js:399
+#: js/tt-rss.js:612
 msgid "You can't edit this kind of feed."
 msgstr "この種類のフィードは編集できません。"
 
-#: js/functions.js:1260
+#: js/functions.js:1213
 msgid "Edit Feed"
 msgstr "フィードの編集"
 
-#: js/functions.js:1266
-#: js/prefs.js:100
-#: js/prefs.js:209
-#: js/prefs.js:647
+#: js/functions.js:1217
+#: js/prefs.js:176
+#: js/prefs.js:523
+#: js/prefs.js:1139
+#: js/prefs.js:78
 msgid "Saving data..."
 msgstr "データを保存しています..."
 
-#: js/functions.js:1293
+#: js/functions.js:1243
 msgid "More Feeds"
 msgstr "さらなるフィード"
 
-#: js/functions.js:1355
-#: js/functions.js:1464
-#: js/prefs.js:398
-#: js/prefs.js:540
-#: js/prefs.js:558
-#: js/prefs.js:1077
+#: js/functions.js:1297
+#: js/functions.js:1383
+#: js/prefs.js:332
+#: js/prefs.js:455
+#: js/prefs.js:473
+#: js/prefs.js:855
 msgid "No feeds are selected."
 msgstr "フィードが選択されていません。"
 
-#: js/functions.js:1398
+#: js/functions.js:1329
 msgid "Remove selected feeds from the archive? Feeds with stored articles will not be removed."
 msgstr "選択したフィードを保管庫から削除しますか?保存された記事があるフィードは削除されません。"
 
-#: js/functions.js:1435
+#: js/functions.js:1360
 msgid "Feeds with update errors"
 msgstr "更新エラーのあるフィード"
 
-#: js/functions.js:1446
-#: js/prefs.js:1058
+#: js/functions.js:1369
+#: js/prefs.js:841
 msgid "Remove selected feeds?"
 msgstr "選択したフィードを削除しますか?"
 
-#: js/functions.js:1449
-#: js/prefs.js:1061
+#: js/functions.js:1370
+#: js/prefs.js:842
 msgid "Removing selected feeds..."
 msgstr "選択したフィードを削除しています..."
 
-#: js/prefs.js:60
-msgid "Please enter login:"
-msgstr "ログイン名を入力してください:"
-
-#: js/prefs.js:67
-msgid "Can't create user: no login specified."
-msgstr "ユーザーが追加できません: ログイン名が指定されていません。"
-
-#: js/prefs.js:71
-msgid "Adding user..."
-msgstr "ユーザーを追加しています..."
-
-#: js/prefs.js:96
-msgid "User Editor"
-msgstr "ユーザーエディター"
-
-#: js/prefs.js:131
-msgid "Edit Filter"
-msgstr "フィルターの編集"
-
-#: js/prefs.js:170
+#: js/prefs.js:143
 msgid "Remove filter?"
 msgstr "フィルターを削除しますか?"
 
-#: js/prefs.js:175
+#: js/prefs.js:148
 msgid "Removing filter..."
 msgstr "フィルターを削除しています..."
 
-#: js/prefs.js:292
+#: js/prefs.js:251
 msgid "Remove selected labels?"
 msgstr "選択したラベルを削除しますか?"
 
-#: js/prefs.js:295
+#: js/prefs.js:252
 msgid "Removing selected labels..."
 msgstr "選択したラベルを削除しています..."
 
-#: js/prefs.js:308
-#: js/prefs.js:1144
+#: js/prefs.js:262
+#: js/prefs.js:909
 msgid "No labels are selected."
 msgstr "ラベルが選択されていません。"
 
-#: js/prefs.js:320
+#: js/prefs.js:274
 msgid "Remove selected users? Neither default admin nor your account will be removed."
 msgstr "選択したユーザーを削除しますか?標準の admin あるいはあなたのアカウントは削除されません。"
 
-#: js/prefs.js:323
+#: js/prefs.js:275
 msgid "Removing selected users..."
 msgstr "選択したユーザーを削除しています..."
 
-#: js/prefs.js:338
-#: js/prefs.js:408
-#: js/prefs.js:427
-#: js/prefs.js:461
+#: js/prefs.js:286
+#: js/prefs.js:342
+#: js/prefs.js:361
+#: js/prefs.js:387
 msgid "No users are selected."
 msgstr "ユーザーが選択されていません。"
 
-#: js/prefs.js:350
+#: js/prefs.js:297
 msgid "Remove selected filters?"
 msgstr "選択したフィルターを削除しますか?"
 
-#: js/prefs.js:353
+#: js/prefs.js:298
 msgid "Removing selected filters..."
 msgstr "選択したフィルターを削除しています..."
 
-#: js/prefs.js:366
-#: js/prefs.js:495
-#: js/prefs.js:514
+#: js/prefs.js:308
+#: js/prefs.js:419
+#: js/prefs.js:438
 msgid "No filters are selected."
 msgstr "フィルターが選択されていません。"
 
-#: js/prefs.js:378
+#: js/prefs.js:319
 msgid "Unsubscribe from selected feeds?"
 msgstr "選択したフィードの購読をやめますか?"
 
-#: js/prefs.js:382
+#: js/prefs.js:321
 msgid "Unsubscribing from selected feeds..."
 msgstr "選択したフィードの購読を解除しています..."
 
-#: js/prefs.js:413
-#: js/prefs.js:432
-#: js/prefs.js:466
+#: js/prefs.js:347
+#: js/prefs.js:366
+#: js/prefs.js:392
 msgid "Please select only one user."
 msgstr "ユーザーをひとりだけ選択してください。"
 
-#: js/prefs.js:436
+#: js/prefs.js:370
 msgid "Reset password of selected user?"
 msgstr "選択したユーザーのパスワードをリセットしますか?"
 
-#: js/prefs.js:439
+#: js/prefs.js:371
 msgid "Resetting password for selected user..."
 msgstr "選択したユーザーのパスワードをリセットしています..."
 
-#: js/prefs.js:500
+#: js/prefs.js:424
 msgid "Please select only one filter."
 msgstr "フィルターをひとつだけ選択してください。"
 
-#: js/prefs.js:518
+#: js/prefs.js:442
 msgid "Combine selected filters?"
 msgstr "選択したフィルターを結合しますか?"
 
-#: js/prefs.js:521
+#: js/prefs.js:443
 msgid "Joining filters..."
 msgstr "フィルターを結合しています..."
 
-#: js/prefs.js:580
+#: js/prefs.js:487
 msgid "Edit Multiple Feeds"
 msgstr "複数フィードの編集"
 
-#: js/prefs.js:604
+#: js/prefs.js:511
 msgid "Save changes to selected feeds?"
 msgstr "選択したフィードの変更を保存しますか?"
 
-#: js/prefs.js:681
+#: js/prefs.js:552
 msgid "OPML Import"
 msgstr "OPML インポート"
 
-#: js/prefs.js:700
+#: js/prefs.js:571
 msgid "Please choose an OPML file first."
 msgstr "はじめに OPML ファイルを選択してください。"
 
-#: js/prefs.js:703
+#: js/prefs.js:574
 #: plugins/import_export/import_export.js:115
 msgid "Importing, please wait..."
 msgstr "インポートしています。しばらくお待ちください..."
 
-#: js/prefs.js:869
+#: js/prefs.js:737
 msgid "Reset to defaults?"
 msgstr "標準に戻しますか?"
 
-#: js/prefs.js:1468
-msgid "Subscribing to feeds..."
-msgstr "フィードを購読しています..."
+#: js/prefs.js:777
+#, perl-format
+msgid "Remove category %s? Any nested feeds would be placed into Uncategorized."
+msgstr "カテゴリー %s を削除しますか?カテゴリー内のフィードは全てカテゴリー割り当てなしに配置されます。"
 
-#: js/prefs.js:1487
-msgid "Clear stored data for this plugin?"
-msgstr "このプラグイン用に保存されたデータを消去しますか?"
+#: js/prefs.js:778
+msgid "Removing category..."
+msgstr "カテゴリーを削除しています..."
 
-#: js/prefs.js:1501
-msgid "Clear all messages in the error log?"
-msgstr "エラーログの全メッセージを消去しますか?"
+#: js/prefs.js:794
+msgid "Remove selected categories?"
+msgstr "選択したカテゴリーを削除しますか?"
 
-#: js/tt-rss.js:118
+#: js/prefs.js:795
+msgid "Removing selected categories..."
+msgstr "選択したカテゴリーを削除しています..."
+
+#: js/prefs.js:805
+msgid "No categories are selected."
+msgstr "カテゴリーが選択されていません。"
+
+#: js/prefs.js:812
+msgid "Category title:"
+msgstr "カテゴリーの題名:"
+
+#: js/prefs.js:815
+msgid "Creating category..."
+msgstr "カテゴリーを作成しています..."
+
+#: js/prefs.js:832
+msgid "Feeds without recent updates"
+msgstr "最近の更新がないフィード"
+
+#: js/prefs.js:869
+msgid "Replace current OPML publishing address with a new one?"
+msgstr "新しいもので現在の OPML 公開アドレスを置き換えますか?"
+
+#: js/prefs.js:898
+msgid "Reset selected labels to default colors?"
+msgstr "選択したラベルの色を標準にリセットしますか?"
+
+#: js/prefs.js:926
+msgid "Settings Profiles"
+msgstr "設定プロファイル"
+
+#: js/prefs.js:935
+msgid "Remove selected profiles? Active and default profiles will not be removed."
+msgstr "選択したプロファイルを削除しますか?現在のプロファイル、標準のプロファイルは削除されません。"
+
+#: js/prefs.js:936
+msgid "Removing selected profiles..."
+msgstr "選択したプロファイルを削除しています..."
+
+#: js/prefs.js:948
+msgid "No profiles are selected."
+msgstr "プロファイルが選択されていません。"
+
+#: js/prefs.js:955
+#: js/prefs.js:997
+msgid "Activate selected profile?"
+msgstr "選択したプロファイルを有効にしますか?"
+
+#: js/prefs.js:964
+#: js/prefs.js:1008
+msgid "Please choose a profile to activate."
+msgstr "有効にするプロファイルを選択してください。"
+
+#: js/prefs.js:969
+msgid "Creating profile..."
+msgstr "プロファイルを作成しています..."
+
+#: js/prefs.js:1016
+msgid "This will invalidate all previously generated feed URLs. Continue?"
+msgstr "この操作は過去に生成されたフィードの URL 全てを無効化します。続けますか?"
+
+#: js/prefs.js:1017
+#: plugins/share/share_prefs.js:3
+msgid "Clearing URLs..."
+msgstr "URL を消去しています..."
+
+#: js/prefs.js:1020
+msgid "Generated URLs cleared."
+msgstr "生成された URL を消去しました。"
+
+#: js/prefs.js:1053
+#, fuzzy
+msgid "Rename category to:"
+msgstr "カテゴリーの削除"
+
+#: js/prefs.js:1074
+msgid "Label Editor"
+msgstr "ラベルエディター"
+
+#: js/tt-rss.js:111
 msgid "Mark all articles as read?"
 msgstr "すべての記事を既読にしますか?"
 
-#: js/tt-rss.js:124
+#: js/tt-rss.js:115
 msgid "Marking all feeds as read..."
 msgstr "すべてのフィードを既読に設定しています..."
 
-#: js/tt-rss.js:398
+#: js/tt-rss.js:351
 msgid "Please enable mail plugin first."
 msgstr "はじめにメールプラグインを有効にしてください。"
 
-#: js/tt-rss.js:527
+#: js/tt-rss.js:477
 msgid "Please enable embed_original plugin first."
 msgstr "はじめに embed_original プラグインを有効にしてください。"
 
-#: js/tt-rss.js:540
-#: js/tt-rss.js:723
+#: js/tt-rss.js:490
+#: js/tt-rss.js:653
 msgid "Widescreen is not available in combined mode."
 msgstr ""
 
-#: js/tt-rss.js:821
-msgid "You can't rescore this kind of feed."
-msgstr "この種類のフィードはスコアを再計算できません。"
-
-#: js/tt-rss.js:826
-#: js/tt-rss.js:686
-msgid "Please select some feed first."
-msgstr "はじめにいくつかのフィードを選択してください。"
-
-#: js/tt-rss.js:831
-#, perl-format
-msgid "Rescore articles in %s?"
-msgstr "%s の記事のスコアを再計算しますか?"
-
-#: js/tt-rss.js:834
-msgid "Rescoring articles..."
-msgstr "記事のスコアを再計算しています..."
-
-#: js/viewfeed.js:917
-#: js/viewfeed.js:955
-#: js/viewfeed.js:1003
-#: js/viewfeed.js:1924
-#: plugins/mail/mail.js:7
+#: js/viewfeed.js:444
+#: js/viewfeed.js:461
+#: js/viewfeed.js:484
+#: js/viewfeed.js:521
+#: js/viewfeed.js:542
+#: js/viewfeed.js:651
+#: js/viewfeed.js:685
+#: js/viewfeed.js:727
+#: js/viewfeed.js:1564
 #: plugins/mailto/init.js:7
-#: js/viewfeed.js:675
-#: js/viewfeed.js:697
-#: js/viewfeed.js:718
-#: js/viewfeed.js:777
-#: js/viewfeed.js:805
+#: plugins/mail/mail.js:7
 msgid "No articles are selected."
 msgstr "記事が選択されていません。"
 
-#: js/viewfeed.js:925
+#: js/viewfeed.js:659
 #, 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:927
+#: js/viewfeed.js:661
 #, perl-format
 msgid "Delete %d selected article?"
 msgid_plural "Delete %d selected articles?"
 msgstr[0] "選択した %d 件の記事を削除しますか?"
 
-#: js/viewfeed.js:964
+#: js/viewfeed.js:694
 #, 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:967
+#: js/viewfeed.js:697
 #, perl-format
 msgid "Move %d archived article back?"
 msgid_plural "Move %d archived articles back?"
 msgstr[0] "%d 件の保管された記事を元に戻しますか?"
 
-#: js/viewfeed.js:969
+#: js/viewfeed.js:698
 msgid "Please note that unstarred articles might get purged on next feed update."
 msgstr "お気に入りから外した記事は次回フィード更新時に削除されるかもしれない点に注意してください。"
 
-#: js/viewfeed.js:1009
+#: js/viewfeed.js:733
 #, 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:1029
+#: js/viewfeed.js:753
 msgid "Edit article Tags"
 msgstr "記事のタグを編集"
 
-#: js/viewfeed.js:1035
+#: js/viewfeed.js:757
 msgid "Saving article tags..."
 msgstr "記事のタグを保存しています..."
 
-#: js/viewfeed.js:1666
+#: js/viewfeed.js:1015
+msgid "No article is selected."
+msgstr "記事が選択されていません。"
+
+#: js/viewfeed.js:1050
+msgid "No articles found to mark"
+msgstr "記事が選択されていません。"
+
+#: js/viewfeed.js:1052
+#, perl-format
+msgid "Mark %d article as read?"
+msgid_plural "Mark %d articles as read?"
+msgstr[0] "%d 件の記事を既読として設定しますか?"
+
+#: js/viewfeed.js:1312
 msgid "Open original article"
 msgstr "元の記事内容を表示"
 
-#: js/viewfeed.js:1673
+#: js/viewfeed.js:1319
 msgid "Display article URL"
 msgstr "記事の URL を表示"
 
-#: js/viewfeed.js:1780
+#: js/viewfeed.js:1426
 msgid "Assign label"
 msgstr "ラベルの割り当て"
 
-#: js/viewfeed.js:1785
+#: js/viewfeed.js:1431
 msgid "Remove label"
 msgstr "ラベルの削除"
 
-#: js/viewfeed.js:1817
+#: js/viewfeed.js:1463
 #, fuzzy
 msgid "Select articles in group"
 msgstr "マウスカーソルの下の記事を選択する"
 
-#: js/viewfeed.js:1827
+#: js/viewfeed.js:1473
 #, fuzzy
 msgid "Mark group as read"
 msgstr "既読にする"
 
-#: js/viewfeed.js:1839
+#: js/viewfeed.js:1485
 #, fuzzy
 msgid "Mark feed as read"
 msgstr "すべてのフィードを既読に設定する"
 
-#: js/viewfeed.js:1892
+#: js/viewfeed.js:1538
 msgid "Please enter new score for selected articles:"
 msgstr "選択した記事の新しいスコアを入力してください:"
 
-#: js/viewfeed.js:1955
+#: js/viewfeed.js:1571
 msgid "Please enter new score for this article:"
 msgstr "この記事の新しいスコアを入力してください:"
 
-#: js/viewfeed.js:1986
+#: js/viewfeed.js:1591
 msgid "Article URL:"
 msgstr "記事の URL:"
 
-#: plugins/note/note.js:17
-msgid "Saving article note..."
-msgstr "記事のノートを保存しています..."
+#: plugins/embed_original/init.js:6
+msgid "Sorry, your browser does not support sandboxed iframes."
+msgstr "あなたのブラウザはサンドボックス化された iframe をサポートしていません。"
 
 #: plugins/af_psql_trgm/init.js:11
 #, fuzzy
 msgid "Related articles"
 msgstr "共有した記事"
 
+#: plugins/mailto/init.js:21
+#: plugins/mail/mail.js:21
+msgid "Forward article by email"
+msgstr "電子メールで記事を転送する"
+
+#: plugins/shorten_expanded/init.js:43
+#, fuzzy
+msgid "Click to expand article"
+msgstr "編集するにはクリック"
+
 #: plugins/import_export/import_export.js:13
 msgid "Export Data"
 msgstr "データのエクスポート"
@@ -3208,260 +3301,171 @@ msgstr "データのインポート"
 msgid "Please choose the file first."
 msgstr "はじめにファイルを選択してください。"
 
-#: plugins/mail/mail.js:21
-#: plugins/mailto/init.js:21
-msgid "Forward article by email"
-msgstr "電子メールで記事を転送する"
+#: plugins/share/share_prefs.js:2
+msgid "This will invalidate all previously shared article URLs. Continue?"
+msgstr "この操作は過去に共有された記事の URL 全てを無効化します。続けますか?"
 
-#: plugins/mail/mail.js:36
-msgid "Error sending email:"
-msgstr ""
-
-#: plugins/mail/mail.js:38
-#, fuzzy
-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:45
-#, fuzzy
-msgid "Click to expand article"
-msgstr "編集するにはクリック"
+#: plugins/share/share_prefs.js:8
+msgid "Shared URLs cleared."
+msgstr "共有された URL を消去しました。"
 
 #: plugins/share/share.js:10
 msgid "Share article by URL"
 msgstr "URL で記事を共有"
 
-#: plugins/share/share.js:14
+#: plugins/share/share.js:13
 msgid "Generate new share URL for this article?"
 msgstr "この記事の新しい共有 URL を生成しますか?"
 
-#: plugins/share/share.js:18
+#: plugins/share/share.js:15
 msgid "Trying to change URL..."
 msgstr "URL の変更をしようとしています..."
 
-#: plugins/share/share.js:55
+#: plugins/share/share.js:48
 msgid "Remove sharing for this article?"
 msgstr "この記事の共有を解除しますか?"
 
-#: plugins/share/share.js:59
+#: plugins/share/share.js:50
 msgid "Trying to unshare..."
 msgstr "記事の共有を解除しようとしています..."
 
-#: plugins/share/share_prefs.js:3
-msgid "This will invalidate all previously shared article URLs. Continue?"
-msgstr "この操作は過去に共有された記事の URL 全てを無効化します。続けますか?"
+#: plugins/mail/mail.js:30
+msgid "Error sending email:"
+msgstr ""
 
-#: plugins/share/share_prefs.js:6
-#: js/prefs.js:1277
-msgid "Clearing URLs..."
-msgstr "URL を消去しています..."
+#: plugins/mail/mail.js:32
+#, fuzzy
+msgid "Your message has been sent."
+msgstr "個人データを変更しました。"
 
-#: plugins/share/share_prefs.js:13
-msgid "Shared URLs cleared."
-msgstr "共有された URL を消去しました。"
+#: plugins/note/note.js:15
+msgid "Saving article note..."
+msgstr "記事のノートを保存しています..."
 
-#: js/feedlist.js:204
+#: js/feedlist.js:168
 #, fuzzy
 msgid "Your password is at default value"
 msgstr "パスワードが標準のままです。変更してください。"
 
-#: js/feedlist.js:453
+#: js/feedlist.js:413
 msgid "Mark all articles in %s as read?"
 msgstr "「%s」のすべての記事を既読に設定しますか?"
 
-#: js/functions.js:494
-msgid "Upload complete."
-msgstr "アップロードが完了しました。"
-
-#: js/functions.js:511
-msgid "Remove stored feed icon?"
-msgstr "保存したフィードアイコンを削除しますか?"
-
-#: js/functions.js:516
-msgid "Removing feed icon..."
-msgstr "フィードアイコンを削除しています..."
-
-#: js/functions.js:521
-msgid "Feed icon removed."
-msgstr "フィードアイコンを削除しました。"
-
-#: js/functions.js:537
-msgid "Please select an image file to upload."
-msgstr "アップロードする画像ファイルをひとつ選択してください。"
-
-#: js/functions.js:539
-msgid "Upload new icon for this feed?"
-msgstr "このフィードに対して新しいアイコンをアップロードしますか?"
-
-#: js/functions.js:540
-msgid "Uploading, please wait..."
-msgstr "アップロードしています。しばらくお待ちください..."
-
-#: js/functions.js:550
-msgid "Please enter label caption:"
-msgstr "ラベルのキャプションを入力してください:"
-
-#: js/functions.js:555
-msgid "Can't create label: missing caption."
-msgstr "ラベルが作成できません: キャプションが見当たりません。"
-
-#: js/functions.js:797
+#: js/functions.js:764
 msgid "Edit rule"
 msgstr "ルールの編集"
 
-#: js/functions.js:819
+#: js/functions.js:786
 msgid "Edit action"
 msgstr "動作の編集"
 
-#: js/functions.js:860
+#: js/functions.js:825
 msgid "Looking for articles (%d processed, %f found)..."
 msgstr ""
 
-#: js/functions.js:890
+#: js/functions.js:855
 #, fuzzy
 msgid "Found %d articles matching this filter:"
 msgstr "このフィルタに一致する記事:"
 
-#: js/functions.js:942
+#: js/functions.js:907
 msgid "Create Filter"
 msgstr "フィルターを作成する"
 
-#: js/functions.js:1060
-#: js/tt-rss.js:692
+#: js/functions.js:1016
+#: js/tt-rss.js:631
 msgid "Unsubscribe from %s?"
 msgstr "%s の購読をやめますか?"
 
-#: js/functions.js:1063
+#: js/functions.js:1019
 msgid "Removing feed..."
 msgstr "フィードを削除しています..."
 
-#: js/functions.js:1489
+#: js/functions.js:1410
 msgid "Help"
 msgstr "ヘルプ"
 
-#: js/prefs.js:973
-msgid "Remove category %s? Any nested feeds would be placed into Uncategorized."
-msgstr "カテゴリー %s を削除しますか?カテゴリー内のフィードは全てカテゴリー割り当てなしに配置されます。"
+#: js/prefs.js:44
+msgid "Please enter login:"
+msgstr "ログイン名を入力してください:"
 
-#: js/prefs.js:979
-msgid "Removing category..."
-msgstr "カテゴリーを削除しています..."
+#: js/prefs.js:51
+msgid "Can't create user: no login specified."
+msgstr "ユーザーが追加できません: ログイン名が指定されていません。"
 
-#: js/prefs.js:997
-msgid "Remove selected categories?"
-msgstr "選択したカテゴリーを削除しますか?"
+#: js/prefs.js:55
+msgid "Adding user..."
+msgstr "ユーザーを追加しています..."
 
-#: js/prefs.js:1000
-msgid "Removing selected categories..."
-msgstr "選択したカテゴリーを削除しています..."
+#: js/prefs.js:74
+msgid "User Editor"
+msgstr "ユーザーエディター"
 
-#: js/prefs.js:1013
-msgid "No categories are selected."
-msgstr "カテゴリーが選択されていません。"
+#: js/prefs.js:104
+msgid "Edit Filter"
+msgstr "フィルターの編集"
 
-#: js/prefs.js:1020
-msgid "Category title:"
-msgstr "カテゴリーの題名:"
+#: js/prefs.js:1175
+msgid "Subscribing to feeds..."
+msgstr "フィードを購読しています..."
 
-#: js/prefs.js:1024
-msgid "Creating category..."
-msgstr "カテゴリーを作成しています..."
+#: js/prefs.js:1191
+msgid "Clear stored data for this plugin?"
+msgstr "このプラグイン用に保存されたデータを消去しますか?"
 
-#: js/prefs.js:1047
-msgid "Feeds without recent updates"
-msgstr "最近の更新がないフィード"
+#: js/prefs.js:1203
+msgid "Clear all messages in the error log?"
+msgstr "エラーログの全メッセージを消去しますか?"
 
-#: js/prefs.js:1091
-msgid "Replace current OPML publishing address with a new one?"
-msgstr "新しいもので現在の OPML 公開アドレスを置き換えますか?"
-
-#: js/prefs.js:1129
-msgid "Reset selected labels to default colors?"
-msgstr "選択したラベルの色を標準にリセットしますか?"
-
-#: js/prefs.js:1161
-msgid "Settings Profiles"
-msgstr "設定プロファイル"
-
-#: js/prefs.js:1170
-msgid "Remove selected profiles? Active and default profiles will not be removed."
-msgstr "選択したプロファイルを削除しますか?現在のプロファイル、標準のプロファイルは削除されません。"
-
-#: js/prefs.js:1173
-msgid "Removing selected profiles..."
-msgstr "選択したプロファイルを削除しています..."
-
-#: js/prefs.js:1189
-msgid "No profiles are selected."
-msgstr "プロファイルが選択されていません。"
-
-#: js/prefs.js:1197
-#: js/prefs.js:1250
-msgid "Activate selected profile?"
-msgstr "選択したプロファイルを有効にしますか?"
-
-#: js/prefs.js:1214
-#: js/prefs.js:1266
-msgid "Please choose a profile to activate."
-msgstr "有効にするプロファイルを選択してください。"
-
-#: js/prefs.js:1219
-msgid "Creating profile..."
-msgstr "プロファイルを作成しています..."
-
-#: js/prefs.js:1274
-msgid "This will invalidate all previously generated feed URLs. Continue?"
-msgstr "この操作は過去に生成されたフィードの URL 全てを無効化します。続けますか?"
-
-#: js/prefs.js:1284
-msgid "Generated URLs cleared."
-msgstr "生成された URL を消去しました。"
-
-#: js/prefs.js:1356
-msgid "Label Editor"
-msgstr "ラベルエディター"
-
-#: js/tt-rss.js:681
+#: js/tt-rss.js:620
 msgid "You can't unsubscribe from the category."
 msgstr "カテゴリーから購読をやめることができません。"
 
-#: js/viewfeed.js:127
-#: js/viewfeed.js:177
-#: js/viewfeed.js:194
+#: js/tt-rss.js:625
+msgid "Please select some feed first."
+msgstr "はじめにいくつかのフィードを選択してください。"
+
+#: js/viewfeed.js:89
+#: js/viewfeed.js:135
+#: js/viewfeed.js:152
 #, fuzzy
 msgid "Click to open next unread feed."
 msgstr "編集するにはクリック"
 
-#: js/viewfeed.js:131
+#: js/viewfeed.js:93
 msgid "Cancel search"
 msgstr "検索の取り消し"
 
-#: js/viewfeed.js:191
+#: js/viewfeed.js:149
 #, fuzzy
 msgid "New articles found, reload feed to continue."
 msgstr "表示する記事が見つかりません。"
 
-#: js/viewfeed.js:620
+#: js/viewfeed.js:405
 msgid "%d article selected"
 msgid_plural "%d articles selected"
 msgstr[0] "%d 件の記事を選択"
 
-#: js/viewfeed.js:1284
-msgid "No article is selected."
-msgstr "記事が選択されていません。"
+#~ msgid "Rescore feed"
+#~ msgstr "フィードのスコアを再計算しています..."
 
-#: js/viewfeed.js:1319
-msgid "No articles found to mark"
-msgstr "記事が選択されていません。"
+#~ msgid "Create label..."
+#~ msgstr "ラベルを作成する..."
 
-#: js/viewfeed.js:1321
-msgid "Mark %d article as read?"
-msgid_plural "Mark %d articles as read?"
-msgstr[0] "%d 件の記事を既読として設定しますか?"
+#~ msgid "Create filter..."
+#~ msgstr "フィルターを作成しています..."
+
+#~ msgid "You can't rescore this kind of feed."
+#~ msgstr "この種類のフィードはスコアを再計算できません。"
+
+#~ msgid "Rescore articles in %s?"
+#~ msgstr "%s の記事のスコアを再計算しますか?"
+
+#~ msgid "Rescoring articles..."
+#~ msgstr "記事のスコアを再計算しています..."
+
+#~ msgid "Can't create label: missing caption."
+#~ msgstr "ラベルが作成できません: キャプションが見当たりません。"
 
 #~ msgid "Firefox integration"
 #~ msgstr "Firefox 統合"
diff --git a/locale/ko_KR/LC_MESSAGES/messages.mo b/locale/ko_KR/LC_MESSAGES/messages.mo
index 8757d7c52..6b0961f65 100644
Binary files a/locale/ko_KR/LC_MESSAGES/messages.mo and b/locale/ko_KR/LC_MESSAGES/messages.mo differ
diff --git a/locale/ko_KR/LC_MESSAGES/messages.po b/locale/ko_KR/LC_MESSAGES/messages.po
index b4b731de0..1967cf5c4 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: 2018-10-10 08:24+0300\n"
+"POT-Creation-Date: 2018-12-01 12:59+0300\n"
 "PO-Revision-Date: 2014-11-04 12:05+0900\n"
 "Last-Translator: YoungMin Park <tfympark1@gmail.com>\n"
 "Language-Team: YoungMin Park <tfympark1@gmail.com>\n"
@@ -95,8 +95,8 @@ msgid "Weekly"
 msgstr "1주일에 한 번"
 
 #: backend.php:103
-#: classes/pref/users.php:47
 #: classes/pref/system.php:51
+#: classes/pref/users.php:47
 msgid "User"
 msgstr "사용자"
 
@@ -168,33 +168,33 @@ msgstr "사용자를 찾지 못했습니다."
 
 #: index.php:151
 #: index.php:167
-#: index.php:285
+#: index.php:282
 #: prefs.php:120
 #: classes/backend.php:5
 #: classes/pref/labels.php:294
-#: classes/pref/feeds.php:1230
 #: classes/pref/filters.php:822
-#: js/feedlist.js:148
-#: js/feedlist.js:491
-#: js/feedlist.js:539
-#: js/functions.js:314
-#: js/functions.js:1336
-#: js/prefs.js:562
-#: js/prefs.js:754
-#: js/prefs.js:1488
-#: js/prefs.js:1503
-#: js/tt-rss.js:547
-#: js/viewfeed.js:1180
+#: classes/pref/feeds.php:1229
+#: js/feedlist.js:118
+#: js/feedlist.js:446
+#: js/feedlist.js:487
+#: js/functions.js:328
+#: js/functions.js:551
+#: js/functions.js:1286
+#: js/prefs.js:477
+#: js/prefs.js:617
+#: js/prefs.js:956
+#: js/prefs.js:1000
+#: js/prefs.js:1028
+#: js/prefs.js:1037
+#: js/prefs.js:1045
+#: js/prefs.js:1057
+#: js/tt-rss.js:497
+#: js/viewfeed.js:509
+#: js/viewfeed.js:928
 #: plugins/import_export/import_export.js:17
-#: js/functions.js:565
-#: js/prefs.js:1200
-#: js/prefs.js:1253
-#: js/prefs.js:1292
-#: js/prefs.js:1305
-#: js/prefs.js:1316
-#: js/prefs.js:1331
-#: js/tt-rss.js:564
-#: js/viewfeed.js:760
+#: js/prefs.js:1192
+#: js/prefs.js:1205
+#: js/tt-rss.js:510
 msgid "Loading, please wait..."
 msgstr "로딩중입니다. 잠깐의 여유를 갖고 하늘을 바라보아요 ^^"
 
@@ -211,13 +211,13 @@ msgid "All Articles"
 msgstr "전체 내용"
 
 #: index.php:194
-#: include/functions.php:1227
+#: include/functions.php:1172
 #: classes/feeds.php:110
 msgid "Starred"
 msgstr "중요 표시"
 
 #: index.php:195
-#: include/functions.php:1228
+#: include/functions.php:1173
 #: classes/feeds.php:111
 msgid "Published"
 msgstr "공개됨"
@@ -257,11 +257,11 @@ msgid "Title"
 msgstr "제목순으로"
 
 #: index.php:211
-#: index.php:251
-#: include/functions.php:1215
+#: index.php:250
+#: include/functions.php:1160
 #: classes/feeds.php:115
-#: js/FeedTree.js:41
-#: js/FeedTree.js:69
+#: js/FeedTree.js:42
+#: js/FeedTree.js:70
 msgid "Mark as read"
 msgstr "읽음 표시"
 
@@ -298,7 +298,7 @@ msgid "Feed actions:"
 msgstr "피드 동작"
 
 #: index.php:246
-#: classes/handler/public.php:551
+#: classes/handler/public.php:575
 msgid "Subscribe to feed..."
 msgstr "피드 구독..."
 
@@ -307,56 +307,44 @@ msgid "Edit this feed..."
 msgstr "이 피드 수정..."
 
 #: index.php:248
-msgid "Rescore feed"
-msgstr "피드 점수 다시 매기기..."
-
-#: index.php:249
-#: classes/pref/feeds.php:770
-#: classes/pref/feeds.php:1203
-#: js/PrefFeedTree.js:61
+#: classes/pref/feeds.php:769
+#: classes/pref/feeds.php:1202
+#: js/PrefFeedTree.js:62
 msgid "Unsubscribe"
 msgstr "구독 해제"
 
-#: index.php:250
+#: index.php:249
 msgid "All feeds:"
 msgstr "전체 피드:"
 
-#: index.php:252
+#: index.php:251
 msgid "(Un)hide read feeds"
 msgstr "읽은 내용 숨김"
 
-#: index.php:253
+#: index.php:252
 msgid "Other actions:"
 msgstr "기타 동작"
 
-#: index.php:254
-#: include/functions.php:1201
+#: index.php:253
+#: include/functions.php:1146
 msgid "Toggle widescreen mode"
 msgstr "와이드스크린 모드 켜기/끄기"
 
-#: index.php:255
-msgid "Create label..."
-msgstr "라벨 만들기..."
-
-#: index.php:256
-msgid "Create filter..."
-msgstr "필터 만들기..."
-
-#: index.php:257
+#: index.php:254
 msgid "Keyboard shortcuts help"
 msgstr "키보드 단축키 도움말"
 
-#: index.php:266
+#: index.php:263
 msgid "Logout"
 msgstr "로그아웃"
 
-#: index.php:272
+#: index.php:269
 msgid "Updates are available from Git."
 msgstr ""
 
 #: prefs.php:33
 #: prefs.php:138
-#: include/functions.php:1230
+#: include/functions.php:1175
 #: classes/pref/prefs.php:425
 msgid "Preferences"
 msgstr "설정"
@@ -371,8 +359,8 @@ msgstr "설정 완료"
 
 #: prefs.php:141
 #: classes/pref/feeds.php:114
-#: classes/pref/feeds.php:1138
-#: classes/pref/feeds.php:1192
+#: classes/pref/feeds.php:1137
+#: classes/pref/feeds.php:1191
 msgid "Feeds"
 msgstr "피드"
 
@@ -382,8 +370,8 @@ msgid "Filters"
 msgstr "필터"
 
 #: prefs.php:147
+#: classes/feeds.php:1696
 #: classes/pref/labels.php:94
-#: classes/feeds.php:1710
 msgid "Labels"
 msgstr "라벨"
 
@@ -395,80 +383,80 @@ msgstr "사용자"
 msgid "System"
 msgstr "시스템"
 
-#: register.php:186
+#: register.php:185
 #: include/login_form.php:162
 msgid "Create new account"
 msgstr "새 계정 생성"
 
-#: register.php:192
+#: register.php:191
 msgid "New user registrations are administratively disabled."
 msgstr "관리자가 신규 사용자 등록 기능을 비활성화 한 상태입니다."
 
-#: register.php:196
-#: register.php:241
-#: register.php:254
-#: register.php:269
-#: register.php:288
-#: register.php:336
-#: register.php:346
-#: register.php:358
-#: classes/handler/public.php:623
-#: classes/handler/public.php:697
-#: classes/handler/public.php:798
-#: classes/handler/public.php:877
-#: classes/handler/public.php:891
-#: classes/handler/public.php:898
-#: classes/handler/public.php:923
+#: register.php:195
+#: register.php:240
+#: register.php:253
+#: register.php:268
+#: register.php:287
+#: register.php:334
+#: register.php:344
+#: register.php:356
+#: classes/handler/public.php:647
+#: classes/handler/public.php:721
+#: 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로 돌아가기"
 
-#: register.php:217
+#: register.php:216
 msgid "Your temporary password will be sent to the specified email. Accounts, which were not logged in once, are erased automatically 24 hours after temporary password is sent."
 msgstr "임시 암호가 이메일로 전송됩니다. 이메일 전송 후 24시간 내에 로그인하지 않으면 계정이 삭제됩니다."
 
-#: register.php:223
+#: register.php:222
 msgid "Desired login:"
 msgstr "원하는 사용자명:"
 
-#: register.php:226
+#: register.php:225
 msgid "Check availability"
 msgstr "가능한지 확인"
 
-#: register.php:228
-#: classes/handler/public.php:713
+#: register.php:227
+#: classes/handler/public.php:737
 msgid "Email:"
 msgstr "이메일:"
 
-#: register.php:231
-#: classes/handler/public.php:718
+#: register.php:230
+#: classes/handler/public.php:742
 msgid "How much is two plus two:"
 msgstr "2 + 2 = ？"
 
-#: register.php:234
+#: register.php:233
 msgid "Submit registration"
 msgstr "등록 정보 제출"
 
-#: register.php:252
+#: register.php:251
 msgid "Your registration information is incomplete."
 msgstr "등록 정보가 미완성 상태입니다."
 
-#: register.php:267
+#: register.php:266
 msgid "Sorry, this username is already taken."
 msgstr "이미 사용중인 사용자명입니다."
 
-#: register.php:286
+#: register.php:285
 msgid "Registration failed."
 msgstr "등록에 실패했습니다."
 
-#: register.php:333
+#: register.php:331
 msgid "Account created successfully."
 msgstr "계정 생성이 완료되었습니다."
 
-#: register.php:355
+#: register.php:353
 msgid "New user registrations are currently closed."
 msgstr "현재는 신규 사용자 등록을 할 수 없습니다."
 
-#: update.php:66
+#: update.php:67
 msgid "Tiny Tiny RSS data update script."
 msgstr "Tiny Tiny RSS 데이터 업데이트 스크립트."
 
@@ -481,10 +469,10 @@ msgstr "모든 피드"
 
 #: include/controls.php:138
 #: include/controls.php:230
-#: classes/opml.php:512
-#: classes/digest.php:120
+#: classes/digest.php:124
+#: classes/feeds.php:1708
 #: classes/pref/feeds.php:233
-#: classes/feeds.php:1722
+#: classes/opml.php:512
 msgid "Uncategorized"
 msgstr "카테고리 없음"
 
@@ -498,287 +486,287 @@ msgstr[0] "저장된 글(%d개)"
 msgid "No feeds found."
 msgstr "피드가 없습니다."
 
-#: include/functions.php:983
+#: include/functions.php:928
 #, php-format
 msgid "%d min"
 msgstr ""
 
-#: include/functions.php:1177
+#: include/functions.php:1122
 msgid "Navigation"
 msgstr "이동"
 
-#: include/functions.php:1178
+#: include/functions.php:1123
 msgid "Open next feed"
 msgstr "다음 피드 열기"
 
-#: include/functions.php:1179
+#: include/functions.php:1124
 msgid "Open previous feed"
 msgstr "이전 피드 열기"
 
-#: include/functions.php:1180
+#: include/functions.php:1125
 msgid "Open next article"
 msgstr "다음 글 보기"
 
-#: include/functions.php:1181
+#: include/functions.php:1126
 msgid "Open previous article"
 msgstr "이전 글 보기"
 
-#: include/functions.php:1182
+#: include/functions.php:1127
 msgid "Open next article (don't scroll long articles)"
 msgstr "다음 글 보기 (긴 글 스크롤 하지 않음)"
 
-#: include/functions.php:1183
+#: include/functions.php:1128
 msgid "Open previous article (don't scroll long articles)"
 msgstr "이전 글 열기 (긴 글 스크롤 하지 않음)"
 
-#: include/functions.php:1184
+#: include/functions.php:1129
 msgid "Move to next article (don't expand or mark read)"
 msgstr "다음 글로 이동(펼치거나 읽음 표시하지 않음)"
 
-#: include/functions.php:1185
+#: include/functions.php:1130
 msgid "Move to previous article (don't expand or mark read)"
 msgstr "이전 글로 이동(펼치거나 읽음 표시하지 않음)"
 
-#: include/functions.php:1186
+#: include/functions.php:1131
 msgid "Show search dialog"
 msgstr "검색 기능 표시"
 
-#: include/functions.php:1187
+#: include/functions.php:1132
 msgid "Article"
 msgstr "글"
 
-#: include/functions.php:1188
-#: js/viewfeed.js:1695
+#: include/functions.php:1133
+#: js/viewfeed.js:1341
 msgid "Toggle starred"
 msgstr "중요 표시"
 
-#: include/functions.php:1189
-#: js/viewfeed.js:1707
+#: include/functions.php:1134
+#: js/viewfeed.js:1353
 msgid "Toggle published"
 msgstr "공개 설정"
 
-#: include/functions.php:1190
-#: js/viewfeed.js:1682
+#: include/functions.php:1135
+#: js/viewfeed.js:1328
 msgid "Toggle unread"
 msgstr "읽지 않음 표시"
 
-#: include/functions.php:1191
+#: include/functions.php:1136
 msgid "Edit tags"
 msgstr "태그 편집"
 
-#: include/functions.php:1192
+#: include/functions.php:1137
 msgid "Open in new window"
 msgstr "새창에서 열기"
 
-#: include/functions.php:1193
-#: js/viewfeed.js:1728
+#: include/functions.php:1138
+#: js/viewfeed.js:1374
 msgid "Mark below as read"
 msgstr "아래 글 읽음 표시"
 
-#: include/functions.php:1194
-#: js/viewfeed.js:1721
+#: include/functions.php:1139
+#: js/viewfeed.js:1367
 msgid "Mark above as read"
 msgstr "위 글 읽음 표시"
 
-#: include/functions.php:1195
+#: include/functions.php:1140
 msgid "Scroll down"
 msgstr "스크롤 다운"
 
-#: include/functions.php:1196
+#: include/functions.php:1141
 msgid "Scroll up"
 msgstr "위로 스크롤"
 
-#: include/functions.php:1197
+#: include/functions.php:1142
 msgid "Select article under cursor"
 msgstr "커서위치의 글 선택"
 
-#: include/functions.php:1198
+#: include/functions.php:1143
 msgid "Email article"
 msgstr "이메일로 글 전송"
 
-#: include/functions.php:1199
+#: include/functions.php:1144
 msgid "Close/collapse article"
 msgstr "글 접기/펴기"
 
-#: include/functions.php:1200
+#: include/functions.php:1145
 msgid "Toggle article expansion (combined mode)"
 msgstr "글 확장 (혼합 모드)"
 
-#: include/functions.php:1202
+#: include/functions.php:1147
 #: plugins/embed_original/init.php:33
 msgid "Toggle embed original"
 msgstr "원문 표시"
 
-#: include/functions.php:1203
+#: include/functions.php:1148
 msgid "Article selection"
 msgstr "글 선택"
 
-#: include/functions.php:1204
+#: include/functions.php:1149
 msgid "Select all articles"
 msgstr "전체 글 선택"
 
-#: include/functions.php:1205
+#: include/functions.php:1150
 msgid "Select unread"
 msgstr "읽지 않은 글 선택"
 
-#: include/functions.php:1206
+#: include/functions.php:1151
 msgid "Select starred"
 msgstr "중요 표시 글 선택"
 
-#: include/functions.php:1207
+#: include/functions.php:1152
 msgid "Select published"
 msgstr "공개한 글 선택"
 
-#: include/functions.php:1208
+#: include/functions.php:1153
 msgid "Invert selection"
 msgstr "선택 반전"
 
-#: include/functions.php:1209
+#: include/functions.php:1154
 msgid "Deselect everything"
 msgstr "전체 선택 해제"
 
-#: include/functions.php:1210
-#: classes/pref/feeds.php:522
-#: classes/pref/feeds.php:794
+#: include/functions.php:1155
+#: classes/pref/feeds.php:521
+#: classes/pref/feeds.php:793
 msgid "Feed"
 msgstr "피드"
 
-#: include/functions.php:1211
+#: include/functions.php:1156
 msgid "Refresh current feed"
 msgstr "이 피드 새로고침"
 
-#: include/functions.php:1212
+#: include/functions.php:1157
 msgid "Un/hide read feeds"
 msgstr "읽은 피드 숨기기/보이기"
 
-#: include/functions.php:1213
-#: classes/pref/feeds.php:1195
+#: include/functions.php:1158
+#: classes/pref/feeds.php:1194
 msgid "Subscribe to feed"
 msgstr "피드 구독"
 
-#: include/functions.php:1214
-#: js/FeedTree.js:48
-#: js/PrefFeedTree.js:55
-#: js/viewfeed.js:1846
+#: include/functions.php:1159
+#: js/FeedTree.js:49
+#: js/PrefFeedTree.js:56
+#: js/viewfeed.js:1492
 msgid "Edit feed"
 msgstr "피드 편집"
 
-#: include/functions.php:1216
+#: include/functions.php:1161
 msgid "Reverse headlines"
 msgstr "헤드라인 거꾸로 표시"
 
-#: include/functions.php:1217
+#: include/functions.php:1162
 msgid "Toggle headline grouping"
 msgstr ""
 
-#: include/functions.php:1218
+#: include/functions.php:1163
 msgid "Debug feed update"
 msgstr "피드 업데이트 디버그"
 
-#: include/functions.php:1219
+#: include/functions.php:1164
 #, fuzzy
 msgid "Debug viewfeed()"
 msgstr "피드 업데이트 디버그"
 
-#: include/functions.php:1220
-#: js/FeedTree.js:97
+#: include/functions.php:1165
+#: js/FeedTree.js:98
 msgid "Mark all feeds as read"
 msgstr "모든 피드를 읽음 표시"
 
-#: include/functions.php:1221
+#: include/functions.php:1166
 msgid "Un/collapse current category"
 msgstr "이 카테고리 접기/펴기"
 
-#: include/functions.php:1222
-msgid "Toggle combined mode"
-msgstr "통합 모드 켜기/끄기"
-
-#: include/functions.php:1223
+#: include/functions.php:1167
 msgid "Toggle auto expand in combined mode"
 msgstr "통합 모드에서의 자동 펼침 켜기/끄기"
 
-#: include/functions.php:1224
+#: include/functions.php:1168
+msgid "Toggle combined mode"
+msgstr "통합 모드 켜기/끄기"
+
+#: include/functions.php:1169
 msgid "Go to"
 msgstr "이동"
 
-#: include/functions.php:1225
-#: classes/feeds.php:1583
+#: include/functions.php:1170
+#: classes/feeds.php:1569
 msgid "All articles"
 msgstr "전체 글"
 
-#: include/functions.php:1226
+#: include/functions.php:1171
 msgid "Fresh"
 msgstr "새 글"
 
-#: include/functions.php:1229
-#: js/tt-rss.js:491
-#: js/tt-rss.js:660
+#: include/functions.php:1174
+#: js/tt-rss.js:439
+#: js/tt-rss.js:599
 msgid "Tag cloud"
 msgstr "태그 클라우드"
 
-#: include/functions.php:1231
+#: include/functions.php:1176
 msgid "Other"
 msgstr "기타"
 
-#: include/functions.php:1232
+#: include/functions.php:1177
 #: classes/pref/labels.php:279
 msgid "Create label"
 msgstr "라벨 생성"
 
-#: include/functions.php:1233
+#: include/functions.php:1178
 #: classes/pref/filters.php:801
 msgid "Create filter"
 msgstr "필터 생성"
 
-#: include/functions.php:1234
+#: include/functions.php:1179
 msgid "Un/collapse sidebar"
 msgstr "사이드바 숨김/표시"
 
-#: include/functions.php:1235
+#: include/functions.php:1180
 msgid "Show help dialog"
 msgstr "도움말 보이기"
 
-#: include/functions.php:2582
+#: include/functions.php:2529
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: include/functions.php:2583
+#: include/functions.php:2530
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: include/functions.php:2584
+#: include/functions.php:2531
 msgid "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form"
 msgstr ""
 
-#: include/functions.php:2585
+#: include/functions.php:2532
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: include/functions.php:2586
+#: include/functions.php:2533
 #, fuzzy
 msgid "No file was uploaded"
 msgstr "업로드된 파일 없음."
 
-#: include/functions.php:2587
+#: include/functions.php:2534
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: include/functions.php:2588
+#: include/functions.php:2535
 msgid "Failed to write file to disk."
 msgstr ""
 
-#: include/functions.php:2589
+#: include/functions.php:2536
 msgid "A PHP extension stopped the file upload."
 msgstr ""
 
 #: include/login_form.php:107
-#: classes/handler/public.php:446
-#: classes/handler/public.php:708
+#: classes/handler/public.php:466
+#: classes/handler/public.php:732
 msgid "Login:"
 msgstr "로그인:"
 
 #: include/login_form.php:117
-#: classes/handler/public.php:449
+#: classes/handler/public.php:469
 msgid "Password:"
 msgstr "암호:"
 
@@ -791,9 +779,9 @@ msgid "Profile:"
 msgstr "프로필:"
 
 #: include/login_form.php:133
-#: classes/handler/public.php:252
 #: classes/pref/prefs.php:1037
 #: classes/rpc.php:69
+#: classes/handler/public.php:272
 msgid "Default profile"
 msgstr "기본 프로필"
 
@@ -810,209 +798,30 @@ msgid "Remember me"
 msgstr "ID/PW 저장"
 
 #: include/login_form.php:159
-#: classes/handler/public.php:454
+#: classes/handler/public.php:474
 msgid "Log in"
 msgstr "로그인"
 
-#: include/sessions.php:46
+#: include/sessions.php:45
 #, fuzzy
 msgid "Session failed to validate (schema version changed)"
 msgstr "세션 유효성 검사 실패(잘못된 IP)"
 
-#: include/sessions.php:62
+#: include/sessions.php:53
+#, fuzzy
+msgid "Session failed to validate (UA changed)."
+msgstr "세션 유효성 검사 실패(잘못된 IP)"
+
+#: include/sessions.php:67
 #, fuzzy
 msgid "Session failed to validate (password changed)"
 msgstr "세션 유효성 검사 실패(잘못된 IP)"
 
-#: include/sessions.php:69
+#: include/sessions.php:74
 #, fuzzy
 msgid "Session failed to validate (user not found)"
 msgstr "세션 유효성 검사 실패(잘못된 IP)"
 
-#: classes/article.php:26
-msgid "Article not found."
-msgstr "글이 없습니다."
-
-#: classes/article.php:211
-msgid "Tags for this article (separated by commas):"
-msgstr "이 글의 태그 (쉼표로 구분)"
-
-#: classes/article.php:236
-#: classes/pref/labels.php:82
-#: classes/pref/users.php:103
-#: classes/pref/feeds.php:774
-#: classes/pref/feeds.php:914
-#: classes/pref/filters.php:525
-#: classes/pref/prefs.php:982
-#: plugins/nsfw/init.php:85
-#: plugins/note/init.php:58
-#: plugins/af_readability/init.php:80
-#: plugins/af_redditimgur/init.php:66
-#: plugins/af_psql_trgm/init.php:188
-#: plugins/mail/init.php:65
-#: plugins/af_zz_imgproxy/init.php:238
-msgid "Save"
-msgstr "저장"
-
-#: classes/article.php:238
-#: classes/handler/public.php:423
-#: classes/handler/public.php:457
-#: classes/pref/labels.php:84
-#: classes/pref/users.php:105
-#: classes/pref/feeds.php:775
-#: classes/pref/feeds.php:917
-#: classes/pref/feeds.php:1672
-#: classes/pref/filters.php:528
-#: classes/pref/filters.php:945
-#: classes/pref/filters.php:1022
-#: classes/pref/filters.php:1115
-#: classes/pref/prefs.php:984
-#: classes/feeds.php:1037
-#: classes/feeds.php:1089
-#: classes/feeds.php:1128
-#: plugins/note/init.php:60
-#: plugins/mail/init.php:179
-msgid "Cancel"
-msgstr "취소"
-
-#: classes/article.php:337
-#: classes/article.php:720
-#: classes/article.php:875
-msgid "no tags"
-msgstr "태그 없음"
-
-#: classes/article.php:448
-msgid "unknown type"
-msgstr "알수 없는 종류"
-
-#: classes/article.php:525
-msgid "Attachments"
-msgstr "첨부"
-
-#: classes/article.php:626
-#: classes/feeds.php:661
-msgid "comment"
-msgid_plural "comments"
-msgstr[0] "코멘트"
-
-#: classes/article.php:630
-#: classes/feeds.php:665
-msgid "comments"
-msgstr "코멘트"
-
-#: classes/article.php:689
-msgid " - "
-msgstr " - "
-
-#: classes/article.php:730
-#: classes/feeds.php:647
-msgid "Edit tags for this article"
-msgstr "이 글의 태그 편집"
-
-#: classes/article.php:763
-#: classes/feeds.php:602
-msgid "Originally from:"
-msgstr "원 출처:"
-
-#: classes/article.php:774
-#: classes/pref/feeds.php:539
-#: classes/feeds.php:613
-msgid "Feed URL"
-msgstr "피드 주소"
-
-#: classes/article.php:811
-#: classes/backend.php:103
-#: classes/dlg.php:33
-#: classes/dlg.php:56
-#: classes/dlg.php:89
-#: classes/dlg.php:154
-#: classes/dlg.php:181
-#: classes/dlg.php:197
-#: classes/pref/feeds.php:1466
-#: classes/pref/feeds.php:1533
-#: classes/pref/filters.php:208
-#: classes/pref/prefs.php:1099
-#: plugins/af_psql_trgm/init.php:109
-#: plugins/import_export/init.php:446
-#: plugins/import_export/init.php:490
-#: plugins/share/init.php:128
-msgid "Close this window"
-msgstr "이 창 닫기"
-
-#: classes/article.php:913
-msgid "(edit note)"
-msgstr "(노트 편집)"
-
-#: classes/opml.php:31
-#: classes/opml.php:36
-msgid "OPML Utility"
-msgstr "OPML 유틸리티"
-
-#: classes/opml.php:40
-msgid "Importing OPML..."
-msgstr "OPML 불러오는중..."
-
-#: classes/opml.php:45
-msgid "Return to preferences"
-msgstr "설정으로 돌아가기"
-
-#: classes/opml.php:301
-#, php-format
-msgid "Adding feed: %s"
-msgstr "%s 피드를 추가하는중..."
-
-#: classes/opml.php:312
-#, php-format
-msgid "Duplicate feed: %s"
-msgstr "중복 피드: %s"
-
-#: classes/opml.php:326
-#, php-format
-msgid "Adding label %s"
-msgstr "%s에 라벨 추가중..."
-
-#: classes/opml.php:329
-#, php-format
-msgid "Duplicate label: %s"
-msgstr ""
-
-#: classes/opml.php:341
-#, php-format
-msgid "Setting preference key %s to %s"
-msgstr ""
-
-#: classes/opml.php:377
-msgid "Adding filter..."
-msgstr "필터를 추가하는중..."
-
-#: classes/opml.php:512
-#, php-format
-msgid "Processing category: %s"
-msgstr "카테고리 처리중: %s"
-
-#: classes/opml.php:558
-#, php-format
-msgid "Upload failed with error code %d"
-msgstr ""
-
-#: classes/opml.php:570
-#: plugins/import_export/init.php:471
-msgid "Unable to move uploaded file."
-msgstr "업로드된 파일을 이동할 수 없습니다."
-
-#: classes/opml.php:574
-#: plugins/import_export/init.php:475
-msgid "Error: please upload OPML file."
-msgstr "오류: OPML 파일을 업로드 하세요."
-
-#: classes/opml.php:585
-msgid "Error: unable to find moved OPML file."
-msgstr "오류: 이동된 OPML 파일을 찾을 수 없습니다."
-
-#: classes/opml.php:594
-msgid "Error while parsing document."
-msgstr "문서 분석중에 오류가 발생했습니다."
-
 #: classes/backend.php:31
 msgid "Other interface tips are available in the Tiny Tiny RSS wiki."
 msgstr ""
@@ -1033,163 +842,353 @@ msgstr ""
 msgid "Help topic not found."
 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/backend.php:103
+#: classes/pref/filters.php:208
+#: classes/pref/feeds.php:1465
+#: classes/pref/feeds.php:1532
+#: classes/pref/prefs.php:1099
+#: classes/dlg.php:33
+#: classes/dlg.php:56
+#: classes/dlg.php:89
+#: classes/dlg.php:154
+#: classes/dlg.php:181
+#: classes/dlg.php:197
+#: classes/article.php:810
+#: plugins/af_psql_trgm/init.php:109
+#: plugins/import_export/init.php:446
+#: plugins/import_export/init.php:490
+#: plugins/share/init.php:128
+msgid "Close this window"
+msgstr "이 창 닫기"
 
-#: classes/dlg.php:44
-msgid "Your Public OPML URL is:"
-msgstr "공개 OPML URL: "
+#: classes/feeds.php:53
+msgid "View as RSS feed"
+msgstr "RSS 피드로 보기"
 
-#: classes/dlg.php:53
-#: classes/dlg.php:178
-#: plugins/share/init.php:125
-msgid "Generate new URL"
-msgstr "새 URL 생성"
+#: classes/feeds.php:54
+#: classes/feeds.php:140
+#: classes/pref/feeds.php:1326
+msgid "View as RSS"
+msgstr "RSS로 보기"
 
-#: classes/dlg.php:67
-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/feeds.php:62
+#, php-format
+msgid "Last updated: %s"
+msgstr "마지막 업데이트: %s"
 
-#: classes/dlg.php:71
-#: classes/dlg.php:80
-msgid "Last update:"
-msgstr "마지막 업데이트:"
-
-#: classes/dlg.php:76
-msgid "Update daemon is taking too long to perform a feed update. This could indicate a problem like crash or a hang. Please check the daemon process or contact instance owner."
-msgstr ""
-
-#: classes/dlg.php:169
-msgid "You can view this feed as RSS using the following URL:"
-msgstr ""
-
-#: classes/dlg.php:190
-msgid "You are using default tt-rss password. Please change it in the Preferences (Personal data / Authentication)."
-msgstr ""
-
-#: classes/dlg.php:194
+#: classes/feeds.php:100
 #, fuzzy
-msgid "Open Preferences"
-msgstr "설정"
+msgid "Select..."
+msgstr "선택"
 
-#: classes/handler/public.php:387
-#: plugins/bookmarklets/init.php:40
-msgid "Share with Tiny Tiny RSS"
-msgstr "Tiny Tiny RSS에 공유하기"
+#: classes/feeds.php:102
+#: classes/pref/labels.php:273
+#: classes/pref/filters.php:391
+#: classes/pref/filters.php:449
+#: classes/pref/filters.php:795
+#: classes/pref/filters.php:878
+#: classes/pref/filters.php:905
+#: classes/pref/feeds.php:1185
+#: classes/pref/feeds.php:1416
+#: classes/pref/feeds.php:1481
+#: classes/pref/users.php:358
+#: classes/pref/prefs.php:996
+msgid "All"
+msgstr "전체"
 
-#: classes/handler/public.php:395
-msgid "Title:"
-msgstr "제목:"
+#: classes/feeds.php:104
+msgid "Invert"
+msgstr "선택 반전"
 
-#: classes/handler/public.php:397
-#: classes/pref/feeds.php:537
-msgid "URL:"
-msgstr "URL:"
+#: classes/feeds.php:105
+#: classes/pref/labels.php:275
+#: classes/pref/filters.php:393
+#: classes/pref/filters.php:451
+#: classes/pref/filters.php:797
+#: classes/pref/filters.php:880
+#: classes/pref/filters.php:907
+#: classes/pref/feeds.php:1187
+#: classes/pref/feeds.php:1418
+#: classes/pref/feeds.php:1483
+#: classes/pref/users.php:360
+#: classes/pref/prefs.php:998
+msgid "None"
+msgstr "선택 안 함"
 
-#: classes/handler/public.php:399
-msgid "Content:"
-msgstr "내용:"
+#: classes/feeds.php:107
+msgid "Selection toggle:"
+msgstr "선택/선택해제:"
 
-#: classes/handler/public.php:401
-msgid "Labels:"
-msgstr "라벨:"
+#: classes/feeds.php:113
+msgid "Selection:"
+msgstr "선택:"
 
-#: classes/handler/public.php:420
-msgid "Shared article will appear in the Published feed."
-msgstr "공유된 글은 공개된 피드에 표시됩니다."
+#: classes/feeds.php:116
+msgid "Set score"
+msgstr "점수 매기기"
 
-#: classes/handler/public.php:422
-msgid "Share"
-msgstr "공유"
+#: classes/feeds.php:119
+msgid "Archive"
+msgstr "보관 처리"
 
-#: classes/handler/public.php:444
-msgid "Not logged in"
-msgstr "로그인되지 않음"
-
-#: classes/handler/public.php:504
-msgid "Incorrect username or password"
-msgstr "잘못된 사용자명 / 암호입니다."
-
-#: classes/handler/public.php:557
-#, php-format
-msgid "Already subscribed to <b>%s</b>."
-msgstr "<b>%s</b>는 이미 구독중입니다."
-
-#: classes/handler/public.php:560
-#, php-format
-msgid "Subscribed to <b>%s</b>."
-msgstr "<b>%s</b>를 구독했습니다."
-
-#: classes/handler/public.php:563
-#, php-format
-msgid "Could not subscribe to <b>%s</b>."
-msgstr "<b>%s</b>를 구독하는데 실패했습니다."
-
-#: classes/handler/public.php:566
-#, php-format
-msgid "No feeds found in <b>%s</b>."
-msgstr "<b>%s</b>에서 피드를 찾지 못했습니다."
-
-#: classes/handler/public.php:569
-msgid "Multiple feed URLs found."
-msgstr "여러개의 피드를 찾았습니다."
-
-#: classes/handler/public.php:573
-#, 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:591
-msgid "Subscribe to selected feed"
-msgstr "선택된 피드 구독"
-
-#: classes/handler/public.php:618
-msgid "Edit subscription options"
-msgstr "구독 옵션 편집"
-
-#: classes/handler/public.php:656
-msgid "Password recovery"
-msgstr "암호 복구"
-
-#: classes/handler/public.php:701
-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:723
-#: classes/pref/users.php:372
-msgid "Reset password"
-msgstr "암호 초기화"
-
-#: classes/handler/public.php:733
-msgid "Some of the required form parameters are missing or incorrect."
-msgstr "일부 필수 파라미터가 누락되었거나 잘못되었습니다."
-
-#: classes/handler/public.php:737
-#: classes/handler/public.php:806
-msgid "Go back"
+#: classes/feeds.php:121
+msgid "Move back"
 msgstr "돌아가기"
 
-#: classes/handler/public.php:775
-#, fuzzy
-msgid "[tt-rss] Password reset request"
-msgstr "[tt-rss] 암호 변경 안내"
+#: classes/feeds.php:122
+#: classes/pref/filters.php:400
+#: classes/pref/filters.php:458
+#: classes/pref/filters.php:887
+#: classes/pref/filters.php:914
+msgid "Delete"
+msgstr "삭제"
 
-#: classes/handler/public.php:802
-msgid "Sorry, login and email combination not found."
-msgstr "로그인/이메일 정보가 없습니다."
+#: classes/feeds.php:127
+#: classes/feeds.php:132
+#: plugins/mailto/init.php:25
+#: plugins/mail/init.php:76
+msgid "Forward by email"
+msgstr "이메일로 전달"
 
-#: classes/handler/public.php:824
-msgid "Your access level is insufficient to run this script."
-msgstr "현재 계정 권한으로는 이 스크립트를 실행할 수 없습니다."
+#: classes/feeds.php:136
+msgid "Feed:"
+msgstr "피드"
 
-#: classes/handler/public.php:850
-msgid "Database Updater"
-msgstr "데이터베이스 업데이터"
+#: classes/feeds.php:193
+#: classes/feeds.php:802
+msgid "Feed not found."
+msgstr "피드가 없습니다."
 
-#: classes/handler/public.php:915
-msgid "Perform updates"
-msgstr "업데이트 실행"
+#: classes/feeds.php:255
+msgid "Never"
+msgstr "영원히"
+
+#: classes/feeds.php:341
+#, php-format
+msgid "Imported at %s"
+msgstr "%s에서 불러옴"
+
+#: classes/feeds.php:391
+#: classes/feeds.php:484
+msgid "mark feed as read"
+msgstr "피드 읽음 표시"
+
+#: classes/feeds.php:540
+msgid "Collapse article"
+msgstr "글 접기"
+
+#: classes/feeds.php:592
+#: classes/article.php:762
+msgid "Originally from:"
+msgstr "원 출처:"
+
+#: classes/feeds.php:603
+#: classes/pref/feeds.php:538
+#: classes/article.php:773
+msgid "Feed URL"
+msgstr "피드 주소"
+
+#: classes/feeds.php:630
+#: classes/article.php:729
+msgid "Edit tags for this article"
+msgstr "이 글의 태그 편집"
+
+#: classes/feeds.php:644
+#: classes/article.php:625
+msgid "comment"
+msgid_plural "comments"
+msgstr[0] "코멘트"
+
+#: classes/feeds.php:648
+#: classes/article.php:629
+msgid "comments"
+msgstr "코멘트"
+
+#: classes/feeds.php:686
+msgid "No unread articles found to display."
+msgstr "읽지 않은 글이 없습니다."
+
+#: classes/feeds.php:689
+msgid "No updated articles found to display."
+msgstr "업데이트된 글이 없습니다."
+
+#: classes/feeds.php:692
+msgid "No starred articles found to display."
+msgstr "중요 표시된 글이 없습니다."
+
+#: classes/feeds.php:696
+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:698
+msgid "No articles found to display."
+msgstr "표시할 글이 없습니다."
+
+#: classes/feeds.php:714
+#: classes/feeds.php:905
+#, php-format
+msgid "Feeds last updated at %s"
+msgstr "%s에 마지막으로 업데이트 되었습니다."
+
+#: classes/feeds.php:726
+#: classes/feeds.php:917
+msgid "Some feeds have update errors (click for details)"
+msgstr "일부 피드에 업데이트 오류가 있습니다 (상세 정보는 클릭)"
+
+#: classes/feeds.php:894
+msgid "No feed selected."
+msgstr "선택된 피드가 없습니다."
+
+#: classes/feeds.php:958
+#: classes/feeds.php:966
+msgid "Feed or site URL"
+msgstr "피드나 사이트 URL"
+
+#: classes/feeds.php:972
+#: classes/pref/feeds.php:559
+#: classes/pref/feeds.php:800
+#: classes/pref/feeds.php:1632
+msgid "Place in category:"
+msgstr "카테고리 위치:"
+
+#: classes/feeds.php:980
+msgid "Available feeds"
+msgstr "사용 가능한 피드"
+
+#: classes/feeds.php:992
+#: classes/pref/feeds.php:621
+#: classes/pref/feeds.php:848
+#: classes/pref/users.php:61
+msgid "Authentication"
+msgstr "인증"
+
+#: classes/feeds.php:996
+#: classes/pref/feeds.php:625
+#: classes/pref/feeds.php:852
+#: classes/pref/feeds.php:1646
+#: classes/pref/users.php:403
+msgid "Login"
+msgstr "로그인"
+
+#: classes/feeds.php:1000
+#: classes/pref/feeds.php:631
+#: classes/pref/feeds.php:860
+#: classes/pref/feeds.php:1649
+#: classes/pref/prefs.php:243
+msgid "Password"
+msgstr "암호"
+
+#: classes/feeds.php:1011
+#: classes/pref/feeds.php:645
+msgid "This feed requires authentication."
+msgstr "이 피드는 로그인이 필요합니다."
+
+#: classes/feeds.php:1014
+#: classes/feeds.php:1070
+#: classes/pref/feeds.php:1668
+msgid "Subscribe"
+msgstr "구독"
+
+#: classes/feeds.php:1017
+msgid "More feeds"
+msgstr "기타 피드"
+
+#: classes/feeds.php:1020
+#: classes/feeds.php:1072
+#: classes/feeds.php:1111
+#: classes/pref/labels.php:84
+#: classes/pref/filters.php:528
+#: classes/pref/filters.php:945
+#: classes/pref/filters.php:1022
+#: classes/pref/filters.php:1115
+#: classes/pref/feeds.php:774
+#: classes/pref/feeds.php:916
+#: classes/pref/feeds.php:1669
+#: classes/pref/users.php:105
+#: classes/pref/prefs.php:984
+#: classes/article.php:238
+#: classes/handler/public.php:443
+#: classes/handler/public.php:477
+#: plugins/mail/init.php:179
+#: plugins/note/init.php:60
+msgid "Cancel"
+msgstr "취소"
+
+#: classes/feeds.php:1042
+#: classes/feeds.php:1110
+#: classes/pref/filters.php:788
+#: classes/pref/feeds.php:1178
+#: classes/pref/users.php:345
+#: js/tt-rss.js:152
+msgid "Search"
+msgstr "검색"
+
+#: classes/feeds.php:1046
+msgid "Popular feeds"
+msgstr "인기 피드"
+
+#: classes/feeds.php:1047
+msgid "Feed archive"
+msgstr "피드 보관"
+
+#: classes/feeds.php:1050
+msgid "limit:"
+msgstr "제한:"
+
+#: classes/feeds.php:1071
+#: classes/pref/labels.php:282
+#: classes/pref/filters.php:518
+#: classes/pref/filters.php:814
+#: classes/pref/feeds.php:751
+#: classes/pref/users.php:369
+msgid "Remove"
+msgstr "삭제"
+
+#: classes/feeds.php:1084
+msgid "Look for"
+msgstr ""
+
+#: classes/feeds.php:1092
+#, php-format
+msgid "in %s"
+msgstr ""
+
+#: classes/feeds.php:1097
+msgid "Used for word stemming"
+msgstr ""
+
+#: classes/feeds.php:1106
+msgid "Search syntax"
+msgstr "문법 "
+
+#: classes/feeds.php:1563
+msgid "Starred articles"
+msgstr "중요 표시된 글"
+
+#: classes/feeds.php:1565
+msgid "Published articles"
+msgstr "공개 글"
+
+#: classes/feeds.php:1567
+msgid "Fresh articles"
+msgstr "새 글"
+
+#: classes/feeds.php:1571
+msgid "Archived articles"
+msgstr "보관 처리된 글"
+
+#: classes/feeds.php:1573
+msgid "Recently read"
+msgstr "최근에 읽은 글"
+
+#: classes/feeds.php:1694
+msgid "Special"
+msgstr "자동 분류"
+
+#: classes/feeds.php:1951
+#, php-format
+msgid "Search results: %s"
+msgstr "검색 결과: %s"
 
 #: classes/pref/labels.php:25
 #: classes/pref/filters.php:377
@@ -1209,201 +1208,193 @@ msgstr "전면색"
 msgid "Background:"
 msgstr "배경색"
 
+#: classes/pref/labels.php:82
+#: classes/pref/filters.php:525
+#: classes/pref/feeds.php:773
+#: classes/pref/feeds.php:913
+#: classes/pref/users.php:103
+#: classes/pref/prefs.php:982
+#: classes/article.php:236
+#: plugins/af_zz_imgproxy/init.php:238
+#: plugins/af_redditimgur/init.php:66
+#: plugins/af_psql_trgm/init.php:188
+#: plugins/af_readability/init.php:80
+#: plugins/nsfw/init.php:85
+#: plugins/mail/init.php:65
+#: plugins/note/init.php:58
+msgid "Save"
+msgstr "저장"
+
 #: classes/pref/labels.php:244
 #, php-format
 msgid "Created label <b>%s</b>"
 msgstr "<b>%s</b> 라벨이 생성되었습니다."
 
 #: classes/pref/labels.php:270
-#: classes/pref/users.php:356
-#: classes/pref/feeds.php:1183
-#: classes/pref/feeds.php:1414
-#: classes/pref/feeds.php:1479
 #: classes/pref/filters.php:388
 #: classes/pref/filters.php:446
 #: classes/pref/filters.php:792
 #: classes/pref/filters.php:875
 #: classes/pref/filters.php:902
+#: classes/pref/feeds.php:1182
+#: classes/pref/feeds.php:1413
+#: classes/pref/feeds.php:1478
+#: classes/pref/users.php:355
 #: classes/pref/prefs.php:993
 msgid "Select"
 msgstr "선택"
 
-#: classes/pref/labels.php:273
-#: classes/pref/users.php:359
-#: classes/pref/feeds.php:1186
-#: classes/pref/feeds.php:1417
-#: classes/pref/feeds.php:1482
-#: classes/pref/filters.php:391
-#: classes/pref/filters.php:449
-#: classes/pref/filters.php:795
-#: classes/pref/filters.php:878
-#: classes/pref/filters.php:905
-#: classes/pref/prefs.php:996
-#: classes/feeds.php:102
-msgid "All"
-msgstr "전체"
-
-#: classes/pref/labels.php:275
-#: classes/pref/users.php:361
-#: classes/pref/feeds.php:1188
-#: classes/pref/feeds.php:1419
-#: classes/pref/feeds.php:1484
-#: classes/pref/filters.php:393
-#: classes/pref/filters.php:451
-#: classes/pref/filters.php:797
-#: classes/pref/filters.php:880
-#: classes/pref/filters.php:907
-#: classes/pref/prefs.php:998
-#: classes/feeds.php:105
-msgid "None"
-msgstr "선택 안 함"
-
-#: classes/pref/labels.php:282
-#: classes/pref/users.php:370
-#: classes/pref/feeds.php:752
-#: classes/pref/filters.php:518
-#: classes/pref/filters.php:814
-#: classes/feeds.php:1088
-msgid "Remove"
-msgstr "삭제"
-
 #: classes/pref/labels.php:285
 msgid "Clear colors"
 msgstr "색 정리"
 
-#: classes/pref/users.php:6
-#: classes/pref/system.php:8
-msgid "Your access level is insufficient to open this tab."
-msgstr "현재 계정 권한으로는 이 탭을 사용할 수 없습니다."
-
-#: classes/pref/users.php:26
+#: classes/pref/filters.php:155
 #, fuzzy
-msgid "Edit user"
-msgstr "규칙 편집"
+msgid "Preview article"
+msgstr "記事フィルター"
 
-#: classes/pref/users.php:61
-#: classes/pref/feeds.php:622
-#: classes/pref/feeds.php:849
-#: classes/feeds.php:1009
-msgid "Authentication"
-msgstr "인증"
+#: classes/pref/filters.php:267
+#: classes/pref/filters.php:573
+msgid "(inverse)"
+msgstr "반전"
 
-#: classes/pref/users.php:64
-msgid "Access level: "
-msgstr "계정 권한:"
-
-#: classes/pref/users.php:82
-#: classes/pref/feeds.php:648
-#: classes/pref/feeds.php:867
-msgid "Options"
-msgstr "옵션"
-
-#: classes/pref/users.php:96
-#: js/prefs.js:479
-msgid "User details"
-msgstr "사용자 상세 정보"
-
-#: classes/pref/users.php:136
-#: classes/pref/users.php:407
-msgid "Registered"
-msgstr "등록 일자"
-
-#: classes/pref/users.php:137
-msgid "Last logged in"
-msgstr "마지막 로그인"
-
-#: classes/pref/users.php:145
-msgid "Subscribed feeds count"
-msgstr "구독중인 피드 수"
-
-#: classes/pref/users.php:146
-#, fuzzy
-msgid "Stored articles"
-msgstr "중요 표시된 글"
-
-#: classes/pref/users.php:150
-#: classes/pref/users.php:406
-msgid "Subscribed feeds"
-msgstr "구독중인 피드"
-
-#: classes/pref/users.php:176
-msgid "User not found"
-msgstr "사용자를 찾지 못했습니다."
-
-#: classes/pref/users.php:246
+#: classes/pref/filters.php:263
+#: classes/pref/filters.php:572
 #, php-format
-msgid "Added user <b>%s</b> with password <b>%s</b>"
-msgstr "사용자 <b>%s</b> (암호: <b>%s</b>)가 추가되었습니다."
+msgid "%s on %s in %s %s"
+msgstr ""
 
-#: classes/pref/users.php:253
-#, php-format
-msgid "Could not create user <b>%s</b>"
-msgstr "사용자 <b>%s</b>를 만들 수 없습니다."
+#: classes/pref/filters.php:383
+#: classes/pref/filters.php:870
+#: classes/pref/filters.php:977
+msgid "Match"
+msgstr "일치"
 
-#: classes/pref/users.php:257
-#, php-format
-msgid "User <b>%s</b> already exists."
-msgstr "<b>%s</b>는 이미 사용중입니다."
+#: classes/pref/filters.php:397
+#: classes/pref/filters.php:455
+#: classes/pref/filters.php:884
+#: classes/pref/filters.php:911
+msgid "Add"
+msgstr "추가"
 
-#: classes/pref/users.php:285
-#, php-format
-msgid "Changed password of user <b>%s</b> to <b>%s</b>"
-msgstr "사용자 <b>%s</b>의 암호가 <b>%s</b>로 변경되었습니다."
+#: classes/pref/filters.php:441
+#: classes/pref/filters.php:897
+msgid "Apply actions"
+msgstr "동작 적용"
 
-#: classes/pref/users.php:287
-#, php-format
-msgid "Sending new password of user <b>%s</b> to <b>%s</b>"
-msgstr "사용자 <b>%s</b>의 새 암호를 <b>%s</b>로 보내중..."
+#: classes/pref/filters.php:492
+#: classes/pref/filters.php:926
+msgid "Enabled"
+msgstr "활성화"
 
-#: classes/pref/users.php:311
-msgid "[tt-rss] Password change notification"
-msgstr "[tt-rss] 암호 변경 안내"
+#: classes/pref/filters.php:501
+#: classes/pref/filters.php:929
+msgid "Match any rule"
+msgstr "아무 규칙이나 적용"
 
-#: classes/pref/users.php:346
-#: classes/pref/feeds.php:1179
-#: classes/pref/filters.php:788
-#: classes/feeds.php:1059
-#: classes/feeds.php:1127
-#: js/tt-rss.js:165
-msgid "Search"
-msgstr "검색"
+#: classes/pref/filters.php:510
+#: classes/pref/filters.php:932
+msgid "Inverse matching"
+msgstr "반대 적용"
 
-#: classes/pref/users.php:364
-msgid "Create user"
-msgstr "사용자 생성"
+#: classes/pref/filters.php:522
+#: classes/pref/filters.php:939
+msgid "Test"
+msgstr "테스트"
+
+#: classes/pref/filters.php:804
+msgid "Combine"
+msgstr "병합"
 
-#: classes/pref/users.php:368
 #: classes/pref/filters.php:807
+#: classes/pref/users.php:367
 msgid "Edit"
 msgstr "편집"
 
-#: classes/pref/users.php:404
-#: classes/pref/feeds.php:626
-#: classes/pref/feeds.php:853
-#: classes/pref/feeds.php:1649
-#: classes/feeds.php:1013
-msgid "Login"
-msgstr "로그인"
+#: classes/pref/filters.php:810
+#: classes/pref/feeds.php:1198
+#: classes/pref/feeds.php:1212
+msgid "Reset sort order"
+msgstr "정렬 순서 초기화"
 
-#: classes/pref/users.php:405
-msgid "Access Level"
-msgstr "계정 권한"
+#: classes/pref/filters.php:942
+msgid "Create"
+msgstr "생성"
 
-#: classes/pref/users.php:408
-msgid "Last login"
-msgstr "마지막 로그인"
+#: classes/pref/filters.php:987
+msgid "Regular expression, without outer delimiters (i.e. slashes)"
+msgstr ""
 
-#: classes/pref/users.php:427
-msgid "Click to edit"
-msgstr "클릭하여 편집"
+#: classes/pref/filters.php:993
+msgid "Inverse regular expression matching"
+msgstr ""
 
-#: classes/pref/users.php:447
-msgid "No users defined."
-msgstr "정의된 사용자가 없습니다."
+#: classes/pref/filters.php:995
+msgid "on field"
+msgstr "필드"
 
-#: classes/pref/users.php:449
-msgid "No matching users found."
-msgstr "일치하는 사용자가 없습니다."
+#: classes/pref/filters.php:1001
+#: js/PrefFilterTree.js:44
+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:764
+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:786
+msgid "Add action"
+msgstr "동작 추가"
+
+#: classes/pref/filters.php:1139
+msgid "[No caption]"
+msgstr "[자막 없음]"
+
+#: classes/pref/filters.php:1141
+#, fuzzy, php-format
+msgid "%s (%d rule)"
+msgid_plural "%s (%d rules)"
+msgstr[0] "규칙 추가"
+
+#: classes/pref/filters.php:1155
+#, fuzzy
+msgid "matches any rule"
+msgstr "아무 규칙이나 적용"
+
+#: classes/pref/filters.php:1158
+#, fuzzy, php-format
+msgid "%s (+%d action)"
+msgid_plural "%s (+%d actions)"
+msgstr[0] "동작 추가"
+
+#: classes/pref/system.php:8
+#: classes/pref/users.php:6
+msgid "Your access level is insufficient to open this tab."
+msgstr "현재 계정 권한으로는 이 탭을 사용할 수 없습니다."
 
 #: classes/pref/system.php:29
 msgid "Error Log"
@@ -1447,384 +1438,316 @@ msgid "(%d feed)"
 msgid_plural "(%d feeds)"
 msgstr[0] "(%d개의 피드)"
 
-#: classes/pref/feeds.php:514
+#: classes/pref/feeds.php:513
 #: classes/pref/prefs.php:18
 msgid "General"
 msgstr "일반"
 
-#: classes/pref/feeds.php:528
+#: classes/pref/feeds.php:527
 msgid "Feed Title"
 msgstr "피드 제목"
 
-#: classes/pref/feeds.php:560
-#: classes/pref/feeds.php:801
-#: classes/pref/feeds.php:1635
-#: classes/feeds.php:989
-msgid "Place in category:"
-msgstr "카테고리 위치:"
+#: classes/pref/feeds.php:536
+#: classes/handler/public.php:417
+msgid "URL:"
+msgstr "URL:"
 
-#: classes/pref/feeds.php:572
+#: classes/pref/feeds.php:571
 #, fuzzy
 msgid "Site URL:"
 msgstr "サイト:"
 
-#: classes/pref/feeds.php:574
+#: classes/pref/feeds.php:573
 #, fuzzy
 msgid "Site URL"
 msgstr "피드 주소"
 
-#: classes/pref/feeds.php:585
-#: classes/pref/feeds.php:815
+#: classes/pref/feeds.php:584
+#: classes/pref/feeds.php:814
 #, fuzzy
 msgid "Language:"
 msgstr "언어"
 
-#: classes/pref/feeds.php:592
-#: classes/pref/feeds.php:824
+#: classes/pref/feeds.php:591
+#: classes/pref/feeds.php:823
 msgid "Update"
 msgstr "업데이트"
 
-#: classes/pref/feeds.php:607
-#: classes/pref/feeds.php:840
+#: classes/pref/feeds.php:606
+#: classes/pref/feeds.php:839
 msgid "Article purging:"
 msgstr "글을 유지:"
 
-#: classes/pref/feeds.php:632
-#: classes/pref/feeds.php:861
-#: classes/pref/feeds.php:1652
-#: classes/pref/prefs.php:243
-#: classes/feeds.php:1017
-msgid "Password"
-msgstr "암호"
-
-#: classes/pref/feeds.php:636
+#: classes/pref/feeds.php:635
 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:646
-#: classes/feeds.php:1028
-msgid "This feed requires authentication."
-msgstr "이 피드는 로그인이 필요합니다."
+#: classes/pref/feeds.php:647
+#: classes/pref/feeds.php:866
+#: classes/pref/users.php:82
+msgid "Options"
+msgstr "옵션"
 
-#: classes/pref/feeds.php:662
-#: classes/pref/feeds.php:871
+#: classes/pref/feeds.php:661
+#: classes/pref/feeds.php:870
 msgid "Hide from Popular feeds"
 msgstr "인기 피드에서 숨김"
 
-#: classes/pref/feeds.php:674
-#: classes/pref/feeds.php:877
+#: classes/pref/feeds.php:673
+#: classes/pref/feeds.php:876
 msgid "Include in e-mail digest"
 msgstr "이메일 요약에 포함"
 
-#: classes/pref/feeds.php:687
-#: classes/pref/feeds.php:883
+#: classes/pref/feeds.php:686
+#: classes/pref/feeds.php:882
 msgid "Always display image attachments"
 msgstr ""
 
-#: classes/pref/feeds.php:700
-#: classes/pref/feeds.php:891
+#: classes/pref/feeds.php:699
+#: classes/pref/feeds.php:890
 #, fuzzy
 msgid "Do not embed media"
 msgstr "글에 이미지 삽입하지 않음"
 
-#: classes/pref/feeds.php:713
-#: classes/pref/feeds.php:899
+#: classes/pref/feeds.php:712
+#: classes/pref/feeds.php:898
 msgid "Cache media"
 msgstr ""
 
-#: classes/pref/feeds.php:725
-#: classes/pref/feeds.php:905
+#: classes/pref/feeds.php:724
+#: classes/pref/feeds.php:904
 msgid "Mark updated articles as unread"
 msgstr "업데이트된 글을 읽지 않음 표시"
 
-#: classes/pref/feeds.php:729
+#: classes/pref/feeds.php:728
 msgid "Icon"
 msgstr "아이콘"
 
-#: classes/pref/feeds.php:743
-#: classes/pref/feeds.php:1284
+#: classes/pref/feeds.php:742
+#: classes/pref/feeds.php:1283
 #: plugins/import_export/init.php:71
 #, fuzzy
 msgid "Choose file..."
 msgstr "필터 만들기..."
 
-#: classes/pref/feeds.php:750
+#: classes/pref/feeds.php:749
 msgid "Replace"
 msgstr ""
 
-#: classes/pref/feeds.php:757
+#: classes/pref/feeds.php:756
 #: classes/pref/prefs.php:679
 msgid "Plugins"
 msgstr "플러그인"
 
-#: classes/pref/feeds.php:1154
+#: classes/pref/feeds.php:1153
 msgid "Feeds with errors"
 msgstr "오류가 있는 피드"
 
-#: classes/pref/feeds.php:1161
+#: classes/pref/feeds.php:1160
 msgid "Inactive feeds"
 msgstr "피드 비활성화"
 
-#: classes/pref/feeds.php:1197
+#: classes/pref/feeds.php:1196
 msgid "Edit selected feeds"
 msgstr "선택된 피드 편집"
 
-#: classes/pref/feeds.php:1199
-#: classes/pref/feeds.php:1213
-#: classes/pref/filters.php:810
-msgid "Reset sort order"
-msgstr "정렬 순서 초기화"
-
-#: classes/pref/feeds.php:1201
-#: js/prefs.js:1462
+#: classes/pref/feeds.php:1200
+#: js/prefs.js:1171
 msgid "Batch subscribe"
 msgstr "일괄 구독"
 
-#: classes/pref/feeds.php:1208
+#: classes/pref/feeds.php:1207
 msgid "Categories"
 msgstr "카테고리"
 
-#: classes/pref/feeds.php:1211
+#: classes/pref/feeds.php:1210
 msgid "Add category"
 msgstr "카테고리 추가"
 
-#: classes/pref/feeds.php:1215
+#: classes/pref/feeds.php:1214
 msgid "Remove selected"
 msgstr "선택된 항목 제거"
 
-#: classes/pref/feeds.php:1272
+#: classes/pref/feeds.php:1271
 msgid "OPML"
 msgstr "OPML"
 
-#: classes/pref/feeds.php:1274
+#: classes/pref/feeds.php:1273
 msgid "Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings."
 msgstr "OPML을 사용하면 피드/필터/라벨/설정을 내보내고 불러올 수 있습니다."
 
-#: classes/pref/feeds.php:1275
+#: classes/pref/feeds.php:1274
 msgid "Only main settings profile can be migrated using OPML."
 msgstr ""
 
-#: classes/pref/feeds.php:1290
+#: classes/pref/feeds.php:1289
 msgid "Import my OPML"
 msgstr "내 OPML 불러오기"
 
-#: classes/pref/feeds.php:1296
+#: classes/pref/feeds.php:1295
 msgid "Filename:"
 msgstr ""
 
-#: classes/pref/feeds.php:1298
+#: classes/pref/feeds.php:1297
 msgid "Include settings"
 msgstr "설정 포함"
 
-#: classes/pref/feeds.php:1302
+#: classes/pref/feeds.php:1301
 msgid "Export OPML"
 msgstr "OPML 내보내기"
 
-#: classes/pref/feeds.php:1306
+#: classes/pref/feeds.php:1305
 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:1310
+#: classes/pref/feeds.php:1309
 msgid "Public OPML URL"
 msgstr ""
 
-#: classes/pref/feeds.php:1311
+#: classes/pref/feeds.php:1310
 msgid "Display published OPML URL"
 msgstr "공개 OPML URL 표시"
 
-#: classes/pref/feeds.php:1318
+#: classes/pref/feeds.php:1317
 msgid "Published & shared articles / Generated feeds"
 msgstr "공개, 공유된 글 / 생성된 피드"
 
-#: classes/pref/feeds.php:1320
+#: classes/pref/feeds.php:1319
 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:1327
-#: classes/feeds.php:54
-#: classes/feeds.php:140
-msgid "View as RSS"
-msgstr "RSS로 보기"
-
-#: classes/pref/feeds.php:1328
 msgid "Display URL"
 msgstr "URL 표시"
 
-#: classes/pref/feeds.php:1331
+#: classes/pref/feeds.php:1330
 msgid "Clear all generated URLs"
 msgstr "이미 만들어진 URL 제거"
 
-#: classes/pref/feeds.php:1410
+#: classes/pref/feeds.php:1409
 msgid "These feeds have not been updated with new content for 3 months (oldest first):"
 msgstr "3개월 이상 업데이트 되지 않은 피드(오래된 순서):"
 
-#: classes/pref/feeds.php:1444
-#: classes/pref/feeds.php:1509
+#: classes/pref/feeds.php:1443
+#: classes/pref/feeds.php:1508
 msgid "Click to edit feed"
 msgstr "클릭하여 피드 편집"
 
-#: classes/pref/feeds.php:1462
-#: classes/pref/feeds.php:1529
+#: classes/pref/feeds.php:1461
+#: classes/pref/feeds.php:1528
 msgid "Unsubscribe from selected feeds"
 msgstr "선택된 피드 구독 해제 중..."
 
-#: classes/pref/feeds.php:1632
+#: classes/pref/feeds.php:1629
 msgid "Add one valid RSS feed per line (no feed detection is done)"
 msgstr ""
 
-#: classes/pref/feeds.php:1641
+#: classes/pref/feeds.php:1638
 msgid "Feeds to subscribe, One per line"
 msgstr ""
 
-#: classes/pref/feeds.php:1664
+#: classes/pref/feeds.php:1661
 msgid "Feeds require authentication."
 msgstr "인증이 필요한 피드"
 
-#: classes/pref/feeds.php:1671
-#: classes/feeds.php:1031
-#: classes/feeds.php:1087
-msgid "Subscribe"
-msgstr "구독"
-
-#: classes/pref/filters.php:155
+#: classes/pref/users.php:26
 #, fuzzy
-msgid "Preview article"
-msgstr "記事フィルター"
+msgid "Edit user"
+msgstr "규칙 편집"
 
-#: classes/pref/filters.php:267
-#: classes/pref/filters.php:573
-msgid "(inverse)"
-msgstr "반전"
+#: classes/pref/users.php:64
+msgid "Access level: "
+msgstr "계정 권한:"
 
-#: classes/pref/filters.php:263
-#: classes/pref/filters.php:572
+#: classes/pref/users.php:96
+#: js/prefs.js:403
+msgid "User details"
+msgstr "사용자 상세 정보"
+
+#: classes/pref/users.php:136
+#: classes/pref/users.php:406
+msgid "Registered"
+msgstr "등록 일자"
+
+#: classes/pref/users.php:137
+msgid "Last logged in"
+msgstr "마지막 로그인"
+
+#: classes/pref/users.php:145
+msgid "Subscribed feeds count"
+msgstr "구독중인 피드 수"
+
+#: classes/pref/users.php:146
+#, fuzzy
+msgid "Stored articles"
+msgstr "중요 표시된 글"
+
+#: classes/pref/users.php:150
+#: classes/pref/users.php:405
+msgid "Subscribed feeds"
+msgstr "구독중인 피드"
+
+#: classes/pref/users.php:176
+msgid "User not found"
+msgstr "사용자를 찾지 못했습니다."
+
+#: classes/pref/users.php:246
 #, php-format
-msgid "%s on %s in %s %s"
-msgstr ""
+msgid "Added user <b>%s</b> with password <b>%s</b>"
+msgstr "사용자 <b>%s</b> (암호: <b>%s</b>)가 추가되었습니다."
 
-#: classes/pref/filters.php:383
-#: classes/pref/filters.php:870
-#: classes/pref/filters.php:977
-msgid "Match"
-msgstr "일치"
+#: classes/pref/users.php:253
+#, php-format
+msgid "Could not create user <b>%s</b>"
+msgstr "사용자 <b>%s</b>를 만들 수 없습니다."
 
-#: classes/pref/filters.php:397
-#: classes/pref/filters.php:455
-#: classes/pref/filters.php:884
-#: classes/pref/filters.php:911
-msgid "Add"
-msgstr "추가"
+#: classes/pref/users.php:257
+#, php-format
+msgid "User <b>%s</b> already exists."
+msgstr "<b>%s</b>는 이미 사용중입니다."
 
-#: classes/pref/filters.php:400
-#: classes/pref/filters.php:458
-#: classes/pref/filters.php:887
-#: classes/pref/filters.php:914
-#: classes/feeds.php:122
-msgid "Delete"
-msgstr "삭제"
+#: classes/pref/users.php:285
+#, php-format
+msgid "Changed password of user <b>%s</b> to <b>%s</b>"
+msgstr "사용자 <b>%s</b>의 암호가 <b>%s</b>로 변경되었습니다."
 
-#: classes/pref/filters.php:441
-#: classes/pref/filters.php:897
-msgid "Apply actions"
-msgstr "동작 적용"
+#: classes/pref/users.php:287
+#, php-format
+msgid "Sending new password of user <b>%s</b> to <b>%s</b>"
+msgstr "사용자 <b>%s</b>의 새 암호를 <b>%s</b>로 보내중..."
 
-#: classes/pref/filters.php:492
-#: classes/pref/filters.php:926
-msgid "Enabled"
-msgstr "활성화"
+#: classes/pref/users.php:310
+msgid "[tt-rss] Password change notification"
+msgstr "[tt-rss] 암호 변경 안내"
 
-#: classes/pref/filters.php:501
-#: classes/pref/filters.php:929
-msgid "Match any rule"
-msgstr "아무 규칙이나 적용"
+#: classes/pref/users.php:363
+msgid "Create user"
+msgstr "사용자 생성"
 
-#: classes/pref/filters.php:510
-#: classes/pref/filters.php:932
-msgid "Inverse matching"
-msgstr "반대 적용"
+#: classes/pref/users.php:371
+#: classes/handler/public.php:747
+msgid "Reset password"
+msgstr "암호 초기화"
 
-#: classes/pref/filters.php:522
-#: classes/pref/filters.php:939
-msgid "Test"
-msgstr "테스트"
+#: classes/pref/users.php:404
+msgid "Access Level"
+msgstr "계정 권한"
 
-#: classes/pref/filters.php:804
-msgid "Combine"
-msgstr "병합"
+#: classes/pref/users.php:407
+msgid "Last login"
+msgstr "마지막 로그인"
 
-#: classes/pref/filters.php:942
-msgid "Create"
-msgstr "생성"
+#: classes/pref/users.php:426
+msgid "Click to edit"
+msgstr "클릭하여 편집"
 
-#: classes/pref/filters.php:987
-msgid "Regular expression, without outer delimiters (i.e. slashes)"
-msgstr ""
+#: classes/pref/users.php:446
+msgid "No users defined."
+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:43
-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:797
-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:819
-msgid "Add action"
-msgstr "동작 추가"
-
-#: classes/pref/filters.php:1139
-msgid "[No caption]"
-msgstr "[자막 없음]"
-
-#: classes/pref/filters.php:1141
-#, fuzzy, php-format
-msgid "%s (%d rule)"
-msgid_plural "%s (%d rules)"
-msgstr[0] "규칙 추가"
-
-#: classes/pref/filters.php:1155
-#, fuzzy
-msgid "matches any rule"
-msgstr "아무 규칙이나 적용"
-
-#: classes/pref/filters.php:1158
-#, fuzzy, php-format
-msgid "%s (+%d action)"
-msgid_plural "%s (+%d actions)"
-msgstr[0] "동작 추가"
+#: classes/pref/users.php:448
+msgid "No matching users found."
+msgstr "일치하는 사용자가 없습니다."
 
 #: classes/pref/prefs.php:19
 msgid "Interface"
@@ -2000,7 +1923,7 @@ msgid "Strip all but most common HTML tags when reading articles."
 msgstr ""
 
 #: classes/pref/prefs.php:53
-#: js/prefs.js:1424
+#: js/prefs.js:1136
 msgid "Customize stylesheet"
 msgstr "스타일시트 변경"
 
@@ -2243,256 +2166,301 @@ msgstr "선택된 프로필 삭제"
 msgid "Activate profile"
 msgstr "프로필 활성화"
 
-#: classes/feeds.php:53
-msgid "View as RSS feed"
-msgstr "RSS 피드로 보기"
+#: 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/feeds.php:62
-#, php-format
-msgid "Last updated: %s"
-msgstr "마지막 업데이트: %s"
+#: classes/dlg.php:44
+msgid "Your Public OPML URL is:"
+msgstr "공개 OPML URL: "
 
-#: classes/feeds.php:100
+#: classes/dlg.php:53
+#: classes/dlg.php:178
+#: plugins/share/init.php:125
+msgid "Generate new URL"
+msgstr "새 URL 생성"
+
+#: classes/dlg.php:67
+msgid "Update daemon is enabled in configuration, but daemon process is not running, which prevents all feeds from updating. Please start the daemon process or contact instance owner."
+msgstr ""
+
+#: classes/dlg.php:71
+#: classes/dlg.php:80
+msgid "Last update:"
+msgstr "마지막 업데이트:"
+
+#: classes/dlg.php:76
+msgid "Update daemon is taking too long to perform a feed update. This could indicate a problem like crash or a hang. Please check the daemon process or contact instance owner."
+msgstr ""
+
+#: classes/dlg.php:169
+msgid "You can view this feed as RSS using the following URL:"
+msgstr ""
+
+#: classes/dlg.php:190
+msgid "You are using default tt-rss password. Please change it in the Preferences (Personal data / Authentication)."
+msgstr ""
+
+#: classes/dlg.php:194
 #, fuzzy
-msgid "Select..."
-msgstr "선택"
+msgid "Open Preferences"
+msgstr "설정"
 
-#: classes/feeds.php:104
-msgid "Invert"
-msgstr "선택 반전"
+#: classes/opml.php:31
+#: classes/opml.php:36
+msgid "OPML Utility"
+msgstr "OPML 유틸리티"
 
-#: classes/feeds.php:107
-msgid "Selection toggle:"
-msgstr "선택/선택해제:"
+#: classes/opml.php:40
+msgid "Importing OPML..."
+msgstr "OPML 불러오는중..."
 
-#: classes/feeds.php:113
-msgid "Selection:"
-msgstr "선택:"
+#: classes/opml.php:45
+msgid "Return to preferences"
+msgstr "설정으로 돌아가기"
 
-#: classes/feeds.php:116
-msgid "Set score"
-msgstr "점수 매기기"
+#: classes/opml.php:301
+#, php-format
+msgid "Adding feed: %s"
+msgstr "%s 피드를 추가하는중..."
 
-#: classes/feeds.php:119
-msgid "Archive"
-msgstr "보관 처리"
+#: classes/opml.php:312
+#, php-format
+msgid "Duplicate feed: %s"
+msgstr "중복 피드: %s"
 
-#: classes/feeds.php:121
-msgid "Move back"
+#: classes/opml.php:326
+#, php-format
+msgid "Adding label %s"
+msgstr "%s에 라벨 추가중..."
+
+#: classes/opml.php:329
+#, php-format
+msgid "Duplicate label: %s"
+msgstr ""
+
+#: classes/opml.php:341
+#, php-format
+msgid "Setting preference key %s to %s"
+msgstr ""
+
+#: classes/opml.php:377
+msgid "Adding filter..."
+msgstr "필터를 추가하는중..."
+
+#: classes/opml.php:512
+#, php-format
+msgid "Processing category: %s"
+msgstr "카테고리 처리중: %s"
+
+#: classes/opml.php:558
+#, php-format
+msgid "Upload failed with error code %d"
+msgstr ""
+
+#: classes/opml.php:570
+#: plugins/import_export/init.php:471
+msgid "Unable to move uploaded file."
+msgstr "업로드된 파일을 이동할 수 없습니다."
+
+#: classes/opml.php:574
+#: plugins/import_export/init.php:475
+msgid "Error: please upload OPML file."
+msgstr "오류: OPML 파일을 업로드 하세요."
+
+#: classes/opml.php:585
+msgid "Error: unable to find moved OPML file."
+msgstr "오류: 이동된 OPML 파일을 찾을 수 없습니다."
+
+#: classes/opml.php:594
+msgid "Error while parsing document."
+msgstr "문서 분석중에 오류가 발생했습니다."
+
+#: classes/article.php:26
+msgid "Article not found."
+msgstr "글이 없습니다."
+
+#: classes/article.php:211
+msgid "Tags for this article (separated by commas):"
+msgstr "이 글의 태그 (쉼표로 구분)"
+
+#: classes/article.php:337
+#: classes/article.php:719
+#: classes/article.php:874
+msgid "no tags"
+msgstr "태그 없음"
+
+#: classes/article.php:447
+msgid "unknown type"
+msgstr "알수 없는 종류"
+
+#: classes/article.php:524
+msgid "Attachments"
+msgstr "첨부"
+
+#: classes/article.php:688
+msgid " - "
+msgstr " - "
+
+#: classes/article.php:912
+msgid "(edit note)"
+msgstr "(노트 편집)"
+
+#: classes/handler/public.php:407
+#: plugins/bookmarklets/init.php:40
+msgid "Share with Tiny Tiny RSS"
+msgstr "Tiny Tiny RSS에 공유하기"
+
+#: classes/handler/public.php:415
+msgid "Title:"
+msgstr "제목:"
+
+#: classes/handler/public.php:419
+msgid "Content:"
+msgstr "내용:"
+
+#: classes/handler/public.php:421
+msgid "Labels:"
+msgstr "라벨:"
+
+#: classes/handler/public.php:440
+msgid "Shared article will appear in the Published feed."
+msgstr "공유된 글은 공개된 피드에 표시됩니다."
+
+#: classes/handler/public.php:442
+msgid "Share"
+msgstr "공유"
+
+#: classes/handler/public.php:464
+msgid "Not logged in"
+msgstr "로그인되지 않음"
+
+#: classes/handler/public.php:527
+msgid "Incorrect username or password"
+msgstr "잘못된 사용자명 / 암호입니다."
+
+#: classes/handler/public.php:581
+#, php-format
+msgid "Already subscribed to <b>%s</b>."
+msgstr "<b>%s</b>는 이미 구독중입니다."
+
+#: classes/handler/public.php:584
+#, php-format
+msgid "Subscribed to <b>%s</b>."
+msgstr "<b>%s</b>를 구독했습니다."
+
+#: classes/handler/public.php:587
+#, php-format
+msgid "Could not subscribe to <b>%s</b>."
+msgstr "<b>%s</b>를 구독하는데 실패했습니다."
+
+#: classes/handler/public.php:590
+#, php-format
+msgid "No feeds found in <b>%s</b>."
+msgstr "<b>%s</b>에서 피드를 찾지 못했습니다."
+
+#: classes/handler/public.php:593
+msgid "Multiple feed URLs found."
+msgstr "여러개의 피드를 찾았습니다."
+
+#: classes/handler/public.php:597
+#, 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:615
+msgid "Subscribe to selected feed"
+msgstr "선택된 피드 구독"
+
+#: classes/handler/public.php:642
+msgid "Edit subscription options"
+msgstr "구독 옵션 편집"
+
+#: classes/handler/public.php:680
+msgid "Password recovery"
+msgstr "암호 복구"
+
+#: classes/handler/public.php:725
+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:757
+msgid "Some of the required form parameters are missing or incorrect."
+msgstr "일부 필수 파라미터가 누락되었거나 잘못되었습니다."
+
+#: classes/handler/public.php:761
+#: classes/handler/public.php:830
+msgid "Go back"
 msgstr "돌아가기"
 
-#: classes/feeds.php:127
-#: classes/feeds.php:132
-#: plugins/mail/init.php:76
-#: plugins/mailto/init.php:25
-msgid "Forward by email"
-msgstr "이메일로 전달"
+#: classes/handler/public.php:799
+#, fuzzy
+msgid "[tt-rss] Password reset request"
+msgstr "[tt-rss] 암호 변경 안내"
 
-#: classes/feeds.php:136
-msgid "Feed:"
-msgstr "피드"
+#: classes/handler/public.php:826
+msgid "Sorry, login and email combination not found."
+msgstr "로그인/이메일 정보가 없습니다."
 
-#: classes/feeds.php:193
-#: classes/feeds.php:819
-msgid "Feed not found."
-msgstr "피드가 없습니다."
+#: classes/handler/public.php:848
+msgid "Your access level is insufficient to run this script."
+msgstr "현재 계정 권한으로는 이 스크립트를 실행할 수 없습니다."
 
-#: classes/feeds.php:255
-msgid "Never"
-msgstr "영원히"
+#: classes/handler/public.php:874
+msgid "Database Updater"
+msgstr "데이터베이스 업데이터"
 
-#: classes/feeds.php:342
-#, php-format
-msgid "Imported at %s"
-msgstr "%s에서 불러옴"
+#: classes/handler/public.php:939
+msgid "Perform updates"
+msgstr "업데이트 실행"
 
-#: classes/feeds.php:394
-#: classes/feeds.php:487
-msgid "mark feed as read"
-msgstr "피드 읽음 표시"
-
-#: classes/feeds.php:542
-msgid "Collapse article"
-msgstr "글 접기"
-
-#: classes/feeds.php:703
-msgid "No unread articles found to display."
-msgstr "읽지 않은 글이 없습니다."
-
-#: classes/feeds.php:706
-msgid "No updated articles found to display."
-msgstr "업데이트된 글이 없습니다."
-
-#: classes/feeds.php:709
-msgid "No starred articles found to display."
-msgstr "중요 표시된 글이 없습니다."
-
-#: classes/feeds.php:713
-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:715
-msgid "No articles found to display."
-msgstr "표시할 글이 없습니다."
-
-#: classes/feeds.php:731
-#: classes/feeds.php:922
-#, php-format
-msgid "Feeds last updated at %s"
-msgstr "%s에 마지막으로 업데이트 되었습니다."
-
-#: classes/feeds.php:743
-#: classes/feeds.php:934
-msgid "Some feeds have update errors (click for details)"
-msgstr "일부 피드에 업데이트 오류가 있습니다 (상세 정보는 클릭)"
-
-#: classes/feeds.php:911
-msgid "No feed selected."
-msgstr "선택된 피드가 없습니다."
-
-#: classes/feeds.php:975
-#: classes/feeds.php:983
-msgid "Feed or site URL"
-msgstr "피드나 사이트 URL"
-
-#: classes/feeds.php:997
-msgid "Available feeds"
-msgstr "사용 가능한 피드"
-
-#: classes/feeds.php:1034
-msgid "More feeds"
-msgstr "기타 피드"
-
-#: classes/feeds.php:1063
-msgid "Popular feeds"
-msgstr "인기 피드"
-
-#: classes/feeds.php:1064
-msgid "Feed archive"
-msgstr "피드 보관"
-
-#: classes/feeds.php:1067
-msgid "limit:"
-msgstr "제한:"
-
-#: classes/feeds.php:1101
-msgid "Look for"
+#: plugins/af_zz_imgproxy/init.php:208
+msgid "Image proxy settings (af_zz_imgproxy)"
 msgstr ""
 
-#: classes/feeds.php:1109
-#, php-format
-msgid "in %s"
-msgstr ""
+#: plugins/af_zz_imgproxy/init.php:232
+#, fuzzy
+msgid "Enable proxy for all remote images."
+msgstr "フィード一覧のアイコンを有効にする"
 
-#: classes/feeds.php:1114
-msgid "Used for word stemming"
-msgstr ""
+#: plugins/af_zz_imgproxy/init.php:236
+#, fuzzy
+msgid "Don't cache files locally."
+msgstr "이미지를 로컬에 캐쉬"
 
-#: classes/feeds.php:1123
-msgid "Search syntax"
-msgstr "문법 "
-
-#: classes/feeds.php:1577
-msgid "Starred articles"
-msgstr "중요 표시된 글"
-
-#: classes/feeds.php:1579
-msgid "Published articles"
-msgstr "공개 글"
-
-#: classes/feeds.php:1581
-msgid "Fresh articles"
-msgstr "새 글"
-
-#: classes/feeds.php:1585
-msgid "Archived articles"
-msgstr "보관 처리된 글"
-
-#: classes/feeds.php:1587
-msgid "Recently read"
-msgstr "최근에 읽은 글"
-
-#: classes/feeds.php:1708
-msgid "Special"
-msgstr "자동 분류"
-
-#: classes/feeds.php:1965
-#, php-format
-msgid "Search results: %s"
-msgstr "검색 결과: %s"
-
-#: 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."
+#: plugins/af_zz_imgproxy/init.php:252
+#: plugins/af_redditimgur/init.php:79
+#, fuzzy
+msgid "Configuration saved"
 msgstr "설정이 저장되었습니다."
 
-#: plugins/note/init.php:28
-#: plugins/note/note.js:11
-msgid "Edit article note"
-msgstr "글 노트 편집"
-
 #: plugins/vf_shared/init.php:17
 #: plugins/vf_shared/init.php:73
 #, fuzzy
 msgid "Shared articles"
 msgstr "중요 표시된 글"
 
-#: plugins/auth_internal/init.php:67
-msgid "Please enter your one time password:"
-msgstr "OTP를 입력하세요:"
-
-#: plugins/auth_internal/init.php:208
-msgid "Password has been changed."
-msgstr "암호가 변경되었습니다."
-
-#: plugins/auth_internal/init.php:210
-msgid "Old password is incorrect."
-msgstr "현재 암호가 틀립니다."
-
-#: plugins/af_readability/init.php:25
-msgid "Data saved."
+#: plugins/bookmarklets/init.php:20
+msgid "Bookmarklets"
 msgstr ""
 
-#: plugins/af_readability/init.php:41
-#, fuzzy
-msgid "Inline content"
-msgstr "記事の内容をスクロールする"
-
-#: plugins/af_readability/init.php:47
-msgid "Readability settings (af_readability)"
+#: 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_readability/init.php:78
-msgid "Use Readability for pages shared via bookmarklet."
+#: 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_readability/init.php:90
-#: plugins/af_psql_trgm/init.php:198
-msgid "Currently enabled for (click to edit):"
-msgstr ""
-
-#: plugins/af_readability/init.php:107
-#, fuzzy
-msgid "Readability"
-msgstr "가능한지 확인"
-
-#: plugins/af_readability/init.php:118
-#, fuzzy
-msgid "Inline article content"
-msgstr "記事の内容をスクロールする"
-
 #: plugins/af_redditimgur/init.php:30
 msgid "Reddit content settings (af_redditimgur)"
 msgstr ""
@@ -2505,11 +2473,21 @@ msgstr ""
 msgid "Enable additional duplicate checking"
 msgstr ""
 
-#: plugins/af_redditimgur/init.php:79
-#: plugins/af_zz_imgproxy/init.php:252
-#, fuzzy
-msgid "Configuration saved"
-msgstr "설정이 저장되었습니다."
+#: plugins/af_comics/init.php:49
+msgid "Feeds supported by af_comics"
+msgstr ""
+
+#: plugins/af_comics/init.php:51
+msgid "The following comics are currently supported:"
+msgstr ""
+
+#: plugins/af_comics/init.php:69
+msgid "To subscribe to GoComics use the comic's regular web page as the feed URL (e.g. for the <em>Garfield</em> comic use <code>http://www.gocomics.com/garfield</code>)."
+msgstr ""
+
+#: plugins/af_comics/init.php:71
+msgid "Drop any updated filters into <code>filters.local</code> in plugin directory."
+msgstr ""
 
 #: plugins/af_psql_trgm/init.php:29
 #, php-format
@@ -2549,26 +2527,87 @@ msgstr ""
 msgid "Enable for all feeds:"
 msgstr "フィード一覧のアイコンを有効にする"
 
+#: plugins/af_psql_trgm/init.php:198
+#: plugins/af_readability/init.php:90
+msgid "Currently enabled for (click to edit):"
+msgstr ""
+
 #: plugins/af_psql_trgm/init.php:216
 msgid "Similarity (pg_trgm)"
 msgstr ""
 
-#: plugins/af_comics/init.php:49
-msgid "Feeds supported by af_comics"
+#: plugins/af_readability/init.php:25
+msgid "Data saved."
 msgstr ""
 
-#: plugins/af_comics/init.php:51
-msgid "The following comics are currently supported:"
+#: plugins/af_readability/init.php:41
+#, fuzzy
+msgid "Inline content"
+msgstr "記事の内容をスクロールする"
+
+#: plugins/af_readability/init.php:47
+msgid "Readability settings (af_readability)"
 msgstr ""
 
-#: plugins/af_comics/init.php:69
-msgid "To subscribe to GoComics use the comic's regular web page as the feed URL (e.g. for the <em>Garfield</em> comic use <code>http://www.gocomics.com/garfield</code>)."
+#: plugins/af_readability/init.php:78
+msgid "Use Readability for pages shared via bookmarklet."
 msgstr ""
 
-#: plugins/af_comics/init.php:71
-msgid "Drop any updated filters into <code>filters.local</code> in plugin directory."
+#: plugins/af_readability/init.php:107
+#, fuzzy
+msgid "Readability"
+msgstr "가능한지 확인"
+
+#: plugins/af_readability/init.php:118
+#, fuzzy
+msgid "Inline article content"
+msgstr "記事の内容をスクロールする"
+
+#: plugins/mailto/init.php:50
+#: plugins/mailto/init.php:58
+#: plugins/mail/init.php:118
+#: plugins/mail/init.php:124
+msgid "[Forwarded]"
 msgstr ""
 
+#: plugins/mailto/init.php:50
+#: plugins/mail/init.php:118
+msgid "Multiple articles"
+msgstr "여러 글"
+
+#: plugins/mailto/init.php:74
+msgid "Clicking the following link to invoke your mail client:"
+msgstr ""
+
+#: plugins/mailto/init.php:78
+msgid "Forward selected article(s) by email."
+msgstr "선택된 글이 이메일로 전달되었습니다."
+
+#: plugins/mailto/init.php:81
+msgid "You should be able to edit the message before sending in your mail client."
+msgstr ""
+
+#: plugins/mailto/init.php:86
+msgid "Close this dialog"
+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/import_export/init.php:53
 msgid "Import and export"
 msgstr ""
@@ -2632,102 +2671,6 @@ msgstr ""
 msgid "No file uploaded."
 msgstr "업로드된 파일 없음."
 
-#: plugins/mail/init.php:29
-msgid "Mail addresses saved."
-msgstr ""
-
-#: plugins/mail/init.php:35
-#, fuzzy
-msgid "Mail plugin"
-msgstr "사용자 플러그인"
-
-#: plugins/mail/init.php:37
-msgid "You can set predefined email addressed here (comma-separated list):"
-msgstr ""
-
-#: plugins/mail/init.php:118
-#: plugins/mail/init.php:124
-#: plugins/mailto/init.php:50
-#: plugins/mailto/init.php:58
-msgid "[Forwarded]"
-msgstr ""
-
-#: plugins/mail/init.php:118
-#: plugins/mailto/init.php:50
-msgid "Multiple articles"
-msgstr "여러 글"
-
-#: plugins/mail/init.php:146
-msgid "To:"
-msgstr "받는 사람:"
-
-#: plugins/mail/init.php:161
-msgid "Subject:"
-msgstr "제목:"
-
-#: plugins/mail/init.php:178
-msgid "Send e-mail"
-msgstr "이메일 전송"
-
-#: plugins/close_button/init.php:25
-msgid "Close article"
-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/toggle_sidebar/init.php:23
-msgid "Collapse feedlist"
-msgstr "피드목록 접기"
-
-#: plugins/af_zz_imgproxy/init.php:208
-msgid "Image proxy settings (af_zz_imgproxy)"
-msgstr ""
-
-#: plugins/af_zz_imgproxy/init.php:232
-#, fuzzy
-msgid "Enable proxy for all remote images."
-msgstr "フィード一覧のアイコンを有効にする"
-
-#: plugins/af_zz_imgproxy/init.php:236
-#, fuzzy
-msgid "Don't cache files locally."
-msgstr "이미지를 로컬에 캐쉬"
-
-#: plugins/mailto/init.php:74
-msgid "Clicking the following link to invoke your mail client:"
-msgstr ""
-
-#: plugins/mailto/init.php:78
-msgid "Forward selected article(s) by email."
-msgstr "선택된 글이 이메일로 전달되었습니다."
-
-#: plugins/mailto/init.php:81
-msgid "You should be able to edit the message before sending in your mail client."
-msgstr ""
-
-#: plugins/mailto/init.php:86
-msgid "Close this dialog"
-msgstr "이 창 닫기"
-
 #: plugins/share/init.php:41
 msgid "You can disable all articles shared by unique URLs here."
 msgstr "아래의 개별 URL로 공유된 모든 글들이 공유 중단됩니다."
@@ -2749,448 +2692,599 @@ msgstr ""
 msgid "Unshare article"
 msgstr "중요 표시 해제"
 
-#: js/FeedTree.js:75
+#: plugins/toggle_sidebar/init.php:23
+msgid "Collapse feedlist"
+msgstr "피드목록 접기"
+
+#: plugins/close_button/init.php:25
+msgid "Close article"
+msgstr "글 닫기"
+
+#: plugins/mail/init.php:29
+msgid "Mail addresses saved."
+msgstr ""
+
+#: plugins/mail/init.php:35
+#, fuzzy
+msgid "Mail plugin"
+msgstr "사용자 플러그인"
+
+#: plugins/mail/init.php:37
+msgid "You can set predefined email addressed here (comma-separated list):"
+msgstr ""
+
+#: plugins/mail/init.php:146
+msgid "To:"
+msgstr "받는 사람:"
+
+#: plugins/mail/init.php:161
+msgid "Subject:"
+msgstr "제목:"
+
+#: plugins/mail/init.php:178
+msgid "Send e-mail"
+msgstr "이메일 전송"
+
+#: plugins/note/init.php:28
+#: plugins/note/note.js:11
+msgid "Edit article note"
+msgstr "글 노트 편집"
+
+#: plugins/auth_internal/init.php:67
+msgid "Please enter your one time password:"
+msgstr "OTP를 입력하세요:"
+
+#: plugins/auth_internal/init.php:208
+msgid "Password has been changed."
+msgstr "암호가 변경되었습니다."
+
+#: plugins/auth_internal/init.php:210
+msgid "Old password is incorrect."
+msgstr "현재 암호가 틀립니다."
+
+#: js/FeedTree.js:76
 #, fuzzy
 msgid "(Un)collapse"
 msgstr "사이드바 숨김/표시"
 
-#: js/PrefFeedTree.js:35
+#: js/PrefFeedTree.js:36
 msgid "Edit category"
 msgstr "카테고리 편집"
 
-#: js/PrefFeedTree.js:42
+#: js/PrefFeedTree.js:43
 msgid "Remove category"
 msgstr "카테고리 제거"
 
-#: js/PrefFilterTree.js:46
+#: js/PrefFilterTree.js:47
 msgid "Inverse"
 msgstr "반전"
 
-#: js/feedlist.js:511
+#: js/feedlist.js:461
 #, fuzzy
 msgid "Mark %w in %s older than 1 day as read?"
 msgstr "하루 이상 지난 %s의 모든 글을 읽음 표시 할까요?"
 
-#: js/feedlist.js:514
+#: js/feedlist.js:464
 #, fuzzy
 msgid "Mark %w in %s older than 1 week as read?"
 msgstr "1주일 이상 지난 %s의 모든 글을 읽음 표시 할까요?"
 
-#: js/feedlist.js:517
+#: js/feedlist.js:467
 #, fuzzy
 msgid "Mark %w in %s older than 2 weeks as read?"
 msgstr "2주일 이상 지난 %s의 모든 글을 읽음 표시 할까요?"
 
-#: js/feedlist.js:520
+#: js/feedlist.js:470
 #, fuzzy
 msgid "Mark %w in %s as read?"
 msgstr "%s의 모든 글을 읽음 표시 할까요?"
 
-#: js/feedlist.js:523
+#: js/feedlist.js:473
 #, fuzzy
 msgid "search results"
 msgstr "검색 결과: %s"
 
-#: js/feedlist.js:523
+#: js/feedlist.js:473
 #, fuzzy
 msgid "all articles"
 msgstr "전체 글"
 
-#: js/functions.js:74
+#: js/functions.js:100
 msgid "Close"
 msgstr ""
 
-#: js/functions.js:141
+#: js/functions.js:167
 msgid "Click to close"
 msgstr "클릭하여 닫기"
 
-#: js/functions.js:448
+#: js/functions.js:456
 msgid "Error explained"
 msgstr ""
 
-#: js/functions.js:592
+#: js/functions.js:490
+msgid "Upload complete."
+msgstr "업로드 완료."
+
+#: js/functions.js:508
+msgid "Remove stored feed icon?"
+msgstr "저장된 피드 아이콘을 제거할까요?"
+
+#: js/functions.js:510
+msgid "Removing feed icon..."
+msgstr "피드 아이콘 제거중..."
+
+#: js/functions.js:515
+msgid "Feed icon removed."
+msgstr "피드 아이콘이 제거되었습니다."
+
+#: js/functions.js:532
+msgid "Please select an image file to upload."
+msgstr "업로드할 이미지 파일을 선택하세요."
+
+#: js/functions.js:533
+msgid "Upload new icon for this feed?"
+msgstr ""
+
+#: js/functions.js:534
+msgid "Uploading, please wait..."
+msgstr "업로드중입니다. 잠깐 웹서핑하고 계세요."
+
+#: js/functions.js:542
+msgid "Please enter label caption:"
+msgstr "라벨 이름을 입력하세요:"
+
+#: js/functions.js:575
 msgid "Subscribe to Feed"
 msgstr "피드 구독"
 
-#: js/functions.js:621
+#: js/functions.js:602
 msgid "Failed to parse output. This can indicate server timeout and/or network issues. Backend output was logged to browser console."
 msgstr ""
 
-#: js/functions.js:636
+#: js/functions.js:617
 #, perl-format
 msgid "Subscribed to %s"
 msgstr "%s를 구독함"
 
-#: js/functions.js:641
+#: js/functions.js:622
 msgid "Specified URL seems to be invalid."
 msgstr ""
 
-#: js/functions.js:644
+#: js/functions.js:625
 msgid "Specified URL doesn't seem to contain any feeds."
 msgstr ""
 
-#: js/functions.js:656
+#: js/functions.js:637
 msgid "Expand to select feed"
 msgstr "선택된 피드로 확장"
 
-#: js/functions.js:668
+#: js/functions.js:649
 #, perl-format
 msgid "Couldn't download the specified URL: %s"
 msgstr "URL %s를 다운로드 할 수 없습니다."
 
-#: js/functions.js:672
+#: js/functions.js:653
 #, perl-format
 msgid "XML validation failed: %s"
 msgstr ""
 
-#: js/functions.js:676
+#: js/functions.js:657
 msgid "You are already subscribed to this feed."
 msgstr "이미 구독중인 피드입니다."
 
-#: js/functions.js:1136
+#: js/functions.js:1098
 msgid "Generate new syndication address for this feed?"
 msgstr ""
 
-#: js/functions.js:1140
-#: js/prefs.js:1095
+#: js/functions.js:1100
+#: js/prefs.js:870
 msgid "Trying to change address..."
 msgstr "주소 변경중..."
 
-#: js/functions.js:1245
-#: js/tt-rss.js:446
-#: js/tt-rss.js:673
+#: js/functions.js:1199
+#: js/tt-rss.js:399
+#: js/tt-rss.js:612
 msgid "You can't edit this kind of feed."
 msgstr "이 형식의 피드는 편집할 수 없습니다."
 
-#: js/functions.js:1260
+#: js/functions.js:1213
 msgid "Edit Feed"
 msgstr "피드 편집"
 
-#: js/functions.js:1266
-#: js/prefs.js:100
-#: js/prefs.js:209
-#: js/prefs.js:647
+#: js/functions.js:1217
+#: js/prefs.js:176
+#: js/prefs.js:523
+#: js/prefs.js:1139
+#: js/prefs.js:78
 msgid "Saving data..."
 msgstr "데이터 저장중..."
 
-#: js/functions.js:1293
+#: js/functions.js:1243
 msgid "More Feeds"
 msgstr "기타 피드"
 
-#: js/functions.js:1355
-#: js/functions.js:1464
-#: js/prefs.js:398
-#: js/prefs.js:540
-#: js/prefs.js:558
-#: js/prefs.js:1077
+#: js/functions.js:1297
+#: js/functions.js:1383
+#: js/prefs.js:332
+#: js/prefs.js:455
+#: js/prefs.js:473
+#: js/prefs.js:855
 msgid "No feeds are selected."
 msgstr "선택된 피드가 없습니다."
 
-#: js/functions.js:1398
+#: js/functions.js:1329
 msgid "Remove selected feeds from the archive? Feeds with stored articles will not be removed."
 msgstr ""
 
-#: js/functions.js:1435
+#: js/functions.js:1360
 msgid "Feeds with update errors"
 msgstr "업데이트 오류가 있는 피드"
 
-#: js/functions.js:1446
-#: js/prefs.js:1058
+#: js/functions.js:1369
+#: js/prefs.js:841
 msgid "Remove selected feeds?"
 msgstr "선택된 피드를 제거할까요?"
 
-#: js/functions.js:1449
-#: js/prefs.js:1061
+#: js/functions.js:1370
+#: js/prefs.js:842
 msgid "Removing selected feeds..."
 msgstr "선택된 피드 제거중..."
 
-#: js/prefs.js:60
-msgid "Please enter login:"
-msgstr "로그인 정보 입력:"
-
-#: js/prefs.js:67
-msgid "Can't create user: no login specified."
-msgstr "사용자 생성 실패: 로그인 정보를 입력하세요."
-
-#: js/prefs.js:71
-msgid "Adding user..."
-msgstr "사용자 추가중..."
-
-#: js/prefs.js:96
-msgid "User Editor"
-msgstr "사용자 편집기"
-
-#: js/prefs.js:131
-msgid "Edit Filter"
-msgstr "필터 편집"
-
-#: js/prefs.js:170
+#: js/prefs.js:143
 msgid "Remove filter?"
 msgstr "필터를 제거할까요?"
 
-#: js/prefs.js:175
+#: js/prefs.js:148
 msgid "Removing filter..."
 msgstr "필터 삭제중..."
 
-#: js/prefs.js:292
+#: js/prefs.js:251
 msgid "Remove selected labels?"
 msgstr "선택한 라벨을 삭제할까요?"
 
-#: js/prefs.js:295
+#: js/prefs.js:252
 msgid "Removing selected labels..."
 msgstr "라벨 삭제중..."
 
-#: js/prefs.js:308
-#: js/prefs.js:1144
+#: js/prefs.js:262
+#: js/prefs.js:909
 msgid "No labels are selected."
 msgstr "선택된 라벨이 없습니다."
 
-#: js/prefs.js:320
+#: js/prefs.js:274
 msgid "Remove selected users? Neither default admin nor your account will be removed."
 msgstr ""
 
-#: js/prefs.js:323
+#: js/prefs.js:275
 msgid "Removing selected users..."
 msgstr "사용자 삭제중..."
 
-#: js/prefs.js:338
-#: js/prefs.js:408
-#: js/prefs.js:427
-#: js/prefs.js:461
+#: js/prefs.js:286
+#: js/prefs.js:342
+#: js/prefs.js:361
+#: js/prefs.js:387
 msgid "No users are selected."
 msgstr "선택된 사용자가 없습니다."
 
-#: js/prefs.js:350
+#: js/prefs.js:297
 msgid "Remove selected filters?"
 msgstr "선택한 필터를 삭제할까요?"
 
-#: js/prefs.js:353
+#: js/prefs.js:298
 msgid "Removing selected filters..."
 msgstr "필터 제거중..."
 
-#: js/prefs.js:366
-#: js/prefs.js:495
-#: js/prefs.js:514
+#: js/prefs.js:308
+#: js/prefs.js:419
+#: js/prefs.js:438
 msgid "No filters are selected."
 msgstr "선택된 필터가 없습니다."
 
-#: js/prefs.js:378
+#: js/prefs.js:319
 msgid "Unsubscribe from selected feeds?"
 msgstr "선택한 피드를 구독 해제할까요?"
 
-#: js/prefs.js:382
+#: js/prefs.js:321
 msgid "Unsubscribing from selected feeds..."
 msgstr "구독 해제 중..."
 
-#: js/prefs.js:413
-#: js/prefs.js:432
-#: js/prefs.js:466
+#: js/prefs.js:347
+#: js/prefs.js:366
+#: js/prefs.js:392
 msgid "Please select only one user."
 msgstr "사용자 한 명만 선택하세요."
 
-#: js/prefs.js:436
+#: js/prefs.js:370
 msgid "Reset password of selected user?"
 msgstr "선택한 사용자의 암호를 초기화 할까요?"
 
-#: js/prefs.js:439
+#: js/prefs.js:371
 msgid "Resetting password for selected user..."
 msgstr "사용자 암호 초기화중..."
 
-#: js/prefs.js:500
+#: js/prefs.js:424
 msgid "Please select only one filter."
 msgstr "필터를 하나만 선택하세요."
 
-#: js/prefs.js:518
+#: js/prefs.js:442
 msgid "Combine selected filters?"
 msgstr "선택된 필터를 섞을까요?"
 
-#: js/prefs.js:521
+#: js/prefs.js:443
 msgid "Joining filters..."
 msgstr "필터 합치는중..."
 
-#: js/prefs.js:580
+#: js/prefs.js:487
 msgid "Edit Multiple Feeds"
 msgstr "여러 피드 편집"
 
-#: js/prefs.js:604
+#: js/prefs.js:511
 msgid "Save changes to selected feeds?"
 msgstr "선택한 피드에 수정 사항을 반영할까요?"
 
-#: js/prefs.js:681
+#: js/prefs.js:552
 msgid "OPML Import"
 msgstr "OPML 불러오기"
 
-#: js/prefs.js:700
+#: js/prefs.js:571
 msgid "Please choose an OPML file first."
 msgstr "먼저 OPML 파일을 선택하세요."
 
-#: js/prefs.js:703
+#: js/prefs.js:574
 #: plugins/import_export/import_export.js:115
 msgid "Importing, please wait..."
 msgstr "불러오는 중입니다. 화장실이라도 다녀오시죠?"
 
-#: js/prefs.js:869
+#: js/prefs.js:737
 msgid "Reset to defaults?"
 msgstr "초기화 할까요?"
 
-#: js/prefs.js:1468
-msgid "Subscribing to feeds..."
-msgstr "피드 구독하는중..."
-
-#: js/prefs.js:1487
-msgid "Clear stored data for this plugin?"
+#: js/prefs.js:777
+#, perl-format
+msgid "Remove category %s? Any nested feeds would be placed into Uncategorized."
 msgstr ""
 
-#: js/prefs.js:1501
-msgid "Clear all messages in the error log?"
+#: js/prefs.js:778
+msgid "Removing category..."
+msgstr "카테고리 제거중..."
+
+#: js/prefs.js:794
+msgid "Remove selected categories?"
+msgstr "선택한 카테고리를 삭제할까요?"
+
+#: js/prefs.js:795
+msgid "Removing selected categories..."
+msgstr "카테고리 삭제중..."
+
+#: js/prefs.js:805
+msgid "No categories are selected."
+msgstr "선택된 카테고리가 없습니다."
+
+#: js/prefs.js:812
+msgid "Category title:"
+msgstr "카테고리 제목:"
+
+#: js/prefs.js:815
+msgid "Creating category..."
+msgstr "카테고리 생성중..."
+
+#: js/prefs.js:832
+#, fuzzy
+msgid "Feeds without recent updates"
+msgstr "업데이트 오류가 있는 피드"
+
+#: js/prefs.js:869
+msgid "Replace current OPML publishing address with a new one?"
+msgstr "현재 OPML 공개 주소를 새 주소로 교체할까요?"
+
+#: js/prefs.js:898
+msgid "Reset selected labels to default colors?"
+msgstr "선택된 라벨의 색을 기본값으로 초기화 할까요?"
+
+#: js/prefs.js:926
+#, fuzzy
+msgid "Settings Profiles"
+msgstr "프로필 생성중..."
+
+#: js/prefs.js:935
+msgid "Remove selected profiles? Active and default profiles will not be removed."
 msgstr ""
 
-#: js/tt-rss.js:118
+#: js/prefs.js:936
+msgid "Removing selected profiles..."
+msgstr "선택된 프로필 제거중..."
+
+#: js/prefs.js:948
+msgid "No profiles are selected."
+msgstr "선택된 프로필이 없습니다."
+
+#: js/prefs.js:955
+#: js/prefs.js:997
+msgid "Activate selected profile?"
+msgstr "선택된 프로필을 활성화 할까요?"
+
+#: js/prefs.js:964
+#: js/prefs.js:1008
+msgid "Please choose a profile to activate."
+msgstr "활성화할 프로필을 선택하세요."
+
+#: js/prefs.js:969
+msgid "Creating profile..."
+msgstr "프로필 생성중..."
+
+#: js/prefs.js:1016
+msgid "This will invalidate all previously generated feed URLs. Continue?"
+msgstr ""
+
+#: js/prefs.js:1017
+#: plugins/share/share_prefs.js:3
+msgid "Clearing URLs..."
+msgstr "URL 지우는중..."
+
+#: js/prefs.js:1020
+msgid "Generated URLs cleared."
+msgstr "생성된 URL이 지워졌습니다."
+
+#: js/prefs.js:1053
+#, fuzzy
+msgid "Rename category to:"
+msgstr "카테고리 제거"
+
+#: js/prefs.js:1074
+msgid "Label Editor"
+msgstr "라벨 편집기"
+
+#: js/tt-rss.js:111
 msgid "Mark all articles as read?"
 msgstr "모든 글을 읽음 표시 할까요?"
 
-#: js/tt-rss.js:124
+#: js/tt-rss.js:115
 msgid "Marking all feeds as read..."
 msgstr "모든 피드를 읽음 표시중..."
 
-#: js/tt-rss.js:398
+#: js/tt-rss.js:351
 msgid "Please enable mail plugin first."
 msgstr "먼저 메일 플러그인을 켜세요."
 
-#: js/tt-rss.js:527
+#: js/tt-rss.js:477
 msgid "Please enable embed_original plugin first."
 msgstr "먼저 embed_original 플러그인을 켜세요."
 
-#: js/tt-rss.js:540
-#: js/tt-rss.js:723
+#: js/tt-rss.js:490
+#: js/tt-rss.js:653
 msgid "Widescreen is not available in combined mode."
 msgstr ""
 
-#: js/tt-rss.js:821
-msgid "You can't rescore this kind of feed."
-msgstr "이 형식의 피드는 점수를 새로 매길 수 없습니다."
-
-#: js/tt-rss.js:826
-#: js/tt-rss.js:686
-msgid "Please select some feed first."
-msgstr "피드를 먼저 선택하세요."
-
-#: js/tt-rss.js:831
-#, perl-format
-msgid "Rescore articles in %s?"
-msgstr "%s의 글의 점수를 다시 매길까요?"
-
-#: js/tt-rss.js:834
-msgid "Rescoring articles..."
-msgstr "글 점수 다시 매기는중..."
-
-#: js/viewfeed.js:917
-#: js/viewfeed.js:955
-#: js/viewfeed.js:1003
-#: js/viewfeed.js:1924
-#: plugins/mail/mail.js:7
+#: js/viewfeed.js:444
+#: js/viewfeed.js:461
+#: js/viewfeed.js:484
+#: js/viewfeed.js:521
+#: js/viewfeed.js:542
+#: js/viewfeed.js:651
+#: js/viewfeed.js:685
+#: js/viewfeed.js:727
+#: js/viewfeed.js:1564
 #: plugins/mailto/init.js:7
-#: js/viewfeed.js:675
-#: js/viewfeed.js:697
-#: js/viewfeed.js:718
-#: js/viewfeed.js:777
-#: js/viewfeed.js:805
+#: plugins/mail/mail.js:7
 msgid "No articles are selected."
 msgstr "선택된 글이 없습니다."
 
-#: js/viewfeed.js:925
+#: js/viewfeed.js:659
 #, 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:927
+#: js/viewfeed.js:661
 #, perl-format
 msgid "Delete %d selected article?"
 msgid_plural "Delete %d selected articles?"
 msgstr[0] "선택된 %d개 글을 삭제할까요?"
 
-#: js/viewfeed.js:964
+#: js/viewfeed.js:694
 #, 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:967
+#: js/viewfeed.js:697
 #, perl-format
 msgid "Move %d archived article back?"
 msgid_plural "Move %d archived articles back?"
 msgstr[0] "보관 처리된 %d개의 글을 다시 옮길까요?"
 
-#: js/viewfeed.js:969
+#: js/viewfeed.js:698
 msgid "Please note that unstarred articles might get purged on next feed update."
 msgstr ""
 
-#: js/viewfeed.js:1009
+#: js/viewfeed.js:733
 #, 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:1029
+#: js/viewfeed.js:753
 msgid "Edit article Tags"
 msgstr "글 태그 편집"
 
-#: js/viewfeed.js:1035
+#: js/viewfeed.js:757
 msgid "Saving article tags..."
 msgstr "글의 태그 저장 중..."
 
-#: js/viewfeed.js:1666
+#: js/viewfeed.js:1015
+msgid "No article is selected."
+msgstr "선택된 글이 없습니다."
+
+#: js/viewfeed.js:1050
+msgid "No articles found to mark"
+msgstr "표시할 글이 없습니다."
+
+#: js/viewfeed.js:1052
+#, perl-format
+msgid "Mark %d article as read?"
+msgid_plural "Mark %d articles as read?"
+msgstr[0] "%d 글을 읽음 표시 할까요?"
+
+#: js/viewfeed.js:1312
 msgid "Open original article"
 msgstr "원본 글 열기"
 
-#: js/viewfeed.js:1673
+#: js/viewfeed.js:1319
 msgid "Display article URL"
 msgstr "글 URL 표시"
 
-#: js/viewfeed.js:1780
+#: js/viewfeed.js:1426
 msgid "Assign label"
 msgstr "라벨 적용"
 
-#: js/viewfeed.js:1785
+#: js/viewfeed.js:1431
 msgid "Remove label"
 msgstr "라벨 제거"
 
-#: js/viewfeed.js:1817
+#: js/viewfeed.js:1463
 #, fuzzy
 msgid "Select articles in group"
 msgstr "커서위치의 글 선택"
 
-#: js/viewfeed.js:1827
+#: js/viewfeed.js:1473
 #, fuzzy
 msgid "Mark group as read"
 msgstr "읽음 표시"
 
-#: js/viewfeed.js:1839
+#: js/viewfeed.js:1485
 msgid "Mark feed as read"
 msgstr "피드 읽음 표시"
 
-#: js/viewfeed.js:1892
+#: js/viewfeed.js:1538
 msgid "Please enter new score for selected articles:"
 msgstr "선택된 글의 점수를 새로 매기세요:"
 
-#: js/viewfeed.js:1955
+#: js/viewfeed.js:1571
 msgid "Please enter new score for this article:"
 msgstr "이 글의 점수를 새로 매기세요:"
 
-#: js/viewfeed.js:1986
+#: js/viewfeed.js:1591
 msgid "Article URL:"
 msgstr "글 URL:"
 
-#: plugins/note/note.js:17
-msgid "Saving article note..."
-msgstr "글 노트 저장중..."
+#: plugins/embed_original/init.js:6
+msgid "Sorry, your browser does not support sandboxed iframes."
+msgstr ""
 
 #: plugins/af_psql_trgm/init.js:11
 #, fuzzy
 msgid "Related articles"
 msgstr "記事を消去する"
 
+#: plugins/mailto/init.js:21
+#: plugins/mail/mail.js:21
+msgid "Forward article by email"
+msgstr "이메일로 글 전달"
+
+#: plugins/shorten_expanded/init.js:43
+msgid "Click to expand article"
+msgstr "글을 펼쳐보려면 클릭하세요"
+
 #: plugins/import_export/import_export.js:13
 msgid "Export Data"
 msgstr "데이터 내보내기"
@@ -3210,264 +3304,174 @@ msgstr "데이터 불러오기"
 msgid "Please choose the file first."
 msgstr "먼저 파일을 선택하세요."
 
-#: plugins/mail/mail.js:21
-#: plugins/mailto/init.js:21
-msgid "Forward article by email"
-msgstr "이메일로 글 전달"
-
-#: plugins/mail/mail.js:36
-msgid "Error sending email:"
+#: plugins/share/share_prefs.js:2
+msgid "This will invalidate all previously shared article URLs. Continue?"
 msgstr ""
 
-#: plugins/mail/mail.js:38
-#, fuzzy
-msgid "Your message has been sent."
-msgstr "개인 정보가 저장되었습니다."
-
-#: plugins/embed_original/init.js:6
-msgid "Sorry, your browser does not support sandboxed iframes."
+#: plugins/share/share_prefs.js:8
+msgid "Shared URLs cleared."
 msgstr ""
 
-#: plugins/shorten_expanded/init.js:45
-msgid "Click to expand article"
-msgstr "글을 펼쳐보려면 클릭하세요"
-
 #: plugins/share/share.js:10
 msgid "Share article by URL"
 msgstr "URL로 글 공유"
 
-#: plugins/share/share.js:14
+#: plugins/share/share.js:13
 #, fuzzy
 msgid "Generate new share URL for this article?"
 msgstr "이 글의 점수를 새로 매기세요:"
 
-#: plugins/share/share.js:18
+#: plugins/share/share.js:15
 msgid "Trying to change URL..."
 msgstr "URL 변경중..."
 
-#: plugins/share/share.js:55
+#: plugins/share/share.js:48
 #, fuzzy
 msgid "Remove sharing for this article?"
 msgstr "이 글의 태그 편집"
 
-#: plugins/share/share.js:59
+#: plugins/share/share.js:50
 #, fuzzy
 msgid "Trying to unshare..."
 msgstr "주소 변경중..."
 
-#: plugins/share/share_prefs.js:3
-msgid "This will invalidate all previously shared article URLs. Continue?"
+#: plugins/mail/mail.js:30
+msgid "Error sending email:"
 msgstr ""
 
-#: plugins/share/share_prefs.js:6
-#: js/prefs.js:1277
-msgid "Clearing URLs..."
-msgstr "URL 지우는중..."
+#: plugins/mail/mail.js:32
+#, fuzzy
+msgid "Your message has been sent."
+msgstr "개인 정보가 저장되었습니다."
 
-#: plugins/share/share_prefs.js:13
-msgid "Shared URLs cleared."
-msgstr ""
+#: plugins/note/note.js:15
+msgid "Saving article note..."
+msgstr "글 노트 저장중..."
 
-#: js/feedlist.js:204
+#: js/feedlist.js:168
 #, fuzzy
 msgid "Your password is at default value"
 msgstr "사용중인 암호가 기본 값입니다. 암호를 변경하세요."
 
-#: js/feedlist.js:453
+#: js/feedlist.js:413
 msgid "Mark all articles in %s as read?"
 msgstr "%s의 모든 글을 읽음 표시 할까요?"
 
-#: js/functions.js:494
-msgid "Upload complete."
-msgstr "업로드 완료."
-
-#: js/functions.js:511
-msgid "Remove stored feed icon?"
-msgstr "저장된 피드 아이콘을 제거할까요?"
-
-#: js/functions.js:516
-msgid "Removing feed icon..."
-msgstr "피드 아이콘 제거중..."
-
-#: js/functions.js:521
-msgid "Feed icon removed."
-msgstr "피드 아이콘이 제거되었습니다."
-
-#: js/functions.js:537
-msgid "Please select an image file to upload."
-msgstr "업로드할 이미지 파일을 선택하세요."
-
-#: js/functions.js:539
-msgid "Upload new icon for this feed?"
-msgstr ""
-
-#: js/functions.js:540
-msgid "Uploading, please wait..."
-msgstr "업로드중입니다. 잠깐 웹서핑하고 계세요."
-
-#: js/functions.js:550
-msgid "Please enter label caption:"
-msgstr "라벨 이름을 입력하세요:"
-
-#: js/functions.js:555
-msgid "Can't create label: missing caption."
-msgstr "라벨 생성 실패: 이름을 입력하세요."
-
-#: js/functions.js:797
+#: js/functions.js:764
 msgid "Edit rule"
 msgstr "규칙 편집"
 
-#: js/functions.js:819
+#: js/functions.js:786
 msgid "Edit action"
 msgstr "동작 편집"
 
-#: js/functions.js:860
+#: js/functions.js:825
 msgid "Looking for articles (%d processed, %f found)..."
 msgstr ""
 
-#: js/functions.js:890
+#: js/functions.js:855
 #, fuzzy
 msgid "Found %d articles matching this filter:"
 msgstr "이 필터에 해당하는 최근 글이 없습니다."
 
-#: js/functions.js:942
+#: js/functions.js:907
 msgid "Create Filter"
 msgstr "필터 생성"
 
-#: js/functions.js:1060
-#: js/tt-rss.js:692
+#: js/functions.js:1016
+#: js/tt-rss.js:631
 msgid "Unsubscribe from %s?"
 msgstr "%s를 구독 해제 할까요?"
 
-#: js/functions.js:1063
+#: js/functions.js:1019
 msgid "Removing feed..."
 msgstr "피드 제거중..."
 
-#: js/functions.js:1489
+#: js/functions.js:1410
 msgid "Help"
 msgstr "도움말"
 
-#: js/prefs.js:973
-msgid "Remove category %s? Any nested feeds would be placed into Uncategorized."
+#: js/prefs.js:44
+msgid "Please enter login:"
+msgstr "로그인 정보 입력:"
+
+#: js/prefs.js:51
+msgid "Can't create user: no login specified."
+msgstr "사용자 생성 실패: 로그인 정보를 입력하세요."
+
+#: js/prefs.js:55
+msgid "Adding user..."
+msgstr "사용자 추가중..."
+
+#: js/prefs.js:74
+msgid "User Editor"
+msgstr "사용자 편집기"
+
+#: js/prefs.js:104
+msgid "Edit Filter"
+msgstr "필터 편집"
+
+#: js/prefs.js:1175
+msgid "Subscribing to feeds..."
+msgstr "피드 구독하는중..."
+
+#: js/prefs.js:1191
+msgid "Clear stored data for this plugin?"
 msgstr ""
 
-#: js/prefs.js:979
-msgid "Removing category..."
-msgstr "카테고리 제거중..."
-
-#: js/prefs.js:997
-msgid "Remove selected categories?"
-msgstr "선택한 카테고리를 삭제할까요?"
-
-#: js/prefs.js:1000
-msgid "Removing selected categories..."
-msgstr "카테고리 삭제중..."
-
-#: js/prefs.js:1013
-msgid "No categories are selected."
-msgstr "선택된 카테고리가 없습니다."
-
-#: js/prefs.js:1020
-msgid "Category title:"
-msgstr "카테고리 제목:"
-
-#: js/prefs.js:1024
-msgid "Creating category..."
-msgstr "카테고리 생성중..."
-
-#: js/prefs.js:1047
-#, fuzzy
-msgid "Feeds without recent updates"
-msgstr "업데이트 오류가 있는 피드"
-
-#: js/prefs.js:1091
-msgid "Replace current OPML publishing address with a new one?"
-msgstr "현재 OPML 공개 주소를 새 주소로 교체할까요?"
-
-#: js/prefs.js:1129
-msgid "Reset selected labels to default colors?"
-msgstr "선택된 라벨의 색을 기본값으로 초기화 할까요?"
-
-#: js/prefs.js:1161
-#, fuzzy
-msgid "Settings Profiles"
-msgstr "프로필 생성중..."
-
-#: js/prefs.js:1170
-msgid "Remove selected profiles? Active and default profiles will not be removed."
+#: js/prefs.js:1203
+msgid "Clear all messages in the error log?"
 msgstr ""
 
-#: js/prefs.js:1173
-msgid "Removing selected profiles..."
-msgstr "선택된 프로필 제거중..."
-
-#: js/prefs.js:1189
-msgid "No profiles are selected."
-msgstr "선택된 프로필이 없습니다."
-
-#: js/prefs.js:1197
-#: js/prefs.js:1250
-msgid "Activate selected profile?"
-msgstr "선택된 프로필을 활성화 할까요?"
-
-#: js/prefs.js:1214
-#: js/prefs.js:1266
-msgid "Please choose a profile to activate."
-msgstr "활성화할 프로필을 선택하세요."
-
-#: js/prefs.js:1219
-msgid "Creating profile..."
-msgstr "프로필 생성중..."
-
-#: js/prefs.js:1274
-msgid "This will invalidate all previously generated feed URLs. Continue?"
-msgstr ""
-
-#: js/prefs.js:1284
-msgid "Generated URLs cleared."
-msgstr "생성된 URL이 지워졌습니다."
-
-#: js/prefs.js:1356
-msgid "Label Editor"
-msgstr "라벨 편집기"
-
-#: js/tt-rss.js:681
+#: js/tt-rss.js:620
 msgid "You can't unsubscribe from the category."
 msgstr "카테고리에서는 구독 해제 할 수 없습니다."
 
-#: js/viewfeed.js:127
-#: js/viewfeed.js:177
-#: js/viewfeed.js:194
+#: js/tt-rss.js:625
+msgid "Please select some feed first."
+msgstr "피드를 먼저 선택하세요."
+
+#: js/viewfeed.js:89
+#: js/viewfeed.js:135
+#: js/viewfeed.js:152
 #, fuzzy
 msgid "Click to open next unread feed."
 msgstr "클릭하여 피드 편집"
 
-#: js/viewfeed.js:131
+#: js/viewfeed.js:93
 msgid "Cancel search"
 msgstr "검색 취소"
 
-#: js/viewfeed.js:191
+#: js/viewfeed.js:149
 #, fuzzy
 msgid "New articles found, reload feed to continue."
 msgstr "표시할 글이 없습니다."
 
-#: js/viewfeed.js:620
+#: js/viewfeed.js:405
 msgid "%d article selected"
 msgid_plural "%d articles selected"
 msgstr[0] "%d개의 글이 선택되었습니다."
 
-#: js/viewfeed.js:1284
-msgid "No article is selected."
-msgstr "선택된 글이 없습니다."
+#~ msgid "Rescore feed"
+#~ msgstr "피드 점수 다시 매기기..."
 
-#: js/viewfeed.js:1319
-msgid "No articles found to mark"
-msgstr "표시할 글이 없습니다."
+#~ msgid "Create label..."
+#~ msgstr "라벨 만들기..."
 
-#: js/viewfeed.js:1321
-msgid "Mark %d article as read?"
-msgid_plural "Mark %d articles as read?"
-msgstr[0] "%d 글을 읽음 표시 할까요?"
+#~ msgid "Create filter..."
+#~ msgstr "필터 만들기..."
+
+#~ msgid "You can't rescore this kind of feed."
+#~ msgstr "이 형식의 피드는 점수를 새로 매길 수 없습니다."
+
+#~ msgid "Rescore articles in %s?"
+#~ msgstr "%s의 글의 점수를 다시 매길까요?"
+
+#~ msgid "Rescoring articles..."
+#~ msgstr "글 점수 다시 매기는중..."
+
+#~ msgid "Can't create label: missing caption."
+#~ msgstr "라벨 생성 실패: 이름을 입력하세요."
 
 #~ msgid "Firefox integration"
 #~ msgstr "Firefox 연동"
diff --git a/locale/lv_LV/LC_MESSAGES/messages.mo b/locale/lv_LV/LC_MESSAGES/messages.mo
index f00f92d58..36c06b26c 100644
Binary files a/locale/lv_LV/LC_MESSAGES/messages.mo and b/locale/lv_LV/LC_MESSAGES/messages.mo differ
diff --git a/locale/lv_LV/LC_MESSAGES/messages.po b/locale/lv_LV/LC_MESSAGES/messages.po
index 6ceb17c83..d6068b050 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: 2018-10-10 08:24+0300\n"
+"POT-Creation-Date: 2018-12-01 12:59+0300\n"
 "PO-Revision-Date: 2014-11-01 23:36+0300\n"
 "Last-Translator: Valdis Vītoliņš <valdis.vitolins@odo.lv>\n"
 "Language-Team: \n"
@@ -95,8 +95,8 @@ msgid "Weekly"
 msgstr "Ik nedēļu"
 
 #: backend.php:103
-#: classes/pref/users.php:47
 #: classes/pref/system.php:51
+#: classes/pref/users.php:47
 msgid "User"
 msgstr "Lietotājs"
 
@@ -168,33 +168,33 @@ msgstr "Lietotājs netika atrasts"
 
 #: index.php:151
 #: index.php:167
-#: index.php:285
+#: index.php:282
 #: prefs.php:120
 #: classes/backend.php:5
 #: classes/pref/labels.php:294
-#: classes/pref/feeds.php:1230
 #: classes/pref/filters.php:822
-#: js/feedlist.js:148
-#: js/feedlist.js:491
-#: js/feedlist.js:539
-#: js/functions.js:314
-#: js/functions.js:1336
-#: js/prefs.js:562
-#: js/prefs.js:754
-#: js/prefs.js:1488
-#: js/prefs.js:1503
-#: js/tt-rss.js:547
-#: js/viewfeed.js:1180
+#: classes/pref/feeds.php:1229
+#: js/feedlist.js:118
+#: js/feedlist.js:446
+#: js/feedlist.js:487
+#: js/functions.js:328
+#: js/functions.js:551
+#: js/functions.js:1286
+#: js/prefs.js:477
+#: js/prefs.js:617
+#: js/prefs.js:956
+#: js/prefs.js:1000
+#: js/prefs.js:1028
+#: js/prefs.js:1037
+#: js/prefs.js:1045
+#: js/prefs.js:1057
+#: js/tt-rss.js:497
+#: js/viewfeed.js:509
+#: js/viewfeed.js:928
 #: plugins/import_export/import_export.js:17
-#: js/functions.js:565
-#: js/prefs.js:1200
-#: js/prefs.js:1253
-#: js/prefs.js:1292
-#: js/prefs.js:1305
-#: js/prefs.js:1316
-#: js/prefs.js:1331
-#: js/tt-rss.js:564
-#: js/viewfeed.js:760
+#: js/prefs.js:1192
+#: js/prefs.js:1205
+#: js/tt-rss.js:510
 msgid "Loading, please wait..."
 msgstr "Ielādē, lūdzu gaidiet..."
 
@@ -211,13 +211,13 @@ msgid "All Articles"
 msgstr "Visus rakstus"
 
 #: index.php:194
-#: include/functions.php:1227
+#: include/functions.php:1172
 #: classes/feeds.php:110
 msgid "Starred"
 msgstr "Zvaigžņotos"
 
 #: index.php:195
-#: include/functions.php:1228
+#: include/functions.php:1173
 #: classes/feeds.php:111
 msgid "Published"
 msgstr "Publicētos"
@@ -257,11 +257,11 @@ msgid "Title"
 msgstr "Virsraksts"
 
 #: index.php:211
-#: index.php:251
-#: include/functions.php:1215
+#: index.php:250
+#: include/functions.php:1160
 #: classes/feeds.php:115
-#: js/FeedTree.js:41
-#: js/FeedTree.js:69
+#: js/FeedTree.js:42
+#: js/FeedTree.js:70
 msgid "Mark as read"
 msgstr "Atzīmēt kā lasītu"
 
@@ -298,7 +298,7 @@ msgid "Feed actions:"
 msgstr "Barotnes darbības"
 
 #: index.php:246
-#: classes/handler/public.php:551
+#: classes/handler/public.php:575
 msgid "Subscribe to feed..."
 msgstr "Abonēt barotni..."
 
@@ -307,56 +307,44 @@ msgid "Edit this feed..."
 msgstr "Mainīt šo barotni..."
 
 #: index.php:248
-msgid "Rescore feed"
-msgstr "Pārvērtēt barotni"
-
-#: index.php:249
-#: classes/pref/feeds.php:770
-#: classes/pref/feeds.php:1203
-#: js/PrefFeedTree.js:61
+#: classes/pref/feeds.php:769
+#: classes/pref/feeds.php:1202
+#: js/PrefFeedTree.js:62
 msgid "Unsubscribe"
 msgstr "Dzēst"
 
-#: index.php:250
+#: index.php:249
 msgid "All feeds:"
 msgstr "Visas barotnes:"
 
-#: index.php:252
+#: index.php:251
 msgid "(Un)hide read feeds"
 msgstr "(Ne)rādīt lasītās barotnes"
 
-#: index.php:253
+#: index.php:252
 msgid "Other actions:"
 msgstr "Citas darbības:"
 
-#: index.php:254
-#: include/functions.php:1201
+#: index.php:253
+#: include/functions.php:1146
 msgid "Toggle widescreen mode"
 msgstr "Pārslēgt platekrāna režīmu"
 
-#: index.php:255
-msgid "Create label..."
-msgstr "Izveido iezīmi..."
-
-#: index.php:256
-msgid "Create filter..."
-msgstr "Izveidot filtru..."
-
-#: index.php:257
+#: index.php:254
 msgid "Keyboard shortcuts help"
 msgstr "Isinājumtaustiņu palīdzība"
 
-#: index.php:266
+#: index.php:263
 msgid "Logout"
 msgstr "Atteikties"
 
-#: index.php:272
+#: index.php:269
 msgid "Updates are available from Git."
 msgstr ""
 
 #: prefs.php:33
 #: prefs.php:138
-#: include/functions.php:1230
+#: include/functions.php:1175
 #: classes/pref/prefs.php:425
 msgid "Preferences"
 msgstr "Iestatījumi"
@@ -371,8 +359,8 @@ msgstr "Iziet no iestatījumiem"
 
 #: prefs.php:141
 #: classes/pref/feeds.php:114
-#: classes/pref/feeds.php:1138
-#: classes/pref/feeds.php:1192
+#: classes/pref/feeds.php:1137
+#: classes/pref/feeds.php:1191
 msgid "Feeds"
 msgstr "Barotnes"
 
@@ -382,8 +370,8 @@ msgid "Filters"
 msgstr "Filtri"
 
 #: prefs.php:147
+#: classes/feeds.php:1696
 #: classes/pref/labels.php:94
-#: classes/feeds.php:1710
 msgid "Labels"
 msgstr "Iezīmes"
 
@@ -395,80 +383,80 @@ msgstr "Lietotāji"
 msgid "System"
 msgstr "Sistēma"
 
-#: register.php:186
+#: register.php:185
 #: include/login_form.php:162
 msgid "Create new account"
 msgstr "Izveidot jaunu kontu"
 
-#: register.php:192
+#: register.php:191
 msgid "New user registrations are administratively disabled."
 msgstr "Jaunu lietotāju reģistrēšana ir administratīvi atcelta."
 
-#: register.php:196
-#: register.php:241
-#: register.php:254
-#: register.php:269
-#: register.php:288
-#: register.php:336
-#: register.php:346
-#: register.php:358
-#: classes/handler/public.php:623
-#: classes/handler/public.php:697
-#: classes/handler/public.php:798
-#: classes/handler/public.php:877
-#: classes/handler/public.php:891
-#: classes/handler/public.php:898
-#: classes/handler/public.php:923
+#: register.php:195
+#: register.php:240
+#: register.php:253
+#: register.php:268
+#: register.php:287
+#: register.php:334
+#: register.php:344
+#: register.php:356
+#: classes/handler/public.php:647
+#: classes/handler/public.php:721
+#: 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"
 
-#: register.php:217
+#: register.php:216
 msgid "Your temporary password will be sent to the specified email. Accounts, which were not logged in once, are erased automatically 24 hours after temporary password is sent."
 msgstr "Jūsu īslaicīgā parole tiks nosūtīta uz norādīto e-pastu. Konti, kuros ne neviens nav pieteicies, tiek automātiski izdzēsti 24 stundu laikā pēc īslaicīgās paroles nosūtīšanas."
 
-#: register.php:223
+#: register.php:222
 msgid "Desired login:"
 msgstr "Vēlamais pieteikšanās vārds:"
 
-#: register.php:226
+#: register.php:225
 msgid "Check availability"
 msgstr "Pārbaudīt pieejamību"
 
-#: register.php:228
-#: classes/handler/public.php:713
+#: register.php:227
+#: classes/handler/public.php:737
 msgid "Email:"
 msgstr "E-pasts:"
 
-#: register.php:231
-#: classes/handler/public.php:718
+#: register.php:230
+#: classes/handler/public.php:742
 msgid "How much is two plus two:"
 msgstr "Cik ir divi un divi:"
 
-#: register.php:234
+#: register.php:233
 msgid "Submit registration"
 msgstr "Iesniegt reģistrāciju"
 
-#: register.php:252
+#: register.php:251
 msgid "Your registration information is incomplete."
 msgstr "Jūsu reģistrācija ir nepilnīga."
 
-#: register.php:267
+#: register.php:266
 msgid "Sorry, this username is already taken."
 msgstr "Piedodiet, lietotāja vārds jau tiek izmantots."
 
-#: register.php:286
+#: register.php:285
 msgid "Registration failed."
 msgstr "Reģistrācija neizdevās."
 
-#: register.php:333
+#: register.php:331
 msgid "Account created successfully."
 msgstr "Konts ir veiksmīgi izveidots."
 
-#: register.php:355
+#: register.php:353
 msgid "New user registrations are currently closed."
 msgstr "Jaunu lietotāju reģistrācija šobrīd ir slēgta."
 
-#: update.php:66
+#: update.php:67
 msgid "Tiny Tiny RSS data update script."
 msgstr "Tiny Tiny RSS datu atjaunošanas skripts."
 
@@ -481,10 +469,10 @@ msgstr "Visas barotnes"
 
 #: include/controls.php:138
 #: include/controls.php:230
-#: classes/opml.php:512
-#: classes/digest.php:120
+#: classes/digest.php:124
+#: classes/feeds.php:1708
 #: classes/pref/feeds.php:233
-#: classes/feeds.php:1722
+#: classes/opml.php:512
 msgid "Uncategorized"
 msgstr "Nekategorizēts"
 
@@ -499,287 +487,287 @@ msgstr[1] "%d arhivēti raksti"
 msgid "No feeds found."
 msgstr "Neatradu barotnes."
 
-#: include/functions.php:983
+#: include/functions.php:928
 #, php-format
 msgid "%d min"
 msgstr ""
 
-#: include/functions.php:1177
+#: include/functions.php:1122
 msgid "Navigation"
 msgstr "Navigācija"
 
-#: include/functions.php:1178
+#: include/functions.php:1123
 msgid "Open next feed"
 msgstr "Atvērt nākamo barotni"
 
-#: include/functions.php:1179
+#: include/functions.php:1124
 msgid "Open previous feed"
 msgstr "Atvērt iepriekšējo barotni"
 
-#: include/functions.php:1180
+#: include/functions.php:1125
 msgid "Open next article"
 msgstr "Atvērt nākamo rakstu"
 
-#: include/functions.php:1181
+#: include/functions.php:1126
 msgid "Open previous article"
 msgstr "Atvērt iepriekšējo rakstu"
 
-#: include/functions.php:1182
+#: include/functions.php:1127
 msgid "Open next article (don't scroll long articles)"
 msgstr "Atvērt nākamo rakstu (nepārtīt garus rakstus)"
 
-#: include/functions.php:1183
+#: include/functions.php:1128
 msgid "Open previous article (don't scroll long articles)"
 msgstr "Atvērt iepriekšējo rakstu (nepārtīt garus rakstus)"
 
-#: include/functions.php:1184
+#: include/functions.php:1129
 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/functions.php:1185
+#: include/functions.php:1130
 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/functions.php:1186
+#: include/functions.php:1131
 msgid "Show search dialog"
 msgstr "Rādīt meklēšanas logu"
 
-#: include/functions.php:1187
+#: include/functions.php:1132
 msgid "Article"
 msgstr "Raksts"
 
-#: include/functions.php:1188
-#: js/viewfeed.js:1695
+#: include/functions.php:1133
+#: js/viewfeed.js:1341
 msgid "Toggle starred"
 msgstr "Pārslēgt zvaigžņošanu"
 
-#: include/functions.php:1189
-#: js/viewfeed.js:1707
+#: include/functions.php:1134
+#: js/viewfeed.js:1353
 msgid "Toggle published"
 msgstr "Pārslēgt publicēšanu"
 
-#: include/functions.php:1190
-#: js/viewfeed.js:1682
+#: include/functions.php:1135
+#: js/viewfeed.js:1328
 msgid "Toggle unread"
 msgstr "Pārslēgt nelasītu"
 
-#: include/functions.php:1191
+#: include/functions.php:1136
 msgid "Edit tags"
 msgstr "Mainīt iezīmes"
 
-#: include/functions.php:1192
+#: include/functions.php:1137
 msgid "Open in new window"
 msgstr "Atvērt jaunā logā"
 
-#: include/functions.php:1193
-#: js/viewfeed.js:1728
+#: include/functions.php:1138
+#: js/viewfeed.js:1374
 msgid "Mark below as read"
 msgstr "Iezīmēt lejup kā lasītus"
 
-#: include/functions.php:1194
-#: js/viewfeed.js:1721
+#: include/functions.php:1139
+#: js/viewfeed.js:1367
 msgid "Mark above as read"
 msgstr "Iezīmēt augšup kā lasītus"
 
-#: include/functions.php:1195
+#: include/functions.php:1140
 msgid "Scroll down"
 msgstr "Pārtīt lejup"
 
-#: include/functions.php:1196
+#: include/functions.php:1141
 msgid "Scroll up"
 msgstr "Pārtīt uz augšu"
 
-#: include/functions.php:1197
+#: include/functions.php:1142
 msgid "Select article under cursor"
 msgstr "Izvēlēties rakstu zem kursora"
 
-#: include/functions.php:1198
+#: include/functions.php:1143
 msgid "Email article"
 msgstr "Nosūtīt rakstu uz e-pastu"
 
-#: include/functions.php:1199
+#: include/functions.php:1144
 msgid "Close/collapse article"
 msgstr "Aizvērt/sakļaut rakstu"
 
-#: include/functions.php:1200
+#: include/functions.php:1145
 msgid "Toggle article expansion (combined mode)"
 msgstr "Pārslēgt raksta izvēršanu (kombinētais režīms)"
 
-#: include/functions.php:1202
+#: include/functions.php:1147
 #: plugins/embed_original/init.php:33
 msgid "Toggle embed original"
 msgstr "Pārslēgt oriģināla iegulšanu"
 
-#: include/functions.php:1203
+#: include/functions.php:1148
 msgid "Article selection"
 msgstr "Raksta atzīmēšana"
 
-#: include/functions.php:1204
+#: include/functions.php:1149
 msgid "Select all articles"
 msgstr "Iezīmēt visus rakstus"
 
-#: include/functions.php:1205
+#: include/functions.php:1150
 msgid "Select unread"
 msgstr "Atzīmēt nelasītos"
 
-#: include/functions.php:1206
+#: include/functions.php:1151
 msgid "Select starred"
 msgstr "Atzīmēt zvaigžņotos"
 
-#: include/functions.php:1207
+#: include/functions.php:1152
 msgid "Select published"
 msgstr "Atzīmēt publicētos"
 
-#: include/functions.php:1208
+#: include/functions.php:1153
 msgid "Invert selection"
 msgstr "Apvērst izvēli"
 
-#: include/functions.php:1209
+#: include/functions.php:1154
 msgid "Deselect everything"
 msgstr "Neatzīmēt visu"
 
-#: include/functions.php:1210
-#: classes/pref/feeds.php:522
-#: classes/pref/feeds.php:794
+#: include/functions.php:1155
+#: classes/pref/feeds.php:521
+#: classes/pref/feeds.php:793
 msgid "Feed"
 msgstr "Barotne"
 
-#: include/functions.php:1211
+#: include/functions.php:1156
 msgid "Refresh current feed"
 msgstr "Atjaunot tekošo barotni"
 
-#: include/functions.php:1212
+#: include/functions.php:1157
 msgid "Un/hide read feeds"
 msgstr "(Ne)rādīt lasītās barotnes"
 
-#: include/functions.php:1213
-#: classes/pref/feeds.php:1195
+#: include/functions.php:1158
+#: classes/pref/feeds.php:1194
 msgid "Subscribe to feed"
 msgstr "Abonēt barotni"
 
-#: include/functions.php:1214
-#: js/FeedTree.js:48
-#: js/PrefFeedTree.js:55
-#: js/viewfeed.js:1846
+#: include/functions.php:1159
+#: js/FeedTree.js:49
+#: js/PrefFeedTree.js:56
+#: js/viewfeed.js:1492
 msgid "Edit feed"
 msgstr "Mainīt barotni"
 
-#: include/functions.php:1216
+#: include/functions.php:1161
 msgid "Reverse headlines"
 msgstr "Apvērst virsrakstus"
 
-#: include/functions.php:1217
+#: include/functions.php:1162
 msgid "Toggle headline grouping"
 msgstr ""
 
-#: include/functions.php:1218
+#: include/functions.php:1163
 msgid "Debug feed update"
 msgstr "Atkļūdot barotņu atjaunojumus"
 
-#: include/functions.php:1219
+#: include/functions.php:1164
 #, fuzzy
 msgid "Debug viewfeed()"
 msgstr "Atkļūdot barotņu atjaunojumus"
 
-#: include/functions.php:1220
-#: js/FeedTree.js:97
+#: include/functions.php:1165
+#: js/FeedTree.js:98
 msgid "Mark all feeds as read"
 msgstr "Atzīmēt visas barotnes kā lasītas"
 
-#: include/functions.php:1221
+#: include/functions.php:1166
 msgid "Un/collapse current category"
 msgstr "Izvērst/sakļaut tekošo kategoriju"
 
-#: include/functions.php:1222
-msgid "Toggle combined mode"
-msgstr "Pārslēgt kombinēto režīmu"
-
-#: include/functions.php:1223
+#: include/functions.php:1167
 msgid "Toggle auto expand in combined mode"
 msgstr "Pārslēgt autoizvēršanu kombinētajā režīmā"
 
-#: include/functions.php:1224
+#: include/functions.php:1168
+msgid "Toggle combined mode"
+msgstr "Pārslēgt kombinēto režīmu"
+
+#: include/functions.php:1169
 msgid "Go to"
 msgstr "Doties uz"
 
-#: include/functions.php:1225
-#: classes/feeds.php:1583
+#: include/functions.php:1170
+#: classes/feeds.php:1569
 msgid "All articles"
 msgstr "Visi raksti"
 
-#: include/functions.php:1226
+#: include/functions.php:1171
 msgid "Fresh"
 msgstr "Svaigs"
 
-#: include/functions.php:1229
-#: js/tt-rss.js:491
-#: js/tt-rss.js:660
+#: include/functions.php:1174
+#: js/tt-rss.js:439
+#: js/tt-rss.js:599
 msgid "Tag cloud"
 msgstr "Iezīmju mākonis"
 
-#: include/functions.php:1231
+#: include/functions.php:1176
 msgid "Other"
 msgstr "Citi"
 
-#: include/functions.php:1232
+#: include/functions.php:1177
 #: classes/pref/labels.php:279
 msgid "Create label"
 msgstr "Izveidot etiķeti"
 
-#: include/functions.php:1233
+#: include/functions.php:1178
 #: classes/pref/filters.php:801
 msgid "Create filter"
 msgstr "Izveidot filtru"
 
-#: include/functions.php:1234
+#: include/functions.php:1179
 msgid "Un/collapse sidebar"
 msgstr "Izvērst/sakļaut sānjoslu"
 
-#: include/functions.php:1235
+#: include/functions.php:1180
 msgid "Show help dialog"
 msgstr "Rādīt palīdzības logu"
 
-#: include/functions.php:2582
+#: include/functions.php:2529
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: include/functions.php:2583
+#: include/functions.php:2530
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: include/functions.php:2584
+#: include/functions.php:2531
 msgid "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form"
 msgstr ""
 
-#: include/functions.php:2585
+#: include/functions.php:2532
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: include/functions.php:2586
+#: include/functions.php:2533
 #, fuzzy
 msgid "No file was uploaded"
 msgstr "Fails nav augšuplādēts."
 
-#: include/functions.php:2587
+#: include/functions.php:2534
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: include/functions.php:2588
+#: include/functions.php:2535
 msgid "Failed to write file to disk."
 msgstr ""
 
-#: include/functions.php:2589
+#: include/functions.php:2536
 msgid "A PHP extension stopped the file upload."
 msgstr ""
 
 #: include/login_form.php:107
-#: classes/handler/public.php:446
-#: classes/handler/public.php:708
+#: classes/handler/public.php:466
+#: classes/handler/public.php:732
 msgid "Login:"
 msgstr "Pieteikties:"
 
 #: include/login_form.php:117
-#: classes/handler/public.php:449
+#: classes/handler/public.php:469
 msgid "Password:"
 msgstr "Parole:"
 
@@ -792,9 +780,9 @@ msgid "Profile:"
 msgstr "Profils:"
 
 #: include/login_form.php:133
-#: classes/handler/public.php:252
 #: classes/pref/prefs.php:1037
 #: classes/rpc.php:69
+#: classes/handler/public.php:272
 msgid "Default profile"
 msgstr "Noklusētais profils"
 
@@ -811,207 +799,27 @@ msgid "Remember me"
 msgstr "Atcerēties mani"
 
 #: include/login_form.php:159
-#: classes/handler/public.php:454
+#: classes/handler/public.php:474
 msgid "Log in"
 msgstr "Pieteikties"
 
-#: include/sessions.php:46
+#: include/sessions.php:45
 msgid "Session failed to validate (schema version changed)"
 msgstr "Neizdevās validēt sesiju (mainījusies shēmas versija)"
 
-#: include/sessions.php:62
+#: include/sessions.php:53
+#, fuzzy
+msgid "Session failed to validate (UA changed)."
+msgstr "Neizdevās validēt sesiju (mainījusies parole)"
+
+#: include/sessions.php:67
 msgid "Session failed to validate (password changed)"
 msgstr "Neizdevās validēt sesiju (mainījusies parole)"
 
-#: include/sessions.php:69
+#: include/sessions.php:74
 msgid "Session failed to validate (user not found)"
 msgstr "Neizdevās validēt sesiju (lietotājs nav atrasts)"
 
-#: classes/article.php:26
-msgid "Article not found."
-msgstr "Raksts netika atrasts."
-
-#: classes/article.php:211
-msgid "Tags for this article (separated by commas):"
-msgstr "Šī raksta iezīmes (atdalītas ar komatiem):"
-
-#: classes/article.php:236
-#: classes/pref/labels.php:82
-#: classes/pref/users.php:103
-#: classes/pref/feeds.php:774
-#: classes/pref/feeds.php:914
-#: classes/pref/filters.php:525
-#: classes/pref/prefs.php:982
-#: plugins/nsfw/init.php:85
-#: plugins/note/init.php:58
-#: plugins/af_readability/init.php:80
-#: plugins/af_redditimgur/init.php:66
-#: plugins/af_psql_trgm/init.php:188
-#: plugins/mail/init.php:65
-#: plugins/af_zz_imgproxy/init.php:238
-msgid "Save"
-msgstr "Saglabāt"
-
-#: classes/article.php:238
-#: classes/handler/public.php:423
-#: classes/handler/public.php:457
-#: classes/pref/labels.php:84
-#: classes/pref/users.php:105
-#: classes/pref/feeds.php:775
-#: classes/pref/feeds.php:917
-#: classes/pref/feeds.php:1672
-#: classes/pref/filters.php:528
-#: classes/pref/filters.php:945
-#: classes/pref/filters.php:1022
-#: classes/pref/filters.php:1115
-#: classes/pref/prefs.php:984
-#: classes/feeds.php:1037
-#: classes/feeds.php:1089
-#: classes/feeds.php:1128
-#: plugins/note/init.php:60
-#: plugins/mail/init.php:179
-msgid "Cancel"
-msgstr "Atcelt"
-
-#: classes/article.php:337
-#: classes/article.php:720
-#: classes/article.php:875
-msgid "no tags"
-msgstr "nav iezīmju"
-
-#: classes/article.php:448
-msgid "unknown type"
-msgstr "nezināms tips"
-
-#: classes/article.php:525
-msgid "Attachments"
-msgstr "Pielikumi"
-
-#: classes/article.php:626
-#: classes/feeds.php:661
-msgid "comment"
-msgid_plural "comments"
-msgstr[0] "komentārs"
-msgstr[1] "komentāri"
-
-#: classes/article.php:630
-#: classes/feeds.php:665
-msgid "comments"
-msgstr "komentāri"
-
-#: classes/article.php:689
-msgid " - "
-msgstr "–"
-
-#: classes/article.php:730
-#: classes/feeds.php:647
-msgid "Edit tags for this article"
-msgstr "Mainīt šī raksta iezīmes"
-
-#: classes/article.php:763
-#: classes/feeds.php:602
-msgid "Originally from:"
-msgstr "Sākotnējais no:"
-
-#: classes/article.php:774
-#: classes/pref/feeds.php:539
-#: classes/feeds.php:613
-msgid "Feed URL"
-msgstr "Barotnes URL"
-
-#: classes/article.php:811
-#: classes/backend.php:103
-#: classes/dlg.php:33
-#: classes/dlg.php:56
-#: classes/dlg.php:89
-#: classes/dlg.php:154
-#: classes/dlg.php:181
-#: classes/dlg.php:197
-#: classes/pref/feeds.php:1466
-#: classes/pref/feeds.php:1533
-#: classes/pref/filters.php:208
-#: classes/pref/prefs.php:1099
-#: plugins/af_psql_trgm/init.php:109
-#: plugins/import_export/init.php:446
-#: plugins/import_export/init.php:490
-#: plugins/share/init.php:128
-msgid "Close this window"
-msgstr "Aizvērt šo logu"
-
-#: classes/article.php:913
-msgid "(edit note)"
-msgstr "(mainīt piezīmi)"
-
-#: classes/opml.php:31
-#: classes/opml.php:36
-msgid "OPML Utility"
-msgstr "OPML rīks"
-
-#: classes/opml.php:40
-msgid "Importing OPML..."
-msgstr "Importē OPML..."
-
-#: classes/opml.php:45
-msgid "Return to preferences"
-msgstr "Atgriezties uz iestatījumiem"
-
-#: classes/opml.php:301
-#, php-format
-msgid "Adding feed: %s"
-msgstr "Pievieno barotni: %s"
-
-#: classes/opml.php:312
-#, php-format
-msgid "Duplicate feed: %s"
-msgstr "Dublēta barotne: %s"
-
-#: classes/opml.php:326
-#, php-format
-msgid "Adding label %s"
-msgstr "Pievieno etiķeti %s"
-
-#: classes/opml.php:329
-#, php-format
-msgid "Duplicate label: %s"
-msgstr "Dublēta etiķete: %s"
-
-#: classes/opml.php:341
-#, php-format
-msgid "Setting preference key %s to %s"
-msgstr "Saglabā iestatījumu atslēgu %s līdz %s"
-
-#: classes/opml.php:377
-msgid "Adding filter..."
-msgstr "Pievieno filtru..."
-
-#: classes/opml.php:512
-#, php-format
-msgid "Processing category: %s"
-msgstr "Apstrādā kategoriju: %s"
-
-#: classes/opml.php:558
-#, php-format
-msgid "Upload failed with error code %d"
-msgstr "Augšuplāde neizdevās ar kļūdas kodu %d"
-
-#: classes/opml.php:570
-#: plugins/import_export/init.php:471
-msgid "Unable to move uploaded file."
-msgstr "Neizdevās pārvietot augšuplādēto failu."
-
-#: classes/opml.php:574
-#: plugins/import_export/init.php:475
-msgid "Error: please upload OPML file."
-msgstr "Kļūda: lūdzu augšuplādējiet OPML failu."
-
-#: classes/opml.php:585
-msgid "Error: unable to find moved OPML file."
-msgstr "Kļūda: neizdevās atrast pārvietoto OPML failu."
-
-#: classes/opml.php:594
-msgid "Error while parsing document."
-msgstr "Dokumenta apstrādes kļūda."
-
 #: 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ē."
@@ -1032,162 +840,354 @@ msgstr "Ctrl"
 msgid "Help topic not found."
 msgstr "Palīdzības tēma netika atrasta."
 
-#: 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."
+#: classes/backend.php:103
+#: classes/pref/filters.php:208
+#: classes/pref/feeds.php:1465
+#: classes/pref/feeds.php:1532
+#: classes/pref/prefs.php:1099
+#: classes/dlg.php:33
+#: classes/dlg.php:56
+#: classes/dlg.php:89
+#: classes/dlg.php:154
+#: classes/dlg.php:181
+#: classes/dlg.php:197
+#: classes/article.php:810
+#: plugins/af_psql_trgm/init.php:109
+#: plugins/import_export/init.php:446
+#: plugins/import_export/init.php:490
+#: plugins/share/init.php:128
+msgid "Close this window"
+msgstr "Aizvērt šo logu"
 
-#: classes/dlg.php:44
-msgid "Your Public OPML URL is:"
-msgstr "Jūsu publiskais OPML URL ir:"
+#: classes/feeds.php:53
+msgid "View as RSS feed"
+msgstr "Skatīt RSS barotni"
 
-#: classes/dlg.php:53
-#: classes/dlg.php:178
-#: plugins/share/init.php:125
-msgid "Generate new URL"
-msgstr "Izveidot jaunu URL"
+#: classes/feeds.php:54
+#: classes/feeds.php:140
+#: classes/pref/feeds.php:1326
+msgid "View as RSS"
+msgstr "Skatīt kā RSS"
 
-#: classes/dlg.php:67
-msgid "Update daemon is enabled in configuration, but daemon process is not running, which prevents all feeds from updating. Please start the daemon process or contact instance owner."
-msgstr "Atjaunošanas process iestatījumos ir ieslēgts, bet tas nedarbojas, tāpēc barotnes neatjaunojas. Lūdzu palaidiet atjaunošanas procesu vai arī sazinieties ar servera īpašnieku."
+#: classes/feeds.php:62
+#, php-format
+msgid "Last updated: %s"
+msgstr "Nesenākais atjaunojums: %s"
 
-#: classes/dlg.php:71
-#: classes/dlg.php:80
-msgid "Last update:"
-msgstr "Pēdējais atjaunojums:"
+#: classes/feeds.php:100
+#, fuzzy
+msgid "Select..."
+msgstr "Iezīmēt"
 
-#: classes/dlg.php:76
-msgid "Update daemon is taking too long to perform a feed update. This could indicate a problem like crash or a hang. Please check the daemon process or contact instance owner."
-msgstr "Atjaunošanas process aizņem pārāk ilgu laiku. Iespējams, ka tas ir tāpēc, ka process ir \"uzkāries\". Lūdzu pārbaudiet atjaunošanas procesu vai arī sazinieties ar servera īpašnieku."
+#: classes/feeds.php:102
+#: classes/pref/labels.php:273
+#: classes/pref/filters.php:391
+#: classes/pref/filters.php:449
+#: classes/pref/filters.php:795
+#: classes/pref/filters.php:878
+#: classes/pref/filters.php:905
+#: classes/pref/feeds.php:1185
+#: classes/pref/feeds.php:1416
+#: classes/pref/feeds.php:1481
+#: classes/pref/users.php:358
+#: classes/pref/prefs.php:996
+msgid "All"
+msgstr "Visus"
 
-#: classes/dlg.php:169
-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/feeds.php:104
+msgid "Invert"
+msgstr "Apgriezt"
 
-#: classes/dlg.php:190
-msgid "You are using default tt-rss password. Please change it in the Preferences (Personal data / Authentication)."
+#: classes/feeds.php:105
+#: classes/pref/labels.php:275
+#: classes/pref/filters.php:393
+#: classes/pref/filters.php:451
+#: classes/pref/filters.php:797
+#: classes/pref/filters.php:880
+#: classes/pref/filters.php:907
+#: classes/pref/feeds.php:1187
+#: classes/pref/feeds.php:1418
+#: classes/pref/feeds.php:1483
+#: classes/pref/users.php:360
+#: classes/pref/prefs.php:998
+msgid "None"
+msgstr "Nevienu"
+
+#: classes/feeds.php:107
+msgid "Selection toggle:"
+msgstr "Izvēles pārslēgšana:"
+
+#: classes/feeds.php:113
+msgid "Selection:"
+msgstr "Izvēle:"
+
+#: classes/feeds.php:116
+msgid "Set score"
+msgstr "Iestatīr vērtējumu"
+
+#: classes/feeds.php:119
+msgid "Archive"
+msgstr "Arhivēt"
+
+#: classes/feeds.php:121
+msgid "Move back"
+msgstr "Pārvietot atpakaļ"
+
+#: classes/feeds.php:122
+#: classes/pref/filters.php:400
+#: classes/pref/filters.php:458
+#: classes/pref/filters.php:887
+#: classes/pref/filters.php:914
+msgid "Delete"
+msgstr "Dzēst"
+
+#: classes/feeds.php:127
+#: classes/feeds.php:132
+#: plugins/mailto/init.php:25
+#: plugins/mail/init.php:76
+msgid "Forward by email"
+msgstr "Pārsūtīt e-pastā"
+
+#: classes/feeds.php:136
+msgid "Feed:"
+msgstr "Barotne:"
+
+#: classes/feeds.php:193
+#: classes/feeds.php:802
+msgid "Feed not found."
+msgstr "Barotne netika atrasta."
+
+#: classes/feeds.php:255
+msgid "Never"
+msgstr "Nekad"
+
+#: classes/feeds.php:341
+#, php-format
+msgid "Imported at %s"
+msgstr "Importēts %s"
+
+#: classes/feeds.php:391
+#: classes/feeds.php:484
+msgid "mark feed as read"
+msgstr "atzīmēt barotni kā lasītu"
+
+#: classes/feeds.php:540
+msgid "Collapse article"
+msgstr "Sakļaut rakstu"
+
+#: classes/feeds.php:592
+#: classes/article.php:762
+msgid "Originally from:"
+msgstr "Sākotnējais no:"
+
+#: classes/feeds.php:603
+#: classes/pref/feeds.php:538
+#: classes/article.php:773
+msgid "Feed URL"
+msgstr "Barotnes URL"
+
+#: classes/feeds.php:630
+#: classes/article.php:729
+msgid "Edit tags for this article"
+msgstr "Mainīt šī raksta iezīmes"
+
+#: classes/feeds.php:644
+#: classes/article.php:625
+msgid "comment"
+msgid_plural "comments"
+msgstr[0] "komentārs"
+msgstr[1] "komentāri"
+
+#: classes/feeds.php:648
+#: classes/article.php:629
+msgid "comments"
+msgstr "komentāri"
+
+#: classes/feeds.php:686
+msgid "No unread articles found to display."
+msgstr "Nav neizlasītu rakstu, ko rādīt."
+
+#: classes/feeds.php:689
+msgid "No updated articles found to display."
+msgstr "Nav atjaunotu rakstu, ko rādīt."
+
+#: classes/feeds.php:692
+msgid "No starred articles found to display."
+msgstr "Nav zvaigžņotu rakstu, ko rādīt."
+
+#: classes/feeds.php:696
+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:698
+msgid "No articles found to display."
+msgstr "Netika atrasti raksti, ko rādīt."
+
+#: classes/feeds.php:714
+#: classes/feeds.php:905
+#, php-format
+msgid "Feeds last updated at %s"
+msgstr "Barotnes pēdējo reizi atjaunotas %s."
+
+#: classes/feeds.php:726
+#: classes/feeds.php:917
+msgid "Some feeds have update errors (click for details)"
+msgstr "Dažas barotnes ir atjaunotas ar kļūdām (klikšķiniet lai skatītu vairāk)"
+
+#: classes/feeds.php:894
+msgid "No feed selected."
+msgstr "Nav izvēlēta barotne."
+
+#: classes/feeds.php:958
+#: classes/feeds.php:966
+msgid "Feed or site URL"
+msgstr "Barotnes vai vietnes URL"
+
+#: classes/feeds.php:972
+#: classes/pref/feeds.php:559
+#: classes/pref/feeds.php:800
+#: classes/pref/feeds.php:1632
+msgid "Place in category:"
+msgstr "Ievietot kategorijā:"
+
+#: classes/feeds.php:980
+msgid "Available feeds"
+msgstr "Pieejamās barotnes"
+
+#: classes/feeds.php:992
+#: classes/pref/feeds.php:621
+#: classes/pref/feeds.php:848
+#: classes/pref/users.php:61
+msgid "Authentication"
+msgstr "Autentifikācija"
+
+#: classes/feeds.php:996
+#: classes/pref/feeds.php:625
+#: classes/pref/feeds.php:852
+#: classes/pref/feeds.php:1646
+#: classes/pref/users.php:403
+msgid "Login"
+msgstr "Pieteikšanās"
+
+#: classes/feeds.php:1000
+#: classes/pref/feeds.php:631
+#: classes/pref/feeds.php:860
+#: classes/pref/feeds.php:1649
+#: classes/pref/prefs.php:243
+msgid "Password"
+msgstr "Parole"
+
+#: classes/feeds.php:1011
+#: classes/pref/feeds.php:645
+msgid "This feed requires authentication."
+msgstr "Šim laukam ir nepieciešams autentificēties."
+
+#: classes/feeds.php:1014
+#: classes/feeds.php:1070
+#: classes/pref/feeds.php:1668
+msgid "Subscribe"
+msgstr "Pasūtīt"
+
+#: classes/feeds.php:1017
+msgid "More feeds"
+msgstr "Vairāk barotnes"
+
+#: classes/feeds.php:1020
+#: classes/feeds.php:1072
+#: classes/feeds.php:1111
+#: classes/pref/labels.php:84
+#: classes/pref/filters.php:528
+#: classes/pref/filters.php:945
+#: classes/pref/filters.php:1022
+#: classes/pref/filters.php:1115
+#: classes/pref/feeds.php:774
+#: classes/pref/feeds.php:916
+#: classes/pref/feeds.php:1669
+#: classes/pref/users.php:105
+#: classes/pref/prefs.php:984
+#: classes/article.php:238
+#: classes/handler/public.php:443
+#: classes/handler/public.php:477
+#: plugins/mail/init.php:179
+#: plugins/note/init.php:60
+msgid "Cancel"
+msgstr "Atcelt"
+
+#: classes/feeds.php:1042
+#: classes/feeds.php:1110
+#: classes/pref/filters.php:788
+#: classes/pref/feeds.php:1178
+#: classes/pref/users.php:345
+#: js/tt-rss.js:152
+msgid "Search"
+msgstr "Meklēt"
+
+#: classes/feeds.php:1046
+msgid "Popular feeds"
+msgstr "Populārās barotnes"
+
+#: classes/feeds.php:1047
+msgid "Feed archive"
+msgstr "Barotņu arhīvs"
+
+#: classes/feeds.php:1050
+msgid "limit:"
+msgstr "ierobežojumi:"
+
+#: classes/feeds.php:1071
+#: classes/pref/labels.php:282
+#: classes/pref/filters.php:518
+#: classes/pref/filters.php:814
+#: classes/pref/feeds.php:751
+#: classes/pref/users.php:369
+msgid "Remove"
+msgstr "Dzēst"
+
+#: classes/feeds.php:1084
+msgid "Look for"
+msgstr "Meklēt"
+
+#: classes/feeds.php:1092
+#, php-format
+msgid "in %s"
 msgstr ""
 
-#: classes/dlg.php:194
-#, fuzzy
-msgid "Open Preferences"
-msgstr "Iestatījumi"
+#: classes/feeds.php:1097
+msgid "Used for word stemming"
+msgstr ""
 
-#: classes/handler/public.php:387
-#: plugins/bookmarklets/init.php:40
-msgid "Share with Tiny Tiny RSS"
-msgstr "Kopīgot ar Tiny Tiny RSS"
+#: classes/feeds.php:1106
+msgid "Search syntax"
+msgstr "Meklēšanas sintakse"
 
-#: classes/handler/public.php:395
-msgid "Title:"
-msgstr "Virsraksts:"
+#: classes/feeds.php:1563
+msgid "Starred articles"
+msgstr "Zvaigžņotie raksti"
 
-#: classes/handler/public.php:397
-#: classes/pref/feeds.php:537
-msgid "URL:"
-msgstr "URL:"
+#: classes/feeds.php:1565
+msgid "Published articles"
+msgstr "Publicētie raksti"
 
-#: classes/handler/public.php:399
-msgid "Content:"
-msgstr "Saturs:"
+#: classes/feeds.php:1567
+msgid "Fresh articles"
+msgstr "Jaunākie raksti"
 
-#: classes/handler/public.php:401
-msgid "Labels:"
-msgstr "Etiķetes:"
+#: classes/feeds.php:1571
+msgid "Archived articles"
+msgstr "Arhivētie raksti"
 
-#: classes/handler/public.php:420
-msgid "Shared article will appear in the Published feed."
-msgstr "Kopīgotais raksts parādīsies Publicēts barotnē"
+#: classes/feeds.php:1573
+msgid "Recently read"
+msgstr "Nesen lasītie raksti"
 
-#: classes/handler/public.php:422
-msgid "Share"
-msgstr "Kopīgot"
+#: classes/feeds.php:1694
+msgid "Special"
+msgstr "Īpaši"
 
-#: classes/handler/public.php:444
-msgid "Not logged in"
-msgstr "Nav pieteicies"
-
-#: classes/handler/public.php:504
-msgid "Incorrect username or password"
-msgstr "Nepareizs lietotāja vārds vai parole"
-
-#: classes/handler/public.php:557
+#: classes/feeds.php:1951
 #, php-format
-msgid "Already subscribed to <b>%s</b>."
-msgstr "Jau ir pasūtījis <b>%s</b>."
-
-#: classes/handler/public.php:560
-#, php-format
-msgid "Subscribed to <b>%s</b>."
-msgstr "Pasūtījis <b>%s</b>."
-
-#: classes/handler/public.php:563
-#, php-format
-msgid "Could not subscribe to <b>%s</b>."
-msgstr "Neizdevās pasūtīt <b>%s</b>."
-
-#: classes/handler/public.php:566
-#, php-format
-msgid "No feeds found in <b>%s</b>."
-msgstr "<b>%s</b> barotne netika atrasta."
-
-#: classes/handler/public.php:569
-msgid "Multiple feed URLs found."
-msgstr "Atradu vairākus barotņu URLus."
-
-#: classes/handler/public.php:573
-#, 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:591
-msgid "Subscribe to selected feed"
-msgstr "Pasūtīt norādīto barotni"
-
-#: classes/handler/public.php:618
-msgid "Edit subscription options"
-msgstr "Mainīt barotnes iestatījumus"
-
-#: classes/handler/public.php:656
-msgid "Password recovery"
-msgstr "Parole atjaunošana"
-
-#: classes/handler/public.php:701
-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:723
-#: classes/pref/users.php:372
-msgid "Reset password"
-msgstr "Atstatīt paroli"
-
-#: classes/handler/public.php:733
-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:737
-#: classes/handler/public.php:806
-msgid "Go back"
-msgstr "Doties atpakaļ"
-
-#: classes/handler/public.php:775
-msgid "[tt-rss] Password reset request"
-msgstr "[tt-rss] paroles pārstatīšanas pieprasījums"
-
-#: classes/handler/public.php:802
-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:824
-msgid "Your access level is insufficient to run this script."
-msgstr "Jums nav nepieciešamo skripta palaišanas tiesību. "
-
-#: classes/handler/public.php:850
-msgid "Database Updater"
-msgstr "Datu bāzes atjaunotājs"
-
-#: classes/handler/public.php:915
-msgid "Perform updates"
-msgstr "Izpildīt atjaunojumus"
+msgid "Search results: %s"
+msgstr "Meklēšanas rezultāti: %s"
 
 #: classes/pref/labels.php:25
 #: classes/pref/filters.php:377
@@ -1207,201 +1207,194 @@ msgstr "Pamats:"
 msgid "Background:"
 msgstr "Virspuse:"
 
+#: classes/pref/labels.php:82
+#: classes/pref/filters.php:525
+#: classes/pref/feeds.php:773
+#: classes/pref/feeds.php:913
+#: classes/pref/users.php:103
+#: classes/pref/prefs.php:982
+#: classes/article.php:236
+#: plugins/af_zz_imgproxy/init.php:238
+#: plugins/af_redditimgur/init.php:66
+#: plugins/af_psql_trgm/init.php:188
+#: plugins/af_readability/init.php:80
+#: plugins/nsfw/init.php:85
+#: plugins/mail/init.php:65
+#: plugins/note/init.php:58
+msgid "Save"
+msgstr "Saglabāt"
+
 #: classes/pref/labels.php:244
 #, php-format
 msgid "Created label <b>%s</b>"
 msgstr "Izveidoju etiķeti <b>%s</b>"
 
 #: classes/pref/labels.php:270
-#: classes/pref/users.php:356
-#: classes/pref/feeds.php:1183
-#: classes/pref/feeds.php:1414
-#: classes/pref/feeds.php:1479
 #: classes/pref/filters.php:388
 #: classes/pref/filters.php:446
 #: classes/pref/filters.php:792
 #: classes/pref/filters.php:875
 #: classes/pref/filters.php:902
+#: classes/pref/feeds.php:1182
+#: classes/pref/feeds.php:1413
+#: classes/pref/feeds.php:1478
+#: classes/pref/users.php:355
 #: classes/pref/prefs.php:993
 msgid "Select"
 msgstr "Iezīmēt"
 
-#: classes/pref/labels.php:273
-#: classes/pref/users.php:359
-#: classes/pref/feeds.php:1186
-#: classes/pref/feeds.php:1417
-#: classes/pref/feeds.php:1482
-#: classes/pref/filters.php:391
-#: classes/pref/filters.php:449
-#: classes/pref/filters.php:795
-#: classes/pref/filters.php:878
-#: classes/pref/filters.php:905
-#: classes/pref/prefs.php:996
-#: classes/feeds.php:102
-msgid "All"
-msgstr "Visus"
-
-#: classes/pref/labels.php:275
-#: classes/pref/users.php:361
-#: classes/pref/feeds.php:1188
-#: classes/pref/feeds.php:1419
-#: classes/pref/feeds.php:1484
-#: classes/pref/filters.php:393
-#: classes/pref/filters.php:451
-#: classes/pref/filters.php:797
-#: classes/pref/filters.php:880
-#: classes/pref/filters.php:907
-#: classes/pref/prefs.php:998
-#: classes/feeds.php:105
-msgid "None"
-msgstr "Nevienu"
-
-#: classes/pref/labels.php:282
-#: classes/pref/users.php:370
-#: classes/pref/feeds.php:752
-#: classes/pref/filters.php:518
-#: classes/pref/filters.php:814
-#: classes/feeds.php:1088
-msgid "Remove"
-msgstr "Dzēst"
-
 #: classes/pref/labels.php:285
 msgid "Clear colors"
 msgstr "Attīrīt krāsas"
 
-#: classes/pref/users.php:6
-#: classes/pref/system.php:8
-msgid "Your access level is insufficient to open this tab."
-msgstr "Jums nav pietiekamas pieejas tiesības, lai atvērtu šo cilni."
-
-#: classes/pref/users.php:26
+#: classes/pref/filters.php:155
 #, fuzzy
-msgid "Edit user"
-msgstr "Mainīt likumu"
+msgid "Preview article"
+msgstr "Jaunākie raksti"
 
-#: classes/pref/users.php:61
-#: classes/pref/feeds.php:622
-#: classes/pref/feeds.php:849
-#: classes/feeds.php:1009
-msgid "Authentication"
-msgstr "Autentifikācija"
+#: classes/pref/filters.php:267
+#: classes/pref/filters.php:573
+msgid "(inverse)"
+msgstr "(apvērst)"
 
-#: classes/pref/users.php:64
-msgid "Access level: "
-msgstr "Pieejas līmenis:"
-
-#: classes/pref/users.php:82
-#: classes/pref/feeds.php:648
-#: classes/pref/feeds.php:867
-msgid "Options"
-msgstr "Iespējas"
-
-#: classes/pref/users.php:96
-#: js/prefs.js:479
-msgid "User details"
-msgstr "Lietotāja detaļas"
-
-#: classes/pref/users.php:136
-#: classes/pref/users.php:407
-msgid "Registered"
-msgstr "Reģistrēts"
-
-#: classes/pref/users.php:137
-msgid "Last logged in"
-msgstr "Pēdējo reizi pieteicies"
-
-#: classes/pref/users.php:145
-msgid "Subscribed feeds count"
-msgstr "Pasūtīto barotņu skaits"
-
-#: classes/pref/users.php:146
-#, fuzzy
-msgid "Stored articles"
-msgstr "Zvaigžņotie raksti"
-
-#: classes/pref/users.php:150
-#: classes/pref/users.php:406
-msgid "Subscribed feeds"
-msgstr "Pasūtītās barotnes"
-
-#: classes/pref/users.php:176
-msgid "User not found"
-msgstr "Lietotājs netika atrasts"
-
-#: classes/pref/users.php:246
+#: classes/pref/filters.php:263
+#: classes/pref/filters.php:572
 #, php-format
-msgid "Added user <b>%s</b> with password <b>%s</b>"
-msgstr "Pievienoja lietotāju <b>%s</b> ar paroli <b>%s</b>"
+msgid "%s on %s in %s %s"
+msgstr "%s uz %s iekš %s %s"
 
-#: classes/pref/users.php:253
-#, php-format
-msgid "Could not create user <b>%s</b>"
-msgstr "Neizdevās izveidot lietotāju <b>%s</b>"
+#: classes/pref/filters.php:383
+#: classes/pref/filters.php:870
+#: classes/pref/filters.php:977
+msgid "Match"
+msgstr "Atbilstība"
 
-#: classes/pref/users.php:257
-#, php-format
-msgid "User <b>%s</b> already exists."
-msgstr "Lietotājs <b>%s</b> jau pastāv."
+#: classes/pref/filters.php:397
+#: classes/pref/filters.php:455
+#: classes/pref/filters.php:884
+#: classes/pref/filters.php:911
+msgid "Add"
+msgstr "Pievienot"
 
-#: classes/pref/users.php:285
-#, 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/filters.php:441
+#: classes/pref/filters.php:897
+msgid "Apply actions"
+msgstr "Pielietot darbības"
 
-#: classes/pref/users.php:287
-#, 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/filters.php:492
+#: classes/pref/filters.php:926
+msgid "Enabled"
+msgstr "Ieslēgts"
 
-#: classes/pref/users.php:311
-msgid "[tt-rss] Password change notification"
-msgstr "[tt-rss] paroles maiņas paziņojums"
+#: classes/pref/filters.php:501
+#: classes/pref/filters.php:929
+msgid "Match any rule"
+msgstr "Atbilst jebkuram likumam"
 
-#: classes/pref/users.php:346
-#: classes/pref/feeds.php:1179
-#: classes/pref/filters.php:788
-#: classes/feeds.php:1059
-#: classes/feeds.php:1127
-#: js/tt-rss.js:165
-msgid "Search"
-msgstr "Meklēt"
+#: classes/pref/filters.php:510
+#: classes/pref/filters.php:932
+msgid "Inverse matching"
+msgstr "Ačgārnā atbilstība"
 
-#: classes/pref/users.php:364
-msgid "Create user"
-msgstr "Izveidot lietotāju"
+#: classes/pref/filters.php:522
+#: classes/pref/filters.php:939
+msgid "Test"
+msgstr "Pārbaudīt"
+
+#: classes/pref/filters.php:804
+msgid "Combine"
+msgstr "Apvienot"
 
-#: classes/pref/users.php:368
 #: classes/pref/filters.php:807
+#: classes/pref/users.php:367
 msgid "Edit"
 msgstr "Mainīt"
 
-#: classes/pref/users.php:404
-#: classes/pref/feeds.php:626
-#: classes/pref/feeds.php:853
-#: classes/pref/feeds.php:1649
-#: classes/feeds.php:1013
-msgid "Login"
-msgstr "Pieteikšanās"
+#: classes/pref/filters.php:810
+#: classes/pref/feeds.php:1198
+#: classes/pref/feeds.php:1212
+msgid "Reset sort order"
+msgstr "Atstatīt kārtošanas secību"
 
-#: classes/pref/users.php:405
-msgid "Access Level"
-msgstr "Pieejas līmenis"
+#: classes/pref/filters.php:942
+msgid "Create"
+msgstr "Izveidot"
 
-#: classes/pref/users.php:408
-msgid "Last login"
-msgstr "Pēdējā pieteikšanās"
+#: classes/pref/filters.php:987
+msgid "Regular expression, without outer delimiters (i.e. slashes)"
+msgstr ""
 
-#: classes/pref/users.php:427
-msgid "Click to edit"
-msgstr "Klikšķiniet, lai mainītu"
+#: classes/pref/filters.php:993
+msgid "Inverse regular expression matching"
+msgstr "Ačgārna regulāro izteiksmju atbilstība"
 
-#: classes/pref/users.php:447
-msgid "No users defined."
-msgstr "Nav definēti lietotāji."
+#: classes/pref/filters.php:995
+msgid "on field"
+msgstr "laukā"
 
-#: classes/pref/users.php:449
-msgid "No matching users found."
-msgstr "Neatradu atbilstošus lietotājus."
+#: classes/pref/filters.php:1001
+#: js/PrefFilterTree.js:44
+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:764
+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:786
+msgid "Add action"
+msgstr "Pievienot darbību"
+
+#: classes/pref/filters.php:1139
+msgid "[No caption]"
+msgstr "[nav paraksta]"
+
+#: classes/pref/filters.php:1141
+#, 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:1155
+#, fuzzy
+msgid "matches any rule"
+msgstr "Atbilst jebkuram likumam"
+
+#: classes/pref/filters.php:1158
+#, 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/system.php:8
+#: classes/pref/users.php:6
+msgid "Your access level is insufficient to open this tab."
+msgstr "Jums nav pietiekamas pieejas tiesības, lai atvērtu šo cilni."
 
 #: classes/pref/system.php:29
 msgid "Error Log"
@@ -1446,385 +1439,316 @@ msgid_plural "(%d feeds)"
 msgstr[0] "(%d barotne)"
 msgstr[1] "(%d barotnes)"
 
-#: classes/pref/feeds.php:514
+#: classes/pref/feeds.php:513
 #: classes/pref/prefs.php:18
 msgid "General"
 msgstr "Vispārīgi"
 
-#: classes/pref/feeds.php:528
+#: classes/pref/feeds.php:527
 msgid "Feed Title"
 msgstr "Barotnes virsraksts"
 
-#: classes/pref/feeds.php:560
-#: classes/pref/feeds.php:801
-#: classes/pref/feeds.php:1635
-#: classes/feeds.php:989
-msgid "Place in category:"
-msgstr "Ievietot kategorijā:"
+#: classes/pref/feeds.php:536
+#: classes/handler/public.php:417
+msgid "URL:"
+msgstr "URL:"
 
-#: classes/pref/feeds.php:572
+#: classes/pref/feeds.php:571
 #, fuzzy
 msgid "Site URL:"
 msgstr "Raksta vietrādis:"
 
-#: classes/pref/feeds.php:574
+#: classes/pref/feeds.php:573
 #, fuzzy
 msgid "Site URL"
 msgstr "Barotnes URL"
 
-#: classes/pref/feeds.php:585
-#: classes/pref/feeds.php:815
+#: classes/pref/feeds.php:584
+#: classes/pref/feeds.php:814
 #, fuzzy
 msgid "Language:"
 msgstr "Valoda"
 
-#: classes/pref/feeds.php:592
-#: classes/pref/feeds.php:824
+#: classes/pref/feeds.php:591
+#: classes/pref/feeds.php:823
 msgid "Update"
 msgstr "Atjaunot"
 
-#: classes/pref/feeds.php:607
-#: classes/pref/feeds.php:840
+#: classes/pref/feeds.php:606
+#: classes/pref/feeds.php:839
 msgid "Article purging:"
 msgstr "Dzēšu rakstu:"
 
-#: classes/pref/feeds.php:632
-#: classes/pref/feeds.php:861
-#: classes/pref/feeds.php:1652
-#: classes/pref/prefs.php:243
-#: classes/feeds.php:1017
-msgid "Password"
-msgstr "Parole"
-
-#: classes/pref/feeds.php:636
+#: classes/pref/feeds.php:635
 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:646
-#: classes/feeds.php:1028
-msgid "This feed requires authentication."
-msgstr "Šim laukam ir nepieciešams autentificēties."
+#: classes/pref/feeds.php:647
+#: classes/pref/feeds.php:866
+#: classes/pref/users.php:82
+msgid "Options"
+msgstr "Iespējas"
 
-#: classes/pref/feeds.php:662
-#: classes/pref/feeds.php:871
+#: classes/pref/feeds.php:661
+#: classes/pref/feeds.php:870
 msgid "Hide from Popular feeds"
 msgstr "Nerādīt populārajās barotnēs"
 
-#: classes/pref/feeds.php:674
-#: classes/pref/feeds.php:877
+#: classes/pref/feeds.php:673
+#: classes/pref/feeds.php:876
 msgid "Include in e-mail digest"
 msgstr "Iekļaut e-pasta īssavilkumu"
 
-#: classes/pref/feeds.php:687
-#: classes/pref/feeds.php:883
+#: classes/pref/feeds.php:686
+#: classes/pref/feeds.php:882
 msgid "Always display image attachments"
 msgstr "Vienmēr rādīt attēlu pielikumus"
 
-#: classes/pref/feeds.php:700
-#: classes/pref/feeds.php:891
+#: classes/pref/feeds.php:699
+#: classes/pref/feeds.php:890
 #, fuzzy
 msgid "Do not embed media"
 msgstr "Neiegult attēlus"
 
-#: classes/pref/feeds.php:713
-#: classes/pref/feeds.php:899
+#: classes/pref/feeds.php:712
+#: classes/pref/feeds.php:898
 msgid "Cache media"
 msgstr ""
 
-#: classes/pref/feeds.php:725
-#: classes/pref/feeds.php:905
+#: classes/pref/feeds.php:724
+#: classes/pref/feeds.php:904
 msgid "Mark updated articles as unread"
 msgstr "Atzīmēt atjaunotos rakstus kā nelasītus"
 
-#: classes/pref/feeds.php:729
+#: classes/pref/feeds.php:728
 msgid "Icon"
 msgstr "Ikona"
 
-#: classes/pref/feeds.php:743
-#: classes/pref/feeds.php:1284
+#: classes/pref/feeds.php:742
+#: classes/pref/feeds.php:1283
 #: plugins/import_export/init.php:71
 #, fuzzy
 msgid "Choose file..."
 msgstr "Izveidot filtru..."
 
-#: classes/pref/feeds.php:750
+#: classes/pref/feeds.php:749
 msgid "Replace"
 msgstr "Aizvietot"
 
-#: classes/pref/feeds.php:757
+#: classes/pref/feeds.php:756
 #: classes/pref/prefs.php:679
 msgid "Plugins"
 msgstr "Spraudņi"
 
-#: classes/pref/feeds.php:1154
+#: classes/pref/feeds.php:1153
 msgid "Feeds with errors"
 msgstr "Barotnes ar kļūdām"
 
-#: classes/pref/feeds.php:1161
+#: classes/pref/feeds.php:1160
 msgid "Inactive feeds"
 msgstr "Neaktīvās barotnes"
 
-#: classes/pref/feeds.php:1197
+#: classes/pref/feeds.php:1196
 msgid "Edit selected feeds"
 msgstr "Mainīt izvēlētās barotnes"
 
-#: classes/pref/feeds.php:1199
-#: classes/pref/feeds.php:1213
-#: classes/pref/filters.php:810
-msgid "Reset sort order"
-msgstr "Atstatīt kārtošanas secību"
-
-#: classes/pref/feeds.php:1201
-#: js/prefs.js:1462
+#: classes/pref/feeds.php:1200
+#: js/prefs.js:1171
 msgid "Batch subscribe"
 msgstr "Pasūtījuma pakotne"
 
-#: classes/pref/feeds.php:1208
+#: classes/pref/feeds.php:1207
 msgid "Categories"
 msgstr "Kategorijas"
 
-#: classes/pref/feeds.php:1211
+#: classes/pref/feeds.php:1210
 msgid "Add category"
 msgstr "Pievienot kategoriju"
 
-#: classes/pref/feeds.php:1215
+#: classes/pref/feeds.php:1214
 msgid "Remove selected"
 msgstr "Dzēst izvēlētās"
 
-#: classes/pref/feeds.php:1272
+#: classes/pref/feeds.php:1271
 msgid "OPML"
 msgstr "OPML"
 
-#: classes/pref/feeds.php:1274
+#: classes/pref/feeds.php:1273
 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:1275
+#: classes/pref/feeds.php:1274
 msgid "Only main settings profile can be migrated using OPML."
 msgstr "Izmantojot OPML var migrēt tikai galvenos iestatījumus."
 
-#: classes/pref/feeds.php:1290
+#: classes/pref/feeds.php:1289
 msgid "Import my OPML"
 msgstr "Importēt manu OPML"
 
-#: classes/pref/feeds.php:1296
+#: classes/pref/feeds.php:1295
 msgid "Filename:"
 msgstr "Faila nosaukums:"
 
-#: classes/pref/feeds.php:1298
+#: classes/pref/feeds.php:1297
 msgid "Include settings"
 msgstr "Iekļaut iestatījumus"
 
-#: classes/pref/feeds.php:1302
+#: classes/pref/feeds.php:1301
 msgid "Export OPML"
 msgstr "Eksportēt OPML"
 
-#: classes/pref/feeds.php:1306
+#: classes/pref/feeds.php:1305
 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:1310
+#: classes/pref/feeds.php:1309
 msgid "Public OPML URL"
 msgstr "Publiskā OPML URL (adrese)"
 
-#: classes/pref/feeds.php:1311
+#: classes/pref/feeds.php:1310
 msgid "Display published OPML URL"
 msgstr "Parādīt publicētā OPML URL"
 
-#: classes/pref/feeds.php:1318
+#: classes/pref/feeds.php:1317
 msgid "Published & shared articles / Generated feeds"
 msgstr "Publicētie un kopīgotie raksti / sagatavotās barotnes"
 
-#: classes/pref/feeds.php:1320
+#: classes/pref/feeds.php:1319
 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:1327
-#: classes/feeds.php:54
-#: classes/feeds.php:140
-msgid "View as RSS"
-msgstr "Skatīt kā RSS"
-
-#: classes/pref/feeds.php:1328
 msgid "Display URL"
 msgstr "Parādīt URL"
 
-#: classes/pref/feeds.php:1331
+#: classes/pref/feeds.php:1330
 msgid "Clear all generated URLs"
 msgstr "Attīrīt visus ģenerētos URL"
 
-#: classes/pref/feeds.php:1410
+#: classes/pref/feeds.php:1409
 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:1444
-#: classes/pref/feeds.php:1509
+#: classes/pref/feeds.php:1443
+#: classes/pref/feeds.php:1508
 msgid "Click to edit feed"
 msgstr "Klikšķiniet, lai mainītu"
 
-#: classes/pref/feeds.php:1462
-#: classes/pref/feeds.php:1529
+#: classes/pref/feeds.php:1461
+#: classes/pref/feeds.php:1528
 msgid "Unsubscribe from selected feeds"
 msgstr "Atcelt izvēlēto barotņu pasūtīšanu"
 
-#: classes/pref/feeds.php:1632
+#: classes/pref/feeds.php:1629
 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:1641
+#: classes/pref/feeds.php:1638
 msgid "Feeds to subscribe, One per line"
 msgstr "Pasūtāmās barotnes, pa vienai katrā rindā"
 
-#: classes/pref/feeds.php:1664
+#: classes/pref/feeds.php:1661
 msgid "Feeds require authentication."
 msgstr "Barotnēm nepieciešama autentifikācija"
 
-#: classes/pref/feeds.php:1671
-#: classes/feeds.php:1031
-#: classes/feeds.php:1087
-msgid "Subscribe"
-msgstr "Pasūtīt"
-
-#: classes/pref/filters.php:155
+#: classes/pref/users.php:26
 #, fuzzy
-msgid "Preview article"
-msgstr "Jaunākie raksti"
+msgid "Edit user"
+msgstr "Mainīt likumu"
 
-#: classes/pref/filters.php:267
-#: classes/pref/filters.php:573
-msgid "(inverse)"
-msgstr "(apvērst)"
+#: classes/pref/users.php:64
+msgid "Access level: "
+msgstr "Pieejas līmenis:"
 
-#: classes/pref/filters.php:263
-#: classes/pref/filters.php:572
-#, php-format
-msgid "%s on %s in %s %s"
-msgstr "%s uz %s iekš %s %s"
+#: classes/pref/users.php:96
+#: js/prefs.js:403
+msgid "User details"
+msgstr "Lietotāja detaļas"
 
-#: classes/pref/filters.php:383
-#: classes/pref/filters.php:870
-#: classes/pref/filters.php:977
-msgid "Match"
-msgstr "Atbilstība"
+#: classes/pref/users.php:136
+#: classes/pref/users.php:406
+msgid "Registered"
+msgstr "Reģistrēts"
 
-#: classes/pref/filters.php:397
-#: classes/pref/filters.php:455
-#: classes/pref/filters.php:884
-#: classes/pref/filters.php:911
-msgid "Add"
-msgstr "Pievienot"
+#: classes/pref/users.php:137
+msgid "Last logged in"
+msgstr "Pēdējo reizi pieteicies"
 
-#: classes/pref/filters.php:400
-#: classes/pref/filters.php:458
-#: classes/pref/filters.php:887
-#: classes/pref/filters.php:914
-#: classes/feeds.php:122
-msgid "Delete"
-msgstr "Dzēst"
+#: classes/pref/users.php:145
+msgid "Subscribed feeds count"
+msgstr "Pasūtīto barotņu skaits"
 
-#: classes/pref/filters.php:441
-#: classes/pref/filters.php:897
-msgid "Apply actions"
-msgstr "Pielietot darbības"
-
-#: classes/pref/filters.php:492
-#: classes/pref/filters.php:926
-msgid "Enabled"
-msgstr "Ieslēgts"
-
-#: classes/pref/filters.php:501
-#: classes/pref/filters.php:929
-msgid "Match any rule"
-msgstr "Atbilst jebkuram likumam"
-
-#: classes/pref/filters.php:510
-#: classes/pref/filters.php:932
-msgid "Inverse matching"
-msgstr "Ačgārnā atbilstība"
-
-#: classes/pref/filters.php:522
-#: classes/pref/filters.php:939
-msgid "Test"
-msgstr "Pārbaudīt"
-
-#: classes/pref/filters.php:804
-msgid "Combine"
-msgstr "Apvienot"
-
-#: classes/pref/filters.php:942
-msgid "Create"
-msgstr "Izveidot"
-
-#: classes/pref/filters.php:987
-msgid "Regular expression, without outer delimiters (i.e. slashes)"
-msgstr ""
-
-#: 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:43
-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:797
-msgid "Add rule"
-msgstr "Pievienot likumu"
-
-#: classes/pref/filters.php:1042
-msgid "Perform Action"
-msgstr "Pielietot darbību"
-
-#: classes/pref/filters.php:1093
+#: classes/pref/users.php:146
 #, fuzzy
-msgid "No actions available"
-msgstr "Ir pieejama jauna versija!"
+msgid "Stored articles"
+msgstr "Zvaigžņotie raksti"
 
-#: classes/pref/filters.php:1112
-msgid "Save action"
-msgstr "Saglabāt darbību"
+#: classes/pref/users.php:150
+#: classes/pref/users.php:405
+msgid "Subscribed feeds"
+msgstr "Pasūtītās barotnes"
 
-#: classes/pref/filters.php:1112
-#: js/functions.js:819
-msgid "Add action"
-msgstr "Pievienot darbību"
+#: classes/pref/users.php:176
+msgid "User not found"
+msgstr "Lietotājs netika atrasts"
 
-#: classes/pref/filters.php:1139
-msgid "[No caption]"
-msgstr "[nav paraksta]"
-
-#: classes/pref/filters.php:1141
+#: classes/pref/users.php:246
 #, php-format
-msgid "%s (%d rule)"
-msgid_plural "%s (%d rules)"
-msgstr[0] "%s (%d likums)"
-msgstr[1] "%s (%d likumi)"
+msgid "Added user <b>%s</b> with password <b>%s</b>"
+msgstr "Pievienoja lietotāju <b>%s</b> ar paroli <b>%s</b>"
 
-#: classes/pref/filters.php:1155
-#, fuzzy
-msgid "matches any rule"
-msgstr "Atbilst jebkuram likumam"
-
-#: classes/pref/filters.php:1158
+#: classes/pref/users.php:253
 #, php-format
-msgid "%s (+%d action)"
-msgid_plural "%s (+%d actions)"
-msgstr[0] "%s (+%d darbība)"
-msgstr[1] "%s (+%d darbības)"
+msgid "Could not create user <b>%s</b>"
+msgstr "Neizdevās izveidot lietotāju <b>%s</b>"
+
+#: classes/pref/users.php:257
+#, php-format
+msgid "User <b>%s</b> already exists."
+msgstr "Lietotājs <b>%s</b> jau pastāv."
+
+#: classes/pref/users.php:285
+#, 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:287
+#, 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:310
+msgid "[tt-rss] Password change notification"
+msgstr "[tt-rss] paroles maiņas paziņojums"
+
+#: classes/pref/users.php:363
+msgid "Create user"
+msgstr "Izveidot lietotāju"
+
+#: classes/pref/users.php:371
+#: classes/handler/public.php:747
+msgid "Reset password"
+msgstr "Atstatīt paroli"
+
+#: classes/pref/users.php:404
+msgid "Access Level"
+msgstr "Pieejas līmenis"
+
+#: classes/pref/users.php:407
+msgid "Last login"
+msgstr "Pēdējā pieteikšanās"
+
+#: classes/pref/users.php:426
+msgid "Click to edit"
+msgstr "Klikšķiniet, lai mainītu"
+
+#: classes/pref/users.php:446
+msgid "No users defined."
+msgstr "Nav definēti lietotāji."
+
+#: classes/pref/users.php:448
+msgid "No matching users found."
+msgstr "Neatradu atbilstošus lietotājus."
 
 #: classes/pref/prefs.php:19
 msgid "Interface"
@@ -2000,7 +1924,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:1424
+#: js/prefs.js:1136
 msgid "Customize stylesheet"
 msgstr "Pielāgot stilu lapu"
 
@@ -2243,254 +2167,298 @@ msgstr "Dzēst iezīmētos profilus"
 msgid "Activate profile"
 msgstr "Aktivizēt profilu"
 
-#: classes/feeds.php:53
-msgid "View as RSS feed"
-msgstr "Skatīt RSS barotni"
+#: 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."
 
-#: classes/feeds.php:62
-#, php-format
-msgid "Last updated: %s"
-msgstr "Nesenākais atjaunojums: %s"
+#: classes/dlg.php:44
+msgid "Your Public OPML URL is:"
+msgstr "Jūsu publiskais OPML URL ir:"
 
-#: classes/feeds.php:100
+#: classes/dlg.php:53
+#: classes/dlg.php:178
+#: plugins/share/init.php:125
+msgid "Generate new URL"
+msgstr "Izveidot jaunu URL"
+
+#: classes/dlg.php:67
+msgid "Update daemon is enabled in configuration, but daemon process is not running, which prevents all feeds from updating. Please start the daemon process or contact instance owner."
+msgstr "Atjaunošanas process iestatījumos ir ieslēgts, bet tas nedarbojas, tāpēc barotnes neatjaunojas. Lūdzu palaidiet atjaunošanas procesu vai arī sazinieties ar servera īpašnieku."
+
+#: classes/dlg.php:71
+#: classes/dlg.php:80
+msgid "Last update:"
+msgstr "Pēdējais atjaunojums:"
+
+#: classes/dlg.php:76
+msgid "Update daemon is taking too long to perform a feed update. This could indicate a problem like crash or a hang. Please check the daemon process or contact instance owner."
+msgstr "Atjaunošanas process aizņem pārāk ilgu laiku. Iespējams, ka tas ir tāpēc, ka process ir \"uzkāries\". Lūdzu pārbaudiet atjaunošanas procesu vai arī sazinieties ar servera īpašnieku."
+
+#: classes/dlg.php:169
+msgid "You can view this feed as RSS using the following URL:"
+msgstr "Jūs varat skatīt so baronti kā RSS ar sekojošu URL:"
+
+#: classes/dlg.php:190
+msgid "You are using default tt-rss password. Please change it in the Preferences (Personal data / Authentication)."
+msgstr ""
+
+#: classes/dlg.php:194
 #, fuzzy
-msgid "Select..."
-msgstr "Iezīmēt"
+msgid "Open Preferences"
+msgstr "Iestatījumi"
 
-#: classes/feeds.php:104
-msgid "Invert"
-msgstr "Apgriezt"
+#: classes/opml.php:31
+#: classes/opml.php:36
+msgid "OPML Utility"
+msgstr "OPML rīks"
 
-#: classes/feeds.php:107
-msgid "Selection toggle:"
-msgstr "Izvēles pārslēgšana:"
+#: classes/opml.php:40
+msgid "Importing OPML..."
+msgstr "Importē OPML..."
 
-#: classes/feeds.php:113
-msgid "Selection:"
-msgstr "Izvēle:"
+#: classes/opml.php:45
+msgid "Return to preferences"
+msgstr "Atgriezties uz iestatījumiem"
 
-#: classes/feeds.php:116
-msgid "Set score"
-msgstr "Iestatīr vērtējumu"
-
-#: classes/feeds.php:119
-msgid "Archive"
-msgstr "Arhivēt"
-
-#: classes/feeds.php:121
-msgid "Move back"
-msgstr "Pārvietot atpakaļ"
-
-#: classes/feeds.php:127
-#: classes/feeds.php:132
-#: plugins/mail/init.php:76
-#: plugins/mailto/init.php:25
-msgid "Forward by email"
-msgstr "Pārsūtīt e-pastā"
-
-#: classes/feeds.php:136
-msgid "Feed:"
-msgstr "Barotne:"
-
-#: classes/feeds.php:193
-#: classes/feeds.php:819
-msgid "Feed not found."
-msgstr "Barotne netika atrasta."
-
-#: classes/feeds.php:255
-msgid "Never"
-msgstr "Nekad"
-
-#: classes/feeds.php:342
+#: classes/opml.php:301
 #, php-format
-msgid "Imported at %s"
-msgstr "Importēts %s"
+msgid "Adding feed: %s"
+msgstr "Pievieno barotni: %s"
 
-#: classes/feeds.php:394
-#: classes/feeds.php:487
-msgid "mark feed as read"
-msgstr "atzīmēt barotni kā lasītu"
-
-#: classes/feeds.php:542
-msgid "Collapse article"
-msgstr "Sakļaut rakstu"
-
-#: classes/feeds.php:703
-msgid "No unread articles found to display."
-msgstr "Nav neizlasītu rakstu, ko rādīt."
-
-#: classes/feeds.php:706
-msgid "No updated articles found to display."
-msgstr "Nav atjaunotu rakstu, ko rādīt."
-
-#: classes/feeds.php:709
-msgid "No starred articles found to display."
-msgstr "Nav zvaigžņotu rakstu, ko rādīt."
-
-#: classes/feeds.php:713
-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:715
-msgid "No articles found to display."
-msgstr "Netika atrasti raksti, ko rādīt."
-
-#: classes/feeds.php:731
-#: classes/feeds.php:922
+#: classes/opml.php:312
 #, php-format
-msgid "Feeds last updated at %s"
-msgstr "Barotnes pēdējo reizi atjaunotas %s."
+msgid "Duplicate feed: %s"
+msgstr "Dublēta barotne: %s"
 
-#: classes/feeds.php:743
-#: classes/feeds.php:934
-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:911
-msgid "No feed selected."
-msgstr "Nav izvēlēta barotne."
-
-#: classes/feeds.php:975
-#: classes/feeds.php:983
-msgid "Feed or site URL"
-msgstr "Barotnes vai vietnes URL"
-
-#: classes/feeds.php:997
-msgid "Available feeds"
-msgstr "Pieejamās barotnes"
-
-#: classes/feeds.php:1034
-msgid "More feeds"
-msgstr "Vairāk barotnes"
-
-#: classes/feeds.php:1063
-msgid "Popular feeds"
-msgstr "Populārās barotnes"
-
-#: classes/feeds.php:1064
-msgid "Feed archive"
-msgstr "Barotņu arhīvs"
-
-#: classes/feeds.php:1067
-msgid "limit:"
-msgstr "ierobežojumi:"
-
-#: classes/feeds.php:1101
-msgid "Look for"
-msgstr "Meklēt"
-
-#: classes/feeds.php:1109
+#: classes/opml.php:326
 #, php-format
-msgid "in %s"
+msgid "Adding label %s"
+msgstr "Pievieno etiķeti %s"
+
+#: classes/opml.php:329
+#, php-format
+msgid "Duplicate label: %s"
+msgstr "Dublēta etiķete: %s"
+
+#: classes/opml.php:341
+#, php-format
+msgid "Setting preference key %s to %s"
+msgstr "Saglabā iestatījumu atslēgu %s līdz %s"
+
+#: classes/opml.php:377
+msgid "Adding filter..."
+msgstr "Pievieno filtru..."
+
+#: classes/opml.php:512
+#, php-format
+msgid "Processing category: %s"
+msgstr "Apstrādā kategoriju: %s"
+
+#: classes/opml.php:558
+#, php-format
+msgid "Upload failed with error code %d"
+msgstr "Augšuplāde neizdevās ar kļūdas kodu %d"
+
+#: classes/opml.php:570
+#: plugins/import_export/init.php:471
+msgid "Unable to move uploaded file."
+msgstr "Neizdevās pārvietot augšuplādēto failu."
+
+#: classes/opml.php:574
+#: plugins/import_export/init.php:475
+msgid "Error: please upload OPML file."
+msgstr "Kļūda: lūdzu augšuplādējiet OPML failu."
+
+#: classes/opml.php:585
+msgid "Error: unable to find moved OPML file."
+msgstr "Kļūda: neizdevās atrast pārvietoto OPML failu."
+
+#: classes/opml.php:594
+msgid "Error while parsing document."
+msgstr "Dokumenta apstrādes kļūda."
+
+#: classes/article.php:26
+msgid "Article not found."
+msgstr "Raksts netika atrasts."
+
+#: classes/article.php:211
+msgid "Tags for this article (separated by commas):"
+msgstr "Šī raksta iezīmes (atdalītas ar komatiem):"
+
+#: classes/article.php:337
+#: classes/article.php:719
+#: classes/article.php:874
+msgid "no tags"
+msgstr "nav iezīmju"
+
+#: classes/article.php:447
+msgid "unknown type"
+msgstr "nezināms tips"
+
+#: classes/article.php:524
+msgid "Attachments"
+msgstr "Pielikumi"
+
+#: classes/article.php:688
+msgid " - "
+msgstr "–"
+
+#: classes/article.php:912
+msgid "(edit note)"
+msgstr "(mainīt piezīmi)"
+
+#: classes/handler/public.php:407
+#: plugins/bookmarklets/init.php:40
+msgid "Share with Tiny Tiny RSS"
+msgstr "Kopīgot ar Tiny Tiny RSS"
+
+#: classes/handler/public.php:415
+msgid "Title:"
+msgstr "Virsraksts:"
+
+#: classes/handler/public.php:419
+msgid "Content:"
+msgstr "Saturs:"
+
+#: classes/handler/public.php:421
+msgid "Labels:"
+msgstr "Etiķetes:"
+
+#: classes/handler/public.php:440
+msgid "Shared article will appear in the Published feed."
+msgstr "Kopīgotais raksts parādīsies Publicēts barotnē"
+
+#: classes/handler/public.php:442
+msgid "Share"
+msgstr "Kopīgot"
+
+#: classes/handler/public.php:464
+msgid "Not logged in"
+msgstr "Nav pieteicies"
+
+#: classes/handler/public.php:527
+msgid "Incorrect username or password"
+msgstr "Nepareizs lietotāja vārds vai parole"
+
+#: classes/handler/public.php:581
+#, php-format
+msgid "Already subscribed to <b>%s</b>."
+msgstr "Jau ir pasūtījis <b>%s</b>."
+
+#: classes/handler/public.php:584
+#, php-format
+msgid "Subscribed to <b>%s</b>."
+msgstr "Pasūtījis <b>%s</b>."
+
+#: classes/handler/public.php:587
+#, php-format
+msgid "Could not subscribe to <b>%s</b>."
+msgstr "Neizdevās pasūtīt <b>%s</b>."
+
+#: classes/handler/public.php:590
+#, php-format
+msgid "No feeds found in <b>%s</b>."
+msgstr "<b>%s</b> barotne netika atrasta."
+
+#: classes/handler/public.php:593
+msgid "Multiple feed URLs found."
+msgstr "Atradu vairākus barotņu URLus."
+
+#: classes/handler/public.php:597
+#, 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:615
+msgid "Subscribe to selected feed"
+msgstr "Pasūtīt norādīto barotni"
+
+#: classes/handler/public.php:642
+msgid "Edit subscription options"
+msgstr "Mainīt barotnes iestatījumus"
+
+#: classes/handler/public.php:680
+msgid "Password recovery"
+msgstr "Parole atjaunošana"
+
+#: classes/handler/public.php:725
+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:757
+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:761
+#: classes/handler/public.php:830
+msgid "Go back"
+msgstr "Doties atpakaļ"
+
+#: classes/handler/public.php:799
+msgid "[tt-rss] Password reset request"
+msgstr "[tt-rss] paroles pārstatīšanas pieprasījums"
+
+#: 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: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:874
+msgid "Database Updater"
+msgstr "Datu bāzes atjaunotājs"
+
+#: classes/handler/public.php:939
+msgid "Perform updates"
+msgstr "Izpildīt atjaunojumus"
+
+#: plugins/af_zz_imgproxy/init.php:208
+msgid "Image proxy settings (af_zz_imgproxy)"
 msgstr ""
 
-#: classes/feeds.php:1114
-msgid "Used for word stemming"
-msgstr ""
+#: plugins/af_zz_imgproxy/init.php:232
+#, fuzzy
+msgid "Enable proxy for all remote images."
+msgstr "Ieslēgt barotņu kategorijas"
 
-#: classes/feeds.php:1123
-msgid "Search syntax"
-msgstr "Meklēšanas sintakse"
+#: plugins/af_zz_imgproxy/init.php:236
+#, fuzzy
+msgid "Don't cache files locally."
+msgstr "Kešot attēlus lokāli"
 
-#: classes/feeds.php:1577
-msgid "Starred articles"
-msgstr "Zvaigžņotie raksti"
-
-#: classes/feeds.php:1579
-msgid "Published articles"
-msgstr "Publicētie raksti"
-
-#: classes/feeds.php:1581
-msgid "Fresh articles"
-msgstr "Jaunākie raksti"
-
-#: classes/feeds.php:1585
-msgid "Archived articles"
-msgstr "Arhivētie raksti"
-
-#: classes/feeds.php:1587
-msgid "Recently read"
-msgstr "Nesen lasītie raksti"
-
-#: classes/feeds.php:1708
-msgid "Special"
-msgstr "Īpaši"
-
-#: classes/feeds.php:1965
-#, php-format
-msgid "Search results: %s"
-msgstr "Meklēšanas rezultāti: %s"
-
-#: 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."
+#: plugins/af_zz_imgproxy/init.php:252
+#: plugins/af_redditimgur/init.php:79
+#, fuzzy
+msgid "Configuration saved"
 msgstr "Iestatījumi ir saglabāti."
 
-#: plugins/note/init.php:28
-#: plugins/note/note.js:11
-msgid "Edit article note"
-msgstr "Mainīt raksta piezīmes"
-
 #: plugins/vf_shared/init.php:17
 #: plugins/vf_shared/init.php:73
 msgid "Shared articles"
 msgstr "Kopīgoti raksti"
 
-#: plugins/auth_internal/init.php:67
-msgid "Please enter your one time password:"
-msgstr "Lūdzu ievadiet vienreizlietojamo paroli:"
+#: plugins/bookmarklets/init.php:20
+msgid "Bookmarklets"
+msgstr "Grāmatzīmes"
 
-#: plugins/auth_internal/init.php:208
-msgid "Password has been changed."
-msgstr "Parole ir nomainīta."
+#: 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 "Velciet zemāk minēto saiti uz jūsu pārlūkprogrammas rīku joslu, tad atveriet jūs interesējošo saiti un klikšķiniet uz tās, lai pasūtītu tās jaunumus"
 
-#: plugins/auth_internal/init.php:210
-msgid "Old password is incorrect."
-msgstr "Vecā parole nav pareiza."
+#: plugins/bookmarklets/init.php:26
+#, php-format
+msgid "Subscribe to %s in Tiny Tiny RSS?"
+msgstr "Pasūtīt %s Tiny Tiny RSS?"
 
-#: plugins/af_readability/init.php:25
-msgid "Data saved."
-msgstr ""
+#: plugins/bookmarklets/init.php:31
+msgid "Subscribe in Tiny Tiny RSS"
+msgstr "Pasūtīt Tiny Tiny RSS"
 
-#: plugins/af_readability/init.php:41
-#, fuzzy
-msgid "Inline content"
-msgstr "Pārtīt raksta saturu"
-
-#: plugins/af_readability/init.php:47
-msgid "Readability settings (af_readability)"
-msgstr ""
-
-#: plugins/af_readability/init.php:78
-msgid "Use Readability for pages shared via bookmarklet."
-msgstr ""
-
-#: plugins/af_readability/init.php:90
-#: plugins/af_psql_trgm/init.php:198
-msgid "Currently enabled for (click to edit):"
-msgstr ""
-
-#: plugins/af_readability/init.php:107
-#, fuzzy
-msgid "Readability"
-msgstr "Pārbaudīt pieejamību"
-
-#: plugins/af_readability/init.php:118
-#, fuzzy
-msgid "Inline article content"
-msgstr "Pārtīt raksta saturu"
+#: plugins/bookmarklets/init.php:34
+msgid "Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS"
+msgstr "Izmantojiet grāmatzīmes lai publicētu izvēlētās lapas Tiny Tiny RSS"
 
 #: plugins/af_redditimgur/init.php:30
 msgid "Reddit content settings (af_redditimgur)"
@@ -2504,11 +2472,21 @@ msgstr ""
 msgid "Enable additional duplicate checking"
 msgstr ""
 
-#: plugins/af_redditimgur/init.php:79
-#: plugins/af_zz_imgproxy/init.php:252
-#, fuzzy
-msgid "Configuration saved"
-msgstr "Iestatījumi ir saglabāti."
+#: plugins/af_comics/init.php:49
+msgid "Feeds supported by af_comics"
+msgstr "Ar af_comics atbalstītās barotnes"
+
+#: plugins/af_comics/init.php:51
+msgid "The following comics are currently supported:"
+msgstr "Šobrīd tiek atbalstīti sekojoši komiksi:"
+
+#: plugins/af_comics/init.php:69
+msgid "To subscribe to GoComics use the comic's regular web page as the feed URL (e.g. for the <em>Garfield</em> comic use <code>http://www.gocomics.com/garfield</code>)."
+msgstr ""
+
+#: plugins/af_comics/init.php:71
+msgid "Drop any updated filters into <code>filters.local</code> in plugin directory."
+msgstr ""
 
 #: plugins/af_psql_trgm/init.php:29
 #, php-format
@@ -2548,26 +2526,87 @@ msgstr ""
 msgid "Enable for all feeds:"
 msgstr "Ieslēgt barotņu kategorijas"
 
+#: plugins/af_psql_trgm/init.php:198
+#: plugins/af_readability/init.php:90
+msgid "Currently enabled for (click to edit):"
+msgstr ""
+
 #: plugins/af_psql_trgm/init.php:216
 msgid "Similarity (pg_trgm)"
 msgstr ""
 
-#: plugins/af_comics/init.php:49
-msgid "Feeds supported by af_comics"
-msgstr "Ar af_comics atbalstītās barotnes"
-
-#: plugins/af_comics/init.php:51
-msgid "The following comics are currently supported:"
-msgstr "Šobrīd tiek atbalstīti sekojoši komiksi:"
-
-#: plugins/af_comics/init.php:69
-msgid "To subscribe to GoComics use the comic's regular web page as the feed URL (e.g. for the <em>Garfield</em> comic use <code>http://www.gocomics.com/garfield</code>)."
+#: plugins/af_readability/init.php:25
+msgid "Data saved."
 msgstr ""
 
-#: plugins/af_comics/init.php:71
-msgid "Drop any updated filters into <code>filters.local</code> in plugin directory."
+#: plugins/af_readability/init.php:41
+#, fuzzy
+msgid "Inline content"
+msgstr "Pārtīt raksta saturu"
+
+#: plugins/af_readability/init.php:47
+msgid "Readability settings (af_readability)"
 msgstr ""
 
+#: plugins/af_readability/init.php:78
+msgid "Use Readability for pages shared via bookmarklet."
+msgstr ""
+
+#: plugins/af_readability/init.php:107
+#, fuzzy
+msgid "Readability"
+msgstr "Pārbaudīt pieejamību"
+
+#: plugins/af_readability/init.php:118
+#, fuzzy
+msgid "Inline article content"
+msgstr "Pārtīt raksta saturu"
+
+#: plugins/mailto/init.php:50
+#: plugins/mailto/init.php:58
+#: plugins/mail/init.php:118
+#: plugins/mail/init.php:124
+msgid "[Forwarded]"
+msgstr "[Pārsūtīts]"
+
+#: plugins/mailto/init.php:50
+#: plugins/mail/init.php:118
+msgid "Multiple articles"
+msgstr "Vairāki raksti"
+
+#: plugins/mailto/init.php:74
+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/mailto/init.php:78
+msgid "Forward selected article(s) by email."
+msgstr "Pārsūtīt izvēlētos rakstus pa e-pastu."
+
+#: plugins/mailto/init.php:81
+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/mailto/init.php:86
+msgid "Close this dialog"
+msgstr "Aizvērt šo logu"
+
+#: 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/import_export/init.php:53
 msgid "Import and export"
 msgstr "Imports un eksports"
@@ -2634,101 +2673,6 @@ msgstr "Augšuplāde neizdevās ar kļūdas kodu %d"
 msgid "No file uploaded."
 msgstr "Fails nav augšuplādēts."
 
-#: plugins/mail/init.php:29
-msgid "Mail addresses saved."
-msgstr "E-pasta adrese saglabāta."
-
-#: plugins/mail/init.php:35
-msgid "Mail plugin"
-msgstr "E-pasta spraudnis"
-
-#: plugins/mail/init.php:37
-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:118
-#: plugins/mail/init.php:124
-#: plugins/mailto/init.php:50
-#: plugins/mailto/init.php:58
-msgid "[Forwarded]"
-msgstr "[Pārsūtīts]"
-
-#: plugins/mail/init.php:118
-#: plugins/mailto/init.php:50
-msgid "Multiple articles"
-msgstr "Vairāki raksti"
-
-#: plugins/mail/init.php:146
-msgid "To:"
-msgstr "Uz:"
-
-#: plugins/mail/init.php:161
-msgid "Subject:"
-msgstr "Temats:"
-
-#: plugins/mail/init.php:178
-msgid "Send e-mail"
-msgstr "Nosūtīt e-pastu"
-
-#: plugins/close_button/init.php:25
-msgid "Close article"
-msgstr "Aizvērt rakstu"
-
-#: plugins/bookmarklets/init.php:20
-msgid "Bookmarklets"
-msgstr "Grāmatzīmes"
-
-#: 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 "Velciet zemāk minēto saiti uz jūsu pārlūkprogrammas rīku joslu, tad atveriet jūs interesējošo saiti un klikšķiniet uz tās, lai pasūtītu tās jaunumus"
-
-#: plugins/bookmarklets/init.php:26
-#, php-format
-msgid "Subscribe to %s in Tiny Tiny RSS?"
-msgstr "Pasūtīt %s Tiny Tiny RSS?"
-
-#: plugins/bookmarklets/init.php:31
-msgid "Subscribe in Tiny Tiny RSS"
-msgstr "Pasūtīt Tiny Tiny RSS"
-
-#: plugins/bookmarklets/init.php:34
-msgid "Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS"
-msgstr "Izmantojiet grāmatzīmes lai publicētu izvēlētās lapas Tiny Tiny RSS"
-
-#: plugins/toggle_sidebar/init.php:23
-msgid "Collapse feedlist"
-msgstr "Sakļaut barotņu sarakstu"
-
-#: plugins/af_zz_imgproxy/init.php:208
-msgid "Image proxy settings (af_zz_imgproxy)"
-msgstr ""
-
-#: plugins/af_zz_imgproxy/init.php:232
-#, fuzzy
-msgid "Enable proxy for all remote images."
-msgstr "Ieslēgt barotņu kategorijas"
-
-#: plugins/af_zz_imgproxy/init.php:236
-#, fuzzy
-msgid "Don't cache files locally."
-msgstr "Kešot attēlus lokāli"
-
-#: plugins/mailto/init.php:74
-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/mailto/init.php:78
-msgid "Forward selected article(s) by email."
-msgstr "Pārsūtīt izvēlētos rakstus pa e-pastu."
-
-#: plugins/mailto/init.php:81
-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/mailto/init.php:86
-msgid "Close this dialog"
-msgstr "Aizvērt šo logu"
-
 #: plugins/share/init.php:41
 msgid "You can disable all articles shared by unique URLs here."
 msgstr "Jūs varat atcelt ar šo URL kopīgotos rakstus šeit."
@@ -2749,453 +2693,611 @@ msgstr "Jūs varat kopīgot šo rakstu ar sekojošu unikālu URL:"
 msgid "Unshare article"
 msgstr "Nekopīgot rakstu"
 
-#: js/FeedTree.js:75
+#: plugins/toggle_sidebar/init.php:23
+msgid "Collapse feedlist"
+msgstr "Sakļaut barotņu sarakstu"
+
+#: plugins/close_button/init.php:25
+msgid "Close article"
+msgstr "Aizvērt rakstu"
+
+#: plugins/mail/init.php:29
+msgid "Mail addresses saved."
+msgstr "E-pasta adrese saglabāta."
+
+#: plugins/mail/init.php:35
+msgid "Mail plugin"
+msgstr "E-pasta spraudnis"
+
+#: plugins/mail/init.php:37
+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:146
+msgid "To:"
+msgstr "Uz:"
+
+#: plugins/mail/init.php:161
+msgid "Subject:"
+msgstr "Temats:"
+
+#: plugins/mail/init.php:178
+msgid "Send e-mail"
+msgstr "Nosūtīt e-pastu"
+
+#: plugins/note/init.php:28
+#: plugins/note/note.js:11
+msgid "Edit article note"
+msgstr "Mainīt raksta piezīmes"
+
+#: plugins/auth_internal/init.php:67
+msgid "Please enter your one time password:"
+msgstr "Lūdzu ievadiet vienreizlietojamo paroli:"
+
+#: plugins/auth_internal/init.php:208
+msgid "Password has been changed."
+msgstr "Parole ir nomainīta."
+
+#: plugins/auth_internal/init.php:210
+msgid "Old password is incorrect."
+msgstr "Vecā parole nav pareiza."
+
+#: js/FeedTree.js:76
 #, fuzzy
 msgid "(Un)collapse"
 msgstr "Izvērst/sakļaut sānjoslu"
 
-#: js/PrefFeedTree.js:35
+#: js/PrefFeedTree.js:36
 msgid "Edit category"
 msgstr "Mainīt kategoriju"
 
-#: js/PrefFeedTree.js:42
+#: js/PrefFeedTree.js:43
 msgid "Remove category"
 msgstr "Dzēst kategoriju"
 
-#: js/PrefFilterTree.js:46
+#: js/PrefFilterTree.js:47
 msgid "Inverse"
 msgstr "Apgriezt"
 
-#: js/feedlist.js:511
+#: js/feedlist.js:461
 #, fuzzy
 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:514
+#: js/feedlist.js:464
 #, fuzzy
 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:517
+#: js/feedlist.js:467
 #, fuzzy
 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:520
+#: js/feedlist.js:470
 #, fuzzy
 msgid "Mark %w in %s as read?"
 msgstr "Vai atzīmēt visus rakstus %s kā lasītus?"
 
-#: js/feedlist.js:523
+#: js/feedlist.js:473
 #, fuzzy
 msgid "search results"
 msgstr "Meklēšanas rezultāti: %s"
 
-#: js/feedlist.js:523
+#: js/feedlist.js:473
 #, fuzzy
 msgid "all articles"
 msgstr "Visi raksti"
 
-#: js/functions.js:74
+#: js/functions.js:100
 msgid "Close"
 msgstr "Aizvērt"
 
-#: js/functions.js:141
+#: js/functions.js:167
 msgid "Click to close"
 msgstr "Klikšķiniet, lai aizvērtu"
 
-#: js/functions.js:448
+#: js/functions.js:456
 msgid "Error explained"
 msgstr ""
 
-#: js/functions.js:592
+#: js/functions.js:490
+msgid "Upload complete."
+msgstr ""
+
+#: js/functions.js:508
+msgid "Remove stored feed icon?"
+msgstr "Dzēst saglabāto barotnes ikonu?"
+
+#: js/functions.js:510
+#, fuzzy
+msgid "Removing feed icon..."
+msgstr "Dzēst saglabāto barotnes ikonu?"
+
+#: js/functions.js:515
+#, fuzzy
+msgid "Feed icon removed."
+msgstr "Barotne netika atrasta."
+
+#: js/functions.js:532
+msgid "Please select an image file to upload."
+msgstr "Lūdzu norādiet augšuplādējamo attēla failu."
+
+#: js/functions.js:533
+msgid "Upload new icon for this feed?"
+msgstr "Augšuplādēt šai barotnei jaunu ikonu?"
+
+#: js/functions.js:534
+#, fuzzy
+msgid "Uploading, please wait..."
+msgstr "Ielādē, lūdzu gaidiet..."
+
+#: js/functions.js:542
+msgid "Please enter label caption:"
+msgstr "Lūdzu ievadiet etiķetes uzrakstu:"
+
+#: js/functions.js:575
 msgid "Subscribe to Feed"
 msgstr "Pasūtīt barotni"
 
-#: js/functions.js:621
+#: js/functions.js:602
 msgid "Failed to parse output. This can indicate server timeout and/or network issues. Backend output was logged to browser console."
 msgstr ""
 
-#: js/functions.js:636
+#: js/functions.js:617
 #, perl-format
 msgid "Subscribed to %s"
 msgstr "Pasūtīta barotne %s"
 
-#: js/functions.js:641
+#: js/functions.js:622
 msgid "Specified URL seems to be invalid."
 msgstr "Norādītais URL ir nepareizs."
 
-#: js/functions.js:644
+#: js/functions.js:625
 msgid "Specified URL doesn't seem to contain any feeds."
 msgstr "Norādītajā URL nav nevienas barotnes."
 
-#: js/functions.js:656
+#: js/functions.js:637
 #, fuzzy
 msgid "Expand to select feed"
 msgstr "Mainīt izvēlētās barotnes"
 
-#: js/functions.js:668
+#: js/functions.js:649
 #, perl-format
 msgid "Couldn't download the specified URL: %s"
 msgstr "Neizdevās lejuplādēt norādīto URL: %s"
 
-#: js/functions.js:672
+#: js/functions.js:653
 #, perl-format
 msgid "XML validation failed: %s"
 msgstr ""
 
-#: js/functions.js:676
+#: js/functions.js:657
 msgid "You are already subscribed to this feed."
 msgstr "Jūs jau esat pasūtījis šo barotni."
 
-#: js/functions.js:1136
+#: js/functions.js:1098
 msgid "Generate new syndication address for this feed?"
 msgstr "Izveidot jaunu šīs barotnes sindikācijas adresi?"
 
-#: js/functions.js:1140
-#: js/prefs.js:1095
+#: js/functions.js:1100
+#: js/prefs.js:870
 msgid "Trying to change address..."
 msgstr "Mēģina izmainīt adresi..."
 
-#: js/functions.js:1245
-#: js/tt-rss.js:446
-#: js/tt-rss.js:673
+#: js/functions.js:1199
+#: js/tt-rss.js:399
+#: js/tt-rss.js:612
 msgid "You can't edit this kind of feed."
 msgstr "Jūs nevarat mainīt šāda veida barotni."
 
-#: js/functions.js:1260
+#: js/functions.js:1213
 msgid "Edit Feed"
 msgstr "Mainīt barotni"
 
-#: js/functions.js:1266
-#: js/prefs.js:100
-#: js/prefs.js:209
-#: js/prefs.js:647
+#: js/functions.js:1217
+#: js/prefs.js:176
+#: js/prefs.js:523
+#: js/prefs.js:1139
+#: js/prefs.js:78
 msgid "Saving data..."
 msgstr "Saglabā datus..."
 
-#: js/functions.js:1293
+#: js/functions.js:1243
 msgid "More Feeds"
 msgstr "Vairāk barotnes"
 
-#: js/functions.js:1355
-#: js/functions.js:1464
-#: js/prefs.js:398
-#: js/prefs.js:540
-#: js/prefs.js:558
-#: js/prefs.js:1077
+#: js/functions.js:1297
+#: js/functions.js:1383
+#: js/prefs.js:332
+#: js/prefs.js:455
+#: js/prefs.js:473
+#: js/prefs.js:855
 msgid "No feeds are selected."
 msgstr "Nav izvēlēta barotne"
 
-#: js/functions.js:1398
+#: js/functions.js:1329
 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:1435
+#: js/functions.js:1360
 msgid "Feeds with update errors"
 msgstr "Barotnes ar atjaunošanas kļūdām"
 
-#: js/functions.js:1446
-#: js/prefs.js:1058
+#: js/functions.js:1369
+#: js/prefs.js:841
 msgid "Remove selected feeds?"
 msgstr "Dzēst izvēlētās barotnes?"
 
-#: js/functions.js:1449
-#: js/prefs.js:1061
+#: js/functions.js:1370
+#: js/prefs.js:842
 msgid "Removing selected feeds..."
 msgstr "Dzēš izvēlētās barotnes..."
 
-#: js/prefs.js:60
-msgid "Please enter login:"
-msgstr "Lūdzu ievadiet pieteikšanās vārdu:"
-
-#: js/prefs.js:67
-msgid "Can't create user: no login specified."
-msgstr "Neizdevās izveidot lietotāju: netika norādīts pieteikšanās vārds."
-
-#: js/prefs.js:71
-msgid "Adding user..."
-msgstr "Pievieno lietotāju..."
-
-#: js/prefs.js:96
-msgid "User Editor"
-msgstr "Lietotāja redaktors"
-
-#: js/prefs.js:131
-msgid "Edit Filter"
-msgstr "Mainīt filtru"
-
-#: js/prefs.js:170
+#: js/prefs.js:143
 msgid "Remove filter?"
 msgstr "Dzēst filtru?"
 
-#: js/prefs.js:175
+#: js/prefs.js:148
 msgid "Removing filter..."
 msgstr "Dzēš filtru..."
 
-#: js/prefs.js:292
+#: js/prefs.js:251
 msgid "Remove selected labels?"
 msgstr "Dzēst izvēlētās etiķetes?"
 
-#: js/prefs.js:295
+#: js/prefs.js:252
 msgid "Removing selected labels..."
 msgstr "Dzēš izvēlētās etiķetes..."
 
-#: js/prefs.js:308
-#: js/prefs.js:1144
+#: js/prefs.js:262
+#: js/prefs.js:909
 msgid "No labels are selected."
 msgstr "Nav izvēlēta etiķete."
 
-#: js/prefs.js:320
+#: js/prefs.js:274
 msgid "Remove selected users? Neither default admin nor your account will be removed."
 msgstr "Dzēst izvēlētos lietotājus? Netiks dzēsts ne jūsu konts, ne arī noklusētais administratora konts."
 
-#: js/prefs.js:323
+#: js/prefs.js:275
 msgid "Removing selected users..."
 msgstr "Dzēš izvēlētos lietotājus..."
 
-#: js/prefs.js:338
-#: js/prefs.js:408
-#: js/prefs.js:427
-#: js/prefs.js:461
+#: js/prefs.js:286
+#: js/prefs.js:342
+#: js/prefs.js:361
+#: js/prefs.js:387
 msgid "No users are selected."
 msgstr "Nav izvēlēts lietotājs."
 
-#: js/prefs.js:350
+#: js/prefs.js:297
 msgid "Remove selected filters?"
 msgstr "Dzēst izvēlētos filtrus?"
 
-#: js/prefs.js:353
+#: js/prefs.js:298
 msgid "Removing selected filters..."
 msgstr "Dzēš izvēlētos filtrus..."
 
-#: js/prefs.js:366
-#: js/prefs.js:495
-#: js/prefs.js:514
+#: js/prefs.js:308
+#: js/prefs.js:419
+#: js/prefs.js:438
 msgid "No filters are selected."
 msgstr "Nav izvēlēts filtrs."
 
-#: js/prefs.js:378
+#: js/prefs.js:319
 msgid "Unsubscribe from selected feeds?"
 msgstr "Dzēst izvēlēto barotni?"
 
-#: js/prefs.js:382
+#: js/prefs.js:321
 msgid "Unsubscribing from selected feeds..."
 msgstr "Atrakstās no izvēlētajām barotnēm..."
 
-#: js/prefs.js:413
-#: js/prefs.js:432
-#: js/prefs.js:466
+#: js/prefs.js:347
+#: js/prefs.js:366
+#: js/prefs.js:392
 msgid "Please select only one user."
 msgstr "Lūdzu izvēlieties tikai vienu lietotāju."
 
-#: js/prefs.js:436
+#: js/prefs.js:370
 msgid "Reset password of selected user?"
 msgstr "Atstatīt izvēlētā lietotāja paroli?"
 
-#: js/prefs.js:439
+#: js/prefs.js:371
 msgid "Resetting password for selected user..."
 msgstr "Atstata izvēlētā lietotāja paroli..."
 
-#: js/prefs.js:500
+#: js/prefs.js:424
 msgid "Please select only one filter."
 msgstr "Lūdzu izvēlieties tikai vienu filtru."
 
-#: js/prefs.js:518
+#: js/prefs.js:442
 msgid "Combine selected filters?"
 msgstr "Apvienot izvēlētos filtrus?"
 
-#: js/prefs.js:521
+#: js/prefs.js:443
 msgid "Joining filters..."
 msgstr "Apvieno filtrus..."
 
-#: js/prefs.js:580
+#: js/prefs.js:487
 msgid "Edit Multiple Feeds"
 msgstr "Mainīt vairākus filtrus"
 
-#: js/prefs.js:604
+#: js/prefs.js:511
 msgid "Save changes to selected feeds?"
 msgstr "Saglabāt izvēlēto barotņu izmaiņas?"
 
-#: js/prefs.js:681
+#: js/prefs.js:552
 msgid "OPML Import"
 msgstr "OPML imports"
 
-#: js/prefs.js:700
+#: js/prefs.js:571
 msgid "Please choose an OPML file first."
 msgstr "Lūdzu vispirms norādiet OPML failu."
 
-#: js/prefs.js:703
+#: js/prefs.js:574
 #: plugins/import_export/import_export.js:115
 msgid "Importing, please wait..."
 msgstr "Importē, lūdzu gaidiet..."
 
-#: js/prefs.js:869
+#: js/prefs.js:737
 msgid "Reset to defaults?"
 msgstr "Atsatīt uz noklusēto?"
 
-#: js/prefs.js:1468
-msgid "Subscribing to feeds..."
-msgstr "Barotņu pasūtīšana"
+#: js/prefs.js:777
+#, perl-format
+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:1487
-msgid "Clear stored data for this plugin?"
-msgstr "Attīrīt šī spraudņa saglabātos datus?"
+#: js/prefs.js:778
+#, fuzzy
+msgid "Removing category..."
+msgstr "Dzēst kategoriju..."
 
-#: js/prefs.js:1501
-msgid "Clear all messages in the error log?"
-msgstr "Izdzēst visus ziņojumus kļūdu žurnālā?"
+#: js/prefs.js:794
+msgid "Remove selected categories?"
+msgstr "Dzēst izvēlētās kategorijas?"
 
-#: js/tt-rss.js:118
+#: js/prefs.js:795
+#, fuzzy
+msgid "Removing selected categories..."
+msgstr "Dzēš izvēlētās kategorijas..."
+
+#: js/prefs.js:805
+msgid "No categories are selected."
+msgstr "Nav izvēlēta kategorija."
+
+#: js/prefs.js:812
+msgid "Category title:"
+msgstr "Kategorijas virsraksts:"
+
+#: js/prefs.js:815
+#, fuzzy
+msgid "Creating category..."
+msgstr "Izveidot filtru..."
+
+#: js/prefs.js:832
+msgid "Feeds without recent updates"
+msgstr "Barotnes bez neseniem jaunumiem"
+
+#: js/prefs.js:869
+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:898
+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:926
+msgid "Settings Profiles"
+msgstr "Profilu iestatījumi"
+
+#: js/prefs.js:935
+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:936
+#, fuzzy
+msgid "Removing selected profiles..."
+msgstr "Dzēš iezīmētos profilus..."
+
+#: js/prefs.js:948
+msgid "No profiles are selected."
+msgstr "Nav izvēlēts profils."
+
+#: js/prefs.js:955
+#: js/prefs.js:997
+msgid "Activate selected profile?"
+msgstr "Aktivizēt izvēlēto profilu?"
+
+#: js/prefs.js:964
+#: js/prefs.js:1008
+msgid "Please choose a profile to activate."
+msgstr "Lūdzu norādiet aktivizējamo profilu."
+
+#: js/prefs.js:969
+#, fuzzy
+msgid "Creating profile..."
+msgstr "Izveido profilu..."
+
+#: js/prefs.js:1016
+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:1017
+#: plugins/share/share_prefs.js:3
+msgid "Clearing URLs..."
+msgstr "Attīra vietrāžus..."
+
+#: js/prefs.js:1020
+#, fuzzy
+msgid "Generated URLs cleared."
+msgstr "Izveidot jaunu URL"
+
+#: js/prefs.js:1053
+#, fuzzy
+msgid "Rename category to:"
+msgstr "Dzēst kategoriju"
+
+#: js/prefs.js:1074
+msgid "Label Editor"
+msgstr "Etiķešu redaktors"
+
+#: js/tt-rss.js:111
 msgid "Mark all articles as read?"
 msgstr "Vai atzīmēt visus rakstus kā lasītus?"
 
-#: js/tt-rss.js:124
+#: js/tt-rss.js:115
 msgid "Marking all feeds as read..."
 msgstr "Atzīmē visas barotnes kā lasītas..."
 
-#: js/tt-rss.js:398
+#: js/tt-rss.js:351
 msgid "Please enable mail plugin first."
 msgstr "Lūdzu, vispirmi ieslēdziet e-pasta spraudni."
 
-#: js/tt-rss.js:527
+#: js/tt-rss.js:477
 msgid "Please enable embed_original plugin first."
 msgstr "Lūdzu, vispirms ieslēdziet embeded_original spraudni."
 
-#: js/tt-rss.js:540
-#: js/tt-rss.js:723
+#: js/tt-rss.js:490
+#: js/tt-rss.js:653
 msgid "Widescreen is not available in combined mode."
 msgstr ""
 
-#: js/tt-rss.js:821
-msgid "You can't rescore this kind of feed."
-msgstr "Jūs nevarat pārvērtēt šī veida barotni."
-
-#: js/tt-rss.js:826
-#: js/tt-rss.js:686
-msgid "Please select some feed first."
-msgstr "Lūdzu, vispirms norādiet barotni."
-
-#: js/tt-rss.js:831
-#, perl-format
-msgid "Rescore articles in %s?"
-msgstr "Pārvērtēt rakstus %s?"
-
-#: js/tt-rss.js:834
-msgid "Rescoring articles..."
-msgstr "Pārvērtē rakstus..."
-
-#: js/viewfeed.js:917
-#: js/viewfeed.js:955
-#: js/viewfeed.js:1003
-#: js/viewfeed.js:1924
-#: plugins/mail/mail.js:7
+#: js/viewfeed.js:444
+#: js/viewfeed.js:461
+#: js/viewfeed.js:484
+#: js/viewfeed.js:521
+#: js/viewfeed.js:542
+#: js/viewfeed.js:651
+#: js/viewfeed.js:685
+#: js/viewfeed.js:727
+#: js/viewfeed.js:1564
 #: plugins/mailto/init.js:7
-#: js/viewfeed.js:675
-#: js/viewfeed.js:697
-#: js/viewfeed.js:718
-#: js/viewfeed.js:777
-#: js/viewfeed.js:805
+#: plugins/mail/mail.js:7
 msgid "No articles are selected."
 msgstr "Nav norādīts raksts."
 
-#: js/viewfeed.js:925
+#: js/viewfeed.js:659
 #, 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:927
+#: js/viewfeed.js:661
 #, 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:964
+#: js/viewfeed.js:694
 #, 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:967
+#: js/viewfeed.js:697
 #, 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:969
+#: js/viewfeed.js:698
 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:1009
+#: js/viewfeed.js:733
 #, 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:1029
+#: js/viewfeed.js:753
 msgid "Edit article Tags"
 msgstr "Mainīt rakstu iezīmes"
 
-#: js/viewfeed.js:1035
+#: js/viewfeed.js:757
 msgid "Saving article tags..."
 msgstr "Saglabā rakstu iezīmes..."
 
-#: js/viewfeed.js:1666
+#: js/viewfeed.js:1015
+msgid "No article is selected."
+msgstr "Nav izvēlēts raksts."
+
+#: js/viewfeed.js:1050
+msgid "No articles found to mark"
+msgstr "Nav atrasti iezīmējamie raksti"
+
+#: js/viewfeed.js:1052
+#, fuzzy, perl-format
+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?"
+
+#: js/viewfeed.js:1312
 msgid "Open original article"
 msgstr "Atvērt sākotnējo rakstu"
 
-#: js/viewfeed.js:1673
+#: js/viewfeed.js:1319
 #, fuzzy
 msgid "Display article URL"
 msgstr "Parādīt URL"
 
-#: js/viewfeed.js:1780
+#: js/viewfeed.js:1426
 msgid "Assign label"
 msgstr "Pievienot etiķeti"
 
-#: js/viewfeed.js:1785
+#: js/viewfeed.js:1431
 msgid "Remove label"
 msgstr "Dzēst etiķeti"
 
-#: js/viewfeed.js:1817
+#: js/viewfeed.js:1463
 msgid "Select articles in group"
 msgstr "Izvēlēties grupas rakstus"
 
-#: js/viewfeed.js:1827
+#: js/viewfeed.js:1473
 msgid "Mark group as read"
 msgstr "Atzīmēt grupu kā lasītu"
 
-#: js/viewfeed.js:1839
+#: js/viewfeed.js:1485
 msgid "Mark feed as read"
 msgstr "Atzīmēt barotni kā lasītu"
 
-#: js/viewfeed.js:1892
+#: js/viewfeed.js:1538
 msgid "Please enter new score for selected articles:"
 msgstr "Ievadiet jauno vērtējumu izvēlētajiem rakstiem:"
 
-#: js/viewfeed.js:1955
+#: js/viewfeed.js:1571
 msgid "Please enter new score for this article:"
 msgstr "Ievadiet jaunu vērtējumu šim rakstam:"
 
-#: js/viewfeed.js:1986
+#: js/viewfeed.js:1591
 msgid "Article URL:"
 msgstr "Raksta vietrādis:"
 
-#: plugins/note/note.js:17
-msgid "Saving article note..."
-msgstr "Saglabā raksta piezīmes..."
+#: 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/af_psql_trgm/init.js:11
 #, fuzzy
 msgid "Related articles"
 msgstr "Dzēst rakstu"
 
+#: 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/shorten_expanded/init.js:43
+msgid "Click to expand article"
+msgstr "Klikšķiniet, lai izvērstu rakstu"
+
 #: plugins/import_export/import_export.js:13
 msgid "Export Data"
 msgstr "Eksportēt datus"
@@ -3215,269 +3317,170 @@ 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
-msgid "Forward article by email"
-msgstr "Pārsūtīt rakstu pa e-pastu"
+#: plugins/share/share_prefs.js:2
+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/mail/mail.js:36
-msgid "Error sending email:"
-msgstr "Kļūda sūtot e-pastu:"
-
-#: plugins/mail/mail.js:38
-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:45
-msgid "Click to expand article"
-msgstr "Klikšķiniet, lai izvērstu rakstu"
+#: plugins/share/share_prefs.js:8
+msgid "Shared URLs cleared."
+msgstr "Kopīgotie vietrāži attīrīti."
 
 #: plugins/share/share.js:10
 msgid "Share article by URL"
 msgstr "Kopīgot rakstu ar vietrādi"
 
-#: plugins/share/share.js:14
+#: plugins/share/share.js:13
 msgid "Generate new share URL for this article?"
 msgstr "Izveidot šim rakstam jaunu vietrādi?"
 
-#: plugins/share/share.js:18
+#: plugins/share/share.js:15
 msgid "Trying to change URL..."
 msgstr "Mēģinu mainīt vietrādi..."
 
-#: plugins/share/share.js:55
+#: plugins/share/share.js:48
 msgid "Remove sharing for this article?"
 msgstr "Dzēst šī raksta kopīgojumu?"
 
-#: plugins/share/share.js:59
+#: plugins/share/share.js:50
 msgid "Trying to unshare..."
 msgstr "Mēģinu atkopīgot..."
 
-#: plugins/share/share_prefs.js:3
-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/mail/mail.js:30
+msgid "Error sending email:"
+msgstr "Kļūda sūtot e-pastu:"
 
-#: plugins/share/share_prefs.js:6
-#: js/prefs.js:1277
-msgid "Clearing URLs..."
-msgstr "Attīra vietrāžus..."
+#: plugins/mail/mail.js:32
+msgid "Your message has been sent."
+msgstr "Jūsu ziņojums ir nosūtīts."
 
-#: plugins/share/share_prefs.js:13
-msgid "Shared URLs cleared."
-msgstr "Kopīgotie vietrāži attīrīti."
+#: plugins/note/note.js:15
+msgid "Saving article note..."
+msgstr "Saglabā raksta piezīmes..."
 
-#: js/feedlist.js:204
+#: js/feedlist.js:168
 #, fuzzy
 msgid "Your password is at default value"
 msgstr "Jums ir norādīta noklusētā parole, lūdzu nomainiet to."
 
-#: js/feedlist.js:453
+#: js/feedlist.js:413
 msgid "Mark all articles in %s as read?"
 msgstr "Vai atzīmēt visus rakstus %s kā lasītus?"
 
-#: js/functions.js:494
-msgid "Upload complete."
-msgstr ""
-
-#: js/functions.js:511
-msgid "Remove stored feed icon?"
-msgstr "Dzēst saglabāto barotnes ikonu?"
-
-#: js/functions.js:516
-#, fuzzy
-msgid "Removing feed icon..."
-msgstr "Dzēst saglabāto barotnes ikonu?"
-
-#: js/functions.js:521
-#, fuzzy
-msgid "Feed icon removed."
-msgstr "Barotne netika atrasta."
-
-#: js/functions.js:537
-msgid "Please select an image file to upload."
-msgstr "Lūdzu norādiet augšuplādējamo attēla failu."
-
-#: js/functions.js:539
-msgid "Upload new icon for this feed?"
-msgstr "Augšuplādēt šai barotnei jaunu ikonu?"
-
-#: js/functions.js:540
-#, fuzzy
-msgid "Uploading, please wait..."
-msgstr "Ielādē, lūdzu gaidiet..."
-
-#: js/functions.js:550
-msgid "Please enter label caption:"
-msgstr "Lūdzu ievadiet etiķetes uzrakstu:"
-
-#: js/functions.js:555
-msgid "Can't create label: missing caption."
-msgstr "Neizdevās izveidot etiķeti: nav uzraksta."
-
-#: js/functions.js:797
+#: js/functions.js:764
 msgid "Edit rule"
 msgstr "Mainīt likumu"
 
-#: js/functions.js:819
+#: js/functions.js:786
 msgid "Edit action"
 msgstr "Mainīt darbību"
 
-#: js/functions.js:860
+#: js/functions.js:825
 msgid "Looking for articles (%d processed, %f found)..."
 msgstr ""
 
-#: js/functions.js:890
+#: js/functions.js:855
 #, fuzzy
 msgid "Found %d articles matching this filter:"
 msgstr "Raksti, kas atbilst šim filtram:"
 
-#: js/functions.js:942
+#: js/functions.js:907
 msgid "Create Filter"
 msgstr "Izveidot filtru"
 
-#: js/functions.js:1060
-#: js/tt-rss.js:692
+#: js/functions.js:1016
+#: js/tt-rss.js:631
 msgid "Unsubscribe from %s?"
 msgstr "Atteikt pasūtījumu %s?"
 
-#: js/functions.js:1063
+#: js/functions.js:1019
 msgid "Removing feed..."
 msgstr "Pārsauc barotni..."
 
-#: js/functions.js:1489
+#: js/functions.js:1410
 msgid "Help"
 msgstr "Palīdzība"
 
-#: js/prefs.js:973
-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:44
+msgid "Please enter login:"
+msgstr "Lūdzu ievadiet pieteikšanās vārdu:"
 
-#: js/prefs.js:979
-#, fuzzy
-msgid "Removing category..."
-msgstr "Dzēst kategoriju..."
+#: js/prefs.js:51
+msgid "Can't create user: no login specified."
+msgstr "Neizdevās izveidot lietotāju: netika norādīts pieteikšanās vārds."
 
-#: js/prefs.js:997
-msgid "Remove selected categories?"
-msgstr "Dzēst izvēlētās kategorijas?"
+#: js/prefs.js:55
+msgid "Adding user..."
+msgstr "Pievieno lietotāju..."
 
-#: js/prefs.js:1000
-#, fuzzy
-msgid "Removing selected categories..."
-msgstr "Dzēš izvēlētās kategorijas..."
+#: js/prefs.js:74
+msgid "User Editor"
+msgstr "Lietotāja redaktors"
 
-#: js/prefs.js:1013
-msgid "No categories are selected."
-msgstr "Nav izvēlēta kategorija."
+#: js/prefs.js:104
+msgid "Edit Filter"
+msgstr "Mainīt filtru"
 
-#: js/prefs.js:1020
-msgid "Category title:"
-msgstr "Kategorijas virsraksts:"
+#: js/prefs.js:1175
+msgid "Subscribing to feeds..."
+msgstr "Barotņu pasūtīšana"
 
-#: js/prefs.js:1024
-#, fuzzy
-msgid "Creating category..."
-msgstr "Izveidot filtru..."
+#: js/prefs.js:1191
+msgid "Clear stored data for this plugin?"
+msgstr "Attīrīt šī spraudņa saglabātos datus?"
 
-#: js/prefs.js:1047
-msgid "Feeds without recent updates"
-msgstr "Barotnes bez neseniem jaunumiem"
+#: js/prefs.js:1203
+msgid "Clear all messages in the error log?"
+msgstr "Izdzēst visus ziņojumus kļūdu žurnālā?"
 
-#: js/prefs.js:1091
-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:1129
-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:1161
-msgid "Settings Profiles"
-msgstr "Profilu iestatījumi"
-
-#: js/prefs.js:1170
-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:1173
-#, fuzzy
-msgid "Removing selected profiles..."
-msgstr "Dzēš iezīmētos profilus..."
-
-#: js/prefs.js:1189
-msgid "No profiles are selected."
-msgstr "Nav izvēlēts profils."
-
-#: js/prefs.js:1197
-#: js/prefs.js:1250
-msgid "Activate selected profile?"
-msgstr "Aktivizēt izvēlēto profilu?"
-
-#: js/prefs.js:1214
-#: js/prefs.js:1266
-msgid "Please choose a profile to activate."
-msgstr "Lūdzu norādiet aktivizējamo profilu."
-
-#: js/prefs.js:1219
-#, fuzzy
-msgid "Creating profile..."
-msgstr "Izveido profilu..."
-
-#: js/prefs.js:1274
-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:1284
-#, fuzzy
-msgid "Generated URLs cleared."
-msgstr "Izveidot jaunu URL"
-
-#: js/prefs.js:1356
-msgid "Label Editor"
-msgstr "Etiķešu redaktors"
-
-#: js/tt-rss.js:681
+#: js/tt-rss.js:620
 msgid "You can't unsubscribe from the category."
 msgstr "Jūs nevarat atteikties no kategorijas."
 
-#: js/viewfeed.js:127
-#: js/viewfeed.js:177
-#: js/viewfeed.js:194
+#: js/tt-rss.js:625
+msgid "Please select some feed first."
+msgstr "Lūdzu, vispirms norādiet barotni."
+
+#: js/viewfeed.js:89
+#: js/viewfeed.js:135
+#: js/viewfeed.js:152
 msgid "Click to open next unread feed."
 msgstr "Klikšķiniet, lai atvērtu nākamo nelasīto barotni."
 
-#: js/viewfeed.js:131
+#: js/viewfeed.js:93
 msgid "Cancel search"
 msgstr "Atcelt meklēšanu"
 
-#: js/viewfeed.js:191
+#: js/viewfeed.js:149
 #, fuzzy
 msgid "New articles found, reload feed to continue."
 msgstr "Netika atrasti raksti, ko rādīt."
 
-#: js/viewfeed.js:620
+#: js/viewfeed.js:405
 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:1284
-msgid "No article is selected."
-msgstr "Nav izvēlēts raksts."
+#~ msgid "Rescore feed"
+#~ msgstr "Pārvērtēt barotni"
 
-#: js/viewfeed.js:1319
-msgid "No articles found to mark"
-msgstr "Nav atrasti iezīmējamie raksti"
+#~ msgid "Create label..."
+#~ msgstr "Izveido iezīmi..."
 
-#: js/viewfeed.js:1321
-#, 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 "Create filter..."
+#~ msgstr "Izveidot filtru..."
+
+#~ msgid "You can't rescore this kind of feed."
+#~ msgstr "Jūs nevarat pārvērtēt šī veida barotni."
+
+#~ msgid "Rescore articles in %s?"
+#~ msgstr "Pārvērtēt rakstus %s?"
+
+#~ msgid "Rescoring articles..."
+#~ msgstr "Pārvērtē rakstus..."
+
+#~ msgid "Can't create label: missing caption."
+#~ msgstr "Neizdevās izveidot etiķeti: nav uzraksta."
 
 #~ msgid "Firefox integration"
 #~ msgstr "Firefox integrācija"
diff --git a/locale/nb_NO/LC_MESSAGES/messages.mo b/locale/nb_NO/LC_MESSAGES/messages.mo
index 942eaa705..e4df633d6 100644
Binary files a/locale/nb_NO/LC_MESSAGES/messages.mo and b/locale/nb_NO/LC_MESSAGES/messages.mo differ
diff --git a/locale/nb_NO/LC_MESSAGES/messages.po b/locale/nb_NO/LC_MESSAGES/messages.po
index 1c7b8a7e2..006cfe014 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: 2018-10-10 08:24+0300\n"
+"POT-Creation-Date: 2018-12-01 12:59+0300\n"
 "PO-Revision-Date: 2009-05-02 00:10+0100\n"
 "Last-Translator: Christian Lomsdalen <christian@vindstille.net>\n"
 "Language-Team: Norwegian Bokmål <christian@vindstille.net>\n"
@@ -94,8 +94,8 @@ msgid "Weekly"
 msgstr "Ukentlig"
 
 #: backend.php:103
-#: classes/pref/users.php:47
 #: classes/pref/system.php:51
+#: classes/pref/users.php:47
 msgid "User"
 msgstr "Bruker"
 
@@ -172,33 +172,33 @@ msgstr "Brukeren ble  ikke funnet"
 
 #: index.php:151
 #: index.php:167
-#: index.php:285
+#: index.php:282
 #: prefs.php:120
 #: classes/backend.php:5
 #: classes/pref/labels.php:294
-#: classes/pref/feeds.php:1230
 #: classes/pref/filters.php:822
-#: js/feedlist.js:148
-#: js/feedlist.js:491
-#: js/feedlist.js:539
-#: js/functions.js:314
-#: js/functions.js:1336
-#: js/prefs.js:562
-#: js/prefs.js:754
-#: js/prefs.js:1488
-#: js/prefs.js:1503
-#: js/tt-rss.js:547
-#: js/viewfeed.js:1180
+#: classes/pref/feeds.php:1229
+#: js/feedlist.js:118
+#: js/feedlist.js:446
+#: js/feedlist.js:487
+#: js/functions.js:328
+#: js/functions.js:551
+#: js/functions.js:1286
+#: js/prefs.js:477
+#: js/prefs.js:617
+#: js/prefs.js:956
+#: js/prefs.js:1000
+#: js/prefs.js:1028
+#: js/prefs.js:1037
+#: js/prefs.js:1045
+#: js/prefs.js:1057
+#: js/tt-rss.js:497
+#: js/viewfeed.js:509
+#: js/viewfeed.js:928
 #: plugins/import_export/import_export.js:17
-#: js/functions.js:565
-#: js/prefs.js:1200
-#: js/prefs.js:1253
-#: js/prefs.js:1292
-#: js/prefs.js:1305
-#: js/prefs.js:1316
-#: js/prefs.js:1331
-#: js/tt-rss.js:564
-#: js/viewfeed.js:760
+#: js/prefs.js:1192
+#: js/prefs.js:1205
+#: js/tt-rss.js:510
 msgid "Loading, please wait..."
 msgstr "laster, vennligst vent"
 
@@ -216,13 +216,13 @@ msgid "All Articles"
 msgstr "Alle artikler"
 
 #: index.php:194
-#: include/functions.php:1227
+#: include/functions.php:1172
 #: classes/feeds.php:110
 msgid "Starred"
 msgstr "Favoritter"
 
 #: index.php:195
-#: include/functions.php:1228
+#: include/functions.php:1173
 #: classes/feeds.php:111
 msgid "Published"
 msgstr "Publisert"
@@ -263,11 +263,11 @@ msgid "Title"
 msgstr "Tittel"
 
 #: index.php:211
-#: index.php:251
-#: include/functions.php:1215
+#: index.php:250
+#: include/functions.php:1160
 #: classes/feeds.php:115
-#: js/FeedTree.js:41
-#: js/FeedTree.js:69
+#: js/FeedTree.js:42
+#: js/FeedTree.js:70
 msgid "Mark as read"
 msgstr "Marker som lest"
 
@@ -305,7 +305,7 @@ msgid "Feed actions:"
 msgstr "Nyhetsstrømshandlinger:"
 
 #: index.php:246
-#: classes/handler/public.php:551
+#: classes/handler/public.php:575
 msgid "Subscribe to feed..."
 msgstr "Abonner på nyhetsstrøm..."
 
@@ -314,58 +314,46 @@ msgid "Edit this feed..."
 msgstr "Rediger nyhetsstrømmen..."
 
 #: index.php:248
-msgid "Rescore feed"
-msgstr "Sett poeng på nytt for nyhetskanalene"
-
-#: index.php:249
-#: classes/pref/feeds.php:770
-#: classes/pref/feeds.php:1203
-#: js/PrefFeedTree.js:61
+#: classes/pref/feeds.php:769
+#: classes/pref/feeds.php:1202
+#: js/PrefFeedTree.js:62
 msgid "Unsubscribe"
 msgstr "Avabonner"
 
-#: index.php:250
+#: index.php:249
 msgid "All feeds:"
 msgstr "Alle nyhetsstrømmer:"
 
-#: index.php:252
+#: index.php:251
 msgid "(Un)hide read feeds"
 msgstr "Skjul/vis leste nyhetsstrømmer"
 
-#: index.php:253
+#: index.php:252
 msgid "Other actions:"
 msgstr "Andre handlinger:"
 
-#: index.php:254
-#: include/functions.php:1201
+#: index.php:253
+#: include/functions.php:1146
 #, fuzzy
 msgid "Toggle widescreen mode"
 msgstr "Tillatt endringer i kategorirekkefølgen?"
 
-#: index.php:255
-msgid "Create label..."
-msgstr "Lag merkelapp..."
-
-#: index.php:256
-msgid "Create filter..."
-msgstr "Lag filter..."
-
-#: index.php:257
+#: index.php:254
 #, fuzzy
 msgid "Keyboard shortcuts help"
 msgstr "Tastatursnarveier"
 
-#: index.php:266
+#: index.php:263
 msgid "Logout"
 msgstr "Logg ut"
 
-#: index.php:272
+#: index.php:269
 msgid "Updates are available from Git."
 msgstr ""
 
 #: prefs.php:33
 #: prefs.php:138
-#: include/functions.php:1230
+#: include/functions.php:1175
 #: classes/pref/prefs.php:425
 msgid "Preferences"
 msgstr "Innstillinger"
@@ -380,8 +368,8 @@ msgstr "Forlat innstillinger"
 
 #: prefs.php:141
 #: classes/pref/feeds.php:114
-#: classes/pref/feeds.php:1138
-#: classes/pref/feeds.php:1192
+#: classes/pref/feeds.php:1137
+#: classes/pref/feeds.php:1191
 msgid "Feeds"
 msgstr "Nyhetsstrømmer"
 
@@ -391,8 +379,8 @@ msgid "Filters"
 msgstr "Filtre"
 
 #: prefs.php:147
+#: classes/feeds.php:1696
 #: classes/pref/labels.php:94
-#: classes/feeds.php:1710
 msgid "Labels"
 msgstr "Merkelapper"
 
@@ -404,80 +392,80 @@ msgstr "Brukere"
 msgid "System"
 msgstr ""
 
-#: register.php:186
+#: register.php:185
 #: include/login_form.php:162
 msgid "Create new account"
 msgstr "Lag ny konto"
 
-#: register.php:192
+#: register.php:191
 msgid "New user registrations are administratively disabled."
 msgstr "Registrering av nye brukere er administrativt avskrudd"
 
-#: register.php:196
-#: register.php:241
-#: register.php:254
-#: register.php:269
-#: register.php:288
-#: register.php:336
-#: register.php:346
-#: register.php:358
-#: classes/handler/public.php:623
-#: classes/handler/public.php:697
-#: classes/handler/public.php:798
-#: classes/handler/public.php:877
-#: classes/handler/public.php:891
-#: classes/handler/public.php:898
-#: classes/handler/public.php:923
+#: register.php:195
+#: register.php:240
+#: register.php:253
+#: register.php:268
+#: register.php:287
+#: register.php:334
+#: register.php:344
+#: register.php:356
+#: classes/handler/public.php:647
+#: classes/handler/public.php:721
+#: 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"
 
-#: register.php:217
+#: register.php:216
 msgid "Your temporary password will be sent to the specified email. Accounts, which were not logged in once, are erased automatically 24 hours after temporary password is sent."
 msgstr "Ditt midlertidige passord vil bli sendt til den oppgitte e-posten. Kontoer, som ikke blir logget inn på, blir slettet automatisk 24 timer etter at passordet ble sendt."
 
-#: register.php:223
+#: register.php:222
 msgid "Desired login:"
 msgstr "Ønsket brukernavn:"
 
-#: register.php:226
+#: register.php:225
 msgid "Check availability"
 msgstr "Sjekk tilgjengeligheten"
 
-#: register.php:228
-#: classes/handler/public.php:713
+#: register.php:227
+#: classes/handler/public.php:737
 msgid "Email:"
 msgstr "E-post:"
 
-#: register.php:231
-#: classes/handler/public.php:718
+#: register.php:230
+#: classes/handler/public.php:742
 msgid "How much is two plus two:"
 msgstr "Hvor mye er to pluss to:"
 
-#: register.php:234
+#: register.php:233
 msgid "Submit registration"
 msgstr "Send registreringen"
 
-#: register.php:252
+#: register.php:251
 msgid "Your registration information is incomplete."
 msgstr "Registreringsinformasjonen din er ufullstendig."
 
-#: register.php:267
+#: register.php:266
 msgid "Sorry, this username is already taken."
 msgstr "Beklager, brukernavn er allerede tatt."
 
-#: register.php:286
+#: register.php:285
 msgid "Registration failed."
 msgstr "Registrering feilet"
 
-#: register.php:333
+#: register.php:331
 msgid "Account created successfully."
 msgstr "Kontoen ble opprettet med suksess."
 
-#: register.php:355
+#: register.php:353
 msgid "New user registrations are currently closed."
 msgstr "Registrering av nye brukere er stengt."
 
-#: update.php:66
+#: update.php:67
 #, fuzzy
 msgid "Tiny Tiny RSS data update script."
 msgstr "Tiny Tiny RSS-databasen er oppdatert"
@@ -491,10 +479,10 @@ msgstr "Alle Nyhetsstrømmer"
 
 #: include/controls.php:138
 #: include/controls.php:230
-#: classes/opml.php:512
-#: classes/digest.php:120
+#: classes/digest.php:124
+#: classes/feeds.php:1708
 #: classes/pref/feeds.php:233
-#: classes/feeds.php:1722
+#: classes/opml.php:512
 msgid "Uncategorized"
 msgstr "Ukategorisert"
 
@@ -509,319 +497,319 @@ msgstr[1] "Favorittartikler"
 msgid "No feeds found."
 msgstr "Ingen nyhetsstrømmer ble funnet."
 
-#: include/functions.php:983
+#: include/functions.php:928
 #, php-format
 msgid "%d min"
 msgstr ""
 
-#: include/functions.php:1177
+#: include/functions.php:1122
 msgid "Navigation"
 msgstr "Navigasjon"
 
-#: include/functions.php:1178
+#: include/functions.php:1123
 #, fuzzy
 msgid "Open next feed"
 msgstr "Generert nyhetsstrøm"
 
-#: include/functions.php:1179
+#: include/functions.php:1124
 msgid "Open previous feed"
 msgstr ""
 
-#: include/functions.php:1180
+#: include/functions.php:1125
 #, fuzzy
 msgid "Open next article"
 msgstr "Vis opprinnelig artikkelinnhold"
 
-#: include/functions.php:1181
+#: include/functions.php:1126
 #, fuzzy
 msgid "Open previous article"
 msgstr "Vis opprinnelig artikkelinnhold"
 
-#: include/functions.php:1182
+#: include/functions.php:1127
 msgid "Open next article (don't scroll long articles)"
 msgstr ""
 
-#: include/functions.php:1183
+#: include/functions.php:1128
 msgid "Open previous article (don't scroll long articles)"
 msgstr ""
 
-#: include/functions.php:1184
+#: include/functions.php:1129
 msgid "Move to next article (don't expand or mark read)"
 msgstr ""
 
-#: include/functions.php:1185
+#: include/functions.php:1130
 msgid "Move to previous article (don't expand or mark read)"
 msgstr ""
 
-#: include/functions.php:1186
+#: include/functions.php:1131
 msgid "Show search dialog"
 msgstr "Vis søkevinduet"
 
-#: include/functions.php:1187
+#: include/functions.php:1132
 #, fuzzy
 msgid "Article"
 msgstr "Alle artikler"
 
-#: include/functions.php:1188
-#: js/viewfeed.js:1695
+#: include/functions.php:1133
+#: js/viewfeed.js:1341
 msgid "Toggle starred"
 msgstr "Sett som favoritt"
 
-#: include/functions.php:1189
-#: js/viewfeed.js:1707
+#: include/functions.php:1134
+#: js/viewfeed.js:1353
 msgid "Toggle published"
 msgstr "Sett som publisert"
 
-#: include/functions.php:1190
-#: js/viewfeed.js:1682
+#: include/functions.php:1135
+#: js/viewfeed.js:1328
 msgid "Toggle unread"
 msgstr "Sett som ulest"
 
-#: include/functions.php:1191
+#: include/functions.php:1136
 msgid "Edit tags"
 msgstr "Endre stikkord"
 
-#: include/functions.php:1192
+#: include/functions.php:1137
 #, fuzzy
 msgid "Open in new window"
 msgstr "Åpne artikkel i nytt nettleservindu"
 
-#: include/functions.php:1193
-#: js/viewfeed.js:1728
+#: include/functions.php:1138
+#: js/viewfeed.js:1374
 #, fuzzy
 msgid "Mark below as read"
 msgstr "Marker som lest"
 
-#: include/functions.php:1194
-#: js/viewfeed.js:1721
+#: include/functions.php:1139
+#: js/viewfeed.js:1367
 #, fuzzy
 msgid "Mark above as read"
 msgstr "Marker som lest"
 
-#: include/functions.php:1195
+#: include/functions.php:1140
 #, fuzzy
 msgid "Scroll down"
 msgstr "Alt ferdig."
 
-#: include/functions.php:1196
+#: include/functions.php:1141
 msgid "Scroll up"
 msgstr ""
 
-#: include/functions.php:1197
+#: include/functions.php:1142
 #, fuzzy
 msgid "Select article under cursor"
 msgstr "Velg artikkelen under musepekeren"
 
-#: include/functions.php:1198
+#: include/functions.php:1143
 #, fuzzy
 msgid "Email article"
 msgstr "Alle artikler"
 
-#: include/functions.php:1199
+#: include/functions.php:1144
 #, fuzzy
 msgid "Close/collapse article"
 msgstr "Fjern artikler"
 
-#: include/functions.php:1200
+#: include/functions.php:1145
 #, fuzzy
 msgid "Toggle article expansion (combined mode)"
 msgstr "Tillatt endringer i kategorirekkefølgen?"
 
-#: include/functions.php:1202
+#: include/functions.php:1147
 #: plugins/embed_original/init.php:33
 #, fuzzy
 msgid "Toggle embed original"
 msgstr "Tillatt endringer i kategorirekkefølgen?"
 
-#: include/functions.php:1203
+#: include/functions.php:1148
 #, fuzzy
 msgid "Article selection"
 msgstr "Handlinger for aktive artikler"
 
-#: include/functions.php:1204
+#: include/functions.php:1149
 #, fuzzy
 msgid "Select all articles"
 msgstr "Fjern artikler"
 
-#: include/functions.php:1205
+#: include/functions.php:1150
 #, fuzzy
 msgid "Select unread"
 msgstr "Slett uleste artikler"
 
-#: include/functions.php:1206
+#: include/functions.php:1151
 #, fuzzy
 msgid "Select starred"
 msgstr "Sett som favorittartikkel"
 
-#: include/functions.php:1207
+#: include/functions.php:1152
 #, fuzzy
 msgid "Select published"
 msgstr "Slett uleste artikler"
 
-#: include/functions.php:1208
+#: include/functions.php:1153
 #, fuzzy
 msgid "Invert selection"
 msgstr "Handlinger for aktive artikler"
 
-#: include/functions.php:1209
+#: include/functions.php:1154
 #, fuzzy
 msgid "Deselect everything"
 msgstr "Fjern artikler"
 
-#: include/functions.php:1210
-#: classes/pref/feeds.php:522
-#: classes/pref/feeds.php:794
+#: include/functions.php:1155
+#: classes/pref/feeds.php:521
+#: classes/pref/feeds.php:793
 msgid "Feed"
 msgstr "Nyhetsstrøm"
 
-#: include/functions.php:1211
+#: include/functions.php:1156
 #, fuzzy
 msgid "Refresh current feed"
 msgstr "Oppdater aktive nyhetsstrømmer"
 
-#: include/functions.php:1212
+#: include/functions.php:1157
 #, fuzzy
 msgid "Un/hide read feeds"
 msgstr "Skjul/vis leste nyhetsstrømmer"
 
-#: include/functions.php:1213
-#: classes/pref/feeds.php:1195
+#: include/functions.php:1158
+#: classes/pref/feeds.php:1194
 msgid "Subscribe to feed"
 msgstr "Abonner på nyhetsstrøm"
 
-#: include/functions.php:1214
-#: js/FeedTree.js:48
-#: js/PrefFeedTree.js:55
-#: js/viewfeed.js:1846
+#: include/functions.php:1159
+#: js/FeedTree.js:49
+#: js/PrefFeedTree.js:56
+#: js/viewfeed.js:1492
 msgid "Edit feed"
 msgstr "Rediger nyhetsstrømmen"
 
-#: include/functions.php:1216
+#: include/functions.php:1161
 #, fuzzy
 msgid "Reverse headlines"
 msgstr "Motsatt titteloversikt (eldste først)"
 
-#: include/functions.php:1217
+#: include/functions.php:1162
 msgid "Toggle headline grouping"
 msgstr ""
 
-#: include/functions.php:1218
+#: include/functions.php:1163
 #, fuzzy
 msgid "Debug feed update"
 msgstr "Alle nyhetsstrømmer er oppdatert"
 
-#: include/functions.php:1219
+#: include/functions.php:1164
 #, fuzzy
 msgid "Debug viewfeed()"
 msgstr "Alle nyhetsstrømmer er oppdatert"
 
-#: include/functions.php:1220
-#: js/FeedTree.js:97
+#: include/functions.php:1165
+#: js/FeedTree.js:98
 msgid "Mark all feeds as read"
 msgstr "Marker alle nyhetsstrømmer som lest"
 
-#: include/functions.php:1221
+#: include/functions.php:1166
 #, fuzzy
 msgid "Un/collapse current category"
 msgstr "Velg for å slå sammen kategorien"
 
-#: include/functions.php:1222
-#, fuzzy
-msgid "Toggle combined mode"
-msgstr "Tillatt endringer i kategorirekkefølgen?"
-
-#: include/functions.php:1223
+#: include/functions.php:1167
 #, fuzzy
 msgid "Toggle auto expand in combined mode"
 msgstr "Tillatt endringer i kategorirekkefølgen?"
 
-#: include/functions.php:1224
+#: include/functions.php:1168
+#, fuzzy
+msgid "Toggle combined mode"
+msgstr "Tillatt endringer i kategorirekkefølgen?"
+
+#: include/functions.php:1169
 #, fuzzy
 msgid "Go to"
 msgstr "Gå til..."
 
-#: include/functions.php:1225
-#: classes/feeds.php:1583
+#: include/functions.php:1170
+#: classes/feeds.php:1569
 msgid "All articles"
 msgstr "Alle artikler"
 
-#: include/functions.php:1226
+#: include/functions.php:1171
 #, fuzzy
 msgid "Fresh"
 msgstr "Oppdater"
 
-#: include/functions.php:1229
-#: js/tt-rss.js:491
-#: js/tt-rss.js:660
+#: include/functions.php:1174
+#: js/tt-rss.js:439
+#: js/tt-rss.js:599
 msgid "Tag cloud"
 msgstr "Tag-sky"
 
-#: include/functions.php:1231
+#: include/functions.php:1176
 #, fuzzy
 msgid "Other"
 msgstr "Andre:"
 
-#: include/functions.php:1232
+#: include/functions.php:1177
 #: classes/pref/labels.php:279
 msgid "Create label"
 msgstr "Lag merkelapp"
 
-#: include/functions.php:1233
+#: include/functions.php:1178
 #: classes/pref/filters.php:801
 msgid "Create filter"
 msgstr "Lag filter"
 
-#: include/functions.php:1234
+#: include/functions.php:1179
 #, fuzzy
 msgid "Un/collapse sidebar"
 msgstr "Skjul nyhetskanalsslisten"
 
-#: include/functions.php:1235
+#: include/functions.php:1180
 #, fuzzy
 msgid "Show help dialog"
 msgstr "Vis søkevinduet"
 
-#: include/functions.php:2582
+#: include/functions.php:2529
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: include/functions.php:2583
+#: include/functions.php:2530
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: include/functions.php:2584
+#: include/functions.php:2531
 msgid "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form"
 msgstr ""
 
-#: include/functions.php:2585
+#: include/functions.php:2532
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: include/functions.php:2586
+#: include/functions.php:2533
 #, fuzzy
 msgid "No file was uploaded"
 msgstr "Ingen OPML-fil til å lastes opp."
 
-#: include/functions.php:2587
+#: include/functions.php:2534
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: include/functions.php:2588
+#: include/functions.php:2535
 msgid "Failed to write file to disk."
 msgstr ""
 
-#: include/functions.php:2589
+#: include/functions.php:2536
 msgid "A PHP extension stopped the file upload."
 msgstr ""
 
 #: include/login_form.php:107
-#: classes/handler/public.php:446
-#: classes/handler/public.php:708
+#: classes/handler/public.php:466
+#: classes/handler/public.php:732
 msgid "Login:"
 msgstr "Brukernavn:"
 
 #: include/login_form.php:117
-#: classes/handler/public.php:449
+#: classes/handler/public.php:469
 msgid "Password:"
 msgstr "Passord:"
 
@@ -836,9 +824,9 @@ msgid "Profile:"
 msgstr "Fil:"
 
 #: include/login_form.php:133
-#: classes/handler/public.php:252
 #: classes/pref/prefs.php:1037
 #: classes/rpc.php:69
+#: classes/handler/public.php:272
 #, fuzzy
 msgid "Default profile"
 msgstr "Standard artikkelbegrensning"
@@ -856,220 +844,30 @@ msgid "Remember me"
 msgstr ""
 
 #: include/login_form.php:159
-#: classes/handler/public.php:454
+#: classes/handler/public.php:474
 msgid "Log in"
 msgstr "Logg inn"
 
-#: include/sessions.php:46
+#: include/sessions.php:45
 #, fuzzy
 msgid "Session failed to validate (schema version changed)"
 msgstr "Sesjonen kunne ikke valideres (feil IP)"
 
-#: include/sessions.php:62
+#: include/sessions.php:53
+#, fuzzy
+msgid "Session failed to validate (UA changed)."
+msgstr "Sesjonen kunne ikke valideres (feil IP)"
+
+#: include/sessions.php:67
 #, fuzzy
 msgid "Session failed to validate (password changed)"
 msgstr "Sesjonen kunne ikke valideres (feil IP)"
 
-#: include/sessions.php:69
+#: include/sessions.php:74
 #, fuzzy
 msgid "Session failed to validate (user not found)"
 msgstr "Sesjonen kunne ikke valideres (feil IP)"
 
-#: classes/article.php:26
-#, fuzzy
-msgid "Article not found."
-msgstr "Nyhetsstrømmen ble ikke funnet"
-
-#: classes/article.php:211
-msgid "Tags for this article (separated by commas):"
-msgstr "Denne artikkelens stikkord (separert med kommaer):"
-
-#: classes/article.php:236
-#: classes/pref/labels.php:82
-#: classes/pref/users.php:103
-#: classes/pref/feeds.php:774
-#: classes/pref/feeds.php:914
-#: classes/pref/filters.php:525
-#: classes/pref/prefs.php:982
-#: plugins/nsfw/init.php:85
-#: plugins/note/init.php:58
-#: plugins/af_readability/init.php:80
-#: plugins/af_redditimgur/init.php:66
-#: plugins/af_psql_trgm/init.php:188
-#: plugins/mail/init.php:65
-#: plugins/af_zz_imgproxy/init.php:238
-msgid "Save"
-msgstr "Lagre"
-
-#: classes/article.php:238
-#: classes/handler/public.php:423
-#: classes/handler/public.php:457
-#: classes/pref/labels.php:84
-#: classes/pref/users.php:105
-#: classes/pref/feeds.php:775
-#: classes/pref/feeds.php:917
-#: classes/pref/feeds.php:1672
-#: classes/pref/filters.php:528
-#: classes/pref/filters.php:945
-#: classes/pref/filters.php:1022
-#: classes/pref/filters.php:1115
-#: classes/pref/prefs.php:984
-#: classes/feeds.php:1037
-#: classes/feeds.php:1089
-#: classes/feeds.php:1128
-#: plugins/note/init.php:60
-#: plugins/mail/init.php:179
-msgid "Cancel"
-msgstr "Avbryt"
-
-#: classes/article.php:337
-#: classes/article.php:720
-#: classes/article.php:875
-msgid "no tags"
-msgstr "Ingen stikkord"
-
-#: classes/article.php:448
-msgid "unknown type"
-msgstr "Ukjent type"
-
-#: classes/article.php:525
-#, fuzzy
-msgid "Attachments"
-msgstr "Vedlegg:"
-
-#: classes/article.php:626
-#: classes/feeds.php:661
-#, fuzzy
-msgid "comment"
-msgid_plural "comments"
-msgstr[0] "Kommentarer"
-msgstr[1] "Kommentarer"
-
-#: classes/article.php:630
-#: classes/feeds.php:665
-msgid "comments"
-msgstr "Kommentarer"
-
-#: classes/article.php:689
-msgid " - "
-msgstr "-"
-
-#: classes/article.php:730
-#: classes/feeds.php:647
-msgid "Edit tags for this article"
-msgstr "Rediger stikkordene for denne artikkelen"
-
-#: classes/article.php:763
-#: classes/feeds.php:602
-#, fuzzy
-msgid "Originally from:"
-msgstr "Vis opprinnelig artikkelinnhold"
-
-#: classes/article.php:774
-#: classes/pref/feeds.php:539
-#: classes/feeds.php:613
-#, fuzzy
-msgid "Feed URL"
-msgstr "Nyhetsstrøm"
-
-#: classes/article.php:811
-#: classes/backend.php:103
-#: classes/dlg.php:33
-#: classes/dlg.php:56
-#: classes/dlg.php:89
-#: classes/dlg.php:154
-#: classes/dlg.php:181
-#: classes/dlg.php:197
-#: classes/pref/feeds.php:1466
-#: classes/pref/feeds.php:1533
-#: classes/pref/filters.php:208
-#: classes/pref/prefs.php:1099
-#: plugins/af_psql_trgm/init.php:109
-#: plugins/import_export/init.php:446
-#: plugins/import_export/init.php:490
-#: plugins/share/init.php:128
-msgid "Close this window"
-msgstr "Lukk dette vinduet"
-
-#: classes/article.php:913
-#, fuzzy
-msgid "(edit note)"
-msgstr "Rediger notat"
-
-#: classes/opml.php:31
-#: classes/opml.php:36
-msgid "OPML Utility"
-msgstr "OPML-verktøy"
-
-#: classes/opml.php:40
-#, fuzzy
-msgid "Importing OPML..."
-msgstr "Importerer OPML (bruker DOMXML-utvidelsen)..."
-
-#: classes/opml.php:45
-msgid "Return to preferences"
-msgstr "Returner til innstillinger"
-
-#: classes/opml.php:301
-#, fuzzy, php-format
-msgid "Adding feed: %s"
-msgstr "Legger til nyhetsstrøm..."
-
-#: classes/opml.php:312
-#, fuzzy, php-format
-msgid "Duplicate feed: %s"
-msgstr "Lag filter"
-
-#: classes/opml.php:326
-#, fuzzy, php-format
-msgid "Adding label %s"
-msgstr "Tildel stikkord"
-
-#: classes/opml.php:329
-#, php-format
-msgid "Duplicate label: %s"
-msgstr ""
-
-#: classes/opml.php:341
-#, php-format
-msgid "Setting preference key %s to %s"
-msgstr ""
-
-#: classes/opml.php:377
-#, fuzzy
-msgid "Adding filter..."
-msgstr "Legger til nyhetsstrøm..."
-
-#: classes/opml.php:512
-#, fuzzy, php-format
-msgid "Processing category: %s"
-msgstr "Plasser i kategori..."
-
-#: classes/opml.php:558
-#, php-format
-msgid "Upload failed with error code %d"
-msgstr ""
-
-#: classes/opml.php:570
-#: plugins/import_export/init.php:471
-#, fuzzy
-msgid "Unable to move uploaded file."
-msgstr "Feil: Kan ikke laste opp OPMLfil"
-
-#: classes/opml.php:574
-#: plugins/import_export/init.php:475
-msgid "Error: please upload OPML file."
-msgstr "Feil: Kan ikke laste opp OPMLfil"
-
-#: classes/opml.php:585
-#, fuzzy
-msgid "Error: unable to find moved OPML file."
-msgstr "Feil: Kan ikke laste opp OPMLfil"
-
-#: classes/opml.php:594
-msgid "Error while parsing document."
-msgstr "Feil under behandling av dokumentet"
-
 #: classes/backend.php:31
 msgid "Other interface tips are available in the Tiny Tiny RSS wiki."
 msgstr ""
@@ -1090,173 +888,377 @@ msgstr ""
 msgid "Help topic not found."
 msgstr "Hjelp-emne kunne ikke bli funnet"
 
-#: 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/backend.php:103
+#: classes/pref/filters.php:208
+#: classes/pref/feeds.php:1465
+#: classes/pref/feeds.php:1532
+#: classes/pref/prefs.php:1099
+#: classes/dlg.php:33
+#: classes/dlg.php:56
+#: classes/dlg.php:89
+#: classes/dlg.php:154
+#: classes/dlg.php:181
+#: classes/dlg.php:197
+#: classes/article.php:810
+#: plugins/af_psql_trgm/init.php:109
+#: plugins/import_export/init.php:446
+#: plugins/import_export/init.php:490
+#: plugins/share/init.php:128
+msgid "Close this window"
+msgstr "Lukk dette vinduet"
 
-#: classes/dlg.php:44
+#: classes/feeds.php:53
 #, fuzzy
-msgid "Your Public OPML URL is:"
-msgstr "Lenke til nyhetsstrøm for publiserte artikler"
+msgid "View as RSS feed"
+msgstr "Se nyhetsstrømmene"
 
-#: classes/dlg.php:53
-#: classes/dlg.php:178
-#: plugins/share/init.php:125
+#: classes/feeds.php:54
+#: classes/feeds.php:140
+#: classes/pref/feeds.php:1326
 #, fuzzy
-msgid "Generate new URL"
-msgstr "Generert nyhetsstrøm"
+msgid "View as RSS"
+msgstr "Se stikkord"
 
-#: classes/dlg.php:67
-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 "Oppdateringsprosessen er åpnet for i konfigurasjonsfilen, men prosessen blir ikke kjørt, noe som gjør at ingen nyhetsstrømmer blir oppdatert. Vennligst start prosessen eller konakt administratoren."
-
-#: classes/dlg.php:71
-#: classes/dlg.php:80
-msgid "Last update:"
+#: classes/feeds.php:62
+#, fuzzy, php-format
+msgid "Last updated: %s"
 msgstr "Siste oppdatering:"
 
-#: classes/dlg.php:76
-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 "TT-RSS har oppdaget at oppdateringsmetoden bruker for lang tid å oppdatere nyhetsstrømmene. Dette kan indikere et krasj eller at noe henger. Vennligst sjekk oppdateringsprosessen eller kontakt vedkommende som innehar nyhetsstrømmen."
-
-#: classes/dlg.php:169
-msgid "You can view this feed as RSS using the following URL:"
-msgstr ""
-
-#: classes/dlg.php:190
-msgid "You are using default tt-rss password. Please change it in the Preferences (Personal data / Authentication)."
-msgstr ""
-
-#: classes/dlg.php:194
+#: classes/feeds.php:100
 #, fuzzy
-msgid "Open Preferences"
-msgstr "Innstillinger"
+msgid "Select..."
+msgstr "Velg:"
 
-#: classes/handler/public.php:387
-#: plugins/bookmarklets/init.php:40
+#: classes/feeds.php:102
+#: classes/pref/labels.php:273
+#: classes/pref/filters.php:391
+#: classes/pref/filters.php:449
+#: classes/pref/filters.php:795
+#: classes/pref/filters.php:878
+#: classes/pref/filters.php:905
+#: classes/pref/feeds.php:1185
+#: classes/pref/feeds.php:1416
+#: classes/pref/feeds.php:1481
+#: classes/pref/users.php:358
+#: classes/pref/prefs.php:996
+msgid "All"
+msgstr "Alle"
+
+#: classes/feeds.php:104
+msgid "Invert"
+msgstr "Motsatt"
+
+#: classes/feeds.php:105
+#: classes/pref/labels.php:275
+#: classes/pref/filters.php:393
+#: classes/pref/filters.php:451
+#: classes/pref/filters.php:797
+#: classes/pref/filters.php:880
+#: classes/pref/filters.php:907
+#: classes/pref/feeds.php:1187
+#: classes/pref/feeds.php:1418
+#: classes/pref/feeds.php:1483
+#: classes/pref/users.php:360
+#: classes/pref/prefs.php:998
+msgid "None"
+msgstr "Ingen"
+
+#: classes/feeds.php:107
+msgid "Selection toggle:"
+msgstr "Marker utvalg:"
+
+#: classes/feeds.php:113
+msgid "Selection:"
+msgstr "Utvalg:"
+
+#: classes/feeds.php:116
 #, fuzzy
-msgid "Share with Tiny Tiny RSS"
-msgstr "Returner til Tiny Tiny RSS"
+msgid "Set score"
+msgstr "Poeng"
 
-#: classes/handler/public.php:395
-msgid "Title:"
-msgstr "Tittel:"
-
-#: classes/handler/public.php:397
-#: classes/pref/feeds.php:537
-msgid "URL:"
-msgstr "Nettadresse:"
-
-#: classes/handler/public.php:399
+#: classes/feeds.php:119
 #, fuzzy
-msgid "Content:"
-msgstr "Innhold"
+msgid "Archive"
+msgstr "Artikkeldato"
 
-#: classes/handler/public.php:401
+#: classes/feeds.php:121
 #, fuzzy
-msgid "Labels:"
-msgstr "Merkelapper"
-
-#: classes/handler/public.php:420
-msgid "Shared article will appear in the Published feed."
-msgstr ""
-
-#: classes/handler/public.php:422
-msgid "Share"
-msgstr ""
-
-#: classes/handler/public.php:444
-#, fuzzy
-msgid "Not logged in"
-msgstr "Sist innlogget"
-
-#: classes/handler/public.php:504
-msgid "Incorrect username or password"
-msgstr "Feil brukernavn og/eller passord"
-
-#: classes/handler/public.php:557
-#, php-format
-msgid "Already subscribed to <b>%s</b>."
-msgstr "Abonnerer allerede på <b>%s</b>"
-
-#: classes/handler/public.php:560
-#, php-format
-msgid "Subscribed to <b>%s</b>."
-msgstr "Abonnerer på <b>%s</b>"
-
-#: classes/handler/public.php:563
-#, fuzzy, php-format
-msgid "Could not subscribe to <b>%s</b>."
-msgstr "Abonnerer allerede på <b>%s</b>"
-
-#: classes/handler/public.php:566
-#, fuzzy, php-format
-msgid "No feeds found in <b>%s</b>."
-msgstr "Ingen nyhetsstrømmer ble funnet."
-
-#: classes/handler/public.php:569
-#, fuzzy
-msgid "Multiple feed URLs found."
-msgstr "Adresse for nyhetsstrømmen for offentliggjorte innlegg har endret seg."
-
-#: classes/handler/public.php:573
-#, 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:591
-#, fuzzy
-msgid "Subscribe to selected feed"
-msgstr "Fjern abonnement på valgte nyhetsstrømmer"
-
-#: classes/handler/public.php:618
-msgid "Edit subscription options"
-msgstr "Rediger abonnementsalternativer"
-
-#: classes/handler/public.php:656
-#, fuzzy
-msgid "Password recovery"
-msgstr "Passord:"
-
-#: classes/handler/public.php:701
-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:723
-#: classes/pref/users.php:372
-msgid "Reset password"
-msgstr "Nullstill passordet"
-
-#: classes/handler/public.php:733
-msgid "Some of the required form parameters are missing or incorrect."
-msgstr ""
-
-#: classes/handler/public.php:737
-#: classes/handler/public.php:806
-#, fuzzy
-msgid "Go back"
+msgid "Move back"
 msgstr "Gå tilbake"
 
-#: classes/handler/public.php:775
+#: classes/feeds.php:122
+#: classes/pref/filters.php:400
+#: classes/pref/filters.php:458
+#: classes/pref/filters.php:887
+#: classes/pref/filters.php:914
 #, fuzzy
-msgid "[tt-rss] Password reset request"
-msgstr "[tt-rss] Varsel om endring av passord"
+msgid "Delete"
+msgstr "Standard"
 
-#: classes/handler/public.php:802
-msgid "Sorry, login and email combination not found."
+#: classes/feeds.php:127
+#: classes/feeds.php:132
+#: plugins/mailto/init.php:25
+#: plugins/mail/init.php:76
+#, fuzzy
+msgid "Forward by email"
+msgstr "Marker artikkel som favoritt"
+
+#: classes/feeds.php:136
+msgid "Feed:"
+msgstr "Nyhetsstrøm:"
+
+#: classes/feeds.php:193
+#: classes/feeds.php:802
+msgid "Feed not found."
+msgstr "Nyhetsstrømmen ble ikke funnet"
+
+#: classes/feeds.php:255
+#, fuzzy
+msgid "Never"
+msgstr "Slett aldri"
+
+#: classes/feeds.php:341
+#, fuzzy, php-format
+msgid "Imported at %s"
+msgstr "Importer"
+
+#: classes/feeds.php:391
+#: classes/feeds.php:484
+#, fuzzy
+msgid "mark feed as read"
+msgstr "Marker nyhetsstrøm som lest"
+
+#: classes/feeds.php:540
+#, fuzzy
+msgid "Collapse article"
+msgstr "Fjern artikler"
+
+#: classes/feeds.php:592
+#: classes/article.php:762
+#, fuzzy
+msgid "Originally from:"
+msgstr "Vis opprinnelig artikkelinnhold"
+
+#: classes/feeds.php:603
+#: classes/pref/feeds.php:538
+#: classes/article.php:773
+#, fuzzy
+msgid "Feed URL"
+msgstr "Nyhetsstrøm"
+
+#: classes/feeds.php:630
+#: classes/article.php:729
+msgid "Edit tags for this article"
+msgstr "Rediger stikkordene for denne artikkelen"
+
+#: classes/feeds.php:644
+#: classes/article.php:625
+#, fuzzy
+msgid "comment"
+msgid_plural "comments"
+msgstr[0] "Kommentarer"
+msgstr[1] "Kommentarer"
+
+#: classes/feeds.php:648
+#: classes/article.php:629
+msgid "comments"
+msgstr "Kommentarer"
+
+#: classes/feeds.php:686
+msgid "No unread articles found to display."
+msgstr "Ingen uleste artikler funnet som kunne vises"
+
+#: classes/feeds.php:689
+msgid "No updated articles found to display."
+msgstr "Ingen oppdaterte artikler funnet som kunne vises"
+
+#: classes/feeds.php:692
+msgid "No starred articles found to display."
+msgstr "Ingen markerte artikler som kan vises"
+
+#: classes/feeds.php:696
+#, 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:698
+msgid "No articles found to display."
+msgstr "Ingen artikler funnet som kan vises"
+
+#: classes/feeds.php:714
+#: classes/feeds.php:905
+#, fuzzy, php-format
+msgid "Feeds last updated at %s"
+msgstr "Oppdateringsfeil"
+
+#: classes/feeds.php:726
+#: classes/feeds.php:917
+msgid "Some feeds have update errors (click for details)"
+msgstr "Noen nyhetsstrømmer har oppdateringsfeil (trykk for detaljer)"
+
+#: classes/feeds.php:894
+msgid "No feed selected."
+msgstr "Ingen valgt nyhetsstrøm"
+
+#: classes/feeds.php:958
+#: classes/feeds.php:966
+#, fuzzy
+msgid "Feed or site URL"
+msgstr "Nyhetsstrøm"
+
+#: classes/feeds.php:972
+#: classes/pref/feeds.php:559
+#: classes/pref/feeds.php:800
+#: classes/pref/feeds.php:1632
+msgid "Place in category:"
+msgstr "Plasser i kategori..."
+
+#: classes/feeds.php:980
+#, fuzzy
+msgid "Available feeds"
+msgstr "Alle Nyhetsstrømmer"
+
+#: classes/feeds.php:992
+#: classes/pref/feeds.php:621
+#: classes/pref/feeds.php:848
+#: classes/pref/users.php:61
+msgid "Authentication"
+msgstr "Autentifisering"
+
+#: classes/feeds.php:996
+#: classes/pref/feeds.php:625
+#: classes/pref/feeds.php:852
+#: classes/pref/feeds.php:1646
+#: classes/pref/users.php:403
+msgid "Login"
+msgstr "Logg inn"
+
+#: classes/feeds.php:1000
+#: classes/pref/feeds.php:631
+#: classes/pref/feeds.php:860
+#: classes/pref/feeds.php:1649
+#: classes/pref/prefs.php:243
+#, fuzzy
+msgid "Password"
+msgstr "Passord:"
+
+#: classes/feeds.php:1011
+#: classes/pref/feeds.php:645
+msgid "This feed requires authentication."
+msgstr "Denne nyhetsstrømmen krever autentifisering"
+
+#: classes/feeds.php:1014
+#: classes/feeds.php:1070
+#: classes/pref/feeds.php:1668
+msgid "Subscribe"
+msgstr "Abonner"
+
+#: classes/feeds.php:1017
+#, fuzzy
+msgid "More feeds"
+msgstr "Flere nyhetsstrømmer"
+
+#: classes/feeds.php:1020
+#: classes/feeds.php:1072
+#: classes/feeds.php:1111
+#: classes/pref/labels.php:84
+#: classes/pref/filters.php:528
+#: classes/pref/filters.php:945
+#: classes/pref/filters.php:1022
+#: classes/pref/filters.php:1115
+#: classes/pref/feeds.php:774
+#: classes/pref/feeds.php:916
+#: classes/pref/feeds.php:1669
+#: classes/pref/users.php:105
+#: classes/pref/prefs.php:984
+#: classes/article.php:238
+#: classes/handler/public.php:443
+#: classes/handler/public.php:477
+#: plugins/mail/init.php:179
+#: plugins/note/init.php:60
+msgid "Cancel"
+msgstr "Avbryt"
+
+#: classes/feeds.php:1042
+#: classes/feeds.php:1110
+#: classes/pref/filters.php:788
+#: classes/pref/feeds.php:1178
+#: classes/pref/users.php:345
+#: js/tt-rss.js:152
+msgid "Search"
+msgstr "Søk"
+
+#: classes/feeds.php:1046
+#, fuzzy
+msgid "Popular feeds"
+msgstr "Vis nyhetsstrømmer"
+
+#: classes/feeds.php:1047
+#, fuzzy
+msgid "Feed archive"
+msgstr "Nyhetsstrømshandlinger"
+
+#: classes/feeds.php:1050
+#, fuzzy
+msgid "limit:"
+msgstr "Antall:"
+
+#: classes/feeds.php:1071
+#: classes/pref/labels.php:282
+#: classes/pref/filters.php:518
+#: classes/pref/filters.php:814
+#: classes/pref/feeds.php:751
+#: classes/pref/users.php:369
+msgid "Remove"
+msgstr "Fjern"
+
+#: classes/feeds.php:1084
+msgid "Look for"
 msgstr ""
 
-#: classes/handler/public.php:824
-msgid "Your access level is insufficient to run this script."
-msgstr "Adgangsnivået ditt er for lavt for å kjøre dette scriptet"
+#: classes/feeds.php:1092
+#, php-format
+msgid "in %s"
+msgstr ""
 
-#: classes/handler/public.php:850
-msgid "Database Updater"
-msgstr "Databaseoppdaterer"
+#: classes/feeds.php:1097
+msgid "Used for word stemming"
+msgstr ""
 
-#: classes/handler/public.php:915
-msgid "Perform updates"
-msgstr "Utfør oppdateringene"
+#: classes/feeds.php:1106
+#, fuzzy
+msgid "Search syntax"
+msgstr "Søk etter merkelapp"
+
+#: classes/feeds.php:1563
+msgid "Starred articles"
+msgstr "Favorittartikler"
+
+#: classes/feeds.php:1565
+msgid "Published articles"
+msgstr "Publiserte artikler"
+
+#: classes/feeds.php:1567
+msgid "Fresh articles"
+msgstr "Ferske artikler"
+
+#: classes/feeds.php:1571
+#, fuzzy
+msgid "Archived articles"
+msgstr "Lagrede artikler"
+
+#: classes/feeds.php:1573
+msgid "Recently read"
+msgstr ""
+
+#: classes/feeds.php:1694
+msgid "Special"
+msgstr "Snarveier"
+
+#: classes/feeds.php:1951
+#, fuzzy, php-format
+msgid "Search results: %s"
+msgstr "Søkeresultat"
 
 #: classes/pref/labels.php:25
 #: classes/pref/filters.php:377
@@ -1279,206 +1281,205 @@ msgstr "Forgrunn"
 msgid "Background:"
 msgstr "bakgrunn"
 
+#: classes/pref/labels.php:82
+#: classes/pref/filters.php:525
+#: classes/pref/feeds.php:773
+#: classes/pref/feeds.php:913
+#: classes/pref/users.php:103
+#: classes/pref/prefs.php:982
+#: classes/article.php:236
+#: plugins/af_zz_imgproxy/init.php:238
+#: plugins/af_redditimgur/init.php:66
+#: plugins/af_psql_trgm/init.php:188
+#: plugins/af_readability/init.php:80
+#: plugins/nsfw/init.php:85
+#: plugins/mail/init.php:65
+#: plugins/note/init.php:58
+msgid "Save"
+msgstr "Lagre"
+
 #: classes/pref/labels.php:244
 #, php-format
 msgid "Created label <b>%s</b>"
 msgstr "Laget merkelappen <b>%s</b>"
 
 #: classes/pref/labels.php:270
-#: classes/pref/users.php:356
-#: classes/pref/feeds.php:1183
-#: classes/pref/feeds.php:1414
-#: classes/pref/feeds.php:1479
 #: classes/pref/filters.php:388
 #: classes/pref/filters.php:446
 #: classes/pref/filters.php:792
 #: classes/pref/filters.php:875
 #: classes/pref/filters.php:902
+#: classes/pref/feeds.php:1182
+#: classes/pref/feeds.php:1413
+#: classes/pref/feeds.php:1478
+#: classes/pref/users.php:355
 #: classes/pref/prefs.php:993
 #, fuzzy
 msgid "Select"
 msgstr "Velg:"
 
-#: classes/pref/labels.php:273
-#: classes/pref/users.php:359
-#: classes/pref/feeds.php:1186
-#: classes/pref/feeds.php:1417
-#: classes/pref/feeds.php:1482
-#: classes/pref/filters.php:391
-#: classes/pref/filters.php:449
-#: classes/pref/filters.php:795
-#: classes/pref/filters.php:878
-#: classes/pref/filters.php:905
-#: classes/pref/prefs.php:996
-#: classes/feeds.php:102
-msgid "All"
-msgstr "Alle"
-
-#: classes/pref/labels.php:275
-#: classes/pref/users.php:361
-#: classes/pref/feeds.php:1188
-#: classes/pref/feeds.php:1419
-#: classes/pref/feeds.php:1484
-#: classes/pref/filters.php:393
-#: classes/pref/filters.php:451
-#: classes/pref/filters.php:797
-#: classes/pref/filters.php:880
-#: classes/pref/filters.php:907
-#: classes/pref/prefs.php:998
-#: classes/feeds.php:105
-msgid "None"
-msgstr "Ingen"
-
-#: classes/pref/labels.php:282
-#: classes/pref/users.php:370
-#: classes/pref/feeds.php:752
-#: classes/pref/filters.php:518
-#: classes/pref/filters.php:814
-#: classes/feeds.php:1088
-msgid "Remove"
-msgstr "Fjern"
-
 #: classes/pref/labels.php:285
 msgid "Clear colors"
 msgstr "Fjern farger"
 
-#: classes/pref/users.php:6
-#: classes/pref/system.php:8
-msgid "Your access level is insufficient to open this tab."
-msgstr "Adgangsnivået ditt er for lavt for å åpne denne siden."
-
-#: classes/pref/users.php:26
+#: classes/pref/filters.php:155
 #, fuzzy
-msgid "Edit user"
-msgstr "Filtre"
+msgid "Preview article"
+msgstr "Filtrer artikkel"
 
-#: classes/pref/users.php:61
-#: classes/pref/feeds.php:622
-#: classes/pref/feeds.php:849
-#: classes/feeds.php:1009
-msgid "Authentication"
-msgstr "Autentifisering"
-
-#: classes/pref/users.php:64
-msgid "Access level: "
-msgstr "Tilgangsnivå:"
-
-#: classes/pref/users.php:82
-#: classes/pref/feeds.php:648
-#: classes/pref/feeds.php:867
-msgid "Options"
-msgstr "Alternativer:"
-
-#: classes/pref/users.php:96
-#: js/prefs.js:479
-msgid "User details"
-msgstr "Brukerdetaljer"
-
-#: classes/pref/users.php:136
-#: classes/pref/users.php:407
-msgid "Registered"
-msgstr "Registrert"
-
-#: classes/pref/users.php:137
-msgid "Last logged in"
-msgstr "Sist innlogget"
-
-#: classes/pref/users.php:145
-msgid "Subscribed feeds count"
-msgstr "Antall nyhetsstrømmer som abonneres på"
-
-#: classes/pref/users.php:146
+#: classes/pref/filters.php:267
+#: classes/pref/filters.php:573
 #, fuzzy
-msgid "Stored articles"
-msgstr "Favorittartikler"
+msgid "(inverse)"
+msgstr "(Motsatt)"
 
-#: classes/pref/users.php:150
-#: classes/pref/users.php:406
-msgid "Subscribed feeds"
-msgstr "Nyhetsstrømmer som abonneres på"
-
-#: classes/pref/users.php:176
-msgid "User not found"
-msgstr "Brukeren ble  ikke funnet"
-
-#: classes/pref/users.php:246
+#: classes/pref/filters.php:263
+#: classes/pref/filters.php:572
 #, php-format
-msgid "Added user <b>%s</b> with password <b>%s</b>"
-msgstr "La til bruker <b>%s</b> med passordet <b>%s</b>"
-
-#: classes/pref/users.php:253
-#, php-format
-msgid "Could not create user <b>%s</b>"
-msgstr "Kunne ikke lage brukeren <b>%s</b>"
-
-#: classes/pref/users.php:257
-#, php-format
-msgid "User <b>%s</b> already exists."
-msgstr "Brukeren <b>%s</b> finnes allerede."
-
-#: classes/pref/users.php:285
-#, fuzzy, php-format
-msgid "Changed password of user <b>%s</b> to <b>%s</b>"
+msgid "%s on %s in %s %s"
 msgstr ""
-"Byttet passord forbruker <b>%s</b>\n"
-"\t\t\t\t\t til <b>%s</b>"
 
-#: classes/pref/users.php:287
-#, fuzzy, php-format
-msgid "Sending new password of user <b>%s</b> to <b>%s</b>"
+#: classes/pref/filters.php:383
+#: classes/pref/filters.php:870
+#: classes/pref/filters.php:977
+msgid "Match"
+msgstr "Match"
+
+#: classes/pref/filters.php:397
+#: classes/pref/filters.php:455
+#: classes/pref/filters.php:884
+#: classes/pref/filters.php:911
+msgid "Add"
+msgstr "Legg til"
+
+#: classes/pref/filters.php:441
+#: classes/pref/filters.php:897
+#, fuzzy
+msgid "Apply actions"
+msgstr "Nyhetsstrømshandlinger"
+
+#: classes/pref/filters.php:492
+#: classes/pref/filters.php:926
+msgid "Enabled"
+msgstr "Tillatt"
+
+#: classes/pref/filters.php:501
+#: classes/pref/filters.php:929
+#, fuzzy
+msgid "Match any rule"
+msgstr "Match på:"
+
+#: classes/pref/filters.php:510
+#: classes/pref/filters.php:932
+#, fuzzy
+msgid "Inverse matching"
+msgstr "Motsatt markering"
+
+#: classes/pref/filters.php:522
+#: classes/pref/filters.php:939
+msgid "Test"
+msgstr "Test"
+
+#: classes/pref/filters.php:804
+msgid "Combine"
 msgstr ""
-"Byttet passord forbruker <b>%s</b>\n"
-"\t\t\t\t\t til <b>%s</b>"
 
-#: classes/pref/users.php:311
-msgid "[tt-rss] Password change notification"
-msgstr "[tt-rss] Varsel om endring av passord"
-
-#: classes/pref/users.php:346
-#: classes/pref/feeds.php:1179
-#: classes/pref/filters.php:788
-#: classes/feeds.php:1059
-#: classes/feeds.php:1127
-#: js/tt-rss.js:165
-msgid "Search"
-msgstr "Søk"
-
-#: classes/pref/users.php:364
-msgid "Create user"
-msgstr "Lag bruker"
-
-#: classes/pref/users.php:368
 #: classes/pref/filters.php:807
+#: classes/pref/users.php:367
 msgid "Edit"
 msgstr "Rediger"
 
-#: classes/pref/users.php:404
-#: classes/pref/feeds.php:626
-#: classes/pref/feeds.php:853
-#: classes/pref/feeds.php:1649
-#: classes/feeds.php:1013
-msgid "Login"
-msgstr "Logg inn"
+#: classes/pref/filters.php:810
+#: classes/pref/feeds.php:1198
+#: classes/pref/feeds.php:1212
+#, fuzzy
+msgid "Reset sort order"
+msgstr "Nullstill passordet"
 
-#: classes/pref/users.php:405
-msgid "Access Level"
-msgstr "Tilgangsnivå"
+#: classes/pref/filters.php:942
+msgid "Create"
+msgstr "Lag"
 
-#: classes/pref/users.php:408
-msgid "Last login"
-msgstr "Siste innlogging"
+#: classes/pref/filters.php:987
+msgid "Regular expression, without outer delimiters (i.e. slashes)"
+msgstr ""
 
-#: classes/pref/users.php:427
-msgid "Click to edit"
-msgstr "Trykk for å endre"
+#: classes/pref/filters.php:993
+msgid "Inverse regular expression matching"
+msgstr ""
 
-#: classes/pref/users.php:447
-msgid "No users defined."
-msgstr "Ingen brukere er valgt"
+#: classes/pref/filters.php:995
+msgid "on field"
+msgstr "På felt:"
 
-#: classes/pref/users.php:449
-msgid "No matching users found."
-msgstr "Ingen matchende brukere ble funnet"
+#: classes/pref/filters.php:1001
+#: js/PrefFilterTree.js:44
+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:764
+#, 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:786
+#, fuzzy
+msgid "Add action"
+msgstr "Nyhetsstrømshandlinger"
+
+#: classes/pref/filters.php:1139
+msgid "[No caption]"
+msgstr "Ingen bildetekst"
+
+#: classes/pref/filters.php:1141
+#, 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:1155
+#, fuzzy
+msgid "matches any rule"
+msgstr "Match på:"
+
+#: classes/pref/filters.php:1158
+#, fuzzy, php-format
+msgid "%s (+%d action)"
+msgid_plural "%s (+%d actions)"
+msgstr[0] "Nyhetsstrømshandlinger"
+msgstr[1] "Nyhetsstrømshandlinger"
+
+#: classes/pref/system.php:8
+#: classes/pref/users.php:6
+msgid "Your access level is insufficient to open this tab."
+msgstr "Adgangsnivået ditt er for lavt for å åpne denne siden."
 
 #: classes/pref/system.php:29
 msgid "Error Log"
@@ -1525,419 +1526,341 @@ msgid_plural "(%d feeds)"
 msgstr[0] "Rediger nyhetsstrømmen"
 msgstr[1] "Rediger nyhetsstrømmen"
 
-#: classes/pref/feeds.php:514
+#: classes/pref/feeds.php:513
 #: classes/pref/prefs.php:18
 msgid "General"
 msgstr "Generelt"
 
-#: classes/pref/feeds.php:528
+#: classes/pref/feeds.php:527
 #, fuzzy
 msgid "Feed Title"
 msgstr "Tittel"
 
-#: classes/pref/feeds.php:560
-#: classes/pref/feeds.php:801
-#: classes/pref/feeds.php:1635
-#: classes/feeds.php:989
-msgid "Place in category:"
-msgstr "Plasser i kategori..."
+#: classes/pref/feeds.php:536
+#: classes/handler/public.php:417
+msgid "URL:"
+msgstr "Nettadresse:"
 
-#: classes/pref/feeds.php:572
+#: classes/pref/feeds.php:571
 #, fuzzy
 msgid "Site URL:"
 msgstr "Side:"
 
-#: classes/pref/feeds.php:574
+#: classes/pref/feeds.php:573
 #, fuzzy
 msgid "Site URL"
 msgstr "Nyhetsstrøm"
 
-#: classes/pref/feeds.php:585
-#: classes/pref/feeds.php:815
+#: classes/pref/feeds.php:584
+#: classes/pref/feeds.php:814
 #, fuzzy
 msgid "Language:"
 msgstr "Språk:"
 
-#: classes/pref/feeds.php:592
-#: classes/pref/feeds.php:824
+#: classes/pref/feeds.php:591
+#: classes/pref/feeds.php:823
 msgid "Update"
 msgstr "Oppdater"
 
-#: classes/pref/feeds.php:607
-#: classes/pref/feeds.php:840
+#: classes/pref/feeds.php:606
+#: classes/pref/feeds.php:839
 msgid "Article purging:"
 msgstr "Slett artikler:"
 
-#: classes/pref/feeds.php:632
-#: classes/pref/feeds.php:861
-#: classes/pref/feeds.php:1652
-#: classes/pref/prefs.php:243
-#: classes/feeds.php:1017
-#, fuzzy
-msgid "Password"
-msgstr "Passord:"
-
-#: classes/pref/feeds.php:636
+#: classes/pref/feeds.php:635
 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:646
-#: classes/feeds.php:1028
-msgid "This feed requires authentication."
-msgstr "Denne nyhetsstrømmen krever autentifisering"
+#: classes/pref/feeds.php:647
+#: classes/pref/feeds.php:866
+#: classes/pref/users.php:82
+msgid "Options"
+msgstr "Alternativer:"
 
-#: classes/pref/feeds.php:662
-#: classes/pref/feeds.php:871
+#: classes/pref/feeds.php:661
+#: classes/pref/feeds.php:870
 #, fuzzy
 msgid "Hide from Popular feeds"
 msgstr "Skjul fra min nyhetsstrømslisten"
 
-#: classes/pref/feeds.php:674
-#: classes/pref/feeds.php:877
+#: classes/pref/feeds.php:673
+#: classes/pref/feeds.php:876
 msgid "Include in e-mail digest"
 msgstr "Inkluder i e-postsammendraget"
 
-#: classes/pref/feeds.php:687
-#: classes/pref/feeds.php:883
+#: classes/pref/feeds.php:686
+#: classes/pref/feeds.php:882
 msgid "Always display image attachments"
 msgstr ""
 
-#: classes/pref/feeds.php:700
-#: classes/pref/feeds.php:891
+#: classes/pref/feeds.php:699
+#: classes/pref/feeds.php:890
 #, fuzzy
 msgid "Do not embed media"
 msgstr "Ikke vis bilder i artiklene"
 
-#: classes/pref/feeds.php:713
-#: classes/pref/feeds.php:899
+#: classes/pref/feeds.php:712
+#: classes/pref/feeds.php:898
 msgid "Cache media"
 msgstr ""
 
-#: classes/pref/feeds.php:725
-#: classes/pref/feeds.php:905
+#: classes/pref/feeds.php:724
+#: classes/pref/feeds.php:904
 #, fuzzy
 msgid "Mark updated articles as unread"
 msgstr "Marker alle artikler som leste?"
 
-#: classes/pref/feeds.php:729
+#: classes/pref/feeds.php:728
 #, fuzzy
 msgid "Icon"
 msgstr "Handling"
 
-#: classes/pref/feeds.php:743
-#: classes/pref/feeds.php:1284
+#: classes/pref/feeds.php:742
+#: classes/pref/feeds.php:1283
 #: plugins/import_export/init.php:71
 #, fuzzy
 msgid "Choose file..."
 msgstr "Lag filter..."
 
-#: classes/pref/feeds.php:750
+#: classes/pref/feeds.php:749
 msgid "Replace"
 msgstr ""
 
-#: classes/pref/feeds.php:757
+#: classes/pref/feeds.php:756
 #: classes/pref/prefs.php:679
 msgid "Plugins"
 msgstr ""
 
-#: classes/pref/feeds.php:1154
+#: classes/pref/feeds.php:1153
 #, fuzzy
 msgid "Feeds with errors"
 msgstr "Nyhetsstrømsredigerer"
 
-#: classes/pref/feeds.php:1161
+#: classes/pref/feeds.php:1160
 #, fuzzy
 msgid "Inactive feeds"
 msgstr "Hele nyhetsstrømmen"
 
-#: classes/pref/feeds.php:1197
+#: classes/pref/feeds.php:1196
 #, fuzzy
 msgid "Edit selected feeds"
 msgstr "Sletter den valgte nyhetsstrømmen..."
 
-#: classes/pref/feeds.php:1199
-#: classes/pref/feeds.php:1213
-#: classes/pref/filters.php:810
-#, fuzzy
-msgid "Reset sort order"
-msgstr "Nullstill passordet"
-
-#: classes/pref/feeds.php:1201
-#: js/prefs.js:1462
+#: classes/pref/feeds.php:1200
+#: js/prefs.js:1171
 #, fuzzy
 msgid "Batch subscribe"
 msgstr "Avabonner"
 
-#: classes/pref/feeds.php:1208
+#: classes/pref/feeds.php:1207
 #, fuzzy
 msgid "Categories"
 msgstr "Kategori:"
 
-#: classes/pref/feeds.php:1211
+#: classes/pref/feeds.php:1210
 #, fuzzy
 msgid "Add category"
 msgstr "Legger til kategori for nyhetsstrømmer"
 
-#: classes/pref/feeds.php:1215
+#: classes/pref/feeds.php:1214
 #, fuzzy
 msgid "Remove selected"
 msgstr "Fjerne valgte filtre?"
 
-#: classes/pref/feeds.php:1272
+#: classes/pref/feeds.php:1271
 msgid "OPML"
 msgstr "OPML"
 
-#: classes/pref/feeds.php:1274
+#: classes/pref/feeds.php:1273
 msgid "Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings."
 msgstr ""
 
-#: classes/pref/feeds.php:1275
+#: classes/pref/feeds.php:1274
 msgid "Only main settings profile can be migrated using OPML."
 msgstr ""
 
-#: classes/pref/feeds.php:1290
+#: classes/pref/feeds.php:1289
 #, fuzzy
 msgid "Import my OPML"
 msgstr "Importerer OPML (bruker DOMXML-utvidelsen)..."
 
-#: classes/pref/feeds.php:1296
+#: classes/pref/feeds.php:1295
 msgid "Filename:"
 msgstr ""
 
-#: classes/pref/feeds.php:1298
+#: classes/pref/feeds.php:1297
 #, fuzzy
 msgid "Include settings"
 msgstr "Inkluder i e-postsammendraget"
 
-#: classes/pref/feeds.php:1302
+#: classes/pref/feeds.php:1301
 #, fuzzy
 msgid "Export OPML"
 msgstr "Eksporter OPML"
 
-#: classes/pref/feeds.php:1306
+#: classes/pref/feeds.php:1305
 #, 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:1310
+#: classes/pref/feeds.php:1309
 msgid "Public OPML URL"
 msgstr ""
 
-#: classes/pref/feeds.php:1311
+#: classes/pref/feeds.php:1310
 msgid "Display published OPML URL"
 msgstr ""
 
-#: classes/pref/feeds.php:1318
+#: classes/pref/feeds.php:1317
 #, fuzzy
 msgid "Published & shared articles / Generated feeds"
 msgstr "Sett poeng på nytt for artiklene i de valgte nyhetskanalene?"
 
-#: classes/pref/feeds.php:1320
+#: classes/pref/feeds.php:1319
 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:1327
-#: classes/feeds.php:54
-#: classes/feeds.php:140
-#, fuzzy
-msgid "View as RSS"
-msgstr "Se stikkord"
-
-#: classes/pref/feeds.php:1328
 #, fuzzy
 msgid "Display URL"
 msgstr "Vis stikkord"
 
-#: classes/pref/feeds.php:1331
+#: classes/pref/feeds.php:1330
 msgid "Clear all generated URLs"
 msgstr ""
 
-#: classes/pref/feeds.php:1410
+#: classes/pref/feeds.php:1409
 #, 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:1444
-#: classes/pref/feeds.php:1509
+#: classes/pref/feeds.php:1443
+#: classes/pref/feeds.php:1508
 #, fuzzy
 msgid "Click to edit feed"
 msgstr "Trykk for å endre"
 
-#: classes/pref/feeds.php:1462
-#: classes/pref/feeds.php:1529
+#: classes/pref/feeds.php:1461
+#: classes/pref/feeds.php:1528
 #, fuzzy
 msgid "Unsubscribe from selected feeds"
 msgstr "Fjern abonnement på valgte nyhetsstrømmer"
 
-#: classes/pref/feeds.php:1632
+#: classes/pref/feeds.php:1629
 msgid "Add one valid RSS feed per line (no feed detection is done)"
 msgstr ""
 
-#: classes/pref/feeds.php:1641
+#: classes/pref/feeds.php:1638
 msgid "Feeds to subscribe, One per line"
 msgstr ""
 
-#: classes/pref/feeds.php:1664
+#: classes/pref/feeds.php:1661
 #, fuzzy
 msgid "Feeds require authentication."
 msgstr "Denne nyhetsstrømmen krever autentifisering"
 
-#: classes/pref/feeds.php:1671
-#: classes/feeds.php:1031
-#: classes/feeds.php:1087
-msgid "Subscribe"
-msgstr "Abonner"
-
-#: classes/pref/filters.php:155
+#: classes/pref/users.php:26
 #, fuzzy
-msgid "Preview article"
-msgstr "Filtrer artikkel"
-
-#: classes/pref/filters.php:267
-#: classes/pref/filters.php:573
-#, fuzzy
-msgid "(inverse)"
-msgstr "(Motsatt)"
-
-#: classes/pref/filters.php:263
-#: classes/pref/filters.php:572
-#, php-format
-msgid "%s on %s in %s %s"
-msgstr ""
-
-#: classes/pref/filters.php:383
-#: classes/pref/filters.php:870
-#: classes/pref/filters.php:977
-msgid "Match"
-msgstr "Match"
-
-#: classes/pref/filters.php:397
-#: classes/pref/filters.php:455
-#: classes/pref/filters.php:884
-#: classes/pref/filters.php:911
-msgid "Add"
-msgstr "Legg til"
-
-#: classes/pref/filters.php:400
-#: classes/pref/filters.php:458
-#: classes/pref/filters.php:887
-#: classes/pref/filters.php:914
-#: classes/feeds.php:122
-#, fuzzy
-msgid "Delete"
-msgstr "Standard"
-
-#: classes/pref/filters.php:441
-#: classes/pref/filters.php:897
-#, fuzzy
-msgid "Apply actions"
-msgstr "Nyhetsstrømshandlinger"
-
-#: classes/pref/filters.php:492
-#: classes/pref/filters.php:926
-msgid "Enabled"
-msgstr "Tillatt"
-
-#: classes/pref/filters.php:501
-#: classes/pref/filters.php:929
-#, fuzzy
-msgid "Match any rule"
-msgstr "Match på:"
-
-#: classes/pref/filters.php:510
-#: classes/pref/filters.php:932
-#, fuzzy
-msgid "Inverse matching"
-msgstr "Motsatt markering"
-
-#: classes/pref/filters.php:522
-#: classes/pref/filters.php:939
-msgid "Test"
-msgstr "Test"
-
-#: classes/pref/filters.php:804
-msgid "Combine"
-msgstr ""
-
-#: classes/pref/filters.php:942
-msgid "Create"
-msgstr "Lag"
-
-#: classes/pref/filters.php:987
-msgid "Regular expression, without outer delimiters (i.e. slashes)"
-msgstr ""
-
-#: 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:43
-msgid "in"
-msgstr "i"
-
-#: classes/pref/filters.php:1014
-#, fuzzy
-msgid "Wiki: Filters"
+msgid "Edit user"
 msgstr "Filtre"
 
-#: classes/pref/filters.php:1019
+#: classes/pref/users.php:64
+msgid "Access level: "
+msgstr "Tilgangsnivå:"
+
+#: classes/pref/users.php:96
+#: js/prefs.js:403
+msgid "User details"
+msgstr "Brukerdetaljer"
+
+#: classes/pref/users.php:136
+#: classes/pref/users.php:406
+msgid "Registered"
+msgstr "Registrert"
+
+#: classes/pref/users.php:137
+msgid "Last logged in"
+msgstr "Sist innlogget"
+
+#: classes/pref/users.php:145
+msgid "Subscribed feeds count"
+msgstr "Antall nyhetsstrømmer som abonneres på"
+
+#: classes/pref/users.php:146
 #, fuzzy
-msgid "Save rule"
-msgstr "Lagre"
+msgid "Stored articles"
+msgstr "Favorittartikler"
 
-#: classes/pref/filters.php:1019
-#: js/functions.js:797
-#, fuzzy
-msgid "Add rule"
-msgstr "Legger til kategori for nyhetsstrømmer"
+#: classes/pref/users.php:150
+#: classes/pref/users.php:405
+msgid "Subscribed feeds"
+msgstr "Nyhetsstrømmer som abonneres på"
 
-#: classes/pref/filters.php:1042
-msgid "Perform Action"
-msgstr "Utfør handlingen"
+#: classes/pref/users.php:176
+msgid "User not found"
+msgstr "Brukeren ble  ikke funnet"
 
-#: classes/pref/filters.php:1093
-#, fuzzy
-msgid "No actions available"
-msgstr "Ny versjon av Tiny Tiny Rss er tilgjengelig!"
+#: classes/pref/users.php:246
+#, php-format
+msgid "Added user <b>%s</b> with password <b>%s</b>"
+msgstr "La til bruker <b>%s</b> med passordet <b>%s</b>"
 
-#: classes/pref/filters.php:1112
-#, fuzzy
-msgid "Save action"
-msgstr "Panelhandlinger"
+#: classes/pref/users.php:253
+#, php-format
+msgid "Could not create user <b>%s</b>"
+msgstr "Kunne ikke lage brukeren <b>%s</b>"
 
-#: classes/pref/filters.php:1112
-#: js/functions.js:819
-#, fuzzy
-msgid "Add action"
-msgstr "Nyhetsstrømshandlinger"
+#: classes/pref/users.php:257
+#, php-format
+msgid "User <b>%s</b> already exists."
+msgstr "Brukeren <b>%s</b> finnes allerede."
 
-#: classes/pref/filters.php:1139
-msgid "[No caption]"
-msgstr "Ingen bildetekst"
-
-#: classes/pref/filters.php:1141
+#: classes/pref/users.php:285
 #, 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"
+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/filters.php:1155
-#, fuzzy
-msgid "matches any rule"
-msgstr "Match på:"
-
-#: classes/pref/filters.php:1158
+#: classes/pref/users.php:287
 #, fuzzy, php-format
-msgid "%s (+%d action)"
-msgid_plural "%s (+%d actions)"
-msgstr[0] "Nyhetsstrømshandlinger"
-msgstr[1] "Nyhetsstrømshandlinger"
+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:310
+msgid "[tt-rss] Password change notification"
+msgstr "[tt-rss] Varsel om endring av passord"
+
+#: classes/pref/users.php:363
+msgid "Create user"
+msgstr "Lag bruker"
+
+#: classes/pref/users.php:371
+#: classes/handler/public.php:747
+msgid "Reset password"
+msgstr "Nullstill passordet"
+
+#: classes/pref/users.php:404
+msgid "Access Level"
+msgstr "Tilgangsnivå"
+
+#: classes/pref/users.php:407
+msgid "Last login"
+msgstr "Siste innlogging"
+
+#: classes/pref/users.php:426
+msgid "Click to edit"
+msgstr "Trykk for å endre"
+
+#: classes/pref/users.php:446
+msgid "No users defined."
+msgstr "Ingen brukere er valgt"
+
+#: classes/pref/users.php:448
+msgid "No matching users found."
+msgstr "Ingen matchende brukere ble funnet"
 
 #: classes/pref/prefs.php:19
 msgid "Interface"
@@ -2125,7 +2048,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:1424
+#: js/prefs.js:1136
 #, fuzzy
 msgid "Customize stylesheet"
 msgstr "URL til brukerbestemt utseendemal (CSS)"
@@ -2391,275 +2314,318 @@ msgstr "Fjerne valgte filtre?"
 msgid "Activate profile"
 msgstr "Fjerne valgte filtre?"
 
-#: classes/feeds.php:53
-#, fuzzy
-msgid "View as RSS feed"
-msgstr "Se nyhetsstrømmene"
+#: 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/feeds.php:62
-#, fuzzy, php-format
-msgid "Last updated: %s"
+#: classes/dlg.php:44
+#, fuzzy
+msgid "Your Public OPML URL is:"
+msgstr "Lenke til nyhetsstrøm for publiserte artikler"
+
+#: classes/dlg.php:53
+#: classes/dlg.php:178
+#: plugins/share/init.php:125
+#, fuzzy
+msgid "Generate new URL"
+msgstr "Generert nyhetsstrøm"
+
+#: classes/dlg.php:67
+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 "Oppdateringsprosessen er åpnet for i konfigurasjonsfilen, men prosessen blir ikke kjørt, noe som gjør at ingen nyhetsstrømmer blir oppdatert. Vennligst start prosessen eller konakt administratoren."
+
+#: classes/dlg.php:71
+#: classes/dlg.php:80
+msgid "Last update:"
 msgstr "Siste oppdatering:"
 
-#: classes/feeds.php:100
+#: classes/dlg.php:76
+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 "TT-RSS har oppdaget at oppdateringsmetoden bruker for lang tid å oppdatere nyhetsstrømmene. Dette kan indikere et krasj eller at noe henger. Vennligst sjekk oppdateringsprosessen eller kontakt vedkommende som innehar nyhetsstrømmen."
+
+#: classes/dlg.php:169
+msgid "You can view this feed as RSS using the following URL:"
+msgstr ""
+
+#: classes/dlg.php:190
+msgid "You are using default tt-rss password. Please change it in the Preferences (Personal data / Authentication)."
+msgstr ""
+
+#: classes/dlg.php:194
 #, fuzzy
-msgid "Select..."
-msgstr "Velg:"
+msgid "Open Preferences"
+msgstr "Innstillinger"
 
-#: classes/feeds.php:104
-msgid "Invert"
-msgstr "Motsatt"
+#: classes/opml.php:31
+#: classes/opml.php:36
+msgid "OPML Utility"
+msgstr "OPML-verktøy"
 
-#: classes/feeds.php:107
-msgid "Selection toggle:"
-msgstr "Marker utvalg:"
-
-#: classes/feeds.php:113
-msgid "Selection:"
-msgstr "Utvalg:"
-
-#: classes/feeds.php:116
+#: classes/opml.php:40
 #, fuzzy
-msgid "Set score"
-msgstr "Poeng"
+msgid "Importing OPML..."
+msgstr "Importerer OPML (bruker DOMXML-utvidelsen)..."
 
-#: classes/feeds.php:119
+#: classes/opml.php:45
+msgid "Return to preferences"
+msgstr "Returner til innstillinger"
+
+#: classes/opml.php:301
+#, fuzzy, php-format
+msgid "Adding feed: %s"
+msgstr "Legger til nyhetsstrøm..."
+
+#: classes/opml.php:312
+#, fuzzy, php-format
+msgid "Duplicate feed: %s"
+msgstr "Lag filter"
+
+#: classes/opml.php:326
+#, fuzzy, php-format
+msgid "Adding label %s"
+msgstr "Tildel stikkord"
+
+#: classes/opml.php:329
+#, php-format
+msgid "Duplicate label: %s"
+msgstr ""
+
+#: classes/opml.php:341
+#, php-format
+msgid "Setting preference key %s to %s"
+msgstr ""
+
+#: classes/opml.php:377
 #, fuzzy
-msgid "Archive"
-msgstr "Artikkeldato"
+msgid "Adding filter..."
+msgstr "Legger til nyhetsstrøm..."
 
-#: classes/feeds.php:121
+#: classes/opml.php:512
+#, fuzzy, php-format
+msgid "Processing category: %s"
+msgstr "Plasser i kategori..."
+
+#: classes/opml.php:558
+#, php-format
+msgid "Upload failed with error code %d"
+msgstr ""
+
+#: classes/opml.php:570
+#: plugins/import_export/init.php:471
 #, fuzzy
-msgid "Move back"
-msgstr "Gå tilbake"
+msgid "Unable to move uploaded file."
+msgstr "Feil: Kan ikke laste opp OPMLfil"
 
-#: classes/feeds.php:127
-#: classes/feeds.php:132
-#: plugins/mail/init.php:76
-#: plugins/mailto/init.php:25
+#: classes/opml.php:574
+#: plugins/import_export/init.php:475
+msgid "Error: please upload OPML file."
+msgstr "Feil: Kan ikke laste opp OPMLfil"
+
+#: classes/opml.php:585
 #, fuzzy
-msgid "Forward by email"
-msgstr "Marker artikkel som favoritt"
+msgid "Error: unable to find moved OPML file."
+msgstr "Feil: Kan ikke laste opp OPMLfil"
 
-#: classes/feeds.php:136
-msgid "Feed:"
-msgstr "Nyhetsstrøm:"
+#: classes/opml.php:594
+msgid "Error while parsing document."
+msgstr "Feil under behandling av dokumentet"
 
-#: classes/feeds.php:193
-#: classes/feeds.php:819
-msgid "Feed not found."
+#: classes/article.php:26
+#, fuzzy
+msgid "Article not found."
 msgstr "Nyhetsstrømmen ble ikke funnet"
 
-#: classes/feeds.php:255
+#: classes/article.php:211
+msgid "Tags for this article (separated by commas):"
+msgstr "Denne artikkelens stikkord (separert med kommaer):"
+
+#: classes/article.php:337
+#: classes/article.php:719
+#: classes/article.php:874
+msgid "no tags"
+msgstr "Ingen stikkord"
+
+#: classes/article.php:447
+msgid "unknown type"
+msgstr "Ukjent type"
+
+#: classes/article.php:524
 #, fuzzy
-msgid "Never"
-msgstr "Slett aldri"
+msgid "Attachments"
+msgstr "Vedlegg:"
 
-#: classes/feeds.php:342
-#, fuzzy, php-format
-msgid "Imported at %s"
-msgstr "Importer"
+#: classes/article.php:688
+msgid " - "
+msgstr "-"
 
-#: classes/feeds.php:394
-#: classes/feeds.php:487
+#: classes/article.php:912
 #, fuzzy
-msgid "mark feed as read"
-msgstr "Marker nyhetsstrøm som lest"
+msgid "(edit note)"
+msgstr "Rediger notat"
 
-#: classes/feeds.php:542
+#: classes/handler/public.php:407
+#: plugins/bookmarklets/init.php:40
 #, fuzzy
-msgid "Collapse article"
-msgstr "Fjern artikler"
+msgid "Share with Tiny Tiny RSS"
+msgstr "Returner til Tiny Tiny RSS"
 
-#: classes/feeds.php:703
-msgid "No unread articles found to display."
-msgstr "Ingen uleste artikler funnet som kunne vises"
+#: classes/handler/public.php:415
+msgid "Title:"
+msgstr "Tittel:"
 
-#: classes/feeds.php:706
-msgid "No updated articles found to display."
-msgstr "Ingen oppdaterte artikler funnet som kunne vises"
-
-#: classes/feeds.php:709
-msgid "No starred articles found to display."
-msgstr "Ingen markerte artikler som kan vises"
-
-#: classes/feeds.php:713
+#: classes/handler/public.php:419
 #, 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."
+msgid "Content:"
+msgstr "Innhold"
 
-#: classes/feeds.php:715
-msgid "No articles found to display."
-msgstr "Ingen artikler funnet som kan vises"
-
-#: classes/feeds.php:731
-#: classes/feeds.php:922
-#, fuzzy, php-format
-msgid "Feeds last updated at %s"
-msgstr "Oppdateringsfeil"
-
-#: classes/feeds.php:743
-#: classes/feeds.php:934
-msgid "Some feeds have update errors (click for details)"
-msgstr "Noen nyhetsstrømmer har oppdateringsfeil (trykk for detaljer)"
-
-#: classes/feeds.php:911
-msgid "No feed selected."
-msgstr "Ingen valgt nyhetsstrøm"
-
-#: classes/feeds.php:975
-#: classes/feeds.php:983
+#: classes/handler/public.php:421
 #, fuzzy
-msgid "Feed or site URL"
-msgstr "Nyhetsstrøm"
+msgid "Labels:"
+msgstr "Merkelapper"
 
-#: classes/feeds.php:997
-#, fuzzy
-msgid "Available feeds"
-msgstr "Alle Nyhetsstrømmer"
-
-#: classes/feeds.php:1034
-#, fuzzy
-msgid "More feeds"
-msgstr "Flere nyhetsstrømmer"
-
-#: classes/feeds.php:1063
-#, fuzzy
-msgid "Popular feeds"
-msgstr "Vis nyhetsstrømmer"
-
-#: classes/feeds.php:1064
-#, fuzzy
-msgid "Feed archive"
-msgstr "Nyhetsstrømshandlinger"
-
-#: classes/feeds.php:1067
-#, fuzzy
-msgid "limit:"
-msgstr "Antall:"
-
-#: classes/feeds.php:1101
-msgid "Look for"
+#: classes/handler/public.php:440
+msgid "Shared article will appear in the Published feed."
 msgstr ""
 
-#: classes/feeds.php:1109
+#: classes/handler/public.php:442
+msgid "Share"
+msgstr ""
+
+#: classes/handler/public.php:464
+#, fuzzy
+msgid "Not logged in"
+msgstr "Sist innlogget"
+
+#: classes/handler/public.php:527
+msgid "Incorrect username or password"
+msgstr "Feil brukernavn og/eller passord"
+
+#: classes/handler/public.php:581
 #, php-format
-msgid "in %s"
-msgstr ""
+msgid "Already subscribed to <b>%s</b>."
+msgstr "Abonnerer allerede på <b>%s</b>"
 
-#: classes/feeds.php:1114
-msgid "Used for word stemming"
-msgstr ""
+#: classes/handler/public.php:584
+#, php-format
+msgid "Subscribed to <b>%s</b>."
+msgstr "Abonnerer på <b>%s</b>"
 
-#: classes/feeds.php:1123
-#, fuzzy
-msgid "Search syntax"
-msgstr "Søk etter merkelapp"
-
-#: classes/feeds.php:1577
-msgid "Starred articles"
-msgstr "Favorittartikler"
-
-#: classes/feeds.php:1579
-msgid "Published articles"
-msgstr "Publiserte artikler"
-
-#: classes/feeds.php:1581
-msgid "Fresh articles"
-msgstr "Ferske artikler"
-
-#: classes/feeds.php:1585
-#, fuzzy
-msgid "Archived articles"
-msgstr "Lagrede artikler"
-
-#: classes/feeds.php:1587
-msgid "Recently read"
-msgstr ""
-
-#: classes/feeds.php:1708
-msgid "Special"
-msgstr "Snarveier"
-
-#: classes/feeds.php:1965
+#: classes/handler/public.php:587
 #, fuzzy, php-format
-msgid "Search results: %s"
-msgstr "Søkeresultat"
+msgid "Could not subscribe to <b>%s</b>."
+msgstr "Abonnerer allerede på <b>%s</b>"
 
-#: plugins/nsfw/init.php:30
-#: plugins/nsfw/init.php:42
-msgid "Not work safe (click to toggle)"
-msgstr ""
+#: classes/handler/public.php:590
+#, fuzzy, php-format
+msgid "No feeds found in <b>%s</b>."
+msgstr "Ingen nyhetsstrømmer ble funnet."
 
-#: 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
+#: classes/handler/public.php:593
 #, fuzzy
-msgid "Configuration saved."
+msgid "Multiple feed URLs found."
+msgstr "Adresse for nyhetsstrømmen for offentliggjorte innlegg har endret seg."
+
+#: classes/handler/public.php:597
+#, 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:615
+#, fuzzy
+msgid "Subscribe to selected feed"
+msgstr "Fjern abonnement på valgte nyhetsstrømmer"
+
+#: classes/handler/public.php:642
+msgid "Edit subscription options"
+msgstr "Rediger abonnementsalternativer"
+
+#: classes/handler/public.php:680
+#, fuzzy
+msgid "Password recovery"
+msgstr "Passord:"
+
+#: classes/handler/public.php:725
+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:757
+msgid "Some of the required form parameters are missing or incorrect."
+msgstr ""
+
+#: classes/handler/public.php:761
+#: classes/handler/public.php:830
+#, fuzzy
+msgid "Go back"
+msgstr "Gå tilbake"
+
+#: classes/handler/public.php:799
+#, fuzzy
+msgid "[tt-rss] Password reset request"
+msgstr "[tt-rss] Varsel om endring av passord"
+
+#: classes/handler/public.php:826
+msgid "Sorry, login and email combination not found."
+msgstr ""
+
+#: 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:874
+msgid "Database Updater"
+msgstr "Databaseoppdaterer"
+
+#: classes/handler/public.php:939
+msgid "Perform updates"
+msgstr "Utfør oppdateringene"
+
+#: plugins/af_zz_imgproxy/init.php:208
+msgid "Image proxy settings (af_zz_imgproxy)"
+msgstr ""
+
+#: plugins/af_zz_imgproxy/init.php:232
+#, fuzzy
+msgid "Enable proxy for all remote images."
+msgstr "Tillat ikoner i nyhetsstrømslisten"
+
+#: plugins/af_zz_imgproxy/init.php:236
+#, fuzzy
+msgid "Don't cache files locally."
+msgstr "Mellomlagre bilder lokalt på serveren"
+
+#: plugins/af_zz_imgproxy/init.php:252
+#: plugins/af_redditimgur/init.php:79
+#, fuzzy
+msgid "Configuration saved"
 msgstr "Konfigurasjonen er lagret."
 
-#: plugins/note/init.php:28
-#: plugins/note/note.js:11
-#, fuzzy
-msgid "Edit article note"
-msgstr "Endre Stikkord"
-
 #: plugins/vf_shared/init.php:17
 #: plugins/vf_shared/init.php:73
 #, fuzzy
 msgid "Shared articles"
 msgstr "Favorittartikler"
 
-#: plugins/auth_internal/init.php:67
-#, fuzzy
-msgid "Please enter your one time password:"
-msgstr "Vennligst skriv inn et notat for denne artikkelen:"
-
-#: plugins/auth_internal/init.php:208
-msgid "Password has been changed."
-msgstr "Passord har blitt endret."
-
-#: plugins/auth_internal/init.php:210
-msgid "Old password is incorrect."
-msgstr "Gammelt passord er feil"
-
-#: plugins/af_readability/init.php:25
-msgid "Data saved."
+#: plugins/bookmarklets/init.php:20
+msgid "Bookmarklets"
 msgstr ""
 
-#: plugins/af_readability/init.php:41
-#, fuzzy
-msgid "Inline content"
-msgstr "Rullevisning av artkkelens innhold"
-
-#: plugins/af_readability/init.php:47
-msgid "Readability settings (af_readability)"
+#: 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_readability/init.php:78
-msgid "Use Readability for pages shared via bookmarklet."
-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_readability/init.php:90
-#: plugins/af_psql_trgm/init.php:198
-msgid "Currently enabled for (click to edit):"
-msgstr ""
-
-#: plugins/af_readability/init.php:107
+#: plugins/bookmarklets/init.php:31
 #, fuzzy
-msgid "Readability"
-msgstr "Sjekk tilgjengeligheten"
+msgid "Subscribe in Tiny Tiny RSS"
+msgstr "Returner til Tiny Tiny RSS"
 
-#: plugins/af_readability/init.php:118
-#, fuzzy
-msgid "Inline article content"
-msgstr "Rullevisning av artkkelens innhold"
+#: plugins/bookmarklets/init.php:34
+msgid "Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS"
+msgstr ""
 
 #: plugins/af_redditimgur/init.php:30
 msgid "Reddit content settings (af_redditimgur)"
@@ -2673,11 +2639,21 @@ msgstr ""
 msgid "Enable additional duplicate checking"
 msgstr ""
 
-#: plugins/af_redditimgur/init.php:79
-#: plugins/af_zz_imgproxy/init.php:252
-#, fuzzy
-msgid "Configuration saved"
-msgstr "Konfigurasjonen er lagret."
+#: plugins/af_comics/init.php:49
+msgid "Feeds supported by af_comics"
+msgstr ""
+
+#: plugins/af_comics/init.php:51
+msgid "The following comics are currently supported:"
+msgstr ""
+
+#: plugins/af_comics/init.php:69
+msgid "To subscribe to GoComics use the comic's regular web page as the feed URL (e.g. for the <em>Garfield</em> comic use <code>http://www.gocomics.com/garfield</code>)."
+msgstr ""
+
+#: plugins/af_comics/init.php:71
+msgid "Drop any updated filters into <code>filters.local</code> in plugin directory."
+msgstr ""
 
 #: plugins/af_psql_trgm/init.php:29
 #, php-format
@@ -2717,26 +2693,91 @@ msgstr ""
 msgid "Enable for all feeds:"
 msgstr "Tillat ikoner i nyhetsstrømslisten"
 
+#: plugins/af_psql_trgm/init.php:198
+#: plugins/af_readability/init.php:90
+msgid "Currently enabled for (click to edit):"
+msgstr ""
+
 #: plugins/af_psql_trgm/init.php:216
 msgid "Similarity (pg_trgm)"
 msgstr ""
 
-#: plugins/af_comics/init.php:49
-msgid "Feeds supported by af_comics"
+#: plugins/af_readability/init.php:25
+msgid "Data saved."
 msgstr ""
 
-#: plugins/af_comics/init.php:51
-msgid "The following comics are currently supported:"
+#: plugins/af_readability/init.php:41
+#, fuzzy
+msgid "Inline content"
+msgstr "Rullevisning av artkkelens innhold"
+
+#: plugins/af_readability/init.php:47
+msgid "Readability settings (af_readability)"
 msgstr ""
 
-#: plugins/af_comics/init.php:69
-msgid "To subscribe to GoComics use the comic's regular web page as the feed URL (e.g. for the <em>Garfield</em> comic use <code>http://www.gocomics.com/garfield</code>)."
+#: plugins/af_readability/init.php:78
+msgid "Use Readability for pages shared via bookmarklet."
 msgstr ""
 
-#: plugins/af_comics/init.php:71
-msgid "Drop any updated filters into <code>filters.local</code> in plugin directory."
+#: plugins/af_readability/init.php:107
+#, fuzzy
+msgid "Readability"
+msgstr "Sjekk tilgjengeligheten"
+
+#: plugins/af_readability/init.php:118
+#, fuzzy
+msgid "Inline article content"
+msgstr "Rullevisning av artkkelens innhold"
+
+#: plugins/mailto/init.php:50
+#: plugins/mailto/init.php:58
+#: plugins/mail/init.php:118
+#: plugins/mail/init.php:124
+msgid "[Forwarded]"
 msgstr ""
 
+#: plugins/mailto/init.php:50
+#: plugins/mail/init.php:118
+#, fuzzy
+msgid "Multiple articles"
+msgstr "Alle artikler"
+
+#: plugins/mailto/init.php:74
+msgid "Clicking the following link to invoke your mail client:"
+msgstr ""
+
+#: plugins/mailto/init.php:78
+#, fuzzy
+msgid "Forward selected article(s) by email."
+msgstr "Marker artikkel som favoritt"
+
+#: plugins/mailto/init.php:81
+msgid "You should be able to edit the message before sending in your mail client."
+msgstr ""
+
+#: plugins/mailto/init.php:86
+#, fuzzy
+msgid "Close this dialog"
+msgstr "Lukk dette vinduet"
+
+#: 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 "Konfigurasjonen er lagret."
+
 #: plugins/import_export/init.php:53
 msgid "Import and export"
 msgstr ""
@@ -2807,109 +2848,6 @@ msgstr ""
 msgid "No file uploaded."
 msgstr "Ingen OPML-fil til å lastes opp."
 
-#: plugins/mail/init.php:29
-msgid "Mail addresses saved."
-msgstr ""
-
-#: plugins/mail/init.php:35
-msgid "Mail plugin"
-msgstr ""
-
-#: plugins/mail/init.php:37
-msgid "You can set predefined email addressed here (comma-separated list):"
-msgstr ""
-
-#: plugins/mail/init.php:118
-#: plugins/mail/init.php:124
-#: plugins/mailto/init.php:50
-#: plugins/mailto/init.php:58
-msgid "[Forwarded]"
-msgstr ""
-
-#: plugins/mail/init.php:118
-#: plugins/mailto/init.php:50
-#, fuzzy
-msgid "Multiple articles"
-msgstr "Alle artikler"
-
-#: plugins/mail/init.php:146
-#, fuzzy
-msgid "To:"
-msgstr "Topp"
-
-#: plugins/mail/init.php:161
-#, fuzzy
-msgid "Subject:"
-msgstr "Velg:"
-
-#: plugins/mail/init.php:178
-#, fuzzy
-msgid "Send e-mail"
-msgstr "Skift e-post"
-
-#: plugins/close_button/init.php:25
-#, fuzzy
-msgid "Close article"
-msgstr "Fjern artikler"
-
-#: 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
-#, fuzzy, php-format
-msgid "Subscribe to %s in Tiny Tiny RSS?"
-msgstr "Returner til Tiny Tiny RSS"
-
-#: plugins/bookmarklets/init.php:31
-#, fuzzy
-msgid "Subscribe in Tiny Tiny RSS"
-msgstr "Returner til Tiny Tiny RSS"
-
-#: plugins/bookmarklets/init.php:34
-msgid "Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS"
-msgstr ""
-
-#: plugins/toggle_sidebar/init.php:23
-msgid "Collapse feedlist"
-msgstr "Skjul nyhetskanalsslisten"
-
-#: plugins/af_zz_imgproxy/init.php:208
-msgid "Image proxy settings (af_zz_imgproxy)"
-msgstr ""
-
-#: plugins/af_zz_imgproxy/init.php:232
-#, fuzzy
-msgid "Enable proxy for all remote images."
-msgstr "Tillat ikoner i nyhetsstrømslisten"
-
-#: plugins/af_zz_imgproxy/init.php:236
-#, fuzzy
-msgid "Don't cache files locally."
-msgstr "Mellomlagre bilder lokalt på serveren"
-
-#: plugins/mailto/init.php:74
-msgid "Clicking the following link to invoke your mail client:"
-msgstr ""
-
-#: plugins/mailto/init.php:78
-#, fuzzy
-msgid "Forward selected article(s) by email."
-msgstr "Marker artikkel som favoritt"
-
-#: plugins/mailto/init.php:81
-msgid "You should be able to edit the message before sending in your mail client."
-msgstr ""
-
-#: plugins/mailto/init.php:86
-#, fuzzy
-msgid "Close this dialog"
-msgstr "Lukk dette vinduet"
-
 #: plugins/share/init.php:41
 msgid "You can disable all articles shared by unique URLs here."
 msgstr ""
@@ -2933,484 +2871,657 @@ msgstr ""
 msgid "Unshare article"
 msgstr "Fjern favorittmerkingen fra artiklen"
 
-#: js/FeedTree.js:75
+#: plugins/toggle_sidebar/init.php:23
+msgid "Collapse feedlist"
+msgstr "Skjul nyhetskanalsslisten"
+
+#: plugins/close_button/init.php:25
+#, fuzzy
+msgid "Close article"
+msgstr "Fjern artikler"
+
+#: plugins/mail/init.php:29
+msgid "Mail addresses saved."
+msgstr ""
+
+#: plugins/mail/init.php:35
+msgid "Mail plugin"
+msgstr ""
+
+#: plugins/mail/init.php:37
+msgid "You can set predefined email addressed here (comma-separated list):"
+msgstr ""
+
+#: plugins/mail/init.php:146
+#, fuzzy
+msgid "To:"
+msgstr "Topp"
+
+#: plugins/mail/init.php:161
+#, fuzzy
+msgid "Subject:"
+msgstr "Velg:"
+
+#: plugins/mail/init.php:178
+#, fuzzy
+msgid "Send e-mail"
+msgstr "Skift e-post"
+
+#: plugins/note/init.php:28
+#: plugins/note/note.js:11
+#, fuzzy
+msgid "Edit article note"
+msgstr "Endre Stikkord"
+
+#: plugins/auth_internal/init.php:67
+#, fuzzy
+msgid "Please enter your one time password:"
+msgstr "Vennligst skriv inn et notat for denne artikkelen:"
+
+#: plugins/auth_internal/init.php:208
+msgid "Password has been changed."
+msgstr "Passord har blitt endret."
+
+#: plugins/auth_internal/init.php:210
+msgid "Old password is incorrect."
+msgstr "Gammelt passord er feil"
+
+#: js/FeedTree.js:76
 #, fuzzy
 msgid "(Un)collapse"
 msgstr "Skjul nyhetskanalsslisten"
 
-#: js/PrefFeedTree.js:35
+#: js/PrefFeedTree.js:36
 #, fuzzy
 msgid "Edit category"
 msgstr "Rediger kategorier"
 
-#: js/PrefFeedTree.js:42
+#: js/PrefFeedTree.js:43
 #, fuzzy
 msgid "Remove category"
 msgstr "Lag kategori"
 
-#: js/PrefFilterTree.js:46
+#: js/PrefFilterTree.js:47
 #, fuzzy
 msgid "Inverse"
 msgstr "(Motsatt)"
 
-#: js/feedlist.js:511
+#: js/feedlist.js:461
 #, fuzzy
 msgid "Mark %w in %s older than 1 day as read?"
 msgstr "Marker alle artikler i %s som leste?"
 
-#: js/feedlist.js:514
+#: js/feedlist.js:464
 #, fuzzy
 msgid "Mark %w in %s older than 1 week as read?"
 msgstr "Marker alle artikler i %s som leste?"
 
-#: js/feedlist.js:517
+#: js/feedlist.js:467
 #, fuzzy
 msgid "Mark %w in %s older than 2 weeks as read?"
 msgstr "Marker alle artikler i %s som leste?"
 
-#: js/feedlist.js:520
+#: js/feedlist.js:470
 #, fuzzy
 msgid "Mark %w in %s as read?"
 msgstr "Marker alle artikler i %s som leste?"
 
-#: js/feedlist.js:523
+#: js/feedlist.js:473
 #, fuzzy
 msgid "search results"
 msgstr "Søkeresultat"
 
-#: js/feedlist.js:523
+#: js/feedlist.js:473
 #, fuzzy
 msgid "all articles"
 msgstr "Alle artikler"
 
-#: js/functions.js:74
+#: js/functions.js:100
 msgid "Close"
 msgstr ""
 
-#: js/functions.js:141
+#: js/functions.js:167
 #, fuzzy
 msgid "Click to close"
 msgstr "Trykk for å endre"
 
-#: js/functions.js:448
+#: js/functions.js:456
 msgid "Error explained"
 msgstr ""
 
-#: js/functions.js:592
+#: js/functions.js:490
+#, fuzzy
+msgid "Upload complete."
+msgstr "Oppdaterte artikler"
+
+#: js/functions.js:508
+#, fuzzy
+msgid "Remove stored feed icon?"
+msgstr "Fjern lagrede data"
+
+#: js/functions.js:510
+#, fuzzy
+msgid "Removing feed icon..."
+msgstr "Fjerner nyhetsstrøm..."
+
+#: js/functions.js:515
+#, fuzzy
+msgid "Feed icon removed."
+msgstr "Nyhetsstrømmen ble ikke funnet"
+
+#: js/functions.js:532
+#, fuzzy
+msgid "Please select an image file to upload."
+msgstr "Vennligst velg en nyhetsstrøm"
+
+#: js/functions.js:533
+msgid "Upload new icon for this feed?"
+msgstr ""
+
+#: js/functions.js:534
+#, fuzzy
+msgid "Uploading, please wait..."
+msgstr "laster, vennligst vent"
+
+#: js/functions.js:542
+msgid "Please enter label caption:"
+msgstr "Vennligst skriv inn merkelappstekst:"
+
+#: js/functions.js:575
 msgid "Subscribe to Feed"
 msgstr "Abonner på nyhetsstrøm"
 
-#: js/functions.js:621
+#: js/functions.js:602
 msgid "Failed to parse output. This can indicate server timeout and/or network issues. Backend output was logged to browser console."
 msgstr ""
 
-#: js/functions.js:636
+#: js/functions.js:617
 #, fuzzy, perl-format
 msgid "Subscribed to %s"
 msgstr "Abonnerer på følgende nyhetsstrømmer:"
 
-#: js/functions.js:641
+#: js/functions.js:622
 msgid "Specified URL seems to be invalid."
 msgstr ""
 
-#: js/functions.js:644
+#: js/functions.js:625
 msgid "Specified URL doesn't seem to contain any feeds."
 msgstr ""
 
-#: js/functions.js:656
+#: js/functions.js:637
 #, fuzzy
 msgid "Expand to select feed"
 msgstr "Sletter den valgte nyhetsstrømmen..."
 
-#: js/functions.js:668
+#: js/functions.js:649
 #, fuzzy, perl-format
 msgid "Couldn't download the specified URL: %s"
 msgstr "Kan ikke abonnere: Ingen nyhetsstrømsadresse er blitt gitt"
 
-#: js/functions.js:672
+#: js/functions.js:653
 #, perl-format
 msgid "XML validation failed: %s"
 msgstr ""
 
-#: js/functions.js:676
+#: js/functions.js:657
 #, fuzzy
 msgid "You are already subscribed to this feed."
 msgstr "Du kan ikke fjerne abonnement fra kategorien."
 
-#: js/functions.js:1136
+#: js/functions.js:1098
 msgid "Generate new syndication address for this feed?"
 msgstr ""
 
-#: js/functions.js:1140
-#: js/prefs.js:1095
+#: js/functions.js:1100
+#: js/prefs.js:870
 msgid "Trying to change address..."
 msgstr "Prøver å endre adressen..."
 
-#: js/functions.js:1245
-#: js/tt-rss.js:446
-#: js/tt-rss.js:673
+#: js/functions.js:1199
+#: js/tt-rss.js:399
+#: js/tt-rss.js:612
 msgid "You can't edit this kind of feed."
 msgstr "Du kan ikke endre denne typen nyhetsstrøm"
 
-#: js/functions.js:1260
+#: js/functions.js:1213
 #, fuzzy
 msgid "Edit Feed"
 msgstr "Rediger nyhetsstrømmen"
 
-#: js/functions.js:1266
-#: js/prefs.js:100
-#: js/prefs.js:209
-#: js/prefs.js:647
+#: js/functions.js:1217
+#: js/prefs.js:176
+#: js/prefs.js:523
+#: js/prefs.js:1139
+#: js/prefs.js:78
 #, fuzzy
 msgid "Saving data..."
 msgstr "Lagrer Nyhetsstrøm"
 
-#: js/functions.js:1293
+#: js/functions.js:1243
 #, fuzzy
 msgid "More Feeds"
 msgstr "Flere nyhetsstrømmer"
 
-#: js/functions.js:1355
-#: js/functions.js:1464
-#: js/prefs.js:398
-#: js/prefs.js:540
-#: js/prefs.js:558
-#: js/prefs.js:1077
+#: js/functions.js:1297
+#: js/functions.js:1383
+#: js/prefs.js:332
+#: js/prefs.js:455
+#: js/prefs.js:473
+#: js/prefs.js:855
 msgid "No feeds are selected."
 msgstr "Ingen nyhetsstrømmer er valgt"
 
-#: js/functions.js:1398
+#: js/functions.js:1329
 msgid "Remove selected feeds from the archive? Feeds with stored articles will not be removed."
 msgstr ""
 
-#: js/functions.js:1435
+#: js/functions.js:1360
 #, fuzzy
 msgid "Feeds with update errors"
 msgstr "Oppdateringsfeil"
 
-#: js/functions.js:1446
-#: js/prefs.js:1058
+#: js/functions.js:1369
+#: js/prefs.js:841
 #, fuzzy
 msgid "Remove selected feeds?"
 msgstr "Fjerne valgte filtre?"
 
-#: js/functions.js:1449
-#: js/prefs.js:1061
+#: js/functions.js:1370
+#: js/prefs.js:842
 #, fuzzy
 msgid "Removing selected feeds..."
 msgstr "Fjerner valgte filtre..."
 
-#: js/prefs.js:60
-msgid "Please enter login:"
-msgstr "Vennligst skriv inn brukernavn:"
-
-#: js/prefs.js:67
-msgid "Can't create user: no login specified."
-msgstr "Kan ikke legge til bruker: brukernavn mangler."
-
-#: js/prefs.js:71
-msgid "Adding user..."
-msgstr "Legger til bruker.."
-
-#: js/prefs.js:96
-msgid "User Editor"
-msgstr "Brukeradministrering"
-
-#: js/prefs.js:131
-#, fuzzy
-msgid "Edit Filter"
-msgstr "Filtre"
-
-#: js/prefs.js:170
+#: js/prefs.js:143
 #, fuzzy
 msgid "Remove filter?"
 msgstr "Fjerne %s filteret?"
 
-#: js/prefs.js:175
+#: js/prefs.js:148
 msgid "Removing filter..."
 msgstr "Fjerner filter..."
 
-#: js/prefs.js:292
+#: js/prefs.js:251
 msgid "Remove selected labels?"
 msgstr "Fjerne merkede merkelapper?"
 
-#: js/prefs.js:295
+#: js/prefs.js:252
 msgid "Removing selected labels..."
 msgstr "Fjerner merkede merkelapper..."
 
-#: js/prefs.js:308
-#: js/prefs.js:1144
+#: js/prefs.js:262
+#: js/prefs.js:909
 msgid "No labels are selected."
 msgstr "Ingen merkelapper er markert"
 
-#: js/prefs.js:320
+#: js/prefs.js:274
 msgid "Remove selected users? Neither default admin nor your account will be removed."
 msgstr ""
 
-#: js/prefs.js:323
+#: js/prefs.js:275
 msgid "Removing selected users..."
 msgstr "Fjerner markerte brukere..."
 
-#: js/prefs.js:338
-#: js/prefs.js:408
-#: js/prefs.js:427
-#: js/prefs.js:461
+#: js/prefs.js:286
+#: js/prefs.js:342
+#: js/prefs.js:361
+#: js/prefs.js:387
 msgid "No users are selected."
 msgstr "Ingen bruker er markert"
 
-#: js/prefs.js:350
+#: js/prefs.js:297
 msgid "Remove selected filters?"
 msgstr "Fjerne valgte filtre?"
 
-#: js/prefs.js:353
+#: js/prefs.js:298
 msgid "Removing selected filters..."
 msgstr "Fjerner valgte filtre..."
 
-#: js/prefs.js:366
-#: js/prefs.js:495
-#: js/prefs.js:514
+#: js/prefs.js:308
+#: js/prefs.js:419
+#: js/prefs.js:438
 msgid "No filters are selected."
 msgstr "Ingen filtre er valgt"
 
-#: js/prefs.js:378
+#: js/prefs.js:319
 msgid "Unsubscribe from selected feeds?"
 msgstr "Fjern abonnement på valgte nyhetsstrømmer"
 
-#: js/prefs.js:382
+#: js/prefs.js:321
 msgid "Unsubscribing from selected feeds..."
 msgstr "Fjerner abonnementer på valgte nyhetsstrømmer..."
 
-#: js/prefs.js:413
-#: js/prefs.js:432
-#: js/prefs.js:466
+#: js/prefs.js:347
+#: js/prefs.js:366
+#: js/prefs.js:392
 msgid "Please select only one user."
 msgstr "Vennligst velg kun en bruker"
 
-#: js/prefs.js:436
+#: js/prefs.js:370
 msgid "Reset password of selected user?"
 msgstr "Nullstill passordet til utvalgte bruker?"
 
-#: js/prefs.js:439
+#: js/prefs.js:371
 msgid "Resetting password for selected user..."
 msgstr "Nullstiller passordet for utvalgte bruker..."
 
-#: js/prefs.js:500
+#: js/prefs.js:424
 msgid "Please select only one filter."
 msgstr "Vennligst velg kun et filter"
 
-#: js/prefs.js:518
+#: js/prefs.js:442
 #, fuzzy
 msgid "Combine selected filters?"
 msgstr "Fjerne valgte filtre?"
 
-#: js/prefs.js:521
+#: js/prefs.js:443
 #, fuzzy
 msgid "Joining filters..."
 msgstr "Fjerner filter..."
 
-#: js/prefs.js:580
+#: js/prefs.js:487
 #, fuzzy
 msgid "Edit Multiple Feeds"
 msgstr "Nyhetsstrømsredigerer"
 
-#: js/prefs.js:604
+#: js/prefs.js:511
 msgid "Save changes to selected feeds?"
 msgstr "Lagre endringer til de valgte nyhetsstrømmene?"
 
-#: js/prefs.js:681
+#: js/prefs.js:552
 #, fuzzy
 msgid "OPML Import"
 msgstr "Importer"
 
-#: js/prefs.js:700
+#: js/prefs.js:571
 #, fuzzy
 msgid "Please choose an OPML file first."
 msgstr "Vennligst velg en eller flere nyhetsstrømmer først"
 
-#: js/prefs.js:703
+#: js/prefs.js:574
 #: plugins/import_export/import_export.js:115
 #, fuzzy
 msgid "Importing, please wait..."
 msgstr "laster, vennligst vent"
 
-#: js/prefs.js:869
+#: js/prefs.js:737
 msgid "Reset to defaults?"
 msgstr "Tilbakefør til standardinnstillingene"
 
-#: js/prefs.js:1468
+#: js/prefs.js:777
+#, perl-format
+msgid "Remove category %s? Any nested feeds would be placed into Uncategorized."
+msgstr ""
+
+#: js/prefs.js:778
 #, fuzzy
-msgid "Subscribing to feeds..."
-msgstr "Abonnerer på nyhetsstrømmen..."
+msgid "Removing category..."
+msgstr "Lag kategori"
 
-#: js/prefs.js:1487
-msgid "Clear stored data for this plugin?"
+#: js/prefs.js:794
+msgid "Remove selected categories?"
+msgstr "Fjerne valgte kategorier?"
+
+#: js/prefs.js:795
+msgid "Removing selected categories..."
+msgstr "Fjerner valgte kategorier..."
+
+#: js/prefs.js:805
+msgid "No categories are selected."
+msgstr "Ingen kategorier er valgt."
+
+#: js/prefs.js:812
+#, fuzzy
+msgid "Category title:"
+msgstr "Kategoriredigerer"
+
+#: js/prefs.js:815
+#, fuzzy
+msgid "Creating category..."
+msgstr "Lag filter..."
+
+#: js/prefs.js:832
+#, fuzzy
+msgid "Feeds without recent updates"
+msgstr "Oppdateringsfeil"
+
+#: js/prefs.js:869
+#, fuzzy
+msgid "Replace current OPML publishing address with a new one?"
+msgstr "Bytt ut nåværende publiseringsadresse med en ny?"
+
+#: js/prefs.js:898
+#, fuzzy
+msgid "Reset selected labels to default colors?"
+msgstr "Sett merkelappsfargene til standard?"
+
+#: js/prefs.js:926
+#, fuzzy
+msgid "Settings Profiles"
+msgstr "Lag filter"
+
+#: js/prefs.js:935
+msgid "Remove selected profiles? Active and default profiles will not be removed."
 msgstr ""
 
-#: js/prefs.js:1501
-msgid "Clear all messages in the error log?"
+#: js/prefs.js:936
+#, fuzzy
+msgid "Removing selected profiles..."
+msgstr "Fjerner valgte filtre..."
+
+#: js/prefs.js:948
+#, fuzzy
+msgid "No profiles are selected."
+msgstr "Ingen artikkel er valgt."
+
+#: js/prefs.js:955
+#: js/prefs.js:997
+#, fuzzy
+msgid "Activate selected profile?"
+msgstr "Fjerne valgte filtre?"
+
+#: js/prefs.js:964
+#: js/prefs.js:1008
+#, fuzzy
+msgid "Please choose a profile to activate."
+msgstr "Vennligst velg en eller flere nyhetsstrømmer først"
+
+#: js/prefs.js:969
+#, fuzzy
+msgid "Creating profile..."
+msgstr "Lag filter"
+
+#: js/prefs.js:1016
+msgid "This will invalidate all previously generated feed URLs. Continue?"
 msgstr ""
 
-#: js/tt-rss.js:118
+#: js/prefs.js:1017
+#: plugins/share/share_prefs.js:3
+#, fuzzy
+msgid "Clearing URLs..."
+msgstr "Rensker nyhetsstrøm..."
+
+#: js/prefs.js:1020
+#, fuzzy
+msgid "Generated URLs cleared."
+msgstr "Generert nyhetsstrøm"
+
+#: js/prefs.js:1053
+#, fuzzy
+msgid "Rename category to:"
+msgstr "Lag kategori"
+
+#: js/prefs.js:1074
+msgid "Label Editor"
+msgstr "Merkelappredigerer"
+
+#: js/tt-rss.js:111
 msgid "Mark all articles as read?"
 msgstr "Marker alle artikler som leste?"
 
-#: js/tt-rss.js:124
+#: js/tt-rss.js:115
 msgid "Marking all feeds as read..."
 msgstr "Marker alle nyhetsstrømmer som lest"
 
-#: js/tt-rss.js:398
+#: js/tt-rss.js:351
 #, fuzzy
 msgid "Please enable mail plugin first."
 msgstr "Vennligst velg en eller flere nyhetsstrømmer først"
 
-#: js/tt-rss.js:527
+#: js/tt-rss.js:477
 #, fuzzy
 msgid "Please enable embed_original plugin first."
 msgstr "Vennligst velg en eller flere nyhetsstrømmer først"
 
-#: js/tt-rss.js:540
-#: js/tt-rss.js:723
+#: js/tt-rss.js:490
+#: js/tt-rss.js:653
 msgid "Widescreen is not available in combined mode."
 msgstr ""
 
-#: js/tt-rss.js:821
-msgid "You can't rescore this kind of feed."
-msgstr "Du kan ikke endre poengsummen for denne typen nyhetskanal"
-
-#: js/tt-rss.js:826
-#: js/tt-rss.js:686
-msgid "Please select some feed first."
-msgstr "Vennligst velg en eller flere nyhetsstrømmer først"
-
-#: js/tt-rss.js:831
-#, perl-format
-msgid "Rescore articles in %s?"
-msgstr "Endre poengene for artiklene i %s?"
-
-#: js/tt-rss.js:834
-msgid "Rescoring articles..."
-msgstr "Endrer poengsummen for artiklene..."
-
-#: js/viewfeed.js:917
-#: js/viewfeed.js:955
-#: js/viewfeed.js:1003
-#: js/viewfeed.js:1924
-#: plugins/mail/mail.js:7
+#: js/viewfeed.js:444
+#: js/viewfeed.js:461
+#: js/viewfeed.js:484
+#: js/viewfeed.js:521
+#: js/viewfeed.js:542
+#: js/viewfeed.js:651
+#: js/viewfeed.js:685
+#: js/viewfeed.js:727
+#: js/viewfeed.js:1564
 #: plugins/mailto/init.js:7
-#: js/viewfeed.js:675
-#: js/viewfeed.js:697
-#: js/viewfeed.js:718
-#: js/viewfeed.js:777
-#: js/viewfeed.js:805
+#: plugins/mail/mail.js:7
 msgid "No articles are selected."
 msgstr "Ingen artikler er valgt."
 
-#: js/viewfeed.js:925
+#: js/viewfeed.js:659
 #, 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:927
+#: js/viewfeed.js:661
 #, 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:964
+#: js/viewfeed.js:694
 #, 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:967
+#: js/viewfeed.js:697
 #, 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:969
+#: js/viewfeed.js:698
 msgid "Please note that unstarred articles might get purged on next feed update."
 msgstr ""
 
-#: js/viewfeed.js:1009
+#: js/viewfeed.js:733
 #, 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:1029
+#: js/viewfeed.js:753
 #, fuzzy
 msgid "Edit article Tags"
 msgstr "Endre Stikkord"
 
-#: js/viewfeed.js:1035
+#: js/viewfeed.js:757
 msgid "Saving article tags..."
 msgstr "Lagrer artikkelens kategorier..."
 
-#: js/viewfeed.js:1666
+#: js/viewfeed.js:1015
+msgid "No article is selected."
+msgstr "Ingen artikkel er valgt."
+
+#: js/viewfeed.js:1050
+msgid "No articles found to mark"
+msgstr "Ingen artikler funnet som kan markeres"
+
+#: js/viewfeed.js:1052
+#, fuzzy, perl-format
+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?"
+
+#: js/viewfeed.js:1312
 #, fuzzy
 msgid "Open original article"
 msgstr "Vis opprinnelig artikkelinnhold"
 
-#: js/viewfeed.js:1673
+#: js/viewfeed.js:1319
 #, fuzzy
 msgid "Display article URL"
 msgstr "Vis stikkord"
 
-#: js/viewfeed.js:1780
+#: js/viewfeed.js:1426
 msgid "Assign label"
 msgstr "Tildel stikkord"
 
-#: js/viewfeed.js:1785
+#: js/viewfeed.js:1431
 #, fuzzy
 msgid "Remove label"
 msgstr "Fjerne merkede merkelapper?"
 
-#: js/viewfeed.js:1817
+#: js/viewfeed.js:1463
 #, fuzzy
 msgid "Select articles in group"
 msgstr "Velg artikkelen under musepekeren"
 
-#: js/viewfeed.js:1827
+#: js/viewfeed.js:1473
 #, fuzzy
 msgid "Mark group as read"
 msgstr "Marker som lest"
 
-#: js/viewfeed.js:1839
+#: js/viewfeed.js:1485
 msgid "Mark feed as read"
 msgstr "Marker nyhetsstrøm som lest"
 
-#: js/viewfeed.js:1892
+#: js/viewfeed.js:1538
 #, fuzzy
 msgid "Please enter new score for selected articles:"
 msgstr "Vennligst skriv inn et notat for denne artikkelen:"
 
-#: js/viewfeed.js:1955
+#: js/viewfeed.js:1571
 #, fuzzy
 msgid "Please enter new score for this article:"
 msgstr "Vennligst skriv inn et notat for denne artikkelen:"
 
-#: js/viewfeed.js:1986
+#: js/viewfeed.js:1591
 #, fuzzy
 msgid "Article URL:"
 msgstr "Alle artikler"
 
-#: plugins/note/note.js:17
-#, fuzzy
-msgid "Saving article note..."
-msgstr "Lagrer artikkelens kategorier..."
+#: plugins/embed_original/init.js:6
+msgid "Sorry, your browser does not support sandboxed iframes."
+msgstr ""
 
 #: plugins/af_psql_trgm/init.js:11
 #, fuzzy
 msgid "Related articles"
 msgstr "Fjern artikler"
 
+#: plugins/mailto/init.js:21
+#: plugins/mail/mail.js:21
+#, fuzzy
+msgid "Forward article by email"
+msgstr "Marker artikkel som favoritt"
+
+#: plugins/shorten_expanded/init.js:43
+msgid "Click to expand article"
+msgstr "Trykk for å utvide artikkel"
+
 #: plugins/import_export/import_export.js:13
 #, fuzzy
 msgid "Export Data"
@@ -3433,294 +3544,186 @@ 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
-#, fuzzy
-msgid "Forward article by email"
-msgstr "Marker artikkel som favoritt"
-
-#: plugins/mail/mail.js:36
-msgid "Error sending email:"
+#: plugins/share/share_prefs.js:2
+msgid "This will invalidate all previously shared article URLs. Continue?"
 msgstr ""
 
-#: plugins/mail/mail.js:38
-#, fuzzy
-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."
+#: plugins/share/share_prefs.js:8
+msgid "Shared URLs cleared."
 msgstr ""
 
-#: plugins/shorten_expanded/init.js:45
-msgid "Click to expand article"
-msgstr "Trykk for å utvide artikkel"
-
 #: plugins/share/share.js:10
 #, fuzzy
 msgid "Share article by URL"
 msgstr "Marker artikkel som favoritt"
 
-#: plugins/share/share.js:14
+#: plugins/share/share.js:13
 #, fuzzy
 msgid "Generate new share URL for this article?"
 msgstr "Vennligst skriv inn et notat for denne artikkelen:"
 
-#: plugins/share/share.js:18
+#: plugins/share/share.js:15
 #, fuzzy
 msgid "Trying to change URL..."
 msgstr "Prøver å endre e-posten..."
 
-#: plugins/share/share.js:55
+#: plugins/share/share.js:48
 #, fuzzy
 msgid "Remove sharing for this article?"
 msgstr "Rediger stikkordene for denne artikkelen"
 
-#: plugins/share/share.js:59
+#: plugins/share/share.js:50
 #, fuzzy
 msgid "Trying to unshare..."
 msgstr "Prøver å endre adressen..."
 
-#: plugins/share/share_prefs.js:3
-msgid "This will invalidate all previously shared article URLs. Continue?"
+#: plugins/mail/mail.js:30
+msgid "Error sending email:"
 msgstr ""
 
-#: plugins/share/share_prefs.js:6
-#: js/prefs.js:1277
+#: plugins/mail/mail.js:32
 #, fuzzy
-msgid "Clearing URLs..."
-msgstr "Rensker nyhetsstrøm..."
+msgid "Your message has been sent."
+msgstr "Passord har blitt endret."
 
-#: plugins/share/share_prefs.js:13
-msgid "Shared URLs cleared."
-msgstr ""
+#: plugins/note/note.js:15
+#, fuzzy
+msgid "Saving article note..."
+msgstr "Lagrer artikkelens kategorier..."
 
-#: js/feedlist.js:204
+#: js/feedlist.js:168
 #, fuzzy
 msgid "Your password is at default value"
 msgstr ""
 "Passordet ditt er et standardpassord, \n"
 "\t\t\t\t\t\tVennligst bytt."
 
-#: js/feedlist.js:453
+#: js/feedlist.js:413
 msgid "Mark all articles in %s as read?"
 msgstr "Marker alle artikler i %s som leste?"
 
-#: js/functions.js:494
-#, fuzzy
-msgid "Upload complete."
-msgstr "Oppdaterte artikler"
-
-#: js/functions.js:511
-#, fuzzy
-msgid "Remove stored feed icon?"
-msgstr "Fjern lagrede data"
-
-#: js/functions.js:516
-#, fuzzy
-msgid "Removing feed icon..."
-msgstr "Fjerner nyhetsstrøm..."
-
-#: js/functions.js:521
-#, fuzzy
-msgid "Feed icon removed."
-msgstr "Nyhetsstrømmen ble ikke funnet"
-
-#: js/functions.js:537
-#, fuzzy
-msgid "Please select an image file to upload."
-msgstr "Vennligst velg en nyhetsstrøm"
-
-#: js/functions.js:539
-msgid "Upload new icon for this feed?"
-msgstr ""
-
-#: js/functions.js:540
-#, fuzzy
-msgid "Uploading, please wait..."
-msgstr "laster, vennligst vent"
-
-#: js/functions.js:550
-msgid "Please enter label caption:"
-msgstr "Vennligst skriv inn merkelappstekst:"
-
-#: js/functions.js:555
-msgid "Can't create label: missing caption."
-msgstr "Kan ikke skape merkelapp, mangler overskrift."
-
-#: js/functions.js:797
+#: js/functions.js:764
 #, fuzzy
 msgid "Edit rule"
 msgstr "Filtre"
 
-#: js/functions.js:819
+#: js/functions.js:786
 #, fuzzy
 msgid "Edit action"
 msgstr "Nyhetsstrømshandlinger"
 
-#: js/functions.js:860
+#: js/functions.js:825
 msgid "Looking for articles (%d processed, %f found)..."
 msgstr ""
 
-#: js/functions.js:890
+#: js/functions.js:855
 #, fuzzy
 msgid "Found %d articles matching this filter:"
 msgstr "Ingen filtre ble funnet."
 
-#: js/functions.js:942
+#: js/functions.js:907
 msgid "Create Filter"
 msgstr "Lag filter"
 
-#: js/functions.js:1060
-#: js/tt-rss.js:692
+#: js/functions.js:1016
+#: js/tt-rss.js:631
 msgid "Unsubscribe from %s?"
 msgstr "Fjerne abonnement på %s?"
 
-#: js/functions.js:1063
+#: js/functions.js:1019
 msgid "Removing feed..."
 msgstr "Fjerner nyhetsstrøm..."
 
-#: js/functions.js:1489
+#: js/functions.js:1410
 msgid "Help"
 msgstr "Hjelp"
 
-#: js/prefs.js:973
-msgid "Remove category %s? Any nested feeds would be placed into Uncategorized."
+#: js/prefs.js:44
+msgid "Please enter login:"
+msgstr "Vennligst skriv inn brukernavn:"
+
+#: js/prefs.js:51
+msgid "Can't create user: no login specified."
+msgstr "Kan ikke legge til bruker: brukernavn mangler."
+
+#: js/prefs.js:55
+msgid "Adding user..."
+msgstr "Legger til bruker.."
+
+#: js/prefs.js:74
+msgid "User Editor"
+msgstr "Brukeradministrering"
+
+#: js/prefs.js:104
+#, fuzzy
+msgid "Edit Filter"
+msgstr "Filtre"
+
+#: js/prefs.js:1175
+#, fuzzy
+msgid "Subscribing to feeds..."
+msgstr "Abonnerer på nyhetsstrømmen..."
+
+#: js/prefs.js:1191
+msgid "Clear stored data for this plugin?"
 msgstr ""
 
-#: js/prefs.js:979
-#, fuzzy
-msgid "Removing category..."
-msgstr "Lag kategori"
-
-#: js/prefs.js:997
-msgid "Remove selected categories?"
-msgstr "Fjerne valgte kategorier?"
-
-#: js/prefs.js:1000
-msgid "Removing selected categories..."
-msgstr "Fjerner valgte kategorier..."
-
-#: js/prefs.js:1013
-msgid "No categories are selected."
-msgstr "Ingen kategorier er valgt."
-
-#: js/prefs.js:1020
-#, fuzzy
-msgid "Category title:"
-msgstr "Kategoriredigerer"
-
-#: js/prefs.js:1024
-#, fuzzy
-msgid "Creating category..."
-msgstr "Lag filter..."
-
-#: js/prefs.js:1047
-#, fuzzy
-msgid "Feeds without recent updates"
-msgstr "Oppdateringsfeil"
-
-#: js/prefs.js:1091
-#, fuzzy
-msgid "Replace current OPML publishing address with a new one?"
-msgstr "Bytt ut nåværende publiseringsadresse med en ny?"
-
-#: js/prefs.js:1129
-#, fuzzy
-msgid "Reset selected labels to default colors?"
-msgstr "Sett merkelappsfargene til standard?"
-
-#: js/prefs.js:1161
-#, fuzzy
-msgid "Settings Profiles"
-msgstr "Lag filter"
-
-#: js/prefs.js:1170
-msgid "Remove selected profiles? Active and default profiles will not be removed."
+#: js/prefs.js:1203
+msgid "Clear all messages in the error log?"
 msgstr ""
 
-#: js/prefs.js:1173
-#, fuzzy
-msgid "Removing selected profiles..."
-msgstr "Fjerner valgte filtre..."
-
-#: js/prefs.js:1189
-#, fuzzy
-msgid "No profiles are selected."
-msgstr "Ingen artikkel er valgt."
-
-#: js/prefs.js:1197
-#: js/prefs.js:1250
-#, fuzzy
-msgid "Activate selected profile?"
-msgstr "Fjerne valgte filtre?"
-
-#: js/prefs.js:1214
-#: js/prefs.js:1266
-#, fuzzy
-msgid "Please choose a profile to activate."
-msgstr "Vennligst velg en eller flere nyhetsstrømmer først"
-
-#: js/prefs.js:1219
-#, fuzzy
-msgid "Creating profile..."
-msgstr "Lag filter"
-
-#: js/prefs.js:1274
-msgid "This will invalidate all previously generated feed URLs. Continue?"
-msgstr ""
-
-#: js/prefs.js:1284
-#, fuzzy
-msgid "Generated URLs cleared."
-msgstr "Generert nyhetsstrøm"
-
-#: js/prefs.js:1356
-msgid "Label Editor"
-msgstr "Merkelappredigerer"
-
-#: js/tt-rss.js:681
+#: js/tt-rss.js:620
 msgid "You can't unsubscribe from the category."
 msgstr "Du kan ikke fjerne abonnement fra kategorien."
 
-#: js/viewfeed.js:127
-#: js/viewfeed.js:177
-#: js/viewfeed.js:194
+#: js/tt-rss.js:625
+msgid "Please select some feed first."
+msgstr "Vennligst velg en eller flere nyhetsstrømmer først"
+
+#: js/viewfeed.js:89
+#: js/viewfeed.js:135
+#: js/viewfeed.js:152
 #, fuzzy
 msgid "Click to open next unread feed."
 msgstr "Trykk for å endre"
 
-#: js/viewfeed.js:131
+#: js/viewfeed.js:93
 #, fuzzy
 msgid "Cancel search"
 msgstr "Avbryt"
 
-#: js/viewfeed.js:191
+#: js/viewfeed.js:149
 #, fuzzy
 msgid "New articles found, reload feed to continue."
 msgstr "Ingen artikler funnet som kan vises"
 
-#: js/viewfeed.js:620
+#: js/viewfeed.js:405
 #, 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:1284
-msgid "No article is selected."
-msgstr "Ingen artikkel er valgt."
+#~ msgid "Rescore feed"
+#~ msgstr "Sett poeng på nytt for nyhetskanalene"
 
-#: js/viewfeed.js:1319
-msgid "No articles found to mark"
-msgstr "Ingen artikler funnet som kan markeres"
+#~ msgid "Create label..."
+#~ msgstr "Lag merkelapp..."
 
-#: js/viewfeed.js:1321
-#, 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 "Create filter..."
+#~ msgstr "Lag filter..."
+
+#~ msgid "You can't rescore this kind of feed."
+#~ msgstr "Du kan ikke endre poengsummen for denne typen nyhetskanal"
+
+#~ msgid "Rescore articles in %s?"
+#~ msgstr "Endre poengene for artiklene i %s?"
+
+#~ msgid "Rescoring articles..."
+#~ msgstr "Endrer poengsummen for artiklene..."
+
+#~ msgid "Can't create label: missing caption."
+#~ msgstr "Kan ikke skape merkelapp, mangler overskrift."
 
 #, fuzzy
 #~ msgid "Firefox integration"
diff --git a/locale/nl_NL/LC_MESSAGES/messages.mo b/locale/nl_NL/LC_MESSAGES/messages.mo
index 2ecfba045..8d19fad20 100644
Binary files a/locale/nl_NL/LC_MESSAGES/messages.mo and b/locale/nl_NL/LC_MESSAGES/messages.mo differ
diff --git a/locale/nl_NL/LC_MESSAGES/messages.po b/locale/nl_NL/LC_MESSAGES/messages.po
index 6d9a5c508..0ee1abcb9 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: 2018-10-10 08:24+0300\n"
+"POT-Creation-Date: 2018-12-01 12:59+0300\n"
 "PO-Revision-Date: 2013-05-02 13:55+0100\n"
 "Last-Translator: ArmyOfPirates\n"
 "Language-Team: translations <LL@li.org>\n"
@@ -98,8 +98,8 @@ msgid "Weekly"
 msgstr "Wekelijks"
 
 #: backend.php:103
-#: classes/pref/users.php:47
 #: classes/pref/system.php:51
+#: classes/pref/users.php:47
 msgid "User"
 msgstr "Gebruiker"
 
@@ -171,33 +171,33 @@ msgstr "Gebruiker niet gevonden"
 
 #: index.php:151
 #: index.php:167
-#: index.php:285
+#: index.php:282
 #: prefs.php:120
 #: classes/backend.php:5
 #: classes/pref/labels.php:294
-#: classes/pref/feeds.php:1230
 #: classes/pref/filters.php:822
-#: js/feedlist.js:148
-#: js/feedlist.js:491
-#: js/feedlist.js:539
-#: js/functions.js:314
-#: js/functions.js:1336
-#: js/prefs.js:562
-#: js/prefs.js:754
-#: js/prefs.js:1488
-#: js/prefs.js:1503
-#: js/tt-rss.js:547
-#: js/viewfeed.js:1180
+#: classes/pref/feeds.php:1229
+#: js/feedlist.js:118
+#: js/feedlist.js:446
+#: js/feedlist.js:487
+#: js/functions.js:328
+#: js/functions.js:551
+#: js/functions.js:1286
+#: js/prefs.js:477
+#: js/prefs.js:617
+#: js/prefs.js:956
+#: js/prefs.js:1000
+#: js/prefs.js:1028
+#: js/prefs.js:1037
+#: js/prefs.js:1045
+#: js/prefs.js:1057
+#: js/tt-rss.js:497
+#: js/viewfeed.js:509
+#: js/viewfeed.js:928
 #: plugins/import_export/import_export.js:17
-#: js/functions.js:565
-#: js/prefs.js:1200
-#: js/prefs.js:1253
-#: js/prefs.js:1292
-#: js/prefs.js:1305
-#: js/prefs.js:1316
-#: js/prefs.js:1331
-#: js/tt-rss.js:564
-#: js/viewfeed.js:760
+#: js/prefs.js:1192
+#: js/prefs.js:1205
+#: js/tt-rss.js:510
 msgid "Loading, please wait..."
 msgstr "Aan 't laden, even wachten aub..."
 
@@ -214,13 +214,13 @@ msgid "All Articles"
 msgstr "Alle artikelen"
 
 #: index.php:194
-#: include/functions.php:1227
+#: include/functions.php:1172
 #: classes/feeds.php:110
 msgid "Starred"
 msgstr "Met ster"
 
 #: index.php:195
-#: include/functions.php:1228
+#: include/functions.php:1173
 #: classes/feeds.php:111
 msgid "Published"
 msgstr "Gepubliceerd"
@@ -260,11 +260,11 @@ msgid "Title"
 msgstr "Titel"
 
 #: index.php:211
-#: index.php:251
-#: include/functions.php:1215
+#: index.php:250
+#: include/functions.php:1160
 #: classes/feeds.php:115
-#: js/FeedTree.js:41
-#: js/FeedTree.js:69
+#: js/FeedTree.js:42
+#: js/FeedTree.js:70
 msgid "Mark as read"
 msgstr "Markeren als gelezen"
 
@@ -301,7 +301,7 @@ msgid "Feed actions:"
 msgstr "Feed acties:"
 
 #: index.php:246
-#: classes/handler/public.php:551
+#: classes/handler/public.php:575
 msgid "Subscribe to feed..."
 msgstr "Abonneren op feed..."
 
@@ -310,56 +310,44 @@ msgid "Edit this feed..."
 msgstr "Bewerk deze feed..."
 
 #: index.php:248
-msgid "Rescore feed"
-msgstr "Feed opnieuw score geven"
-
-#: index.php:249
-#: classes/pref/feeds.php:770
-#: classes/pref/feeds.php:1203
-#: js/PrefFeedTree.js:61
+#: classes/pref/feeds.php:769
+#: classes/pref/feeds.php:1202
+#: js/PrefFeedTree.js:62
 msgid "Unsubscribe"
 msgstr "Abonnement opzeggen"
 
-#: index.php:250
+#: index.php:249
 msgid "All feeds:"
 msgstr "Alle feeds:"
 
-#: index.php:252
+#: index.php:251
 msgid "(Un)hide read feeds"
 msgstr "Toon/Verberg gelezen feeds"
 
-#: index.php:253
+#: index.php:252
 msgid "Other actions:"
 msgstr "Andere acties:"
 
-#: index.php:254
-#: include/functions.php:1201
+#: index.php:253
+#: include/functions.php:1146
 msgid "Toggle widescreen mode"
 msgstr "Wisselen breedbeeld modus"
 
-#: index.php:255
-msgid "Create label..."
-msgstr "Label aanmaken…"
-
-#: index.php:256
-msgid "Create filter..."
-msgstr "Filter aanmaken…"
-
-#: index.php:257
+#: index.php:254
 msgid "Keyboard shortcuts help"
 msgstr "Hulp bij sneltoetscombinaties"
 
-#: index.php:266
+#: index.php:263
 msgid "Logout"
 msgstr "Afmelden"
 
-#: index.php:272
+#: index.php:269
 msgid "Updates are available from Git."
 msgstr ""
 
 #: prefs.php:33
 #: prefs.php:138
-#: include/functions.php:1230
+#: include/functions.php:1175
 #: classes/pref/prefs.php:425
 msgid "Preferences"
 msgstr "Voorkeuren"
@@ -374,8 +362,8 @@ msgstr "Verlaat voorkeuren"
 
 #: prefs.php:141
 #: classes/pref/feeds.php:114
-#: classes/pref/feeds.php:1138
-#: classes/pref/feeds.php:1192
+#: classes/pref/feeds.php:1137
+#: classes/pref/feeds.php:1191
 msgid "Feeds"
 msgstr "Feeds"
 
@@ -385,8 +373,8 @@ msgid "Filters"
 msgstr "Filters"
 
 #: prefs.php:147
+#: classes/feeds.php:1696
 #: classes/pref/labels.php:94
-#: classes/feeds.php:1710
 msgid "Labels"
 msgstr "Labels"
 
@@ -398,80 +386,80 @@ msgstr "Gebruikers"
 msgid "System"
 msgstr "Systeem"
 
-#: register.php:186
+#: register.php:185
 #: include/login_form.php:162
 msgid "Create new account"
 msgstr "Maak nieuw account aan"
 
-#: register.php:192
+#: register.php:191
 msgid "New user registrations are administratively disabled."
 msgstr "Het registreren van nieuwe gebruikers is door de beheerder uitgeschakeld."
 
-#: register.php:196
-#: register.php:241
-#: register.php:254
-#: register.php:269
-#: register.php:288
-#: register.php:336
-#: register.php:346
-#: register.php:358
-#: classes/handler/public.php:623
-#: classes/handler/public.php:697
-#: classes/handler/public.php:798
-#: classes/handler/public.php:877
-#: classes/handler/public.php:891
-#: classes/handler/public.php:898
-#: classes/handler/public.php:923
+#: register.php:195
+#: register.php:240
+#: register.php:253
+#: register.php:268
+#: register.php:287
+#: register.php:334
+#: register.php:344
+#: register.php:356
+#: classes/handler/public.php:647
+#: classes/handler/public.php:721
+#: 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"
 
-#: register.php:217
+#: register.php:216
 msgid "Your temporary password will be sent to the specified email. Accounts, which were not logged in once, are erased automatically 24 hours after temporary password is sent."
 msgstr "Uw tijdelijke wachtwoord wordt naar het vermelde e-mailadres verstuurd. Accounts waarin niet wordt ingelogd, worden automatisch 24 uur na het verzenden van het tijdelijk wachtwoord verwijderd."
 
-#: register.php:223
+#: register.php:222
 msgid "Desired login:"
 msgstr "Gewenst loginID:"
 
-#: register.php:226
+#: register.php:225
 msgid "Check availability"
 msgstr "Controleer beschikbaarheid"
 
-#: register.php:228
-#: classes/handler/public.php:713
+#: register.php:227
+#: classes/handler/public.php:737
 msgid "Email:"
 msgstr "E-mail:"
 
-#: register.php:231
-#: classes/handler/public.php:718
+#: register.php:230
+#: classes/handler/public.php:742
 msgid "How much is two plus two:"
 msgstr "Hoeveel is twee plus twee:"
 
-#: register.php:234
+#: register.php:233
 msgid "Submit registration"
 msgstr "Registratie indienen"
 
-#: register.php:252
+#: register.php:251
 msgid "Your registration information is incomplete."
 msgstr "Uw registratie informatie is incompleet."
 
-#: register.php:267
+#: register.php:266
 msgid "Sorry, this username is already taken."
 msgstr "Sorry, deze naam is al in gebruik."
 
-#: register.php:286
+#: register.php:285
 msgid "Registration failed."
 msgstr "Registratie is mislukt."
 
-#: register.php:333
+#: register.php:331
 msgid "Account created successfully."
 msgstr "Het account is met succes aangemaakt."
 
-#: register.php:355
+#: register.php:353
 msgid "New user registrations are currently closed."
 msgstr "Nieuwe gebruikersregistratie is op dit moment niet mogelijk."
 
-#: update.php:66
+#: update.php:67
 msgid "Tiny Tiny RSS data update script."
 msgstr "Tiny Tiny RSS data update script."
 
@@ -484,10 +472,10 @@ msgstr "Alle feeds"
 
 #: include/controls.php:138
 #: include/controls.php:230
-#: classes/opml.php:512
-#: classes/digest.php:120
+#: classes/digest.php:124
+#: classes/feeds.php:1708
 #: classes/pref/feeds.php:233
-#: classes/feeds.php:1722
+#: classes/opml.php:512
 msgid "Uncategorized"
 msgstr "Ongecategoriseerd"
 
@@ -502,287 +490,287 @@ msgstr[1] "%d gearchiveerde artikelen"
 msgid "No feeds found."
 msgstr "Geen feeds gevonden."
 
-#: include/functions.php:983
+#: include/functions.php:928
 #, php-format
 msgid "%d min"
 msgstr ""
 
-#: include/functions.php:1177
+#: include/functions.php:1122
 msgid "Navigation"
 msgstr "Navigatie"
 
-#: include/functions.php:1178
+#: include/functions.php:1123
 msgid "Open next feed"
 msgstr "Open volgende feed"
 
-#: include/functions.php:1179
+#: include/functions.php:1124
 msgid "Open previous feed"
 msgstr "Open voorgaande feed"
 
-#: include/functions.php:1180
+#: include/functions.php:1125
 msgid "Open next article"
 msgstr "Open volgende artikel"
 
-#: include/functions.php:1181
+#: include/functions.php:1126
 msgid "Open previous article"
 msgstr "Open voorgaand artikel"
 
-#: include/functions.php:1182
+#: include/functions.php:1127
 msgid "Open next article (don't scroll long articles)"
 msgstr "Open volgend artikel (lange artikelen niet scrollen)"
 
-#: include/functions.php:1183
+#: include/functions.php:1128
 msgid "Open previous article (don't scroll long articles)"
 msgstr "Open vorig artikel (lange artikelen niet scrollen)"
 
-#: include/functions.php:1184
+#: include/functions.php:1129
 msgid "Move to next article (don't expand or mark read)"
 msgstr "Open volgend artikel (niet uitklappen of markeren als gelezen)"
 
-#: include/functions.php:1185
+#: include/functions.php:1130
 msgid "Move to previous article (don't expand or mark read)"
 msgstr "Open vorig artikel (niet uitklappen of markeren als gelezen)"
 
-#: include/functions.php:1186
+#: include/functions.php:1131
 msgid "Show search dialog"
 msgstr "Toon zoekdialoogvenster"
 
-#: include/functions.php:1187
+#: include/functions.php:1132
 msgid "Article"
 msgstr "Artikel"
 
-#: include/functions.php:1188
-#: js/viewfeed.js:1695
+#: include/functions.php:1133
+#: js/viewfeed.js:1341
 msgid "Toggle starred"
 msgstr "In/uitschakelen sterren"
 
-#: include/functions.php:1189
-#: js/viewfeed.js:1707
+#: include/functions.php:1134
+#: js/viewfeed.js:1353
 msgid "Toggle published"
 msgstr "In/uitschakelen gepubliceerd"
 
-#: include/functions.php:1190
-#: js/viewfeed.js:1682
+#: include/functions.php:1135
+#: js/viewfeed.js:1328
 msgid "Toggle unread"
 msgstr "In/uitschakelen gelezen"
 
-#: include/functions.php:1191
+#: include/functions.php:1136
 msgid "Edit tags"
 msgstr "Bewerk tags"
 
-#: include/functions.php:1192
+#: include/functions.php:1137
 msgid "Open in new window"
 msgstr "Open in nieuw venster"
 
-#: include/functions.php:1193
-#: js/viewfeed.js:1728
+#: include/functions.php:1138
+#: js/viewfeed.js:1374
 msgid "Mark below as read"
 msgstr "Hieronder markeren als gelezen"
 
-#: include/functions.php:1194
-#: js/viewfeed.js:1721
+#: include/functions.php:1139
+#: js/viewfeed.js:1367
 msgid "Mark above as read"
 msgstr "Hierboven markeren als gelezen"
 
-#: include/functions.php:1195
+#: include/functions.php:1140
 msgid "Scroll down"
 msgstr "Omlaag scrollen"
 
-#: include/functions.php:1196
+#: include/functions.php:1141
 msgid "Scroll up"
 msgstr "Omhoog scrollen"
 
-#: include/functions.php:1197
+#: include/functions.php:1142
 msgid "Select article under cursor"
 msgstr "Selecteer artikel onder de cursor"
 
-#: include/functions.php:1198
+#: include/functions.php:1143
 msgid "Email article"
 msgstr "E-mail artikel"
 
-#: include/functions.php:1199
+#: include/functions.php:1144
 msgid "Close/collapse article"
 msgstr "Sluiten/inklappen artikel"
 
-#: include/functions.php:1200
+#: include/functions.php:1145
 msgid "Toggle article expansion (combined mode)"
 msgstr "In/uitschakelen artikel uitklappen (gecombineerde modus)"
 
-#: include/functions.php:1202
+#: include/functions.php:1147
 #: plugins/embed_original/init.php:33
 msgid "Toggle embed original"
 msgstr "In/uitschakelen origineel  insluiten"
 
-#: include/functions.php:1203
+#: include/functions.php:1148
 msgid "Article selection"
 msgstr "Artikelselectie"
 
-#: include/functions.php:1204
+#: include/functions.php:1149
 msgid "Select all articles"
 msgstr "Selecteer alle artikelen"
 
-#: include/functions.php:1205
+#: include/functions.php:1150
 msgid "Select unread"
 msgstr "Selecteer ongelezen"
 
-#: include/functions.php:1206
+#: include/functions.php:1151
 msgid "Select starred"
 msgstr "Selecteer met ster"
 
-#: include/functions.php:1207
+#: include/functions.php:1152
 msgid "Select published"
 msgstr "Selecteer gepubliceerde"
 
-#: include/functions.php:1208
+#: include/functions.php:1153
 msgid "Invert selection"
 msgstr "Keer selectie om"
 
-#: include/functions.php:1209
+#: include/functions.php:1154
 msgid "Deselect everything"
 msgstr "Deselecteer alles"
 
-#: include/functions.php:1210
-#: classes/pref/feeds.php:522
-#: classes/pref/feeds.php:794
+#: include/functions.php:1155
+#: classes/pref/feeds.php:521
+#: classes/pref/feeds.php:793
 msgid "Feed"
 msgstr "Feed"
 
-#: include/functions.php:1211
+#: include/functions.php:1156
 msgid "Refresh current feed"
 msgstr "Ververs huidige feed"
 
-#: include/functions.php:1212
+#: include/functions.php:1157
 msgid "Un/hide read feeds"
 msgstr "Toon/Verberg gelezen feeds"
 
-#: include/functions.php:1213
-#: classes/pref/feeds.php:1195
+#: include/functions.php:1158
+#: classes/pref/feeds.php:1194
 msgid "Subscribe to feed"
 msgstr "Abonneer op feed"
 
-#: include/functions.php:1214
-#: js/FeedTree.js:48
-#: js/PrefFeedTree.js:55
-#: js/viewfeed.js:1846
+#: include/functions.php:1159
+#: js/FeedTree.js:49
+#: js/PrefFeedTree.js:56
+#: js/viewfeed.js:1492
 msgid "Edit feed"
 msgstr "Bewerk feed"
 
-#: include/functions.php:1216
+#: include/functions.php:1161
 msgid "Reverse headlines"
 msgstr "Draai kopteksten om"
 
-#: include/functions.php:1217
+#: include/functions.php:1162
 msgid "Toggle headline grouping"
 msgstr ""
 
-#: include/functions.php:1218
+#: include/functions.php:1163
 msgid "Debug feed update"
 msgstr "Debug feed update"
 
-#: include/functions.php:1219
+#: include/functions.php:1164
 #, fuzzy
 msgid "Debug viewfeed()"
 msgstr "Debug feed update"
 
-#: include/functions.php:1220
-#: js/FeedTree.js:97
+#: include/functions.php:1165
+#: js/FeedTree.js:98
 msgid "Mark all feeds as read"
 msgstr "Markeer alle feeds als gelezen"
 
-#: include/functions.php:1221
+#: include/functions.php:1166
 msgid "Un/collapse current category"
 msgstr "Uit/Inklappen huidige categorie"
 
-#: include/functions.php:1222
-msgid "Toggle combined mode"
-msgstr "In/uitschakelen gecombineerde modus"
-
-#: include/functions.php:1223
+#: include/functions.php:1167
 msgid "Toggle auto expand in combined mode"
 msgstr "In/uitschakelen automatisch uitklappen in gecombineerde modus"
 
-#: include/functions.php:1224
+#: include/functions.php:1168
+msgid "Toggle combined mode"
+msgstr "In/uitschakelen gecombineerde modus"
+
+#: include/functions.php:1169
 msgid "Go to"
 msgstr "Ga naar"
 
-#: include/functions.php:1225
-#: classes/feeds.php:1583
+#: include/functions.php:1170
+#: classes/feeds.php:1569
 msgid "All articles"
 msgstr "Alle artikelen"
 
-#: include/functions.php:1226
+#: include/functions.php:1171
 msgid "Fresh"
 msgstr "Nieuw"
 
-#: include/functions.php:1229
-#: js/tt-rss.js:491
-#: js/tt-rss.js:660
+#: include/functions.php:1174
+#: js/tt-rss.js:439
+#: js/tt-rss.js:599
 msgid "Tag cloud"
 msgstr "Tag wolk"
 
-#: include/functions.php:1231
+#: include/functions.php:1176
 msgid "Other"
 msgstr "Andere"
 
-#: include/functions.php:1232
+#: include/functions.php:1177
 #: classes/pref/labels.php:279
 msgid "Create label"
 msgstr "Maak label"
 
-#: include/functions.php:1233
+#: include/functions.php:1178
 #: classes/pref/filters.php:801
 msgid "Create filter"
 msgstr "Maak filter"
 
-#: include/functions.php:1234
+#: include/functions.php:1179
 msgid "Un/collapse sidebar"
 msgstr "Uit/Inklappen zijbalk"
 
-#: include/functions.php:1235
+#: include/functions.php:1180
 msgid "Show help dialog"
 msgstr "Toon helpdialoogvenster"
 
-#: include/functions.php:2582
+#: include/functions.php:2529
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: include/functions.php:2583
+#: include/functions.php:2530
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: include/functions.php:2584
+#: include/functions.php:2531
 msgid "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form"
 msgstr ""
 
-#: include/functions.php:2585
+#: include/functions.php:2532
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: include/functions.php:2586
+#: include/functions.php:2533
 #, fuzzy
 msgid "No file was uploaded"
 msgstr "Geen bestand geupload."
 
-#: include/functions.php:2587
+#: include/functions.php:2534
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: include/functions.php:2588
+#: include/functions.php:2535
 msgid "Failed to write file to disk."
 msgstr ""
 
-#: include/functions.php:2589
+#: include/functions.php:2536
 msgid "A PHP extension stopped the file upload."
 msgstr ""
 
 #: include/login_form.php:107
-#: classes/handler/public.php:446
-#: classes/handler/public.php:708
+#: classes/handler/public.php:466
+#: classes/handler/public.php:732
 msgid "Login:"
 msgstr "Aanmelden:"
 
 #: include/login_form.php:117
-#: classes/handler/public.php:449
+#: classes/handler/public.php:469
 msgid "Password:"
 msgstr "Wachtwoord:"
 
@@ -795,9 +783,9 @@ msgid "Profile:"
 msgstr "Profiel:"
 
 #: include/login_form.php:133
-#: classes/handler/public.php:252
 #: classes/pref/prefs.php:1037
 #: classes/rpc.php:69
+#: classes/handler/public.php:272
 msgid "Default profile"
 msgstr "Standaard profiel"
 
@@ -814,211 +802,30 @@ msgid "Remember me"
 msgstr "Onthoud mij"
 
 #: include/login_form.php:159
-#: classes/handler/public.php:454
+#: classes/handler/public.php:474
 msgid "Log in"
 msgstr "Aanmelden"
 
-#: include/sessions.php:46
+#: include/sessions.php:45
 #, fuzzy
 msgid "Session failed to validate (schema version changed)"
 msgstr "De sessie kon niet worden gevalideerd (onjuist IP)"
 
-#: include/sessions.php:62
+#: include/sessions.php:53
+#, fuzzy
+msgid "Session failed to validate (UA changed)."
+msgstr "De sessie kon niet worden gevalideerd (onjuist IP)"
+
+#: include/sessions.php:67
 #, fuzzy
 msgid "Session failed to validate (password changed)"
 msgstr "De sessie kon niet worden gevalideerd (onjuist IP)"
 
-#: include/sessions.php:69
+#: include/sessions.php:74
 #, fuzzy
 msgid "Session failed to validate (user not found)"
 msgstr "De sessie kon niet worden gevalideerd (onjuist IP)"
 
-#: classes/article.php:26
-msgid "Article not found."
-msgstr "Artikel niet gevonden."
-
-#: classes/article.php:211
-msgid "Tags for this article (separated by commas):"
-msgstr "Tags voor dit artikel (komma gescheiden):"
-
-#: classes/article.php:236
-#: classes/pref/labels.php:82
-#: classes/pref/users.php:103
-#: classes/pref/feeds.php:774
-#: classes/pref/feeds.php:914
-#: classes/pref/filters.php:525
-#: classes/pref/prefs.php:982
-#: plugins/nsfw/init.php:85
-#: plugins/note/init.php:58
-#: plugins/af_readability/init.php:80
-#: plugins/af_redditimgur/init.php:66
-#: plugins/af_psql_trgm/init.php:188
-#: plugins/mail/init.php:65
-#: plugins/af_zz_imgproxy/init.php:238
-msgid "Save"
-msgstr "Opslaan"
-
-#: classes/article.php:238
-#: classes/handler/public.php:423
-#: classes/handler/public.php:457
-#: classes/pref/labels.php:84
-#: classes/pref/users.php:105
-#: classes/pref/feeds.php:775
-#: classes/pref/feeds.php:917
-#: classes/pref/feeds.php:1672
-#: classes/pref/filters.php:528
-#: classes/pref/filters.php:945
-#: classes/pref/filters.php:1022
-#: classes/pref/filters.php:1115
-#: classes/pref/prefs.php:984
-#: classes/feeds.php:1037
-#: classes/feeds.php:1089
-#: classes/feeds.php:1128
-#: plugins/note/init.php:60
-#: plugins/mail/init.php:179
-msgid "Cancel"
-msgstr "Annuleren"
-
-#: classes/article.php:337
-#: classes/article.php:720
-#: classes/article.php:875
-msgid "no tags"
-msgstr "geen tags"
-
-#: classes/article.php:448
-msgid "unknown type"
-msgstr "onbekend type"
-
-#: classes/article.php:525
-msgid "Attachments"
-msgstr "Bijlagen"
-
-#: classes/article.php:626
-#: classes/feeds.php:661
-msgid "comment"
-msgid_plural "comments"
-msgstr[0] ""
-msgstr[1] ""
-
-#: classes/article.php:630
-#: classes/feeds.php:665
-#, fuzzy
-msgid "comments"
-msgstr "Bijlagen"
-
-#: classes/article.php:689
-msgid " - "
-msgstr " - "
-
-#: classes/article.php:730
-#: classes/feeds.php:647
-msgid "Edit tags for this article"
-msgstr "Bewerk tags voor dit artikel"
-
-#: classes/article.php:763
-#: classes/feeds.php:602
-msgid "Originally from:"
-msgstr "Oorspronkelijk uit:"
-
-#: classes/article.php:774
-#: classes/pref/feeds.php:539
-#: classes/feeds.php:613
-msgid "Feed URL"
-msgstr "Feed URL"
-
-#: classes/article.php:811
-#: classes/backend.php:103
-#: classes/dlg.php:33
-#: classes/dlg.php:56
-#: classes/dlg.php:89
-#: classes/dlg.php:154
-#: classes/dlg.php:181
-#: classes/dlg.php:197
-#: classes/pref/feeds.php:1466
-#: classes/pref/feeds.php:1533
-#: classes/pref/filters.php:208
-#: classes/pref/prefs.php:1099
-#: plugins/af_psql_trgm/init.php:109
-#: plugins/import_export/init.php:446
-#: plugins/import_export/init.php:490
-#: plugins/share/init.php:128
-msgid "Close this window"
-msgstr "Sluit dit venster"
-
-#: classes/article.php:913
-msgid "(edit note)"
-msgstr "(bewerk notitie)"
-
-#: classes/opml.php:31
-#: classes/opml.php:36
-msgid "OPML Utility"
-msgstr "OPML hulpprogramma"
-
-#: classes/opml.php:40
-msgid "Importing OPML..."
-msgstr "OPML aan 't importeren…"
-
-#: classes/opml.php:45
-msgid "Return to preferences"
-msgstr "Terug naar voorkeuren"
-
-#: classes/opml.php:301
-#, php-format
-msgid "Adding feed: %s"
-msgstr "Feed toevoegen: %s"
-
-#: classes/opml.php:312
-#, php-format
-msgid "Duplicate feed: %s"
-msgstr "Dubbele feed: %s"
-
-#: classes/opml.php:326
-#, php-format
-msgid "Adding label %s"
-msgstr "Toevoegen label %s"
-
-#: classes/opml.php:329
-#, php-format
-msgid "Duplicate label: %s"
-msgstr "Dubbele label: %s"
-
-#: classes/opml.php:341
-#, php-format
-msgid "Setting preference key %s to %s"
-msgstr "Instellen voorkeursleutel %s op %s"
-
-#: classes/opml.php:377
-msgid "Adding filter..."
-msgstr "Filter toevoegen..."
-
-#: classes/opml.php:512
-#, php-format
-msgid "Processing category: %s"
-msgstr "Verwerken categorie: %s"
-
-#: classes/opml.php:558
-#, php-format
-msgid "Upload failed with error code %d"
-msgstr "Upload mislukt met fout nummer %d"
-
-#: classes/opml.php:570
-#: plugins/import_export/init.php:471
-msgid "Unable to move uploaded file."
-msgstr "Kan het geüploade bestand niet verplaatsen."
-
-#: classes/opml.php:574
-#: plugins/import_export/init.php:475
-msgid "Error: please upload OPML file."
-msgstr "Fout: OPML bestand uploaden aub."
-
-#: classes/opml.php:585
-msgid "Error: unable to find moved OPML file."
-msgstr "Fout: kan het verplaatste OPML bestand niet vinden."
-
-#: classes/opml.php:594
-msgid "Error while parsing document."
-msgstr "Fout bij het parsen van het document."
-
 #: 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."
@@ -1039,164 +846,357 @@ msgstr "Ctrl"
 msgid "Help topic not found."
 msgstr "Help onderwerp niet gevonden."
 
-#: 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."
+#: classes/backend.php:103
+#: classes/pref/filters.php:208
+#: classes/pref/feeds.php:1465
+#: classes/pref/feeds.php:1532
+#: classes/pref/prefs.php:1099
+#: classes/dlg.php:33
+#: classes/dlg.php:56
+#: classes/dlg.php:89
+#: classes/dlg.php:154
+#: classes/dlg.php:181
+#: classes/dlg.php:197
+#: classes/article.php:810
+#: plugins/af_psql_trgm/init.php:109
+#: plugins/import_export/init.php:446
+#: plugins/import_export/init.php:490
+#: plugins/share/init.php:128
+msgid "Close this window"
+msgstr "Sluit dit venster"
 
-#: classes/dlg.php:44
-msgid "Your Public OPML URL is:"
-msgstr "Uw publieke OPML URL is:"
+#: classes/feeds.php:53
+msgid "View as RSS feed"
+msgstr "Toon als RSS feed"
 
-#: classes/dlg.php:53
-#: classes/dlg.php:178
-#: plugins/share/init.php:125
-msgid "Generate new URL"
-msgstr "Genereer nieuwe URL"
+#: classes/feeds.php:54
+#: classes/feeds.php:140
+#: classes/pref/feeds.php:1326
+msgid "View as RSS"
+msgstr "Toon als RSS"
 
-#: classes/dlg.php:67
-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 "De update daemon is ingeschakeld in de configuratie, maar het achtergrondproces loopt niet. Dit voorkomt dat alle feeds wordt bijgewerkt. Start het achtergrondproces of contacteer de eigenaar van deze instantie."
+#: classes/feeds.php:62
+#, php-format
+msgid "Last updated: %s"
+msgstr "Laatst geüpdatet: %s"
 
-#: classes/dlg.php:71
-#: classes/dlg.php:80
-msgid "Last update:"
-msgstr "Laatste update:"
+#: classes/feeds.php:100
+#, fuzzy
+msgid "Select..."
+msgstr "Selecteer"
 
-#: classes/dlg.php:76
-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 "De update daemon neemt te veel tijd om een feed bij te werken. Dit kan betekenen dat het proces is gescrashed of hangt. Controleer het achtergrondproces of contacteer de eigenaar van deze instantie."
+#: classes/feeds.php:102
+#: classes/pref/labels.php:273
+#: classes/pref/filters.php:391
+#: classes/pref/filters.php:449
+#: classes/pref/filters.php:795
+#: classes/pref/filters.php:878
+#: classes/pref/filters.php:905
+#: classes/pref/feeds.php:1185
+#: classes/pref/feeds.php:1416
+#: classes/pref/feeds.php:1481
+#: classes/pref/users.php:358
+#: classes/pref/prefs.php:996
+msgid "All"
+msgstr "Alles"
 
-#: classes/dlg.php:169
-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/feeds.php:104
+msgid "Invert"
+msgstr "Omkeren"
 
-#: classes/dlg.php:190
-msgid "You are using default tt-rss password. Please change it in the Preferences (Personal data / Authentication)."
+#: classes/feeds.php:105
+#: classes/pref/labels.php:275
+#: classes/pref/filters.php:393
+#: classes/pref/filters.php:451
+#: classes/pref/filters.php:797
+#: classes/pref/filters.php:880
+#: classes/pref/filters.php:907
+#: classes/pref/feeds.php:1187
+#: classes/pref/feeds.php:1418
+#: classes/pref/feeds.php:1483
+#: classes/pref/users.php:360
+#: classes/pref/prefs.php:998
+msgid "None"
+msgstr "Niets"
+
+#: classes/feeds.php:107
+msgid "Selection toggle:"
+msgstr "Selectie schakelaar:"
+
+#: classes/feeds.php:113
+msgid "Selection:"
+msgstr "Selectie:"
+
+#: classes/feeds.php:116
+msgid "Set score"
+msgstr "Geef score"
+
+#: classes/feeds.php:119
+msgid "Archive"
+msgstr "Archiveer"
+
+#: classes/feeds.php:121
+msgid "Move back"
+msgstr "Terugzetten"
+
+#: classes/feeds.php:122
+#: classes/pref/filters.php:400
+#: classes/pref/filters.php:458
+#: classes/pref/filters.php:887
+#: classes/pref/filters.php:914
+msgid "Delete"
+msgstr "Verwijderen"
+
+#: classes/feeds.php:127
+#: classes/feeds.php:132
+#: plugins/mailto/init.php:25
+#: plugins/mail/init.php:76
+msgid "Forward by email"
+msgstr "Doorsturen per e-mail"
+
+#: classes/feeds.php:136
+msgid "Feed:"
+msgstr "Feed:"
+
+#: classes/feeds.php:193
+#: classes/feeds.php:802
+msgid "Feed not found."
+msgstr "Feed niet gevonden."
+
+#: classes/feeds.php:255
+msgid "Never"
+msgstr "Nooit"
+
+#: classes/feeds.php:341
+#, php-format
+msgid "Imported at %s"
+msgstr "Geïmporteerd op %s"
+
+#: classes/feeds.php:391
+#: classes/feeds.php:484
+#, fuzzy
+msgid "mark feed as read"
+msgstr "Markeer alle feeds als gelezen"
+
+#: classes/feeds.php:540
+msgid "Collapse article"
+msgstr "Artikel inklappen"
+
+#: classes/feeds.php:592
+#: classes/article.php:762
+msgid "Originally from:"
+msgstr "Oorspronkelijk uit:"
+
+#: classes/feeds.php:603
+#: classes/pref/feeds.php:538
+#: classes/article.php:773
+msgid "Feed URL"
+msgstr "Feed URL"
+
+#: classes/feeds.php:630
+#: classes/article.php:729
+msgid "Edit tags for this article"
+msgstr "Bewerk tags voor dit artikel"
+
+#: classes/feeds.php:644
+#: classes/article.php:625
+msgid "comment"
+msgid_plural "comments"
+msgstr[0] ""
+msgstr[1] ""
+
+#: classes/feeds.php:648
+#: classes/article.php:629
+#, fuzzy
+msgid "comments"
+msgstr "Bijlagen"
+
+#: classes/feeds.php:686
+msgid "No unread articles found to display."
+msgstr "Er zijn geen ongelezen artikelen gevonden om weer te geven."
+
+#: classes/feeds.php:689
+msgid "No updated articles found to display."
+msgstr "Geen bijgewerkte artikelen gevonden om weer te geven."
+
+#: classes/feeds.php:692
+msgid "No starred articles found to display."
+msgstr "Er zijn geen artikelen met ster gevonden om weer te geven."
+
+#: classes/feeds.php:696
+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:698
+msgid "No articles found to display."
+msgstr "Geen artikelen gevonden om weer te geven."
+
+#: classes/feeds.php:714
+#: classes/feeds.php:905
+#, php-format
+msgid "Feeds last updated at %s"
+msgstr "Feeds laatst bijgewerkt op %s"
+
+#: classes/feeds.php:726
+#: classes/feeds.php:917
+msgid "Some feeds have update errors (click for details)"
+msgstr "Sommige feeds hebben update fouten (klik voor details)"
+
+#: classes/feeds.php:894
+msgid "No feed selected."
+msgstr "Geen feeds geselecteerd."
+
+#: classes/feeds.php:958
+#: classes/feeds.php:966
+msgid "Feed or site URL"
+msgstr "Feed of website URL"
+
+#: classes/feeds.php:972
+#: classes/pref/feeds.php:559
+#: classes/pref/feeds.php:800
+#: classes/pref/feeds.php:1632
+msgid "Place in category:"
+msgstr "Plaats in categorie:"
+
+#: classes/feeds.php:980
+msgid "Available feeds"
+msgstr "Beschikbare feeds"
+
+#: classes/feeds.php:992
+#: classes/pref/feeds.php:621
+#: classes/pref/feeds.php:848
+#: classes/pref/users.php:61
+msgid "Authentication"
+msgstr "Authenticatie"
+
+#: classes/feeds.php:996
+#: classes/pref/feeds.php:625
+#: classes/pref/feeds.php:852
+#: classes/pref/feeds.php:1646
+#: classes/pref/users.php:403
+msgid "Login"
+msgstr "LoginID"
+
+#: classes/feeds.php:1000
+#: classes/pref/feeds.php:631
+#: classes/pref/feeds.php:860
+#: classes/pref/feeds.php:1649
+#: classes/pref/prefs.php:243
+msgid "Password"
+msgstr "Wachtwoord"
+
+#: classes/feeds.php:1011
+#: classes/pref/feeds.php:645
+msgid "This feed requires authentication."
+msgstr "Deze feed vereist authenticatie."
+
+#: classes/feeds.php:1014
+#: classes/feeds.php:1070
+#: classes/pref/feeds.php:1668
+msgid "Subscribe"
+msgstr "Abonneren"
+
+#: classes/feeds.php:1017
+msgid "More feeds"
+msgstr "Meer feeds"
+
+#: classes/feeds.php:1020
+#: classes/feeds.php:1072
+#: classes/feeds.php:1111
+#: classes/pref/labels.php:84
+#: classes/pref/filters.php:528
+#: classes/pref/filters.php:945
+#: classes/pref/filters.php:1022
+#: classes/pref/filters.php:1115
+#: classes/pref/feeds.php:774
+#: classes/pref/feeds.php:916
+#: classes/pref/feeds.php:1669
+#: classes/pref/users.php:105
+#: classes/pref/prefs.php:984
+#: classes/article.php:238
+#: classes/handler/public.php:443
+#: classes/handler/public.php:477
+#: plugins/mail/init.php:179
+#: plugins/note/init.php:60
+msgid "Cancel"
+msgstr "Annuleren"
+
+#: classes/feeds.php:1042
+#: classes/feeds.php:1110
+#: classes/pref/filters.php:788
+#: classes/pref/feeds.php:1178
+#: classes/pref/users.php:345
+#: js/tt-rss.js:152
+msgid "Search"
+msgstr "Zoeken"
+
+#: classes/feeds.php:1046
+msgid "Popular feeds"
+msgstr "Populaire feeds"
+
+#: classes/feeds.php:1047
+msgid "Feed archive"
+msgstr "Feed archief"
+
+#: classes/feeds.php:1050
+msgid "limit:"
+msgstr "beperking:"
+
+#: classes/feeds.php:1071
+#: classes/pref/labels.php:282
+#: classes/pref/filters.php:518
+#: classes/pref/filters.php:814
+#: classes/pref/feeds.php:751
+#: classes/pref/users.php:369
+msgid "Remove"
+msgstr "Verwijderen"
+
+#: classes/feeds.php:1084
+msgid "Look for"
+msgstr "Zoek naar"
+
+#: classes/feeds.php:1092
+#, php-format
+msgid "in %s"
 msgstr ""
 
-#: classes/dlg.php:194
+#: classes/feeds.php:1097
+msgid "Used for word stemming"
+msgstr ""
+
+#: classes/feeds.php:1106
 #, fuzzy
-msgid "Open Preferences"
-msgstr "Voorkeuren"
+msgid "Search syntax"
+msgstr "Zoeken"
 
-#: classes/handler/public.php:387
-#: plugins/bookmarklets/init.php:40
-msgid "Share with Tiny Tiny RSS"
-msgstr "Deel met Tiny Tiny RSS"
+#: classes/feeds.php:1563
+msgid "Starred articles"
+msgstr "Artikelen met ster"
 
-#: classes/handler/public.php:395
-msgid "Title:"
-msgstr "Titel:"
+#: classes/feeds.php:1565
+msgid "Published articles"
+msgstr "Gepubliceerde artikelen"
 
-#: classes/handler/public.php:397
-#: classes/pref/feeds.php:537
-msgid "URL:"
-msgstr "URL:"
+#: classes/feeds.php:1567
+msgid "Fresh articles"
+msgstr "Nieuwe artikelen"
 
-#: classes/handler/public.php:399
-msgid "Content:"
-msgstr "Inhoud:"
+#: classes/feeds.php:1571
+msgid "Archived articles"
+msgstr "Gearchiveerde artikelen"
 
-#: classes/handler/public.php:401
-msgid "Labels:"
-msgstr "Labels:"
+#: classes/feeds.php:1573
+msgid "Recently read"
+msgstr "Recent gelezen"
 
-#: classes/handler/public.php:420
-msgid "Shared article will appear in the Published feed."
-msgstr "Gedeeld artikel zal verschijnen in de Gepubliceerd feed."
+#: classes/feeds.php:1694
+msgid "Special"
+msgstr "Speciaal"
 
-#: classes/handler/public.php:422
-msgid "Share"
-msgstr "Delen"
-
-#: classes/handler/public.php:444
-msgid "Not logged in"
-msgstr "Niet ingelogd"
-
-#: classes/handler/public.php:504
-msgid "Incorrect username or password"
-msgstr "Onjuiste gebruikersnaam of wachtwoord"
-
-#: classes/handler/public.php:557
+#: classes/feeds.php:1951
 #, php-format
-msgid "Already subscribed to <b>%s</b>."
-msgstr "Reeds geabonneerd op <b>%s</b>."
-
-#: classes/handler/public.php:560
-#, php-format
-msgid "Subscribed to <b>%s</b>."
-msgstr "Geabonneerd op  <b>%s</b>."
-
-#: classes/handler/public.php:563
-#, php-format
-msgid "Could not subscribe to <b>%s</b>."
-msgstr "Kon niet abonneren op  <b>%s</b>."
-
-#: classes/handler/public.php:566
-#, php-format
-msgid "No feeds found in <b>%s</b>."
-msgstr "Geen feeds gevonden in <b>%s</b>."
-
-#: classes/handler/public.php:569
-msgid "Multiple feed URLs found."
-msgstr "Meerdere feed-URL's gevonden."
-
-#: classes/handler/public.php:573
-#, 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:591
-msgid "Subscribe to selected feed"
-msgstr "Abonneren op de geselecteerde feed"
-
-#: classes/handler/public.php:618
-msgid "Edit subscription options"
-msgstr "Bewerk abonnement opties"
-
-#: classes/handler/public.php:656
-msgid "Password recovery"
-msgstr "Wachtwoordherstel"
-
-#: classes/handler/public.php:701
-#, 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:723
-#: classes/pref/users.php:372
-msgid "Reset password"
-msgstr "Herstel wachtwoord"
-
-#: classes/handler/public.php:733
-msgid "Some of the required form parameters are missing or incorrect."
-msgstr "Sommige vereiste velden ontbreken of zijn onjuist."
-
-#: classes/handler/public.php:737
-#: classes/handler/public.php:806
-msgid "Go back"
-msgstr "Ga terug"
-
-#: classes/handler/public.php:775
-#, fuzzy
-msgid "[tt-rss] Password reset request"
-msgstr "[tt-rss] Melding verandering van wachtwoord"
-
-#: classes/handler/public.php:802
-msgid "Sorry, login and email combination not found."
-msgstr "Sorry, deze combinatie van naam en wachtwoord is onbekend."
-
-#: classes/handler/public.php:824
-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:850
-msgid "Database Updater"
-msgstr "Database updater"
-
-#: classes/handler/public.php:915
-msgid "Perform updates"
-msgstr "Voor de updates uit"
+msgid "Search results: %s"
+msgstr "Zoekresultaten: %s"
 
 #: classes/pref/labels.php:25
 #: classes/pref/filters.php:377
@@ -1216,201 +1216,195 @@ msgstr "Voorgrond:"
 msgid "Background:"
 msgstr "Achtergrond:"
 
+#: classes/pref/labels.php:82
+#: classes/pref/filters.php:525
+#: classes/pref/feeds.php:773
+#: classes/pref/feeds.php:913
+#: classes/pref/users.php:103
+#: classes/pref/prefs.php:982
+#: classes/article.php:236
+#: plugins/af_zz_imgproxy/init.php:238
+#: plugins/af_redditimgur/init.php:66
+#: plugins/af_psql_trgm/init.php:188
+#: plugins/af_readability/init.php:80
+#: plugins/nsfw/init.php:85
+#: plugins/mail/init.php:65
+#: plugins/note/init.php:58
+msgid "Save"
+msgstr "Opslaan"
+
 #: classes/pref/labels.php:244
 #, php-format
 msgid "Created label <b>%s</b>"
 msgstr "Label <b>%s</b> aangemaakt"
 
 #: classes/pref/labels.php:270
-#: classes/pref/users.php:356
-#: classes/pref/feeds.php:1183
-#: classes/pref/feeds.php:1414
-#: classes/pref/feeds.php:1479
 #: classes/pref/filters.php:388
 #: classes/pref/filters.php:446
 #: classes/pref/filters.php:792
 #: classes/pref/filters.php:875
 #: classes/pref/filters.php:902
+#: classes/pref/feeds.php:1182
+#: classes/pref/feeds.php:1413
+#: classes/pref/feeds.php:1478
+#: classes/pref/users.php:355
 #: classes/pref/prefs.php:993
 msgid "Select"
 msgstr "Selecteer"
 
-#: classes/pref/labels.php:273
-#: classes/pref/users.php:359
-#: classes/pref/feeds.php:1186
-#: classes/pref/feeds.php:1417
-#: classes/pref/feeds.php:1482
-#: classes/pref/filters.php:391
-#: classes/pref/filters.php:449
-#: classes/pref/filters.php:795
-#: classes/pref/filters.php:878
-#: classes/pref/filters.php:905
-#: classes/pref/prefs.php:996
-#: classes/feeds.php:102
-msgid "All"
-msgstr "Alles"
-
-#: classes/pref/labels.php:275
-#: classes/pref/users.php:361
-#: classes/pref/feeds.php:1188
-#: classes/pref/feeds.php:1419
-#: classes/pref/feeds.php:1484
-#: classes/pref/filters.php:393
-#: classes/pref/filters.php:451
-#: classes/pref/filters.php:797
-#: classes/pref/filters.php:880
-#: classes/pref/filters.php:907
-#: classes/pref/prefs.php:998
-#: classes/feeds.php:105
-msgid "None"
-msgstr "Niets"
-
-#: classes/pref/labels.php:282
-#: classes/pref/users.php:370
-#: classes/pref/feeds.php:752
-#: classes/pref/filters.php:518
-#: classes/pref/filters.php:814
-#: classes/feeds.php:1088
-msgid "Remove"
-msgstr "Verwijderen"
-
 #: classes/pref/labels.php:285
 msgid "Clear colors"
 msgstr "Wis kleuren"
 
-#: classes/pref/users.php:6
-#: classes/pref/system.php:8
-msgid "Your access level is insufficient to open this tab."
-msgstr "Uw toegangsniveau is niet toereikend om deze tab te openen."
-
-#: classes/pref/users.php:26
+#: classes/pref/filters.php:155
 #, fuzzy
-msgid "Edit user"
-msgstr "Bewerk regel"
+msgid "Preview article"
+msgstr "Nieuwe artikelen"
 
-#: classes/pref/users.php:61
-#: classes/pref/feeds.php:622
-#: classes/pref/feeds.php:849
-#: classes/feeds.php:1009
-msgid "Authentication"
-msgstr "Authenticatie"
+#: classes/pref/filters.php:267
+#: classes/pref/filters.php:573
+msgid "(inverse)"
+msgstr "(omgekeerd)"
 
-#: classes/pref/users.php:64
-msgid "Access level: "
-msgstr "Toegangsniveau:"
-
-#: classes/pref/users.php:82
-#: classes/pref/feeds.php:648
-#: classes/pref/feeds.php:867
-msgid "Options"
-msgstr "Opties"
-
-#: classes/pref/users.php:96
-#: js/prefs.js:479
-msgid "User details"
-msgstr "Gebruiker's details"
-
-#: classes/pref/users.php:136
-#: classes/pref/users.php:407
-msgid "Registered"
-msgstr "Geregistreerd"
-
-#: classes/pref/users.php:137
-msgid "Last logged in"
-msgstr "Laatst ingelogd"
-
-#: classes/pref/users.php:145
-msgid "Subscribed feeds count"
-msgstr "Aantal geabonneerde feeds"
-
-#: classes/pref/users.php:146
-#, fuzzy
-msgid "Stored articles"
-msgstr "Artikelen met ster"
-
-#: classes/pref/users.php:150
-#: classes/pref/users.php:406
-msgid "Subscribed feeds"
-msgstr "Geabonneerde feeds"
-
-#: classes/pref/users.php:176
-msgid "User not found"
-msgstr "Gebruiker niet gevonden"
-
-#: classes/pref/users.php:246
+#: classes/pref/filters.php:263
+#: classes/pref/filters.php:572
 #, php-format
-msgid "Added user <b>%s</b> with password <b>%s</b>"
-msgstr "Gebruiker <b>%s</b> toegevoegd met wachtwoord <b>%s</b>"
+msgid "%s on %s in %s %s"
+msgstr "%s op %s in %s %s"
 
-#: classes/pref/users.php:253
-#, php-format
-msgid "Could not create user <b>%s</b>"
-msgstr "Kon gebruiker <b>%s</b> niet aanmaken"
+#: classes/pref/filters.php:383
+#: classes/pref/filters.php:870
+#: classes/pref/filters.php:977
+msgid "Match"
+msgstr "Match"
 
-#: classes/pref/users.php:257
-#, php-format
-msgid "User <b>%s</b> already exists."
-msgstr "Gebruiker <b>%s</b> bestaat al."
+#: classes/pref/filters.php:397
+#: classes/pref/filters.php:455
+#: classes/pref/filters.php:884
+#: classes/pref/filters.php:911
+msgid "Add"
+msgstr "Toevoegen"
 
-#: classes/pref/users.php:285
-#, 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/filters.php:441
+#: classes/pref/filters.php:897
+msgid "Apply actions"
+msgstr "Acties toepassen"
 
-#: classes/pref/users.php:287
-#, 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/filters.php:492
+#: classes/pref/filters.php:926
+msgid "Enabled"
+msgstr "Ingeschakeld"
 
-#: classes/pref/users.php:311
-msgid "[tt-rss] Password change notification"
-msgstr "[tt-rss] Melding verandering van wachtwoord"
+#: classes/pref/filters.php:501
+#: classes/pref/filters.php:929
+msgid "Match any rule"
+msgstr "Match elke regel"
 
-#: classes/pref/users.php:346
-#: classes/pref/feeds.php:1179
-#: classes/pref/filters.php:788
-#: classes/feeds.php:1059
-#: classes/feeds.php:1127
-#: js/tt-rss.js:165
-msgid "Search"
-msgstr "Zoeken"
+#: classes/pref/filters.php:510
+#: classes/pref/filters.php:932
+msgid "Inverse matching"
+msgstr "Omgekeerde matching"
 
-#: classes/pref/users.php:364
-msgid "Create user"
-msgstr "Gebruiker aanmaken"
+#: classes/pref/filters.php:522
+#: classes/pref/filters.php:939
+msgid "Test"
+msgstr "Test"
+
+#: classes/pref/filters.php:804
+msgid "Combine"
+msgstr "Combineren"
 
-#: classes/pref/users.php:368
 #: classes/pref/filters.php:807
+#: classes/pref/users.php:367
 msgid "Edit"
 msgstr "Bewerken"
 
-#: classes/pref/users.php:404
-#: classes/pref/feeds.php:626
-#: classes/pref/feeds.php:853
-#: classes/pref/feeds.php:1649
-#: classes/feeds.php:1013
-msgid "Login"
-msgstr "LoginID"
+#: classes/pref/filters.php:810
+#: classes/pref/feeds.php:1198
+#: classes/pref/feeds.php:1212
+msgid "Reset sort order"
+msgstr "Herstel sorteervolgorde"
 
-#: classes/pref/users.php:405
-msgid "Access Level"
-msgstr "Toegangsniveau"
+#: classes/pref/filters.php:942
+msgid "Create"
+msgstr "Aanmaken"
 
-#: classes/pref/users.php:408
-msgid "Last login"
-msgstr "Laatste loginID"
+#: classes/pref/filters.php:987
+msgid "Regular expression, without outer delimiters (i.e. slashes)"
+msgstr ""
 
-#: classes/pref/users.php:427
-msgid "Click to edit"
-msgstr "Klik om te bewerken"
+#: classes/pref/filters.php:993
+msgid "Inverse regular expression matching"
+msgstr "Omgekeerde regular expression matching"
 
-#: classes/pref/users.php:447
-msgid "No users defined."
-msgstr "Geen gebruikers gedefinieerd."
+#: classes/pref/filters.php:995
+msgid "on field"
+msgstr "op veld"
 
-#: classes/pref/users.php:449
-msgid "No matching users found."
-msgstr "Geen overeenkomstige gebruikers gevonden."
+#: classes/pref/filters.php:1001
+#: js/PrefFilterTree.js:44
+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:764
+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:786
+msgid "Add action"
+msgstr "Actie toevoegen"
+
+#: classes/pref/filters.php:1139
+msgid "[No caption]"
+msgstr "[Geen onderschrift]"
+
+#: classes/pref/filters.php:1141
+#, fuzzy, php-format
+msgid "%s (%d rule)"
+msgid_plural "%s (%d rules)"
+msgstr[0] "Regel toevoegen"
+msgstr[1] "Regel toevoegen"
+
+#: classes/pref/filters.php:1155
+#, fuzzy
+msgid "matches any rule"
+msgstr "Match elke regel"
+
+#: classes/pref/filters.php:1158
+#, fuzzy, php-format
+msgid "%s (+%d action)"
+msgid_plural "%s (+%d actions)"
+msgstr[0] "Actie toevoegen"
+msgstr[1] "Actie toevoegen"
+
+#: classes/pref/system.php:8
+#: classes/pref/users.php:6
+msgid "Your access level is insufficient to open this tab."
+msgstr "Uw toegangsniveau is niet toereikend om deze tab te openen."
 
 #: classes/pref/system.php:29
 msgid "Error Log"
@@ -1456,386 +1450,316 @@ msgid_plural "(%d feeds)"
 msgstr[0] "(%d feeds)"
 msgstr[1] "(%d feeds)"
 
-#: classes/pref/feeds.php:514
+#: classes/pref/feeds.php:513
 #: classes/pref/prefs.php:18
 msgid "General"
 msgstr "Algemeen"
 
-#: classes/pref/feeds.php:528
+#: classes/pref/feeds.php:527
 msgid "Feed Title"
 msgstr "Feed titel"
 
-#: classes/pref/feeds.php:560
-#: classes/pref/feeds.php:801
-#: classes/pref/feeds.php:1635
-#: classes/feeds.php:989
-msgid "Place in category:"
-msgstr "Plaats in categorie:"
+#: classes/pref/feeds.php:536
+#: classes/handler/public.php:417
+msgid "URL:"
+msgstr "URL:"
 
-#: classes/pref/feeds.php:572
+#: classes/pref/feeds.php:571
 #, fuzzy
 msgid "Site URL:"
 msgstr "Artikel URL:"
 
-#: classes/pref/feeds.php:574
+#: classes/pref/feeds.php:573
 #, fuzzy
 msgid "Site URL"
 msgstr "Feed URL"
 
-#: classes/pref/feeds.php:585
-#: classes/pref/feeds.php:815
+#: classes/pref/feeds.php:584
+#: classes/pref/feeds.php:814
 #, fuzzy
 msgid "Language:"
 msgstr "Taal"
 
-#: classes/pref/feeds.php:592
-#: classes/pref/feeds.php:824
+#: classes/pref/feeds.php:591
+#: classes/pref/feeds.php:823
 msgid "Update"
 msgstr "Bijwerken"
 
-#: classes/pref/feeds.php:607
-#: classes/pref/feeds.php:840
+#: classes/pref/feeds.php:606
+#: classes/pref/feeds.php:839
 msgid "Article purging:"
 msgstr "Artikelopschoning:"
 
-#: classes/pref/feeds.php:632
-#: classes/pref/feeds.php:861
-#: classes/pref/feeds.php:1652
-#: classes/pref/prefs.php:243
-#: classes/feeds.php:1017
-msgid "Password"
-msgstr "Wachtwoord"
-
-#: classes/pref/feeds.php:636
+#: classes/pref/feeds.php:635
 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:646
-#: classes/feeds.php:1028
-msgid "This feed requires authentication."
-msgstr "Deze feed vereist authenticatie."
+#: classes/pref/feeds.php:647
+#: classes/pref/feeds.php:866
+#: classes/pref/users.php:82
+msgid "Options"
+msgstr "Opties"
 
-#: classes/pref/feeds.php:662
-#: classes/pref/feeds.php:871
+#: classes/pref/feeds.php:661
+#: classes/pref/feeds.php:870
 msgid "Hide from Popular feeds"
 msgstr "Verbergen voor populaire feeds"
 
-#: classes/pref/feeds.php:674
-#: classes/pref/feeds.php:877
+#: classes/pref/feeds.php:673
+#: classes/pref/feeds.php:876
 msgid "Include in e-mail digest"
 msgstr "Toevoegen aan e-mail samenvatting"
 
-#: classes/pref/feeds.php:687
-#: classes/pref/feeds.php:883
+#: classes/pref/feeds.php:686
+#: classes/pref/feeds.php:882
 msgid "Always display image attachments"
 msgstr "Altijd afbeeldingsbijlagen weergeven"
 
-#: classes/pref/feeds.php:700
-#: classes/pref/feeds.php:891
+#: classes/pref/feeds.php:699
+#: classes/pref/feeds.php:890
 #, fuzzy
 msgid "Do not embed media"
 msgstr "Afbeeldingen niet insluiten."
 
-#: classes/pref/feeds.php:713
-#: classes/pref/feeds.php:899
+#: classes/pref/feeds.php:712
+#: classes/pref/feeds.php:898
 msgid "Cache media"
 msgstr ""
 
-#: classes/pref/feeds.php:725
-#: classes/pref/feeds.php:905
+#: classes/pref/feeds.php:724
+#: classes/pref/feeds.php:904
 msgid "Mark updated articles as unread"
 msgstr "Markeer bijgewerkte artikelen als niet-gelezen"
 
-#: classes/pref/feeds.php:729
+#: classes/pref/feeds.php:728
 msgid "Icon"
 msgstr "Pictogram"
 
-#: classes/pref/feeds.php:743
-#: classes/pref/feeds.php:1284
+#: classes/pref/feeds.php:742
+#: classes/pref/feeds.php:1283
 #: plugins/import_export/init.php:71
 #, fuzzy
 msgid "Choose file..."
 msgstr "Filter aanmaken…"
 
-#: classes/pref/feeds.php:750
+#: classes/pref/feeds.php:749
 msgid "Replace"
 msgstr "Vervangen"
 
-#: classes/pref/feeds.php:757
+#: classes/pref/feeds.php:756
 #: classes/pref/prefs.php:679
 msgid "Plugins"
 msgstr "Plug-ins"
 
-#: classes/pref/feeds.php:1154
+#: classes/pref/feeds.php:1153
 msgid "Feeds with errors"
 msgstr "Feeds met fouten"
 
-#: classes/pref/feeds.php:1161
+#: classes/pref/feeds.php:1160
 msgid "Inactive feeds"
 msgstr "Inactieve feeds"
 
-#: classes/pref/feeds.php:1197
+#: classes/pref/feeds.php:1196
 msgid "Edit selected feeds"
 msgstr "Bewerk geselecteerde feeds"
 
-#: classes/pref/feeds.php:1199
-#: classes/pref/feeds.php:1213
-#: classes/pref/filters.php:810
-msgid "Reset sort order"
-msgstr "Herstel sorteervolgorde"
-
-#: classes/pref/feeds.php:1201
-#: js/prefs.js:1462
+#: classes/pref/feeds.php:1200
+#: js/prefs.js:1171
 msgid "Batch subscribe"
 msgstr "Batchmatig abonneren"
 
-#: classes/pref/feeds.php:1208
+#: classes/pref/feeds.php:1207
 msgid "Categories"
 msgstr "Categorieën"
 
-#: classes/pref/feeds.php:1211
+#: classes/pref/feeds.php:1210
 msgid "Add category"
 msgstr "Categorie toevoegen"
 
-#: classes/pref/feeds.php:1215
+#: classes/pref/feeds.php:1214
 msgid "Remove selected"
 msgstr "Verwijder geselecteerde"
 
-#: classes/pref/feeds.php:1272
+#: classes/pref/feeds.php:1271
 msgid "OPML"
 msgstr "OPML"
 
-#: classes/pref/feeds.php:1274
+#: classes/pref/feeds.php:1273
 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:1275
+#: classes/pref/feeds.php:1274
 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:1290
+#: classes/pref/feeds.php:1289
 msgid "Import my OPML"
 msgstr "Importeer mijn OPML"
 
-#: classes/pref/feeds.php:1296
+#: classes/pref/feeds.php:1295
 msgid "Filename:"
 msgstr "Bestandsnaam:"
 
-#: classes/pref/feeds.php:1298
+#: classes/pref/feeds.php:1297
 msgid "Include settings"
 msgstr "Toevoegingsinstellingen"
 
-#: classes/pref/feeds.php:1302
+#: classes/pref/feeds.php:1301
 msgid "Export OPML"
 msgstr "OPML exporteren"
 
-#: classes/pref/feeds.php:1306
+#: classes/pref/feeds.php:1305
 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:1310
+#: classes/pref/feeds.php:1309
 msgid "Public OPML URL"
 msgstr "Publieke OPML URL"
 
-#: classes/pref/feeds.php:1311
+#: classes/pref/feeds.php:1310
 msgid "Display published OPML URL"
 msgstr "Gepubliceerde OPML URL weergeven"
 
-#: classes/pref/feeds.php:1318
+#: classes/pref/feeds.php:1317
 msgid "Published & shared articles / Generated feeds"
 msgstr "Gepubliceerde & gedeelde artikelen / Gegenereerde feeds"
 
-#: classes/pref/feeds.php:1320
+#: classes/pref/feeds.php:1319
 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:1327
-#: classes/feeds.php:54
-#: classes/feeds.php:140
-msgid "View as RSS"
-msgstr "Toon als RSS"
-
-#: classes/pref/feeds.php:1328
 msgid "Display URL"
 msgstr "Toon URL"
 
-#: classes/pref/feeds.php:1331
+#: classes/pref/feeds.php:1330
 msgid "Clear all generated URLs"
 msgstr "Wis alle gegenereerde URL's"
 
-#: classes/pref/feeds.php:1410
+#: classes/pref/feeds.php:1409
 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:1444
-#: classes/pref/feeds.php:1509
+#: classes/pref/feeds.php:1443
+#: classes/pref/feeds.php:1508
 msgid "Click to edit feed"
 msgstr "Klik om feed te bewerken"
 
-#: classes/pref/feeds.php:1462
-#: classes/pref/feeds.php:1529
+#: classes/pref/feeds.php:1461
+#: classes/pref/feeds.php:1528
 msgid "Unsubscribe from selected feeds"
 msgstr "Abonnement opzeggen voor geselecteerde feeds"
 
-#: classes/pref/feeds.php:1632
+#: classes/pref/feeds.php:1629
 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:1641
+#: classes/pref/feeds.php:1638
 msgid "Feeds to subscribe, One per line"
 msgstr "Te abonneren feeds: één per regel"
 
-#: classes/pref/feeds.php:1664
+#: classes/pref/feeds.php:1661
 msgid "Feeds require authentication."
 msgstr "Feeds vereisen authenticatie."
 
-#: classes/pref/feeds.php:1671
-#: classes/feeds.php:1031
-#: classes/feeds.php:1087
-msgid "Subscribe"
-msgstr "Abonneren"
-
-#: classes/pref/filters.php:155
+#: classes/pref/users.php:26
 #, fuzzy
-msgid "Preview article"
-msgstr "Nieuwe artikelen"
+msgid "Edit user"
+msgstr "Bewerk regel"
 
-#: classes/pref/filters.php:267
-#: classes/pref/filters.php:573
-msgid "(inverse)"
-msgstr "(omgekeerd)"
+#: classes/pref/users.php:64
+msgid "Access level: "
+msgstr "Toegangsniveau:"
 
-#: classes/pref/filters.php:263
-#: classes/pref/filters.php:572
+#: classes/pref/users.php:96
+#: js/prefs.js:403
+msgid "User details"
+msgstr "Gebruiker's details"
+
+#: classes/pref/users.php:136
+#: classes/pref/users.php:406
+msgid "Registered"
+msgstr "Geregistreerd"
+
+#: classes/pref/users.php:137
+msgid "Last logged in"
+msgstr "Laatst ingelogd"
+
+#: classes/pref/users.php:145
+msgid "Subscribed feeds count"
+msgstr "Aantal geabonneerde feeds"
+
+#: classes/pref/users.php:146
+#, fuzzy
+msgid "Stored articles"
+msgstr "Artikelen met ster"
+
+#: classes/pref/users.php:150
+#: classes/pref/users.php:405
+msgid "Subscribed feeds"
+msgstr "Geabonneerde feeds"
+
+#: classes/pref/users.php:176
+msgid "User not found"
+msgstr "Gebruiker niet gevonden"
+
+#: classes/pref/users.php:246
 #, php-format
-msgid "%s on %s in %s %s"
-msgstr "%s op %s in %s %s"
+msgid "Added user <b>%s</b> with password <b>%s</b>"
+msgstr "Gebruiker <b>%s</b> toegevoegd met wachtwoord <b>%s</b>"
 
-#: classes/pref/filters.php:383
-#: classes/pref/filters.php:870
-#: classes/pref/filters.php:977
-msgid "Match"
-msgstr "Match"
+#: classes/pref/users.php:253
+#, php-format
+msgid "Could not create user <b>%s</b>"
+msgstr "Kon gebruiker <b>%s</b> niet aanmaken"
 
-#: classes/pref/filters.php:397
-#: classes/pref/filters.php:455
-#: classes/pref/filters.php:884
-#: classes/pref/filters.php:911
-msgid "Add"
-msgstr "Toevoegen"
+#: classes/pref/users.php:257
+#, php-format
+msgid "User <b>%s</b> already exists."
+msgstr "Gebruiker <b>%s</b> bestaat al."
 
-#: classes/pref/filters.php:400
-#: classes/pref/filters.php:458
-#: classes/pref/filters.php:887
-#: classes/pref/filters.php:914
-#: classes/feeds.php:122
-msgid "Delete"
-msgstr "Verwijderen"
+#: classes/pref/users.php:285
+#, 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/filters.php:441
-#: classes/pref/filters.php:897
-msgid "Apply actions"
-msgstr "Acties toepassen"
+#: classes/pref/users.php:287
+#, 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/filters.php:492
-#: classes/pref/filters.php:926
-msgid "Enabled"
-msgstr "Ingeschakeld"
+#: classes/pref/users.php:310
+msgid "[tt-rss] Password change notification"
+msgstr "[tt-rss] Melding verandering van wachtwoord"
 
-#: classes/pref/filters.php:501
-#: classes/pref/filters.php:929
-msgid "Match any rule"
-msgstr "Match elke regel"
+#: classes/pref/users.php:363
+msgid "Create user"
+msgstr "Gebruiker aanmaken"
 
-#: classes/pref/filters.php:510
-#: classes/pref/filters.php:932
-msgid "Inverse matching"
-msgstr "Omgekeerde matching"
+#: classes/pref/users.php:371
+#: classes/handler/public.php:747
+msgid "Reset password"
+msgstr "Herstel wachtwoord"
 
-#: classes/pref/filters.php:522
-#: classes/pref/filters.php:939
-msgid "Test"
-msgstr "Test"
+#: classes/pref/users.php:404
+msgid "Access Level"
+msgstr "Toegangsniveau"
 
-#: classes/pref/filters.php:804
-msgid "Combine"
-msgstr "Combineren"
+#: classes/pref/users.php:407
+msgid "Last login"
+msgstr "Laatste loginID"
 
-#: classes/pref/filters.php:942
-msgid "Create"
-msgstr "Aanmaken"
+#: classes/pref/users.php:426
+msgid "Click to edit"
+msgstr "Klik om te bewerken"
 
-#: classes/pref/filters.php:987
-msgid "Regular expression, without outer delimiters (i.e. slashes)"
-msgstr ""
+#: classes/pref/users.php:446
+msgid "No users defined."
+msgstr "Geen gebruikers gedefinieerd."
 
-#: 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:43
-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:797
-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:819
-msgid "Add action"
-msgstr "Actie toevoegen"
-
-#: classes/pref/filters.php:1139
-msgid "[No caption]"
-msgstr "[Geen onderschrift]"
-
-#: classes/pref/filters.php:1141
-#, fuzzy, php-format
-msgid "%s (%d rule)"
-msgid_plural "%s (%d rules)"
-msgstr[0] "Regel toevoegen"
-msgstr[1] "Regel toevoegen"
-
-#: classes/pref/filters.php:1155
-#, fuzzy
-msgid "matches any rule"
-msgstr "Match elke regel"
-
-#: classes/pref/filters.php:1158
-#, fuzzy, php-format
-msgid "%s (+%d action)"
-msgid_plural "%s (+%d actions)"
-msgstr[0] "Actie toevoegen"
-msgstr[1] "Actie toevoegen"
+#: classes/pref/users.php:448
+msgid "No matching users found."
+msgstr "Geen overeenkomstige gebruikers gevonden."
 
 #: classes/pref/prefs.php:19
 msgid "Interface"
@@ -2011,7 +1935,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:1424
+#: js/prefs.js:1136
 msgid "Customize stylesheet"
 msgstr "Aanpassen opmaakmodel"
 
@@ -2254,257 +2178,301 @@ msgstr "Verwijder geselecteerde profielen"
 msgid "Activate profile"
 msgstr "Activeer profiel"
 
-#: classes/feeds.php:53
-msgid "View as RSS feed"
-msgstr "Toon als RSS feed"
+#: 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."
 
-#: classes/feeds.php:62
-#, php-format
-msgid "Last updated: %s"
-msgstr "Laatst geüpdatet: %s"
+#: classes/dlg.php:44
+msgid "Your Public OPML URL is:"
+msgstr "Uw publieke OPML URL is:"
 
-#: classes/feeds.php:100
-#, fuzzy
-msgid "Select..."
-msgstr "Selecteer"
+#: classes/dlg.php:53
+#: classes/dlg.php:178
+#: plugins/share/init.php:125
+msgid "Generate new URL"
+msgstr "Genereer nieuwe URL"
 
-#: classes/feeds.php:104
-msgid "Invert"
-msgstr "Omkeren"
+#: classes/dlg.php:67
+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 "De update daemon is ingeschakeld in de configuratie, maar het achtergrondproces loopt niet. Dit voorkomt dat alle feeds wordt bijgewerkt. Start het achtergrondproces of contacteer de eigenaar van deze instantie."
 
-#: classes/feeds.php:107
-msgid "Selection toggle:"
-msgstr "Selectie schakelaar:"
+#: classes/dlg.php:71
+#: classes/dlg.php:80
+msgid "Last update:"
+msgstr "Laatste update:"
 
-#: classes/feeds.php:113
-msgid "Selection:"
-msgstr "Selectie:"
+#: classes/dlg.php:76
+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 "De update daemon neemt te veel tijd om een feed bij te werken. Dit kan betekenen dat het proces is gescrashed of hangt. Controleer het achtergrondproces of contacteer de eigenaar van deze instantie."
 
-#: classes/feeds.php:116
-msgid "Set score"
-msgstr "Geef score"
+#: classes/dlg.php:169
+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/feeds.php:119
-msgid "Archive"
-msgstr "Archiveer"
-
-#: classes/feeds.php:121
-msgid "Move back"
-msgstr "Terugzetten"
-
-#: classes/feeds.php:127
-#: classes/feeds.php:132
-#: plugins/mail/init.php:76
-#: plugins/mailto/init.php:25
-msgid "Forward by email"
-msgstr "Doorsturen per e-mail"
-
-#: classes/feeds.php:136
-msgid "Feed:"
-msgstr "Feed:"
-
-#: classes/feeds.php:193
-#: classes/feeds.php:819
-msgid "Feed not found."
-msgstr "Feed niet gevonden."
-
-#: classes/feeds.php:255
-msgid "Never"
-msgstr "Nooit"
-
-#: classes/feeds.php:342
-#, php-format
-msgid "Imported at %s"
-msgstr "Geïmporteerd op %s"
-
-#: classes/feeds.php:394
-#: classes/feeds.php:487
-#, fuzzy
-msgid "mark feed as read"
-msgstr "Markeer alle feeds als gelezen"
-
-#: classes/feeds.php:542
-msgid "Collapse article"
-msgstr "Artikel inklappen"
-
-#: classes/feeds.php:703
-msgid "No unread articles found to display."
-msgstr "Er zijn geen ongelezen artikelen gevonden om weer te geven."
-
-#: classes/feeds.php:706
-msgid "No updated articles found to display."
-msgstr "Geen bijgewerkte artikelen gevonden om weer te geven."
-
-#: classes/feeds.php:709
-msgid "No starred articles found to display."
-msgstr "Er zijn geen artikelen met ster gevonden om weer te geven."
-
-#: classes/feeds.php:713
-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:715
-msgid "No articles found to display."
-msgstr "Geen artikelen gevonden om weer te geven."
-
-#: classes/feeds.php:731
-#: classes/feeds.php:922
-#, php-format
-msgid "Feeds last updated at %s"
-msgstr "Feeds laatst bijgewerkt op %s"
-
-#: classes/feeds.php:743
-#: classes/feeds.php:934
-msgid "Some feeds have update errors (click for details)"
-msgstr "Sommige feeds hebben update fouten (klik voor details)"
-
-#: classes/feeds.php:911
-msgid "No feed selected."
-msgstr "Geen feeds geselecteerd."
-
-#: classes/feeds.php:975
-#: classes/feeds.php:983
-msgid "Feed or site URL"
-msgstr "Feed of website URL"
-
-#: classes/feeds.php:997
-msgid "Available feeds"
-msgstr "Beschikbare feeds"
-
-#: classes/feeds.php:1034
-msgid "More feeds"
-msgstr "Meer feeds"
-
-#: classes/feeds.php:1063
-msgid "Popular feeds"
-msgstr "Populaire feeds"
-
-#: classes/feeds.php:1064
-msgid "Feed archive"
-msgstr "Feed archief"
-
-#: classes/feeds.php:1067
-msgid "limit:"
-msgstr "beperking:"
-
-#: classes/feeds.php:1101
-msgid "Look for"
-msgstr "Zoek naar"
-
-#: classes/feeds.php:1109
-#, php-format
-msgid "in %s"
+#: classes/dlg.php:190
+msgid "You are using default tt-rss password. Please change it in the Preferences (Personal data / Authentication)."
 msgstr ""
 
-#: classes/feeds.php:1114
-msgid "Used for word stemming"
+#: classes/dlg.php:194
+#, fuzzy
+msgid "Open Preferences"
+msgstr "Voorkeuren"
+
+#: classes/opml.php:31
+#: classes/opml.php:36
+msgid "OPML Utility"
+msgstr "OPML hulpprogramma"
+
+#: classes/opml.php:40
+msgid "Importing OPML..."
+msgstr "OPML aan 't importeren…"
+
+#: classes/opml.php:45
+msgid "Return to preferences"
+msgstr "Terug naar voorkeuren"
+
+#: classes/opml.php:301
+#, php-format
+msgid "Adding feed: %s"
+msgstr "Feed toevoegen: %s"
+
+#: classes/opml.php:312
+#, php-format
+msgid "Duplicate feed: %s"
+msgstr "Dubbele feed: %s"
+
+#: classes/opml.php:326
+#, php-format
+msgid "Adding label %s"
+msgstr "Toevoegen label %s"
+
+#: classes/opml.php:329
+#, php-format
+msgid "Duplicate label: %s"
+msgstr "Dubbele label: %s"
+
+#: classes/opml.php:341
+#, php-format
+msgid "Setting preference key %s to %s"
+msgstr "Instellen voorkeursleutel %s op %s"
+
+#: classes/opml.php:377
+msgid "Adding filter..."
+msgstr "Filter toevoegen..."
+
+#: classes/opml.php:512
+#, php-format
+msgid "Processing category: %s"
+msgstr "Verwerken categorie: %s"
+
+#: classes/opml.php:558
+#, php-format
+msgid "Upload failed with error code %d"
+msgstr "Upload mislukt met fout nummer %d"
+
+#: classes/opml.php:570
+#: plugins/import_export/init.php:471
+msgid "Unable to move uploaded file."
+msgstr "Kan het geüploade bestand niet verplaatsen."
+
+#: classes/opml.php:574
+#: plugins/import_export/init.php:475
+msgid "Error: please upload OPML file."
+msgstr "Fout: OPML bestand uploaden aub."
+
+#: classes/opml.php:585
+msgid "Error: unable to find moved OPML file."
+msgstr "Fout: kan het verplaatste OPML bestand niet vinden."
+
+#: classes/opml.php:594
+msgid "Error while parsing document."
+msgstr "Fout bij het parsen van het document."
+
+#: classes/article.php:26
+msgid "Article not found."
+msgstr "Artikel niet gevonden."
+
+#: classes/article.php:211
+msgid "Tags for this article (separated by commas):"
+msgstr "Tags voor dit artikel (komma gescheiden):"
+
+#: classes/article.php:337
+#: classes/article.php:719
+#: classes/article.php:874
+msgid "no tags"
+msgstr "geen tags"
+
+#: classes/article.php:447
+msgid "unknown type"
+msgstr "onbekend type"
+
+#: classes/article.php:524
+msgid "Attachments"
+msgstr "Bijlagen"
+
+#: classes/article.php:688
+msgid " - "
+msgstr " - "
+
+#: classes/article.php:912
+msgid "(edit note)"
+msgstr "(bewerk notitie)"
+
+#: classes/handler/public.php:407
+#: plugins/bookmarklets/init.php:40
+msgid "Share with Tiny Tiny RSS"
+msgstr "Deel met Tiny Tiny RSS"
+
+#: classes/handler/public.php:415
+msgid "Title:"
+msgstr "Titel:"
+
+#: classes/handler/public.php:419
+msgid "Content:"
+msgstr "Inhoud:"
+
+#: classes/handler/public.php:421
+msgid "Labels:"
+msgstr "Labels:"
+
+#: classes/handler/public.php:440
+msgid "Shared article will appear in the Published feed."
+msgstr "Gedeeld artikel zal verschijnen in de Gepubliceerd feed."
+
+#: classes/handler/public.php:442
+msgid "Share"
+msgstr "Delen"
+
+#: classes/handler/public.php:464
+msgid "Not logged in"
+msgstr "Niet ingelogd"
+
+#: classes/handler/public.php:527
+msgid "Incorrect username or password"
+msgstr "Onjuiste gebruikersnaam of wachtwoord"
+
+#: classes/handler/public.php:581
+#, php-format
+msgid "Already subscribed to <b>%s</b>."
+msgstr "Reeds geabonneerd op <b>%s</b>."
+
+#: classes/handler/public.php:584
+#, php-format
+msgid "Subscribed to <b>%s</b>."
+msgstr "Geabonneerd op  <b>%s</b>."
+
+#: classes/handler/public.php:587
+#, php-format
+msgid "Could not subscribe to <b>%s</b>."
+msgstr "Kon niet abonneren op  <b>%s</b>."
+
+#: classes/handler/public.php:590
+#, php-format
+msgid "No feeds found in <b>%s</b>."
+msgstr "Geen feeds gevonden in <b>%s</b>."
+
+#: classes/handler/public.php:593
+msgid "Multiple feed URLs found."
+msgstr "Meerdere feed-URL's gevonden."
+
+#: classes/handler/public.php:597
+#, 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:615
+msgid "Subscribe to selected feed"
+msgstr "Abonneren op de geselecteerde feed"
+
+#: classes/handler/public.php:642
+msgid "Edit subscription options"
+msgstr "Bewerk abonnement opties"
+
+#: classes/handler/public.php:680
+msgid "Password recovery"
+msgstr "Wachtwoordherstel"
+
+#: classes/handler/public.php:725
+#, 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:757
+msgid "Some of the required form parameters are missing or incorrect."
+msgstr "Sommige vereiste velden ontbreken of zijn onjuist."
+
+#: classes/handler/public.php:761
+#: classes/handler/public.php:830
+msgid "Go back"
+msgstr "Ga terug"
+
+#: classes/handler/public.php:799
+#, fuzzy
+msgid "[tt-rss] Password reset request"
+msgstr "[tt-rss] Melding verandering van wachtwoord"
+
+#: 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: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:874
+msgid "Database Updater"
+msgstr "Database updater"
+
+#: classes/handler/public.php:939
+msgid "Perform updates"
+msgstr "Voor de updates uit"
+
+#: plugins/af_zz_imgproxy/init.php:208
+msgid "Image proxy settings (af_zz_imgproxy)"
 msgstr ""
 
-#: classes/feeds.php:1123
+#: plugins/af_zz_imgproxy/init.php:232
 #, fuzzy
-msgid "Search syntax"
-msgstr "Zoeken"
+msgid "Enable proxy for all remote images."
+msgstr "Inschakelen feed categorieën"
 
-#: classes/feeds.php:1577
-msgid "Starred articles"
-msgstr "Artikelen met ster"
+#: plugins/af_zz_imgproxy/init.php:236
+#, fuzzy
+msgid "Don't cache files locally."
+msgstr "Afbeelding lokaal in cache plaatsen"
 
-#: classes/feeds.php:1579
-msgid "Published articles"
-msgstr "Gepubliceerde artikelen"
-
-#: classes/feeds.php:1581
-msgid "Fresh articles"
-msgstr "Nieuwe artikelen"
-
-#: classes/feeds.php:1585
-msgid "Archived articles"
-msgstr "Gearchiveerde artikelen"
-
-#: classes/feeds.php:1587
-msgid "Recently read"
-msgstr "Recent gelezen"
-
-#: classes/feeds.php:1708
-msgid "Special"
-msgstr "Speciaal"
-
-#: classes/feeds.php:1965
-#, php-format
-msgid "Search results: %s"
-msgstr "Zoekresultaten: %s"
-
-#: 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."
+#: plugins/af_zz_imgproxy/init.php:252
+#: plugins/af_redditimgur/init.php:79
+#, fuzzy
+msgid "Configuration saved"
 msgstr "Configuratie opgeslagen."
 
-#: plugins/note/init.php:28
-#: plugins/note/note.js:11
-msgid "Edit article note"
-msgstr "Bewerk artikel notitie"
-
 #: plugins/vf_shared/init.php:17
 #: plugins/vf_shared/init.php:73
 #, fuzzy
 msgid "Shared articles"
 msgstr "Artikelen met ster"
 
-#: plugins/auth_internal/init.php:67
-msgid "Please enter your one time password:"
-msgstr "Geef aub uw eenmalig wachtwoord:"
+#: plugins/bookmarklets/init.php:20
+msgid "Bookmarklets"
+msgstr "Bookmarklets"
 
-#: plugins/auth_internal/init.php:208
-msgid "Password has been changed."
-msgstr "Wachtwoord is veranderd."
+#: 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 "Sleep de link hieronder naar uw browser's werkbalk, open de feed waar u geïnteresseerd in bent in uw browser en klik op de link om u er op te abonneren."
 
-#: plugins/auth_internal/init.php:210
-msgid "Old password is incorrect."
-msgstr "Oud wachtwoord is onjuist."
+#: plugins/bookmarklets/init.php:26
+#, php-format
+msgid "Subscribe to %s in Tiny Tiny RSS?"
+msgstr "Abonneren op %s in Tiny Tiny RSS?"
 
-#: plugins/af_readability/init.php:25
-msgid "Data saved."
-msgstr ""
+#: plugins/bookmarklets/init.php:31
+msgid "Subscribe in Tiny Tiny RSS"
+msgstr "Abonneren in Tiny Tiny RSS"
 
-#: plugins/af_readability/init.php:41
-#, fuzzy
-msgid "Inline content"
-msgstr "Bewerk artikel notitie"
-
-#: plugins/af_readability/init.php:47
-msgid "Readability settings (af_readability)"
-msgstr ""
-
-#: plugins/af_readability/init.php:78
-msgid "Use Readability for pages shared via bookmarklet."
-msgstr ""
-
-#: plugins/af_readability/init.php:90
-#: plugins/af_psql_trgm/init.php:198
-msgid "Currently enabled for (click to edit):"
-msgstr ""
-
-#: plugins/af_readability/init.php:107
-#, fuzzy
-msgid "Readability"
-msgstr "Controleer beschikbaarheid"
-
-#: plugins/af_readability/init.php:118
-#, fuzzy
-msgid "Inline article content"
-msgstr "Bewerk artikel notitie"
+#: plugins/bookmarklets/init.php:34
+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_redditimgur/init.php:30
 msgid "Reddit content settings (af_redditimgur)"
@@ -2518,11 +2486,21 @@ msgstr ""
 msgid "Enable additional duplicate checking"
 msgstr ""
 
-#: plugins/af_redditimgur/init.php:79
-#: plugins/af_zz_imgproxy/init.php:252
-#, fuzzy
-msgid "Configuration saved"
-msgstr "Configuratie opgeslagen."
+#: plugins/af_comics/init.php:49
+msgid "Feeds supported by af_comics"
+msgstr ""
+
+#: plugins/af_comics/init.php:51
+msgid "The following comics are currently supported:"
+msgstr ""
+
+#: plugins/af_comics/init.php:69
+msgid "To subscribe to GoComics use the comic's regular web page as the feed URL (e.g. for the <em>Garfield</em> comic use <code>http://www.gocomics.com/garfield</code>)."
+msgstr ""
+
+#: plugins/af_comics/init.php:71
+msgid "Drop any updated filters into <code>filters.local</code> in plugin directory."
+msgstr ""
 
 #: plugins/af_psql_trgm/init.php:29
 #, php-format
@@ -2562,25 +2540,86 @@ msgstr ""
 msgid "Enable for all feeds:"
 msgstr "Inschakelen feed categorieën"
 
+#: plugins/af_psql_trgm/init.php:198
+#: plugins/af_readability/init.php:90
+msgid "Currently enabled for (click to edit):"
+msgstr ""
+
 #: plugins/af_psql_trgm/init.php:216
 msgid "Similarity (pg_trgm)"
 msgstr ""
 
-#: plugins/af_comics/init.php:49
-msgid "Feeds supported by af_comics"
+#: plugins/af_readability/init.php:25
+msgid "Data saved."
 msgstr ""
 
-#: plugins/af_comics/init.php:51
-msgid "The following comics are currently supported:"
+#: plugins/af_readability/init.php:41
+#, fuzzy
+msgid "Inline content"
+msgstr "Bewerk artikel notitie"
+
+#: plugins/af_readability/init.php:47
+msgid "Readability settings (af_readability)"
 msgstr ""
 
-#: plugins/af_comics/init.php:69
-msgid "To subscribe to GoComics use the comic's regular web page as the feed URL (e.g. for the <em>Garfield</em> comic use <code>http://www.gocomics.com/garfield</code>)."
+#: plugins/af_readability/init.php:78
+msgid "Use Readability for pages shared via bookmarklet."
 msgstr ""
 
-#: plugins/af_comics/init.php:71
-msgid "Drop any updated filters into <code>filters.local</code> in plugin directory."
-msgstr ""
+#: plugins/af_readability/init.php:107
+#, fuzzy
+msgid "Readability"
+msgstr "Controleer beschikbaarheid"
+
+#: plugins/af_readability/init.php:118
+#, fuzzy
+msgid "Inline article content"
+msgstr "Bewerk artikel notitie"
+
+#: plugins/mailto/init.php:50
+#: plugins/mailto/init.php:58
+#: plugins/mail/init.php:118
+#: plugins/mail/init.php:124
+msgid "[Forwarded]"
+msgstr "[Doorgestuurd]"
+
+#: plugins/mailto/init.php:50
+#: plugins/mail/init.php:118
+msgid "Multiple articles"
+msgstr "Meerdere artikelen"
+
+#: plugins/mailto/init.php:74
+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/mailto/init.php:78
+msgid "Forward selected article(s) by email."
+msgstr "Geselecteerde artikel(en) doorsturen per e-mail."
+
+#: plugins/mailto/init.php:81
+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/mailto/init.php:86
+msgid "Close this dialog"
+msgstr "Sluit dit dialoogvenster"
+
+#: 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/import_export/init.php:53
 msgid "Import and export"
@@ -2649,102 +2688,6 @@ msgstr "Upload mislukt met fout nummer %d"
 msgid "No file uploaded."
 msgstr "Geen bestand geupload."
 
-#: plugins/mail/init.php:29
-msgid "Mail addresses saved."
-msgstr ""
-
-#: plugins/mail/init.php:35
-#, fuzzy
-msgid "Mail plugin"
-msgstr "Gebruiker's plug-ins"
-
-#: plugins/mail/init.php:37
-msgid "You can set predefined email addressed here (comma-separated list):"
-msgstr ""
-
-#: plugins/mail/init.php:118
-#: plugins/mail/init.php:124
-#: plugins/mailto/init.php:50
-#: plugins/mailto/init.php:58
-msgid "[Forwarded]"
-msgstr "[Doorgestuurd]"
-
-#: plugins/mail/init.php:118
-#: plugins/mailto/init.php:50
-msgid "Multiple articles"
-msgstr "Meerdere artikelen"
-
-#: plugins/mail/init.php:146
-msgid "To:"
-msgstr "Naar:"
-
-#: plugins/mail/init.php:161
-msgid "Subject:"
-msgstr "Onderwerp:"
-
-#: plugins/mail/init.php:178
-msgid "Send e-mail"
-msgstr "Verzend e-mail"
-
-#: plugins/close_button/init.php:25
-msgid "Close article"
-msgstr "Sluit artikel"
-
-#: plugins/bookmarklets/init.php:20
-msgid "Bookmarklets"
-msgstr "Bookmarklets"
-
-#: plugins/bookmarklets/init.php:22
-msgid "Drag the link below to your browser toolbar, open the feed you're interested in in your browser and click on the link to subscribe to it."
-msgstr "Sleep de link hieronder naar uw browser's werkbalk, open de feed waar u geïnteresseerd in bent in uw browser en klik op de link om u er op te abonneren."
-
-#: plugins/bookmarklets/init.php:26
-#, php-format
-msgid "Subscribe to %s in Tiny Tiny RSS?"
-msgstr "Abonneren op %s in Tiny Tiny RSS?"
-
-#: plugins/bookmarklets/init.php:31
-msgid "Subscribe in Tiny Tiny RSS"
-msgstr "Abonneren in Tiny Tiny RSS"
-
-#: plugins/bookmarklets/init.php:34
-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/toggle_sidebar/init.php:23
-msgid "Collapse feedlist"
-msgstr "Feedlijst inklappen"
-
-#: plugins/af_zz_imgproxy/init.php:208
-msgid "Image proxy settings (af_zz_imgproxy)"
-msgstr ""
-
-#: plugins/af_zz_imgproxy/init.php:232
-#, fuzzy
-msgid "Enable proxy for all remote images."
-msgstr "Inschakelen feed categorieën"
-
-#: plugins/af_zz_imgproxy/init.php:236
-#, fuzzy
-msgid "Don't cache files locally."
-msgstr "Afbeelding lokaal in cache plaatsen"
-
-#: plugins/mailto/init.php:74
-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/mailto/init.php:78
-msgid "Forward selected article(s) by email."
-msgstr "Geselecteerde artikel(en) doorsturen per e-mail."
-
-#: plugins/mailto/init.php:81
-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/mailto/init.php:86
-msgid "Close this dialog"
-msgstr "Sluit dit dialoogvenster"
-
 #: plugins/share/init.php:41
 msgid "You can disable all articles shared by unique URLs here."
 msgstr "U kunt alle artikelen gedeeld via unieke URL's hier uitschakelen."
@@ -2766,454 +2709,605 @@ msgstr "U kunt dit artikel delen via de volgende unieke URL:"
 msgid "Unshare article"
 msgstr "Ster weghalen bij artikel"
 
-#: js/FeedTree.js:75
+#: plugins/toggle_sidebar/init.php:23
+msgid "Collapse feedlist"
+msgstr "Feedlijst inklappen"
+
+#: plugins/close_button/init.php:25
+msgid "Close article"
+msgstr "Sluit artikel"
+
+#: plugins/mail/init.php:29
+msgid "Mail addresses saved."
+msgstr ""
+
+#: plugins/mail/init.php:35
+#, fuzzy
+msgid "Mail plugin"
+msgstr "Gebruiker's plug-ins"
+
+#: plugins/mail/init.php:37
+msgid "You can set predefined email addressed here (comma-separated list):"
+msgstr ""
+
+#: plugins/mail/init.php:146
+msgid "To:"
+msgstr "Naar:"
+
+#: plugins/mail/init.php:161
+msgid "Subject:"
+msgstr "Onderwerp:"
+
+#: plugins/mail/init.php:178
+msgid "Send e-mail"
+msgstr "Verzend e-mail"
+
+#: plugins/note/init.php:28
+#: plugins/note/note.js:11
+msgid "Edit article note"
+msgstr "Bewerk artikel notitie"
+
+#: plugins/auth_internal/init.php:67
+msgid "Please enter your one time password:"
+msgstr "Geef aub uw eenmalig wachtwoord:"
+
+#: plugins/auth_internal/init.php:208
+msgid "Password has been changed."
+msgstr "Wachtwoord is veranderd."
+
+#: plugins/auth_internal/init.php:210
+msgid "Old password is incorrect."
+msgstr "Oud wachtwoord is onjuist."
+
+#: js/FeedTree.js:76
 #, fuzzy
 msgid "(Un)collapse"
 msgstr "Uit/Inklappen zijbalk"
 
-#: js/PrefFeedTree.js:35
+#: js/PrefFeedTree.js:36
 msgid "Edit category"
 msgstr "Bewerk categorie"
 
-#: js/PrefFeedTree.js:42
+#: js/PrefFeedTree.js:43
 msgid "Remove category"
 msgstr "Categorie verwijderen"
 
-#: js/PrefFilterTree.js:46
+#: js/PrefFilterTree.js:47
 msgid "Inverse"
 msgstr "Omgekeerd"
 
-#: js/feedlist.js:511
+#: js/feedlist.js:461
 #, 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:514
+#: js/feedlist.js:464
 #, 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:517
+#: js/feedlist.js:467
 #, 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:520
+#: js/feedlist.js:470
 #, fuzzy
 msgid "Mark %w in %s as read?"
 msgstr "Markeer alle artikelen in %s als gelezen?"
 
-#: js/feedlist.js:523
+#: js/feedlist.js:473
 #, fuzzy
 msgid "search results"
 msgstr "Zoekresultaten: %s"
 
-#: js/feedlist.js:523
+#: js/feedlist.js:473
 #, fuzzy
 msgid "all articles"
 msgstr "Alle artikelen"
 
-#: js/functions.js:74
+#: js/functions.js:100
 msgid "Close"
 msgstr ""
 
-#: js/functions.js:141
+#: js/functions.js:167
 msgid "Click to close"
 msgstr "Klik om te sluiten"
 
-#: js/functions.js:448
+#: js/functions.js:456
 msgid "Error explained"
 msgstr "Fout uitleg"
 
-#: js/functions.js:592
+#: js/functions.js:490
+msgid "Upload complete."
+msgstr "Upload voltooid."
+
+#: js/functions.js:508
+msgid "Remove stored feed icon?"
+msgstr "Opgeslagen feed pictogram verwijderen?"
+
+#: js/functions.js:510
+msgid "Removing feed icon..."
+msgstr "Opgeslagen feed pictogram verwijderen..."
+
+#: js/functions.js:515
+msgid "Feed icon removed."
+msgstr "Feed pictogram verwijderd."
+
+#: js/functions.js:532
+msgid "Please select an image file to upload."
+msgstr "Selecteer aub een afbeeldingsbestand om te uploaden."
+
+#: js/functions.js:533
+msgid "Upload new icon for this feed?"
+msgstr "Nieuw pictogram voor deze feed uploaden?"
+
+#: js/functions.js:534
+msgid "Uploading, please wait..."
+msgstr "Aan 't uploaden, even wachten aub..."
+
+#: js/functions.js:542
+msgid "Please enter label caption:"
+msgstr "Geeft een onderschrift voor label:"
+
+#: js/functions.js:575
 msgid "Subscribe to Feed"
 msgstr "Abonneren op feed"
 
-#: js/functions.js:621
+#: js/functions.js:602
 msgid "Failed to parse output. This can indicate server timeout and/or network issues. Backend output was logged to browser console."
 msgstr ""
 
-#: js/functions.js:636
+#: js/functions.js:617
 #, perl-format
 msgid "Subscribed to %s"
 msgstr "Geabonneerd op %s"
 
-#: js/functions.js:641
+#: js/functions.js:622
 msgid "Specified URL seems to be invalid."
 msgstr "Gespecificeerde URL lijkt ongeldig te zijn."
 
-#: js/functions.js:644
+#: js/functions.js:625
 msgid "Specified URL doesn't seem to contain any feeds."
 msgstr "Gespecificeerde URL lijkt geen feeds te bevatten."
 
-#: js/functions.js:656
+#: js/functions.js:637
 msgid "Expand to select feed"
 msgstr "Uitklappen tot geselecteerde feed"
 
-#: js/functions.js:668
+#: js/functions.js:649
 #, perl-format
 msgid "Couldn't download the specified URL: %s"
 msgstr "Kon de gespecificeerde URL: %s niet downloaden"
 
-#: js/functions.js:672
+#: js/functions.js:653
 #, perl-format
 msgid "XML validation failed: %s"
 msgstr "XML validatie mislukt: %s"
 
-#: js/functions.js:676
+#: js/functions.js:657
 msgid "You are already subscribed to this feed."
 msgstr "U bent al geabonneerd op deze feed."
 
-#: js/functions.js:1136
+#: js/functions.js:1098
 msgid "Generate new syndication address for this feed?"
 msgstr "Nieuw syndicatie-adres voor deze feed genereren?"
 
-#: js/functions.js:1140
-#: js/prefs.js:1095
+#: js/functions.js:1100
+#: js/prefs.js:870
 msgid "Trying to change address..."
 msgstr "Adres aan het aanpassen..."
 
-#: js/functions.js:1245
-#: js/tt-rss.js:446
-#: js/tt-rss.js:673
+#: js/functions.js:1199
+#: js/tt-rss.js:399
+#: js/tt-rss.js:612
 msgid "You can't edit this kind of feed."
 msgstr "U kunt dit type feed niet bewerken."
 
-#: js/functions.js:1260
+#: js/functions.js:1213
 msgid "Edit Feed"
 msgstr "Bewerk feed"
 
-#: js/functions.js:1266
-#: js/prefs.js:100
-#: js/prefs.js:209
-#: js/prefs.js:647
+#: js/functions.js:1217
+#: js/prefs.js:176
+#: js/prefs.js:523
+#: js/prefs.js:1139
+#: js/prefs.js:78
 msgid "Saving data..."
 msgstr "Gegevens opslaan..."
 
-#: js/functions.js:1293
+#: js/functions.js:1243
 msgid "More Feeds"
 msgstr "Meer feeds"
 
-#: js/functions.js:1355
-#: js/functions.js:1464
-#: js/prefs.js:398
-#: js/prefs.js:540
-#: js/prefs.js:558
-#: js/prefs.js:1077
+#: js/functions.js:1297
+#: js/functions.js:1383
+#: js/prefs.js:332
+#: js/prefs.js:455
+#: js/prefs.js:473
+#: js/prefs.js:855
 msgid "No feeds are selected."
 msgstr "Er zijn geen feeds geselecteerd."
 
-#: js/functions.js:1398
+#: js/functions.js:1329
 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:1435
+#: js/functions.js:1360
 msgid "Feeds with update errors"
 msgstr "Feeds met update fouten"
 
-#: js/functions.js:1446
-#: js/prefs.js:1058
+#: js/functions.js:1369
+#: js/prefs.js:841
 msgid "Remove selected feeds?"
 msgstr "Geselecteerde feeds verwijderen?"
 
-#: js/functions.js:1449
-#: js/prefs.js:1061
+#: js/functions.js:1370
+#: js/prefs.js:842
 msgid "Removing selected feeds..."
 msgstr "Geselecteerde feeds verwijderen..."
 
-#: js/prefs.js:60
-msgid "Please enter login:"
-msgstr "Geef loginID aub:"
-
-#: js/prefs.js:67
-msgid "Can't create user: no login specified."
-msgstr "Kan gebruiker niet aanmaken: geen loginID gespecificeerd."
-
-#: js/prefs.js:71
-msgid "Adding user..."
-msgstr "Gebruiker toevoegen..."
-
-#: js/prefs.js:96
-msgid "User Editor"
-msgstr "Gebruikers bewerken"
-
-#: js/prefs.js:131
-msgid "Edit Filter"
-msgstr "Bewerk filter"
-
-#: js/prefs.js:170
+#: js/prefs.js:143
 msgid "Remove filter?"
 msgstr "Filter verwijderen?"
 
-#: js/prefs.js:175
+#: js/prefs.js:148
 msgid "Removing filter..."
 msgstr "Filter verwijderen..."
 
-#: js/prefs.js:292
+#: js/prefs.js:251
 msgid "Remove selected labels?"
 msgstr "Geselecteerde labels verwijderen?"
 
-#: js/prefs.js:295
+#: js/prefs.js:252
 msgid "Removing selected labels..."
 msgstr "Geselecteerde labels verwijderen..."
 
-#: js/prefs.js:308
-#: js/prefs.js:1144
+#: js/prefs.js:262
+#: js/prefs.js:909
 msgid "No labels are selected."
 msgstr "Er zijn geen labels geselecteerd."
 
-#: js/prefs.js:320
+#: js/prefs.js:274
 msgid "Remove selected users? Neither default admin nor your account will be removed."
 msgstr "Geselecteerde gebruikers verwijderen? Noch de standaard admin gebruiker, noch uw eigen account zal worden verwijderd."
 
-#: js/prefs.js:323
+#: js/prefs.js:275
 msgid "Removing selected users..."
 msgstr "Geselecteerde gebruikers verwijderen..."
 
-#: js/prefs.js:338
-#: js/prefs.js:408
-#: js/prefs.js:427
-#: js/prefs.js:461
+#: js/prefs.js:286
+#: js/prefs.js:342
+#: js/prefs.js:361
+#: js/prefs.js:387
 msgid "No users are selected."
 msgstr "Er zijn geen gebruikers geselecteerd."
 
-#: js/prefs.js:350
+#: js/prefs.js:297
 msgid "Remove selected filters?"
 msgstr "Geselecteerde filters verwijderen?"
 
-#: js/prefs.js:353
+#: js/prefs.js:298
 msgid "Removing selected filters..."
 msgstr "Geselecteerde filters verwijderen..."
 
-#: js/prefs.js:366
-#: js/prefs.js:495
-#: js/prefs.js:514
+#: js/prefs.js:308
+#: js/prefs.js:419
+#: js/prefs.js:438
 msgid "No filters are selected."
 msgstr "Er zijn geen filters geselecteerd."
 
-#: js/prefs.js:378
+#: js/prefs.js:319
 msgid "Unsubscribe from selected feeds?"
 msgstr "Abonnement opzeggen voor geselecteerde feeds?"
 
-#: js/prefs.js:382
+#: js/prefs.js:321
 msgid "Unsubscribing from selected feeds..."
 msgstr "Abonnement opzeggen voor geselecteerde feeds..."
 
-#: js/prefs.js:413
-#: js/prefs.js:432
-#: js/prefs.js:466
+#: js/prefs.js:347
+#: js/prefs.js:366
+#: js/prefs.js:392
 msgid "Please select only one user."
 msgstr "Selecteer aub slechts één gebruiker."
 
-#: js/prefs.js:436
+#: js/prefs.js:370
 msgid "Reset password of selected user?"
 msgstr "Wachtwoord van geselecteerde gebruiker opnieuw instellen?"
 
-#: js/prefs.js:439
+#: js/prefs.js:371
 msgid "Resetting password for selected user..."
 msgstr "Wachtwoord van geselecteerde gebruiker opnieuw instellen..."
 
-#: js/prefs.js:500
+#: js/prefs.js:424
 msgid "Please select only one filter."
 msgstr "Selecteer aub slecht één filter."
 
-#: js/prefs.js:518
+#: js/prefs.js:442
 msgid "Combine selected filters?"
 msgstr "Geselecteerde filters combineren?"
 
-#: js/prefs.js:521
+#: js/prefs.js:443
 msgid "Joining filters..."
 msgstr "Filters samenvoegen..."
 
-#: js/prefs.js:580
+#: js/prefs.js:487
 msgid "Edit Multiple Feeds"
 msgstr "Bewerk meervoudige feeds"
 
-#: js/prefs.js:604
+#: js/prefs.js:511
 msgid "Save changes to selected feeds?"
 msgstr "Veranderingen aan geselecteerde feeds opslaan?"
 
-#: js/prefs.js:681
+#: js/prefs.js:552
 msgid "OPML Import"
 msgstr "OPML import"
 
-#: js/prefs.js:700
+#: js/prefs.js:571
 msgid "Please choose an OPML file first."
 msgstr "kies eerst een OPML-bestand aub."
 
-#: js/prefs.js:703
+#: js/prefs.js:574
 #: plugins/import_export/import_export.js:115
 msgid "Importing, please wait..."
 msgstr "Aan 't importeren, even wachten aub..."
 
-#: js/prefs.js:869
+#: js/prefs.js:737
 msgid "Reset to defaults?"
 msgstr "Terugzetten naar de standaardwaarden?"
 
-#: js/prefs.js:1468
-msgid "Subscribing to feeds..."
-msgstr "Abonneren op feeds..."
+#: js/prefs.js:777
+#, perl-format
+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:1487
-msgid "Clear stored data for this plugin?"
-msgstr "Wis opgeslagen data voor deze plug-in?"
+#: js/prefs.js:778
+msgid "Removing category..."
+msgstr "Categorie verwijderen..."
 
-#: js/prefs.js:1501
-msgid "Clear all messages in the error log?"
-msgstr ""
+#: js/prefs.js:794
+msgid "Remove selected categories?"
+msgstr "Geselecteerde categorieën verwijderen?"
 
-#: js/tt-rss.js:118
+#: js/prefs.js:795
+msgid "Removing selected categories..."
+msgstr "Geselecteerde categorieën verwijderen..."
+
+#: js/prefs.js:805
+msgid "No categories are selected."
+msgstr "Geen categorieën geselecteerd."
+
+#: js/prefs.js:812
+msgid "Category title:"
+msgstr "Categorie titel:"
+
+#: js/prefs.js:815
+msgid "Creating category..."
+msgstr "Aanmaken categorie…"
+
+#: js/prefs.js:832
+msgid "Feeds without recent updates"
+msgstr "Feeds zonder recente updates"
+
+#: js/prefs.js:869
+msgid "Replace current OPML publishing address with a new one?"
+msgstr "Huidig OPML publicatieadres vervangen door een nieuwe?"
+
+#: js/prefs.js:898
+msgid "Reset selected labels to default colors?"
+msgstr "Geselecteerd label naar de standaard kleur terugzetten?"
+
+#: js/prefs.js:926
+msgid "Settings Profiles"
+msgstr "Instellingsprofielen"
+
+#: js/prefs.js:935
+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:936
+msgid "Removing selected profiles..."
+msgstr "Geselecteerde profielen verwijderen..."
+
+#: js/prefs.js:948
+msgid "No profiles are selected."
+msgstr "Er zijn geen profielen geselecteerd."
+
+#: js/prefs.js:955
+#: js/prefs.js:997
+msgid "Activate selected profile?"
+msgstr "Geselecteerd profiel activeren?"
+
+#: js/prefs.js:964
+#: js/prefs.js:1008
+msgid "Please choose a profile to activate."
+msgstr "Kies een te activeren profiel aub."
+
+#: js/prefs.js:969
+msgid "Creating profile..."
+msgstr "Profiel aanmaken..."
+
+#: js/prefs.js:1016
+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:1017
+#: plugins/share/share_prefs.js:3
+msgid "Clearing URLs..."
+msgstr "URLs opruimen..."
+
+#: js/prefs.js:1020
+msgid "Generated URLs cleared."
+msgstr "Genereerde URLs gewist."
+
+#: js/prefs.js:1053
+#, fuzzy
+msgid "Rename category to:"
+msgstr "Categorie verwijderen"
+
+#: js/prefs.js:1074
+msgid "Label Editor"
+msgstr "Label editor"
+
+#: js/tt-rss.js:111
 msgid "Mark all articles as read?"
 msgstr "Markeer alle artikelen als gelezen?"
 
-#: js/tt-rss.js:124
+#: js/tt-rss.js:115
 msgid "Marking all feeds as read..."
 msgstr "Alle feeds als gelezen markeren..."
 
-#: js/tt-rss.js:398
+#: js/tt-rss.js:351
 msgid "Please enable mail plugin first."
 msgstr "Eerst de e-mail plug-in inschakelen aub."
 
-#: js/tt-rss.js:527
+#: js/tt-rss.js:477
 msgid "Please enable embed_original plugin first."
 msgstr "Eerst embed_original plug-in inschakelen aub."
 
-#: js/tt-rss.js:540
-#: js/tt-rss.js:723
+#: js/tt-rss.js:490
+#: js/tt-rss.js:653
 msgid "Widescreen is not available in combined mode."
 msgstr ""
 
-#: js/tt-rss.js:821
-msgid "You can't rescore this kind of feed."
-msgstr "U kunt dit type feed geen andere score geven."
-
-#: js/tt-rss.js:826
-#: js/tt-rss.js:686
-msgid "Please select some feed first."
-msgstr "Selecteer aub eerst een feed."
-
-#: js/tt-rss.js:831
-#, perl-format
-msgid "Rescore articles in %s?"
-msgstr "Artikelen in %s opnieuw een score geven?"
-
-#: js/tt-rss.js:834
-msgid "Rescoring articles..."
-msgstr "Artikelen nieuwe score geven..."
-
-#: js/viewfeed.js:917
-#: js/viewfeed.js:955
-#: js/viewfeed.js:1003
-#: js/viewfeed.js:1924
-#: plugins/mail/mail.js:7
+#: js/viewfeed.js:444
+#: js/viewfeed.js:461
+#: js/viewfeed.js:484
+#: js/viewfeed.js:521
+#: js/viewfeed.js:542
+#: js/viewfeed.js:651
+#: js/viewfeed.js:685
+#: js/viewfeed.js:727
+#: js/viewfeed.js:1564
 #: plugins/mailto/init.js:7
-#: js/viewfeed.js:675
-#: js/viewfeed.js:697
-#: js/viewfeed.js:718
-#: js/viewfeed.js:777
-#: js/viewfeed.js:805
+#: plugins/mail/mail.js:7
 msgid "No articles are selected."
 msgstr "Geen artikelen geselecteerd."
 
-#: js/viewfeed.js:925
+#: js/viewfeed.js:659
 #, 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:927
+#: js/viewfeed.js:661
 #, 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:964
+#: js/viewfeed.js:694
 #, 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:967
+#: js/viewfeed.js:697
 #, 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:969
+#: js/viewfeed.js:698
 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:1009
+#: js/viewfeed.js:733
 #, 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:1029
+#: js/viewfeed.js:753
 msgid "Edit article Tags"
 msgstr "Bewerk artikel tags"
 
-#: js/viewfeed.js:1035
+#: js/viewfeed.js:757
 msgid "Saving article tags..."
 msgstr "Artikel tags opslaan..."
 
-#: js/viewfeed.js:1666
+#: js/viewfeed.js:1015
+msgid "No article is selected."
+msgstr "Geen artikel geselecteerd."
+
+#: js/viewfeed.js:1050
+msgid "No articles found to mark"
+msgstr "Geen artikelen gevonden om te markeren"
+
+#: js/viewfeed.js:1052
+#, perl-format
+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?"
+
+#: js/viewfeed.js:1312
 msgid "Open original article"
 msgstr "Open origineel artikel"
 
-#: js/viewfeed.js:1673
+#: js/viewfeed.js:1319
 msgid "Display article URL"
 msgstr "Toon artikel URL"
 
-#: js/viewfeed.js:1780
+#: js/viewfeed.js:1426
 msgid "Assign label"
 msgstr "Labels toevoegen"
 
-#: js/viewfeed.js:1785
+#: js/viewfeed.js:1431
 msgid "Remove label"
 msgstr "Label verwijderen"
 
-#: js/viewfeed.js:1817
+#: js/viewfeed.js:1463
 #, fuzzy
 msgid "Select articles in group"
 msgstr "Selecteer artikel onder de cursor"
 
-#: js/viewfeed.js:1827
+#: js/viewfeed.js:1473
 #, fuzzy
 msgid "Mark group as read"
 msgstr "Markeren als gelezen"
 
-#: js/viewfeed.js:1839
+#: js/viewfeed.js:1485
 #, fuzzy
 msgid "Mark feed as read"
 msgstr "Markeer alle feeds als gelezen"
 
-#: js/viewfeed.js:1892
+#: js/viewfeed.js:1538
 msgid "Please enter new score for selected articles:"
 msgstr "Geef aub een nieuwe score voor de geselecteerde artikelen:"
 
-#: js/viewfeed.js:1955
+#: js/viewfeed.js:1571
 msgid "Please enter new score for this article:"
 msgstr "Geef aub een nieuwe score voor dit artikel:"
 
-#: js/viewfeed.js:1986
+#: js/viewfeed.js:1591
 msgid "Article URL:"
 msgstr "Artikel URL:"
 
-#: plugins/note/note.js:17
-msgid "Saving article note..."
-msgstr "Artikel notitie opslaan..."
+#: 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/af_psql_trgm/init.js:11
 #, fuzzy
 msgid "Related articles"
 msgstr "Verwijder artikel"
 
+#: plugins/mailto/init.js:21
+#: plugins/mail/mail.js:21
+msgid "Forward article by email"
+msgstr "Artikel doorsturen per e-mail"
+
+#: plugins/shorten_expanded/init.js:43
+#, fuzzy
+msgid "Click to expand article"
+msgstr "Klik om artikel uit te klappen."
+
 #: plugins/import_export/import_export.js:13
 msgid "Export Data"
 msgstr "Data exporteren"
@@ -3233,266 +3327,176 @@ 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
-msgid "Forward article by email"
-msgstr "Artikel doorsturen per e-mail"
+#: plugins/share/share_prefs.js:2
+msgid "This will invalidate all previously shared article URLs. Continue?"
+msgstr "Dit zal all eerder gedeelde artikel-URL's ongeldig maken. Doorgaan?"
 
-#: plugins/mail/mail.js:36
-msgid "Error sending email:"
-msgstr ""
-
-#: plugins/mail/mail.js:38
-#, fuzzy
-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:45
-#, fuzzy
-msgid "Click to expand article"
-msgstr "Klik om artikel uit te klappen."
+#: plugins/share/share_prefs.js:8
+msgid "Shared URLs cleared."
+msgstr "Gedeelde URLs opgeruimd."
 
 #: plugins/share/share.js:10
 msgid "Share article by URL"
 msgstr "Deel artikel via URL"
 
-#: plugins/share/share.js:14
+#: plugins/share/share.js:13
 #, fuzzy
 msgid "Generate new share URL for this article?"
 msgstr "Geef aub een nieuwe score voor dit artikel:"
 
-#: plugins/share/share.js:18
+#: plugins/share/share.js:15
 #, fuzzy
 msgid "Trying to change URL..."
 msgstr "Adres aan het aanpassen..."
 
-#: plugins/share/share.js:55
+#: plugins/share/share.js:48
 #, fuzzy
 msgid "Remove sharing for this article?"
 msgstr "Bewerk tags voor dit artikel"
 
-#: plugins/share/share.js:59
+#: plugins/share/share.js:50
 #, fuzzy
 msgid "Trying to unshare..."
 msgstr "Adres aan het aanpassen..."
 
-#: plugins/share/share_prefs.js:3
-msgid "This will invalidate all previously shared article URLs. Continue?"
-msgstr "Dit zal all eerder gedeelde artikel-URL's ongeldig maken. Doorgaan?"
+#: plugins/mail/mail.js:30
+msgid "Error sending email:"
+msgstr ""
 
-#: plugins/share/share_prefs.js:6
-#: js/prefs.js:1277
-msgid "Clearing URLs..."
-msgstr "URLs opruimen..."
+#: plugins/mail/mail.js:32
+#, fuzzy
+msgid "Your message has been sent."
+msgstr "Uw persoonlijke gegevens zijn opgeslagen."
 
-#: plugins/share/share_prefs.js:13
-msgid "Shared URLs cleared."
-msgstr "Gedeelde URLs opgeruimd."
+#: plugins/note/note.js:15
+msgid "Saving article note..."
+msgstr "Artikel notitie opslaan..."
 
-#: js/feedlist.js:204
+#: js/feedlist.js:168
 #, fuzzy
 msgid "Your password is at default value"
 msgstr "Uw wachtwoord staat op de standaard waarde. Verander het aub."
 
-#: js/feedlist.js:453
+#: js/feedlist.js:413
 msgid "Mark all articles in %s as read?"
 msgstr "Markeer alle artikelen in %s als gelezen?"
 
-#: js/functions.js:494
-msgid "Upload complete."
-msgstr "Upload voltooid."
-
-#: js/functions.js:511
-msgid "Remove stored feed icon?"
-msgstr "Opgeslagen feed pictogram verwijderen?"
-
-#: js/functions.js:516
-msgid "Removing feed icon..."
-msgstr "Opgeslagen feed pictogram verwijderen..."
-
-#: js/functions.js:521
-msgid "Feed icon removed."
-msgstr "Feed pictogram verwijderd."
-
-#: js/functions.js:537
-msgid "Please select an image file to upload."
-msgstr "Selecteer aub een afbeeldingsbestand om te uploaden."
-
-#: js/functions.js:539
-msgid "Upload new icon for this feed?"
-msgstr "Nieuw pictogram voor deze feed uploaden?"
-
-#: js/functions.js:540
-msgid "Uploading, please wait..."
-msgstr "Aan 't uploaden, even wachten aub..."
-
-#: js/functions.js:550
-msgid "Please enter label caption:"
-msgstr "Geeft een onderschrift voor label:"
-
-#: js/functions.js:555
-msgid "Can't create label: missing caption."
-msgstr "Kan label niet aanmaken: onderschrift ontbreekt."
-
-#: js/functions.js:797
+#: js/functions.js:764
 msgid "Edit rule"
 msgstr "Bewerk regel"
 
-#: js/functions.js:819
+#: js/functions.js:786
 msgid "Edit action"
 msgstr "Bewerk actie"
 
-#: js/functions.js:860
+#: js/functions.js:825
 msgid "Looking for articles (%d processed, %f found)..."
 msgstr ""
 
-#: js/functions.js:890
+#: js/functions.js:855
 #, fuzzy
 msgid "Found %d articles matching this filter:"
 msgstr "Artikelen volgens dit filter:"
 
-#: js/functions.js:942
+#: js/functions.js:907
 msgid "Create Filter"
 msgstr "Filter aanmaken"
 
-#: js/functions.js:1060
-#: js/tt-rss.js:692
+#: js/functions.js:1016
+#: js/tt-rss.js:631
 msgid "Unsubscribe from %s?"
 msgstr "Abonnement opzeggen voor %s?"
 
-#: js/functions.js:1063
+#: js/functions.js:1019
 msgid "Removing feed..."
 msgstr "Feed wordt verwijderd..."
 
-#: js/functions.js:1489
+#: js/functions.js:1410
 msgid "Help"
 msgstr "Help"
 
-#: js/prefs.js:973
-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:44
+msgid "Please enter login:"
+msgstr "Geef loginID aub:"
 
-#: js/prefs.js:979
-msgid "Removing category..."
-msgstr "Categorie verwijderen..."
+#: js/prefs.js:51
+msgid "Can't create user: no login specified."
+msgstr "Kan gebruiker niet aanmaken: geen loginID gespecificeerd."
 
-#: js/prefs.js:997
-msgid "Remove selected categories?"
-msgstr "Geselecteerde categorieën verwijderen?"
+#: js/prefs.js:55
+msgid "Adding user..."
+msgstr "Gebruiker toevoegen..."
 
-#: js/prefs.js:1000
-msgid "Removing selected categories..."
-msgstr "Geselecteerde categorieën verwijderen..."
+#: js/prefs.js:74
+msgid "User Editor"
+msgstr "Gebruikers bewerken"
 
-#: js/prefs.js:1013
-msgid "No categories are selected."
-msgstr "Geen categorieën geselecteerd."
+#: js/prefs.js:104
+msgid "Edit Filter"
+msgstr "Bewerk filter"
 
-#: js/prefs.js:1020
-msgid "Category title:"
-msgstr "Categorie titel:"
+#: js/prefs.js:1175
+msgid "Subscribing to feeds..."
+msgstr "Abonneren op feeds..."
 
-#: js/prefs.js:1024
-msgid "Creating category..."
-msgstr "Aanmaken categorie…"
+#: js/prefs.js:1191
+msgid "Clear stored data for this plugin?"
+msgstr "Wis opgeslagen data voor deze plug-in?"
 
-#: js/prefs.js:1047
-msgid "Feeds without recent updates"
-msgstr "Feeds zonder recente updates"
+#: js/prefs.js:1203
+msgid "Clear all messages in the error log?"
+msgstr ""
 
-#: js/prefs.js:1091
-msgid "Replace current OPML publishing address with a new one?"
-msgstr "Huidig OPML publicatieadres vervangen door een nieuwe?"
-
-#: js/prefs.js:1129
-msgid "Reset selected labels to default colors?"
-msgstr "Geselecteerd label naar de standaard kleur terugzetten?"
-
-#: js/prefs.js:1161
-msgid "Settings Profiles"
-msgstr "Instellingsprofielen"
-
-#: js/prefs.js:1170
-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:1173
-msgid "Removing selected profiles..."
-msgstr "Geselecteerde profielen verwijderen..."
-
-#: js/prefs.js:1189
-msgid "No profiles are selected."
-msgstr "Er zijn geen profielen geselecteerd."
-
-#: js/prefs.js:1197
-#: js/prefs.js:1250
-msgid "Activate selected profile?"
-msgstr "Geselecteerd profiel activeren?"
-
-#: js/prefs.js:1214
-#: js/prefs.js:1266
-msgid "Please choose a profile to activate."
-msgstr "Kies een te activeren profiel aub."
-
-#: js/prefs.js:1219
-msgid "Creating profile..."
-msgstr "Profiel aanmaken..."
-
-#: js/prefs.js:1274
-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:1284
-msgid "Generated URLs cleared."
-msgstr "Genereerde URLs gewist."
-
-#: js/prefs.js:1356
-msgid "Label Editor"
-msgstr "Label editor"
-
-#: js/tt-rss.js:681
+#: js/tt-rss.js:620
 msgid "You can't unsubscribe from the category."
 msgstr "U kunt het abonnementen niet opzeggen in deze categorie."
 
-#: js/viewfeed.js:127
-#: js/viewfeed.js:177
-#: js/viewfeed.js:194
+#: js/tt-rss.js:625
+msgid "Please select some feed first."
+msgstr "Selecteer aub eerst een feed."
+
+#: js/viewfeed.js:89
+#: js/viewfeed.js:135
+#: js/viewfeed.js:152
 #, fuzzy
 msgid "Click to open next unread feed."
 msgstr "Klik om feed te bewerken"
 
-#: js/viewfeed.js:131
+#: js/viewfeed.js:93
 msgid "Cancel search"
 msgstr "Zoeken annuleren"
 
-#: js/viewfeed.js:191
+#: js/viewfeed.js:149
 #, fuzzy
 msgid "New articles found, reload feed to continue."
 msgstr "Geen artikelen gevonden om weer te geven."
 
-#: js/viewfeed.js:620
+#: js/viewfeed.js:405
 msgid "%d article selected"
 msgid_plural "%d articles selected"
 msgstr[0] "%d artikel geselecteerd"
 msgstr[1] "%d artikelen geselecteerd"
 
-#: js/viewfeed.js:1284
-msgid "No article is selected."
-msgstr "Geen artikel geselecteerd."
+#~ msgid "Rescore feed"
+#~ msgstr "Feed opnieuw score geven"
 
-#: js/viewfeed.js:1319
-msgid "No articles found to mark"
-msgstr "Geen artikelen gevonden om te markeren"
+#~ msgid "Create label..."
+#~ msgstr "Label aanmaken…"
 
-#: js/viewfeed.js:1321
-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 "Create filter..."
+#~ msgstr "Filter aanmaken…"
+
+#~ msgid "You can't rescore this kind of feed."
+#~ msgstr "U kunt dit type feed geen andere score geven."
+
+#~ msgid "Rescore articles in %s?"
+#~ msgstr "Artikelen in %s opnieuw een score geven?"
+
+#~ msgid "Rescoring articles..."
+#~ msgstr "Artikelen nieuwe score geven..."
+
+#~ msgid "Can't create label: missing caption."
+#~ msgstr "Kan label niet aanmaken: onderschrift ontbreekt."
 
 #~ msgid "Firefox integration"
 #~ msgstr "Firefox integratie"
diff --git a/locale/pl_PL/LC_MESSAGES/messages.mo b/locale/pl_PL/LC_MESSAGES/messages.mo
index 98710da9c..f28c15333 100644
Binary files a/locale/pl_PL/LC_MESSAGES/messages.mo and b/locale/pl_PL/LC_MESSAGES/messages.mo differ
diff --git a/locale/pl_PL/LC_MESSAGES/messages.po b/locale/pl_PL/LC_MESSAGES/messages.po
index a99d53e9e..e83294336 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: 2018-10-10 08:24+0300\n"
+"POT-Creation-Date: 2018-12-01 12:59+0300\n"
 "PO-Revision-Date: 2013-08-02 08:25+0100\n"
 "Last-Translator: Mirosław Lach <m.wordpress@lach.waw.pl>\n"
 "Language-Team: \n"
@@ -96,8 +96,8 @@ msgid "Weekly"
 msgstr "Cotygodniowo"
 
 #: backend.php:103
-#: classes/pref/users.php:47
 #: classes/pref/system.php:51
+#: classes/pref/users.php:47
 msgid "User"
 msgstr "Użytkownik"
 
@@ -169,33 +169,33 @@ msgstr "Użytkownik nie został odnaleziony"
 
 #: index.php:151
 #: index.php:167
-#: index.php:285
+#: index.php:282
 #: prefs.php:120
 #: classes/backend.php:5
 #: classes/pref/labels.php:294
-#: classes/pref/feeds.php:1230
 #: classes/pref/filters.php:822
-#: js/feedlist.js:148
-#: js/feedlist.js:491
-#: js/feedlist.js:539
-#: js/functions.js:314
-#: js/functions.js:1336
-#: js/prefs.js:562
-#: js/prefs.js:754
-#: js/prefs.js:1488
-#: js/prefs.js:1503
-#: js/tt-rss.js:547
-#: js/viewfeed.js:1180
+#: classes/pref/feeds.php:1229
+#: js/feedlist.js:118
+#: js/feedlist.js:446
+#: js/feedlist.js:487
+#: js/functions.js:328
+#: js/functions.js:551
+#: js/functions.js:1286
+#: js/prefs.js:477
+#: js/prefs.js:617
+#: js/prefs.js:956
+#: js/prefs.js:1000
+#: js/prefs.js:1028
+#: js/prefs.js:1037
+#: js/prefs.js:1045
+#: js/prefs.js:1057
+#: js/tt-rss.js:497
+#: js/viewfeed.js:509
+#: js/viewfeed.js:928
 #: plugins/import_export/import_export.js:17
-#: js/functions.js:565
-#: js/prefs.js:1200
-#: js/prefs.js:1253
-#: js/prefs.js:1292
-#: js/prefs.js:1305
-#: js/prefs.js:1316
-#: js/prefs.js:1331
-#: js/tt-rss.js:564
-#: js/viewfeed.js:760
+#: js/prefs.js:1192
+#: js/prefs.js:1205
+#: js/tt-rss.js:510
 msgid "Loading, please wait..."
 msgstr "Trwa ładowanie, proszę czekać..."
 
@@ -212,13 +212,13 @@ msgid "All Articles"
 msgstr "Wszystkie artykuły"
 
 #: index.php:194
-#: include/functions.php:1227
+#: include/functions.php:1172
 #: classes/feeds.php:110
 msgid "Starred"
 msgstr "Oznaczone gwiazdką"
 
 #: index.php:195
-#: include/functions.php:1228
+#: include/functions.php:1173
 #: classes/feeds.php:111
 msgid "Published"
 msgstr "Opublikowane"
@@ -258,11 +258,11 @@ msgid "Title"
 msgstr "Tytuł"
 
 #: index.php:211
-#: index.php:251
-#: include/functions.php:1215
+#: index.php:250
+#: include/functions.php:1160
 #: classes/feeds.php:115
-#: js/FeedTree.js:41
-#: js/FeedTree.js:69
+#: js/FeedTree.js:42
+#: js/FeedTree.js:70
 msgid "Mark as read"
 msgstr "Oznacz jako przeczytane"
 
@@ -299,7 +299,7 @@ msgid "Feed actions:"
 msgstr "Działania dla kanałów:"
 
 #: index.php:246
-#: classes/handler/public.php:551
+#: classes/handler/public.php:575
 msgid "Subscribe to feed..."
 msgstr "Prenumeruj kanał..."
 
@@ -308,56 +308,44 @@ msgid "Edit this feed..."
 msgstr "Edytuj ten kanał..."
 
 #: index.php:248
-msgid "Rescore feed"
-msgstr "Przelicz punktację kanału"
-
-#: index.php:249
-#: classes/pref/feeds.php:770
-#: classes/pref/feeds.php:1203
-#: js/PrefFeedTree.js:61
+#: classes/pref/feeds.php:769
+#: classes/pref/feeds.php:1202
+#: js/PrefFeedTree.js:62
 msgid "Unsubscribe"
 msgstr "Wypisz się"
 
-#: index.php:250
+#: index.php:249
 msgid "All feeds:"
 msgstr "Wszystkie kanały:"
 
-#: index.php:252
+#: index.php:251
 msgid "(Un)hide read feeds"
 msgstr "Pokaż/Ukryj przeczytane kanały"
 
-#: index.php:253
+#: index.php:252
 msgid "Other actions:"
 msgstr "Inne działania:"
 
-#: index.php:254
-#: include/functions.php:1201
+#: index.php:253
+#: include/functions.php:1146
 msgid "Toggle widescreen mode"
 msgstr "Przełącz tryb szerokoekranowy"
 
-#: index.php:255
-msgid "Create label..."
-msgstr "Utwórz etykietę..."
-
-#: index.php:256
-msgid "Create filter..."
-msgstr "Utwórz filtr..."
-
-#: index.php:257
+#: index.php:254
 msgid "Keyboard shortcuts help"
 msgstr "O skrótach klawiszowych"
 
-#: index.php:266
+#: index.php:263
 msgid "Logout"
 msgstr "Wyloguj"
 
-#: index.php:272
+#: index.php:269
 msgid "Updates are available from Git."
 msgstr ""
 
 #: prefs.php:33
 #: prefs.php:138
-#: include/functions.php:1230
+#: include/functions.php:1175
 #: classes/pref/prefs.php:425
 msgid "Preferences"
 msgstr "Ustawienia"
@@ -372,8 +360,8 @@ msgstr "Wyjdź z ustawień"
 
 #: prefs.php:141
 #: classes/pref/feeds.php:114
-#: classes/pref/feeds.php:1138
-#: classes/pref/feeds.php:1192
+#: classes/pref/feeds.php:1137
+#: classes/pref/feeds.php:1191
 msgid "Feeds"
 msgstr "Kanały"
 
@@ -383,8 +371,8 @@ msgid "Filters"
 msgstr "Filtry"
 
 #: prefs.php:147
+#: classes/feeds.php:1696
 #: classes/pref/labels.php:94
-#: classes/feeds.php:1710
 msgid "Labels"
 msgstr "Etykiety"
 
@@ -396,80 +384,80 @@ msgstr "Użytkowników"
 msgid "System"
 msgstr "Systemowe"
 
-#: register.php:186
+#: register.php:185
 #: include/login_form.php:162
 msgid "Create new account"
 msgstr "Utwórz nowe konto"
 
-#: register.php:192
+#: register.php:191
 msgid "New user registrations are administratively disabled."
 msgstr "Rejestracja nowych użytkowników został zablokowana przez administratora."
 
-#: register.php:196
-#: register.php:241
-#: register.php:254
-#: register.php:269
-#: register.php:288
-#: register.php:336
-#: register.php:346
-#: register.php:358
-#: classes/handler/public.php:623
-#: classes/handler/public.php:697
-#: classes/handler/public.php:798
-#: classes/handler/public.php:877
-#: classes/handler/public.php:891
-#: classes/handler/public.php:898
-#: classes/handler/public.php:923
+#: register.php:195
+#: register.php:240
+#: register.php:253
+#: register.php:268
+#: register.php:287
+#: register.php:334
+#: register.php:344
+#: register.php:356
+#: classes/handler/public.php:647
+#: classes/handler/public.php:721
+#: 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"
 
-#: register.php:217
+#: register.php:216
 msgid "Your temporary password will be sent to the specified email. Accounts, which were not logged in once, are erased automatically 24 hours after temporary password is sent."
 msgstr "Twoje tymczasowe hasło zostanie wysłane na podany adres email. Konta, na które  nikt nie zalogował się, są usuwane automatycznie 24 godziny po wysłaniu hasła tymczasowego."
 
-#: register.php:223
+#: register.php:222
 msgid "Desired login:"
 msgstr "Pożądana nazwa użytkownika:"
 
-#: register.php:226
+#: register.php:225
 msgid "Check availability"
 msgstr "Sprawdź dostępność"
 
-#: register.php:228
-#: classes/handler/public.php:713
+#: register.php:227
+#: classes/handler/public.php:737
 msgid "Email:"
 msgstr "Email:"
 
-#: register.php:231
-#: classes/handler/public.php:718
+#: register.php:230
+#: classes/handler/public.php:742
 msgid "How much is two plus two:"
 msgstr "Ile wynosi dwa plus dwa:"
 
-#: register.php:234
+#: register.php:233
 msgid "Submit registration"
 msgstr "Zarejestruj się"
 
-#: register.php:252
+#: register.php:251
 msgid "Your registration information is incomplete."
 msgstr "Wprowadzone informacje są niekompletne."
 
-#: register.php:267
+#: register.php:266
 msgid "Sorry, this username is already taken."
 msgstr "Niestety, ta nazwa użytkownika jest już zajęta."
 
-#: register.php:286
+#: register.php:285
 msgid "Registration failed."
 msgstr "Rejestracja nie powiodła się."
 
-#: register.php:333
+#: register.php:331
 msgid "Account created successfully."
 msgstr "Konto zostało założone."
 
-#: register.php:355
+#: register.php:353
 msgid "New user registrations are currently closed."
 msgstr "Możliwość rejestracji jest obecnie wyłączona."
 
-#: update.php:66
+#: update.php:67
 msgid "Tiny Tiny RSS data update script."
 msgstr "Skrypt aktualizacji danych Tiny Tiny RSS."
 
@@ -482,10 +470,10 @@ msgstr "Wszystkie kanały"
 
 #: include/controls.php:138
 #: include/controls.php:230
-#: classes/opml.php:512
-#: classes/digest.php:120
+#: classes/digest.php:124
+#: classes/feeds.php:1708
 #: classes/pref/feeds.php:233
-#: classes/feeds.php:1722
+#: classes/opml.php:512
 msgid "Uncategorized"
 msgstr "Bez kategorii"
 
@@ -501,287 +489,287 @@ msgstr[2] "%d zarchiwizowanych artykułów"
 msgid "No feeds found."
 msgstr "Nie znaleziono kanałów."
 
-#: include/functions.php:983
+#: include/functions.php:928
 #, php-format
 msgid "%d min"
 msgstr ""
 
-#: include/functions.php:1177
+#: include/functions.php:1122
 msgid "Navigation"
 msgstr "Nawigacja"
 
-#: include/functions.php:1178
+#: include/functions.php:1123
 msgid "Open next feed"
 msgstr "Przejdź do następnego kanału"
 
-#: include/functions.php:1179
+#: include/functions.php:1124
 msgid "Open previous feed"
 msgstr "Otwórz poprzedni kanał"
 
-#: include/functions.php:1180
+#: include/functions.php:1125
 msgid "Open next article"
 msgstr "Otwórz następny artykuł"
 
-#: include/functions.php:1181
+#: include/functions.php:1126
 msgid "Open previous article"
 msgstr "Otwórz poprzedni artykuł"
 
-#: include/functions.php:1182
+#: include/functions.php:1127
 msgid "Open next article (don't scroll long articles)"
 msgstr "Otwórz następny artykuł (nie przewijaj długich artykułów)"
 
-#: include/functions.php:1183
+#: include/functions.php:1128
 msgid "Open previous article (don't scroll long articles)"
 msgstr "Otwórz poprzeni artykuł (nie przewijaj długich artykułów)"
 
-#: include/functions.php:1184
+#: include/functions.php:1129
 msgid "Move to next article (don't expand or mark read)"
 msgstr "Otwórz następny artykuł (nie rozszerzaj lub oznaczaj jako przeczytane)"
 
-#: include/functions.php:1185
+#: include/functions.php:1130
 msgid "Move to previous article (don't expand or mark read)"
 msgstr "Otwórz poprzeni artykuł (nie rozszerzaj lub oznaczaj jako przeczytane)"
 
-#: include/functions.php:1186
+#: include/functions.php:1131
 msgid "Show search dialog"
 msgstr "Otwórz okno wyszukiwania"
 
-#: include/functions.php:1187
+#: include/functions.php:1132
 msgid "Article"
 msgstr "Artykuł"
 
-#: include/functions.php:1188
-#: js/viewfeed.js:1695
+#: include/functions.php:1133
+#: js/viewfeed.js:1341
 msgid "Toggle starred"
 msgstr "Przełącz oznaczenie gwiazdką"
 
-#: include/functions.php:1189
-#: js/viewfeed.js:1707
+#: include/functions.php:1134
+#: js/viewfeed.js:1353
 msgid "Toggle published"
 msgstr "Przełącz flagę publikacji"
 
-#: include/functions.php:1190
-#: js/viewfeed.js:1682
+#: include/functions.php:1135
+#: js/viewfeed.js:1328
 msgid "Toggle unread"
 msgstr "Przełącz flagę \"przeczytano\""
 
-#: include/functions.php:1191
+#: include/functions.php:1136
 msgid "Edit tags"
 msgstr "Edytuj tagi"
 
-#: include/functions.php:1192
+#: include/functions.php:1137
 msgid "Open in new window"
 msgstr "Otwórz w nowym oknie"
 
-#: include/functions.php:1193
-#: js/viewfeed.js:1728
+#: include/functions.php:1138
+#: js/viewfeed.js:1374
 msgid "Mark below as read"
 msgstr "Oznacz poniższe jako przeczytane"
 
-#: include/functions.php:1194
-#: js/viewfeed.js:1721
+#: include/functions.php:1139
+#: js/viewfeed.js:1367
 msgid "Mark above as read"
 msgstr "Oznacz powyższe jako przeczytane"
 
-#: include/functions.php:1195
+#: include/functions.php:1140
 msgid "Scroll down"
 msgstr "Przewiń w dół"
 
-#: include/functions.php:1196
+#: include/functions.php:1141
 msgid "Scroll up"
 msgstr "Przewiń do góry"
 
-#: include/functions.php:1197
+#: include/functions.php:1142
 msgid "Select article under cursor"
 msgstr "Wybierz artykuł pod kursorem"
 
-#: include/functions.php:1198
+#: include/functions.php:1143
 msgid "Email article"
 msgstr "Prześlij artykuł emailem"
 
-#: include/functions.php:1199
+#: include/functions.php:1144
 msgid "Close/collapse article"
 msgstr "Zamknij/zwiń artykuł"
 
-#: include/functions.php:1200
+#: include/functions.php:1145
 msgid "Toggle article expansion (combined mode)"
 msgstr "Przełącz rozszerzanie artykułów (tryb scalony)"
 
-#: include/functions.php:1202
+#: include/functions.php:1147
 #: plugins/embed_original/init.php:33
 msgid "Toggle embed original"
 msgstr "Przełącza flagę \"wbuduj oryginalny artykuł\""
 
-#: include/functions.php:1203
+#: include/functions.php:1148
 msgid "Article selection"
 msgstr "Wybór artykułów"
 
-#: include/functions.php:1204
+#: include/functions.php:1149
 msgid "Select all articles"
 msgstr "Wybierz wszystkie artykuły"
 
-#: include/functions.php:1205
+#: include/functions.php:1150
 msgid "Select unread"
 msgstr "Wybierz nieprzeczytane"
 
-#: include/functions.php:1206
+#: include/functions.php:1151
 msgid "Select starred"
 msgstr "Wybierz oznaczone gwiazdką"
 
-#: include/functions.php:1207
+#: include/functions.php:1152
 msgid "Select published"
 msgstr "Wybierz opublikowane"
 
-#: include/functions.php:1208
+#: include/functions.php:1153
 msgid "Invert selection"
 msgstr "Odwróć zaznaczenie"
 
-#: include/functions.php:1209
+#: include/functions.php:1154
 msgid "Deselect everything"
 msgstr "Odznacz wszystko"
 
-#: include/functions.php:1210
-#: classes/pref/feeds.php:522
-#: classes/pref/feeds.php:794
+#: include/functions.php:1155
+#: classes/pref/feeds.php:521
+#: classes/pref/feeds.php:793
 msgid "Feed"
 msgstr "Kanał"
 
-#: include/functions.php:1211
+#: include/functions.php:1156
 msgid "Refresh current feed"
 msgstr "Odśwież bieżący kanał"
 
-#: include/functions.php:1212
+#: include/functions.php:1157
 msgid "Un/hide read feeds"
 msgstr "Pokaż/Ukryj przeczytane kanały"
 
-#: include/functions.php:1213
-#: classes/pref/feeds.php:1195
+#: include/functions.php:1158
+#: classes/pref/feeds.php:1194
 msgid "Subscribe to feed"
 msgstr "Prenumeruj kanał"
 
-#: include/functions.php:1214
-#: js/FeedTree.js:48
-#: js/PrefFeedTree.js:55
-#: js/viewfeed.js:1846
+#: include/functions.php:1159
+#: js/FeedTree.js:49
+#: js/PrefFeedTree.js:56
+#: js/viewfeed.js:1492
 msgid "Edit feed"
 msgstr "Edytuj kanał"
 
-#: include/functions.php:1216
+#: include/functions.php:1161
 msgid "Reverse headlines"
 msgstr "Odwróć kolejność nagłówków"
 
-#: include/functions.php:1217
+#: include/functions.php:1162
 msgid "Toggle headline grouping"
 msgstr ""
 
-#: include/functions.php:1218
+#: include/functions.php:1163
 msgid "Debug feed update"
 msgstr "Testuj aktualizację kanałów"
 
-#: include/functions.php:1219
+#: include/functions.php:1164
 #, fuzzy
 msgid "Debug viewfeed()"
 msgstr "Testuj aktualizację kanałów"
 
-#: include/functions.php:1220
-#: js/FeedTree.js:97
+#: include/functions.php:1165
+#: js/FeedTree.js:98
 msgid "Mark all feeds as read"
 msgstr "Oznacz wszystkie kanały jako przeczytane"
 
-#: include/functions.php:1221
+#: include/functions.php:1166
 msgid "Un/collapse current category"
 msgstr "Zwiń/rozwiń bieżącą kategorię"
 
-#: include/functions.php:1222
-msgid "Toggle combined mode"
-msgstr "Przełącz tryb scalony"
-
-#: include/functions.php:1223
+#: include/functions.php:1167
 msgid "Toggle auto expand in combined mode"
 msgstr "Przełącz automatyczne rozszerzanie artykułów w trybie scalonym"
 
-#: include/functions.php:1224
+#: include/functions.php:1168
+msgid "Toggle combined mode"
+msgstr "Przełącz tryb scalony"
+
+#: include/functions.php:1169
 msgid "Go to"
 msgstr "Idź do"
 
-#: include/functions.php:1225
-#: classes/feeds.php:1583
+#: include/functions.php:1170
+#: classes/feeds.php:1569
 msgid "All articles"
 msgstr "Wszystkie artykuły"
 
-#: include/functions.php:1226
+#: include/functions.php:1171
 msgid "Fresh"
 msgstr "Świeży"
 
-#: include/functions.php:1229
-#: js/tt-rss.js:491
-#: js/tt-rss.js:660
+#: include/functions.php:1174
+#: js/tt-rss.js:439
+#: js/tt-rss.js:599
 msgid "Tag cloud"
 msgstr "Chmura tagów"
 
-#: include/functions.php:1231
+#: include/functions.php:1176
 msgid "Other"
 msgstr "Inne"
 
-#: include/functions.php:1232
+#: include/functions.php:1177
 #: classes/pref/labels.php:279
 msgid "Create label"
 msgstr "Utwórz etykietę"
 
-#: include/functions.php:1233
+#: include/functions.php:1178
 #: classes/pref/filters.php:801
 msgid "Create filter"
 msgstr "Utwórz filtr"
 
-#: include/functions.php:1234
+#: include/functions.php:1179
 msgid "Un/collapse sidebar"
 msgstr "Zwin/rozwiń pasek boczny"
 
-#: include/functions.php:1235
+#: include/functions.php:1180
 msgid "Show help dialog"
 msgstr "Otwórz okno pomocy"
 
-#: include/functions.php:2582
+#: include/functions.php:2529
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: include/functions.php:2583
+#: include/functions.php:2530
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: include/functions.php:2584
+#: include/functions.php:2531
 msgid "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form"
 msgstr ""
 
-#: include/functions.php:2585
+#: include/functions.php:2532
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: include/functions.php:2586
+#: include/functions.php:2533
 #, fuzzy
 msgid "No file was uploaded"
 msgstr "Nie przesłano żadnego pliku."
 
-#: include/functions.php:2587
+#: include/functions.php:2534
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: include/functions.php:2588
+#: include/functions.php:2535
 msgid "Failed to write file to disk."
 msgstr ""
 
-#: include/functions.php:2589
+#: include/functions.php:2536
 msgid "A PHP extension stopped the file upload."
 msgstr ""
 
 #: include/login_form.php:107
-#: classes/handler/public.php:446
-#: classes/handler/public.php:708
+#: classes/handler/public.php:466
+#: classes/handler/public.php:732
 msgid "Login:"
 msgstr "Nazwa użytkownika:"
 
 #: include/login_form.php:117
-#: classes/handler/public.php:449
+#: classes/handler/public.php:469
 msgid "Password:"
 msgstr "Hasło:"
 
@@ -794,9 +782,9 @@ msgid "Profile:"
 msgstr "Profil:"
 
 #: include/login_form.php:133
-#: classes/handler/public.php:252
 #: classes/pref/prefs.php:1037
 #: classes/rpc.php:69
+#: classes/handler/public.php:272
 msgid "Default profile"
 msgstr "Domyślny profil"
 
@@ -813,210 +801,27 @@ msgid "Remember me"
 msgstr "Pamiętaj mnie"
 
 #: include/login_form.php:159
-#: classes/handler/public.php:454
+#: classes/handler/public.php:474
 msgid "Log in"
 msgstr "Zaloguj"
 
-#: include/sessions.php:46
+#: include/sessions.php:45
 msgid "Session failed to validate (schema version changed)"
 msgstr "Nie powiodła się weryfikacja sesji (zmieniona wersja schematu)"
 
-#: include/sessions.php:62
+#: include/sessions.php:53
+#, fuzzy
+msgid "Session failed to validate (UA changed)."
+msgstr "Nie powiodła się weryfikacja sesji (zmienione hasło)"
+
+#: include/sessions.php:67
 msgid "Session failed to validate (password changed)"
 msgstr "Nie powiodła się weryfikacja sesji (zmienione hasło)"
 
-#: include/sessions.php:69
+#: include/sessions.php:74
 msgid "Session failed to validate (user not found)"
 msgstr "Nie powiodła się weryfikacja sesji (nie znaleziono użytkownika)"
 
-#: classes/article.php:26
-msgid "Article not found."
-msgstr "Artykuł nie został znaleziony."
-
-#: classes/article.php:211
-msgid "Tags for this article (separated by commas):"
-msgstr "Tagi dla tego artykułu (oddzielone przecinkami):"
-
-#: classes/article.php:236
-#: classes/pref/labels.php:82
-#: classes/pref/users.php:103
-#: classes/pref/feeds.php:774
-#: classes/pref/feeds.php:914
-#: classes/pref/filters.php:525
-#: classes/pref/prefs.php:982
-#: plugins/nsfw/init.php:85
-#: plugins/note/init.php:58
-#: plugins/af_readability/init.php:80
-#: plugins/af_redditimgur/init.php:66
-#: plugins/af_psql_trgm/init.php:188
-#: plugins/mail/init.php:65
-#: plugins/af_zz_imgproxy/init.php:238
-msgid "Save"
-msgstr "Zapisz"
-
-#: classes/article.php:238
-#: classes/handler/public.php:423
-#: classes/handler/public.php:457
-#: classes/pref/labels.php:84
-#: classes/pref/users.php:105
-#: classes/pref/feeds.php:775
-#: classes/pref/feeds.php:917
-#: classes/pref/feeds.php:1672
-#: classes/pref/filters.php:528
-#: classes/pref/filters.php:945
-#: classes/pref/filters.php:1022
-#: classes/pref/filters.php:1115
-#: classes/pref/prefs.php:984
-#: classes/feeds.php:1037
-#: classes/feeds.php:1089
-#: classes/feeds.php:1128
-#: plugins/note/init.php:60
-#: plugins/mail/init.php:179
-msgid "Cancel"
-msgstr "Anuluj"
-
-#: classes/article.php:337
-#: classes/article.php:720
-#: classes/article.php:875
-msgid "no tags"
-msgstr "brak tagów"
-
-#: classes/article.php:448
-msgid "unknown type"
-msgstr "nieznany typ"
-
-#: classes/article.php:525
-msgid "Attachments"
-msgstr "Załączniki"
-
-#: classes/article.php:626
-#: classes/feeds.php:661
-#, fuzzy
-msgid "comment"
-msgid_plural "comments"
-msgstr[0] "Komentarze?"
-msgstr[1] "Komentarze?"
-msgstr[2] "Komentarze?"
-
-#: classes/article.php:630
-#: classes/feeds.php:665
-#, fuzzy
-msgid "comments"
-msgstr "Komentarze?"
-
-#: classes/article.php:689
-msgid " - "
-msgstr " - "
-
-#: classes/article.php:730
-#: classes/feeds.php:647
-msgid "Edit tags for this article"
-msgstr "Edytuj tagi dla tego artykułu"
-
-#: classes/article.php:763
-#: classes/feeds.php:602
-msgid "Originally from:"
-msgstr "Oryginał pochodzi z:"
-
-#: classes/article.php:774
-#: classes/pref/feeds.php:539
-#: classes/feeds.php:613
-msgid "Feed URL"
-msgstr "Adres kanału"
-
-#: classes/article.php:811
-#: classes/backend.php:103
-#: classes/dlg.php:33
-#: classes/dlg.php:56
-#: classes/dlg.php:89
-#: classes/dlg.php:154
-#: classes/dlg.php:181
-#: classes/dlg.php:197
-#: classes/pref/feeds.php:1466
-#: classes/pref/feeds.php:1533
-#: classes/pref/filters.php:208
-#: classes/pref/prefs.php:1099
-#: plugins/af_psql_trgm/init.php:109
-#: plugins/import_export/init.php:446
-#: plugins/import_export/init.php:490
-#: plugins/share/init.php:128
-msgid "Close this window"
-msgstr "Zamknij to okno"
-
-#: classes/article.php:913
-msgid "(edit note)"
-msgstr "(edytuj notatkę)"
-
-#: classes/opml.php:31
-#: classes/opml.php:36
-msgid "OPML Utility"
-msgstr "Narzędzie OPML"
-
-#: classes/opml.php:40
-msgid "Importing OPML..."
-msgstr "Importowanie OPML..."
-
-#: classes/opml.php:45
-msgid "Return to preferences"
-msgstr "Wróć do ustawień"
-
-#: classes/opml.php:301
-#, php-format
-msgid "Adding feed: %s"
-msgstr "Dodaję kanał: %s"
-
-#: classes/opml.php:312
-#, php-format
-msgid "Duplicate feed: %s"
-msgstr "Duplikat kanału: %s"
-
-#: classes/opml.php:326
-#, php-format
-msgid "Adding label %s"
-msgstr "Dodaję etykietę %s"
-
-#: classes/opml.php:329
-#, php-format
-msgid "Duplicate label: %s"
-msgstr "Duplikat etykiety: %s"
-
-#: classes/opml.php:341
-#, php-format
-msgid "Setting preference key %s to %s"
-msgstr "Ustawiam wartość parametru %s na %s"
-
-#: classes/opml.php:377
-msgid "Adding filter..."
-msgstr "Dodaję filtr..."
-
-#: classes/opml.php:512
-#, php-format
-msgid "Processing category: %s"
-msgstr "Przetwarzam kategorię: %s"
-
-#: classes/opml.php:558
-#, php-format
-msgid "Upload failed with error code %d"
-msgstr "Przesyłanie pliku zakończone błędem numer %d"
-
-#: classes/opml.php:570
-#: plugins/import_export/init.php:471
-msgid "Unable to move uploaded file."
-msgstr "Nie udało się przenieść przesłanego pliku."
-
-#: classes/opml.php:574
-#: plugins/import_export/init.php:475
-msgid "Error: please upload OPML file."
-msgstr "Błąd: proszę wgrać plik OPML."
-
-#: classes/opml.php:585
-msgid "Error: unable to find moved OPML file."
-msgstr "Błąd: nie udało się przenieść pliku OPML."
-
-#: classes/opml.php:594
-msgid "Error while parsing document."
-msgstr "Błąd przetwarzania dokumentu."
-
 #: 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."
@@ -1037,164 +842,359 @@ msgstr "Ctrl"
 msgid "Help topic not found."
 msgstr "Temat pomocy nie został znaleziony."
 
-#: 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."
+#: classes/backend.php:103
+#: classes/pref/filters.php:208
+#: classes/pref/feeds.php:1465
+#: classes/pref/feeds.php:1532
+#: classes/pref/prefs.php:1099
+#: classes/dlg.php:33
+#: classes/dlg.php:56
+#: classes/dlg.php:89
+#: classes/dlg.php:154
+#: classes/dlg.php:181
+#: classes/dlg.php:197
+#: classes/article.php:810
+#: plugins/af_psql_trgm/init.php:109
+#: plugins/import_export/init.php:446
+#: plugins/import_export/init.php:490
+#: plugins/share/init.php:128
+msgid "Close this window"
+msgstr "Zamknij to okno"
 
-#: classes/dlg.php:44
-msgid "Your Public OPML URL is:"
-msgstr "Twój publiczny adres OPML to:"
+#: classes/feeds.php:53
+msgid "View as RSS feed"
+msgstr "Zobacz jako kanał RSS"
 
-#: classes/dlg.php:53
-#: classes/dlg.php:178
-#: plugins/share/init.php:125
-msgid "Generate new URL"
-msgstr "Wygeneruj nowy adres"
+#: classes/feeds.php:54
+#: classes/feeds.php:140
+#: classes/pref/feeds.php:1326
+msgid "View as RSS"
+msgstr "Wyświetl jako RSS"
 
-#: classes/dlg.php:67
-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 "W konfiguracji wybrano wykorzystywanie zewnętrznego procesu aktualizacji, jednak proces ten nie działa co powoduje iż kanały nie są aktualizowane. Proszę uruchomić zewnętrzny proces aktualizacji lub skontaktować się z właścicielem tej instalacji."
+#: classes/feeds.php:62
+#, php-format
+msgid "Last updated: %s"
+msgstr "Ostatnia aktualizacja: %s"
 
-#: classes/dlg.php:71
-#: classes/dlg.php:80
-msgid "Last update:"
-msgstr "Ostatnia aktualizacja:"
-
-#: classes/dlg.php:76
-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 "Aktualizacja kanału z wykorzystaniem zewnętrznego procesu aktualizacji trwa zbyt długo. Może to wskazywać na jego awarię/unieruchomienie (crash) lub zawieszenie. Sprawdź poprawność działania zewnętrznego procesu aktualizacji lub skontaktuj się z właścicielem tej instalacji."
-
-#: classes/dlg.php:169
-msgid "You can view this feed as RSS using the following URL:"
-msgstr "Możesz obejrzeć ten kanał jako RSS korzystając z adresu:"
-
-#: classes/dlg.php:190
-msgid "You are using default tt-rss password. Please change it in the Preferences (Personal data / Authentication)."
-msgstr ""
-
-#: classes/dlg.php:194
+#: classes/feeds.php:100
 #, fuzzy
-msgid "Open Preferences"
-msgstr "Ustawienia"
+msgid "Select..."
+msgstr "Wybierz"
 
-#: classes/handler/public.php:387
-#: plugins/bookmarklets/init.php:40
-msgid "Share with Tiny Tiny RSS"
-msgstr "Udostępnij za pomocą Tiny Tiny RSS"
+#: classes/feeds.php:102
+#: classes/pref/labels.php:273
+#: classes/pref/filters.php:391
+#: classes/pref/filters.php:449
+#: classes/pref/filters.php:795
+#: classes/pref/filters.php:878
+#: classes/pref/filters.php:905
+#: classes/pref/feeds.php:1185
+#: classes/pref/feeds.php:1416
+#: classes/pref/feeds.php:1481
+#: classes/pref/users.php:358
+#: classes/pref/prefs.php:996
+msgid "All"
+msgstr "Wszystko"
 
-#: classes/handler/public.php:395
-msgid "Title:"
-msgstr "Tytuł:"
+#: classes/feeds.php:104
+msgid "Invert"
+msgstr "Odwróć"
 
-#: classes/handler/public.php:397
-#: classes/pref/feeds.php:537
-msgid "URL:"
-msgstr "Adres:"
+#: classes/feeds.php:105
+#: classes/pref/labels.php:275
+#: classes/pref/filters.php:393
+#: classes/pref/filters.php:451
+#: classes/pref/filters.php:797
+#: classes/pref/filters.php:880
+#: classes/pref/filters.php:907
+#: classes/pref/feeds.php:1187
+#: classes/pref/feeds.php:1418
+#: classes/pref/feeds.php:1483
+#: classes/pref/users.php:360
+#: classes/pref/prefs.php:998
+msgid "None"
+msgstr "Nic"
 
-#: classes/handler/public.php:399
-msgid "Content:"
-msgstr "Treść:"
+#: classes/feeds.php:107
+msgid "Selection toggle:"
+msgstr "Przełącz zaznaczenie:"
 
-#: classes/handler/public.php:401
-msgid "Labels:"
-msgstr "Etykiety:"
+#: classes/feeds.php:113
+msgid "Selection:"
+msgstr "Zaznaczenie:"
 
-#: classes/handler/public.php:420
-msgid "Shared article will appear in the Published feed."
-msgstr "Udostępniany artykuł będzie wyświetlany w Publikowanych kanałach."
+#: classes/feeds.php:116
+msgid "Set score"
+msgstr "Oceń"
 
-#: classes/handler/public.php:422
-msgid "Share"
-msgstr "Udostępnij"
+#: classes/feeds.php:119
+msgid "Archive"
+msgstr "Archiwizuj"
 
-#: classes/handler/public.php:444
-msgid "Not logged in"
-msgstr "Nie zalogowany"
-
-#: classes/handler/public.php:504
-msgid "Incorrect username or password"
-msgstr "Nieprawidłowa nazwa użytkownika lub hasło"
-
-#: classes/handler/public.php:557
-#, php-format
-msgid "Already subscribed to <b>%s</b>."
-msgstr "Prenumerujesz już kanał <b>%s</b>."
-
-#: classes/handler/public.php:560
-#, php-format
-msgid "Subscribed to <b>%s</b>."
-msgstr "Zaprenumerowano kanał <b>%s</b>."
-
-#: classes/handler/public.php:563
-#, php-format
-msgid "Could not subscribe to <b>%s</b>."
-msgstr "Nie udało się zaprenumerować <b>%s</b>."
-
-#: classes/handler/public.php:566
-#, php-format
-msgid "No feeds found in <b>%s</b>."
-msgstr "Nie znaleziono kanałów w <b>%s</b>."
-
-#: classes/handler/public.php:569
-msgid "Multiple feed URLs found."
-msgstr "Znaleziono wiele adresów kanałów."
-
-#: classes/handler/public.php:573
-#, 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:591
-msgid "Subscribe to selected feed"
-msgstr "Prenumeruj wybrany kanał"
-
-#: classes/handler/public.php:618
-msgid "Edit subscription options"
-msgstr "Edytuj opcje prenumeraty"
-
-#: classes/handler/public.php:656
-msgid "Password recovery"
-msgstr "Odzyskiwanie hasła"
-
-#: classes/handler/public.php:701
-#, 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:723
-#: classes/pref/users.php:372
-msgid "Reset password"
-msgstr "Resetuj hasło"
-
-#: classes/handler/public.php:733
-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:737
-#: classes/handler/public.php:806
-msgid "Go back"
+#: classes/feeds.php:121
+msgid "Move back"
 msgstr "Cofnij"
 
-#: classes/handler/public.php:775
+#: classes/feeds.php:122
+#: classes/pref/filters.php:400
+#: classes/pref/filters.php:458
+#: classes/pref/filters.php:887
+#: classes/pref/filters.php:914
+msgid "Delete"
+msgstr "Usuń"
+
+#: classes/feeds.php:127
+#: classes/feeds.php:132
+#: plugins/mailto/init.php:25
+#: plugins/mail/init.php:76
+msgid "Forward by email"
+msgstr "Przekaż za pomocą emaila"
+
+#: classes/feeds.php:136
+msgid "Feed:"
+msgstr "Kanał:"
+
+#: classes/feeds.php:193
+#: classes/feeds.php:802
+msgid "Feed not found."
+msgstr "Kanał nie został odnaleziony."
+
+#: classes/feeds.php:255
+msgid "Never"
+msgstr "Nigdy"
+
+#: classes/feeds.php:341
+#, php-format
+msgid "Imported at %s"
+msgstr "Zaimportowane do %s"
+
+#: classes/feeds.php:391
+#: classes/feeds.php:484
 #, fuzzy
-msgid "[tt-rss] Password reset request"
-msgstr "[tt-rss] Informacja o zmianie hasła"
+msgid "mark feed as read"
+msgstr "Oznacz kanał jako przeczytany"
 
-#: classes/handler/public.php:802
-msgid "Sorry, login and email combination not found."
-msgstr "Przykro mi, podana kombinacja nazwy użytkownika i adresu email nie została oznaleziona."
+#: classes/feeds.php:540
+msgid "Collapse article"
+msgstr "Zwiń artykuł"
 
-#: classes/handler/public.php:824
-msgid "Your access level is insufficient to run this script."
-msgstr "Twój poziom dostępu jest niewystarczający do uruchomienia tego skryptu."
+#: classes/feeds.php:592
+#: classes/article.php:762
+msgid "Originally from:"
+msgstr "Oryginał pochodzi z:"
 
-#: classes/handler/public.php:850
-msgid "Database Updater"
-msgstr "Aktualizator bazy danych"
+#: classes/feeds.php:603
+#: classes/pref/feeds.php:538
+#: classes/article.php:773
+msgid "Feed URL"
+msgstr "Adres kanału"
 
-#: classes/handler/public.php:915
-msgid "Perform updates"
-msgstr "Przeprowadź aktualizacje"
+#: classes/feeds.php:630
+#: classes/article.php:729
+msgid "Edit tags for this article"
+msgstr "Edytuj tagi dla tego artykułu"
+
+#: classes/feeds.php:644
+#: classes/article.php:625
+#, fuzzy
+msgid "comment"
+msgid_plural "comments"
+msgstr[0] "Komentarze?"
+msgstr[1] "Komentarze?"
+msgstr[2] "Komentarze?"
+
+#: classes/feeds.php:648
+#: classes/article.php:629
+#, fuzzy
+msgid "comments"
+msgstr "Komentarze?"
+
+#: classes/feeds.php:686
+msgid "No unread articles found to display."
+msgstr "Nie znaleziono nieprzeczytanych artykułów."
+
+#: classes/feeds.php:689
+msgid "No updated articles found to display."
+msgstr "Nie znaleziono uaktualnionych artykułów."
+
+#: classes/feeds.php:692
+msgid "No starred articles found to display."
+msgstr "Nie znaleziono artykułów oznaczonych gwiazdką."
+
+#: classes/feeds.php:696
+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:698
+msgid "No articles found to display."
+msgstr "Nie znaleziono artykułów."
+
+#: classes/feeds.php:714
+#: classes/feeds.php:905
+#, php-format
+msgid "Feeds last updated at %s"
+msgstr "Kanały ostatnio uaktualnione o %s"
+
+#: classes/feeds.php:726
+#: classes/feeds.php:917
+msgid "Some feeds have update errors (click for details)"
+msgstr "Wystąpiły błędy aktualizacji niektórych kanałów (kliknij aby zobaczyć szczegóły)"
+
+#: classes/feeds.php:894
+msgid "No feed selected."
+msgstr "Nie wybrano kanału."
+
+#: classes/feeds.php:958
+#: classes/feeds.php:966
+msgid "Feed or site URL"
+msgstr "Adres kanału lub strony"
+
+#: classes/feeds.php:972
+#: classes/pref/feeds.php:559
+#: classes/pref/feeds.php:800
+#: classes/pref/feeds.php:1632
+msgid "Place in category:"
+msgstr "Umieść w kategorii:"
+
+#: classes/feeds.php:980
+msgid "Available feeds"
+msgstr "Dostępne kanały"
+
+#: classes/feeds.php:992
+#: classes/pref/feeds.php:621
+#: classes/pref/feeds.php:848
+#: classes/pref/users.php:61
+msgid "Authentication"
+msgstr "Uwierzytelnianie"
+
+#: classes/feeds.php:996
+#: classes/pref/feeds.php:625
+#: classes/pref/feeds.php:852
+#: classes/pref/feeds.php:1646
+#: classes/pref/users.php:403
+msgid "Login"
+msgstr "Nazwa użytkownika"
+
+#: classes/feeds.php:1000
+#: classes/pref/feeds.php:631
+#: classes/pref/feeds.php:860
+#: classes/pref/feeds.php:1649
+#: classes/pref/prefs.php:243
+msgid "Password"
+msgstr "Hasło"
+
+#: classes/feeds.php:1011
+#: classes/pref/feeds.php:645
+msgid "This feed requires authentication."
+msgstr "Ten kanał wymaga uwierzytelniania."
+
+#: classes/feeds.php:1014
+#: classes/feeds.php:1070
+#: classes/pref/feeds.php:1668
+msgid "Subscribe"
+msgstr "Prenumeruj"
+
+#: classes/feeds.php:1017
+msgid "More feeds"
+msgstr "Więcej kanałów"
+
+#: classes/feeds.php:1020
+#: classes/feeds.php:1072
+#: classes/feeds.php:1111
+#: classes/pref/labels.php:84
+#: classes/pref/filters.php:528
+#: classes/pref/filters.php:945
+#: classes/pref/filters.php:1022
+#: classes/pref/filters.php:1115
+#: classes/pref/feeds.php:774
+#: classes/pref/feeds.php:916
+#: classes/pref/feeds.php:1669
+#: classes/pref/users.php:105
+#: classes/pref/prefs.php:984
+#: classes/article.php:238
+#: classes/handler/public.php:443
+#: classes/handler/public.php:477
+#: plugins/mail/init.php:179
+#: plugins/note/init.php:60
+msgid "Cancel"
+msgstr "Anuluj"
+
+#: classes/feeds.php:1042
+#: classes/feeds.php:1110
+#: classes/pref/filters.php:788
+#: classes/pref/feeds.php:1178
+#: classes/pref/users.php:345
+#: js/tt-rss.js:152
+msgid "Search"
+msgstr "Szukaj"
+
+#: classes/feeds.php:1046
+msgid "Popular feeds"
+msgstr "Popularne kanały"
+
+#: classes/feeds.php:1047
+msgid "Feed archive"
+msgstr "Archiwum kanału"
+
+#: classes/feeds.php:1050
+msgid "limit:"
+msgstr "limit:"
+
+#: classes/feeds.php:1071
+#: classes/pref/labels.php:282
+#: classes/pref/filters.php:518
+#: classes/pref/filters.php:814
+#: classes/pref/feeds.php:751
+#: classes/pref/users.php:369
+msgid "Remove"
+msgstr "Usuń"
+
+#: classes/feeds.php:1084
+msgid "Look for"
+msgstr "Szukaj napisu"
+
+#: classes/feeds.php:1092
+#, php-format
+msgid "in %s"
+msgstr ""
+
+#: classes/feeds.php:1097
+msgid "Used for word stemming"
+msgstr ""
+
+#: classes/feeds.php:1106
+#, fuzzy
+msgid "Search syntax"
+msgstr "Szukaj"
+
+#: classes/feeds.php:1563
+msgid "Starred articles"
+msgstr "Artykuły oznaczone gwiazdką"
+
+#: classes/feeds.php:1565
+msgid "Published articles"
+msgstr "Opublikowane artykuły"
+
+#: classes/feeds.php:1567
+msgid "Fresh articles"
+msgstr "Świeże artykuły"
+
+#: classes/feeds.php:1571
+msgid "Archived articles"
+msgstr "Zarchiwizowane artykuły"
+
+#: classes/feeds.php:1573
+msgid "Recently read"
+msgstr "Ostatnio czytane"
+
+#: classes/feeds.php:1694
+msgid "Special"
+msgstr "Specjalne"
+
+#: classes/feeds.php:1951
+#, php-format
+msgid "Search results: %s"
+msgstr "Wyniki wyszukiwania: %s"
 
 #: classes/pref/labels.php:25
 #: classes/pref/filters.php:377
@@ -1214,201 +1214,197 @@ msgstr "Pierwszoplanowy:"
 msgid "Background:"
 msgstr "Tło:"
 
+#: classes/pref/labels.php:82
+#: classes/pref/filters.php:525
+#: classes/pref/feeds.php:773
+#: classes/pref/feeds.php:913
+#: classes/pref/users.php:103
+#: classes/pref/prefs.php:982
+#: classes/article.php:236
+#: plugins/af_zz_imgproxy/init.php:238
+#: plugins/af_redditimgur/init.php:66
+#: plugins/af_psql_trgm/init.php:188
+#: plugins/af_readability/init.php:80
+#: plugins/nsfw/init.php:85
+#: plugins/mail/init.php:65
+#: plugins/note/init.php:58
+msgid "Save"
+msgstr "Zapisz"
+
 #: classes/pref/labels.php:244
 #, php-format
 msgid "Created label <b>%s</b>"
 msgstr "Utworzono etykietę <b>%s</b>"
 
 #: classes/pref/labels.php:270
-#: classes/pref/users.php:356
-#: classes/pref/feeds.php:1183
-#: classes/pref/feeds.php:1414
-#: classes/pref/feeds.php:1479
 #: classes/pref/filters.php:388
 #: classes/pref/filters.php:446
 #: classes/pref/filters.php:792
 #: classes/pref/filters.php:875
 #: classes/pref/filters.php:902
+#: classes/pref/feeds.php:1182
+#: classes/pref/feeds.php:1413
+#: classes/pref/feeds.php:1478
+#: classes/pref/users.php:355
 #: classes/pref/prefs.php:993
 msgid "Select"
 msgstr "Wybierz"
 
-#: classes/pref/labels.php:273
-#: classes/pref/users.php:359
-#: classes/pref/feeds.php:1186
-#: classes/pref/feeds.php:1417
-#: classes/pref/feeds.php:1482
-#: classes/pref/filters.php:391
-#: classes/pref/filters.php:449
-#: classes/pref/filters.php:795
-#: classes/pref/filters.php:878
-#: classes/pref/filters.php:905
-#: classes/pref/prefs.php:996
-#: classes/feeds.php:102
-msgid "All"
-msgstr "Wszystko"
-
-#: classes/pref/labels.php:275
-#: classes/pref/users.php:361
-#: classes/pref/feeds.php:1188
-#: classes/pref/feeds.php:1419
-#: classes/pref/feeds.php:1484
-#: classes/pref/filters.php:393
-#: classes/pref/filters.php:451
-#: classes/pref/filters.php:797
-#: classes/pref/filters.php:880
-#: classes/pref/filters.php:907
-#: classes/pref/prefs.php:998
-#: classes/feeds.php:105
-msgid "None"
-msgstr "Nic"
-
-#: classes/pref/labels.php:282
-#: classes/pref/users.php:370
-#: classes/pref/feeds.php:752
-#: classes/pref/filters.php:518
-#: classes/pref/filters.php:814
-#: classes/feeds.php:1088
-msgid "Remove"
-msgstr "Usuń"
-
 #: classes/pref/labels.php:285
 msgid "Clear colors"
 msgstr "Wyczyść kolory"
 
-#: classes/pref/users.php:6
-#: classes/pref/system.php:8
-msgid "Your access level is insufficient to open this tab."
-msgstr "Twój poziom uprawnień jest niewystarczający aby otworzyć tę zakładkę."
-
-#: classes/pref/users.php:26
+#: classes/pref/filters.php:155
 #, fuzzy
-msgid "Edit user"
-msgstr "Edytuj regułę"
+msgid "Preview article"
+msgstr "Świeże artykuły"
 
-#: classes/pref/users.php:61
-#: classes/pref/feeds.php:622
-#: classes/pref/feeds.php:849
-#: classes/feeds.php:1009
-msgid "Authentication"
-msgstr "Uwierzytelnianie"
+#: classes/pref/filters.php:267
+#: classes/pref/filters.php:573
+msgid "(inverse)"
+msgstr "(odwróć)"
 
-#: classes/pref/users.php:64
-msgid "Access level: "
-msgstr "Poziom dostępu: "
-
-#: classes/pref/users.php:82
-#: classes/pref/feeds.php:648
-#: classes/pref/feeds.php:867
-msgid "Options"
-msgstr "Opcje"
-
-#: classes/pref/users.php:96
-#: js/prefs.js:479
-msgid "User details"
-msgstr "Szczegóły użytkownika"
-
-#: classes/pref/users.php:136
-#: classes/pref/users.php:407
-msgid "Registered"
-msgstr "Zarejestrowany"
-
-#: classes/pref/users.php:137
-msgid "Last logged in"
-msgstr "Ostatnio zalogowany"
-
-#: classes/pref/users.php:145
-msgid "Subscribed feeds count"
-msgstr "Ilość prenumerowanych kanałów"
-
-#: classes/pref/users.php:146
-#, fuzzy
-msgid "Stored articles"
-msgstr "Artykuły oznaczone gwiazdką"
-
-#: classes/pref/users.php:150
-#: classes/pref/users.php:406
-msgid "Subscribed feeds"
-msgstr "Prenumerowane kanały"
-
-#: classes/pref/users.php:176
-msgid "User not found"
-msgstr "Użytkownik nie został odnaleziony"
-
-#: classes/pref/users.php:246
+#: classes/pref/filters.php:263
+#: classes/pref/filters.php:572
 #, php-format
-msgid "Added user <b>%s</b> with password <b>%s</b>"
-msgstr "Dodano użytkownika <b>%s</b> używającego hasła <b>%s</b>"
+msgid "%s on %s in %s %s"
+msgstr "%s na %s w %s %s"
 
-#: classes/pref/users.php:253
-#, php-format
-msgid "Could not create user <b>%s</b>"
-msgstr "Nie udało się utworzyć użytkownika <b>%s</b>"
+#: classes/pref/filters.php:383
+#: classes/pref/filters.php:870
+#: classes/pref/filters.php:977
+msgid "Match"
+msgstr "Dopasuj"
 
-#: classes/pref/users.php:257
-#, php-format
-msgid "User <b>%s</b> already exists."
-msgstr "Użytkownik <b>%s</b> już istnieje."
+#: classes/pref/filters.php:397
+#: classes/pref/filters.php:455
+#: classes/pref/filters.php:884
+#: classes/pref/filters.php:911
+msgid "Add"
+msgstr "Dodaj"
 
-#: classes/pref/users.php:285
-#, 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/filters.php:441
+#: classes/pref/filters.php:897
+msgid "Apply actions"
+msgstr "Zastosuj działania"
 
-#: classes/pref/users.php:287
-#, 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/filters.php:492
+#: classes/pref/filters.php:926
+msgid "Enabled"
+msgstr "Włączone"
 
-#: classes/pref/users.php:311
-msgid "[tt-rss] Password change notification"
-msgstr "[tt-rss] Informacja o zmianie hasła"
+#: classes/pref/filters.php:501
+#: classes/pref/filters.php:929
+msgid "Match any rule"
+msgstr "Pasuje do dowolnej reguły"
 
-#: classes/pref/users.php:346
-#: classes/pref/feeds.php:1179
-#: classes/pref/filters.php:788
-#: classes/feeds.php:1059
-#: classes/feeds.php:1127
-#: js/tt-rss.js:165
-msgid "Search"
-msgstr "Szukaj"
+#: classes/pref/filters.php:510
+#: classes/pref/filters.php:932
+msgid "Inverse matching"
+msgstr "Odwróć dopasowanie"
 
-#: classes/pref/users.php:364
-msgid "Create user"
-msgstr "Utwórz użytkownika"
+#: classes/pref/filters.php:522
+#: classes/pref/filters.php:939
+msgid "Test"
+msgstr "Testuj"
+
+#: classes/pref/filters.php:804
+msgid "Combine"
+msgstr "Połącz"
 
-#: classes/pref/users.php:368
 #: classes/pref/filters.php:807
+#: classes/pref/users.php:367
 msgid "Edit"
 msgstr "Edytuj"
 
-#: classes/pref/users.php:404
-#: classes/pref/feeds.php:626
-#: classes/pref/feeds.php:853
-#: classes/pref/feeds.php:1649
-#: classes/feeds.php:1013
-msgid "Login"
-msgstr "Nazwa użytkownika"
+#: classes/pref/filters.php:810
+#: classes/pref/feeds.php:1198
+#: classes/pref/feeds.php:1212
+msgid "Reset sort order"
+msgstr "Zresetuj porządek sortowania"
 
-#: classes/pref/users.php:405
-msgid "Access Level"
-msgstr "Poziom dostępu"
+#: classes/pref/filters.php:942
+msgid "Create"
+msgstr "Utwórz"
 
-#: classes/pref/users.php:408
-msgid "Last login"
-msgstr "Ostatnie logowanie"
+#: classes/pref/filters.php:987
+msgid "Regular expression, without outer delimiters (i.e. slashes)"
+msgstr ""
 
-#: classes/pref/users.php:427
-msgid "Click to edit"
-msgstr "Kliknij aby edytować"
+#: classes/pref/filters.php:993
+msgid "Inverse regular expression matching"
+msgstr "Odwróć dopasowywanie wyrażeniami regularnymi"
 
-#: classes/pref/users.php:447
-msgid "No users defined."
-msgstr "Nie zdefiniowano żadnego użytkownika."
+#: classes/pref/filters.php:995
+msgid "on field"
+msgstr "pole"
 
-#: classes/pref/users.php:449
-msgid "No matching users found."
-msgstr "Nie odnaleziono pasującego użytkownika."
+#: classes/pref/filters.php:1001
+#: js/PrefFilterTree.js:44
+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:764
+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:786
+msgid "Add action"
+msgstr "Dodaj działania"
+
+#: classes/pref/filters.php:1139
+msgid "[No caption]"
+msgstr "[Brak opisu]"
+
+#: classes/pref/filters.php:1141
+#, 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:1155
+#, fuzzy
+msgid "matches any rule"
+msgstr "Pasuje do dowolnej reguły"
+
+#: classes/pref/filters.php:1158
+#, 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/system.php:8
+#: classes/pref/users.php:6
+msgid "Your access level is insufficient to open this tab."
+msgstr "Twój poziom uprawnień jest niewystarczający aby otworzyć tę zakładkę."
 
 #: classes/pref/system.php:29
 msgid "Error Log"
@@ -1454,388 +1450,316 @@ msgstr[0] "(%d kanał)"
 msgstr[1] "(%d kanały)"
 msgstr[2] "(%d kanałów)"
 
-#: classes/pref/feeds.php:514
+#: classes/pref/feeds.php:513
 #: classes/pref/prefs.php:18
 msgid "General"
 msgstr "Ogólne"
 
-#: classes/pref/feeds.php:528
+#: classes/pref/feeds.php:527
 msgid "Feed Title"
 msgstr "Tytuł kanału"
 
-#: classes/pref/feeds.php:560
-#: classes/pref/feeds.php:801
-#: classes/pref/feeds.php:1635
-#: classes/feeds.php:989
-msgid "Place in category:"
-msgstr "Umieść w kategorii:"
+#: classes/pref/feeds.php:536
+#: classes/handler/public.php:417
+msgid "URL:"
+msgstr "Adres:"
 
-#: classes/pref/feeds.php:572
+#: classes/pref/feeds.php:571
 #, fuzzy
 msgid "Site URL:"
 msgstr "Adres artykułu:"
 
-#: classes/pref/feeds.php:574
+#: classes/pref/feeds.php:573
 #, fuzzy
 msgid "Site URL"
 msgstr "Adres kanału"
 
-#: classes/pref/feeds.php:585
-#: classes/pref/feeds.php:815
+#: classes/pref/feeds.php:584
+#: classes/pref/feeds.php:814
 #, fuzzy
 msgid "Language:"
 msgstr "Język"
 
-#: classes/pref/feeds.php:592
-#: classes/pref/feeds.php:824
+#: classes/pref/feeds.php:591
+#: classes/pref/feeds.php:823
 msgid "Update"
 msgstr "Aktualizuj"
 
-#: classes/pref/feeds.php:607
-#: classes/pref/feeds.php:840
+#: classes/pref/feeds.php:606
+#: classes/pref/feeds.php:839
 msgid "Article purging:"
 msgstr "Czyszczenie artykułów:"
 
-#: classes/pref/feeds.php:632
-#: classes/pref/feeds.php:861
-#: classes/pref/feeds.php:1652
-#: classes/pref/prefs.php:243
-#: classes/feeds.php:1017
-msgid "Password"
-msgstr "Hasło"
-
-#: classes/pref/feeds.php:636
+#: classes/pref/feeds.php:635
 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:646
-#: classes/feeds.php:1028
-msgid "This feed requires authentication."
-msgstr "Ten kanał wymaga uwierzytelniania."
+#: classes/pref/feeds.php:647
+#: classes/pref/feeds.php:866
+#: classes/pref/users.php:82
+msgid "Options"
+msgstr "Opcje"
 
-#: classes/pref/feeds.php:662
-#: classes/pref/feeds.php:871
+#: classes/pref/feeds.php:661
+#: classes/pref/feeds.php:870
 msgid "Hide from Popular feeds"
 msgstr "Ukryj przed umieszczeniem w Popularnych kanałach"
 
-#: classes/pref/feeds.php:674
-#: classes/pref/feeds.php:877
+#: classes/pref/feeds.php:673
+#: classes/pref/feeds.php:876
 msgid "Include in e-mail digest"
 msgstr "Umieść w przeglądzie emailowym"
 
-#: classes/pref/feeds.php:687
-#: classes/pref/feeds.php:883
+#: classes/pref/feeds.php:686
+#: classes/pref/feeds.php:882
 msgid "Always display image attachments"
 msgstr "Zawsze wyświetlaj załączniki graficzne"
 
-#: classes/pref/feeds.php:700
-#: classes/pref/feeds.php:891
+#: classes/pref/feeds.php:699
+#: classes/pref/feeds.php:890
 #, fuzzy
 msgid "Do not embed media"
 msgstr "Nie osadzaj obrazków"
 
-#: classes/pref/feeds.php:713
-#: classes/pref/feeds.php:899
+#: classes/pref/feeds.php:712
+#: classes/pref/feeds.php:898
 msgid "Cache media"
 msgstr ""
 
-#: classes/pref/feeds.php:725
-#: classes/pref/feeds.php:905
+#: classes/pref/feeds.php:724
+#: classes/pref/feeds.php:904
 msgid "Mark updated articles as unread"
 msgstr "Oznacz zaktualizowane artykuły jako nieprzeczytane"
 
-#: classes/pref/feeds.php:729
+#: classes/pref/feeds.php:728
 msgid "Icon"
 msgstr "Ikona"
 
-#: classes/pref/feeds.php:743
-#: classes/pref/feeds.php:1284
+#: classes/pref/feeds.php:742
+#: classes/pref/feeds.php:1283
 #: plugins/import_export/init.php:71
 #, fuzzy
 msgid "Choose file..."
 msgstr "Utwórz filtr..."
 
-#: classes/pref/feeds.php:750
+#: classes/pref/feeds.php:749
 msgid "Replace"
 msgstr "Zamień"
 
-#: classes/pref/feeds.php:757
+#: classes/pref/feeds.php:756
 #: classes/pref/prefs.php:679
 msgid "Plugins"
 msgstr "Wtyczki"
 
-#: classes/pref/feeds.php:1154
+#: classes/pref/feeds.php:1153
 msgid "Feeds with errors"
 msgstr "Kanały z błędami"
 
-#: classes/pref/feeds.php:1161
+#: classes/pref/feeds.php:1160
 msgid "Inactive feeds"
 msgstr "Nieaktywne kanały"
 
-#: classes/pref/feeds.php:1197
+#: classes/pref/feeds.php:1196
 msgid "Edit selected feeds"
 msgstr "Edytuj wybrane kanały"
 
-#: classes/pref/feeds.php:1199
-#: classes/pref/feeds.php:1213
-#: classes/pref/filters.php:810
-msgid "Reset sort order"
-msgstr "Zresetuj porządek sortowania"
-
-#: classes/pref/feeds.php:1201
-#: js/prefs.js:1462
+#: classes/pref/feeds.php:1200
+#: js/prefs.js:1171
 msgid "Batch subscribe"
 msgstr "Prenumerata wsadowa"
 
-#: classes/pref/feeds.php:1208
+#: classes/pref/feeds.php:1207
 msgid "Categories"
 msgstr "Kategorie"
 
-#: classes/pref/feeds.php:1211
+#: classes/pref/feeds.php:1210
 msgid "Add category"
 msgstr "Dodaj kategorię"
 
-#: classes/pref/feeds.php:1215
+#: classes/pref/feeds.php:1214
 msgid "Remove selected"
 msgstr "Usuń wybrane"
 
-#: classes/pref/feeds.php:1272
+#: classes/pref/feeds.php:1271
 msgid "OPML"
 msgstr "OPML"
 
-#: classes/pref/feeds.php:1274
+#: classes/pref/feeds.php:1273
 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:1275
+#: classes/pref/feeds.php:1274
 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:1290
+#: classes/pref/feeds.php:1289
 msgid "Import my OPML"
 msgstr "Importuj mój OPML"
 
-#: classes/pref/feeds.php:1296
+#: classes/pref/feeds.php:1295
 msgid "Filename:"
 msgstr "Nazwa pliku:"
 
-#: classes/pref/feeds.php:1298
+#: classes/pref/feeds.php:1297
 msgid "Include settings"
 msgstr "Załącz ustawienia"
 
-#: classes/pref/feeds.php:1302
+#: classes/pref/feeds.php:1301
 msgid "Export OPML"
 msgstr "Eksportuj OPML"
 
-#: classes/pref/feeds.php:1306
+#: classes/pref/feeds.php:1305
 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:1310
+#: classes/pref/feeds.php:1309
 msgid "Public OPML URL"
 msgstr "Publiczny adres OPML"
 
-#: classes/pref/feeds.php:1311
+#: classes/pref/feeds.php:1310
 msgid "Display published OPML URL"
 msgstr "Wyświetl opublikowany adres OPML"
 
-#: classes/pref/feeds.php:1318
+#: classes/pref/feeds.php:1317
 msgid "Published & shared articles / Generated feeds"
 msgstr "Opublikowane i udostępnione artykuły / Wygenerowane kanały"
 
-#: classes/pref/feeds.php:1320
+#: classes/pref/feeds.php:1319
 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:1327
-#: classes/feeds.php:54
-#: classes/feeds.php:140
-msgid "View as RSS"
-msgstr "Wyświetl jako RSS"
-
-#: classes/pref/feeds.php:1328
 msgid "Display URL"
 msgstr "Wyświetl adres"
 
-#: classes/pref/feeds.php:1331
+#: classes/pref/feeds.php:1330
 msgid "Clear all generated URLs"
 msgstr "Wyczyść wszystkie wygenerowane adresy"
 
-#: classes/pref/feeds.php:1410
+#: classes/pref/feeds.php:1409
 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:1444
-#: classes/pref/feeds.php:1509
+#: classes/pref/feeds.php:1443
+#: classes/pref/feeds.php:1508
 msgid "Click to edit feed"
 msgstr "Kliknij aby edytować kanał"
 
-#: classes/pref/feeds.php:1462
-#: classes/pref/feeds.php:1529
+#: classes/pref/feeds.php:1461
+#: classes/pref/feeds.php:1528
 msgid "Unsubscribe from selected feeds"
 msgstr "Zakończ prenumeratę wybranych kanałów:"
 
-#: classes/pref/feeds.php:1632
+#: classes/pref/feeds.php:1629
 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:1641
+#: classes/pref/feeds.php:1638
 msgid "Feeds to subscribe, One per line"
 msgstr "Kanały do prenumeraty. Każdy w osobnej linii"
 
-#: classes/pref/feeds.php:1664
+#: classes/pref/feeds.php:1661
 msgid "Feeds require authentication."
 msgstr "Kanały wymagają uwierzytelniania."
 
-#: classes/pref/feeds.php:1671
-#: classes/feeds.php:1031
-#: classes/feeds.php:1087
-msgid "Subscribe"
-msgstr "Prenumeruj"
-
-#: classes/pref/filters.php:155
+#: classes/pref/users.php:26
 #, fuzzy
-msgid "Preview article"
-msgstr "Świeże artykuły"
+msgid "Edit user"
+msgstr "Edytuj regułę"
 
-#: classes/pref/filters.php:267
-#: classes/pref/filters.php:573
-msgid "(inverse)"
-msgstr "(odwróć)"
+#: classes/pref/users.php:64
+msgid "Access level: "
+msgstr "Poziom dostępu: "
 
-#: classes/pref/filters.php:263
-#: classes/pref/filters.php:572
+#: classes/pref/users.php:96
+#: js/prefs.js:403
+msgid "User details"
+msgstr "Szczegóły użytkownika"
+
+#: classes/pref/users.php:136
+#: classes/pref/users.php:406
+msgid "Registered"
+msgstr "Zarejestrowany"
+
+#: classes/pref/users.php:137
+msgid "Last logged in"
+msgstr "Ostatnio zalogowany"
+
+#: classes/pref/users.php:145
+msgid "Subscribed feeds count"
+msgstr "Ilość prenumerowanych kanałów"
+
+#: classes/pref/users.php:146
+#, fuzzy
+msgid "Stored articles"
+msgstr "Artykuły oznaczone gwiazdką"
+
+#: classes/pref/users.php:150
+#: classes/pref/users.php:405
+msgid "Subscribed feeds"
+msgstr "Prenumerowane kanały"
+
+#: classes/pref/users.php:176
+msgid "User not found"
+msgstr "Użytkownik nie został odnaleziony"
+
+#: classes/pref/users.php:246
 #, php-format
-msgid "%s on %s in %s %s"
-msgstr "%s na %s w %s %s"
+msgid "Added user <b>%s</b> with password <b>%s</b>"
+msgstr "Dodano użytkownika <b>%s</b> używającego hasła <b>%s</b>"
 
-#: classes/pref/filters.php:383
-#: classes/pref/filters.php:870
-#: classes/pref/filters.php:977
-msgid "Match"
-msgstr "Dopasuj"
+#: classes/pref/users.php:253
+#, php-format
+msgid "Could not create user <b>%s</b>"
+msgstr "Nie udało się utworzyć użytkownika <b>%s</b>"
 
-#: classes/pref/filters.php:397
-#: classes/pref/filters.php:455
-#: classes/pref/filters.php:884
-#: classes/pref/filters.php:911
-msgid "Add"
-msgstr "Dodaj"
+#: classes/pref/users.php:257
+#, php-format
+msgid "User <b>%s</b> already exists."
+msgstr "Użytkownik <b>%s</b> już istnieje."
 
-#: classes/pref/filters.php:400
-#: classes/pref/filters.php:458
-#: classes/pref/filters.php:887
-#: classes/pref/filters.php:914
-#: classes/feeds.php:122
-msgid "Delete"
-msgstr "Usuń"
+#: classes/pref/users.php:285
+#, 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/filters.php:441
-#: classes/pref/filters.php:897
-msgid "Apply actions"
-msgstr "Zastosuj działania"
+#: classes/pref/users.php:287
+#, 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/filters.php:492
-#: classes/pref/filters.php:926
-msgid "Enabled"
-msgstr "Włączone"
+#: classes/pref/users.php:310
+msgid "[tt-rss] Password change notification"
+msgstr "[tt-rss] Informacja o zmianie hasła"
 
-#: classes/pref/filters.php:501
-#: classes/pref/filters.php:929
-msgid "Match any rule"
-msgstr "Pasuje do dowolnej reguły"
+#: classes/pref/users.php:363
+msgid "Create user"
+msgstr "Utwórz użytkownika"
 
-#: classes/pref/filters.php:510
-#: classes/pref/filters.php:932
-msgid "Inverse matching"
-msgstr "Odwróć dopasowanie"
+#: classes/pref/users.php:371
+#: classes/handler/public.php:747
+msgid "Reset password"
+msgstr "Resetuj hasło"
 
-#: classes/pref/filters.php:522
-#: classes/pref/filters.php:939
-msgid "Test"
-msgstr "Testuj"
+#: classes/pref/users.php:404
+msgid "Access Level"
+msgstr "Poziom dostępu"
 
-#: classes/pref/filters.php:804
-msgid "Combine"
-msgstr "Połącz"
+#: classes/pref/users.php:407
+msgid "Last login"
+msgstr "Ostatnie logowanie"
 
-#: classes/pref/filters.php:942
-msgid "Create"
-msgstr "Utwórz"
+#: classes/pref/users.php:426
+msgid "Click to edit"
+msgstr "Kliknij aby edytować"
 
-#: classes/pref/filters.php:987
-msgid "Regular expression, without outer delimiters (i.e. slashes)"
-msgstr ""
+#: classes/pref/users.php:446
+msgid "No users defined."
+msgstr "Nie zdefiniowano żadnego użytkownika."
 
-#: 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:43
-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:797
-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:819
-msgid "Add action"
-msgstr "Dodaj działania"
-
-#: classes/pref/filters.php:1139
-msgid "[No caption]"
-msgstr "[Brak opisu]"
-
-#: classes/pref/filters.php:1141
-#, 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:1155
-#, fuzzy
-msgid "matches any rule"
-msgstr "Pasuje do dowolnej reguły"
-
-#: classes/pref/filters.php:1158
-#, 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:448
+msgid "No matching users found."
+msgstr "Nie odnaleziono pasującego użytkownika."
 
 #: classes/pref/prefs.php:19
 msgid "Interface"
@@ -2011,7 +1935,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:1424
+#: js/prefs.js:1136
 msgid "Customize stylesheet"
 msgstr "Dostosuj arkusz styli"
 
@@ -2254,256 +2178,300 @@ msgstr "Usuń wybrane profile"
 msgid "Activate profile"
 msgstr "Aktywuj profil"
 
-#: classes/feeds.php:53
-msgid "View as RSS feed"
-msgstr "Zobacz jako kanał RSS"
+#: 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."
 
-#: classes/feeds.php:62
-#, php-format
-msgid "Last updated: %s"
-msgstr "Ostatnia aktualizacja: %s"
+#: classes/dlg.php:44
+msgid "Your Public OPML URL is:"
+msgstr "Twój publiczny adres OPML to:"
 
-#: classes/feeds.php:100
+#: classes/dlg.php:53
+#: classes/dlg.php:178
+#: plugins/share/init.php:125
+msgid "Generate new URL"
+msgstr "Wygeneruj nowy adres"
+
+#: classes/dlg.php:67
+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 "W konfiguracji wybrano wykorzystywanie zewnętrznego procesu aktualizacji, jednak proces ten nie działa co powoduje iż kanały nie są aktualizowane. Proszę uruchomić zewnętrzny proces aktualizacji lub skontaktować się z właścicielem tej instalacji."
+
+#: classes/dlg.php:71
+#: classes/dlg.php:80
+msgid "Last update:"
+msgstr "Ostatnia aktualizacja:"
+
+#: classes/dlg.php:76
+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 "Aktualizacja kanału z wykorzystaniem zewnętrznego procesu aktualizacji trwa zbyt długo. Może to wskazywać na jego awarię/unieruchomienie (crash) lub zawieszenie. Sprawdź poprawność działania zewnętrznego procesu aktualizacji lub skontaktuj się z właścicielem tej instalacji."
+
+#: classes/dlg.php:169
+msgid "You can view this feed as RSS using the following URL:"
+msgstr "Możesz obejrzeć ten kanał jako RSS korzystając z adresu:"
+
+#: classes/dlg.php:190
+msgid "You are using default tt-rss password. Please change it in the Preferences (Personal data / Authentication)."
+msgstr ""
+
+#: classes/dlg.php:194
 #, fuzzy
-msgid "Select..."
-msgstr "Wybierz"
+msgid "Open Preferences"
+msgstr "Ustawienia"
 
-#: classes/feeds.php:104
-msgid "Invert"
-msgstr "Odwróć"
+#: classes/opml.php:31
+#: classes/opml.php:36
+msgid "OPML Utility"
+msgstr "Narzędzie OPML"
 
-#: classes/feeds.php:107
-msgid "Selection toggle:"
-msgstr "Przełącz zaznaczenie:"
+#: classes/opml.php:40
+msgid "Importing OPML..."
+msgstr "Importowanie OPML..."
 
-#: classes/feeds.php:113
-msgid "Selection:"
-msgstr "Zaznaczenie:"
+#: classes/opml.php:45
+msgid "Return to preferences"
+msgstr "Wróć do ustawień"
 
-#: classes/feeds.php:116
-msgid "Set score"
-msgstr "Oceń"
+#: classes/opml.php:301
+#, php-format
+msgid "Adding feed: %s"
+msgstr "Dodaję kanał: %s"
 
-#: classes/feeds.php:119
-msgid "Archive"
-msgstr "Archiwizuj"
+#: classes/opml.php:312
+#, php-format
+msgid "Duplicate feed: %s"
+msgstr "Duplikat kanału: %s"
 
-#: classes/feeds.php:121
-msgid "Move back"
+#: classes/opml.php:326
+#, php-format
+msgid "Adding label %s"
+msgstr "Dodaję etykietę %s"
+
+#: classes/opml.php:329
+#, php-format
+msgid "Duplicate label: %s"
+msgstr "Duplikat etykiety: %s"
+
+#: classes/opml.php:341
+#, php-format
+msgid "Setting preference key %s to %s"
+msgstr "Ustawiam wartość parametru %s na %s"
+
+#: classes/opml.php:377
+msgid "Adding filter..."
+msgstr "Dodaję filtr..."
+
+#: classes/opml.php:512
+#, php-format
+msgid "Processing category: %s"
+msgstr "Przetwarzam kategorię: %s"
+
+#: classes/opml.php:558
+#, php-format
+msgid "Upload failed with error code %d"
+msgstr "Przesyłanie pliku zakończone błędem numer %d"
+
+#: classes/opml.php:570
+#: plugins/import_export/init.php:471
+msgid "Unable to move uploaded file."
+msgstr "Nie udało się przenieść przesłanego pliku."
+
+#: classes/opml.php:574
+#: plugins/import_export/init.php:475
+msgid "Error: please upload OPML file."
+msgstr "Błąd: proszę wgrać plik OPML."
+
+#: classes/opml.php:585
+msgid "Error: unable to find moved OPML file."
+msgstr "Błąd: nie udało się przenieść pliku OPML."
+
+#: classes/opml.php:594
+msgid "Error while parsing document."
+msgstr "Błąd przetwarzania dokumentu."
+
+#: classes/article.php:26
+msgid "Article not found."
+msgstr "Artykuł nie został znaleziony."
+
+#: classes/article.php:211
+msgid "Tags for this article (separated by commas):"
+msgstr "Tagi dla tego artykułu (oddzielone przecinkami):"
+
+#: classes/article.php:337
+#: classes/article.php:719
+#: classes/article.php:874
+msgid "no tags"
+msgstr "brak tagów"
+
+#: classes/article.php:447
+msgid "unknown type"
+msgstr "nieznany typ"
+
+#: classes/article.php:524
+msgid "Attachments"
+msgstr "Załączniki"
+
+#: classes/article.php:688
+msgid " - "
+msgstr " - "
+
+#: classes/article.php:912
+msgid "(edit note)"
+msgstr "(edytuj notatkę)"
+
+#: classes/handler/public.php:407
+#: plugins/bookmarklets/init.php:40
+msgid "Share with Tiny Tiny RSS"
+msgstr "Udostępnij za pomocą Tiny Tiny RSS"
+
+#: classes/handler/public.php:415
+msgid "Title:"
+msgstr "Tytuł:"
+
+#: classes/handler/public.php:419
+msgid "Content:"
+msgstr "Treść:"
+
+#: classes/handler/public.php:421
+msgid "Labels:"
+msgstr "Etykiety:"
+
+#: classes/handler/public.php:440
+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:442
+msgid "Share"
+msgstr "Udostępnij"
+
+#: classes/handler/public.php:464
+msgid "Not logged in"
+msgstr "Nie zalogowany"
+
+#: classes/handler/public.php:527
+msgid "Incorrect username or password"
+msgstr "Nieprawidłowa nazwa użytkownika lub hasło"
+
+#: classes/handler/public.php:581
+#, php-format
+msgid "Already subscribed to <b>%s</b>."
+msgstr "Prenumerujesz już kanał <b>%s</b>."
+
+#: classes/handler/public.php:584
+#, php-format
+msgid "Subscribed to <b>%s</b>."
+msgstr "Zaprenumerowano kanał <b>%s</b>."
+
+#: classes/handler/public.php:587
+#, php-format
+msgid "Could not subscribe to <b>%s</b>."
+msgstr "Nie udało się zaprenumerować <b>%s</b>."
+
+#: classes/handler/public.php:590
+#, php-format
+msgid "No feeds found in <b>%s</b>."
+msgstr "Nie znaleziono kanałów w <b>%s</b>."
+
+#: classes/handler/public.php:593
+msgid "Multiple feed URLs found."
+msgstr "Znaleziono wiele adresów kanałów."
+
+#: classes/handler/public.php:597
+#, 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:615
+msgid "Subscribe to selected feed"
+msgstr "Prenumeruj wybrany kanał"
+
+#: classes/handler/public.php:642
+msgid "Edit subscription options"
+msgstr "Edytuj opcje prenumeraty"
+
+#: classes/handler/public.php:680
+msgid "Password recovery"
+msgstr "Odzyskiwanie hasła"
+
+#: classes/handler/public.php:725
+#, 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:757
+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:761
+#: classes/handler/public.php:830
+msgid "Go back"
 msgstr "Cofnij"
 
-#: classes/feeds.php:127
-#: classes/feeds.php:132
-#: plugins/mail/init.php:76
-#: plugins/mailto/init.php:25
-msgid "Forward by email"
-msgstr "Przekaż za pomocą emaila"
-
-#: classes/feeds.php:136
-msgid "Feed:"
-msgstr "Kanał:"
-
-#: classes/feeds.php:193
-#: classes/feeds.php:819
-msgid "Feed not found."
-msgstr "Kanał nie został odnaleziony."
-
-#: classes/feeds.php:255
-msgid "Never"
-msgstr "Nigdy"
-
-#: classes/feeds.php:342
-#, php-format
-msgid "Imported at %s"
-msgstr "Zaimportowane do %s"
-
-#: classes/feeds.php:394
-#: classes/feeds.php:487
+#: classes/handler/public.php:799
 #, fuzzy
-msgid "mark feed as read"
-msgstr "Oznacz kanał jako przeczytany"
+msgid "[tt-rss] Password reset request"
+msgstr "[tt-rss] Informacja o zmianie hasła"
 
-#: classes/feeds.php:542
-msgid "Collapse article"
-msgstr "Zwiń artykuł"
+#: 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/feeds.php:703
-msgid "No unread articles found to display."
-msgstr "Nie znaleziono nieprzeczytanych artykułów."
+#: 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/feeds.php:706
-msgid "No updated articles found to display."
-msgstr "Nie znaleziono uaktualnionych artykułów."
+#: classes/handler/public.php:874
+msgid "Database Updater"
+msgstr "Aktualizator bazy danych"
 
-#: classes/feeds.php:709
-msgid "No starred articles found to display."
-msgstr "Nie znaleziono artykułów oznaczonych gwiazdką."
+#: classes/handler/public.php:939
+msgid "Perform updates"
+msgstr "Przeprowadź aktualizacje"
 
-#: classes/feeds.php:713
-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:715
-msgid "No articles found to display."
-msgstr "Nie znaleziono artykułów."
-
-#: classes/feeds.php:731
-#: classes/feeds.php:922
-#, php-format
-msgid "Feeds last updated at %s"
-msgstr "Kanały ostatnio uaktualnione o %s"
-
-#: classes/feeds.php:743
-#: classes/feeds.php:934
-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:911
-msgid "No feed selected."
-msgstr "Nie wybrano kanału."
-
-#: classes/feeds.php:975
-#: classes/feeds.php:983
-msgid "Feed or site URL"
-msgstr "Adres kanału lub strony"
-
-#: classes/feeds.php:997
-msgid "Available feeds"
-msgstr "Dostępne kanały"
-
-#: classes/feeds.php:1034
-msgid "More feeds"
-msgstr "Więcej kanałów"
-
-#: classes/feeds.php:1063
-msgid "Popular feeds"
-msgstr "Popularne kanały"
-
-#: classes/feeds.php:1064
-msgid "Feed archive"
-msgstr "Archiwum kanału"
-
-#: classes/feeds.php:1067
-msgid "limit:"
-msgstr "limit:"
-
-#: classes/feeds.php:1101
-msgid "Look for"
-msgstr "Szukaj napisu"
-
-#: classes/feeds.php:1109
-#, php-format
-msgid "in %s"
+#: plugins/af_zz_imgproxy/init.php:208
+msgid "Image proxy settings (af_zz_imgproxy)"
 msgstr ""
 
-#: classes/feeds.php:1114
-msgid "Used for word stemming"
-msgstr ""
-
-#: classes/feeds.php:1123
+#: plugins/af_zz_imgproxy/init.php:232
 #, fuzzy
-msgid "Search syntax"
-msgstr "Szukaj"
+msgid "Enable proxy for all remote images."
+msgstr "Włącz kategorie kanałów"
 
-#: classes/feeds.php:1577
-msgid "Starred articles"
-msgstr "Artykuły oznaczone gwiazdką"
+#: plugins/af_zz_imgproxy/init.php:236
+#, fuzzy
+msgid "Don't cache files locally."
+msgstr "Przechowuj obrazki lokalnie"
 
-#: classes/feeds.php:1579
-msgid "Published articles"
-msgstr "Opublikowane artykuły"
-
-#: classes/feeds.php:1581
-msgid "Fresh articles"
-msgstr "Świeże artykuły"
-
-#: classes/feeds.php:1585
-msgid "Archived articles"
-msgstr "Zarchiwizowane artykuły"
-
-#: classes/feeds.php:1587
-msgid "Recently read"
-msgstr "Ostatnio czytane"
-
-#: classes/feeds.php:1708
-msgid "Special"
-msgstr "Specjalne"
-
-#: classes/feeds.php:1965
-#, php-format
-msgid "Search results: %s"
-msgstr "Wyniki wyszukiwania: %s"
-
-#: 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."
+#: plugins/af_zz_imgproxy/init.php:252
+#: plugins/af_redditimgur/init.php:79
+#, fuzzy
+msgid "Configuration saved"
 msgstr "Konfiguracja została zapisana."
 
-#: plugins/note/init.php:28
-#: plugins/note/note.js:11
-msgid "Edit article note"
-msgstr "Edytuj notatkę do artykułu"
-
 #: plugins/vf_shared/init.php:17
 #: plugins/vf_shared/init.php:73
 msgid "Shared articles"
 msgstr "Udostępnione artykuły"
 
-#: plugins/auth_internal/init.php:67
-msgid "Please enter your one time password:"
-msgstr "Wprowadź hasło jednorazowe:"
+#: plugins/bookmarklets/init.php:20
+msgid "Bookmarklets"
+msgstr "Skryptozakładki"
 
-#: plugins/auth_internal/init.php:208
-msgid "Password has been changed."
-msgstr "Hasło zostało zmienione."
+#: 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 "Przeciągnij poniższy odnośnik na pasek zakładek Twojej przeglądarki, otwórz kanał który Cie interesuje w przeglądarce i kliknij na utworzonym odnośniku aby zaprenumerować kanał."
 
-#: plugins/auth_internal/init.php:210
-msgid "Old password is incorrect."
-msgstr "Nieprawidłowe stare hasło."
+#: plugins/bookmarklets/init.php:26
+#, php-format
+msgid "Subscribe to %s in Tiny Tiny RSS?"
+msgstr "Prenumerować %s w Tiny Tiny RSS?"
 
-#: plugins/af_readability/init.php:25
-msgid "Data saved."
-msgstr ""
+#: plugins/bookmarklets/init.php:31
+msgid "Subscribe in Tiny Tiny RSS"
+msgstr "Prenumeruj w Tiny Tiny RSS"
 
-#: plugins/af_readability/init.php:41
-#, fuzzy
-msgid "Inline content"
-msgstr "Przewijanie treści artykułu"
-
-#: plugins/af_readability/init.php:47
-msgid "Readability settings (af_readability)"
-msgstr ""
-
-#: plugins/af_readability/init.php:78
-msgid "Use Readability for pages shared via bookmarklet."
-msgstr ""
-
-#: plugins/af_readability/init.php:90
-#: plugins/af_psql_trgm/init.php:198
-msgid "Currently enabled for (click to edit):"
-msgstr ""
-
-#: plugins/af_readability/init.php:107
-#, fuzzy
-msgid "Readability"
-msgstr "Sprawdź dostępność"
-
-#: plugins/af_readability/init.php:118
-#, fuzzy
-msgid "Inline article content"
-msgstr "Przewijanie treści artykułu"
+#: plugins/bookmarklets/init.php:34
+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_redditimgur/init.php:30
 msgid "Reddit content settings (af_redditimgur)"
@@ -2517,11 +2485,21 @@ msgstr ""
 msgid "Enable additional duplicate checking"
 msgstr ""
 
-#: plugins/af_redditimgur/init.php:79
-#: plugins/af_zz_imgproxy/init.php:252
-#, fuzzy
-msgid "Configuration saved"
-msgstr "Konfiguracja została zapisana."
+#: plugins/af_comics/init.php:49
+msgid "Feeds supported by af_comics"
+msgstr ""
+
+#: plugins/af_comics/init.php:51
+msgid "The following comics are currently supported:"
+msgstr ""
+
+#: plugins/af_comics/init.php:69
+msgid "To subscribe to GoComics use the comic's regular web page as the feed URL (e.g. for the <em>Garfield</em> comic use <code>http://www.gocomics.com/garfield</code>)."
+msgstr ""
+
+#: plugins/af_comics/init.php:71
+msgid "Drop any updated filters into <code>filters.local</code> in plugin directory."
+msgstr ""
 
 #: plugins/af_psql_trgm/init.php:29
 #, php-format
@@ -2561,25 +2539,86 @@ msgstr ""
 msgid "Enable for all feeds:"
 msgstr "Włącz kategorie kanałów"
 
+#: plugins/af_psql_trgm/init.php:198
+#: plugins/af_readability/init.php:90
+msgid "Currently enabled for (click to edit):"
+msgstr ""
+
 #: plugins/af_psql_trgm/init.php:216
 msgid "Similarity (pg_trgm)"
 msgstr ""
 
-#: plugins/af_comics/init.php:49
-msgid "Feeds supported by af_comics"
+#: plugins/af_readability/init.php:25
+msgid "Data saved."
 msgstr ""
 
-#: plugins/af_comics/init.php:51
-msgid "The following comics are currently supported:"
+#: plugins/af_readability/init.php:41
+#, fuzzy
+msgid "Inline content"
+msgstr "Przewijanie treści artykułu"
+
+#: plugins/af_readability/init.php:47
+msgid "Readability settings (af_readability)"
 msgstr ""
 
-#: plugins/af_comics/init.php:69
-msgid "To subscribe to GoComics use the comic's regular web page as the feed URL (e.g. for the <em>Garfield</em> comic use <code>http://www.gocomics.com/garfield</code>)."
+#: plugins/af_readability/init.php:78
+msgid "Use Readability for pages shared via bookmarklet."
 msgstr ""
 
-#: plugins/af_comics/init.php:71
-msgid "Drop any updated filters into <code>filters.local</code> in plugin directory."
-msgstr ""
+#: plugins/af_readability/init.php:107
+#, fuzzy
+msgid "Readability"
+msgstr "Sprawdź dostępność"
+
+#: plugins/af_readability/init.php:118
+#, fuzzy
+msgid "Inline article content"
+msgstr "Przewijanie treści artykułu"
+
+#: plugins/mailto/init.php:50
+#: plugins/mailto/init.php:58
+#: plugins/mail/init.php:118
+#: plugins/mail/init.php:124
+msgid "[Forwarded]"
+msgstr "[Przekazane]"
+
+#: plugins/mailto/init.php:50
+#: plugins/mail/init.php:118
+msgid "Multiple articles"
+msgstr "Wiele artykułów"
+
+#: plugins/mailto/init.php:74
+msgid "Clicking the following link to invoke your mail client:"
+msgstr "Kliknij odnośnik aby uruchomić Twój program pocztowy:"
+
+#: plugins/mailto/init.php:78
+msgid "Forward selected article(s) by email."
+msgstr "Prześlij artykuł emailem."
+
+#: plugins/mailto/init.php:81
+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/mailto/init.php:86
+msgid "Close this dialog"
+msgstr "Zamknij to okno"
+
+#: 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/import_export/init.php:53
 msgid "Import and export"
@@ -2650,102 +2689,6 @@ msgstr "Przesyłanie pliku zakończone błędem numer %d"
 msgid "No file uploaded."
 msgstr "Nie przesłano żadnego pliku."
 
-#: plugins/mail/init.php:29
-msgid "Mail addresses saved."
-msgstr ""
-
-#: plugins/mail/init.php:35
-#, fuzzy
-msgid "Mail plugin"
-msgstr "Wtyczki użytkowników"
-
-#: plugins/mail/init.php:37
-msgid "You can set predefined email addressed here (comma-separated list):"
-msgstr ""
-
-#: plugins/mail/init.php:118
-#: plugins/mail/init.php:124
-#: plugins/mailto/init.php:50
-#: plugins/mailto/init.php:58
-msgid "[Forwarded]"
-msgstr "[Przekazane]"
-
-#: plugins/mail/init.php:118
-#: plugins/mailto/init.php:50
-msgid "Multiple articles"
-msgstr "Wiele artykułów"
-
-#: plugins/mail/init.php:146
-msgid "To:"
-msgstr "Do:"
-
-#: plugins/mail/init.php:161
-msgid "Subject:"
-msgstr "Temat:"
-
-#: plugins/mail/init.php:178
-msgid "Send e-mail"
-msgstr "Wyślij email"
-
-#: plugins/close_button/init.php:25
-msgid "Close article"
-msgstr "Zamknij artykuł"
-
-#: plugins/bookmarklets/init.php:20
-msgid "Bookmarklets"
-msgstr "Skryptozakładki"
-
-#: 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 "Przeciągnij poniższy odnośnik na pasek zakładek Twojej przeglądarki, otwórz kanał który Cie interesuje w przeglądarce i kliknij na utworzonym odnośniku aby zaprenumerować kanał."
-
-#: plugins/bookmarklets/init.php:26
-#, php-format
-msgid "Subscribe to %s in Tiny Tiny RSS?"
-msgstr "Prenumerować %s w Tiny Tiny RSS?"
-
-#: plugins/bookmarklets/init.php:31
-msgid "Subscribe in Tiny Tiny RSS"
-msgstr "Prenumeruj w Tiny Tiny RSS"
-
-#: plugins/bookmarklets/init.php:34
-msgid "Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS"
-msgstr "Użyj tej Skryptozakładki aby publikować dowolne strony używając Tiny Tiny RSS"
-
-#: plugins/toggle_sidebar/init.php:23
-msgid "Collapse feedlist"
-msgstr "Rozwiń listę kanałów"
-
-#: plugins/af_zz_imgproxy/init.php:208
-msgid "Image proxy settings (af_zz_imgproxy)"
-msgstr ""
-
-#: plugins/af_zz_imgproxy/init.php:232
-#, fuzzy
-msgid "Enable proxy for all remote images."
-msgstr "Włącz kategorie kanałów"
-
-#: plugins/af_zz_imgproxy/init.php:236
-#, fuzzy
-msgid "Don't cache files locally."
-msgstr "Przechowuj obrazki lokalnie"
-
-#: plugins/mailto/init.php:74
-msgid "Clicking the following link to invoke your mail client:"
-msgstr "Kliknij odnośnik aby uruchomić Twój program pocztowy:"
-
-#: plugins/mailto/init.php:78
-msgid "Forward selected article(s) by email."
-msgstr "Prześlij artykuł emailem."
-
-#: plugins/mailto/init.php:81
-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/mailto/init.php:86
-msgid "Close this dialog"
-msgstr "Zamknij to okno"
-
 #: plugins/share/init.php:41
 msgid "You can disable all articles shared by unique URLs here."
 msgstr "Możesz wyłączyć wszystkie unikalne adresy prowadzące do udostępnionych artykułów."
@@ -2766,357 +2709,483 @@ msgstr "Możesz udostępnić ten artykuł korzystając z tego unikalnego adresu:
 msgid "Unshare article"
 msgstr "Zakończ udostępnianie artykułu"
 
-#: js/FeedTree.js:75
+#: plugins/toggle_sidebar/init.php:23
+msgid "Collapse feedlist"
+msgstr "Rozwiń listę kanałów"
+
+#: plugins/close_button/init.php:25
+msgid "Close article"
+msgstr "Zamknij artykuł"
+
+#: plugins/mail/init.php:29
+msgid "Mail addresses saved."
+msgstr ""
+
+#: plugins/mail/init.php:35
+#, fuzzy
+msgid "Mail plugin"
+msgstr "Wtyczki użytkowników"
+
+#: plugins/mail/init.php:37
+msgid "You can set predefined email addressed here (comma-separated list):"
+msgstr ""
+
+#: plugins/mail/init.php:146
+msgid "To:"
+msgstr "Do:"
+
+#: plugins/mail/init.php:161
+msgid "Subject:"
+msgstr "Temat:"
+
+#: plugins/mail/init.php:178
+msgid "Send e-mail"
+msgstr "Wyślij email"
+
+#: plugins/note/init.php:28
+#: plugins/note/note.js:11
+msgid "Edit article note"
+msgstr "Edytuj notatkę do artykułu"
+
+#: plugins/auth_internal/init.php:67
+msgid "Please enter your one time password:"
+msgstr "Wprowadź hasło jednorazowe:"
+
+#: plugins/auth_internal/init.php:208
+msgid "Password has been changed."
+msgstr "Hasło zostało zmienione."
+
+#: plugins/auth_internal/init.php:210
+msgid "Old password is incorrect."
+msgstr "Nieprawidłowe stare hasło."
+
+#: js/FeedTree.js:76
 #, fuzzy
 msgid "(Un)collapse"
 msgstr "Zwin/rozwiń pasek boczny"
 
-#: js/PrefFeedTree.js:35
+#: js/PrefFeedTree.js:36
 msgid "Edit category"
 msgstr "Edytuj kategorię"
 
-#: js/PrefFeedTree.js:42
+#: js/PrefFeedTree.js:43
 msgid "Remove category"
 msgstr "Usuń kategorię"
 
-#: js/PrefFilterTree.js:46
+#: js/PrefFilterTree.js:47
 msgid "Inverse"
 msgstr "Odwróć"
 
-#: js/feedlist.js:511
+#: js/feedlist.js:461
 #, 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:514
+#: js/feedlist.js:464
 #, 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:517
+#: js/feedlist.js:467
 #, 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:520
+#: js/feedlist.js:470
 #, fuzzy
 msgid "Mark %w in %s as read?"
 msgstr "Oznaczyć wszystkie artykuły w %s jako przeczytane?"
 
-#: js/feedlist.js:523
+#: js/feedlist.js:473
 #, fuzzy
 msgid "search results"
 msgstr "Wyniki wyszukiwania: %s"
 
-#: js/feedlist.js:523
+#: js/feedlist.js:473
 #, fuzzy
 msgid "all articles"
 msgstr "Wszystkie artykuły"
 
-#: js/functions.js:74
+#: js/functions.js:100
 #, fuzzy
 msgid "Close"
 msgstr "zamknij"
 
-#: js/functions.js:141
+#: js/functions.js:167
 msgid "Click to close"
 msgstr "Kliknij aby zamknąć"
 
-#: js/functions.js:448
+#: js/functions.js:456
 msgid "Error explained"
 msgstr "Wyjaśnienie błędu"
 
-#: js/functions.js:592
+#: js/functions.js:490
+msgid "Upload complete."
+msgstr "Przesyłanie ukończone."
+
+#: js/functions.js:508
+msgid "Remove stored feed icon?"
+msgstr "Usuń zapisaną ikonę kanału."
+
+#: js/functions.js:510
+msgid "Removing feed icon..."
+msgstr "Usuwanie ikony kanału..."
+
+#: js/functions.js:515
+msgid "Feed icon removed."
+msgstr "Ikona kanału usunięta."
+
+#: js/functions.js:532
+msgid "Please select an image file to upload."
+msgstr "Wybierz obrazek do wysłania."
+
+#: js/functions.js:533
+msgid "Upload new icon for this feed?"
+msgstr "Wgrać nową ikonę dla tego kanału?"
+
+#: js/functions.js:534
+msgid "Uploading, please wait..."
+msgstr "Trwa ładowanie, proszę czekać..."
+
+#: js/functions.js:542
+msgid "Please enter label caption:"
+msgstr "Proszę wprowadzić opis etykiety:"
+
+#: js/functions.js:575
 msgid "Subscribe to Feed"
 msgstr "Prenumeruj kanał"
 
-#: js/functions.js:621
+#: js/functions.js:602
 msgid "Failed to parse output. This can indicate server timeout and/or network issues. Backend output was logged to browser console."
 msgstr ""
 
-#: js/functions.js:636
+#: js/functions.js:617
 #, perl-format
 msgid "Subscribed to %s"
 msgstr "Zaprenumerowano kanał %s"
 
-#: js/functions.js:641
+#: js/functions.js:622
 msgid "Specified URL seems to be invalid."
 msgstr "Wprowadzony adres jest niepoprawny."
 
-#: js/functions.js:644
+#: js/functions.js:625
 msgid "Specified URL doesn't seem to contain any feeds."
 msgstr "Wprowadzony adres nie zawiera żadnych kanałów."
 
-#: js/functions.js:656
+#: js/functions.js:637
 msgid "Expand to select feed"
 msgstr "Rozwiń aby wybrać kanał"
 
-#: js/functions.js:668
+#: js/functions.js:649
 #, perl-format
 msgid "Couldn't download the specified URL: %s"
 msgstr "Nie udało się pobrać wprowadzonego adresu: %s"
 
-#: js/functions.js:672
+#: js/functions.js:653
 #, perl-format
 msgid "XML validation failed: %s"
 msgstr "Weryfikacja XML niepowiodła się: %s"
 
-#: js/functions.js:676
+#: js/functions.js:657
 msgid "You are already subscribed to this feed."
 msgstr "Prenumerujesz już ten kanał."
 
-#: js/functions.js:1136
+#: js/functions.js:1098
 msgid "Generate new syndication address for this feed?"
 msgstr "Wygenerowań nowy adres do dzielenia się tym kanałem?"
 
-#: js/functions.js:1140
-#: js/prefs.js:1095
+#: js/functions.js:1100
+#: js/prefs.js:870
 msgid "Trying to change address..."
 msgstr "Próbuje zmienić adres..."
 
-#: js/functions.js:1245
-#: js/tt-rss.js:446
-#: js/tt-rss.js:673
+#: js/functions.js:1199
+#: js/tt-rss.js:399
+#: js/tt-rss.js:612
 msgid "You can't edit this kind of feed."
 msgstr "Nie możesz edytować kanału tego typu."
 
-#: js/functions.js:1260
+#: js/functions.js:1213
 msgid "Edit Feed"
 msgstr "Edytuj kanał"
 
-#: js/functions.js:1266
-#: js/prefs.js:100
-#: js/prefs.js:209
-#: js/prefs.js:647
+#: js/functions.js:1217
+#: js/prefs.js:176
+#: js/prefs.js:523
+#: js/prefs.js:1139
+#: js/prefs.js:78
 msgid "Saving data..."
 msgstr "Zapisywanie danych..."
 
-#: js/functions.js:1293
+#: js/functions.js:1243
 msgid "More Feeds"
 msgstr "Więcej kanałów"
 
-#: js/functions.js:1355
-#: js/functions.js:1464
-#: js/prefs.js:398
-#: js/prefs.js:540
-#: js/prefs.js:558
-#: js/prefs.js:1077
+#: js/functions.js:1297
+#: js/functions.js:1383
+#: js/prefs.js:332
+#: js/prefs.js:455
+#: js/prefs.js:473
+#: js/prefs.js:855
 msgid "No feeds are selected."
 msgstr "Nie wybrano żadnego kanału."
 
-#: js/functions.js:1398
+#: js/functions.js:1329
 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:1435
+#: js/functions.js:1360
 msgid "Feeds with update errors"
 msgstr "Kanały z błędami aktualizacji"
 
-#: js/functions.js:1446
-#: js/prefs.js:1058
+#: js/functions.js:1369
+#: js/prefs.js:841
 msgid "Remove selected feeds?"
 msgstr "Usunąć wybrane kanały?"
 
-#: js/functions.js:1449
-#: js/prefs.js:1061
+#: js/functions.js:1370
+#: js/prefs.js:842
 msgid "Removing selected feeds..."
 msgstr "Usuwanie wybranych kanałów..."
 
-#: js/prefs.js:60
-msgid "Please enter login:"
-msgstr "Wprowadź nazwę użytkownika:"
-
-#: js/prefs.js:67
-msgid "Can't create user: no login specified."
-msgstr "Nie stworzono użytkownika: nie wprowadzono nazwy użytkownika."
-
-#: js/prefs.js:71
-msgid "Adding user..."
-msgstr "Dodawanie użytkownika..."
-
-#: js/prefs.js:96
-msgid "User Editor"
-msgstr "Edytor użytkowników"
-
-#: js/prefs.js:131
-msgid "Edit Filter"
-msgstr "Edytuj filtr"
-
-#: js/prefs.js:170
+#: js/prefs.js:143
 msgid "Remove filter?"
 msgstr "Usunąć filtr?"
 
-#: js/prefs.js:175
+#: js/prefs.js:148
 msgid "Removing filter..."
 msgstr "Usuwanie filtra..."
 
-#: js/prefs.js:292
+#: js/prefs.js:251
 msgid "Remove selected labels?"
 msgstr "Usunąć wybrane etykiety?"
 
-#: js/prefs.js:295
+#: js/prefs.js:252
 msgid "Removing selected labels..."
 msgstr "Usuwanie wybranych etykiet..."
 
-#: js/prefs.js:308
-#: js/prefs.js:1144
+#: js/prefs.js:262
+#: js/prefs.js:909
 msgid "No labels are selected."
 msgstr "Nie wybrano żadnych etykiet."
 
-#: js/prefs.js:320
+#: js/prefs.js:274
 msgid "Remove selected users? Neither default admin nor your account will be removed."
 msgstr "Usunąć wybranych użytkowników? Domyślny administrator ani Twoje konto nie zostaną skasowane."
 
-#: js/prefs.js:323
+#: js/prefs.js:275
 msgid "Removing selected users..."
 msgstr "Usuwanie wybranych użytkowników..."
 
-#: js/prefs.js:338
-#: js/prefs.js:408
-#: js/prefs.js:427
-#: js/prefs.js:461
+#: js/prefs.js:286
+#: js/prefs.js:342
+#: js/prefs.js:361
+#: js/prefs.js:387
 msgid "No users are selected."
 msgstr "Nie wybrano użytkowników."
 
-#: js/prefs.js:350
+#: js/prefs.js:297
 msgid "Remove selected filters?"
 msgstr "Usunąć wybrane filtry?"
 
-#: js/prefs.js:353
+#: js/prefs.js:298
 msgid "Removing selected filters..."
 msgstr "Usuwanie wybranych filtrów..."
 
-#: js/prefs.js:366
-#: js/prefs.js:495
-#: js/prefs.js:514
+#: js/prefs.js:308
+#: js/prefs.js:419
+#: js/prefs.js:438
 msgid "No filters are selected."
 msgstr "Żadne filtry nie zostały wybrane."
 
-#: js/prefs.js:378
+#: js/prefs.js:319
 msgid "Unsubscribe from selected feeds?"
 msgstr "Zakończyć prenumeratę wybranych kanałów?"
 
-#: js/prefs.js:382
+#: js/prefs.js:321
 msgid "Unsubscribing from selected feeds..."
 msgstr "Kończenie prenumeraty wybranych kanałów..."
 
-#: js/prefs.js:413
-#: js/prefs.js:432
-#: js/prefs.js:466
+#: js/prefs.js:347
+#: js/prefs.js:366
+#: js/prefs.js:392
 msgid "Please select only one user."
 msgstr "Wybierz tylko jednego użytkownika."
 
-#: js/prefs.js:436
+#: js/prefs.js:370
 msgid "Reset password of selected user?"
 msgstr "Zresetować hasło wybranego użytkownika?"
 
-#: js/prefs.js:439
+#: js/prefs.js:371
 msgid "Resetting password for selected user..."
 msgstr "Resetowanie hasła wybranego użytkownika..."
 
-#: js/prefs.js:500
+#: js/prefs.js:424
 msgid "Please select only one filter."
 msgstr "Wybierz tylko jeden filtr."
 
-#: js/prefs.js:518
+#: js/prefs.js:442
 msgid "Combine selected filters?"
 msgstr "Połączyć wybrane filtry?"
 
-#: js/prefs.js:521
+#: js/prefs.js:443
 msgid "Joining filters..."
 msgstr "Scalanie filtrów..."
 
-#: js/prefs.js:580
+#: js/prefs.js:487
 msgid "Edit Multiple Feeds"
 msgstr "Edytuj wiele kanałów"
 
-#: js/prefs.js:604
+#: js/prefs.js:511
 msgid "Save changes to selected feeds?"
 msgstr "Zapisać zmiany w wybranych kanałach?"
 
-#: js/prefs.js:681
+#: js/prefs.js:552
 msgid "OPML Import"
 msgstr "Import OPML"
 
-#: js/prefs.js:700
+#: js/prefs.js:571
 msgid "Please choose an OPML file first."
 msgstr "Najpierw wybierz plik OPML."
 
-#: js/prefs.js:703
+#: js/prefs.js:574
 #: plugins/import_export/import_export.js:115
 msgid "Importing, please wait..."
 msgstr "Trwa import, proszę czekać..."
 
-#: js/prefs.js:869
+#: js/prefs.js:737
 msgid "Reset to defaults?"
 msgstr "Przywrócić ustawienia domyślne?"
 
-#: js/prefs.js:1468
-msgid "Subscribing to feeds..."
-msgstr "Prenumerowanie kanałów..."
+#: js/prefs.js:777
+#, perl-format
+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:1487
-msgid "Clear stored data for this plugin?"
-msgstr "Wyczyścić zapamiętane dane tej wtyczki?"
+#: js/prefs.js:778
+msgid "Removing category..."
+msgstr "Usuwanie kategorii..."
 
-#: js/prefs.js:1501
-msgid "Clear all messages in the error log?"
-msgstr "Usunąć wszystkie wiadomości z dziennika błędów?"
+#: js/prefs.js:794
+msgid "Remove selected categories?"
+msgstr "Usunąć wybrane kategorię?"
 
-#: js/tt-rss.js:118
+#: js/prefs.js:795
+msgid "Removing selected categories..."
+msgstr "Usuwanie wybranych kategorii..."
+
+#: js/prefs.js:805
+msgid "No categories are selected."
+msgstr "Nie wybrano żadnej kategorii."
+
+#: js/prefs.js:812
+msgid "Category title:"
+msgstr "Tytuł kategorii:"
+
+#: js/prefs.js:815
+msgid "Creating category..."
+msgstr "Tworzenie kategorii..."
+
+#: js/prefs.js:832
+msgid "Feeds without recent updates"
+msgstr "Kanały nieaktualizowane ostatnio"
+
+#: js/prefs.js:869
+msgid "Replace current OPML publishing address with a new one?"
+msgstr "Zastąpić obecny adres publikacji OPML nowym adresem?"
+
+#: js/prefs.js:898
+msgid "Reset selected labels to default colors?"
+msgstr "Przywrócić domyślne kolory wybranym etykietom?"
+
+#: js/prefs.js:926
+msgid "Settings Profiles"
+msgstr "Profile ustawień"
+
+#: js/prefs.js:935
+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:936
+msgid "Removing selected profiles..."
+msgstr "Usuwanie wybranych profili..."
+
+#: js/prefs.js:948
+msgid "No profiles are selected."
+msgstr "Nie wybrano żadnych profili."
+
+#: js/prefs.js:955
+#: js/prefs.js:997
+msgid "Activate selected profile?"
+msgstr "Uaktywnić wybrany profil?"
+
+#: js/prefs.js:964
+#: js/prefs.js:1008
+msgid "Please choose a profile to activate."
+msgstr "Wybierz profil do uaktywnienia."
+
+#: js/prefs.js:969
+msgid "Creating profile..."
+msgstr "Tworzenie profili...."
+
+#: js/prefs.js:1016
+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:1017
+#: plugins/share/share_prefs.js:3
+msgid "Clearing URLs..."
+msgstr "Czyszczę URLe..."
+
+#: js/prefs.js:1020
+msgid "Generated URLs cleared."
+msgstr "Wyczyszczono wygenerowane adresy URL."
+
+#: js/prefs.js:1053
+#, fuzzy
+msgid "Rename category to:"
+msgstr "Usuń kategorię"
+
+#: js/prefs.js:1074
+msgid "Label Editor"
+msgstr "Edytor etykiet"
+
+#: js/tt-rss.js:111
 msgid "Mark all articles as read?"
 msgstr "Oznaczyć wszystkie artykuły jako przeczytane?"
 
-#: js/tt-rss.js:124
+#: js/tt-rss.js:115
 msgid "Marking all feeds as read..."
 msgstr "Oznaczam wszystkie kanały jako przeczytane..."
 
-#: js/tt-rss.js:398
+#: js/tt-rss.js:351
 msgid "Please enable mail plugin first."
 msgstr "Włącz najpierw wtyczkę obsługi poczty (mail)."
 
-#: js/tt-rss.js:527
+#: js/tt-rss.js:477
 msgid "Please enable embed_original plugin first."
 msgstr "Włącz najpierw wtyczkę osadzania oryginalnej wiadomości (embed_original)."
 
-#: js/tt-rss.js:540
-#: js/tt-rss.js:723
+#: js/tt-rss.js:490
+#: js/tt-rss.js:653
 msgid "Widescreen is not available in combined mode."
 msgstr ""
 
-#: js/tt-rss.js:821
-msgid "You can't rescore this kind of feed."
-msgstr "Nie możesz przeliczyć punktacji kanału tego rodzaju."
-
-#: js/tt-rss.js:826
-#: js/tt-rss.js:686
-msgid "Please select some feed first."
-msgstr "Wybierz najpierw jakiś kanał."
-
-#: js/tt-rss.js:831
-#, perl-format
-msgid "Rescore articles in %s?"
-msgstr "Przeliczyć punktację artykułów w %s?"
-
-#: js/tt-rss.js:834
-msgid "Rescoring articles..."
-msgstr "Przeliczanie punktacji kanałów..."
-
-#: js/viewfeed.js:917
-#: js/viewfeed.js:955
-#: js/viewfeed.js:1003
-#: js/viewfeed.js:1924
-#: plugins/mail/mail.js:7
+#: js/viewfeed.js:444
+#: js/viewfeed.js:461
+#: js/viewfeed.js:484
+#: js/viewfeed.js:521
+#: js/viewfeed.js:542
+#: js/viewfeed.js:651
+#: js/viewfeed.js:685
+#: js/viewfeed.js:727
+#: js/viewfeed.js:1564
 #: plugins/mailto/init.js:7
-#: js/viewfeed.js:675
-#: js/viewfeed.js:697
-#: js/viewfeed.js:718
-#: js/viewfeed.js:777
-#: js/viewfeed.js:805
+#: plugins/mail/mail.js:7
 msgid "No articles are selected."
 msgstr "Nie wybrano żadnych artykułów"
 
-#: js/viewfeed.js:925
+#: js/viewfeed.js:659
 #, perl-format
 msgid "Delete %d selected article in %s?"
 msgid_plural "Delete %d selected articles in %s?"
@@ -3124,7 +3193,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:927
+#: js/viewfeed.js:661
 #, perl-format
 msgid "Delete %d selected article?"
 msgid_plural "Delete %d selected articles?"
@@ -3132,7 +3201,7 @@ msgstr[0] "Usunąć %d zaznaczony artykuł?"
 msgstr[1] "Usunąć %d zaznaczone artykuły?"
 msgstr[2] "Usunąć %d zaznaczonych artykułów?"
 
-#: js/viewfeed.js:964
+#: js/viewfeed.js:694
 #, perl-format
 msgid "Archive %d selected article in %s?"
 msgid_plural "Archive %d selected articles in %s?"
@@ -3140,7 +3209,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:967
+#: js/viewfeed.js:697
 #, perl-format
 msgid "Move %d archived article back?"
 msgid_plural "Move %d archived articles back?"
@@ -3148,11 +3217,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:969
+#: js/viewfeed.js:698
 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:1009
+#: js/viewfeed.js:733
 #, perl-format
 msgid "Mark %d selected article in %s as read?"
 msgid_plural "Mark %d selected articles in %s as read?"
@@ -3160,65 +3229,91 @@ 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:1029
+#: js/viewfeed.js:753
 msgid "Edit article Tags"
 msgstr "Edytuj tagi artykułu"
 
-#: js/viewfeed.js:1035
+#: js/viewfeed.js:757
 msgid "Saving article tags..."
 msgstr "Zapisuję tagi artykułu..."
 
-#: js/viewfeed.js:1666
+#: js/viewfeed.js:1015
+msgid "No article is selected."
+msgstr "Nie wybrano żadnego artykułu."
+
+#: js/viewfeed.js:1050
+msgid "No articles found to mark"
+msgstr "Nie znaleziono artykułów do oznaczenia"
+
+#: js/viewfeed.js:1052
+#, perl-format
+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?"
+
+#: js/viewfeed.js:1312
 msgid "Open original article"
 msgstr "Otwórz oryginalny artykuł"
 
-#: js/viewfeed.js:1673
+#: js/viewfeed.js:1319
 msgid "Display article URL"
 msgstr "Wyświetl adres artykułu"
 
-#: js/viewfeed.js:1780
+#: js/viewfeed.js:1426
 msgid "Assign label"
 msgstr "Przypisz etykietę"
 
-#: js/viewfeed.js:1785
+#: js/viewfeed.js:1431
 msgid "Remove label"
 msgstr "Usuń etykietę"
 
-#: js/viewfeed.js:1817
+#: js/viewfeed.js:1463
 #, fuzzy
 msgid "Select articles in group"
 msgstr "Wybierz artykuł pod kursorem"
 
-#: js/viewfeed.js:1827
+#: js/viewfeed.js:1473
 #, fuzzy
 msgid "Mark group as read"
 msgstr "Oznacz jako przeczytane"
 
-#: js/viewfeed.js:1839
+#: js/viewfeed.js:1485
 msgid "Mark feed as read"
 msgstr "Oznacz kanał jako przeczytany"
 
-#: js/viewfeed.js:1892
+#: js/viewfeed.js:1538
 msgid "Please enter new score for selected articles:"
 msgstr "Wprowadź nową punktację dla wybranych artykułów:"
 
-#: js/viewfeed.js:1955
+#: js/viewfeed.js:1571
 msgid "Please enter new score for this article:"
 msgstr "Wprowadź nową punktację dla tego artykułu:"
 
-#: js/viewfeed.js:1986
+#: js/viewfeed.js:1591
 msgid "Article URL:"
 msgstr "Adres artykułu:"
 
-#: plugins/note/note.js:17
-msgid "Saving article note..."
-msgstr "Zapisuję notatkę do artykułu..."
+#: 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/af_psql_trgm/init.js:11
 #, fuzzy
 msgid "Related articles"
 msgstr "Usuń artykuł"
 
+#: plugins/mailto/init.js:21
+#: plugins/mail/mail.js:21
+msgid "Forward article by email"
+msgstr "Prześlij artykuł emailem"
+
+#: plugins/shorten_expanded/init.js:43
+#, fuzzy
+msgid "Click to expand article"
+msgstr "Kliknij aby powiększyć artykuł."
+
 #: plugins/import_export/import_export.js:13
 msgid "Export Data"
 msgstr "Eksportuj dane"
@@ -3239,264 +3334,173 @@ msgstr "Importuj dane"
 msgid "Please choose the file first."
 msgstr "Najpierw wybierz plik."
 
-#: plugins/mail/mail.js:21
-#: plugins/mailto/init.js:21
-msgid "Forward article by email"
-msgstr "Prześlij artykuł emailem"
+#: plugins/share/share_prefs.js:2
+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/mail/mail.js:36
-msgid "Error sending email:"
-msgstr ""
-
-#: plugins/mail/mail.js:38
-#, fuzzy
-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:45
-#, fuzzy
-msgid "Click to expand article"
-msgstr "Kliknij aby powiększyć artykuł."
+#: plugins/share/share_prefs.js:8
+msgid "Shared URLs cleared."
+msgstr "Udostępniane adresy zostały wyczyszczone."
 
 #: plugins/share/share.js:10
 msgid "Share article by URL"
 msgstr "Udostępnij artykuł"
 
-#: plugins/share/share.js:14
+#: plugins/share/share.js:13
 msgid "Generate new share URL for this article?"
 msgstr "Wygenerować nowy URL dla udostępnianego artukułu?"
 
-#: plugins/share/share.js:18
+#: plugins/share/share.js:15
 msgid "Trying to change URL..."
 msgstr "Próbuję zmienić adres..."
 
-#: plugins/share/share.js:55
+#: plugins/share/share.js:48
 msgid "Remove sharing for this article?"
 msgstr "Wyłączyć udostępnianie tego artykułu?"
 
-#: plugins/share/share.js:59
+#: plugins/share/share.js:50
 msgid "Trying to unshare..."
 msgstr "Próbuje zakończyć udostępnianie..."
 
-#: plugins/share/share_prefs.js:3
-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/mail/mail.js:30
+msgid "Error sending email:"
+msgstr ""
 
-#: plugins/share/share_prefs.js:6
-#: js/prefs.js:1277
-msgid "Clearing URLs..."
-msgstr "Czyszczę URLe..."
+#: plugins/mail/mail.js:32
+#, fuzzy
+msgid "Your message has been sent."
+msgstr "Dwoje dane osobiste zostały zapisane."
 
-#: plugins/share/share_prefs.js:13
-msgid "Shared URLs cleared."
-msgstr "Udostępniane adresy zostały wyczyszczone."
+#: plugins/note/note.js:15
+msgid "Saving article note..."
+msgstr "Zapisuję notatkę do artykułu..."
 
-#: js/feedlist.js:204
+#: js/feedlist.js:168
 #, fuzzy
 msgid "Your password is at default value"
 msgstr "Używasz domyślnego hasła, zmień je proszę."
 
-#: js/feedlist.js:453
+#: js/feedlist.js:413
 msgid "Mark all articles in %s as read?"
 msgstr "Oznaczyć wszystkie artykuły w %s jako przeczytane?"
 
-#: js/functions.js:494
-msgid "Upload complete."
-msgstr "Przesyłanie ukończone."
-
-#: js/functions.js:511
-msgid "Remove stored feed icon?"
-msgstr "Usuń zapisaną ikonę kanału."
-
-#: js/functions.js:516
-msgid "Removing feed icon..."
-msgstr "Usuwanie ikony kanału..."
-
-#: js/functions.js:521
-msgid "Feed icon removed."
-msgstr "Ikona kanału usunięta."
-
-#: js/functions.js:537
-msgid "Please select an image file to upload."
-msgstr "Wybierz obrazek do wysłania."
-
-#: js/functions.js:539
-msgid "Upload new icon for this feed?"
-msgstr "Wgrać nową ikonę dla tego kanału?"
-
-#: js/functions.js:540
-msgid "Uploading, please wait..."
-msgstr "Trwa ładowanie, proszę czekać..."
-
-#: js/functions.js:550
-msgid "Please enter label caption:"
-msgstr "Proszę wprowadzić opis etykiety:"
-
-#: js/functions.js:555
-msgid "Can't create label: missing caption."
-msgstr "Nie udało się utworzyć etykiety: brak opisu."
-
-#: js/functions.js:797
+#: js/functions.js:764
 msgid "Edit rule"
 msgstr "Edytuj regułę"
 
-#: js/functions.js:819
+#: js/functions.js:786
 msgid "Edit action"
 msgstr "Edytuj działanie"
 
-#: js/functions.js:860
+#: js/functions.js:825
 msgid "Looking for articles (%d processed, %f found)..."
 msgstr ""
 
-#: js/functions.js:890
+#: js/functions.js:855
 #, fuzzy
 msgid "Found %d articles matching this filter:"
 msgstr "Artykuły pasujące do filtra:"
 
-#: js/functions.js:942
+#: js/functions.js:907
 msgid "Create Filter"
 msgstr "Utwórz filtr"
 
-#: js/functions.js:1060
-#: js/tt-rss.js:692
+#: js/functions.js:1016
+#: js/tt-rss.js:631
 msgid "Unsubscribe from %s?"
 msgstr "Zakończyć prenumeratę %s?"
 
-#: js/functions.js:1063
+#: js/functions.js:1019
 msgid "Removing feed..."
 msgstr "Usuwanie kanału..."
 
-#: js/functions.js:1489
+#: js/functions.js:1410
 msgid "Help"
 msgstr "Pomoc"
 
-#: js/prefs.js:973
-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:44
+msgid "Please enter login:"
+msgstr "Wprowadź nazwę użytkownika:"
 
-#: js/prefs.js:979
-msgid "Removing category..."
-msgstr "Usuwanie kategorii..."
+#: js/prefs.js:51
+msgid "Can't create user: no login specified."
+msgstr "Nie stworzono użytkownika: nie wprowadzono nazwy użytkownika."
 
-#: js/prefs.js:997
-msgid "Remove selected categories?"
-msgstr "Usunąć wybrane kategorię?"
+#: js/prefs.js:55
+msgid "Adding user..."
+msgstr "Dodawanie użytkownika..."
 
-#: js/prefs.js:1000
-msgid "Removing selected categories..."
-msgstr "Usuwanie wybranych kategorii..."
+#: js/prefs.js:74
+msgid "User Editor"
+msgstr "Edytor użytkowników"
 
-#: js/prefs.js:1013
-msgid "No categories are selected."
-msgstr "Nie wybrano żadnej kategorii."
+#: js/prefs.js:104
+msgid "Edit Filter"
+msgstr "Edytuj filtr"
 
-#: js/prefs.js:1020
-msgid "Category title:"
-msgstr "Tytuł kategorii:"
+#: js/prefs.js:1175
+msgid "Subscribing to feeds..."
+msgstr "Prenumerowanie kanałów..."
 
-#: js/prefs.js:1024
-msgid "Creating category..."
-msgstr "Tworzenie kategorii..."
+#: js/prefs.js:1191
+msgid "Clear stored data for this plugin?"
+msgstr "Wyczyścić zapamiętane dane tej wtyczki?"
 
-#: js/prefs.js:1047
-msgid "Feeds without recent updates"
-msgstr "Kanały nieaktualizowane ostatnio"
+#: js/prefs.js:1203
+msgid "Clear all messages in the error log?"
+msgstr "Usunąć wszystkie wiadomości z dziennika błędów?"
 
-#: js/prefs.js:1091
-msgid "Replace current OPML publishing address with a new one?"
-msgstr "Zastąpić obecny adres publikacji OPML nowym adresem?"
-
-#: js/prefs.js:1129
-msgid "Reset selected labels to default colors?"
-msgstr "Przywrócić domyślne kolory wybranym etykietom?"
-
-#: js/prefs.js:1161
-msgid "Settings Profiles"
-msgstr "Profile ustawień"
-
-#: js/prefs.js:1170
-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:1173
-msgid "Removing selected profiles..."
-msgstr "Usuwanie wybranych profili..."
-
-#: js/prefs.js:1189
-msgid "No profiles are selected."
-msgstr "Nie wybrano żadnych profili."
-
-#: js/prefs.js:1197
-#: js/prefs.js:1250
-msgid "Activate selected profile?"
-msgstr "Uaktywnić wybrany profil?"
-
-#: js/prefs.js:1214
-#: js/prefs.js:1266
-msgid "Please choose a profile to activate."
-msgstr "Wybierz profil do uaktywnienia."
-
-#: js/prefs.js:1219
-msgid "Creating profile..."
-msgstr "Tworzenie profili...."
-
-#: js/prefs.js:1274
-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:1284
-msgid "Generated URLs cleared."
-msgstr "Wyczyszczono wygenerowane adresy URL."
-
-#: js/prefs.js:1356
-msgid "Label Editor"
-msgstr "Edytor etykiet"
-
-#: js/tt-rss.js:681
+#: js/tt-rss.js:620
 msgid "You can't unsubscribe from the category."
 msgstr "Nie możesz zrezygnować z prenumeraty tej kategorii."
 
-#: js/viewfeed.js:127
-#: js/viewfeed.js:177
-#: js/viewfeed.js:194
+#: js/tt-rss.js:625
+msgid "Please select some feed first."
+msgstr "Wybierz najpierw jakiś kanał."
+
+#: js/viewfeed.js:89
+#: js/viewfeed.js:135
+#: js/viewfeed.js:152
 #, fuzzy
 msgid "Click to open next unread feed."
 msgstr "Kliknij aby edytować kanał"
 
-#: js/viewfeed.js:131
+#: js/viewfeed.js:93
 msgid "Cancel search"
 msgstr "Anuluj wyszukiwanie"
 
-#: js/viewfeed.js:191
+#: js/viewfeed.js:149
 #, fuzzy
 msgid "New articles found, reload feed to continue."
 msgstr "Nie znaleziono artykułów."
 
-#: js/viewfeed.js:620
+#: js/viewfeed.js:405
 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:1284
-msgid "No article is selected."
-msgstr "Nie wybrano żadnego artykułu."
+#~ msgid "Rescore feed"
+#~ msgstr "Przelicz punktację kanału"
 
-#: js/viewfeed.js:1319
-msgid "No articles found to mark"
-msgstr "Nie znaleziono artykułów do oznaczenia"
+#~ msgid "Create label..."
+#~ msgstr "Utwórz etykietę..."
 
-#: js/viewfeed.js:1321
-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 "Create filter..."
+#~ msgstr "Utwórz filtr..."
+
+#~ msgid "You can't rescore this kind of feed."
+#~ msgstr "Nie możesz przeliczyć punktacji kanału tego rodzaju."
+
+#~ msgid "Rescore articles in %s?"
+#~ msgstr "Przeliczyć punktację artykułów w %s?"
+
+#~ msgid "Rescoring articles..."
+#~ msgstr "Przeliczanie punktacji kanałów..."
+
+#~ msgid "Can't create label: missing caption."
+#~ msgstr "Nie udało się utworzyć etykiety: brak opisu."
 
 #~ msgid "Firefox integration"
 #~ msgstr "Integracja z Firefoxem"
diff --git a/locale/pt_BR/LC_MESSAGES/messages.mo b/locale/pt_BR/LC_MESSAGES/messages.mo
index be5c803f7..d16681a6d 100755
Binary files a/locale/pt_BR/LC_MESSAGES/messages.mo and b/locale/pt_BR/LC_MESSAGES/messages.mo differ
diff --git a/locale/pt_BR/LC_MESSAGES/messages.po b/locale/pt_BR/LC_MESSAGES/messages.po
index b2a9df5ad..7939c5057 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: 2018-10-10 08:24+0300\n"
+"POT-Creation-Date: 2018-12-01 12:59+0300\n"
 "PO-Revision-Date: 2018-04-28 09:07-0300\n"
 "Last-Translator: Eduardo Kalinowski <eduardo@kalinowski.com.br>\n"
 "Language-Team: Portuguese/Brazil\n"
@@ -91,8 +91,8 @@ msgid "Weekly"
 msgstr "Semanalmente"
 
 #: backend.php:103
-#: classes/pref/users.php:47
 #: classes/pref/system.php:51
+#: classes/pref/users.php:47
 msgid "User"
 msgstr "Usuário"
 
@@ -162,33 +162,33 @@ msgstr "Plugin não encontrado"
 
 #: index.php:151
 #: index.php:167
-#: index.php:285
+#: index.php:282
 #: prefs.php:120
 #: classes/backend.php:5
 #: classes/pref/labels.php:294
-#: classes/pref/feeds.php:1230
 #: classes/pref/filters.php:822
-#: js/feedlist.js:148
-#: js/feedlist.js:491
-#: js/feedlist.js:539
-#: js/functions.js:314
-#: js/functions.js:1336
-#: js/prefs.js:562
-#: js/prefs.js:754
-#: js/prefs.js:1488
-#: js/prefs.js:1503
-#: js/tt-rss.js:547
-#: js/viewfeed.js:1180
+#: classes/pref/feeds.php:1229
+#: js/feedlist.js:118
+#: js/feedlist.js:446
+#: js/feedlist.js:487
+#: js/functions.js:328
+#: js/functions.js:551
+#: js/functions.js:1286
+#: js/prefs.js:477
+#: js/prefs.js:617
+#: js/prefs.js:956
+#: js/prefs.js:1000
+#: js/prefs.js:1028
+#: js/prefs.js:1037
+#: js/prefs.js:1045
+#: js/prefs.js:1057
+#: js/tt-rss.js:497
+#: js/viewfeed.js:509
+#: js/viewfeed.js:928
 #: plugins/import_export/import_export.js:17
-#: js/functions.js:565
-#: js/prefs.js:1200
-#: js/prefs.js:1253
-#: js/prefs.js:1292
-#: js/prefs.js:1305
-#: js/prefs.js:1316
-#: js/prefs.js:1331
-#: js/tt-rss.js:564
-#: js/viewfeed.js:760
+#: js/prefs.js:1192
+#: js/prefs.js:1205
+#: js/tt-rss.js:510
 msgid "Loading, please wait..."
 msgstr "Carregando, por favor aguarde..."
 
@@ -205,13 +205,13 @@ msgid "All Articles"
 msgstr "Todos os artigos"
 
 #: index.php:194
-#: include/functions.php:1227
+#: include/functions.php:1172
 #: classes/feeds.php:110
 msgid "Starred"
 msgstr "Favoritos"
 
 #: index.php:195
-#: include/functions.php:1228
+#: include/functions.php:1173
 #: classes/feeds.php:111
 msgid "Published"
 msgstr "Publicados"
@@ -251,11 +251,11 @@ msgid "Title"
 msgstr "Título"
 
 #: index.php:211
-#: index.php:251
-#: include/functions.php:1215
+#: index.php:250
+#: include/functions.php:1160
 #: classes/feeds.php:115
-#: js/FeedTree.js:41
-#: js/FeedTree.js:69
+#: js/FeedTree.js:42
+#: js/FeedTree.js:70
 msgid "Mark as read"
 msgstr "Marcar como lido"
 
@@ -292,7 +292,7 @@ msgid "Feed actions:"
 msgstr "Ações do feed:"
 
 #: index.php:246
-#: classes/handler/public.php:551
+#: classes/handler/public.php:575
 msgid "Subscribe to feed..."
 msgstr "Inscrever-se ao feed..."
 
@@ -301,56 +301,44 @@ msgid "Edit this feed..."
 msgstr "Editar esta inscrição..."
 
 #: index.php:248
-msgid "Rescore feed"
-msgstr "Reclassificar feed"
-
-#: index.php:249
-#: classes/pref/feeds.php:770
-#: classes/pref/feeds.php:1203
-#: js/PrefFeedTree.js:61
+#: classes/pref/feeds.php:769
+#: classes/pref/feeds.php:1202
+#: js/PrefFeedTree.js:62
 msgid "Unsubscribe"
 msgstr "Cancelar inscrição"
 
-#: index.php:250
+#: index.php:249
 msgid "All feeds:"
 msgstr "Todos os feeds:"
 
-#: index.php:252
+#: index.php:251
 msgid "(Un)hide read feeds"
 msgstr "Mostrar/Ocultar feeds lidos"
 
-#: index.php:253
+#: index.php:252
 msgid "Other actions:"
 msgstr "Outras ações:"
 
-#: index.php:254
-#: include/functions.php:1201
+#: index.php:253
+#: include/functions.php:1146
 msgid "Toggle widescreen mode"
 msgstr "Ativa/Desativa modo tela-cheia"
 
-#: index.php:255
-msgid "Create label..."
-msgstr "Criar marcador..."
-
-#: index.php:256
-msgid "Create filter..."
-msgstr "Criar filtro..."
-
-#: index.php:257
+#: index.php:254
 msgid "Keyboard shortcuts help"
 msgstr "Ajuda para atalhos de teclado"
 
-#: index.php:266
+#: index.php:263
 msgid "Logout"
 msgstr "Sair"
 
-#: index.php:272
+#: index.php:269
 msgid "Updates are available from Git."
 msgstr "Atualizações estão disponíveis via Git."
 
 #: prefs.php:33
 #: prefs.php:138
-#: include/functions.php:1230
+#: include/functions.php:1175
 #: classes/pref/prefs.php:425
 msgid "Preferences"
 msgstr "Preferências"
@@ -365,8 +353,8 @@ msgstr "Sair das preferências"
 
 #: prefs.php:141
 #: classes/pref/feeds.php:114
-#: classes/pref/feeds.php:1138
-#: classes/pref/feeds.php:1192
+#: classes/pref/feeds.php:1137
+#: classes/pref/feeds.php:1191
 msgid "Feeds"
 msgstr "Inscrições"
 
@@ -376,8 +364,8 @@ msgid "Filters"
 msgstr "Filtros"
 
 #: prefs.php:147
+#: classes/feeds.php:1696
 #: classes/pref/labels.php:94
-#: classes/feeds.php:1710
 msgid "Labels"
 msgstr "Marcadores"
 
@@ -389,80 +377,80 @@ msgstr "Usuários"
 msgid "System"
 msgstr "Sistema"
 
-#: register.php:186
+#: register.php:185
 #: include/login_form.php:162
 msgid "Create new account"
 msgstr "Criar uma nova conta"
 
-#: register.php:192
+#: register.php:191
 msgid "New user registrations are administratively disabled."
 msgstr "Registro de novos usuários foi desativado pelo administrador."
 
-#: register.php:196
-#: register.php:241
-#: register.php:254
-#: register.php:269
-#: register.php:288
-#: register.php:336
-#: register.php:346
-#: register.php:358
-#: classes/handler/public.php:623
-#: classes/handler/public.php:697
-#: classes/handler/public.php:798
-#: classes/handler/public.php:877
-#: classes/handler/public.php:891
-#: classes/handler/public.php:898
-#: classes/handler/public.php:923
+#: register.php:195
+#: register.php:240
+#: register.php:253
+#: register.php:268
+#: register.php:287
+#: register.php:334
+#: register.php:344
+#: register.php:356
+#: classes/handler/public.php:647
+#: classes/handler/public.php:721
+#: 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"
 
-#: register.php:217
+#: register.php:216
 msgid "Your temporary password will be sent to the specified email. Accounts, which were not logged in once, are erased automatically 24 hours after temporary password is sent."
 msgstr "Sua senha temporária será enviada para o e-mail informado. Contas que não receberem pelo menos um acesso são apagadas automaticamente 24 horas depois do envio da senha temporária."
 
-#: register.php:223
+#: register.php:222
 msgid "Desired login:"
 msgstr "Nome de usuário:"
 
-#: register.php:226
+#: register.php:225
 msgid "Check availability"
 msgstr "Verificar disponibilidade"
 
-#: register.php:228
-#: classes/handler/public.php:713
+#: register.php:227
+#: classes/handler/public.php:737
 msgid "Email:"
 msgstr "E-mail:"
 
-#: register.php:231
-#: classes/handler/public.php:718
+#: register.php:230
+#: classes/handler/public.php:742
 msgid "How much is two plus two:"
 msgstr "Quanto é dois mais dois:"
 
-#: register.php:234
+#: register.php:233
 msgid "Submit registration"
 msgstr "Enviar o cadastro"
 
-#: register.php:252
+#: register.php:251
 msgid "Your registration information is incomplete."
 msgstr "Sua informação de cadastro está incompleta."
 
-#: register.php:267
+#: register.php:266
 msgid "Sorry, this username is already taken."
 msgstr "Desculpe, esse nome de usuário já está sendo usado."
 
-#: register.php:286
+#: register.php:285
 msgid "Registration failed."
 msgstr "Processo de registro falhou."
 
-#: register.php:333
+#: register.php:331
 msgid "Account created successfully."
 msgstr "Conta criada com sucesso."
 
-#: register.php:355
+#: register.php:353
 msgid "New user registrations are currently closed."
 msgstr "Registro de novos usuários está suspenso."
 
-#: update.php:66
+#: update.php:67
 msgid "Tiny Tiny RSS data update script."
 msgstr "Script de atualização do Tiny Tiny RSS."
 
@@ -475,10 +463,10 @@ msgstr "Todos os feeds"
 
 #: include/controls.php:138
 #: include/controls.php:230
-#: classes/opml.php:512
-#: classes/digest.php:120
+#: classes/digest.php:124
+#: classes/feeds.php:1708
 #: classes/pref/feeds.php:233
-#: classes/feeds.php:1722
+#: classes/opml.php:512
 msgid "Uncategorized"
 msgstr "Não categorizado"
 
@@ -493,285 +481,285 @@ msgstr[1] "%d artigos arquivados"
 msgid "No feeds found."
 msgstr "Sem feeds para exibir."
 
-#: include/functions.php:983
+#: include/functions.php:928
 #, php-format
 msgid "%d min"
 msgstr "%d min"
 
-#: include/functions.php:1177
+#: include/functions.php:1122
 msgid "Navigation"
 msgstr "Navegação"
 
-#: include/functions.php:1178
+#: include/functions.php:1123
 msgid "Open next feed"
 msgstr "Abrir o próximo feed"
 
-#: include/functions.php:1179
+#: include/functions.php:1124
 msgid "Open previous feed"
 msgstr "Abrir o feed anterior"
 
-#: include/functions.php:1180
+#: include/functions.php:1125
 msgid "Open next article"
 msgstr "Abrir o próximo artigo"
 
-#: include/functions.php:1181
+#: include/functions.php:1126
 msgid "Open previous article"
 msgstr "Abrir o artigo anterior"
 
-#: include/functions.php:1182
+#: include/functions.php:1127
 msgid "Open next article (don't scroll long articles)"
 msgstr "Abrir o próximo artigo (não rola artigos longos)"
 
-#: include/functions.php:1183
+#: include/functions.php:1128
 msgid "Open previous article (don't scroll long articles)"
 msgstr "Abrir o artigo anterior (não rola artigos longos)"
 
-#: include/functions.php:1184
+#: include/functions.php:1129
 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/functions.php:1185
+#: include/functions.php:1130
 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/functions.php:1186
+#: include/functions.php:1131
 msgid "Show search dialog"
 msgstr "Mostrar janela de pesquisa"
 
-#: include/functions.php:1187
+#: include/functions.php:1132
 msgid "Article"
 msgstr "Artigo"
 
-#: include/functions.php:1188
-#: js/viewfeed.js:1695
+#: include/functions.php:1133
+#: js/viewfeed.js:1341
 msgid "Toggle starred"
 msgstr "Incluir/Remover estrela"
 
-#: include/functions.php:1189
-#: js/viewfeed.js:1707
+#: include/functions.php:1134
+#: js/viewfeed.js:1353
 msgid "Toggle published"
 msgstr "Marcar/Desmarcar como publicado"
 
-#: include/functions.php:1190
-#: js/viewfeed.js:1682
+#: include/functions.php:1135
+#: js/viewfeed.js:1328
 msgid "Toggle unread"
 msgstr "Marcar como não lido/lido"
 
-#: include/functions.php:1191
+#: include/functions.php:1136
 msgid "Edit tags"
 msgstr "Editar tags"
 
-#: include/functions.php:1192
+#: include/functions.php:1137
 msgid "Open in new window"
 msgstr "Abrir em uma nova janela"
 
-#: include/functions.php:1193
-#: js/viewfeed.js:1728
+#: include/functions.php:1138
+#: js/viewfeed.js:1374
 msgid "Mark below as read"
 msgstr "Marcar abaixo como lido"
 
-#: include/functions.php:1194
-#: js/viewfeed.js:1721
+#: include/functions.php:1139
+#: js/viewfeed.js:1367
 msgid "Mark above as read"
 msgstr "Marcar acima como lido"
 
-#: include/functions.php:1195
+#: include/functions.php:1140
 msgid "Scroll down"
 msgstr "Rolar para baixo"
 
-#: include/functions.php:1196
+#: include/functions.php:1141
 msgid "Scroll up"
 msgstr "Rolar para cima"
 
-#: include/functions.php:1197
+#: include/functions.php:1142
 msgid "Select article under cursor"
 msgstr "Selecionar artigo sob o cursor"
 
-#: include/functions.php:1198
+#: include/functions.php:1143
 msgid "Email article"
 msgstr "Enviar artigo por e-mail"
 
-#: include/functions.php:1199
+#: include/functions.php:1144
 msgid "Close/collapse article"
 msgstr "Fechar/contrair artigo"
 
-#: include/functions.php:1200
+#: include/functions.php:1145
 msgid "Toggle article expansion (combined mode)"
 msgstr "Ativar/Desativar expansão de artigo (modo combinado)"
 
-#: include/functions.php:1202
+#: include/functions.php:1147
 #: plugins/embed_original/init.php:33
 msgid "Toggle embed original"
 msgstr "Ativar/Desativar inclusão do original"
 
-#: include/functions.php:1203
+#: include/functions.php:1148
 msgid "Article selection"
 msgstr "Seleção de artigos"
 
-#: include/functions.php:1204
+#: include/functions.php:1149
 msgid "Select all articles"
 msgstr "Selecionar todos os artigos"
 
-#: include/functions.php:1205
+#: include/functions.php:1150
 msgid "Select unread"
 msgstr "Selecionar os não lidos"
 
-#: include/functions.php:1206
+#: include/functions.php:1151
 msgid "Select starred"
 msgstr "Selecionar artigos com estrela"
 
-#: include/functions.php:1207
+#: include/functions.php:1152
 msgid "Select published"
 msgstr "Selecionar artigos publicados"
 
-#: include/functions.php:1208
+#: include/functions.php:1153
 msgid "Invert selection"
 msgstr "Inverter seleção"
 
-#: include/functions.php:1209
+#: include/functions.php:1154
 msgid "Deselect everything"
 msgstr "Desmarcar tudo"
 
-#: include/functions.php:1210
-#: classes/pref/feeds.php:522
-#: classes/pref/feeds.php:794
+#: include/functions.php:1155
+#: classes/pref/feeds.php:521
+#: classes/pref/feeds.php:793
 msgid "Feed"
 msgstr "Feed"
 
-#: include/functions.php:1211
+#: include/functions.php:1156
 msgid "Refresh current feed"
 msgstr "Atualizar feed atual"
 
-#: include/functions.php:1212
+#: include/functions.php:1157
 msgid "Un/hide read feeds"
 msgstr "Ocultar/mostrar feeds lidos"
 
-#: include/functions.php:1213
-#: classes/pref/feeds.php:1195
+#: include/functions.php:1158
+#: classes/pref/feeds.php:1194
 msgid "Subscribe to feed"
 msgstr "Inscrever-se no feed"
 
-#: include/functions.php:1214
-#: js/FeedTree.js:48
-#: js/PrefFeedTree.js:55
-#: js/viewfeed.js:1846
+#: include/functions.php:1159
+#: js/FeedTree.js:49
+#: js/PrefFeedTree.js:56
+#: js/viewfeed.js:1492
 msgid "Edit feed"
 msgstr "Editar inscrição"
 
-#: include/functions.php:1216
+#: include/functions.php:1161
 msgid "Reverse headlines"
 msgstr "Reverter títulos"
 
-#: include/functions.php:1217
+#: include/functions.php:1162
 msgid "Toggle headline grouping"
 msgstr "Ativar/desativar agrupamento de títulos"
 
-#: include/functions.php:1218
+#: include/functions.php:1163
 msgid "Debug feed update"
 msgstr "Debugar atualização de feeds"
 
-#: include/functions.php:1219
+#: include/functions.php:1164
 msgid "Debug viewfeed()"
 msgstr "Debugar viewfeed()"
 
-#: include/functions.php:1220
-#: js/FeedTree.js:97
+#: include/functions.php:1165
+#: js/FeedTree.js:98
 msgid "Mark all feeds as read"
 msgstr "Marcar todos os feeds como lidos"
 
-#: include/functions.php:1221
+#: include/functions.php:1166
 msgid "Un/collapse current category"
 msgstr "Mostrar/Ocultar categoria atual"
 
-#: include/functions.php:1222
-msgid "Toggle combined mode"
-msgstr "Ativar/Desativar modo combinado"
-
-#: include/functions.php:1223
+#: include/functions.php:1167
 msgid "Toggle auto expand in combined mode"
 msgstr "Ativar/Desativar expansão automática no modo combinado"
 
-#: include/functions.php:1224
+#: include/functions.php:1168
+msgid "Toggle combined mode"
+msgstr "Ativar/Desativar modo combinado"
+
+#: include/functions.php:1169
 msgid "Go to"
 msgstr "Ir para"
 
-#: include/functions.php:1225
-#: classes/feeds.php:1583
+#: include/functions.php:1170
+#: classes/feeds.php:1569
 msgid "All articles"
 msgstr "Todos os artigos"
 
-#: include/functions.php:1226
+#: include/functions.php:1171
 msgid "Fresh"
 msgstr "Recentes"
 
-#: include/functions.php:1229
-#: js/tt-rss.js:491
-#: js/tt-rss.js:660
+#: include/functions.php:1174
+#: js/tt-rss.js:439
+#: js/tt-rss.js:599
 msgid "Tag cloud"
 msgstr "Núvem de tags"
 
-#: include/functions.php:1231
+#: include/functions.php:1176
 msgid "Other"
 msgstr "Outros"
 
-#: include/functions.php:1232
+#: include/functions.php:1177
 #: classes/pref/labels.php:279
 msgid "Create label"
 msgstr "Criar marcador"
 
-#: include/functions.php:1233
+#: include/functions.php:1178
 #: classes/pref/filters.php:801
 msgid "Create filter"
 msgstr "Criar filtro"
 
-#: include/functions.php:1234
+#: include/functions.php:1179
 msgid "Un/collapse sidebar"
 msgstr "Mostrar/Ocultar barra lateral"
 
-#: include/functions.php:1235
+#: include/functions.php:1180
 msgid "Show help dialog"
 msgstr "Mostrar janela de ajuda"
 
-#: include/functions.php:2582
+#: include/functions.php:2529
 msgid "There is no error, the file uploaded with success"
 msgstr "Sem erro, o arquivo foi enviado com sucesso"
 
-#: include/functions.php:2583
+#: include/functions.php:2530
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "O tamanho do arquivo enviado excede a diretiva upload_max_filesize do php.ini"
 
-#: include/functions.php:2584
+#: include/functions.php:2531
 msgid "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form"
 msgstr "O tamanho do arquivo enviado excede a diretiva MAX_FILE_SIZE do formulário HTML"
 
-#: include/functions.php:2585
+#: include/functions.php:2532
 msgid "The uploaded file was only partially uploaded"
 msgstr "O arquivo foi apenas parcialmente enviado"
 
-#: include/functions.php:2586
+#: include/functions.php:2533
 msgid "No file was uploaded"
 msgstr "Nenhum arquivo enviado"
 
-#: include/functions.php:2587
+#: include/functions.php:2534
 msgid "Missing a temporary folder"
 msgstr "Falta um diretório temporário"
 
-#: include/functions.php:2588
+#: include/functions.php:2535
 msgid "Failed to write file to disk."
 msgstr "Falha ao gravar o arquivo."
 
-#: include/functions.php:2589
+#: include/functions.php:2536
 msgid "A PHP extension stopped the file upload."
 msgstr "Uma extensão PHP impediu o envio do arquivo."
 
 #: include/login_form.php:107
-#: classes/handler/public.php:446
-#: classes/handler/public.php:708
+#: classes/handler/public.php:466
+#: classes/handler/public.php:732
 msgid "Login:"
 msgstr "Nome de usuário:"
 
 #: include/login_form.php:117
-#: classes/handler/public.php:449
+#: classes/handler/public.php:469
 msgid "Password:"
 msgstr "Senha:"
 
@@ -784,9 +772,9 @@ msgid "Profile:"
 msgstr "Perfil:"
 
 #: include/login_form.php:133
-#: classes/handler/public.php:252
 #: classes/pref/prefs.php:1037
 #: classes/rpc.php:69
+#: classes/handler/public.php:272
 msgid "Default profile"
 msgstr "Perfil padrão"
 
@@ -803,207 +791,27 @@ msgid "Remember me"
 msgstr "Continuar conectado"
 
 #: include/login_form.php:159
-#: classes/handler/public.php:454
+#: classes/handler/public.php:474
 msgid "Log in"
 msgstr "Conectar"
 
-#: include/sessions.php:46
+#: include/sessions.php:45
 msgid "Session failed to validate (schema version changed)"
 msgstr "Falha ao validar a sessão (versão do banco de dados mudou)"
 
-#: include/sessions.php:62
+#: include/sessions.php:53
+#, fuzzy
+msgid "Session failed to validate (UA changed)."
+msgstr "Falha ao validar a sessão (senha foi alterada)"
+
+#: include/sessions.php:67
 msgid "Session failed to validate (password changed)"
 msgstr "Falha ao validar a sessão (senha foi alterada)"
 
-#: include/sessions.php:69
+#: include/sessions.php:74
 msgid "Session failed to validate (user not found)"
 msgstr "Falha ao validar a sessão (usuário não encontrado)"
 
-#: classes/article.php:26
-msgid "Article not found."
-msgstr "Artigo não encontrado."
-
-#: classes/article.php:211
-msgid "Tags for this article (separated by commas):"
-msgstr "Tags para esse artigo (separadas por vírgula):"
-
-#: classes/article.php:236
-#: classes/pref/labels.php:82
-#: classes/pref/users.php:103
-#: classes/pref/feeds.php:774
-#: classes/pref/feeds.php:914
-#: classes/pref/filters.php:525
-#: classes/pref/prefs.php:982
-#: plugins/nsfw/init.php:85
-#: plugins/note/init.php:58
-#: plugins/af_readability/init.php:80
-#: plugins/af_redditimgur/init.php:66
-#: plugins/af_psql_trgm/init.php:188
-#: plugins/mail/init.php:65
-#: plugins/af_zz_imgproxy/init.php:238
-msgid "Save"
-msgstr "Salvar"
-
-#: classes/article.php:238
-#: classes/handler/public.php:423
-#: classes/handler/public.php:457
-#: classes/pref/labels.php:84
-#: classes/pref/users.php:105
-#: classes/pref/feeds.php:775
-#: classes/pref/feeds.php:917
-#: classes/pref/feeds.php:1672
-#: classes/pref/filters.php:528
-#: classes/pref/filters.php:945
-#: classes/pref/filters.php:1022
-#: classes/pref/filters.php:1115
-#: classes/pref/prefs.php:984
-#: classes/feeds.php:1037
-#: classes/feeds.php:1089
-#: classes/feeds.php:1128
-#: plugins/note/init.php:60
-#: plugins/mail/init.php:179
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: classes/article.php:337
-#: classes/article.php:720
-#: classes/article.php:875
-msgid "no tags"
-msgstr "sem tags"
-
-#: classes/article.php:448
-msgid "unknown type"
-msgstr "tipo desconhecido"
-
-#: classes/article.php:525
-msgid "Attachments"
-msgstr "Anexos"
-
-#: classes/article.php:626
-#: classes/feeds.php:661
-msgid "comment"
-msgid_plural "comments"
-msgstr[0] "comentário"
-msgstr[1] "comentários"
-
-#: classes/article.php:630
-#: classes/feeds.php:665
-msgid "comments"
-msgstr "comentários"
-
-#: classes/article.php:689
-msgid " - "
-msgstr " - "
-
-#: classes/article.php:730
-#: classes/feeds.php:647
-msgid "Edit tags for this article"
-msgstr "Editar tags deste artigo"
-
-#: classes/article.php:763
-#: classes/feeds.php:602
-msgid "Originally from:"
-msgstr "Originalmente de:"
-
-#: classes/article.php:774
-#: classes/pref/feeds.php:539
-#: classes/feeds.php:613
-msgid "Feed URL"
-msgstr "URL do feed"
-
-#: classes/article.php:811
-#: classes/backend.php:103
-#: classes/dlg.php:33
-#: classes/dlg.php:56
-#: classes/dlg.php:89
-#: classes/dlg.php:154
-#: classes/dlg.php:181
-#: classes/dlg.php:197
-#: classes/pref/feeds.php:1466
-#: classes/pref/feeds.php:1533
-#: classes/pref/filters.php:208
-#: classes/pref/prefs.php:1099
-#: plugins/af_psql_trgm/init.php:109
-#: plugins/import_export/init.php:446
-#: plugins/import_export/init.php:490
-#: plugins/share/init.php:128
-msgid "Close this window"
-msgstr "Fechar esta janela"
-
-#: classes/article.php:913
-msgid "(edit note)"
-msgstr "(editar nota)"
-
-#: classes/opml.php:31
-#: classes/opml.php:36
-msgid "OPML Utility"
-msgstr "Utilitário OPML"
-
-#: classes/opml.php:40
-msgid "Importing OPML..."
-msgstr "Importando OPML..."
-
-#: classes/opml.php:45
-msgid "Return to preferences"
-msgstr "Retornar às preferências"
-
-#: classes/opml.php:301
-#, php-format
-msgid "Adding feed: %s"
-msgstr "Adicionando feed: %s"
-
-#: classes/opml.php:312
-#, php-format
-msgid "Duplicate feed: %s"
-msgstr "Feed duplicado: %s"
-
-#: classes/opml.php:326
-#, php-format
-msgid "Adding label %s"
-msgstr "Adicionando marcador %s"
-
-#: classes/opml.php:329
-#, php-format
-msgid "Duplicate label: %s"
-msgstr "Marcador duplicado: %s"
-
-#: classes/opml.php:341
-#, php-format
-msgid "Setting preference key %s to %s"
-msgstr "Ajustando chave de configuração %s para %s"
-
-#: classes/opml.php:377
-msgid "Adding filter..."
-msgstr "Adicionando filtro..."
-
-#: classes/opml.php:512
-#, php-format
-msgid "Processing category: %s"
-msgstr "Processando categoria: %s"
-
-#: classes/opml.php:558
-#, php-format
-msgid "Upload failed with error code %d"
-msgstr "Envio falhou com o código de erro %d"
-
-#: classes/opml.php:570
-#: plugins/import_export/init.php:471
-msgid "Unable to move uploaded file."
-msgstr "Incapaz de mover arquivo enviado."
-
-#: classes/opml.php:574
-#: plugins/import_export/init.php:475
-msgid "Error: please upload OPML file."
-msgstr "Erro: por favor envie um arquivo OPML."
-
-#: classes/opml.php:585
-msgid "Error: unable to find moved OPML file."
-msgstr "Erro: arquivo OPML movido não foi encontrado."
-
-#: classes/opml.php:594
-msgid "Error while parsing document."
-msgstr "Erro ao processar o documento."
-
 #: 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."
@@ -1024,161 +832,353 @@ msgstr "Ctrl"
 msgid "Help topic not found."
 msgstr "Tópico de ajuda não encontrado."
 
-#: 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."
+#: classes/backend.php:103
+#: classes/pref/filters.php:208
+#: classes/pref/feeds.php:1465
+#: classes/pref/feeds.php:1532
+#: classes/pref/prefs.php:1099
+#: classes/dlg.php:33
+#: classes/dlg.php:56
+#: classes/dlg.php:89
+#: classes/dlg.php:154
+#: classes/dlg.php:181
+#: classes/dlg.php:197
+#: classes/article.php:810
+#: plugins/af_psql_trgm/init.php:109
+#: plugins/import_export/init.php:446
+#: plugins/import_export/init.php:490
+#: plugins/share/init.php:128
+msgid "Close this window"
+msgstr "Fechar esta janela"
 
-#: classes/dlg.php:44
-msgid "Your Public OPML URL is:"
-msgstr "Sua URL OPML pública é:"
+#: classes/feeds.php:53
+msgid "View as RSS feed"
+msgstr "Ver como um feed RSS"
 
-#: classes/dlg.php:53
-#: classes/dlg.php:178
-#: plugins/share/init.php:125
-msgid "Generate new URL"
-msgstr "Gerar nova URL"
+#: classes/feeds.php:54
+#: classes/feeds.php:140
+#: classes/pref/feeds.php:1326
+msgid "View as RSS"
+msgstr "Ver como RSS"
 
-#: classes/dlg.php:67
-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 "Serviço de atualização está habilitado na configuração, porém o processo de atualização não está rodando. Isso impede a atualização de todos os feeds. Por favor inicie o serviço ou contacte o administrador."
-
-#: classes/dlg.php:71
-#: classes/dlg.php:80
-msgid "Last update:"
-msgstr "Última atualização:"
-
-#: classes/dlg.php:76
-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 "O serviço de atualização está demorando demais para atualizar um feed. Isso pode indicar um problema. Por favor verifique o processo correspondente ou contacte o administrador."
-
-#: classes/dlg.php:169
-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/dlg.php:190
-msgid "You are using default tt-rss password. Please change it in the Preferences (Personal data / Authentication)."
-msgstr "Você está usando a senha padrão do tt-rss. Por favor altere-a nas Preferências (Dados pessoais / Autenticação)."
-
-#: classes/dlg.php:194
-msgid "Open Preferences"
-msgstr "Abrir preferências"
-
-#: classes/handler/public.php:387
-#: plugins/bookmarklets/init.php:40
-msgid "Share with Tiny Tiny RSS"
-msgstr "Compartilhar com Tiny Tiny RSS"
-
-#: classes/handler/public.php:395
-msgid "Title:"
-msgstr "Título:"
-
-#: classes/handler/public.php:397
-#: classes/pref/feeds.php:537
-msgid "URL:"
-msgstr "URL:"
-
-#: classes/handler/public.php:399
-msgid "Content:"
-msgstr "Conteúdo:"
-
-#: classes/handler/public.php:401
-msgid "Labels:"
-msgstr "Marcadores:"
-
-#: classes/handler/public.php:420
-msgid "Shared article will appear in the Published feed."
-msgstr "Artigo compartilhado vai aparecer nos publicados."
-
-#: classes/handler/public.php:422
-msgid "Share"
-msgstr "Compartilhar"
-
-#: classes/handler/public.php:444
-msgid "Not logged in"
-msgstr "Não logado"
-
-#: classes/handler/public.php:504
-msgid "Incorrect username or password"
-msgstr "Usuário ou senha inválidos"
-
-#: classes/handler/public.php:557
+#: classes/feeds.php:62
 #, php-format
-msgid "Already subscribed to <b>%s</b>."
-msgstr "Já inscrito em <b>%s</b>"
+msgid "Last updated: %s"
+msgstr "Última atualização em: %s"
 
-#: classes/handler/public.php:560
+#: classes/feeds.php:100
+msgid "Select..."
+msgstr "Selecione..."
+
+#: classes/feeds.php:102
+#: classes/pref/labels.php:273
+#: classes/pref/filters.php:391
+#: classes/pref/filters.php:449
+#: classes/pref/filters.php:795
+#: classes/pref/filters.php:878
+#: classes/pref/filters.php:905
+#: classes/pref/feeds.php:1185
+#: classes/pref/feeds.php:1416
+#: classes/pref/feeds.php:1481
+#: classes/pref/users.php:358
+#: classes/pref/prefs.php:996
+msgid "All"
+msgstr "Tudo"
+
+#: classes/feeds.php:104
+msgid "Invert"
+msgstr "Inverter"
+
+#: classes/feeds.php:105
+#: classes/pref/labels.php:275
+#: classes/pref/filters.php:393
+#: classes/pref/filters.php:451
+#: classes/pref/filters.php:797
+#: classes/pref/filters.php:880
+#: classes/pref/filters.php:907
+#: classes/pref/feeds.php:1187
+#: classes/pref/feeds.php:1418
+#: classes/pref/feeds.php:1483
+#: classes/pref/users.php:360
+#: classes/pref/prefs.php:998
+msgid "None"
+msgstr "Nenhum"
+
+#: classes/feeds.php:107
+msgid "Selection toggle:"
+msgstr "Inverter seleção:"
+
+#: classes/feeds.php:113
+msgid "Selection:"
+msgstr "Seleção:"
+
+#: classes/feeds.php:116
+msgid "Set score"
+msgstr "Classificar"
+
+#: classes/feeds.php:119
+msgid "Archive"
+msgstr "Arquivar"
+
+#: classes/feeds.php:121
+msgid "Move back"
+msgstr "Retornar"
+
+#: classes/feeds.php:122
+#: classes/pref/filters.php:400
+#: classes/pref/filters.php:458
+#: classes/pref/filters.php:887
+#: classes/pref/filters.php:914
+msgid "Delete"
+msgstr "Apagar"
+
+#: classes/feeds.php:127
+#: classes/feeds.php:132
+#: plugins/mailto/init.php:25
+#: plugins/mail/init.php:76
+msgid "Forward by email"
+msgstr "Encaminhar por e-mail"
+
+#: classes/feeds.php:136
+msgid "Feed:"
+msgstr "Feed:"
+
+#: classes/feeds.php:193
+#: classes/feeds.php:802
+msgid "Feed not found."
+msgstr "Feed não encontrado."
+
+#: classes/feeds.php:255
+msgid "Never"
+msgstr "Nunca"
+
+#: classes/feeds.php:341
 #, php-format
-msgid "Subscribed to <b>%s</b>."
-msgstr "Inscrito em <b>%s</b>."
+msgid "Imported at %s"
+msgstr "Importado em %s"
 
-#: classes/handler/public.php:563
+#: classes/feeds.php:391
+#: classes/feeds.php:484
+msgid "mark feed as read"
+msgstr "marcar feed como lido"
+
+#: classes/feeds.php:540
+msgid "Collapse article"
+msgstr "Fechar artigo"
+
+#: classes/feeds.php:592
+#: classes/article.php:762
+msgid "Originally from:"
+msgstr "Originalmente de:"
+
+#: classes/feeds.php:603
+#: classes/pref/feeds.php:538
+#: classes/article.php:773
+msgid "Feed URL"
+msgstr "URL do feed"
+
+#: classes/feeds.php:630
+#: classes/article.php:729
+msgid "Edit tags for this article"
+msgstr "Editar tags deste artigo"
+
+#: classes/feeds.php:644
+#: classes/article.php:625
+msgid "comment"
+msgid_plural "comments"
+msgstr[0] "comentário"
+msgstr[1] "comentários"
+
+#: classes/feeds.php:648
+#: classes/article.php:629
+msgid "comments"
+msgstr "comentários"
+
+#: classes/feeds.php:686
+msgid "No unread articles found to display."
+msgstr "Sem artigos não lidos para exibir."
+
+#: classes/feeds.php:689
+msgid "No updated articles found to display."
+msgstr "Sem artigos atualizados para exibir."
+
+#: classes/feeds.php:692
+msgid "No starred articles found to display."
+msgstr "Sem artigos com estrela para exibir."
+
+#: classes/feeds.php:696
+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:698
+msgid "No articles found to display."
+msgstr "Nenhum artigo foi encontrado para exibir."
+
+#: classes/feeds.php:714
+#: classes/feeds.php:905
 #, php-format
-msgid "Could not subscribe to <b>%s</b>."
-msgstr "Não foi possível inscrever-se em <b>%s</b>"
+msgid "Feeds last updated at %s"
+msgstr "Feeds atualizados em %s"
 
-#: classes/handler/public.php:566
+#: classes/feeds.php:726
+#: classes/feeds.php:917
+msgid "Some feeds have update errors (click for details)"
+msgstr "Alguns feeds estão com erros (clique aqui para detalhes)"
+
+#: classes/feeds.php:894
+msgid "No feed selected."
+msgstr "Nenhum feed foi selecionado."
+
+#: classes/feeds.php:958
+#: classes/feeds.php:966
+msgid "Feed or site URL"
+msgstr "URL do site ou feed"
+
+#: classes/feeds.php:972
+#: classes/pref/feeds.php:559
+#: classes/pref/feeds.php:800
+#: classes/pref/feeds.php:1632
+msgid "Place in category:"
+msgstr "Colocar na categoria:"
+
+#: classes/feeds.php:980
+msgid "Available feeds"
+msgstr "Feeds disponíveis"
+
+#: classes/feeds.php:992
+#: classes/pref/feeds.php:621
+#: classes/pref/feeds.php:848
+#: classes/pref/users.php:61
+msgid "Authentication"
+msgstr "Autenticação"
+
+#: classes/feeds.php:996
+#: classes/pref/feeds.php:625
+#: classes/pref/feeds.php:852
+#: classes/pref/feeds.php:1646
+#: classes/pref/users.php:403
+msgid "Login"
+msgstr "Nome de usuário"
+
+#: classes/feeds.php:1000
+#: classes/pref/feeds.php:631
+#: classes/pref/feeds.php:860
+#: classes/pref/feeds.php:1649
+#: classes/pref/prefs.php:243
+msgid "Password"
+msgstr "Senha"
+
+#: classes/feeds.php:1011
+#: classes/pref/feeds.php:645
+msgid "This feed requires authentication."
+msgstr "Este feed requer autenticação."
+
+#: classes/feeds.php:1014
+#: classes/feeds.php:1070
+#: classes/pref/feeds.php:1668
+msgid "Subscribe"
+msgstr "Inscrever-se"
+
+#: classes/feeds.php:1017
+msgid "More feeds"
+msgstr "Mais feeds"
+
+#: classes/feeds.php:1020
+#: classes/feeds.php:1072
+#: classes/feeds.php:1111
+#: classes/pref/labels.php:84
+#: classes/pref/filters.php:528
+#: classes/pref/filters.php:945
+#: classes/pref/filters.php:1022
+#: classes/pref/filters.php:1115
+#: classes/pref/feeds.php:774
+#: classes/pref/feeds.php:916
+#: classes/pref/feeds.php:1669
+#: classes/pref/users.php:105
+#: classes/pref/prefs.php:984
+#: classes/article.php:238
+#: classes/handler/public.php:443
+#: classes/handler/public.php:477
+#: plugins/mail/init.php:179
+#: plugins/note/init.php:60
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: classes/feeds.php:1042
+#: classes/feeds.php:1110
+#: classes/pref/filters.php:788
+#: classes/pref/feeds.php:1178
+#: classes/pref/users.php:345
+#: js/tt-rss.js:152
+msgid "Search"
+msgstr "Pesquisar"
+
+#: classes/feeds.php:1046
+msgid "Popular feeds"
+msgstr "Feeds populares"
+
+#: classes/feeds.php:1047
+msgid "Feed archive"
+msgstr "Arquivo de feeds"
+
+#: classes/feeds.php:1050
+msgid "limit:"
+msgstr "limite:"
+
+#: classes/feeds.php:1071
+#: classes/pref/labels.php:282
+#: classes/pref/filters.php:518
+#: classes/pref/filters.php:814
+#: classes/pref/feeds.php:751
+#: classes/pref/users.php:369
+msgid "Remove"
+msgstr "Remover"
+
+#: classes/feeds.php:1084
+msgid "Look for"
+msgstr "Procurar por"
+
+#: classes/feeds.php:1092
 #, php-format
-msgid "No feeds found in <b>%s</b>."
-msgstr "Nenhum feed encontrado em <b>%s</b>."
+msgid "in %s"
+msgstr "em %s"
 
-#: classes/handler/public.php:569
-msgid "Multiple feed URLs found."
-msgstr "Multiplas URLs de feed encontradas."
+#: classes/feeds.php:1097
+msgid "Used for word stemming"
+msgstr "Usado para achar as raízes das palavras"
 
-#: classes/handler/public.php:573
+#: classes/feeds.php:1106
+msgid "Search syntax"
+msgstr "Sintaxe da pesquisa"
+
+#: classes/feeds.php:1563
+msgid "Starred articles"
+msgstr "Artigos com estrela"
+
+#: classes/feeds.php:1565
+msgid "Published articles"
+msgstr "Artigos publicados"
+
+#: classes/feeds.php:1567
+msgid "Fresh articles"
+msgstr "Recentes"
+
+#: classes/feeds.php:1571
+msgid "Archived articles"
+msgstr "Artigos arquivados"
+
+#: classes/feeds.php:1573
+msgid "Recently read"
+msgstr "Lidos recentemente"
+
+#: classes/feeds.php:1694
+msgid "Special"
+msgstr "Especial"
+
+#: classes/feeds.php:1951
 #, 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:591
-msgid "Subscribe to selected feed"
-msgstr "Inscrever-se no feed selecionado"
-
-#: classes/handler/public.php:618
-msgid "Edit subscription options"
-msgstr "Editar opções de inscrição"
-
-#: classes/handler/public.php:656
-msgid "Password recovery"
-msgstr "Recuperação de senha"
-
-#: classes/handler/public.php:701
-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:723
-#: classes/pref/users.php:372
-msgid "Reset password"
-msgstr "Redefinir a senha"
-
-#: classes/handler/public.php:733
-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:737
-#: classes/handler/public.php:806
-msgid "Go back"
-msgstr "Voltar"
-
-#: classes/handler/public.php:775
-msgid "[tt-rss] Password reset request"
-msgstr "[tt-rss] Requisição de troca de senha"
-
-#: classes/handler/public.php:802
-msgid "Sorry, login and email combination not found."
-msgstr "Desculpe, nome de usuário e e-mail não encontrados."
-
-#: classes/handler/public.php:824
-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:850
-msgid "Database Updater"
-msgstr "Atualizador do banco de dados"
-
-#: classes/handler/public.php:915
-msgid "Perform updates"
-msgstr "Executar atualização"
+msgid "Search results: %s"
+msgstr "Resultados da pesquisa: %s"
 
 #: classes/pref/labels.php:25
 #: classes/pref/filters.php:377
@@ -1198,199 +1198,191 @@ msgstr "Cor do texto:"
 msgid "Background:"
 msgstr "Cor de fundo:"
 
+#: classes/pref/labels.php:82
+#: classes/pref/filters.php:525
+#: classes/pref/feeds.php:773
+#: classes/pref/feeds.php:913
+#: classes/pref/users.php:103
+#: classes/pref/prefs.php:982
+#: classes/article.php:236
+#: plugins/af_zz_imgproxy/init.php:238
+#: plugins/af_redditimgur/init.php:66
+#: plugins/af_psql_trgm/init.php:188
+#: plugins/af_readability/init.php:80
+#: plugins/nsfw/init.php:85
+#: plugins/mail/init.php:65
+#: plugins/note/init.php:58
+msgid "Save"
+msgstr "Salvar"
+
 #: classes/pref/labels.php:244
 #, php-format
 msgid "Created label <b>%s</b>"
 msgstr "Marcador <b>%s</b> criado"
 
 #: classes/pref/labels.php:270
-#: classes/pref/users.php:356
-#: classes/pref/feeds.php:1183
-#: classes/pref/feeds.php:1414
-#: classes/pref/feeds.php:1479
 #: classes/pref/filters.php:388
 #: classes/pref/filters.php:446
 #: classes/pref/filters.php:792
 #: classes/pref/filters.php:875
 #: classes/pref/filters.php:902
+#: classes/pref/feeds.php:1182
+#: classes/pref/feeds.php:1413
+#: classes/pref/feeds.php:1478
+#: classes/pref/users.php:355
 #: classes/pref/prefs.php:993
 msgid "Select"
 msgstr "Selecione"
 
-#: classes/pref/labels.php:273
-#: classes/pref/users.php:359
-#: classes/pref/feeds.php:1186
-#: classes/pref/feeds.php:1417
-#: classes/pref/feeds.php:1482
-#: classes/pref/filters.php:391
-#: classes/pref/filters.php:449
-#: classes/pref/filters.php:795
-#: classes/pref/filters.php:878
-#: classes/pref/filters.php:905
-#: classes/pref/prefs.php:996
-#: classes/feeds.php:102
-msgid "All"
-msgstr "Tudo"
-
-#: classes/pref/labels.php:275
-#: classes/pref/users.php:361
-#: classes/pref/feeds.php:1188
-#: classes/pref/feeds.php:1419
-#: classes/pref/feeds.php:1484
-#: classes/pref/filters.php:393
-#: classes/pref/filters.php:451
-#: classes/pref/filters.php:797
-#: classes/pref/filters.php:880
-#: classes/pref/filters.php:907
-#: classes/pref/prefs.php:998
-#: classes/feeds.php:105
-msgid "None"
-msgstr "Nenhum"
-
-#: classes/pref/labels.php:282
-#: classes/pref/users.php:370
-#: classes/pref/feeds.php:752
-#: classes/pref/filters.php:518
-#: classes/pref/filters.php:814
-#: classes/feeds.php:1088
-msgid "Remove"
-msgstr "Remover"
-
 #: classes/pref/labels.php:285
 msgid "Clear colors"
 msgstr "Limpar cores"
 
-#: classes/pref/users.php:6
-#: classes/pref/system.php:8
-msgid "Your access level is insufficient to open this tab."
-msgstr "Seu nível de acesso é insuficiente para abrir esta aba."
+#: classes/pref/filters.php:155
+msgid "Preview article"
+msgstr "Pré-visualizar artigo"
 
-#: classes/pref/users.php:26
-msgid "Edit user"
-msgstr "Editar usuário"
+#: classes/pref/filters.php:267
+#: classes/pref/filters.php:573
+msgid "(inverse)"
+msgstr "(invertido)"
 
-#: classes/pref/users.php:61
-#: classes/pref/feeds.php:622
-#: classes/pref/feeds.php:849
-#: classes/feeds.php:1009
-msgid "Authentication"
-msgstr "Autenticação"
-
-#: classes/pref/users.php:64
-msgid "Access level: "
-msgstr "Nível de acesso:"
-
-#: classes/pref/users.php:82
-#: classes/pref/feeds.php:648
-#: classes/pref/feeds.php:867
-msgid "Options"
-msgstr "Opções"
-
-#: classes/pref/users.php:96
-#: js/prefs.js:479
-msgid "User details"
-msgstr "Detalhes do usuário"
-
-#: classes/pref/users.php:136
-#: classes/pref/users.php:407
-msgid "Registered"
-msgstr "Registrado"
-
-#: classes/pref/users.php:137
-msgid "Last logged in"
-msgstr "Último acesso em"
-
-#: classes/pref/users.php:145
-msgid "Subscribed feeds count"
-msgstr "Contador de inscrições"
-
-#: classes/pref/users.php:146
-msgid "Stored articles"
-msgstr "Artigos armazenados"
-
-#: classes/pref/users.php:150
-#: classes/pref/users.php:406
-msgid "Subscribed feeds"
-msgstr "Inscrições"
-
-#: classes/pref/users.php:176
-msgid "User not found"
-msgstr "Usuário não encontrado"
-
-#: classes/pref/users.php:246
+#: classes/pref/filters.php:263
+#: classes/pref/filters.php:572
 #, php-format
-msgid "Added user <b>%s</b> with password <b>%s</b>"
-msgstr "Adicionado usuário <b>%s</b> com senha <b>%s</b>"
+msgid "%s on %s in %s %s"
+msgstr "%s em %s em %s %s"
 
-#: classes/pref/users.php:253
-#, php-format
-msgid "Could not create user <b>%s</b>"
-msgstr "Não foi possível criar o usuário <b>%s</b>"
+#: classes/pref/filters.php:383
+#: classes/pref/filters.php:870
+#: classes/pref/filters.php:977
+msgid "Match"
+msgstr "Critérios"
 
-#: classes/pref/users.php:257
-#, php-format
-msgid "User <b>%s</b> already exists."
-msgstr "O usuário <b>%s</b> já existe."
+#: classes/pref/filters.php:397
+#: classes/pref/filters.php:455
+#: classes/pref/filters.php:884
+#: classes/pref/filters.php:911
+msgid "Add"
+msgstr "Adicionar"
 
-#: classes/pref/users.php:285
-#, 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/filters.php:441
+#: classes/pref/filters.php:897
+msgid "Apply actions"
+msgstr "Aplicar ações"
 
-#: classes/pref/users.php:287
-#, 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/filters.php:492
+#: classes/pref/filters.php:926
+msgid "Enabled"
+msgstr "Ativado"
 
-#: classes/pref/users.php:311
-msgid "[tt-rss] Password change notification"
-msgstr "[tt-rss] Notificação de troca de senha"
+#: classes/pref/filters.php:501
+#: classes/pref/filters.php:929
+msgid "Match any rule"
+msgstr "Ativar se qualquer critério for satisfeito"
 
-#: classes/pref/users.php:346
-#: classes/pref/feeds.php:1179
-#: classes/pref/filters.php:788
-#: classes/feeds.php:1059
-#: classes/feeds.php:1127
-#: js/tt-rss.js:165
-msgid "Search"
-msgstr "Pesquisar"
+#: classes/pref/filters.php:510
+#: classes/pref/filters.php:932
+msgid "Inverse matching"
+msgstr "Inverter aplicação dos critérios"
 
-#: classes/pref/users.php:364
-msgid "Create user"
-msgstr "Criar um usuário"
+#: classes/pref/filters.php:522
+#: classes/pref/filters.php:939
+msgid "Test"
+msgstr "Testar"
+
+#: classes/pref/filters.php:804
+msgid "Combine"
+msgstr "Combinar"
 
-#: classes/pref/users.php:368
 #: classes/pref/filters.php:807
+#: classes/pref/users.php:367
 msgid "Edit"
 msgstr "Editar"
 
-#: classes/pref/users.php:404
-#: classes/pref/feeds.php:626
-#: classes/pref/feeds.php:853
-#: classes/pref/feeds.php:1649
-#: classes/feeds.php:1013
-msgid "Login"
-msgstr "Nome de usuário"
+#: classes/pref/filters.php:810
+#: classes/pref/feeds.php:1198
+#: classes/pref/feeds.php:1212
+msgid "Reset sort order"
+msgstr "Reiniciar ordenação"
 
-#: classes/pref/users.php:405
-msgid "Access Level"
-msgstr "Nível de acesso"
+#: classes/pref/filters.php:942
+msgid "Create"
+msgstr "Criar"
 
-#: classes/pref/users.php:408
-msgid "Last login"
-msgstr "Último acesso"
+#: classes/pref/filters.php:987
+msgid "Regular expression, without outer delimiters (i.e. slashes)"
+msgstr "Expressão regular, sem os delimitadores (como barras)"
 
-#: classes/pref/users.php:427
-msgid "Click to edit"
-msgstr "Clique para editar"
+#: classes/pref/filters.php:993
+msgid "Inverse regular expression matching"
+msgstr "Inverter o teste da expressão regular"
 
-#: classes/pref/users.php:447
-msgid "No users defined."
-msgstr "Nenhum usuário definido."
+#: classes/pref/filters.php:995
+msgid "on field"
+msgstr "no campo"
 
-#: classes/pref/users.php:449
-msgid "No matching users found."
-msgstr "Nenhum usuário encontrado."
+#: classes/pref/filters.php:1001
+#: js/PrefFilterTree.js:44
+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:764
+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:786
+msgid "Add action"
+msgstr "Adicionar ação"
+
+#: classes/pref/filters.php:1139
+msgid "[No caption]"
+msgstr "[Sem título]"
+
+#: classes/pref/filters.php:1141
+#, 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:1155
+msgid "matches any rule"
+msgstr "qualquer critério"
+
+#: classes/pref/filters.php:1158
+#, 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/system.php:8
+#: classes/pref/users.php:6
+msgid "Your access level is insufficient to open this tab."
+msgstr "Seu nível de acesso é insuficiente para abrir esta aba."
 
 #: classes/pref/system.php:29
 msgid "Error Log"
@@ -1435,378 +1427,310 @@ msgid_plural "(%d feeds)"
 msgstr[0] "(%d feed)"
 msgstr[1] "(%d feeds)"
 
-#: classes/pref/feeds.php:514
+#: classes/pref/feeds.php:513
 #: classes/pref/prefs.php:18
 msgid "General"
 msgstr "Geral"
 
-#: classes/pref/feeds.php:528
+#: classes/pref/feeds.php:527
 msgid "Feed Title"
 msgstr "Título do feed"
 
-#: classes/pref/feeds.php:560
-#: classes/pref/feeds.php:801
-#: classes/pref/feeds.php:1635
-#: classes/feeds.php:989
-msgid "Place in category:"
-msgstr "Colocar na categoria:"
+#: classes/pref/feeds.php:536
+#: classes/handler/public.php:417
+msgid "URL:"
+msgstr "URL:"
 
-#: classes/pref/feeds.php:572
+#: classes/pref/feeds.php:571
 msgid "Site URL:"
 msgstr "URL do site:"
 
-#: classes/pref/feeds.php:574
+#: classes/pref/feeds.php:573
 msgid "Site URL"
 msgstr "URL do site"
 
-#: classes/pref/feeds.php:585
-#: classes/pref/feeds.php:815
+#: classes/pref/feeds.php:584
+#: classes/pref/feeds.php:814
 msgid "Language:"
 msgstr "Língua:"
 
-#: classes/pref/feeds.php:592
-#: classes/pref/feeds.php:824
+#: classes/pref/feeds.php:591
+#: classes/pref/feeds.php:823
 msgid "Update"
 msgstr "Atualizar"
 
-#: classes/pref/feeds.php:607
-#: classes/pref/feeds.php:840
+#: classes/pref/feeds.php:606
+#: classes/pref/feeds.php:839
 msgid "Article purging:"
 msgstr "Remoção de artigos:"
 
-#: classes/pref/feeds.php:632
-#: classes/pref/feeds.php:861
-#: classes/pref/feeds.php:1652
-#: classes/pref/prefs.php:243
-#: classes/feeds.php:1017
-msgid "Password"
-msgstr "Senha"
-
-#: classes/pref/feeds.php:636
+#: classes/pref/feeds.php:635
 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:646
-#: classes/feeds.php:1028
-msgid "This feed requires authentication."
-msgstr "Este feed requer autenticação."
+#: classes/pref/feeds.php:647
+#: classes/pref/feeds.php:866
+#: classes/pref/users.php:82
+msgid "Options"
+msgstr "Opções"
 
-#: classes/pref/feeds.php:662
-#: classes/pref/feeds.php:871
+#: classes/pref/feeds.php:661
+#: classes/pref/feeds.php:870
 msgid "Hide from Popular feeds"
 msgstr "Ocultar do feed populares"
 
-#: classes/pref/feeds.php:674
-#: classes/pref/feeds.php:877
+#: classes/pref/feeds.php:673
+#: classes/pref/feeds.php:876
 msgid "Include in e-mail digest"
 msgstr "Incluir no resumo por e-mail"
 
-#: classes/pref/feeds.php:687
-#: classes/pref/feeds.php:883
+#: classes/pref/feeds.php:686
+#: classes/pref/feeds.php:882
 msgid "Always display image attachments"
 msgstr "Sempre mostrar imagens anexas"
 
-#: classes/pref/feeds.php:700
-#: classes/pref/feeds.php:891
+#: classes/pref/feeds.php:699
+#: classes/pref/feeds.php:890
 #, fuzzy
 msgid "Do not embed media"
 msgstr "Não embutir imagens"
 
-#: classes/pref/feeds.php:713
-#: classes/pref/feeds.php:899
+#: classes/pref/feeds.php:712
+#: classes/pref/feeds.php:898
 msgid "Cache media"
 msgstr "Fazer cache de mídia"
 
-#: classes/pref/feeds.php:725
-#: classes/pref/feeds.php:905
+#: classes/pref/feeds.php:724
+#: classes/pref/feeds.php:904
 msgid "Mark updated articles as unread"
 msgstr "Marcar artigos atualizados como não lidos"
 
-#: classes/pref/feeds.php:729
+#: classes/pref/feeds.php:728
 msgid "Icon"
 msgstr "Ícone"
 
-#: classes/pref/feeds.php:743
-#: classes/pref/feeds.php:1284
+#: classes/pref/feeds.php:742
+#: classes/pref/feeds.php:1283
 #: plugins/import_export/init.php:71
 msgid "Choose file..."
 msgstr "Escolher arquivo..."
 
-#: classes/pref/feeds.php:750
+#: classes/pref/feeds.php:749
 msgid "Replace"
 msgstr "Substituir"
 
-#: classes/pref/feeds.php:757
+#: classes/pref/feeds.php:756
 #: classes/pref/prefs.php:679
 msgid "Plugins"
 msgstr "Plugins"
 
-#: classes/pref/feeds.php:1154
+#: classes/pref/feeds.php:1153
 msgid "Feeds with errors"
 msgstr "Feeds com erro"
 
-#: classes/pref/feeds.php:1161
+#: classes/pref/feeds.php:1160
 msgid "Inactive feeds"
 msgstr "Feeds inativos"
 
-#: classes/pref/feeds.php:1197
+#: classes/pref/feeds.php:1196
 msgid "Edit selected feeds"
 msgstr "Editar feeds selecionados"
 
-#: classes/pref/feeds.php:1199
-#: classes/pref/feeds.php:1213
-#: classes/pref/filters.php:810
-msgid "Reset sort order"
-msgstr "Reiniciar ordenação"
-
-#: classes/pref/feeds.php:1201
-#: js/prefs.js:1462
+#: classes/pref/feeds.php:1200
+#: js/prefs.js:1171
 msgid "Batch subscribe"
 msgstr "Inscrição em lote"
 
-#: classes/pref/feeds.php:1208
+#: classes/pref/feeds.php:1207
 msgid "Categories"
 msgstr "Categorias"
 
-#: classes/pref/feeds.php:1211
+#: classes/pref/feeds.php:1210
 msgid "Add category"
 msgstr "Adicionar categoria"
 
-#: classes/pref/feeds.php:1215
+#: classes/pref/feeds.php:1214
 msgid "Remove selected"
 msgstr "Remover selecionados"
 
-#: classes/pref/feeds.php:1272
+#: classes/pref/feeds.php:1271
 msgid "OPML"
 msgstr "OPML"
 
-#: classes/pref/feeds.php:1274
+#: classes/pref/feeds.php:1273
 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:1275
+#: classes/pref/feeds.php:1274
 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:1290
+#: classes/pref/feeds.php:1289
 msgid "Import my OPML"
 msgstr "Importar OPML"
 
-#: classes/pref/feeds.php:1296
+#: classes/pref/feeds.php:1295
 msgid "Filename:"
 msgstr "Nome do arquivo:"
 
-#: classes/pref/feeds.php:1298
+#: classes/pref/feeds.php:1297
 msgid "Include settings"
 msgstr "Incluir configurações"
 
-#: classes/pref/feeds.php:1302
+#: classes/pref/feeds.php:1301
 msgid "Export OPML"
 msgstr "Exportar OPML"
 
-#: classes/pref/feeds.php:1306
+#: classes/pref/feeds.php:1305
 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:1310
+#: classes/pref/feeds.php:1309
 msgid "Public OPML URL"
 msgstr "URL OPML pública"
 
-#: classes/pref/feeds.php:1311
+#: classes/pref/feeds.php:1310
 msgid "Display published OPML URL"
 msgstr "Mostrar a URL OPML publicada"
 
-#: classes/pref/feeds.php:1318
+#: classes/pref/feeds.php:1317
 msgid "Published & shared articles / Generated feeds"
 msgstr "Artigos publicados e compartilhados / Feeds gerados"
 
-#: classes/pref/feeds.php:1320
+#: classes/pref/feeds.php:1319
 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:1327
-#: classes/feeds.php:54
-#: classes/feeds.php:140
-msgid "View as RSS"
-msgstr "Ver como RSS"
-
-#: classes/pref/feeds.php:1328
 msgid "Display URL"
 msgstr "Mostrar URL"
 
-#: classes/pref/feeds.php:1331
+#: classes/pref/feeds.php:1330
 msgid "Clear all generated URLs"
 msgstr "Limpar todas as URLs geradas"
 
-#: classes/pref/feeds.php:1410
+#: classes/pref/feeds.php:1409
 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:1444
-#: classes/pref/feeds.php:1509
+#: classes/pref/feeds.php:1443
+#: classes/pref/feeds.php:1508
 msgid "Click to edit feed"
 msgstr "Clique para editar a inscrição"
 
-#: classes/pref/feeds.php:1462
-#: classes/pref/feeds.php:1529
+#: classes/pref/feeds.php:1461
+#: classes/pref/feeds.php:1528
 msgid "Unsubscribe from selected feeds"
 msgstr "Cancelar inscrições selecionadas"
 
-#: classes/pref/feeds.php:1632
+#: classes/pref/feeds.php:1629
 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:1641
+#: classes/pref/feeds.php:1638
 msgid "Feeds to subscribe, One per line"
 msgstr "Feeds para se inscrever, um por linha"
 
-#: classes/pref/feeds.php:1664
+#: classes/pref/feeds.php:1661
 msgid "Feeds require authentication."
 msgstr "Feed requer autenticação."
 
-#: classes/pref/feeds.php:1671
-#: classes/feeds.php:1031
-#: classes/feeds.php:1087
-msgid "Subscribe"
-msgstr "Inscrever-se"
+#: classes/pref/users.php:26
+msgid "Edit user"
+msgstr "Editar usuário"
 
-#: classes/pref/filters.php:155
-msgid "Preview article"
-msgstr "Pré-visualizar artigo"
+#: classes/pref/users.php:64
+msgid "Access level: "
+msgstr "Nível de acesso:"
 
-#: classes/pref/filters.php:267
-#: classes/pref/filters.php:573
-msgid "(inverse)"
-msgstr "(invertido)"
+#: classes/pref/users.php:96
+#: js/prefs.js:403
+msgid "User details"
+msgstr "Detalhes do usuário"
 
-#: classes/pref/filters.php:263
-#: classes/pref/filters.php:572
+#: classes/pref/users.php:136
+#: classes/pref/users.php:406
+msgid "Registered"
+msgstr "Registrado"
+
+#: classes/pref/users.php:137
+msgid "Last logged in"
+msgstr "Último acesso em"
+
+#: classes/pref/users.php:145
+msgid "Subscribed feeds count"
+msgstr "Contador de inscrições"
+
+#: classes/pref/users.php:146
+msgid "Stored articles"
+msgstr "Artigos armazenados"
+
+#: classes/pref/users.php:150
+#: classes/pref/users.php:405
+msgid "Subscribed feeds"
+msgstr "Inscrições"
+
+#: classes/pref/users.php:176
+msgid "User not found"
+msgstr "Usuário não encontrado"
+
+#: classes/pref/users.php:246
 #, php-format
-msgid "%s on %s in %s %s"
-msgstr "%s em %s em %s %s"
+msgid "Added user <b>%s</b> with password <b>%s</b>"
+msgstr "Adicionado usuário <b>%s</b> com senha <b>%s</b>"
 
-#: classes/pref/filters.php:383
-#: classes/pref/filters.php:870
-#: classes/pref/filters.php:977
-msgid "Match"
-msgstr "Critérios"
-
-#: classes/pref/filters.php:397
-#: classes/pref/filters.php:455
-#: classes/pref/filters.php:884
-#: classes/pref/filters.php:911
-msgid "Add"
-msgstr "Adicionar"
-
-#: classes/pref/filters.php:400
-#: classes/pref/filters.php:458
-#: classes/pref/filters.php:887
-#: classes/pref/filters.php:914
-#: classes/feeds.php:122
-msgid "Delete"
-msgstr "Apagar"
-
-#: classes/pref/filters.php:441
-#: classes/pref/filters.php:897
-msgid "Apply actions"
-msgstr "Aplicar ações"
-
-#: classes/pref/filters.php:492
-#: classes/pref/filters.php:926
-msgid "Enabled"
-msgstr "Ativado"
-
-#: classes/pref/filters.php:501
-#: classes/pref/filters.php:929
-msgid "Match any rule"
-msgstr "Ativar se qualquer critério for satisfeito"
-
-#: classes/pref/filters.php:510
-#: classes/pref/filters.php:932
-msgid "Inverse matching"
-msgstr "Inverter aplicação dos critérios"
-
-#: classes/pref/filters.php:522
-#: classes/pref/filters.php:939
-msgid "Test"
-msgstr "Testar"
-
-#: classes/pref/filters.php:804
-msgid "Combine"
-msgstr "Combinar"
-
-#: classes/pref/filters.php:942
-msgid "Create"
-msgstr "Criar"
-
-#: classes/pref/filters.php:987
-msgid "Regular expression, without outer delimiters (i.e. slashes)"
-msgstr "Expressão regular, sem os delimitadores (como barras)"
-
-#: 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:43
-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:797
-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:819
-msgid "Add action"
-msgstr "Adicionar ação"
-
-#: classes/pref/filters.php:1139
-msgid "[No caption]"
-msgstr "[Sem título]"
-
-#: classes/pref/filters.php:1141
+#: classes/pref/users.php:253
 #, php-format
-msgid "%s (%d rule)"
-msgid_plural "%s (%d rules)"
-msgstr[0] "%s (%d regra)"
-msgstr[1] "%s (%d regras)"
+msgid "Could not create user <b>%s</b>"
+msgstr "Não foi possível criar o usuário <b>%s</b>"
 
-#: classes/pref/filters.php:1155
-msgid "matches any rule"
-msgstr "qualquer critério"
-
-#: classes/pref/filters.php:1158
+#: classes/pref/users.php:257
 #, php-format
-msgid "%s (+%d action)"
-msgid_plural "%s (+%d actions)"
-msgstr[0] "%s (+%d ação)"
-msgstr[1] "%s (+%d ações)"
+msgid "User <b>%s</b> already exists."
+msgstr "O usuário <b>%s</b> já existe."
+
+#: classes/pref/users.php:285
+#, 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:287
+#, 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:310
+msgid "[tt-rss] Password change notification"
+msgstr "[tt-rss] Notificação de troca de senha"
+
+#: classes/pref/users.php:363
+msgid "Create user"
+msgstr "Criar um usuário"
+
+#: classes/pref/users.php:371
+#: classes/handler/public.php:747
+msgid "Reset password"
+msgstr "Redefinir a senha"
+
+#: classes/pref/users.php:404
+msgid "Access Level"
+msgstr "Nível de acesso"
+
+#: classes/pref/users.php:407
+msgid "Last login"
+msgstr "Último acesso"
+
+#: classes/pref/users.php:426
+msgid "Click to edit"
+msgstr "Clique para editar"
+
+#: classes/pref/users.php:446
+msgid "No users defined."
+msgstr "Nenhum usuário definido."
+
+#: classes/pref/users.php:448
+msgid "No matching users found."
+msgstr "Nenhum usuário encontrado."
 
 #: classes/pref/prefs.php:19
 msgid "Interface"
@@ -1982,7 +1906,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:1424
+#: js/prefs.js:1136
 msgid "Customize stylesheet"
 msgstr "Personalize a folha de estilo"
 
@@ -2225,250 +2149,294 @@ msgstr "Remover os perfis selecionados"
 msgid "Activate profile"
 msgstr "Ativar perfil"
 
-#: classes/feeds.php:53
-msgid "View as RSS feed"
-msgstr "Ver como um feed RSS"
+#: 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."
 
-#: classes/feeds.php:62
+#: classes/dlg.php:44
+msgid "Your Public OPML URL is:"
+msgstr "Sua URL OPML pública é:"
+
+#: classes/dlg.php:53
+#: classes/dlg.php:178
+#: plugins/share/init.php:125
+msgid "Generate new URL"
+msgstr "Gerar nova URL"
+
+#: classes/dlg.php:67
+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 "Serviço de atualização está habilitado na configuração, porém o processo de atualização não está rodando. Isso impede a atualização de todos os feeds. Por favor inicie o serviço ou contacte o administrador."
+
+#: classes/dlg.php:71
+#: classes/dlg.php:80
+msgid "Last update:"
+msgstr "Última atualização:"
+
+#: classes/dlg.php:76
+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 "O serviço de atualização está demorando demais para atualizar um feed. Isso pode indicar um problema. Por favor verifique o processo correspondente ou contacte o administrador."
+
+#: classes/dlg.php:169
+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/dlg.php:190
+msgid "You are using default tt-rss password. Please change it in the Preferences (Personal data / Authentication)."
+msgstr "Você está usando a senha padrão do tt-rss. Por favor altere-a nas Preferências (Dados pessoais / Autenticação)."
+
+#: classes/dlg.php:194
+msgid "Open Preferences"
+msgstr "Abrir preferências"
+
+#: classes/opml.php:31
+#: classes/opml.php:36
+msgid "OPML Utility"
+msgstr "Utilitário OPML"
+
+#: classes/opml.php:40
+msgid "Importing OPML..."
+msgstr "Importando OPML..."
+
+#: classes/opml.php:45
+msgid "Return to preferences"
+msgstr "Retornar às preferências"
+
+#: classes/opml.php:301
 #, php-format
-msgid "Last updated: %s"
-msgstr "Última atualização em: %s"
+msgid "Adding feed: %s"
+msgstr "Adicionando feed: %s"
 
-#: classes/feeds.php:100
-msgid "Select..."
-msgstr "Selecione..."
-
-#: classes/feeds.php:104
-msgid "Invert"
-msgstr "Inverter"
-
-#: classes/feeds.php:107
-msgid "Selection toggle:"
-msgstr "Inverter seleção:"
-
-#: classes/feeds.php:113
-msgid "Selection:"
-msgstr "Seleção:"
-
-#: classes/feeds.php:116
-msgid "Set score"
-msgstr "Classificar"
-
-#: classes/feeds.php:119
-msgid "Archive"
-msgstr "Arquivar"
-
-#: classes/feeds.php:121
-msgid "Move back"
-msgstr "Retornar"
-
-#: classes/feeds.php:127
-#: classes/feeds.php:132
-#: plugins/mail/init.php:76
-#: plugins/mailto/init.php:25
-msgid "Forward by email"
-msgstr "Encaminhar por e-mail"
-
-#: classes/feeds.php:136
-msgid "Feed:"
-msgstr "Feed:"
-
-#: classes/feeds.php:193
-#: classes/feeds.php:819
-msgid "Feed not found."
-msgstr "Feed não encontrado."
-
-#: classes/feeds.php:255
-msgid "Never"
-msgstr "Nunca"
-
-#: classes/feeds.php:342
+#: classes/opml.php:312
 #, php-format
-msgid "Imported at %s"
-msgstr "Importado em %s"
+msgid "Duplicate feed: %s"
+msgstr "Feed duplicado: %s"
 
-#: classes/feeds.php:394
-#: classes/feeds.php:487
-msgid "mark feed as read"
-msgstr "marcar feed como lido"
-
-#: classes/feeds.php:542
-msgid "Collapse article"
-msgstr "Fechar artigo"
-
-#: classes/feeds.php:703
-msgid "No unread articles found to display."
-msgstr "Sem artigos não lidos para exibir."
-
-#: classes/feeds.php:706
-msgid "No updated articles found to display."
-msgstr "Sem artigos atualizados para exibir."
-
-#: classes/feeds.php:709
-msgid "No starred articles found to display."
-msgstr "Sem artigos com estrela para exibir."
-
-#: classes/feeds.php:713
-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:715
-msgid "No articles found to display."
-msgstr "Nenhum artigo foi encontrado para exibir."
-
-#: classes/feeds.php:731
-#: classes/feeds.php:922
+#: classes/opml.php:326
 #, php-format
-msgid "Feeds last updated at %s"
-msgstr "Feeds atualizados em %s"
+msgid "Adding label %s"
+msgstr "Adicionando marcador %s"
 
-#: classes/feeds.php:743
-#: classes/feeds.php:934
-msgid "Some feeds have update errors (click for details)"
-msgstr "Alguns feeds estão com erros (clique aqui para detalhes)"
-
-#: classes/feeds.php:911
-msgid "No feed selected."
-msgstr "Nenhum feed foi selecionado."
-
-#: classes/feeds.php:975
-#: classes/feeds.php:983
-msgid "Feed or site URL"
-msgstr "URL do site ou feed"
-
-#: classes/feeds.php:997
-msgid "Available feeds"
-msgstr "Feeds disponíveis"
-
-#: classes/feeds.php:1034
-msgid "More feeds"
-msgstr "Mais feeds"
-
-#: classes/feeds.php:1063
-msgid "Popular feeds"
-msgstr "Feeds populares"
-
-#: classes/feeds.php:1064
-msgid "Feed archive"
-msgstr "Arquivo de feeds"
-
-#: classes/feeds.php:1067
-msgid "limit:"
-msgstr "limite:"
-
-#: classes/feeds.php:1101
-msgid "Look for"
-msgstr "Procurar por"
-
-#: classes/feeds.php:1109
+#: classes/opml.php:329
 #, php-format
-msgid "in %s"
-msgstr "em %s"
+msgid "Duplicate label: %s"
+msgstr "Marcador duplicado: %s"
 
-#: classes/feeds.php:1114
-msgid "Used for word stemming"
-msgstr "Usado para achar as raízes das palavras"
-
-#: classes/feeds.php:1123
-msgid "Search syntax"
-msgstr "Sintaxe da pesquisa"
-
-#: classes/feeds.php:1577
-msgid "Starred articles"
-msgstr "Artigos com estrela"
-
-#: classes/feeds.php:1579
-msgid "Published articles"
-msgstr "Artigos publicados"
-
-#: classes/feeds.php:1581
-msgid "Fresh articles"
-msgstr "Recentes"
-
-#: classes/feeds.php:1585
-msgid "Archived articles"
-msgstr "Artigos arquivados"
-
-#: classes/feeds.php:1587
-msgid "Recently read"
-msgstr "Lidos recentemente"
-
-#: classes/feeds.php:1708
-msgid "Special"
-msgstr "Especial"
-
-#: classes/feeds.php:1965
+#: classes/opml.php:341
 #, php-format
-msgid "Search results: %s"
-msgstr "Resultados da pesquisa: %s"
+msgid "Setting preference key %s to %s"
+msgstr "Ajustando chave de configuração %s para %s"
 
-#: 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/opml.php:377
+msgid "Adding filter..."
+msgstr "Adicionando filtro..."
 
-#: plugins/nsfw/init.php:52
-msgid "NSFW Plugin"
-msgstr "Plugin NSFW"
+#: classes/opml.php:512
+#, php-format
+msgid "Processing category: %s"
+msgstr "Processando categoria: %s"
 
-#: plugins/nsfw/init.php:79
-msgid "Tags to consider NSFW (comma-separated)"
-msgstr "Tags para considerar NSFW (separadas por vírgula)"
+#: classes/opml.php:558
+#, php-format
+msgid "Upload failed with error code %d"
+msgstr "Envio falhou com o código de erro %d"
 
-#: plugins/nsfw/init.php:100
-msgid "Configuration saved."
-msgstr "Configuração salva."
+#: classes/opml.php:570
+#: plugins/import_export/init.php:471
+msgid "Unable to move uploaded file."
+msgstr "Incapaz de mover arquivo enviado."
 
-#: plugins/note/init.php:28
-#: plugins/note/note.js:11
-msgid "Edit article note"
-msgstr "Editar anotação sobre o artigo"
+#: classes/opml.php:574
+#: plugins/import_export/init.php:475
+msgid "Error: please upload OPML file."
+msgstr "Erro: por favor envie um arquivo OPML."
+
+#: classes/opml.php:585
+msgid "Error: unable to find moved OPML file."
+msgstr "Erro: arquivo OPML movido não foi encontrado."
+
+#: classes/opml.php:594
+msgid "Error while parsing document."
+msgstr "Erro ao processar o documento."
+
+#: classes/article.php:26
+msgid "Article not found."
+msgstr "Artigo não encontrado."
+
+#: classes/article.php:211
+msgid "Tags for this article (separated by commas):"
+msgstr "Tags para esse artigo (separadas por vírgula):"
+
+#: classes/article.php:337
+#: classes/article.php:719
+#: classes/article.php:874
+msgid "no tags"
+msgstr "sem tags"
+
+#: classes/article.php:447
+msgid "unknown type"
+msgstr "tipo desconhecido"
+
+#: classes/article.php:524
+msgid "Attachments"
+msgstr "Anexos"
+
+#: classes/article.php:688
+msgid " - "
+msgstr " - "
+
+#: classes/article.php:912
+msgid "(edit note)"
+msgstr "(editar nota)"
+
+#: classes/handler/public.php:407
+#: plugins/bookmarklets/init.php:40
+msgid "Share with Tiny Tiny RSS"
+msgstr "Compartilhar com Tiny Tiny RSS"
+
+#: classes/handler/public.php:415
+msgid "Title:"
+msgstr "Título:"
+
+#: classes/handler/public.php:419
+msgid "Content:"
+msgstr "Conteúdo:"
+
+#: classes/handler/public.php:421
+msgid "Labels:"
+msgstr "Marcadores:"
+
+#: classes/handler/public.php:440
+msgid "Shared article will appear in the Published feed."
+msgstr "Artigo compartilhado vai aparecer nos publicados."
+
+#: classes/handler/public.php:442
+msgid "Share"
+msgstr "Compartilhar"
+
+#: classes/handler/public.php:464
+msgid "Not logged in"
+msgstr "Não logado"
+
+#: classes/handler/public.php:527
+msgid "Incorrect username or password"
+msgstr "Usuário ou senha inválidos"
+
+#: classes/handler/public.php:581
+#, php-format
+msgid "Already subscribed to <b>%s</b>."
+msgstr "Já inscrito em <b>%s</b>"
+
+#: classes/handler/public.php:584
+#, php-format
+msgid "Subscribed to <b>%s</b>."
+msgstr "Inscrito em <b>%s</b>."
+
+#: classes/handler/public.php:587
+#, 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:590
+#, php-format
+msgid "No feeds found in <b>%s</b>."
+msgstr "Nenhum feed encontrado em <b>%s</b>."
+
+#: classes/handler/public.php:593
+msgid "Multiple feed URLs found."
+msgstr "Multiplas URLs de feed encontradas."
+
+#: classes/handler/public.php:597
+#, 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:615
+msgid "Subscribe to selected feed"
+msgstr "Inscrever-se no feed selecionado"
+
+#: classes/handler/public.php:642
+msgid "Edit subscription options"
+msgstr "Editar opções de inscrição"
+
+#: classes/handler/public.php:680
+msgid "Password recovery"
+msgstr "Recuperação de senha"
+
+#: classes/handler/public.php:725
+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:757
+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:761
+#: classes/handler/public.php:830
+msgid "Go back"
+msgstr "Voltar"
+
+#: classes/handler/public.php:799
+msgid "[tt-rss] Password reset request"
+msgstr "[tt-rss] Requisição de troca de senha"
+
+#: 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: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:874
+msgid "Database Updater"
+msgstr "Atualizador do banco de dados"
+
+#: classes/handler/public.php:939
+msgid "Perform updates"
+msgstr "Executar atualização"
+
+#: plugins/af_zz_imgproxy/init.php:208
+msgid "Image proxy settings (af_zz_imgproxy)"
+msgstr "Configurações do proxy de imagens (af_zz_imgproxy)"
+
+#: plugins/af_zz_imgproxy/init.php:232
+msgid "Enable proxy for all remote images."
+msgstr "Habilitar proxy para todas as imagem remotas."
+
+#: plugins/af_zz_imgproxy/init.php:236
+msgid "Don't cache files locally."
+msgstr "Não guardar arquivos no cache local."
+
+#: plugins/af_zz_imgproxy/init.php:252
+#: plugins/af_redditimgur/init.php:79
+msgid "Configuration saved"
+msgstr "Configuração salva"
 
 #: plugins/vf_shared/init.php:17
 #: plugins/vf_shared/init.php:73
 msgid "Shared articles"
 msgstr "Artigos compartilhados"
 
-#: plugins/auth_internal/init.php:67
-msgid "Please enter your one time password:"
-msgstr "Por favor, entre sua senha temporária:"
+#: plugins/bookmarklets/init.php:20
+msgid "Bookmarklets"
+msgstr "Bookmarklets"
 
-#: plugins/auth_internal/init.php:208
-msgid "Password has been changed."
-msgstr "Senha foi alterada."
+#: 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 "Arraste o link abaixo para a barra de ferramentas do seu navegador, abra o feed que você se interessar em seu navegador e clique no link para se inscrever."
 
-#: plugins/auth_internal/init.php:210
-msgid "Old password is incorrect."
-msgstr "Senha antiga incorreta."
+#: plugins/bookmarklets/init.php:26
+#, php-format
+msgid "Subscribe to %s in Tiny Tiny RSS?"
+msgstr "Inscrever-se ao %s com o Tiny Tiny RSS?"
 
-#: plugins/af_readability/init.php:25
-msgid "Data saved."
-msgstr "Dados salvos."
+#: plugins/bookmarklets/init.php:31
+msgid "Subscribe in Tiny Tiny RSS"
+msgstr "Inscrever-se com Tiny Tiny RSS"
 
-#: plugins/af_readability/init.php:41
-msgid "Inline content"
-msgstr "Exibir conteúdo em linha"
-
-#: plugins/af_readability/init.php:47
-msgid "Readability settings (af_readability)"
-msgstr "Configurações do Readability (af_readability)"
-
-#: plugins/af_readability/init.php:78
-msgid "Use Readability for pages shared via bookmarklet."
-msgstr "Usar o Readability para páginas compartiladas pelo bookmarklet."
-
-#: plugins/af_readability/init.php:90
-#: plugins/af_psql_trgm/init.php:198
-msgid "Currently enabled for (click to edit):"
-msgstr "Atualmente habilitado para (clique para editar):"
-
-#: plugins/af_readability/init.php:107
-msgid "Readability"
-msgstr "Readability"
-
-#: plugins/af_readability/init.php:118
-msgid "Inline article content"
-msgstr "Exibir conteúdo do arquivo em linha"
+#: plugins/bookmarklets/init.php:34
+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_redditimgur/init.php:30
 msgid "Reddit content settings (af_redditimgur)"
@@ -2482,10 +2450,21 @@ msgstr "Extrair conteúdo que falta usando o Readability"
 msgid "Enable additional duplicate checking"
 msgstr "Habilitar verificação de duplicidade adicional"
 
-#: plugins/af_redditimgur/init.php:79
-#: plugins/af_zz_imgproxy/init.php:252
-msgid "Configuration saved"
-msgstr "Configuração salva"
+#: plugins/af_comics/init.php:49
+msgid "Feeds supported by af_comics"
+msgstr "Feeds suportados pelo af_comics"
+
+#: plugins/af_comics/init.php:51
+msgid "The following comics are currently supported:"
+msgstr "Os quadrinhos a seguir são suportados no momento:"
+
+#: plugins/af_comics/init.php:69
+msgid "To subscribe to GoComics use the comic's regular web page as the feed URL (e.g. for the <em>Garfield</em> comic use <code>http://www.gocomics.com/garfield</code>)."
+msgstr "Para inscrever-se ao GoComics use o endereço da página como a URL do feed (p.ex. para <em>Garfield</em> use <code>http://www.gocomics.com/garfield</code>)."
+
+#: plugins/af_comics/init.php:71
+msgid "Drop any updated filters into <code>filters.local</code> in plugin directory."
+msgstr "Inclua qualquer filtro atualizado no diretório <code>filters.local</code> no diretório do plugin."
 
 #: plugins/af_psql_trgm/init.php:29
 #, php-format
@@ -2521,25 +2500,83 @@ msgstr "Tamanho mínimo do título:"
 msgid "Enable for all feeds:"
 msgstr "Habilitar para todos os feeds:"
 
+#: plugins/af_psql_trgm/init.php:198
+#: plugins/af_readability/init.php:90
+msgid "Currently enabled for (click to edit):"
+msgstr "Atualmente habilitado para (clique para editar):"
+
 #: plugins/af_psql_trgm/init.php:216
 msgid "Similarity (pg_trgm)"
 msgstr "Semelhança (pg_trgm)"
 
-#: plugins/af_comics/init.php:49
-msgid "Feeds supported by af_comics"
-msgstr "Feeds suportados pelo af_comics"
+#: plugins/af_readability/init.php:25
+msgid "Data saved."
+msgstr "Dados salvos."
 
-#: plugins/af_comics/init.php:51
-msgid "The following comics are currently supported:"
-msgstr "Os quadrinhos a seguir são suportados no momento:"
+#: plugins/af_readability/init.php:41
+msgid "Inline content"
+msgstr "Exibir conteúdo em linha"
 
-#: plugins/af_comics/init.php:69
-msgid "To subscribe to GoComics use the comic's regular web page as the feed URL (e.g. for the <em>Garfield</em> comic use <code>http://www.gocomics.com/garfield</code>)."
-msgstr "Para inscrever-se ao GoComics use o endereço da página como a URL do feed (p.ex. para <em>Garfield</em> use <code>http://www.gocomics.com/garfield</code>)."
+#: plugins/af_readability/init.php:47
+msgid "Readability settings (af_readability)"
+msgstr "Configurações do Readability (af_readability)"
 
-#: plugins/af_comics/init.php:71
-msgid "Drop any updated filters into <code>filters.local</code> in plugin directory."
-msgstr "Inclua qualquer filtro atualizado no diretório <code>filters.local</code> no diretório do plugin."
+#: plugins/af_readability/init.php:78
+msgid "Use Readability for pages shared via bookmarklet."
+msgstr "Usar o Readability para páginas compartiladas pelo bookmarklet."
+
+#: plugins/af_readability/init.php:107
+msgid "Readability"
+msgstr "Readability"
+
+#: plugins/af_readability/init.php:118
+msgid "Inline article content"
+msgstr "Exibir conteúdo do arquivo em linha"
+
+#: plugins/mailto/init.php:50
+#: plugins/mailto/init.php:58
+#: plugins/mail/init.php:118
+#: plugins/mail/init.php:124
+msgid "[Forwarded]"
+msgstr "[Encaminhado]"
+
+#: plugins/mailto/init.php:50
+#: plugins/mail/init.php:118
+msgid "Multiple articles"
+msgstr "Múltiplos artigos"
+
+#: plugins/mailto/init.php:74
+msgid "Clicking the following link to invoke your mail client:"
+msgstr "Clique no link seguinte para ativar seu cliente de e-mail:"
+
+#: plugins/mailto/init.php:78
+msgid "Forward selected article(s) by email."
+msgstr "Encaminhar artigo(s) selecionado(s) por e-mail."
+
+#: plugins/mailto/init.php:81
+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/mailto/init.php:86
+msgid "Close this dialog"
+msgstr "Fechar esta janela"
+
+#: 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/import_export/init.php:53
 msgid "Import and export"
@@ -2607,99 +2644,6 @@ msgstr "Envio falhou com o código de erro %d (%s)"
 msgid "No file uploaded."
 msgstr "Nenhum arquivo enviado."
 
-#: plugins/mail/init.php:29
-msgid "Mail addresses saved."
-msgstr "Endereços de e-mail salvos."
-
-#: plugins/mail/init.php:35
-msgid "Mail plugin"
-msgstr "Plugin de e-mail"
-
-#: plugins/mail/init.php:37
-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:118
-#: plugins/mail/init.php:124
-#: plugins/mailto/init.php:50
-#: plugins/mailto/init.php:58
-msgid "[Forwarded]"
-msgstr "[Encaminhado]"
-
-#: plugins/mail/init.php:118
-#: plugins/mailto/init.php:50
-msgid "Multiple articles"
-msgstr "Múltiplos artigos"
-
-#: plugins/mail/init.php:146
-msgid "To:"
-msgstr "Para:"
-
-#: plugins/mail/init.php:161
-msgid "Subject:"
-msgstr "Assunto:"
-
-#: plugins/mail/init.php:178
-msgid "Send e-mail"
-msgstr "Enviar e-mail"
-
-#: plugins/close_button/init.php:25
-msgid "Close article"
-msgstr "Fechar artigo"
-
-#: plugins/bookmarklets/init.php:20
-msgid "Bookmarklets"
-msgstr "Bookmarklets"
-
-#: plugins/bookmarklets/init.php:22
-msgid "Drag the link below to your browser toolbar, open the feed you're interested in in your browser and click on the link to subscribe to it."
-msgstr "Arraste o link abaixo para a barra de ferramentas do seu navegador, abra o feed que você se interessar em seu navegador e clique no link para se inscrever."
-
-#: plugins/bookmarklets/init.php:26
-#, php-format
-msgid "Subscribe to %s in Tiny Tiny RSS?"
-msgstr "Inscrever-se ao %s com o Tiny Tiny RSS?"
-
-#: plugins/bookmarklets/init.php:31
-msgid "Subscribe in Tiny Tiny RSS"
-msgstr "Inscrever-se com Tiny Tiny RSS"
-
-#: plugins/bookmarklets/init.php:34
-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/toggle_sidebar/init.php:23
-msgid "Collapse feedlist"
-msgstr "Contrair lista de feeds"
-
-#: plugins/af_zz_imgproxy/init.php:208
-msgid "Image proxy settings (af_zz_imgproxy)"
-msgstr "Configurações do proxy de imagens (af_zz_imgproxy)"
-
-#: plugins/af_zz_imgproxy/init.php:232
-msgid "Enable proxy for all remote images."
-msgstr "Habilitar proxy para todas as imagem remotas."
-
-#: plugins/af_zz_imgproxy/init.php:236
-msgid "Don't cache files locally."
-msgstr "Não guardar arquivos no cache local."
-
-#: plugins/mailto/init.php:74
-msgid "Clicking the following link to invoke your mail client:"
-msgstr "Clique no link seguinte para ativar seu cliente de e-mail:"
-
-#: plugins/mailto/init.php:78
-msgid "Forward selected article(s) by email."
-msgstr "Encaminhar artigo(s) selecionado(s) por e-mail."
-
-#: plugins/mailto/init.php:81
-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/mailto/init.php:86
-msgid "Close this dialog"
-msgstr "Fechar esta janela"
-
 #: plugins/share/init.php:41
 msgid "You can disable all articles shared by unique URLs here."
 msgstr "Você pode desabilitar todos os artigos compartilhados por URLs únicas aqui."
@@ -2720,443 +2664,592 @@ msgstr "Você pode compartilhar esse artigo pela seguinte URL:"
 msgid "Unshare article"
 msgstr "Remover compartilhamento"
 
-#: js/FeedTree.js:75
+#: plugins/toggle_sidebar/init.php:23
+msgid "Collapse feedlist"
+msgstr "Contrair lista de feeds"
+
+#: plugins/close_button/init.php:25
+msgid "Close article"
+msgstr "Fechar artigo"
+
+#: plugins/mail/init.php:29
+msgid "Mail addresses saved."
+msgstr "Endereços de e-mail salvos."
+
+#: plugins/mail/init.php:35
+msgid "Mail plugin"
+msgstr "Plugin de e-mail"
+
+#: plugins/mail/init.php:37
+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:146
+msgid "To:"
+msgstr "Para:"
+
+#: plugins/mail/init.php:161
+msgid "Subject:"
+msgstr "Assunto:"
+
+#: plugins/mail/init.php:178
+msgid "Send e-mail"
+msgstr "Enviar e-mail"
+
+#: plugins/note/init.php:28
+#: plugins/note/note.js:11
+msgid "Edit article note"
+msgstr "Editar anotação sobre o artigo"
+
+#: plugins/auth_internal/init.php:67
+msgid "Please enter your one time password:"
+msgstr "Por favor, entre sua senha temporária:"
+
+#: plugins/auth_internal/init.php:208
+msgid "Password has been changed."
+msgstr "Senha foi alterada."
+
+#: plugins/auth_internal/init.php:210
+msgid "Old password is incorrect."
+msgstr "Senha antiga incorreta."
+
+#: js/FeedTree.js:76
 msgid "(Un)collapse"
 msgstr "Mostrar/ocultar"
 
-#: js/PrefFeedTree.js:35
+#: js/PrefFeedTree.js:36
 msgid "Edit category"
 msgstr "Editar categoria"
 
-#: js/PrefFeedTree.js:42
+#: js/PrefFeedTree.js:43
 msgid "Remove category"
 msgstr "Remover categoria"
 
-#: js/PrefFilterTree.js:46
+#: js/PrefFilterTree.js:47
 msgid "Inverse"
 msgstr "Invertido"
 
-#: js/feedlist.js:511
+#: js/feedlist.js:461
 msgid "Mark %w in %s older than 1 day as read?"
 msgstr "Marcar %w em %s com mais de um dia como lidos?"
 
-#: js/feedlist.js:514
+#: js/feedlist.js:464
 msgid "Mark %w in %s older than 1 week as read?"
 msgstr "Marcar %w em %s com mais de uma semana como lidos?"
 
-#: js/feedlist.js:517
+#: js/feedlist.js:467
 msgid "Mark %w in %s older than 2 weeks as read?"
 msgstr "Marcar %w em %s com mais de duas semana como lidos?"
 
-#: js/feedlist.js:520
+#: js/feedlist.js:470
 msgid "Mark %w in %s as read?"
 msgstr "Marcar %w em %s lidos?"
 
-#: js/feedlist.js:523
+#: js/feedlist.js:473
 msgid "search results"
 msgstr "resultados da pesquisa"
 
-#: js/feedlist.js:523
+#: js/feedlist.js:473
 msgid "all articles"
 msgstr "todos os artigos"
 
-#: js/functions.js:74
+#: js/functions.js:100
 msgid "Close"
 msgstr "Fechar"
 
-#: js/functions.js:141
+#: js/functions.js:167
 msgid "Click to close"
 msgstr "Clique para fechar"
 
-#: js/functions.js:448
+#: js/functions.js:456
 msgid "Error explained"
 msgstr "Detalhamento do erro"
 
-#: js/functions.js:592
+#: js/functions.js:490
+msgid "Upload complete."
+msgstr "Upload completo."
+
+#: js/functions.js:508
+msgid "Remove stored feed icon?"
+msgstr "Remover o ícone armazenado para esse feed?"
+
+#: js/functions.js:510
+msgid "Removing feed icon..."
+msgstr "Removendo icone do feed..."
+
+#: js/functions.js:515
+msgid "Feed icon removed."
+msgstr "Ícone do feed foi removido."
+
+#: js/functions.js:532
+msgid "Please select an image file to upload."
+msgstr "Por favor selecione um arquivo de imagem para enviar."
+
+#: js/functions.js:533
+msgid "Upload new icon for this feed?"
+msgstr "Enviar novo icone para este feed?"
+
+#: js/functions.js:534
+msgid "Uploading, please wait..."
+msgstr "Enviando, por favor aguarde..."
+
+#: js/functions.js:542
+msgid "Please enter label caption:"
+msgstr "Por favor entre o título do marcador:"
+
+#: js/functions.js:575
 msgid "Subscribe to Feed"
 msgstr "Inscrever-se ao feed"
 
-#: js/functions.js:621
+#: js/functions.js:602
 msgid "Failed to parse output. This can indicate server timeout and/or network issues. Backend output was logged to browser console."
 msgstr "Falha ao processar saída. Isso pode indicar um estouro do tempo de resposta e/ou problemas na rede. A saída do backend foi registrada no console do navegador."
 
-#: js/functions.js:636
+#: js/functions.js:617
 #, perl-format
 msgid "Subscribed to %s"
 msgstr "Inscrito em %s"
 
-#: js/functions.js:641
+#: js/functions.js:622
 msgid "Specified URL seems to be invalid."
 msgstr "URL informada parece ser inválida."
 
-#: js/functions.js:644
+#: js/functions.js:625
 msgid "Specified URL doesn't seem to contain any feeds."
 msgstr "A URL informada não parece conter nenhum feed."
 
-#: js/functions.js:656
+#: js/functions.js:637
 msgid "Expand to select feed"
 msgstr "Expandir para selecionar feed"
 
-#: js/functions.js:668
+#: js/functions.js:649
 #, perl-format
 msgid "Couldn't download the specified URL: %s"
 msgstr "Não foi possível baixar a URL informada: %s"
 
-#: js/functions.js:672
+#: js/functions.js:653
 #, perl-format
 msgid "XML validation failed: %s"
 msgstr "Erro na validação do XML: %s"
 
-#: js/functions.js:676
+#: js/functions.js:657
 msgid "You are already subscribed to this feed."
 msgstr "Você já está inscrito neste feed."
 
-#: js/functions.js:1136
+#: js/functions.js:1098
 msgid "Generate new syndication address for this feed?"
 msgstr "Gerar novo endereço para este feed?"
 
-#: js/functions.js:1140
-#: js/prefs.js:1095
+#: js/functions.js:1100
+#: js/prefs.js:870
 msgid "Trying to change address..."
 msgstr "Tentando alterar endereço ..."
 
-#: js/functions.js:1245
-#: js/tt-rss.js:446
-#: js/tt-rss.js:673
+#: js/functions.js:1199
+#: js/tt-rss.js:399
+#: js/tt-rss.js:612
 msgid "You can't edit this kind of feed."
 msgstr "Você não pode editar esse tipo de feed."
 
-#: js/functions.js:1260
+#: js/functions.js:1213
 msgid "Edit Feed"
 msgstr "Editar inscrição"
 
-#: js/functions.js:1266
-#: js/prefs.js:100
-#: js/prefs.js:209
-#: js/prefs.js:647
+#: js/functions.js:1217
+#: js/prefs.js:176
+#: js/prefs.js:523
+#: js/prefs.js:1139
+#: js/prefs.js:78
 msgid "Saving data..."
 msgstr "Salvando dados..."
 
-#: js/functions.js:1293
+#: js/functions.js:1243
 msgid "More Feeds"
 msgstr "Mais feeds"
 
-#: js/functions.js:1355
-#: js/functions.js:1464
-#: js/prefs.js:398
-#: js/prefs.js:540
-#: js/prefs.js:558
-#: js/prefs.js:1077
+#: js/functions.js:1297
+#: js/functions.js:1383
+#: js/prefs.js:332
+#: js/prefs.js:455
+#: js/prefs.js:473
+#: js/prefs.js:855
 msgid "No feeds are selected."
 msgstr "Nenhum feed foi selecionado."
 
-#: js/functions.js:1398
+#: js/functions.js:1329
 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:1435
+#: js/functions.js:1360
 msgid "Feeds with update errors"
 msgstr "Feeds com erro na atualização"
 
-#: js/functions.js:1446
-#: js/prefs.js:1058
+#: js/functions.js:1369
+#: js/prefs.js:841
 msgid "Remove selected feeds?"
 msgstr "Remover feeds selecionados?"
 
-#: js/functions.js:1449
-#: js/prefs.js:1061
+#: js/functions.js:1370
+#: js/prefs.js:842
 msgid "Removing selected feeds..."
 msgstr "Removendo feeds selecionados..."
 
-#: js/prefs.js:60
-msgid "Please enter login:"
-msgstr "Por favor entre o nome de usuário:"
-
-#: js/prefs.js:67
-msgid "Can't create user: no login specified."
-msgstr "Não foi possível criar o usuário: nome de usuário não informado."
-
-#: js/prefs.js:71
-msgid "Adding user..."
-msgstr "Adicionando o usuário..."
-
-#: js/prefs.js:96
-msgid "User Editor"
-msgstr "Editor de usuários"
-
-#: js/prefs.js:131
-msgid "Edit Filter"
-msgstr "Editar filtro"
-
-#: js/prefs.js:170
+#: js/prefs.js:143
 msgid "Remove filter?"
 msgstr "Remover filtro?"
 
-#: js/prefs.js:175
+#: js/prefs.js:148
 msgid "Removing filter..."
 msgstr "Removendo filtro..."
 
-#: js/prefs.js:292
+#: js/prefs.js:251
 msgid "Remove selected labels?"
 msgstr "Remover marcadores selecionados?"
 
-#: js/prefs.js:295
+#: js/prefs.js:252
 msgid "Removing selected labels..."
 msgstr "Removendo marcadores selecionados..."
 
-#: js/prefs.js:308
-#: js/prefs.js:1144
+#: js/prefs.js:262
+#: js/prefs.js:909
 msgid "No labels are selected."
 msgstr "Nenhum marcador está selecionado."
 
-#: js/prefs.js:320
+#: js/prefs.js:274
 msgid "Remove selected users? Neither default admin nor your account will be removed."
 msgstr "Remover usuários selecionados? A sua conta e a do administrador não serão removidas."
 
-#: js/prefs.js:323
+#: js/prefs.js:275
 msgid "Removing selected users..."
 msgstr "Removendo usuários selecionados..."
 
-#: js/prefs.js:338
-#: js/prefs.js:408
-#: js/prefs.js:427
-#: js/prefs.js:461
+#: js/prefs.js:286
+#: js/prefs.js:342
+#: js/prefs.js:361
+#: js/prefs.js:387
 msgid "No users are selected."
 msgstr "Nenhum usuário foi selecionado."
 
-#: js/prefs.js:350
+#: js/prefs.js:297
 msgid "Remove selected filters?"
 msgstr "Remover os filtros selecionados?"
 
-#: js/prefs.js:353
+#: js/prefs.js:298
 msgid "Removing selected filters..."
 msgstr "Removendo filtros selecionados..."
 
-#: js/prefs.js:366
-#: js/prefs.js:495
-#: js/prefs.js:514
+#: js/prefs.js:308
+#: js/prefs.js:419
+#: js/prefs.js:438
 msgid "No filters are selected."
 msgstr "Nenhum filtro foi selecionado."
 
-#: js/prefs.js:378
+#: js/prefs.js:319
 msgid "Unsubscribe from selected feeds?"
 msgstr "Cancelar inscrição dos feeds selecionados?"
 
-#: js/prefs.js:382
+#: js/prefs.js:321
 msgid "Unsubscribing from selected feeds..."
 msgstr "Cancelando inscrição dos feeds selecionados..."
 
-#: js/prefs.js:413
-#: js/prefs.js:432
-#: js/prefs.js:466
+#: js/prefs.js:347
+#: js/prefs.js:366
+#: js/prefs.js:392
 msgid "Please select only one user."
 msgstr "Por favor selecione somente um usuário."
 
-#: js/prefs.js:436
+#: js/prefs.js:370
 msgid "Reset password of selected user?"
 msgstr "Reiniciar a senha do usuário selecionado?"
 
-#: js/prefs.js:439
+#: js/prefs.js:371
 msgid "Resetting password for selected user..."
 msgstr "Reiniciando a senha do usuário selecionado..."
 
-#: js/prefs.js:500
+#: js/prefs.js:424
 msgid "Please select only one filter."
 msgstr "Por favor selecione somente um filtro."
 
-#: js/prefs.js:518
+#: js/prefs.js:442
 msgid "Combine selected filters?"
 msgstr "Combinar os filtros selecionados?"
 
-#: js/prefs.js:521
+#: js/prefs.js:443
 msgid "Joining filters..."
 msgstr "Combinando filtros..."
 
-#: js/prefs.js:580
+#: js/prefs.js:487
 msgid "Edit Multiple Feeds"
 msgstr "Editar múltiplos feeds"
 
-#: js/prefs.js:604
+#: js/prefs.js:511
 msgid "Save changes to selected feeds?"
 msgstr "Salvar alterações nas inscrições selecionadas?"
 
-#: js/prefs.js:681
+#: js/prefs.js:552
 msgid "OPML Import"
 msgstr "Importar OPML"
 
-#: js/prefs.js:700
+#: js/prefs.js:571
 msgid "Please choose an OPML file first."
 msgstr "Por favor selecione um arquivo OPML."
 
-#: js/prefs.js:703
+#: js/prefs.js:574
 #: plugins/import_export/import_export.js:115
 msgid "Importing, please wait..."
 msgstr "Importando, por favor aguarde..."
 
-#: js/prefs.js:869
+#: js/prefs.js:737
 msgid "Reset to defaults?"
 msgstr "Usar o padrão?"
 
-#: js/prefs.js:1468
-msgid "Subscribing to feeds..."
-msgstr "Inscrevendo-se aos feeds..."
+#: js/prefs.js:777
+#, perl-format
+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:1487
-msgid "Clear stored data for this plugin?"
-msgstr "Limpar dados armazenados para este plugin?"
+#: js/prefs.js:778
+msgid "Removing category..."
+msgstr "Removendo categoria..."
 
-#: js/prefs.js:1501
-msgid "Clear all messages in the error log?"
-msgstr "Limpar todas as mensagems do registro de erro?"
+#: js/prefs.js:794
+msgid "Remove selected categories?"
+msgstr "Remover as categorias selecionadas?"
 
-#: js/tt-rss.js:118
+#: js/prefs.js:795
+msgid "Removing selected categories..."
+msgstr "Removendo categorias selecionadas..."
+
+#: js/prefs.js:805
+msgid "No categories are selected."
+msgstr "Nenhuma categoria foi selecionada."
+
+#: js/prefs.js:812
+msgid "Category title:"
+msgstr "Título da categoria:"
+
+#: js/prefs.js:815
+msgid "Creating category..."
+msgstr "Criando categoria..."
+
+#: js/prefs.js:832
+msgid "Feeds without recent updates"
+msgstr "Feeds sem atualização recente"
+
+#: js/prefs.js:869
+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:898
+msgid "Reset selected labels to default colors?"
+msgstr "Reiniciar marcadores selecionados para a cor padrão?"
+
+#: js/prefs.js:926
+msgid "Settings Profiles"
+msgstr "Perfis de configurações"
+
+#: js/prefs.js:935
+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:936
+msgid "Removing selected profiles..."
+msgstr "Removendo perfis selecionados..."
+
+#: js/prefs.js:948
+msgid "No profiles are selected."
+msgstr "Nenhum perfil está selecionado."
+
+#: js/prefs.js:955
+#: js/prefs.js:997
+msgid "Activate selected profile?"
+msgstr "Ativar o perfil selecionado?"
+
+#: js/prefs.js:964
+#: js/prefs.js:1008
+msgid "Please choose a profile to activate."
+msgstr "Por favor, selecione um perfil para ativar."
+
+#: js/prefs.js:969
+msgid "Creating profile..."
+msgstr "Criando perfil..."
+
+#: js/prefs.js:1016
+msgid "This will invalidate all previously generated feed URLs. Continue?"
+msgstr "Isso irá invalidar todos os URLs gerados para feeds. Continuar?"
+
+#: js/prefs.js:1017
+#: plugins/share/share_prefs.js:3
+msgid "Clearing URLs..."
+msgstr "Apagando URLs..."
+
+#: js/prefs.js:1020
+msgid "Generated URLs cleared."
+msgstr "URLs geradas apagadas."
+
+#: js/prefs.js:1053
+#, fuzzy
+msgid "Rename category to:"
+msgstr "Remover categoria"
+
+#: js/prefs.js:1074
+msgid "Label Editor"
+msgstr "Editor de marcador"
+
+#: js/tt-rss.js:111
 msgid "Mark all articles as read?"
 msgstr "Marcar todos os artigos como lidos?"
 
-#: js/tt-rss.js:124
+#: js/tt-rss.js:115
 msgid "Marking all feeds as read..."
 msgstr "Marcando todos os feeds como lidos..."
 
-#: js/tt-rss.js:398
+#: js/tt-rss.js:351
 msgid "Please enable mail plugin first."
 msgstr "Por favor habilite o plugin de e-mail."
 
-#: js/tt-rss.js:527
+#: js/tt-rss.js:477
 msgid "Please enable embed_original plugin first."
 msgstr "Por favor, habilite o plugin \"embed_original\"."
 
-#: js/tt-rss.js:540
-#: js/tt-rss.js:723
+#: js/tt-rss.js:490
+#: js/tt-rss.js:653
 msgid "Widescreen is not available in combined mode."
 msgstr "Tela-cheia não suportado no modo combinado."
 
-#: js/tt-rss.js:821
-msgid "You can't rescore this kind of feed."
-msgstr "Você não pode classificar esse tipo de feed."
-
-#: js/tt-rss.js:826
-#: js/tt-rss.js:686
-msgid "Please select some feed first."
-msgstr "Por favor selecione algum feed."
-
-#: js/tt-rss.js:831
-#, perl-format
-msgid "Rescore articles in %s?"
-msgstr "Reclassificar artigos em %s?"
-
-#: js/tt-rss.js:834
-msgid "Rescoring articles..."
-msgstr "Reclassificando artigos..."
-
-#: js/viewfeed.js:917
-#: js/viewfeed.js:955
-#: js/viewfeed.js:1003
-#: js/viewfeed.js:1924
-#: plugins/mail/mail.js:7
+#: js/viewfeed.js:444
+#: js/viewfeed.js:461
+#: js/viewfeed.js:484
+#: js/viewfeed.js:521
+#: js/viewfeed.js:542
+#: js/viewfeed.js:651
+#: js/viewfeed.js:685
+#: js/viewfeed.js:727
+#: js/viewfeed.js:1564
 #: plugins/mailto/init.js:7
-#: js/viewfeed.js:675
-#: js/viewfeed.js:697
-#: js/viewfeed.js:718
-#: js/viewfeed.js:777
-#: js/viewfeed.js:805
+#: plugins/mail/mail.js:7
 msgid "No articles are selected."
 msgstr "Nenhum artigo foi selecionado."
 
-#: js/viewfeed.js:925
+#: js/viewfeed.js:659
 #, 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:927
+#: js/viewfeed.js:661
 #, 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:964
+#: js/viewfeed.js:694
 #, 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:967
+#: js/viewfeed.js:697
 #, 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:969
+#: js/viewfeed.js:698
 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:1009
+#: js/viewfeed.js:733
 #, 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:1029
+#: js/viewfeed.js:753
 msgid "Edit article Tags"
 msgstr "Editar tags do artigo"
 
-#: js/viewfeed.js:1035
+#: js/viewfeed.js:757
 msgid "Saving article tags..."
 msgstr "Salvando tags..."
 
-#: js/viewfeed.js:1666
+#: js/viewfeed.js:1015
+msgid "No article is selected."
+msgstr "Nenhum artigo foi selecionado."
+
+#: js/viewfeed.js:1050
+msgid "No articles found to mark"
+msgstr "Nenhum artigo foi encontrado para marcar"
+
+#: js/viewfeed.js:1052
+#, perl-format
+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?"
+
+#: js/viewfeed.js:1312
 msgid "Open original article"
 msgstr "Abrir o artigo original"
 
-#: js/viewfeed.js:1673
+#: js/viewfeed.js:1319
 msgid "Display article URL"
 msgstr "Mostrar URL do artigo"
 
-#: js/viewfeed.js:1780
+#: js/viewfeed.js:1426
 msgid "Assign label"
 msgstr "Incluir marcador"
 
-#: js/viewfeed.js:1785
+#: js/viewfeed.js:1431
 msgid "Remove label"
 msgstr "Remover marcador"
 
-#: js/viewfeed.js:1817
+#: js/viewfeed.js:1463
 msgid "Select articles in group"
 msgstr "Selecionar artigos no grupo"
 
-#: js/viewfeed.js:1827
+#: js/viewfeed.js:1473
 msgid "Mark group as read"
 msgstr "Marcar grupo como lido"
 
-#: js/viewfeed.js:1839
+#: js/viewfeed.js:1485
 msgid "Mark feed as read"
 msgstr "Marcar feed como lido"
 
-#: js/viewfeed.js:1892
+#: js/viewfeed.js:1538
 msgid "Please enter new score for selected articles:"
 msgstr "Por favor entre uma nova classificação para os artigos selecionados:"
 
-#: js/viewfeed.js:1955
+#: js/viewfeed.js:1571
 msgid "Please enter new score for this article:"
 msgstr "Por favor entre uma nova classificação para esse artigo:"
 
-#: js/viewfeed.js:1986
+#: js/viewfeed.js:1591
 msgid "Article URL:"
 msgstr "URL do artigo:"
 
-#: plugins/note/note.js:17
-msgid "Saving article note..."
-msgstr "Salvando anotação..."
+#: 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/af_psql_trgm/init.js:11
 msgid "Related articles"
 msgstr "Artigos relacionados"
 
+#: plugins/mailto/init.js:21
+#: plugins/mail/mail.js:21
+msgid "Forward article by email"
+msgstr "Encaminhar artigo por e-mail"
+
+#: plugins/shorten_expanded/init.js:43
+msgid "Click to expand article"
+msgstr "Clique para expandir o artigo"
+
 #: plugins/import_export/import_export.js:13
 msgid "Export Data"
 msgstr "Exportar dados"
@@ -3176,256 +3269,167 @@ 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
-msgid "Forward article by email"
-msgstr "Encaminhar artigo por e-mail"
+#: plugins/share/share_prefs.js:2
+msgid "This will invalidate all previously shared article URLs. Continue?"
+msgstr "Isso irá invalidar todos os URLs de artigos compartilhados anteriormente. Continuar?"
 
-#: plugins/mail/mail.js:36
-msgid "Error sending email:"
-msgstr "Erro ao enviar e-mail:"
-
-#: plugins/mail/mail.js:38
-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:45
-msgid "Click to expand article"
-msgstr "Clique para expandir o artigo"
+#: plugins/share/share_prefs.js:8
+msgid "Shared URLs cleared."
+msgstr "URLs compartilhados apagados."
 
 #: plugins/share/share.js:10
 msgid "Share article by URL"
 msgstr "Compartilhar artigo pela URL"
 
-#: plugins/share/share.js:14
+#: plugins/share/share.js:13
 msgid "Generate new share URL for this article?"
 msgstr "Gerar uma nova URL de compartilhamento para esse artigo?"
 
-#: plugins/share/share.js:18
+#: plugins/share/share.js:15
 msgid "Trying to change URL..."
 msgstr "Tentando mudar a URL..."
 
-#: plugins/share/share.js:55
+#: plugins/share/share.js:48
 msgid "Remove sharing for this article?"
 msgstr "Remover compartilhamento deste artigo?"
 
-#: plugins/share/share.js:59
+#: plugins/share/share.js:50
 msgid "Trying to unshare..."
 msgstr "Tentando remover compartilhamento ..."
 
-#: plugins/share/share_prefs.js:3
-msgid "This will invalidate all previously shared article URLs. Continue?"
-msgstr "Isso irá invalidar todos os URLs de artigos compartilhados anteriormente. Continuar?"
+#: plugins/mail/mail.js:30
+msgid "Error sending email:"
+msgstr "Erro ao enviar e-mail:"
 
-#: plugins/share/share_prefs.js:6
-#: js/prefs.js:1277
-msgid "Clearing URLs..."
-msgstr "Apagando URLs..."
+#: plugins/mail/mail.js:32
+msgid "Your message has been sent."
+msgstr "Sua mensagem foi enviada."
 
-#: plugins/share/share_prefs.js:13
-msgid "Shared URLs cleared."
-msgstr "URLs compartilhados apagados."
+#: plugins/note/note.js:15
+msgid "Saving article note..."
+msgstr "Salvando anotação..."
 
-#: js/feedlist.js:204
+#: js/feedlist.js:168
 msgid "Your password is at default value"
 msgstr "Sua senha tem o valor padrão"
 
-#: js/feedlist.js:453
+#: js/feedlist.js:413
 msgid "Mark all articles in %s as read?"
 msgstr "Marcar todos os artigos em %s como lidos?"
 
-#: js/functions.js:494
-msgid "Upload complete."
-msgstr "Upload completo."
-
-#: js/functions.js:511
-msgid "Remove stored feed icon?"
-msgstr "Remover o ícone armazenado para esse feed?"
-
-#: js/functions.js:516
-msgid "Removing feed icon..."
-msgstr "Removendo icone do feed..."
-
-#: js/functions.js:521
-msgid "Feed icon removed."
-msgstr "Ícone do feed foi removido."
-
-#: js/functions.js:537
-msgid "Please select an image file to upload."
-msgstr "Por favor selecione um arquivo de imagem para enviar."
-
-#: js/functions.js:539
-msgid "Upload new icon for this feed?"
-msgstr "Enviar novo icone para este feed?"
-
-#: js/functions.js:540
-msgid "Uploading, please wait..."
-msgstr "Enviando, por favor aguarde..."
-
-#: js/functions.js:550
-msgid "Please enter label caption:"
-msgstr "Por favor entre o título do marcador:"
-
-#: js/functions.js:555
-msgid "Can't create label: missing caption."
-msgstr "Não foi posso criar o marcador: falta o título."
-
-#: js/functions.js:797
+#: js/functions.js:764
 msgid "Edit rule"
 msgstr "Editar regra"
 
-#: js/functions.js:819
+#: js/functions.js:786
 msgid "Edit action"
 msgstr "Editar ação"
 
-#: js/functions.js:860
+#: js/functions.js:825
 msgid "Looking for articles (%d processed, %f found)..."
 msgstr "Procurando por artigos (%d processados, %f encontrados)..."
 
-#: js/functions.js:890
+#: js/functions.js:855
 msgid "Found %d articles matching this filter:"
 msgstr "Encontrados %d artigos de acordo com este filtro:"
 
-#: js/functions.js:942
+#: js/functions.js:907
 msgid "Create Filter"
 msgstr "Criar um filtro"
 
-#: js/functions.js:1060
-#: js/tt-rss.js:692
+#: js/functions.js:1016
+#: js/tt-rss.js:631
 msgid "Unsubscribe from %s?"
 msgstr "Cancelar inscrição de %s?"
 
-#: js/functions.js:1063
+#: js/functions.js:1019
 msgid "Removing feed..."
 msgstr "Removendo a inscrição..."
 
-#: js/functions.js:1489
+#: js/functions.js:1410
 msgid "Help"
 msgstr "Ajuda"
 
-#: js/prefs.js:973
-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:44
+msgid "Please enter login:"
+msgstr "Por favor entre o nome de usuário:"
 
-#: js/prefs.js:979
-msgid "Removing category..."
-msgstr "Removendo categoria..."
+#: js/prefs.js:51
+msgid "Can't create user: no login specified."
+msgstr "Não foi possível criar o usuário: nome de usuário não informado."
 
-#: js/prefs.js:997
-msgid "Remove selected categories?"
-msgstr "Remover as categorias selecionadas?"
+#: js/prefs.js:55
+msgid "Adding user..."
+msgstr "Adicionando o usuário..."
 
-#: js/prefs.js:1000
-msgid "Removing selected categories..."
-msgstr "Removendo categorias selecionadas..."
+#: js/prefs.js:74
+msgid "User Editor"
+msgstr "Editor de usuários"
 
-#: js/prefs.js:1013
-msgid "No categories are selected."
-msgstr "Nenhuma categoria foi selecionada."
+#: js/prefs.js:104
+msgid "Edit Filter"
+msgstr "Editar filtro"
 
-#: js/prefs.js:1020
-msgid "Category title:"
-msgstr "Título da categoria:"
+#: js/prefs.js:1175
+msgid "Subscribing to feeds..."
+msgstr "Inscrevendo-se aos feeds..."
 
-#: js/prefs.js:1024
-msgid "Creating category..."
-msgstr "Criando categoria..."
+#: js/prefs.js:1191
+msgid "Clear stored data for this plugin?"
+msgstr "Limpar dados armazenados para este plugin?"
 
-#: js/prefs.js:1047
-msgid "Feeds without recent updates"
-msgstr "Feeds sem atualização recente"
+#: js/prefs.js:1203
+msgid "Clear all messages in the error log?"
+msgstr "Limpar todas as mensagems do registro de erro?"
 
-#: js/prefs.js:1091
-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:1129
-msgid "Reset selected labels to default colors?"
-msgstr "Reiniciar marcadores selecionados para a cor padrão?"
-
-#: js/prefs.js:1161
-msgid "Settings Profiles"
-msgstr "Perfis de configurações"
-
-#: js/prefs.js:1170
-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:1173
-msgid "Removing selected profiles..."
-msgstr "Removendo perfis selecionados..."
-
-#: js/prefs.js:1189
-msgid "No profiles are selected."
-msgstr "Nenhum perfil está selecionado."
-
-#: js/prefs.js:1197
-#: js/prefs.js:1250
-msgid "Activate selected profile?"
-msgstr "Ativar o perfil selecionado?"
-
-#: js/prefs.js:1214
-#: js/prefs.js:1266
-msgid "Please choose a profile to activate."
-msgstr "Por favor, selecione um perfil para ativar."
-
-#: js/prefs.js:1219
-msgid "Creating profile..."
-msgstr "Criando perfil..."
-
-#: js/prefs.js:1274
-msgid "This will invalidate all previously generated feed URLs. Continue?"
-msgstr "Isso irá invalidar todos os URLs gerados para feeds. Continuar?"
-
-#: js/prefs.js:1284
-msgid "Generated URLs cleared."
-msgstr "URLs geradas apagadas."
-
-#: js/prefs.js:1356
-msgid "Label Editor"
-msgstr "Editor de marcador"
-
-#: js/tt-rss.js:681
+#: js/tt-rss.js:620
 msgid "You can't unsubscribe from the category."
 msgstr "Você não pode cancelar a inscrição dessa categoria."
 
-#: js/viewfeed.js:127
-#: js/viewfeed.js:177
-#: js/viewfeed.js:194
+#: js/tt-rss.js:625
+msgid "Please select some feed first."
+msgstr "Por favor selecione algum feed."
+
+#: js/viewfeed.js:89
+#: js/viewfeed.js:135
+#: js/viewfeed.js:152
 msgid "Click to open next unread feed."
 msgstr "Clique para abrir o próximo feed não lido."
 
-#: js/viewfeed.js:131
+#: js/viewfeed.js:93
 msgid "Cancel search"
 msgstr "Cancelar pesquisa"
 
-#: js/viewfeed.js:191
+#: js/viewfeed.js:149
 msgid "New articles found, reload feed to continue."
 msgstr "Novos artigos encontrados, recarregue o feed para continuar."
 
-#: js/viewfeed.js:620
+#: js/viewfeed.js:405
 msgid "%d article selected"
 msgid_plural "%d articles selected"
 msgstr[0] "%d artigo selecionado"
 msgstr[1] "%d artigos selecionados"
 
-#: js/viewfeed.js:1284
-msgid "No article is selected."
-msgstr "Nenhum artigo foi selecionado."
+#~ msgid "Rescore feed"
+#~ msgstr "Reclassificar feed"
 
-#: js/viewfeed.js:1319
-msgid "No articles found to mark"
-msgstr "Nenhum artigo foi encontrado para marcar"
+#~ msgid "Create label..."
+#~ msgstr "Criar marcador..."
 
-#: js/viewfeed.js:1321
-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 "Create filter..."
+#~ msgstr "Criar filtro..."
+
+#~ msgid "You can't rescore this kind of feed."
+#~ msgstr "Você não pode classificar esse tipo de feed."
+
+#~ msgid "Rescore articles in %s?"
+#~ msgstr "Reclassificar artigos em %s?"
+
+#~ msgid "Rescoring articles..."
+#~ msgstr "Reclassificando artigos..."
+
+#~ msgid "Can't create label: missing caption."
+#~ msgstr "Não foi posso criar o marcador: falta o título."
 
 #~ 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>"
diff --git a/locale/pt_PT/LC_MESSAGES/messages.mo b/locale/pt_PT/LC_MESSAGES/messages.mo
index f5256ed98..78aa1f9c9 100644
Binary files a/locale/pt_PT/LC_MESSAGES/messages.mo and b/locale/pt_PT/LC_MESSAGES/messages.mo differ
diff --git a/locale/pt_PT/LC_MESSAGES/messages.po b/locale/pt_PT/LC_MESSAGES/messages.po
index 619fd5419..b50e63d4e 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: 2018-10-10 08:24+0300\n"
+"POT-Creation-Date: 2018-12-01 12:59+0300\n"
 "PO-Revision-Date: 2016-01-09 14:25-0200\n"
 "Last-Translator: Duarte Velez Grilo <duartegrilo@gmail.com>\n"
 "Language-Team: Portuguese/Portugal <duartegrilo@gmail.com>\n"
@@ -97,8 +97,8 @@ msgid "Weekly"
 msgstr "Semanalmente"
 
 #: backend.php:103
-#: classes/pref/users.php:47
 #: classes/pref/system.php:51
+#: classes/pref/users.php:47
 msgid "User"
 msgstr "Utilizador"
 
@@ -170,33 +170,33 @@ msgstr "Usuário não encontrado"
 
 #: index.php:151
 #: index.php:167
-#: index.php:285
+#: index.php:282
 #: prefs.php:120
 #: classes/backend.php:5
 #: classes/pref/labels.php:294
-#: classes/pref/feeds.php:1230
 #: classes/pref/filters.php:822
-#: js/feedlist.js:148
-#: js/feedlist.js:491
-#: js/feedlist.js:539
-#: js/functions.js:314
-#: js/functions.js:1336
-#: js/prefs.js:562
-#: js/prefs.js:754
-#: js/prefs.js:1488
-#: js/prefs.js:1503
-#: js/tt-rss.js:547
-#: js/viewfeed.js:1180
+#: classes/pref/feeds.php:1229
+#: js/feedlist.js:118
+#: js/feedlist.js:446
+#: js/feedlist.js:487
+#: js/functions.js:328
+#: js/functions.js:551
+#: js/functions.js:1286
+#: js/prefs.js:477
+#: js/prefs.js:617
+#: js/prefs.js:956
+#: js/prefs.js:1000
+#: js/prefs.js:1028
+#: js/prefs.js:1037
+#: js/prefs.js:1045
+#: js/prefs.js:1057
+#: js/tt-rss.js:497
+#: js/viewfeed.js:509
+#: js/viewfeed.js:928
 #: plugins/import_export/import_export.js:17
-#: js/functions.js:565
-#: js/prefs.js:1200
-#: js/prefs.js:1253
-#: js/prefs.js:1292
-#: js/prefs.js:1305
-#: js/prefs.js:1316
-#: js/prefs.js:1331
-#: js/tt-rss.js:564
-#: js/viewfeed.js:760
+#: js/prefs.js:1192
+#: js/prefs.js:1205
+#: js/tt-rss.js:510
 msgid "Loading, please wait..."
 msgstr "A carregar, por favor aguarde..."
 
@@ -213,13 +213,13 @@ msgid "All Articles"
 msgstr "Todos os artigos"
 
 #: index.php:194
-#: include/functions.php:1227
+#: include/functions.php:1172
 #: classes/feeds.php:110
 msgid "Starred"
 msgstr "Favoritos"
 
 #: index.php:195
-#: include/functions.php:1228
+#: include/functions.php:1173
 #: classes/feeds.php:111
 msgid "Published"
 msgstr "Publicados"
@@ -259,11 +259,11 @@ msgid "Title"
 msgstr "Título"
 
 #: index.php:211
-#: index.php:251
-#: include/functions.php:1215
+#: index.php:250
+#: include/functions.php:1160
 #: classes/feeds.php:115
-#: js/FeedTree.js:41
-#: js/FeedTree.js:69
+#: js/FeedTree.js:42
+#: js/FeedTree.js:70
 msgid "Mark as read"
 msgstr "Marcar como lido"
 
@@ -300,7 +300,7 @@ msgid "Feed actions:"
 msgstr "Acções do Feed:"
 
 #: index.php:246
-#: classes/handler/public.php:551
+#: classes/handler/public.php:575
 msgid "Subscribe to feed..."
 msgstr "Assinar feed..."
 
@@ -309,56 +309,44 @@ msgid "Edit this feed..."
 msgstr "Editar assinatura..."
 
 #: index.php:248
-msgid "Rescore feed"
-msgstr "Reclassificar assinatura"
-
-#: index.php:249
-#: classes/pref/feeds.php:770
-#: classes/pref/feeds.php:1203
-#: js/PrefFeedTree.js:61
+#: classes/pref/feeds.php:769
+#: classes/pref/feeds.php:1202
+#: js/PrefFeedTree.js:62
 msgid "Unsubscribe"
 msgstr "Cancelar assinatura"
 
-#: index.php:250
+#: index.php:249
 msgid "All feeds:"
 msgstr "Todos os Feeds:"
 
-#: index.php:252
+#: index.php:251
 msgid "(Un)hide read feeds"
 msgstr "Mostrar/Ocultar feeds lidos"
 
-#: index.php:253
+#: index.php:252
 msgid "Other actions:"
 msgstr "Outras acções:"
 
-#: index.php:254
-#: include/functions.php:1201
+#: index.php:253
+#: include/functions.php:1146
 msgid "Toggle widescreen mode"
 msgstr "Activa/Desactiva modo widescreen"
 
-#: index.php:255
-msgid "Create label..."
-msgstr "Criar marcador..."
-
-#: index.php:256
-msgid "Create filter..."
-msgstr "Criar filtro..."
-
-#: index.php:257
+#: index.php:254
 msgid "Keyboard shortcuts help"
 msgstr "Ajuda para atalhos de teclado"
 
-#: index.php:266
+#: index.php:263
 msgid "Logout"
 msgstr "Sair"
 
-#: index.php:272
+#: index.php:269
 msgid "Updates are available from Git."
 msgstr ""
 
 #: prefs.php:33
 #: prefs.php:138
-#: include/functions.php:1230
+#: include/functions.php:1175
 #: classes/pref/prefs.php:425
 msgid "Preferences"
 msgstr "Preferências"
@@ -373,8 +361,8 @@ msgstr "Sair das preferências"
 
 #: prefs.php:141
 #: classes/pref/feeds.php:114
-#: classes/pref/feeds.php:1138
-#: classes/pref/feeds.php:1192
+#: classes/pref/feeds.php:1137
+#: classes/pref/feeds.php:1191
 msgid "Feeds"
 msgstr "Assinaturas"
 
@@ -384,8 +372,8 @@ msgid "Filters"
 msgstr "Filtros"
 
 #: prefs.php:147
+#: classes/feeds.php:1696
 #: classes/pref/labels.php:94
-#: classes/feeds.php:1710
 msgid "Labels"
 msgstr "Marcadores"
 
@@ -397,80 +385,80 @@ msgstr "Utilizadores"
 msgid "System"
 msgstr "Sistema"
 
-#: register.php:186
+#: register.php:185
 #: include/login_form.php:162
 msgid "Create new account"
 msgstr "Criar uma nova conta"
 
-#: register.php:192
+#: register.php:191
 msgid "New user registrations are administratively disabled."
 msgstr "O registro de novos utilizadores foi desactivado pelo administrador"
 
-#: register.php:196
-#: register.php:241
-#: register.php:254
-#: register.php:269
-#: register.php:288
-#: register.php:336
-#: register.php:346
-#: register.php:358
-#: classes/handler/public.php:623
-#: classes/handler/public.php:697
-#: classes/handler/public.php:798
-#: classes/handler/public.php:877
-#: classes/handler/public.php:891
-#: classes/handler/public.php:898
-#: classes/handler/public.php:923
+#: register.php:195
+#: register.php:240
+#: register.php:253
+#: register.php:268
+#: register.php:287
+#: register.php:334
+#: register.php:344
+#: register.php:356
+#: classes/handler/public.php:647
+#: classes/handler/public.php:721
+#: 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"
 
-#: register.php:217
+#: register.php:216
 msgid "Your temporary password will be sent to the specified email. Accounts, which were not logged in once, are erased automatically 24 hours after temporary password is sent."
 msgstr "A sua palavra-pasee temporária será enviada para o e-mail especificado. Contas que não recebam, pelo menos, um acesso são apagadas automaticamente 24 horas depois do envio da palavra-passe temporária."
 
-#: register.php:223
+#: register.php:222
 msgid "Desired login:"
 msgstr "Nome de utilizador:"
 
-#: register.php:226
+#: register.php:225
 msgid "Check availability"
 msgstr "Verificar disponibilidade"
 
-#: register.php:228
-#: classes/handler/public.php:713
+#: register.php:227
+#: classes/handler/public.php:737
 msgid "Email:"
 msgstr "E-mail: "
 
-#: register.php:231
-#: classes/handler/public.php:718
+#: register.php:230
+#: classes/handler/public.php:742
 msgid "How much is two plus two:"
 msgstr "Quanto é dois mais dois:"
 
-#: register.php:234
+#: register.php:233
 msgid "Submit registration"
 msgstr "Submeter registo"
 
-#: register.php:252
+#: register.php:251
 msgid "Your registration information is incomplete."
 msgstr "A sua informação de registo está incompleta."
 
-#: register.php:267
+#: register.php:266
 msgid "Sorry, this username is already taken."
 msgstr "Desculpe, esse nome de utilizador já está em uso."
 
-#: register.php:286
+#: register.php:285
 msgid "Registration failed."
 msgstr "Processo de registo falhou."
 
-#: register.php:333
+#: register.php:331
 msgid "Account created successfully."
 msgstr "Conta criada com sucesso."
 
-#: register.php:355
+#: register.php:353
 msgid "New user registrations are currently closed."
 msgstr "O registro de novos utilizador está actualmente suspenso."
 
-#: update.php:66
+#: update.php:67
 msgid "Tiny Tiny RSS data update script."
 msgstr "Script de actualização do Tiny Tiny RSS."
 
@@ -483,10 +471,10 @@ msgstr "Todos os feeds"
 
 #: include/controls.php:138
 #: include/controls.php:230
-#: classes/opml.php:512
-#: classes/digest.php:120
+#: classes/digest.php:124
+#: classes/feeds.php:1708
 #: classes/pref/feeds.php:233
-#: classes/feeds.php:1722
+#: classes/opml.php:512
 msgid "Uncategorized"
 msgstr "Não Categorizado"
 
@@ -501,288 +489,288 @@ msgstr[1] "%d artigos arquivados"
 msgid "No feeds found."
 msgstr "Sem assinaturas para exibir."
 
-#: include/functions.php:983
+#: include/functions.php:928
 #, php-format
 msgid "%d min"
 msgstr ""
 
-#: include/functions.php:1177
+#: include/functions.php:1122
 msgid "Navigation"
 msgstr "Navegação"
 
-#: include/functions.php:1178
+#: include/functions.php:1123
 msgid "Open next feed"
 msgstr "Abrir a próxima assinatura"
 
-#: include/functions.php:1179
+#: include/functions.php:1124
 msgid "Open previous feed"
 msgstr "Abrir a assinatura anterior"
 
-#: include/functions.php:1180
+#: include/functions.php:1125
 msgid "Open next article"
 msgstr "Abrir o próximo artigo"
 
-#: include/functions.php:1181
+#: include/functions.php:1126
 msgid "Open previous article"
 msgstr "Abrir o artigo anterior"
 
-#: include/functions.php:1182
+#: include/functions.php:1127
 msgid "Open next article (don't scroll long articles)"
 msgstr "Abrir o próximo artigo (não rolar artigos longos)"
 
-#: include/functions.php:1183
+#: include/functions.php:1128
 msgid "Open previous article (don't scroll long articles)"
 msgstr "Abrir o artigo anterior (não rolar artigos longos)"
 
-#: include/functions.php:1184
+#: include/functions.php:1129
 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/functions.php:1185
+#: include/functions.php:1130
 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/functions.php:1186
+#: include/functions.php:1131
 msgid "Show search dialog"
 msgstr "Mostrar diálogo de pesquisa"
 
-#: include/functions.php:1187
+#: include/functions.php:1132
 msgid "Article"
 msgstr "Artigo"
 
-#: include/functions.php:1188
-#: js/viewfeed.js:1695
+#: include/functions.php:1133
+#: js/viewfeed.js:1341
 msgid "Toggle starred"
 msgstr "Incluir/Remover estrela"
 
-#: include/functions.php:1189
-#: js/viewfeed.js:1707
+#: include/functions.php:1134
+#: js/viewfeed.js:1353
 msgid "Toggle published"
 msgstr "Marcar/Desmarcar como publicado"
 
-#: include/functions.php:1190
-#: js/viewfeed.js:1682
+#: include/functions.php:1135
+#: js/viewfeed.js:1328
 msgid "Toggle unread"
 msgstr "Marcar como não lido"
 
-#: include/functions.php:1191
+#: include/functions.php:1136
 msgid "Edit tags"
 msgstr "Editar Tags"
 
-#: include/functions.php:1192
+#: include/functions.php:1137
 msgid "Open in new window"
 msgstr "Abrir em uma nova janela"
 
-#: include/functions.php:1193
-#: js/viewfeed.js:1728
+#: include/functions.php:1138
+#: js/viewfeed.js:1374
 msgid "Mark below as read"
 msgstr "Marcar abaixo como lido"
 
-#: include/functions.php:1194
-#: js/viewfeed.js:1721
+#: include/functions.php:1139
+#: js/viewfeed.js:1367
 msgid "Mark above as read"
 msgstr "Marcar acima como lido"
 
-#: include/functions.php:1195
+#: include/functions.php:1140
 msgid "Scroll down"
 msgstr "Rolar para baixo"
 
-#: include/functions.php:1196
+#: include/functions.php:1141
 msgid "Scroll up"
 msgstr "Rolar para cima"
 
-#: include/functions.php:1197
+#: include/functions.php:1142
 msgid "Select article under cursor"
 msgstr "Selecionar artigo sob o cursor"
 
-#: include/functions.php:1198
+#: include/functions.php:1143
 msgid "Email article"
 msgstr "Enviar artigo por e-mail"
 
-#: include/functions.php:1199
+#: include/functions.php:1144
 msgid "Close/collapse article"
 msgstr "Fechar/Abrir artigo"
 
-#: include/functions.php:1200
+#: include/functions.php:1145
 msgid "Toggle article expansion (combined mode)"
 msgstr "Ativar/Desativar expansão de artigo (modo combinado)"
 
-#: include/functions.php:1202
+#: include/functions.php:1147
 #: plugins/embed_original/init.php:33
 msgid "Toggle embed original"
 msgstr "Ativar/Desativar inclusão do original"
 
-#: include/functions.php:1203
+#: include/functions.php:1148
 msgid "Article selection"
 msgstr "Seleção de artigos"
 
-#: include/functions.php:1204
+#: include/functions.php:1149
 msgid "Select all articles"
 msgstr "Selecionar todos os artigos"
 
-#: include/functions.php:1205
+#: include/functions.php:1150
 msgid "Select unread"
 msgstr "Selecionar os não lidos"
 
-#: include/functions.php:1206
+#: include/functions.php:1151
 msgid "Select starred"
 msgstr "Selecionar artigos com estrela"
 
-#: include/functions.php:1207
+#: include/functions.php:1152
 msgid "Select published"
 msgstr "Selecionar artigos publicados"
 
-#: include/functions.php:1208
+#: include/functions.php:1153
 msgid "Invert selection"
 msgstr "Inverter seleção"
 
-#: include/functions.php:1209
+#: include/functions.php:1154
 msgid "Deselect everything"
 msgstr "Desmarcar tudo"
 
-#: include/functions.php:1210
-#: classes/pref/feeds.php:522
-#: classes/pref/feeds.php:794
+#: include/functions.php:1155
+#: classes/pref/feeds.php:521
+#: classes/pref/feeds.php:793
 msgid "Feed"
 msgstr "Feed"
 
-#: include/functions.php:1211
+#: include/functions.php:1156
 msgid "Refresh current feed"
 msgstr "Atualizar inscrição atual"
 
-#: include/functions.php:1212
+#: include/functions.php:1157
 msgid "Un/hide read feeds"
 msgstr "Ocultar/mostrar inscrições lidas"
 
-#: include/functions.php:1213
-#: classes/pref/feeds.php:1195
+#: include/functions.php:1158
+#: classes/pref/feeds.php:1194
 msgid "Subscribe to feed"
 msgstr "Assinar"
 
-#: include/functions.php:1214
-#: js/FeedTree.js:48
-#: js/PrefFeedTree.js:55
-#: js/viewfeed.js:1846
+#: include/functions.php:1159
+#: js/FeedTree.js:49
+#: js/PrefFeedTree.js:56
+#: js/viewfeed.js:1492
 msgid "Edit feed"
 msgstr "Editar inscrição"
 
-#: include/functions.php:1216
+#: include/functions.php:1161
 #, fuzzy
 msgid "Reverse headlines"
 msgstr "Remover as categorias selecionadas?"
 
-#: include/functions.php:1217
+#: include/functions.php:1162
 msgid "Toggle headline grouping"
 msgstr ""
 
-#: include/functions.php:1218
+#: include/functions.php:1163
 msgid "Debug feed update"
 msgstr "Debugar atualização de inscrições"
 
-#: include/functions.php:1219
+#: include/functions.php:1164
 #, fuzzy
 msgid "Debug viewfeed()"
 msgstr "Debugar atualização de inscrições"
 
-#: include/functions.php:1220
-#: js/FeedTree.js:97
+#: include/functions.php:1165
+#: js/FeedTree.js:98
 msgid "Mark all feeds as read"
 msgstr "Marcar todas as inscrições como lidas"
 
-#: include/functions.php:1221
+#: include/functions.php:1166
 msgid "Un/collapse current category"
 msgstr "Mostrar/Ocultar categoria atual"
 
-#: include/functions.php:1222
-msgid "Toggle combined mode"
-msgstr "Ativar/Desativar modo combinado"
-
-#: include/functions.php:1223
+#: include/functions.php:1167
 msgid "Toggle auto expand in combined mode"
 msgstr "Ativar/Desativar expansão no modo combinado"
 
-#: include/functions.php:1224
+#: include/functions.php:1168
+msgid "Toggle combined mode"
+msgstr "Ativar/Desativar modo combinado"
+
+#: include/functions.php:1169
 msgid "Go to"
 msgstr "Ir para"
 
-#: include/functions.php:1225
-#: classes/feeds.php:1583
+#: include/functions.php:1170
+#: classes/feeds.php:1569
 msgid "All articles"
 msgstr "Todas as inscrições"
 
-#: include/functions.php:1226
+#: include/functions.php:1171
 msgid "Fresh"
 msgstr "Recentes"
 
-#: include/functions.php:1229
-#: js/tt-rss.js:491
-#: js/tt-rss.js:660
+#: include/functions.php:1174
+#: js/tt-rss.js:439
+#: js/tt-rss.js:599
 msgid "Tag cloud"
 msgstr "Núvem de tags"
 
-#: include/functions.php:1231
+#: include/functions.php:1176
 msgid "Other"
 msgstr "Outros"
 
-#: include/functions.php:1232
+#: include/functions.php:1177
 #: classes/pref/labels.php:279
 msgid "Create label"
 msgstr "Criar marcador"
 
-#: include/functions.php:1233
+#: include/functions.php:1178
 #: classes/pref/filters.php:801
 msgid "Create filter"
 msgstr "Criar filtro"
 
-#: include/functions.php:1234
+#: include/functions.php:1179
 msgid "Un/collapse sidebar"
 msgstr "Mostrar/Ocultar barra lateral"
 
-#: include/functions.php:1235
+#: include/functions.php:1180
 msgid "Show help dialog"
 msgstr "Mostrar dialogo de ajuda"
 
-#: include/functions.php:2582
+#: include/functions.php:2529
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: include/functions.php:2583
+#: include/functions.php:2530
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: include/functions.php:2584
+#: include/functions.php:2531
 msgid "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form"
 msgstr ""
 
-#: include/functions.php:2585
+#: include/functions.php:2532
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: include/functions.php:2586
+#: include/functions.php:2533
 #, fuzzy
 msgid "No file was uploaded"
 msgstr "Nenhum arquivo enviado."
 
-#: include/functions.php:2587
+#: include/functions.php:2534
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: include/functions.php:2588
+#: include/functions.php:2535
 msgid "Failed to write file to disk."
 msgstr ""
 
-#: include/functions.php:2589
+#: include/functions.php:2536
 msgid "A PHP extension stopped the file upload."
 msgstr ""
 
 #: include/login_form.php:107
-#: classes/handler/public.php:446
-#: classes/handler/public.php:708
+#: classes/handler/public.php:466
+#: classes/handler/public.php:732
 msgid "Login:"
 msgstr "Nome de usuário:"
 
 #: include/login_form.php:117
-#: classes/handler/public.php:449
+#: classes/handler/public.php:469
 msgid "Password:"
 msgstr "Senha:"
 
@@ -795,9 +783,9 @@ msgid "Profile:"
 msgstr "Perfil:"
 
 #: include/login_form.php:133
-#: classes/handler/public.php:252
 #: classes/pref/prefs.php:1037
 #: classes/rpc.php:69
+#: classes/handler/public.php:272
 msgid "Default profile"
 msgstr "Perfil padrão"
 
@@ -814,209 +802,27 @@ msgid "Remember me"
 msgstr "Continuar conectado"
 
 #: include/login_form.php:159
-#: classes/handler/public.php:454
+#: classes/handler/public.php:474
 msgid "Log in"
 msgstr "Login"
 
-#: include/sessions.php:46
+#: include/sessions.php:45
 msgid "Session failed to validate (schema version changed)"
 msgstr "Falha ao validar a sessão (Versão do banco de dados mudou)"
 
-#: include/sessions.php:62
+#: include/sessions.php:53
+#, fuzzy
+msgid "Session failed to validate (UA changed)."
+msgstr "Falha ao validar a sessão (A senha foi alterada)"
+
+#: include/sessions.php:67
 msgid "Session failed to validate (password changed)"
 msgstr "Falha ao validar a sessão (A senha foi alterada)"
 
-#: include/sessions.php:69
+#: include/sessions.php:74
 msgid "Session failed to validate (user not found)"
 msgstr "Falha ao validar a sessão (Usuário não encontrado)"
 
-#: classes/article.php:26
-msgid "Article not found."
-msgstr "Artigo não encontrado."
-
-#: classes/article.php:211
-msgid "Tags for this article (separated by commas):"
-msgstr "Tags para esse artigo (separadas por vírgula):"
-
-#: classes/article.php:236
-#: classes/pref/labels.php:82
-#: classes/pref/users.php:103
-#: classes/pref/feeds.php:774
-#: classes/pref/feeds.php:914
-#: classes/pref/filters.php:525
-#: classes/pref/prefs.php:982
-#: plugins/nsfw/init.php:85
-#: plugins/note/init.php:58
-#: plugins/af_readability/init.php:80
-#: plugins/af_redditimgur/init.php:66
-#: plugins/af_psql_trgm/init.php:188
-#: plugins/mail/init.php:65
-#: plugins/af_zz_imgproxy/init.php:238
-msgid "Save"
-msgstr "Salvar"
-
-#: classes/article.php:238
-#: classes/handler/public.php:423
-#: classes/handler/public.php:457
-#: classes/pref/labels.php:84
-#: classes/pref/users.php:105
-#: classes/pref/feeds.php:775
-#: classes/pref/feeds.php:917
-#: classes/pref/feeds.php:1672
-#: classes/pref/filters.php:528
-#: classes/pref/filters.php:945
-#: classes/pref/filters.php:1022
-#: classes/pref/filters.php:1115
-#: classes/pref/prefs.php:984
-#: classes/feeds.php:1037
-#: classes/feeds.php:1089
-#: classes/feeds.php:1128
-#: plugins/note/init.php:60
-#: plugins/mail/init.php:179
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: classes/article.php:337
-#: classes/article.php:720
-#: classes/article.php:875
-msgid "no tags"
-msgstr "sem tags"
-
-#: classes/article.php:448
-msgid "unknown type"
-msgstr "tipo desconhecido"
-
-#: classes/article.php:525
-msgid "Attachments"
-msgstr "Anexos"
-
-#: classes/article.php:626
-#: classes/feeds.php:661
-#, fuzzy
-msgid "comment"
-msgid_plural "comments"
-msgstr[0] "Conteúdo"
-msgstr[1] "Conteúdo"
-
-#: classes/article.php:630
-#: classes/feeds.php:665
-#, fuzzy
-msgid "comments"
-msgstr "Conteúdo"
-
-#: classes/article.php:689
-msgid " - "
-msgstr " - "
-
-#: classes/article.php:730
-#: classes/feeds.php:647
-msgid "Edit tags for this article"
-msgstr "Editar tags deste artigo"
-
-#: classes/article.php:763
-#: classes/feeds.php:602
-msgid "Originally from:"
-msgstr "Originalmente de:"
-
-#: classes/article.php:774
-#: classes/pref/feeds.php:539
-#: classes/feeds.php:613
-msgid "Feed URL"
-msgstr "URL da inscrição"
-
-#: classes/article.php:811
-#: classes/backend.php:103
-#: classes/dlg.php:33
-#: classes/dlg.php:56
-#: classes/dlg.php:89
-#: classes/dlg.php:154
-#: classes/dlg.php:181
-#: classes/dlg.php:197
-#: classes/pref/feeds.php:1466
-#: classes/pref/feeds.php:1533
-#: classes/pref/filters.php:208
-#: classes/pref/prefs.php:1099
-#: plugins/af_psql_trgm/init.php:109
-#: plugins/import_export/init.php:446
-#: plugins/import_export/init.php:490
-#: plugins/share/init.php:128
-msgid "Close this window"
-msgstr "Fechar esta janela"
-
-#: classes/article.php:913
-msgid "(edit note)"
-msgstr "Editar nota"
-
-#: classes/opml.php:31
-#: classes/opml.php:36
-msgid "OPML Utility"
-msgstr "Utilitário OPML"
-
-#: classes/opml.php:40
-msgid "Importing OPML..."
-msgstr "Importando OPML..."
-
-#: classes/opml.php:45
-msgid "Return to preferences"
-msgstr "Retornar às preferências"
-
-#: classes/opml.php:301
-#, php-format
-msgid "Adding feed: %s"
-msgstr "Adicionando feed: %s"
-
-#: classes/opml.php:312
-#, php-format
-msgid "Duplicate feed: %s"
-msgstr "Feed duplicado: %s"
-
-#: classes/opml.php:326
-#, php-format
-msgid "Adding label %s"
-msgstr "Adicionando marcador %s"
-
-#: classes/opml.php:329
-#, php-format
-msgid "Duplicate label: %s"
-msgstr "Marcador duplicado: %s"
-
-#: classes/opml.php:341
-#, php-format
-msgid "Setting preference key %s to %s"
-msgstr "Ajustando chave de configuração %s para %s"
-
-#: classes/opml.php:377
-msgid "Adding filter..."
-msgstr "Adicionando filtro..."
-
-#: classes/opml.php:512
-#, php-format
-msgid "Processing category: %s"
-msgstr "Processando categoria: %s"
-
-#: classes/opml.php:558
-#, php-format
-msgid "Upload failed with error code %d"
-msgstr "Enviou falhou com o código de erro %d"
-
-#: classes/opml.php:570
-#: plugins/import_export/init.php:471
-msgid "Unable to move uploaded file."
-msgstr "Incapaz de mover arquivo enviado."
-
-#: classes/opml.php:574
-#: plugins/import_export/init.php:475
-msgid "Error: please upload OPML file."
-msgstr "Erro: Por favor envie um arquivo OPML."
-
-#: classes/opml.php:585
-msgid "Error: unable to find moved OPML file."
-msgstr "Erro: Arquivo OPML movido não foi encontrado"
-
-#: classes/opml.php:594
-msgid "Error while parsing document."
-msgstr "Erro ao processar o documento."
-
 #: 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."
@@ -1037,164 +843,358 @@ msgstr ""
 msgid "Help topic not found."
 msgstr "Tópico de ajuda não encontrado."
 
-#: classes/dlg.php:17
-msgid "If you have imported labels and/or filters, you might need to reload preferences to see your new data."
+#: classes/backend.php:103
+#: classes/pref/filters.php:208
+#: classes/pref/feeds.php:1465
+#: classes/pref/feeds.php:1532
+#: classes/pref/prefs.php:1099
+#: classes/dlg.php:33
+#: classes/dlg.php:56
+#: classes/dlg.php:89
+#: classes/dlg.php:154
+#: classes/dlg.php:181
+#: classes/dlg.php:197
+#: classes/article.php:810
+#: plugins/af_psql_trgm/init.php:109
+#: plugins/import_export/init.php:446
+#: plugins/import_export/init.php:490
+#: plugins/share/init.php:128
+msgid "Close this window"
+msgstr "Fechar esta janela"
+
+#: classes/feeds.php:53
+msgid "View as RSS feed"
+msgstr "Ver como um feed rss"
+
+#: classes/feeds.php:54
+#: classes/feeds.php:140
+#: classes/pref/feeds.php:1326
+msgid "View as RSS"
+msgstr "Ver como RSS"
+
+#: classes/feeds.php:62
+#, php-format
+msgid "Last updated: %s"
+msgstr "Última atualização em: %s"
+
+#: classes/feeds.php:100
+#, fuzzy
+msgid "Select..."
+msgstr "Selecione"
+
+#: classes/feeds.php:102
+#: classes/pref/labels.php:273
+#: classes/pref/filters.php:391
+#: classes/pref/filters.php:449
+#: classes/pref/filters.php:795
+#: classes/pref/filters.php:878
+#: classes/pref/filters.php:905
+#: classes/pref/feeds.php:1185
+#: classes/pref/feeds.php:1416
+#: classes/pref/feeds.php:1481
+#: classes/pref/users.php:358
+#: classes/pref/prefs.php:996
+msgid "All"
+msgstr "Tudo"
+
+#: classes/feeds.php:104
+msgid "Invert"
+msgstr "Inverter"
+
+#: classes/feeds.php:105
+#: classes/pref/labels.php:275
+#: classes/pref/filters.php:393
+#: classes/pref/filters.php:451
+#: classes/pref/filters.php:797
+#: classes/pref/filters.php:880
+#: classes/pref/filters.php:907
+#: classes/pref/feeds.php:1187
+#: classes/pref/feeds.php:1418
+#: classes/pref/feeds.php:1483
+#: classes/pref/users.php:360
+#: classes/pref/prefs.php:998
+msgid "None"
+msgstr "Nenhum"
+
+#: classes/feeds.php:107
+msgid "Selection toggle:"
+msgstr "Inverter seleção:"
+
+#: classes/feeds.php:113
+msgid "Selection:"
+msgstr "Seleção:"
+
+#: classes/feeds.php:116
+msgid "Set score"
+msgstr "Classificar"
+
+#: classes/feeds.php:119
+msgid "Archive"
+msgstr "Arquivar"
+
+#: classes/feeds.php:121
+msgid "Move back"
+msgstr "Retornar"
+
+#: classes/feeds.php:122
+#: classes/pref/filters.php:400
+#: classes/pref/filters.php:458
+#: classes/pref/filters.php:887
+#: classes/pref/filters.php:914
+msgid "Delete"
+msgstr "Apaga"
+
+#: classes/feeds.php:127
+#: classes/feeds.php:132
+#: plugins/mailto/init.php:25
+#: plugins/mail/init.php:76
+msgid "Forward by email"
+msgstr "Encaminhar por e-mail"
+
+#: classes/feeds.php:136
+msgid "Feed:"
+msgstr "Feed:"
+
+#: classes/feeds.php:193
+#: classes/feeds.php:802
+msgid "Feed not found."
+msgstr "Feed não encontrado."
+
+#: classes/feeds.php:255
+msgid "Never"
+msgstr "Nunca"
+
+#: classes/feeds.php:341
+#, php-format
+msgid "Imported at %s"
+msgstr "Importado em %s"
+
+#: classes/feeds.php:391
+#: classes/feeds.php:484
+#, fuzzy
+msgid "mark feed as read"
+msgstr "Marcar como lido"
+
+#: classes/feeds.php:540
+msgid "Collapse article"
+msgstr "Fechar artigo"
+
+#: classes/feeds.php:592
+#: classes/article.php:762
+msgid "Originally from:"
+msgstr "Originalmente de:"
+
+#: classes/feeds.php:603
+#: classes/pref/feeds.php:538
+#: classes/article.php:773
+msgid "Feed URL"
+msgstr "URL da inscrição"
+
+#: classes/feeds.php:630
+#: classes/article.php:729
+msgid "Edit tags for this article"
+msgstr "Editar tags deste artigo"
+
+#: classes/feeds.php:644
+#: classes/article.php:625
+#, fuzzy
+msgid "comment"
+msgid_plural "comments"
+msgstr[0] "Conteúdo"
+msgstr[1] "Conteúdo"
+
+#: classes/feeds.php:648
+#: classes/article.php:629
+#, fuzzy
+msgid "comments"
+msgstr "Conteúdo"
+
+#: classes/feeds.php:686
+msgid "No unread articles found to display."
+msgstr "Sem artigos não lidos para exibir."
+
+#: classes/feeds.php:689
+msgid "No updated articles found to display."
+msgstr "Sem artigos atualizados para exibir."
+
+#: classes/feeds.php:692
+msgid "No starred articles found to display."
+msgstr "Sem artigos com estrela para exibir."
+
+#: classes/feeds.php:696
+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:698
+msgid "No articles found to display."
+msgstr "Nenhum artigo foi encontrado para exibir."
+
+#: classes/feeds.php:714
+#: classes/feeds.php:905
+#, php-format
+msgid "Feeds last updated at %s"
+msgstr "Inscrições atualizadas em %s"
+
+#: classes/feeds.php:726
+#: classes/feeds.php:917
+msgid "Some feeds have update errors (click for details)"
+msgstr "Alguns feeds estão com erros (clique aqui para detalhes)"
+
+#: classes/feeds.php:894
+msgid "No feed selected."
+msgstr "Nenhum feed foi selecionado."
+
+#: classes/feeds.php:958
+#: classes/feeds.php:966
+msgid "Feed or site URL"
+msgstr "URL do site ou feed"
+
+#: classes/feeds.php:972
+#: classes/pref/feeds.php:559
+#: classes/pref/feeds.php:800
+#: classes/pref/feeds.php:1632
+msgid "Place in category:"
+msgstr "Colocar na categoria:"
+
+#: classes/feeds.php:980
+msgid "Available feeds"
+msgstr "Feeds disponíveis"
+
+#: classes/feeds.php:992
+#: classes/pref/feeds.php:621
+#: classes/pref/feeds.php:848
+#: classes/pref/users.php:61
+msgid "Authentication"
+msgstr "Autenticação"
+
+#: classes/feeds.php:996
+#: classes/pref/feeds.php:625
+#: classes/pref/feeds.php:852
+#: classes/pref/feeds.php:1646
+#: classes/pref/users.php:403
+msgid "Login"
+msgstr "Login"
+
+#: classes/feeds.php:1000
+#: classes/pref/feeds.php:631
+#: classes/pref/feeds.php:860
+#: classes/pref/feeds.php:1649
+#: classes/pref/prefs.php:243
+msgid "Password"
+msgstr "Senha"
+
+#: classes/feeds.php:1011
+#: classes/pref/feeds.php:645
+msgid "This feed requires authentication."
+msgstr "Este feed requer autenticação."
+
+#: classes/feeds.php:1014
+#: classes/feeds.php:1070
+#: classes/pref/feeds.php:1668
+msgid "Subscribe"
+msgstr "Assinar"
+
+#: classes/feeds.php:1017
+msgid "More feeds"
+msgstr "Mais inscrições"
+
+#: classes/feeds.php:1020
+#: classes/feeds.php:1072
+#: classes/feeds.php:1111
+#: classes/pref/labels.php:84
+#: classes/pref/filters.php:528
+#: classes/pref/filters.php:945
+#: classes/pref/filters.php:1022
+#: classes/pref/filters.php:1115
+#: classes/pref/feeds.php:774
+#: classes/pref/feeds.php:916
+#: classes/pref/feeds.php:1669
+#: classes/pref/users.php:105
+#: classes/pref/prefs.php:984
+#: classes/article.php:238
+#: classes/handler/public.php:443
+#: classes/handler/public.php:477
+#: plugins/mail/init.php:179
+#: plugins/note/init.php:60
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: classes/feeds.php:1042
+#: classes/feeds.php:1110
+#: classes/pref/filters.php:788
+#: classes/pref/feeds.php:1178
+#: classes/pref/users.php:345
+#: js/tt-rss.js:152
+msgid "Search"
+msgstr "Pesquisar"
+
+#: classes/feeds.php:1046
+msgid "Popular feeds"
+msgstr "Inscrições populares"
+
+#: classes/feeds.php:1047
+msgid "Feed archive"
+msgstr "Arquivo de inscrições"
+
+#: classes/feeds.php:1050
+msgid "limit:"
+msgstr "limite:"
+
+#: classes/feeds.php:1071
+#: classes/pref/labels.php:282
+#: classes/pref/filters.php:518
+#: classes/pref/filters.php:814
+#: classes/pref/feeds.php:751
+#: classes/pref/users.php:369
+msgid "Remove"
+msgstr "Remover"
+
+#: classes/feeds.php:1084
+msgid "Look for"
+msgstr "Procurar por"
+
+#: classes/feeds.php:1092
+#, php-format
+msgid "in %s"
 msgstr ""
 
-#: classes/dlg.php:44
-msgid "Your Public OPML URL is:"
-msgstr "Sua URL OPML pública é:"
-
-#: classes/dlg.php:53
-#: classes/dlg.php:178
-#: plugins/share/init.php:125
-msgid "Generate new URL"
-msgstr "Gerar nova URL"
-
-#: classes/dlg.php:67
-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 "Serviço de atualização está habilitado na configuração, porém, o processo de atualização não está rodando. Isso impede a atualização de todas as assinaturas. Por favor inicie o serviço ou contacte o administrador."
-
-#: classes/dlg.php:71
-#: classes/dlg.php:80
-msgid "Last update:"
-msgstr "Última atualização:"
-
-#: classes/dlg.php:76
-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 "O serviço de atualização está demorando demais para atualizar um feed. Isso pode indicar um problema. Por favor verifique o processo correspondente ou contacte o administrador."
-
-#: classes/dlg.php:169
-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/dlg.php:190
-msgid "You are using default tt-rss password. Please change it in the Preferences (Personal data / Authentication)."
+#: classes/feeds.php:1097
+msgid "Used for word stemming"
 msgstr ""
 
-#: classes/dlg.php:194
+#: classes/feeds.php:1106
 #, fuzzy
-msgid "Open Preferences"
-msgstr "Preferências"
+msgid "Search syntax"
+msgstr "Pesquisar"
 
-#: classes/handler/public.php:387
-#: plugins/bookmarklets/init.php:40
-msgid "Share with Tiny Tiny RSS"
-msgstr "Compartilhar com TT-Rss"
+#: classes/feeds.php:1563
+msgid "Starred articles"
+msgstr "Artigos com estrela"
 
-#: classes/handler/public.php:395
-msgid "Title:"
-msgstr "Título"
+#: classes/feeds.php:1565
+msgid "Published articles"
+msgstr "Artigos publicados"
 
-#: classes/handler/public.php:397
-#: classes/pref/feeds.php:537
-msgid "URL:"
-msgstr "URL:"
+#: classes/feeds.php:1567
+msgid "Fresh articles"
+msgstr "Últimas notícias"
 
-#: classes/handler/public.php:399
-msgid "Content:"
-msgstr "Conteúdo:"
+#: classes/feeds.php:1571
+msgid "Archived articles"
+msgstr "Artigos arquivados"
 
-#: classes/handler/public.php:401
-msgid "Labels:"
-msgstr "Marcadores:"
+#: classes/feeds.php:1573
+msgid "Recently read"
+msgstr "Lidos recentemente"
 
-#: classes/handler/public.php:420
-msgid "Shared article will appear in the Published feed."
-msgstr "Artigo compartilhado vai aparecer nos publicados."
+#: classes/feeds.php:1694
+msgid "Special"
+msgstr "Especial"
 
-#: classes/handler/public.php:422
-msgid "Share"
-msgstr "Compartilhar"
-
-#: classes/handler/public.php:444
-msgid "Not logged in"
-msgstr "Não logado"
-
-#: classes/handler/public.php:504
-msgid "Incorrect username or password"
-msgstr "Usuário ou senha inválidos"
-
-#: classes/handler/public.php:557
+#: classes/feeds.php:1951
 #, php-format
-msgid "Already subscribed to <b>%s</b>."
-msgstr "Já inscrito em <b>%s</b>"
-
-#: classes/handler/public.php:560
-#, php-format
-msgid "Subscribed to <b>%s</b>."
-msgstr "Inscrito em <b>%s</b>."
-
-#: classes/handler/public.php:563
-#, 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:566
-#, php-format
-msgid "No feeds found in <b>%s</b>."
-msgstr "Nenhum feed encontrado em <b>%s</b>."
-
-#: classes/handler/public.php:569
-msgid "Multiple feed URLs found."
-msgstr "Multiplas URLs encontradas."
-
-#: classes/handler/public.php:573
-#, 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:591
-msgid "Subscribe to selected feed"
-msgstr "Inscrever no feed selecionado"
-
-#: classes/handler/public.php:618
-msgid "Edit subscription options"
-msgstr "Editar opções de assinatura"
-
-#: classes/handler/public.php:656
-msgid "Password recovery"
-msgstr "Recuperação de senha"
-
-#: classes/handler/public.php:701
-#, 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:723
-#: classes/pref/users.php:372
-msgid "Reset password"
-msgstr "Redefinir a senha"
-
-#: classes/handler/public.php:733
-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:737
-#: classes/handler/public.php:806
-msgid "Go back"
-msgstr "Voltar"
-
-#: classes/handler/public.php:775
-#, fuzzy
-msgid "[tt-rss] Password reset request"
-msgstr "[tt-rss] Notificação de troca de senh"
-
-#: classes/handler/public.php:802
-msgid "Sorry, login and email combination not found."
-msgstr "Desculpe, Nome de usuário e e-mail não encontrados."
-
-#: classes/handler/public.php:824
-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:850
-msgid "Database Updater"
-msgstr "Atualizador do banco de dados"
-
-#: classes/handler/public.php:915
-msgid "Perform updates"
-msgstr "Executar atualização"
+msgid "Search results: %s"
+msgstr "Resultados da pesquisa: %s"
 
 #: classes/pref/labels.php:25
 #: classes/pref/filters.php:377
@@ -1214,201 +1214,197 @@ msgstr "Cor do texto:"
 msgid "Background:"
 msgstr "Cor de fundo:"
 
+#: classes/pref/labels.php:82
+#: classes/pref/filters.php:525
+#: classes/pref/feeds.php:773
+#: classes/pref/feeds.php:913
+#: classes/pref/users.php:103
+#: classes/pref/prefs.php:982
+#: classes/article.php:236
+#: plugins/af_zz_imgproxy/init.php:238
+#: plugins/af_redditimgur/init.php:66
+#: plugins/af_psql_trgm/init.php:188
+#: plugins/af_readability/init.php:80
+#: plugins/nsfw/init.php:85
+#: plugins/mail/init.php:65
+#: plugins/note/init.php:58
+msgid "Save"
+msgstr "Salvar"
+
 #: classes/pref/labels.php:244
 #, php-format
 msgid "Created label <b>%s</b>"
 msgstr "Marcador <b>%s</b> criado"
 
 #: classes/pref/labels.php:270
-#: classes/pref/users.php:356
-#: classes/pref/feeds.php:1183
-#: classes/pref/feeds.php:1414
-#: classes/pref/feeds.php:1479
 #: classes/pref/filters.php:388
 #: classes/pref/filters.php:446
 #: classes/pref/filters.php:792
 #: classes/pref/filters.php:875
 #: classes/pref/filters.php:902
+#: classes/pref/feeds.php:1182
+#: classes/pref/feeds.php:1413
+#: classes/pref/feeds.php:1478
+#: classes/pref/users.php:355
 #: classes/pref/prefs.php:993
 msgid "Select"
 msgstr "Selecione"
 
-#: classes/pref/labels.php:273
-#: classes/pref/users.php:359
-#: classes/pref/feeds.php:1186
-#: classes/pref/feeds.php:1417
-#: classes/pref/feeds.php:1482
-#: classes/pref/filters.php:391
-#: classes/pref/filters.php:449
-#: classes/pref/filters.php:795
-#: classes/pref/filters.php:878
-#: classes/pref/filters.php:905
-#: classes/pref/prefs.php:996
-#: classes/feeds.php:102
-msgid "All"
-msgstr "Tudo"
-
-#: classes/pref/labels.php:275
-#: classes/pref/users.php:361
-#: classes/pref/feeds.php:1188
-#: classes/pref/feeds.php:1419
-#: classes/pref/feeds.php:1484
-#: classes/pref/filters.php:393
-#: classes/pref/filters.php:451
-#: classes/pref/filters.php:797
-#: classes/pref/filters.php:880
-#: classes/pref/filters.php:907
-#: classes/pref/prefs.php:998
-#: classes/feeds.php:105
-msgid "None"
-msgstr "Nenhum"
-
-#: classes/pref/labels.php:282
-#: classes/pref/users.php:370
-#: classes/pref/feeds.php:752
-#: classes/pref/filters.php:518
-#: classes/pref/filters.php:814
-#: classes/feeds.php:1088
-msgid "Remove"
-msgstr "Remover"
-
 #: classes/pref/labels.php:285
 msgid "Clear colors"
 msgstr "Limpar cores"
 
-#: classes/pref/users.php:6
-#: classes/pref/system.php:8
-msgid "Your access level is insufficient to open this tab."
-msgstr "Seu nível de acesso é insuficiente para abrir esta aba."
-
-#: classes/pref/users.php:26
+#: classes/pref/filters.php:155
 #, fuzzy
-msgid "Edit user"
-msgstr "Editar regra"
+msgid "Preview article"
+msgstr "Favoritos"
 
-#: classes/pref/users.php:61
-#: classes/pref/feeds.php:622
-#: classes/pref/feeds.php:849
-#: classes/feeds.php:1009
-msgid "Authentication"
-msgstr "Autenticação"
+#: classes/pref/filters.php:267
+#: classes/pref/filters.php:573
+msgid "(inverse)"
+msgstr "(invertido)"
 
-#: classes/pref/users.php:64
-msgid "Access level: "
-msgstr "Nível de acesso:"
+#: classes/pref/filters.php:263
+#: classes/pref/filters.php:572
+#, php-format
+msgid "%s on %s in %s %s"
+msgstr ""
 
-#: classes/pref/users.php:82
-#: classes/pref/feeds.php:648
-#: classes/pref/feeds.php:867
-msgid "Options"
-msgstr "Opções"
+#: classes/pref/filters.php:383
+#: classes/pref/filters.php:870
+#: classes/pref/filters.php:977
+msgid "Match"
+msgstr ""
 
-#: classes/pref/users.php:96
-#: js/prefs.js:479
-msgid "User details"
-msgstr "Detalhes do usuário"
+#: classes/pref/filters.php:397
+#: classes/pref/filters.php:455
+#: classes/pref/filters.php:884
+#: classes/pref/filters.php:911
+msgid "Add"
+msgstr ""
 
-#: classes/pref/users.php:136
-#: classes/pref/users.php:407
-msgid "Registered"
-msgstr "Registrado"
+#: classes/pref/filters.php:441
+#: classes/pref/filters.php:897
+msgid "Apply actions"
+msgstr "Aplicar ações"
 
-#: classes/pref/users.php:137
-msgid "Last logged in"
-msgstr "Último acesso em"
+#: classes/pref/filters.php:492
+#: classes/pref/filters.php:926
+msgid "Enabled"
+msgstr "Ativado"
 
-#: classes/pref/users.php:145
-msgid "Subscribed feeds count"
-msgstr "Contador de inscrições"
-
-#: classes/pref/users.php:146
+#: classes/pref/filters.php:501
+#: classes/pref/filters.php:929
 #, fuzzy
-msgid "Stored articles"
-msgstr "Artigos com estrela"
+msgid "Match any rule"
+msgstr "Favoritos"
 
-#: classes/pref/users.php:150
-#: classes/pref/users.php:406
-msgid "Subscribed feeds"
-msgstr "Inscrições"
+#: classes/pref/filters.php:510
+#: classes/pref/filters.php:932
+#, fuzzy
+msgid "Inverse matching"
+msgstr "Favoritos"
 
-#: classes/pref/users.php:176
-msgid "User not found"
-msgstr "Usuário não encontrado"
+#: classes/pref/filters.php:522
+#: classes/pref/filters.php:939
+msgid "Test"
+msgstr "Teste"
 
-#: classes/pref/users.php:246
-#, php-format
-msgid "Added user <b>%s</b> with password <b>%s</b>"
-msgstr "Adicionado usuário  <b>%s</b> com senha <b>%s</b>"
+#: classes/pref/filters.php:804
+msgid "Combine"
+msgstr ""
 
-#: classes/pref/users.php:253
-#, php-format
-msgid "Could not create user <b>%s</b>"
-msgstr "Não pode criar o usuário <b>%s</b>"
-
-#: classes/pref/users.php:257
-#, php-format
-msgid "User <b>%s</b> already exists."
-msgstr "O usuário <b>%s</b> já existe."
-
-#: classes/pref/users.php:285
-#, 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:287
-#, 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:311
-msgid "[tt-rss] Password change notification"
-msgstr "[tt-rss] Notificação de troca de senh"
-
-#: classes/pref/users.php:346
-#: classes/pref/feeds.php:1179
-#: classes/pref/filters.php:788
-#: classes/feeds.php:1059
-#: classes/feeds.php:1127
-#: js/tt-rss.js:165
-msgid "Search"
-msgstr "Pesquisar"
-
-#: classes/pref/users.php:364
-msgid "Create user"
-msgstr "Criar um usuário"
-
-#: classes/pref/users.php:368
 #: classes/pref/filters.php:807
+#: classes/pref/users.php:367
 msgid "Edit"
 msgstr "Editar"
 
-#: classes/pref/users.php:404
-#: classes/pref/feeds.php:626
-#: classes/pref/feeds.php:853
-#: classes/pref/feeds.php:1649
-#: classes/feeds.php:1013
-msgid "Login"
-msgstr "Login"
+#: classes/pref/filters.php:810
+#: classes/pref/feeds.php:1198
+#: classes/pref/feeds.php:1212
+msgid "Reset sort order"
+msgstr "Reiniciar ordenação"
 
-#: classes/pref/users.php:405
-msgid "Access Level"
-msgstr "Nível de acesso"
+#: classes/pref/filters.php:942
+msgid "Create"
+msgstr "Criar"
 
-#: classes/pref/users.php:408
-msgid "Last login"
-msgstr "Último Login"
+#: classes/pref/filters.php:987
+msgid "Regular expression, without outer delimiters (i.e. slashes)"
+msgstr ""
 
-#: classes/pref/users.php:427
-msgid "Click to edit"
-msgstr "Clique para editar"
+#: classes/pref/filters.php:993
+msgid "Inverse regular expression matching"
+msgstr "Inverter o teste da expressão regular"
 
-#: classes/pref/users.php:447
-msgid "No users defined."
-msgstr "Nenhum usuário definido."
+#: classes/pref/filters.php:995
+msgid "on field"
+msgstr "no campo"
 
-#: classes/pref/users.php:449
-msgid "No matching users found."
-msgstr "Nenhum usuário encontrado."
+#: classes/pref/filters.php:1001
+#: js/PrefFilterTree.js:44
+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:764
+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:786
+msgid "Add action"
+msgstr "Adicionar ação"
+
+#: classes/pref/filters.php:1139
+msgid "[No caption]"
+msgstr "[Sem título]"
+
+#: classes/pref/filters.php:1141
+#, fuzzy, php-format
+msgid "%s (%d rule)"
+msgid_plural "%s (%d rules)"
+msgstr[0] "Adicionar regra"
+msgstr[1] "Adicionar regra"
+
+#: classes/pref/filters.php:1155
+#, fuzzy
+msgid "matches any rule"
+msgstr "Favoritos"
+
+#: classes/pref/filters.php:1158
+#, fuzzy, php-format
+msgid "%s (+%d action)"
+msgid_plural "%s (+%d actions)"
+msgstr[0] "Adicionar ação"
+msgstr[1] "Adicionar ação"
+
+#: classes/pref/system.php:8
+#: classes/pref/users.php:6
+msgid "Your access level is insufficient to open this tab."
+msgstr "Seu nível de acesso é insuficiente para abrir esta aba."
 
 #: classes/pref/system.php:29
 msgid "Error Log"
@@ -1453,388 +1449,316 @@ msgid_plural "(%d feeds)"
 msgstr[0] "Editar"
 msgstr[1] "Editar"
 
-#: classes/pref/feeds.php:514
+#: classes/pref/feeds.php:513
 #: classes/pref/prefs.php:18
 msgid "General"
 msgstr "Geral"
 
-#: classes/pref/feeds.php:528
+#: classes/pref/feeds.php:527
 msgid "Feed Title"
 msgstr "Título da inscrição"
 
-#: classes/pref/feeds.php:560
-#: classes/pref/feeds.php:801
-#: classes/pref/feeds.php:1635
-#: classes/feeds.php:989
-msgid "Place in category:"
-msgstr "Colocar na categoria:"
+#: classes/pref/feeds.php:536
+#: classes/handler/public.php:417
+msgid "URL:"
+msgstr "URL:"
 
-#: classes/pref/feeds.php:572
+#: classes/pref/feeds.php:571
 #, fuzzy
 msgid "Site URL:"
 msgstr "Título"
 
-#: classes/pref/feeds.php:574
+#: classes/pref/feeds.php:573
 #, fuzzy
 msgid "Site URL"
 msgstr "URL da inscrição"
 
-#: classes/pref/feeds.php:585
-#: classes/pref/feeds.php:815
+#: classes/pref/feeds.php:584
+#: classes/pref/feeds.php:814
 #, fuzzy
 msgid "Language:"
 msgstr "Língua"
 
-#: classes/pref/feeds.php:592
-#: classes/pref/feeds.php:824
+#: classes/pref/feeds.php:591
+#: classes/pref/feeds.php:823
 msgid "Update"
 msgstr "Atualizar"
 
-#: classes/pref/feeds.php:607
-#: classes/pref/feeds.php:840
+#: classes/pref/feeds.php:606
+#: classes/pref/feeds.php:839
 msgid "Article purging:"
 msgstr "Apagando artigo:"
 
-#: classes/pref/feeds.php:632
-#: classes/pref/feeds.php:861
-#: classes/pref/feeds.php:1652
-#: classes/pref/prefs.php:243
-#: classes/feeds.php:1017
-msgid "Password"
-msgstr "Senha"
-
-#: classes/pref/feeds.php:636
+#: classes/pref/feeds.php:635
 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:646
-#: classes/feeds.php:1028
-msgid "This feed requires authentication."
-msgstr "Este feed requer autenticação."
+#: classes/pref/feeds.php:647
+#: classes/pref/feeds.php:866
+#: classes/pref/users.php:82
+msgid "Options"
+msgstr "Opções"
 
-#: classes/pref/feeds.php:662
-#: classes/pref/feeds.php:871
+#: classes/pref/feeds.php:661
+#: classes/pref/feeds.php:870
 msgid "Hide from Popular feeds"
 msgstr "Ocultar das inscrições populares"
 
-#: classes/pref/feeds.php:674
-#: classes/pref/feeds.php:877
+#: classes/pref/feeds.php:673
+#: classes/pref/feeds.php:876
 msgid "Include in e-mail digest"
 msgstr "Incluir no resumo por e-mail"
 
-#: classes/pref/feeds.php:687
-#: classes/pref/feeds.php:883
+#: classes/pref/feeds.php:686
+#: classes/pref/feeds.php:882
 msgid "Always display image attachments"
 msgstr "Sempre mostrar imagens anexas"
 
-#: classes/pref/feeds.php:700
-#: classes/pref/feeds.php:891
+#: classes/pref/feeds.php:699
+#: classes/pref/feeds.php:890
 #, fuzzy
 msgid "Do not embed media"
 msgstr "Não embutir imagens"
 
-#: classes/pref/feeds.php:713
-#: classes/pref/feeds.php:899
+#: classes/pref/feeds.php:712
+#: classes/pref/feeds.php:898
 msgid "Cache media"
 msgstr ""
 
-#: classes/pref/feeds.php:725
-#: classes/pref/feeds.php:905
+#: classes/pref/feeds.php:724
+#: classes/pref/feeds.php:904
 msgid "Mark updated articles as unread"
 msgstr "Marcar artigos atualizados como não lidos"
 
-#: classes/pref/feeds.php:729
+#: classes/pref/feeds.php:728
 msgid "Icon"
 msgstr "Ícone"
 
-#: classes/pref/feeds.php:743
-#: classes/pref/feeds.php:1284
+#: classes/pref/feeds.php:742
+#: classes/pref/feeds.php:1283
 #: plugins/import_export/init.php:71
 #, fuzzy
 msgid "Choose file..."
 msgstr "Criar filtro..."
 
-#: classes/pref/feeds.php:750
+#: classes/pref/feeds.php:749
 msgid "Replace"
 msgstr "Substituir"
 
-#: classes/pref/feeds.php:757
+#: classes/pref/feeds.php:756
 #: classes/pref/prefs.php:679
 msgid "Plugins"
 msgstr ""
 
-#: classes/pref/feeds.php:1154
+#: classes/pref/feeds.php:1153
 msgid "Feeds with errors"
 msgstr "Inscrições com erro"
 
-#: classes/pref/feeds.php:1161
+#: classes/pref/feeds.php:1160
 msgid "Inactive feeds"
 msgstr "Inscrições inativas"
 
-#: classes/pref/feeds.php:1197
+#: classes/pref/feeds.php:1196
 msgid "Edit selected feeds"
 msgstr "Editar inscrições selecionadas"
 
-#: classes/pref/feeds.php:1199
-#: classes/pref/feeds.php:1213
-#: classes/pref/filters.php:810
-msgid "Reset sort order"
-msgstr "Reiniciar ordenação"
-
-#: classes/pref/feeds.php:1201
-#: js/prefs.js:1462
+#: classes/pref/feeds.php:1200
+#: js/prefs.js:1171
 msgid "Batch subscribe"
 msgstr "Assinatura em lote"
 
-#: classes/pref/feeds.php:1208
+#: classes/pref/feeds.php:1207
 msgid "Categories"
 msgstr "Categorias"
 
-#: classes/pref/feeds.php:1211
+#: classes/pref/feeds.php:1210
 msgid "Add category"
 msgstr "Adicionar categoria"
 
-#: classes/pref/feeds.php:1215
+#: classes/pref/feeds.php:1214
 msgid "Remove selected"
 msgstr "Remover selecionados"
 
-#: classes/pref/feeds.php:1272
+#: classes/pref/feeds.php:1271
 msgid "OPML"
 msgstr "OPML"
 
-#: classes/pref/feeds.php:1274
+#: classes/pref/feeds.php:1273
 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:1275
+#: classes/pref/feeds.php:1274
 msgid "Only main settings profile can be migrated using OPML."
 msgstr ""
 
-#: classes/pref/feeds.php:1290
+#: classes/pref/feeds.php:1289
 msgid "Import my OPML"
 msgstr "Importar OPML"
 
-#: classes/pref/feeds.php:1296
+#: classes/pref/feeds.php:1295
 msgid "Filename:"
 msgstr "Nome do arquivo:"
 
-#: classes/pref/feeds.php:1298
+#: classes/pref/feeds.php:1297
 msgid "Include settings"
 msgstr "Incluir configurações"
 
-#: classes/pref/feeds.php:1302
+#: classes/pref/feeds.php:1301
 msgid "Export OPML"
 msgstr "Exportar OPML"
 
-#: classes/pref/feeds.php:1306
+#: classes/pref/feeds.php:1305
 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:1310
+#: classes/pref/feeds.php:1309
 msgid "Public OPML URL"
 msgstr "URL OPML pública"
 
-#: classes/pref/feeds.php:1311
+#: classes/pref/feeds.php:1310
 msgid "Display published OPML URL"
 msgstr "Mostrar a URL OPML publicada"
 
-#: classes/pref/feeds.php:1318
+#: classes/pref/feeds.php:1317
 msgid "Published & shared articles / Generated feeds"
 msgstr "Artigos publicados & compartilhados / Feeds gerados"
 
-#: classes/pref/feeds.php:1320
+#: classes/pref/feeds.php:1319
 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:1327
-#: classes/feeds.php:54
-#: classes/feeds.php:140
-msgid "View as RSS"
-msgstr "Ver como RSS"
-
-#: classes/pref/feeds.php:1328
 msgid "Display URL"
 msgstr "Mostrar URL"
 
-#: classes/pref/feeds.php:1331
+#: classes/pref/feeds.php:1330
 msgid "Clear all generated URLs"
 msgstr "Limpar todas as URLs geradas"
 
-#: classes/pref/feeds.php:1410
+#: classes/pref/feeds.php:1409
 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:1444
-#: classes/pref/feeds.php:1509
+#: classes/pref/feeds.php:1443
+#: classes/pref/feeds.php:1508
 msgid "Click to edit feed"
 msgstr "Clique para editar inscrição"
 
-#: classes/pref/feeds.php:1462
-#: classes/pref/feeds.php:1529
+#: classes/pref/feeds.php:1461
+#: classes/pref/feeds.php:1528
 msgid "Unsubscribe from selected feeds"
 msgstr "Cancelar inscrições selecionadas"
 
-#: classes/pref/feeds.php:1632
+#: classes/pref/feeds.php:1629
 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:1641
+#: classes/pref/feeds.php:1638
 msgid "Feeds to subscribe, One per line"
 msgstr "Feeds para assinar, um por linha"
 
-#: classes/pref/feeds.php:1664
+#: classes/pref/feeds.php:1661
 msgid "Feeds require authentication."
 msgstr "Inscrição requer autenticação."
 
-#: classes/pref/feeds.php:1671
-#: classes/feeds.php:1031
-#: classes/feeds.php:1087
-msgid "Subscribe"
-msgstr "Assinar"
-
-#: classes/pref/filters.php:155
+#: classes/pref/users.php:26
 #, fuzzy
-msgid "Preview article"
-msgstr "Favoritos"
+msgid "Edit user"
+msgstr "Editar regra"
 
-#: classes/pref/filters.php:267
-#: classes/pref/filters.php:573
-msgid "(inverse)"
-msgstr "(invertido)"
+#: classes/pref/users.php:64
+msgid "Access level: "
+msgstr "Nível de acesso:"
 
-#: classes/pref/filters.php:263
-#: classes/pref/filters.php:572
+#: classes/pref/users.php:96
+#: js/prefs.js:403
+msgid "User details"
+msgstr "Detalhes do usuário"
+
+#: classes/pref/users.php:136
+#: classes/pref/users.php:406
+msgid "Registered"
+msgstr "Registrado"
+
+#: classes/pref/users.php:137
+msgid "Last logged in"
+msgstr "Último acesso em"
+
+#: classes/pref/users.php:145
+msgid "Subscribed feeds count"
+msgstr "Contador de inscrições"
+
+#: classes/pref/users.php:146
+#, fuzzy
+msgid "Stored articles"
+msgstr "Artigos com estrela"
+
+#: classes/pref/users.php:150
+#: classes/pref/users.php:405
+msgid "Subscribed feeds"
+msgstr "Inscrições"
+
+#: classes/pref/users.php:176
+msgid "User not found"
+msgstr "Usuário não encontrado"
+
+#: classes/pref/users.php:246
 #, php-format
-msgid "%s on %s in %s %s"
-msgstr ""
+msgid "Added user <b>%s</b> with password <b>%s</b>"
+msgstr "Adicionado usuário  <b>%s</b> com senha <b>%s</b>"
 
-#: classes/pref/filters.php:383
-#: classes/pref/filters.php:870
-#: classes/pref/filters.php:977
-msgid "Match"
-msgstr ""
+#: classes/pref/users.php:253
+#, php-format
+msgid "Could not create user <b>%s</b>"
+msgstr "Não pode criar o usuário <b>%s</b>"
 
-#: classes/pref/filters.php:397
-#: classes/pref/filters.php:455
-#: classes/pref/filters.php:884
-#: classes/pref/filters.php:911
-msgid "Add"
-msgstr ""
+#: classes/pref/users.php:257
+#, php-format
+msgid "User <b>%s</b> already exists."
+msgstr "O usuário <b>%s</b> já existe."
 
-#: classes/pref/filters.php:400
-#: classes/pref/filters.php:458
-#: classes/pref/filters.php:887
-#: classes/pref/filters.php:914
-#: classes/feeds.php:122
-msgid "Delete"
-msgstr "Apaga"
+#: classes/pref/users.php:285
+#, 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/filters.php:441
-#: classes/pref/filters.php:897
-msgid "Apply actions"
-msgstr "Aplicar ações"
+#: classes/pref/users.php:287
+#, 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/filters.php:492
-#: classes/pref/filters.php:926
-msgid "Enabled"
-msgstr "Ativado"
+#: classes/pref/users.php:310
+msgid "[tt-rss] Password change notification"
+msgstr "[tt-rss] Notificação de troca de senh"
 
-#: classes/pref/filters.php:501
-#: classes/pref/filters.php:929
-#, fuzzy
-msgid "Match any rule"
-msgstr "Favoritos"
+#: classes/pref/users.php:363
+msgid "Create user"
+msgstr "Criar um usuário"
 
-#: classes/pref/filters.php:510
-#: classes/pref/filters.php:932
-#, fuzzy
-msgid "Inverse matching"
-msgstr "Favoritos"
+#: classes/pref/users.php:371
+#: classes/handler/public.php:747
+msgid "Reset password"
+msgstr "Redefinir a senha"
 
-#: classes/pref/filters.php:522
-#: classes/pref/filters.php:939
-msgid "Test"
-msgstr "Teste"
+#: classes/pref/users.php:404
+msgid "Access Level"
+msgstr "Nível de acesso"
 
-#: classes/pref/filters.php:804
-msgid "Combine"
-msgstr ""
+#: classes/pref/users.php:407
+msgid "Last login"
+msgstr "Último Login"
 
-#: classes/pref/filters.php:942
-msgid "Create"
-msgstr "Criar"
+#: classes/pref/users.php:426
+msgid "Click to edit"
+msgstr "Clique para editar"
 
-#: classes/pref/filters.php:987
-msgid "Regular expression, without outer delimiters (i.e. slashes)"
-msgstr ""
+#: classes/pref/users.php:446
+msgid "No users defined."
+msgstr "Nenhum usuário definido."
 
-#: 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:43
-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:797
-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:819
-msgid "Add action"
-msgstr "Adicionar ação"
-
-#: classes/pref/filters.php:1139
-msgid "[No caption]"
-msgstr "[Sem título]"
-
-#: classes/pref/filters.php:1141
-#, fuzzy, php-format
-msgid "%s (%d rule)"
-msgid_plural "%s (%d rules)"
-msgstr[0] "Adicionar regra"
-msgstr[1] "Adicionar regra"
-
-#: classes/pref/filters.php:1155
-#, fuzzy
-msgid "matches any rule"
-msgstr "Favoritos"
-
-#: classes/pref/filters.php:1158
-#, 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:448
+msgid "No matching users found."
+msgstr "Nenhum usuário encontrado."
 
 #: classes/pref/prefs.php:19
 msgid "Interface"
@@ -2010,7 +1934,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:1424
+#: js/prefs.js:1136
 msgid "Customize stylesheet"
 msgstr "Personalize a folha de estilo"
 
@@ -2253,257 +2177,301 @@ msgstr "Remover os perfis selecionados?"
 msgid "Activate profile"
 msgstr "Ativar perfil"
 
-#: classes/feeds.php:53
-msgid "View as RSS feed"
-msgstr "Ver como um feed rss"
+#: 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/feeds.php:62
-#, php-format
-msgid "Last updated: %s"
-msgstr "Última atualização em: %s"
+#: classes/dlg.php:44
+msgid "Your Public OPML URL is:"
+msgstr "Sua URL OPML pública é:"
 
-#: classes/feeds.php:100
+#: classes/dlg.php:53
+#: classes/dlg.php:178
+#: plugins/share/init.php:125
+msgid "Generate new URL"
+msgstr "Gerar nova URL"
+
+#: classes/dlg.php:67
+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 "Serviço de atualização está habilitado na configuração, porém, o processo de atualização não está rodando. Isso impede a atualização de todas as assinaturas. Por favor inicie o serviço ou contacte o administrador."
+
+#: classes/dlg.php:71
+#: classes/dlg.php:80
+msgid "Last update:"
+msgstr "Última atualização:"
+
+#: classes/dlg.php:76
+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 "O serviço de atualização está demorando demais para atualizar um feed. Isso pode indicar um problema. Por favor verifique o processo correspondente ou contacte o administrador."
+
+#: classes/dlg.php:169
+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/dlg.php:190
+msgid "You are using default tt-rss password. Please change it in the Preferences (Personal data / Authentication)."
+msgstr ""
+
+#: classes/dlg.php:194
 #, fuzzy
-msgid "Select..."
-msgstr "Selecione"
+msgid "Open Preferences"
+msgstr "Preferências"
 
-#: classes/feeds.php:104
-msgid "Invert"
-msgstr "Inverter"
+#: classes/opml.php:31
+#: classes/opml.php:36
+msgid "OPML Utility"
+msgstr "Utilitário OPML"
 
-#: classes/feeds.php:107
-msgid "Selection toggle:"
-msgstr "Inverter seleção:"
+#: classes/opml.php:40
+msgid "Importing OPML..."
+msgstr "Importando OPML..."
 
-#: classes/feeds.php:113
-msgid "Selection:"
-msgstr "Seleção:"
+#: classes/opml.php:45
+msgid "Return to preferences"
+msgstr "Retornar às preferências"
 
-#: classes/feeds.php:116
-msgid "Set score"
-msgstr "Classificar"
-
-#: classes/feeds.php:119
-msgid "Archive"
-msgstr "Arquivar"
-
-#: classes/feeds.php:121
-msgid "Move back"
-msgstr "Retornar"
-
-#: classes/feeds.php:127
-#: classes/feeds.php:132
-#: plugins/mail/init.php:76
-#: plugins/mailto/init.php:25
-msgid "Forward by email"
-msgstr "Encaminhar por e-mail"
-
-#: classes/feeds.php:136
-msgid "Feed:"
-msgstr "Feed:"
-
-#: classes/feeds.php:193
-#: classes/feeds.php:819
-msgid "Feed not found."
-msgstr "Feed não encontrado."
-
-#: classes/feeds.php:255
-msgid "Never"
-msgstr "Nunca"
-
-#: classes/feeds.php:342
+#: classes/opml.php:301
 #, php-format
-msgid "Imported at %s"
-msgstr "Importado em %s"
+msgid "Adding feed: %s"
+msgstr "Adicionando feed: %s"
 
-#: classes/feeds.php:394
-#: classes/feeds.php:487
+#: classes/opml.php:312
+#, php-format
+msgid "Duplicate feed: %s"
+msgstr "Feed duplicado: %s"
+
+#: classes/opml.php:326
+#, php-format
+msgid "Adding label %s"
+msgstr "Adicionando marcador %s"
+
+#: classes/opml.php:329
+#, php-format
+msgid "Duplicate label: %s"
+msgstr "Marcador duplicado: %s"
+
+#: classes/opml.php:341
+#, php-format
+msgid "Setting preference key %s to %s"
+msgstr "Ajustando chave de configuração %s para %s"
+
+#: classes/opml.php:377
+msgid "Adding filter..."
+msgstr "Adicionando filtro..."
+
+#: classes/opml.php:512
+#, php-format
+msgid "Processing category: %s"
+msgstr "Processando categoria: %s"
+
+#: classes/opml.php:558
+#, php-format
+msgid "Upload failed with error code %d"
+msgstr "Enviou falhou com o código de erro %d"
+
+#: classes/opml.php:570
+#: plugins/import_export/init.php:471
+msgid "Unable to move uploaded file."
+msgstr "Incapaz de mover arquivo enviado."
+
+#: classes/opml.php:574
+#: plugins/import_export/init.php:475
+msgid "Error: please upload OPML file."
+msgstr "Erro: Por favor envie um arquivo OPML."
+
+#: classes/opml.php:585
+msgid "Error: unable to find moved OPML file."
+msgstr "Erro: Arquivo OPML movido não foi encontrado"
+
+#: classes/opml.php:594
+msgid "Error while parsing document."
+msgstr "Erro ao processar o documento."
+
+#: classes/article.php:26
+msgid "Article not found."
+msgstr "Artigo não encontrado."
+
+#: classes/article.php:211
+msgid "Tags for this article (separated by commas):"
+msgstr "Tags para esse artigo (separadas por vírgula):"
+
+#: classes/article.php:337
+#: classes/article.php:719
+#: classes/article.php:874
+msgid "no tags"
+msgstr "sem tags"
+
+#: classes/article.php:447
+msgid "unknown type"
+msgstr "tipo desconhecido"
+
+#: classes/article.php:524
+msgid "Attachments"
+msgstr "Anexos"
+
+#: classes/article.php:688
+msgid " - "
+msgstr " - "
+
+#: classes/article.php:912
+msgid "(edit note)"
+msgstr "Editar nota"
+
+#: classes/handler/public.php:407
+#: plugins/bookmarklets/init.php:40
+msgid "Share with Tiny Tiny RSS"
+msgstr "Compartilhar com TT-Rss"
+
+#: classes/handler/public.php:415
+msgid "Title:"
+msgstr "Título"
+
+#: classes/handler/public.php:419
+msgid "Content:"
+msgstr "Conteúdo:"
+
+#: classes/handler/public.php:421
+msgid "Labels:"
+msgstr "Marcadores:"
+
+#: classes/handler/public.php:440
+msgid "Shared article will appear in the Published feed."
+msgstr "Artigo compartilhado vai aparecer nos publicados."
+
+#: classes/handler/public.php:442
+msgid "Share"
+msgstr "Compartilhar"
+
+#: classes/handler/public.php:464
+msgid "Not logged in"
+msgstr "Não logado"
+
+#: classes/handler/public.php:527
+msgid "Incorrect username or password"
+msgstr "Usuário ou senha inválidos"
+
+#: classes/handler/public.php:581
+#, php-format
+msgid "Already subscribed to <b>%s</b>."
+msgstr "Já inscrito em <b>%s</b>"
+
+#: classes/handler/public.php:584
+#, php-format
+msgid "Subscribed to <b>%s</b>."
+msgstr "Inscrito em <b>%s</b>."
+
+#: classes/handler/public.php:587
+#, 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:590
+#, php-format
+msgid "No feeds found in <b>%s</b>."
+msgstr "Nenhum feed encontrado em <b>%s</b>."
+
+#: classes/handler/public.php:593
+msgid "Multiple feed URLs found."
+msgstr "Multiplas URLs encontradas."
+
+#: classes/handler/public.php:597
+#, 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:615
+msgid "Subscribe to selected feed"
+msgstr "Inscrever no feed selecionado"
+
+#: classes/handler/public.php:642
+msgid "Edit subscription options"
+msgstr "Editar opções de assinatura"
+
+#: classes/handler/public.php:680
+msgid "Password recovery"
+msgstr "Recuperação de senha"
+
+#: classes/handler/public.php:725
 #, fuzzy
-msgid "mark feed as read"
-msgstr "Marcar como lido"
+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/feeds.php:542
-msgid "Collapse article"
-msgstr "Fechar artigo"
+#: classes/handler/public.php:757
+msgid "Some of the required form parameters are missing or incorrect."
+msgstr "Alguns dos parâmetros necessários estão faltando ou incorretos."
 
-#: classes/feeds.php:703
-msgid "No unread articles found to display."
-msgstr "Sem artigos não lidos para exibir."
+#: classes/handler/public.php:761
+#: classes/handler/public.php:830
+msgid "Go back"
+msgstr "Voltar"
 
-#: classes/feeds.php:706
-msgid "No updated articles found to display."
-msgstr "Sem artigos atualizados para exibir."
-
-#: classes/feeds.php:709
-msgid "No starred articles found to display."
-msgstr "Sem artigos com estrela para exibir."
-
-#: classes/feeds.php:713
-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:715
-msgid "No articles found to display."
-msgstr "Nenhum artigo foi encontrado para exibir."
-
-#: classes/feeds.php:731
-#: classes/feeds.php:922
-#, php-format
-msgid "Feeds last updated at %s"
-msgstr "Inscrições atualizadas em %s"
-
-#: classes/feeds.php:743
-#: classes/feeds.php:934
-msgid "Some feeds have update errors (click for details)"
-msgstr "Alguns feeds estão com erros (clique aqui para detalhes)"
-
-#: classes/feeds.php:911
-msgid "No feed selected."
-msgstr "Nenhum feed foi selecionado."
-
-#: classes/feeds.php:975
-#: classes/feeds.php:983
-msgid "Feed or site URL"
-msgstr "URL do site ou feed"
-
-#: classes/feeds.php:997
-msgid "Available feeds"
-msgstr "Feeds disponíveis"
-
-#: classes/feeds.php:1034
-msgid "More feeds"
-msgstr "Mais inscrições"
-
-#: classes/feeds.php:1063
-msgid "Popular feeds"
-msgstr "Inscrições populares"
-
-#: classes/feeds.php:1064
-msgid "Feed archive"
-msgstr "Arquivo de inscrições"
-
-#: classes/feeds.php:1067
-msgid "limit:"
-msgstr "limite:"
-
-#: classes/feeds.php:1101
-msgid "Look for"
-msgstr "Procurar por"
-
-#: classes/feeds.php:1109
-#, php-format
-msgid "in %s"
-msgstr ""
-
-#: classes/feeds.php:1114
-msgid "Used for word stemming"
-msgstr ""
-
-#: classes/feeds.php:1123
+#: classes/handler/public.php:799
 #, fuzzy
-msgid "Search syntax"
-msgstr "Pesquisar"
+msgid "[tt-rss] Password reset request"
+msgstr "[tt-rss] Notificação de troca de senh"
 
-#: classes/feeds.php:1577
-msgid "Starred articles"
-msgstr "Artigos com estrela"
+#: 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/feeds.php:1579
-msgid "Published articles"
-msgstr "Artigos publicados"
+#: 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/feeds.php:1581
-msgid "Fresh articles"
-msgstr "Últimas notícias"
+#: classes/handler/public.php:874
+msgid "Database Updater"
+msgstr "Atualizador do banco de dados"
 
-#: classes/feeds.php:1585
-msgid "Archived articles"
-msgstr "Artigos arquivados"
+#: classes/handler/public.php:939
+msgid "Perform updates"
+msgstr "Executar atualização"
 
-#: classes/feeds.php:1587
-msgid "Recently read"
-msgstr "Lidos recentemente"
-
-#: classes/feeds.php:1708
-msgid "Special"
-msgstr "Especial"
-
-#: classes/feeds.php:1965
-#, php-format
-msgid "Search results: %s"
-msgstr "Resultados da pesquisa: %s"
-
-#: plugins/nsfw/init.php:30
-#: plugins/nsfw/init.php:42
-msgid "Not work safe (click to toggle)"
+#: plugins/af_zz_imgproxy/init.php:208
+msgid "Image proxy settings (af_zz_imgproxy)"
 msgstr ""
 
-#: plugins/nsfw/init.php:52
-msgid "NSFW Plugin"
-msgstr ""
+#: plugins/af_zz_imgproxy/init.php:232
+#, fuzzy
+msgid "Enable proxy for all remote images."
+msgstr "Favoritos"
 
-#: plugins/nsfw/init.php:79
-msgid "Tags to consider NSFW (comma-separated)"
-msgstr "Tags para considerar NSFW (separadas por vírgula)"
+#: plugins/af_zz_imgproxy/init.php:236
+#, fuzzy
+msgid "Don't cache files locally."
+msgstr "Guardar imagens no cache local"
 
-#: plugins/nsfw/init.php:100
-msgid "Configuration saved."
+#: plugins/af_zz_imgproxy/init.php:252
+#: plugins/af_redditimgur/init.php:79
+#, fuzzy
+msgid "Configuration saved"
 msgstr "Configuração salva."
 
-#: plugins/note/init.php:28
-#: plugins/note/note.js:11
-msgid "Edit article note"
-msgstr "Editar anotação sobre o artigo"
-
 #: plugins/vf_shared/init.php:17
 #: plugins/vf_shared/init.php:73
 msgid "Shared articles"
 msgstr "Artigos compartilhados"
 
-#: plugins/auth_internal/init.php:67
-msgid "Please enter your one time password:"
-msgstr "Por favor, entre sua senha temporária"
-
-#: plugins/auth_internal/init.php:208
-msgid "Password has been changed."
-msgstr "Senha foi alterada."
-
-#: plugins/auth_internal/init.php:210
-msgid "Old password is incorrect."
-msgstr "Senha antiga incorreta"
-
-#: plugins/af_readability/init.php:25
-msgid "Data saved."
+#: plugins/bookmarklets/init.php:20
+msgid "Bookmarklets"
 msgstr ""
 
-#: plugins/af_readability/init.php:41
-#, fuzzy
-msgid "Inline content"
-msgstr "Editar anotação sobre o artigo"
+#: 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 "Arraste o link abaixo para a barra de ferramentas do seu navegador, abra o feed que você se interessar em seu navegador e clique no link para assinar."
 
-#: plugins/af_readability/init.php:47
-msgid "Readability settings (af_readability)"
+#: plugins/bookmarklets/init.php:26
+#, php-format
+msgid "Subscribe to %s in Tiny Tiny RSS?"
+msgstr "Assinar %s em TT-Rss?"
+
+#: plugins/bookmarklets/init.php:31
+msgid "Subscribe in Tiny Tiny RSS"
+msgstr "Assinar em TT-Rss"
+
+#: plugins/bookmarklets/init.php:34
+msgid "Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS"
 msgstr ""
 
-#: plugins/af_readability/init.php:78
-msgid "Use Readability for pages shared via bookmarklet."
-msgstr ""
-
-#: plugins/af_readability/init.php:90
-#: plugins/af_psql_trgm/init.php:198
-msgid "Currently enabled for (click to edit):"
-msgstr ""
-
-#: plugins/af_readability/init.php:107
-#, fuzzy
-msgid "Readability"
-msgstr "Verificar disponibilidade"
-
-#: plugins/af_readability/init.php:118
-#, fuzzy
-msgid "Inline article content"
-msgstr "Editar anotação sobre o artigo"
-
 #: plugins/af_redditimgur/init.php:30
 msgid "Reddit content settings (af_redditimgur)"
 msgstr ""
@@ -2516,11 +2484,21 @@ msgstr ""
 msgid "Enable additional duplicate checking"
 msgstr ""
 
-#: plugins/af_redditimgur/init.php:79
-#: plugins/af_zz_imgproxy/init.php:252
-#, fuzzy
-msgid "Configuration saved"
-msgstr "Configuração salva."
+#: plugins/af_comics/init.php:49
+msgid "Feeds supported by af_comics"
+msgstr ""
+
+#: plugins/af_comics/init.php:51
+msgid "The following comics are currently supported:"
+msgstr ""
+
+#: plugins/af_comics/init.php:69
+msgid "To subscribe to GoComics use the comic's regular web page as the feed URL (e.g. for the <em>Garfield</em> comic use <code>http://www.gocomics.com/garfield</code>)."
+msgstr ""
+
+#: plugins/af_comics/init.php:71
+msgid "Drop any updated filters into <code>filters.local</code> in plugin directory."
+msgstr ""
 
 #: plugins/af_psql_trgm/init.php:29
 #, php-format
@@ -2560,26 +2538,87 @@ msgstr ""
 msgid "Enable for all feeds:"
 msgstr "Favoritos"
 
+#: plugins/af_psql_trgm/init.php:198
+#: plugins/af_readability/init.php:90
+msgid "Currently enabled for (click to edit):"
+msgstr ""
+
 #: plugins/af_psql_trgm/init.php:216
 msgid "Similarity (pg_trgm)"
 msgstr ""
 
-#: plugins/af_comics/init.php:49
-msgid "Feeds supported by af_comics"
+#: plugins/af_readability/init.php:25
+msgid "Data saved."
 msgstr ""
 
-#: plugins/af_comics/init.php:51
-msgid "The following comics are currently supported:"
+#: plugins/af_readability/init.php:41
+#, fuzzy
+msgid "Inline content"
+msgstr "Editar anotação sobre o artigo"
+
+#: plugins/af_readability/init.php:47
+msgid "Readability settings (af_readability)"
 msgstr ""
 
-#: plugins/af_comics/init.php:69
-msgid "To subscribe to GoComics use the comic's regular web page as the feed URL (e.g. for the <em>Garfield</em> comic use <code>http://www.gocomics.com/garfield</code>)."
+#: plugins/af_readability/init.php:78
+msgid "Use Readability for pages shared via bookmarklet."
 msgstr ""
 
-#: plugins/af_comics/init.php:71
-msgid "Drop any updated filters into <code>filters.local</code> in plugin directory."
+#: plugins/af_readability/init.php:107
+#, fuzzy
+msgid "Readability"
+msgstr "Verificar disponibilidade"
+
+#: plugins/af_readability/init.php:118
+#, fuzzy
+msgid "Inline article content"
+msgstr "Editar anotação sobre o artigo"
+
+#: plugins/mailto/init.php:50
+#: plugins/mailto/init.php:58
+#: plugins/mail/init.php:118
+#: plugins/mail/init.php:124
+msgid "[Forwarded]"
+msgstr "[Encaminhado]"
+
+#: plugins/mailto/init.php:50
+#: plugins/mail/init.php:118
+msgid "Multiple articles"
+msgstr "Múltiplos artigos"
+
+#: plugins/mailto/init.php:74
+msgid "Clicking the following link to invoke your mail client:"
+msgstr "Clique no link seguinte para ativar seu cliente de e-mail:"
+
+#: plugins/mailto/init.php:78
+msgid "Forward selected article(s) by email."
+msgstr "Encaminhar artigo(s) selecionados por e-mail."
+
+#: plugins/mailto/init.php:81
+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/mailto/init.php:86
+msgid "Close this dialog"
+msgstr "Fechar esta janela"
+
+#: 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/import_export/init.php:53
 msgid "Import and export"
 msgstr "Importar e exportar"
@@ -2646,103 +2685,6 @@ msgstr "Enviou falhou com o código de erro %d"
 msgid "No file uploaded."
 msgstr "Nenhum arquivo enviado."
 
-#: plugins/mail/init.php:29
-msgid "Mail addresses saved."
-msgstr ""
-
-#: plugins/mail/init.php:35
-#, fuzzy
-msgid "Mail plugin"
-msgstr "Plugins de usuário"
-
-#: plugins/mail/init.php:37
-msgid "You can set predefined email addressed here (comma-separated list):"
-msgstr ""
-
-#: plugins/mail/init.php:118
-#: plugins/mail/init.php:124
-#: plugins/mailto/init.php:50
-#: plugins/mailto/init.php:58
-msgid "[Forwarded]"
-msgstr "[Encaminhado]"
-
-#: plugins/mail/init.php:118
-#: plugins/mailto/init.php:50
-msgid "Multiple articles"
-msgstr "Múltiplos artigos"
-
-#: plugins/mail/init.php:146
-msgid "To:"
-msgstr "Para:"
-
-#: plugins/mail/init.php:161
-msgid "Subject:"
-msgstr "Assunto:"
-
-#: plugins/mail/init.php:178
-msgid "Send e-mail"
-msgstr "Enviar e-mail"
-
-#: plugins/close_button/init.php:25
-msgid "Close article"
-msgstr "Fechar artigo"
-
-#: 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 "Arraste o link abaixo para a barra de ferramentas do seu navegador, abra o feed que você se interessar em seu navegador e clique no link para assinar."
-
-#: plugins/bookmarklets/init.php:26
-#, php-format
-msgid "Subscribe to %s in Tiny Tiny RSS?"
-msgstr "Assinar %s em TT-Rss?"
-
-#: plugins/bookmarklets/init.php:31
-msgid "Subscribe in Tiny Tiny RSS"
-msgstr "Assinar em TT-Rss"
-
-#: plugins/bookmarklets/init.php:34
-msgid "Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS"
-msgstr ""
-
-#: plugins/toggle_sidebar/init.php:23
-#, fuzzy
-msgid "Collapse feedlist"
-msgstr "Fechar lista de feeds"
-
-#: plugins/af_zz_imgproxy/init.php:208
-msgid "Image proxy settings (af_zz_imgproxy)"
-msgstr ""
-
-#: plugins/af_zz_imgproxy/init.php:232
-#, fuzzy
-msgid "Enable proxy for all remote images."
-msgstr "Favoritos"
-
-#: plugins/af_zz_imgproxy/init.php:236
-#, fuzzy
-msgid "Don't cache files locally."
-msgstr "Guardar imagens no cache local"
-
-#: plugins/mailto/init.php:74
-msgid "Clicking the following link to invoke your mail client:"
-msgstr "Clique no link seguinte para ativar seu cliente de e-mail:"
-
-#: plugins/mailto/init.php:78
-msgid "Forward selected article(s) by email."
-msgstr "Encaminhar artigo(s) selecionados por e-mail."
-
-#: plugins/mailto/init.php:81
-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/mailto/init.php:86
-msgid "Close this dialog"
-msgstr "Fechar esta janela"
-
 #: plugins/share/init.php:41
 msgid "You can disable all articles shared by unique URLs here."
 msgstr "Você pode desabilitar todos os artigos compartilhados por URLs únicas aqui."
@@ -2763,454 +2705,607 @@ msgstr "Você pode compartilhar esse artigo pela seguinte URL:"
 msgid "Unshare article"
 msgstr "Remover compartilhamento"
 
-#: js/FeedTree.js:75
+#: plugins/toggle_sidebar/init.php:23
+#, fuzzy
+msgid "Collapse feedlist"
+msgstr "Fechar lista de feeds"
+
+#: plugins/close_button/init.php:25
+msgid "Close article"
+msgstr "Fechar artigo"
+
+#: plugins/mail/init.php:29
+msgid "Mail addresses saved."
+msgstr ""
+
+#: plugins/mail/init.php:35
+#, fuzzy
+msgid "Mail plugin"
+msgstr "Plugins de usuário"
+
+#: plugins/mail/init.php:37
+msgid "You can set predefined email addressed here (comma-separated list):"
+msgstr ""
+
+#: plugins/mail/init.php:146
+msgid "To:"
+msgstr "Para:"
+
+#: plugins/mail/init.php:161
+msgid "Subject:"
+msgstr "Assunto:"
+
+#: plugins/mail/init.php:178
+msgid "Send e-mail"
+msgstr "Enviar e-mail"
+
+#: plugins/note/init.php:28
+#: plugins/note/note.js:11
+msgid "Edit article note"
+msgstr "Editar anotação sobre o artigo"
+
+#: plugins/auth_internal/init.php:67
+msgid "Please enter your one time password:"
+msgstr "Por favor, entre sua senha temporária"
+
+#: plugins/auth_internal/init.php:208
+msgid "Password has been changed."
+msgstr "Senha foi alterada."
+
+#: plugins/auth_internal/init.php:210
+msgid "Old password is incorrect."
+msgstr "Senha antiga incorreta"
+
+#: js/FeedTree.js:76
 #, fuzzy
 msgid "(Un)collapse"
 msgstr "Mostrar/Ocultar barra lateral"
 
-#: js/PrefFeedTree.js:35
+#: js/PrefFeedTree.js:36
 msgid "Edit category"
 msgstr "Editar categoria"
 
-#: js/PrefFeedTree.js:42
+#: js/PrefFeedTree.js:43
 msgid "Remove category"
 msgstr "Remover categoria"
 
-#: js/PrefFilterTree.js:46
+#: js/PrefFilterTree.js:47
 msgid "Inverse"
 msgstr "Invertido"
 
-#: js/feedlist.js:511
+#: js/feedlist.js:461
 #, 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:514
+#: js/feedlist.js:464
 #, 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:517
+#: js/feedlist.js:467
 #, 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:520
+#: js/feedlist.js:470
 #, fuzzy
 msgid "Mark %w in %s as read?"
 msgstr "Marcar todos os artigos em %s como lidos?"
 
-#: js/feedlist.js:523
+#: js/feedlist.js:473
 #, fuzzy
 msgid "search results"
 msgstr "Resultados da pesquisa: %s"
 
-#: js/feedlist.js:523
+#: js/feedlist.js:473
 #, fuzzy
 msgid "all articles"
 msgstr "Todas as inscrições"
 
-#: js/functions.js:74
+#: js/functions.js:100
 msgid "Close"
 msgstr ""
 
-#: js/functions.js:141
+#: js/functions.js:167
 msgid "Click to close"
 msgstr "Clique para fechar"
 
-#: js/functions.js:448
+#: js/functions.js:456
 msgid "Error explained"
 msgstr "Detalhamento do erro"
 
-#: js/functions.js:592
+#: js/functions.js:490
+msgid "Upload complete."
+msgstr "Upload completo."
+
+#: js/functions.js:508
+msgid "Remove stored feed icon?"
+msgstr "Remover o ícone armazenado para essa assinatura?"
+
+#: js/functions.js:510
+msgid "Removing feed icon..."
+msgstr "Removendo icone da assinatura..."
+
+#: js/functions.js:515
+msgid "Feed icon removed."
+msgstr "Ícone da inscrição foi removido."
+
+#: js/functions.js:532
+msgid "Please select an image file to upload."
+msgstr "Por favor selecione  um arquivo de imagem para enviar."
+
+#: js/functions.js:533
+msgid "Upload new icon for this feed?"
+msgstr "Enviar novo icone para essa inscrição?"
+
+#: js/functions.js:534
+msgid "Uploading, please wait..."
+msgstr "Enviando, por favor aguarde..."
+
+#: js/functions.js:542
+msgid "Please enter label caption:"
+msgstr "Por favor entre o título do marcador:"
+
+#: js/functions.js:575
 msgid "Subscribe to Feed"
 msgstr "Assinar inscrição"
 
-#: js/functions.js:621
+#: js/functions.js:602
 msgid "Failed to parse output. This can indicate server timeout and/or network issues. Backend output was logged to browser console."
 msgstr ""
 
-#: js/functions.js:636
+#: js/functions.js:617
 #, perl-format
 msgid "Subscribed to %s"
 msgstr "%s assinado"
 
-#: js/functions.js:641
+#: js/functions.js:622
 msgid "Specified URL seems to be invalid."
 msgstr "URL informada parece ser inválida."
 
-#: js/functions.js:644
+#: js/functions.js:625
 msgid "Specified URL doesn't seem to contain any feeds."
 msgstr "A URL informada não parece conter nenhum feed."
 
-#: js/functions.js:656
+#: js/functions.js:637
 msgid "Expand to select feed"
 msgstr "Expandir inscrição selecionada"
 
-#: js/functions.js:668
+#: js/functions.js:649
 #, perl-format
 msgid "Couldn't download the specified URL: %s"
 msgstr "Não foi possível baixar a URL informada: %s"
 
-#: js/functions.js:672
+#: js/functions.js:653
 #, perl-format
 msgid "XML validation failed: %s"
 msgstr "Erro na validação do XML: %s"
 
-#: js/functions.js:676
+#: js/functions.js:657
 msgid "You are already subscribed to this feed."
 msgstr "Você já assinou este feed."
 
-#: js/functions.js:1136
+#: js/functions.js:1098
 msgid "Generate new syndication address for this feed?"
 msgstr ""
 
-#: js/functions.js:1140
-#: js/prefs.js:1095
+#: js/functions.js:1100
+#: js/prefs.js:870
 msgid "Trying to change address..."
 msgstr "Tentando alterar endereço ..."
 
-#: js/functions.js:1245
-#: js/tt-rss.js:446
-#: js/tt-rss.js:673
+#: js/functions.js:1199
+#: js/tt-rss.js:399
+#: js/tt-rss.js:612
 msgid "You can't edit this kind of feed."
 msgstr "Você não pode editar esse tipo de feed."
 
-#: js/functions.js:1260
+#: js/functions.js:1213
 msgid "Edit Feed"
 msgstr "Editar inscrição"
 
-#: js/functions.js:1266
-#: js/prefs.js:100
-#: js/prefs.js:209
-#: js/prefs.js:647
+#: js/functions.js:1217
+#: js/prefs.js:176
+#: js/prefs.js:523
+#: js/prefs.js:1139
+#: js/prefs.js:78
 msgid "Saving data..."
 msgstr "Salvando dados..."
 
-#: js/functions.js:1293
+#: js/functions.js:1243
 msgid "More Feeds"
 msgstr "Mais inscrições"
 
-#: js/functions.js:1355
-#: js/functions.js:1464
-#: js/prefs.js:398
-#: js/prefs.js:540
-#: js/prefs.js:558
-#: js/prefs.js:1077
+#: js/functions.js:1297
+#: js/functions.js:1383
+#: js/prefs.js:332
+#: js/prefs.js:455
+#: js/prefs.js:473
+#: js/prefs.js:855
 msgid "No feeds are selected."
 msgstr "Nenhum feed foi selecionado."
 
-#: js/functions.js:1398
+#: js/functions.js:1329
 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:1435
+#: js/functions.js:1360
 msgid "Feeds with update errors"
 msgstr "Inscrições com erro na atualização"
 
-#: js/functions.js:1446
-#: js/prefs.js:1058
+#: js/functions.js:1369
+#: js/prefs.js:841
 msgid "Remove selected feeds?"
 msgstr "Remover inscrições selecionadas?"
 
-#: js/functions.js:1449
-#: js/prefs.js:1061
+#: js/functions.js:1370
+#: js/prefs.js:842
 msgid "Removing selected feeds..."
 msgstr "Removendo inscrições selecionadas…"
 
-#: js/prefs.js:60
-msgid "Please enter login:"
-msgstr "Por favor entre login:"
-
-#: js/prefs.js:67
-msgid "Can't create user: no login specified."
-msgstr "Não foi possível criar o usuário: Nenhum nome foi especificado."
-
-#: js/prefs.js:71
-msgid "Adding user..."
-msgstr "Adicionando o usuário…"
-
-#: js/prefs.js:96
-msgid "User Editor"
-msgstr "Editor de usuários"
-
-#: js/prefs.js:131
-msgid "Edit Filter"
-msgstr "Editar filtros"
-
-#: js/prefs.js:170
+#: js/prefs.js:143
 msgid "Remove filter?"
 msgstr "Remover filtro?"
 
-#: js/prefs.js:175
+#: js/prefs.js:148
 msgid "Removing filter..."
 msgstr "Removendo filtro..."
 
-#: js/prefs.js:292
+#: js/prefs.js:251
 msgid "Remove selected labels?"
 msgstr "Remover marcadores selecionados?"
 
-#: js/prefs.js:295
+#: js/prefs.js:252
 msgid "Removing selected labels..."
 msgstr "Removendo marcadores selecionados..."
 
-#: js/prefs.js:308
-#: js/prefs.js:1144
+#: js/prefs.js:262
+#: js/prefs.js:909
 msgid "No labels are selected."
 msgstr "Nenhum marcador está selecionado."
 
-#: js/prefs.js:320
+#: js/prefs.js:274
 msgid "Remove selected users? Neither default admin nor your account will be removed."
 msgstr "Remover usuários selecionados? A sua conta e a do administrador não serão removidas."
 
-#: js/prefs.js:323
+#: js/prefs.js:275
 msgid "Removing selected users..."
 msgstr "Removendo usuários selecionados…"
 
-#: js/prefs.js:338
-#: js/prefs.js:408
-#: js/prefs.js:427
-#: js/prefs.js:461
+#: js/prefs.js:286
+#: js/prefs.js:342
+#: js/prefs.js:361
+#: js/prefs.js:387
 msgid "No users are selected."
 msgstr "Nenhum usuário foi selecionado."
 
-#: js/prefs.js:350
+#: js/prefs.js:297
 msgid "Remove selected filters?"
 msgstr "Remover os filtros selecionados?"
 
-#: js/prefs.js:353
+#: js/prefs.js:298
 msgid "Removing selected filters..."
 msgstr "Removendo filtros selecionados…"
 
-#: js/prefs.js:366
-#: js/prefs.js:495
-#: js/prefs.js:514
+#: js/prefs.js:308
+#: js/prefs.js:419
+#: js/prefs.js:438
 msgid "No filters are selected."
 msgstr "Nenhum filtro foi selecionado."
 
-#: js/prefs.js:378
+#: js/prefs.js:319
 msgid "Unsubscribe from selected feeds?"
 msgstr "Cancelar inscrição dos feeds selecionados?"
 
-#: js/prefs.js:382
+#: js/prefs.js:321
 msgid "Unsubscribing from selected feeds..."
 msgstr "Cancelando inscrição dos feeds selecionados..."
 
-#: js/prefs.js:413
-#: js/prefs.js:432
-#: js/prefs.js:466
+#: js/prefs.js:347
+#: js/prefs.js:366
+#: js/prefs.js:392
 msgid "Please select only one user."
 msgstr "Por favor selecione somente um usuário."
 
-#: js/prefs.js:436
+#: js/prefs.js:370
 msgid "Reset password of selected user?"
 msgstr "Reiniciar a senha do usuário selecionado?"
 
-#: js/prefs.js:439
+#: js/prefs.js:371
 msgid "Resetting password for selected user..."
 msgstr "Reiniciando a senha do usuário selecionado..."
 
-#: js/prefs.js:500
+#: js/prefs.js:424
 msgid "Please select only one filter."
 msgstr "Por favor selecione somente um filtro."
 
-#: js/prefs.js:518
+#: js/prefs.js:442
 msgid "Combine selected filters?"
 msgstr "Combinar os filtros selecionados?"
 
-#: js/prefs.js:521
+#: js/prefs.js:443
 msgid "Joining filters..."
 msgstr "Combinando filtros..."
 
-#: js/prefs.js:580
+#: js/prefs.js:487
 msgid "Edit Multiple Feeds"
 msgstr "Editar múltiplas assinaturas"
 
-#: js/prefs.js:604
+#: js/prefs.js:511
 msgid "Save changes to selected feeds?"
 msgstr "Salvar alterações nas inscrições selecionadas?"
 
-#: js/prefs.js:681
+#: js/prefs.js:552
 msgid "OPML Import"
 msgstr "Importar OPML"
 
-#: js/prefs.js:700
+#: js/prefs.js:571
 msgid "Please choose an OPML file first."
 msgstr "Por favor selecione um arquivo OPML."
 
-#: js/prefs.js:703
+#: js/prefs.js:574
 #: plugins/import_export/import_export.js:115
 msgid "Importing, please wait..."
 msgstr "Importando, por favor aguarde..."
 
-#: js/prefs.js:869
+#: js/prefs.js:737
 msgid "Reset to defaults?"
 msgstr "Usar o padrão?"
 
-#: js/prefs.js:1468
-msgid "Subscribing to feeds..."
-msgstr "Adicionando inscrições..."
+#: js/prefs.js:777
+#, perl-format
+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:1487
-msgid "Clear stored data for this plugin?"
-msgstr "Limpar dados armazenados para este plugin?"
+#: js/prefs.js:778
+msgid "Removing category..."
+msgstr "Removendo categoria..."
 
-#: js/prefs.js:1501
-msgid "Clear all messages in the error log?"
-msgstr "Limpar todas as mensagems no registro de erro?"
+#: js/prefs.js:794
+msgid "Remove selected categories?"
+msgstr "Remover as categorias selecionadas?"
 
-#: js/tt-rss.js:118
+#: js/prefs.js:795
+msgid "Removing selected categories..."
+msgstr "Removendo categorias selecionadas…"
+
+#: js/prefs.js:805
+msgid "No categories are selected."
+msgstr "Nenhuma categoria foi selecionada."
+
+#: js/prefs.js:812
+msgid "Category title:"
+msgstr "Título da categoria..."
+
+#: js/prefs.js:815
+msgid "Creating category..."
+msgstr "Criando categoria..."
+
+#: js/prefs.js:832
+msgid "Feeds without recent updates"
+msgstr "Inscrições sem atualização recente"
+
+#: js/prefs.js:869
+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:898
+msgid "Reset selected labels to default colors?"
+msgstr "Reiniciar marcadores selecionados para a cor padrão?"
+
+#: js/prefs.js:926
+#, fuzzy
+msgid "Settings Profiles"
+msgstr "Criando perfil..."
+
+#: js/prefs.js:935
+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:936
+msgid "Removing selected profiles..."
+msgstr "Removendo perfis selecionados…"
+
+#: js/prefs.js:948
+msgid "No profiles are selected."
+msgstr "Nenhum perfil está selecionado."
+
+#: js/prefs.js:955
+#: js/prefs.js:997
+msgid "Activate selected profile?"
+msgstr "Ativar o perfil selecionado?"
+
+#: js/prefs.js:964
+#: js/prefs.js:1008
+msgid "Please choose a profile to activate."
+msgstr "Por favor, selecione um perfil para ativar."
+
+#: js/prefs.js:969
+msgid "Creating profile..."
+msgstr "Criando perfil..."
+
+#: js/prefs.js:1016
+msgid "This will invalidate all previously generated feed URLs. Continue?"
+msgstr ""
+
+#: js/prefs.js:1017
+#: plugins/share/share_prefs.js:3
+msgid "Clearing URLs..."
+msgstr "Limpando URLs..."
+
+#: js/prefs.js:1020
+msgid "Generated URLs cleared."
+msgstr "URLs automaticas limpas."
+
+#: js/prefs.js:1053
+#, fuzzy
+msgid "Rename category to:"
+msgstr "Remover categoria"
+
+#: js/prefs.js:1074
+msgid "Label Editor"
+msgstr "Editor de marcador"
+
+#: js/tt-rss.js:111
 msgid "Mark all articles as read?"
 msgstr "Marcar todos os artigos como lidos?"
 
-#: js/tt-rss.js:124
+#: js/tt-rss.js:115
 msgid "Marking all feeds as read..."
 msgstr "Marcando todos os feeds como lidos..."
 
-#: js/tt-rss.js:398
+#: js/tt-rss.js:351
 msgid "Please enable mail plugin first."
 msgstr "Por favor habilite o plugin de e-mail."
 
-#: js/tt-rss.js:527
+#: js/tt-rss.js:477
 msgid "Please enable embed_original plugin first."
 msgstr "Por favor, habilite o plugin \"embed_original\"."
 
-#: js/tt-rss.js:540
-#: js/tt-rss.js:723
+#: js/tt-rss.js:490
+#: js/tt-rss.js:653
 msgid "Widescreen is not available in combined mode."
 msgstr ""
 
-#: js/tt-rss.js:821
-msgid "You can't rescore this kind of feed."
-msgstr "Você não pode classificar esse tipo de assinatura."
-
-#: js/tt-rss.js:826
-#: js/tt-rss.js:686
-msgid "Please select some feed first."
-msgstr "Por favor selecione alguma inscrição."
-
-#: js/tt-rss.js:831
-#, perl-format
-msgid "Rescore articles in %s?"
-msgstr "Reclassificar artigos em %s?"
-
-#: js/tt-rss.js:834
-msgid "Rescoring articles..."
-msgstr "Reclassificando artigos..."
-
-#: js/viewfeed.js:917
-#: js/viewfeed.js:955
-#: js/viewfeed.js:1003
-#: js/viewfeed.js:1924
-#: plugins/mail/mail.js:7
+#: js/viewfeed.js:444
+#: js/viewfeed.js:461
+#: js/viewfeed.js:484
+#: js/viewfeed.js:521
+#: js/viewfeed.js:542
+#: js/viewfeed.js:651
+#: js/viewfeed.js:685
+#: js/viewfeed.js:727
+#: js/viewfeed.js:1564
 #: plugins/mailto/init.js:7
-#: js/viewfeed.js:675
-#: js/viewfeed.js:697
-#: js/viewfeed.js:718
-#: js/viewfeed.js:777
-#: js/viewfeed.js:805
+#: plugins/mail/mail.js:7
 msgid "No articles are selected."
 msgstr "Nenhum artigo foi selecionado."
 
-#: js/viewfeed.js:925
+#: js/viewfeed.js:659
 #, 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:927
+#: js/viewfeed.js:661
 #, 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:964
+#: js/viewfeed.js:694
 #, 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:967
+#: js/viewfeed.js:697
 #, 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:969
+#: js/viewfeed.js:698
 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:1009
+#: js/viewfeed.js:733
 #, 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:1029
+#: js/viewfeed.js:753
 msgid "Edit article Tags"
 msgstr "Editar Tags do artigo"
 
-#: js/viewfeed.js:1035
+#: js/viewfeed.js:757
 msgid "Saving article tags..."
 msgstr "Salvando tags..."
 
-#: js/viewfeed.js:1666
+#: js/viewfeed.js:1015
+msgid "No article is selected."
+msgstr "Nenhum artigo foi selecionado."
+
+#: js/viewfeed.js:1050
+msgid "No articles found to mark"
+msgstr "Nenhum artigo foi encontrado para marcar"
+
+#: js/viewfeed.js:1052
+#, perl-format
+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?"
+
+#: js/viewfeed.js:1312
 msgid "Open original article"
 msgstr "Abrir o artigo original"
 
-#: js/viewfeed.js:1673
+#: js/viewfeed.js:1319
 msgid "Display article URL"
 msgstr "Mostrar URL do artigo"
 
-#: js/viewfeed.js:1780
+#: js/viewfeed.js:1426
 msgid "Assign label"
 msgstr "Incluir marcador"
 
-#: js/viewfeed.js:1785
+#: js/viewfeed.js:1431
 msgid "Remove label"
 msgstr "Remover marcador"
 
-#: js/viewfeed.js:1817
+#: js/viewfeed.js:1463
 #, fuzzy
 msgid "Select articles in group"
 msgstr "Selecionar artigo sob o cursor"
 
-#: js/viewfeed.js:1827
+#: js/viewfeed.js:1473
 #, fuzzy
 msgid "Mark group as read"
 msgstr "Marcar como lido"
 
-#: js/viewfeed.js:1839
+#: js/viewfeed.js:1485
 #, fuzzy
 msgid "Mark feed as read"
 msgstr "Marcar como lido"
 
-#: js/viewfeed.js:1892
+#: js/viewfeed.js:1538
 msgid "Please enter new score for selected articles:"
 msgstr "Por favor entre uma nova classificação para os artigos selecionados:"
 
-#: js/viewfeed.js:1955
+#: js/viewfeed.js:1571
 msgid "Please enter new score for this article:"
 msgstr "Por favor entre uma nova classificação para esse artigo:"
 
-#: js/viewfeed.js:1986
+#: js/viewfeed.js:1591
 msgid "Article URL:"
 msgstr "URL do artigo:"
 
-#: plugins/note/note.js:17
-msgid "Saving article note..."
-msgstr "Salvando anotação..."
+#: plugins/embed_original/init.js:6
+msgid "Sorry, your browser does not support sandboxed iframes."
+msgstr ""
 
 #: plugins/af_psql_trgm/init.js:11
 #, fuzzy
 msgid "Related articles"
 msgstr "Favoritos"
 
+#: plugins/mailto/init.js:21
+#: plugins/mail/mail.js:21
+msgid "Forward article by email"
+msgstr "Encaminhar artigo por email"
+
+#: plugins/shorten_expanded/init.js:43
+#, fuzzy
+msgid "Click to expand article"
+msgstr "Favoritos"
+
 #: plugins/import_export/import_export.js:13
 msgid "Export Data"
 msgstr "Exportar dados"
@@ -3230,263 +3325,172 @@ 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
-msgid "Forward article by email"
-msgstr "Encaminhar artigo por email"
-
-#: plugins/mail/mail.js:36
-msgid "Error sending email:"
+#: plugins/share/share_prefs.js:2
+msgid "This will invalidate all previously shared article URLs. Continue?"
 msgstr ""
 
-#: plugins/mail/mail.js:38
-#, fuzzy
-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."
+#: plugins/share/share_prefs.js:8
+msgid "Shared URLs cleared."
 msgstr ""
 
-#: plugins/shorten_expanded/init.js:45
-#, fuzzy
-msgid "Click to expand article"
-msgstr "Favoritos"
-
 #: plugins/share/share.js:10
 msgid "Share article by URL"
 msgstr "Compartilhar artigo pela URL"
 
-#: plugins/share/share.js:14
+#: plugins/share/share.js:13
 msgid "Generate new share URL for this article?"
 msgstr "Gerar uma nova URL de compartilhamento para esse artigo?"
 
-#: plugins/share/share.js:18
+#: plugins/share/share.js:15
 msgid "Trying to change URL..."
 msgstr "Tentando mudar a URL..."
 
-#: plugins/share/share.js:55
+#: plugins/share/share.js:48
 msgid "Remove sharing for this article?"
 msgstr "Remover compartilhamento deste artigo?"
 
-#: plugins/share/share.js:59
+#: plugins/share/share.js:50
 msgid "Trying to unshare..."
 msgstr "Tentando remover compartilhamento ..."
 
-#: plugins/share/share_prefs.js:3
-msgid "This will invalidate all previously shared article URLs. Continue?"
+#: plugins/mail/mail.js:30
+msgid "Error sending email:"
 msgstr ""
 
-#: plugins/share/share_prefs.js:6
-#: js/prefs.js:1277
-msgid "Clearing URLs..."
-msgstr "Limpando URLs..."
+#: plugins/mail/mail.js:32
+#, fuzzy
+msgid "Your message has been sent."
+msgstr "Seus dados pessoais foram salvos."
 
-#: plugins/share/share_prefs.js:13
-msgid "Shared URLs cleared."
-msgstr ""
+#: plugins/note/note.js:15
+msgid "Saving article note..."
+msgstr "Salvando anotação..."
 
-#: js/feedlist.js:204
+#: js/feedlist.js:168
 #, fuzzy
 msgid "Your password is at default value"
 msgstr "Sua senha é a padrão, você deve mudá-la."
 
-#: js/feedlist.js:453
+#: js/feedlist.js:413
 msgid "Mark all articles in %s as read?"
 msgstr "Marcar todos os artigos em %s como lidos?"
 
-#: js/functions.js:494
-msgid "Upload complete."
-msgstr "Upload completo."
-
-#: js/functions.js:511
-msgid "Remove stored feed icon?"
-msgstr "Remover o ícone armazenado para essa assinatura?"
-
-#: js/functions.js:516
-msgid "Removing feed icon..."
-msgstr "Removendo icone da assinatura..."
-
-#: js/functions.js:521
-msgid "Feed icon removed."
-msgstr "Ícone da inscrição foi removido."
-
-#: js/functions.js:537
-msgid "Please select an image file to upload."
-msgstr "Por favor selecione  um arquivo de imagem para enviar."
-
-#: js/functions.js:539
-msgid "Upload new icon for this feed?"
-msgstr "Enviar novo icone para essa inscrição?"
-
-#: js/functions.js:540
-msgid "Uploading, please wait..."
-msgstr "Enviando, por favor aguarde..."
-
-#: js/functions.js:550
-msgid "Please enter label caption:"
-msgstr "Por favor entre o título do marcador:"
-
-#: js/functions.js:555
-msgid "Can't create label: missing caption."
-msgstr "Não foi posso criar o marcador: Falta o título"
-
-#: js/functions.js:797
+#: js/functions.js:764
 msgid "Edit rule"
 msgstr "Editar regra"
 
-#: js/functions.js:819
+#: js/functions.js:786
 msgid "Edit action"
 msgstr "Editar ação"
 
-#: js/functions.js:860
+#: js/functions.js:825
 msgid "Looking for articles (%d processed, %f found)..."
 msgstr ""
 
-#: js/functions.js:890
+#: js/functions.js:855
 #, fuzzy
 msgid "Found %d articles matching this filter:"
 msgstr "Artigos de acordo com este filtro:"
 
-#: js/functions.js:942
+#: js/functions.js:907
 msgid "Create Filter"
 msgstr "Criar um filtro"
 
-#: js/functions.js:1060
-#: js/tt-rss.js:692
+#: js/functions.js:1016
+#: js/tt-rss.js:631
 msgid "Unsubscribe from %s?"
 msgstr "Cancelar inscrição de %s?"
 
-#: js/functions.js:1063
+#: js/functions.js:1019
 msgid "Removing feed..."
 msgstr "Removendo o Feed..."
 
-#: js/functions.js:1489
+#: js/functions.js:1410
 msgid "Help"
 msgstr "Ajuda,"
 
-#: js/prefs.js:973
-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:44
+msgid "Please enter login:"
+msgstr "Por favor entre login:"
 
-#: js/prefs.js:979
-msgid "Removing category..."
-msgstr "Removendo categoria..."
+#: js/prefs.js:51
+msgid "Can't create user: no login specified."
+msgstr "Não foi possível criar o usuário: Nenhum nome foi especificado."
 
-#: js/prefs.js:997
-msgid "Remove selected categories?"
-msgstr "Remover as categorias selecionadas?"
+#: js/prefs.js:55
+msgid "Adding user..."
+msgstr "Adicionando o usuário…"
 
-#: js/prefs.js:1000
-msgid "Removing selected categories..."
-msgstr "Removendo categorias selecionadas…"
+#: js/prefs.js:74
+msgid "User Editor"
+msgstr "Editor de usuários"
 
-#: js/prefs.js:1013
-msgid "No categories are selected."
-msgstr "Nenhuma categoria foi selecionada."
+#: js/prefs.js:104
+msgid "Edit Filter"
+msgstr "Editar filtros"
 
-#: js/prefs.js:1020
-msgid "Category title:"
-msgstr "Título da categoria..."
+#: js/prefs.js:1175
+msgid "Subscribing to feeds..."
+msgstr "Adicionando inscrições..."
 
-#: js/prefs.js:1024
-msgid "Creating category..."
-msgstr "Criando categoria..."
+#: js/prefs.js:1191
+msgid "Clear stored data for this plugin?"
+msgstr "Limpar dados armazenados para este plugin?"
 
-#: js/prefs.js:1047
-msgid "Feeds without recent updates"
-msgstr "Inscrições sem atualização recente"
+#: js/prefs.js:1203
+msgid "Clear all messages in the error log?"
+msgstr "Limpar todas as mensagems no registro de erro?"
 
-#: js/prefs.js:1091
-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:1129
-msgid "Reset selected labels to default colors?"
-msgstr "Reiniciar marcadores selecionados para a cor padrão?"
-
-#: js/prefs.js:1161
-#, fuzzy
-msgid "Settings Profiles"
-msgstr "Criando perfil..."
-
-#: js/prefs.js:1170
-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:1173
-msgid "Removing selected profiles..."
-msgstr "Removendo perfis selecionados…"
-
-#: js/prefs.js:1189
-msgid "No profiles are selected."
-msgstr "Nenhum perfil está selecionado."
-
-#: js/prefs.js:1197
-#: js/prefs.js:1250
-msgid "Activate selected profile?"
-msgstr "Ativar o perfil selecionado?"
-
-#: js/prefs.js:1214
-#: js/prefs.js:1266
-msgid "Please choose a profile to activate."
-msgstr "Por favor, selecione um perfil para ativar."
-
-#: js/prefs.js:1219
-msgid "Creating profile..."
-msgstr "Criando perfil..."
-
-#: js/prefs.js:1274
-msgid "This will invalidate all previously generated feed URLs. Continue?"
-msgstr ""
-
-#: js/prefs.js:1284
-msgid "Generated URLs cleared."
-msgstr "URLs automaticas limpas."
-
-#: js/prefs.js:1356
-msgid "Label Editor"
-msgstr "Editor de marcador"
-
-#: js/tt-rss.js:681
+#: js/tt-rss.js:620
 msgid "You can't unsubscribe from the category."
 msgstr "Você não pode cancelar a inscrição dessa categoria."
 
-#: js/viewfeed.js:127
-#: js/viewfeed.js:177
-#: js/viewfeed.js:194
+#: js/tt-rss.js:625
+msgid "Please select some feed first."
+msgstr "Por favor selecione alguma inscrição."
+
+#: js/viewfeed.js:89
+#: js/viewfeed.js:135
+#: js/viewfeed.js:152
 #, fuzzy
 msgid "Click to open next unread feed."
 msgstr "Clique para editar inscrição"
 
-#: js/viewfeed.js:131
+#: js/viewfeed.js:93
 msgid "Cancel search"
 msgstr "Cancelar pesquisa"
 
-#: js/viewfeed.js:191
+#: js/viewfeed.js:149
 #, fuzzy
 msgid "New articles found, reload feed to continue."
 msgstr "Nenhum artigo foi encontrado para exibir."
 
-#: js/viewfeed.js:620
+#: js/viewfeed.js:405
 msgid "%d article selected"
 msgid_plural "%d articles selected"
 msgstr[0] "%d artigo selecionado"
 msgstr[1] "%d artigos selecionados"
 
-#: js/viewfeed.js:1284
-msgid "No article is selected."
-msgstr "Nenhum artigo foi selecionado."
+#~ msgid "Rescore feed"
+#~ msgstr "Reclassificar assinatura"
 
-#: js/viewfeed.js:1319
-msgid "No articles found to mark"
-msgstr "Nenhum artigo foi encontrado para marcar"
+#~ msgid "Create label..."
+#~ msgstr "Criar marcador..."
 
-#: js/viewfeed.js:1321
-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 "Create filter..."
+#~ msgstr "Criar filtro..."
+
+#~ msgid "You can't rescore this kind of feed."
+#~ msgstr "Você não pode classificar esse tipo de assinatura."
+
+#~ msgid "Rescore articles in %s?"
+#~ msgstr "Reclassificar artigos em %s?"
+
+#~ msgid "Rescoring articles..."
+#~ msgstr "Reclassificando artigos..."
+
+#~ msgid "Can't create label: missing caption."
+#~ msgstr "Não foi posso criar o marcador: Falta o título"
 
 #~ msgid "Firefox integration"
 #~ msgstr "Integração com o firefox"
diff --git a/locale/ru_RU/LC_MESSAGES/messages.mo b/locale/ru_RU/LC_MESSAGES/messages.mo
index 13a8d9991..de56cdc54 100644
Binary files a/locale/ru_RU/LC_MESSAGES/messages.mo and b/locale/ru_RU/LC_MESSAGES/messages.mo differ
diff --git a/locale/ru_RU/LC_MESSAGES/messages.po b/locale/ru_RU/LC_MESSAGES/messages.po
index 91ddd0fc9..76b3bcbe9 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: 2018-10-10 08:24+0300\n"
+"POT-Creation-Date: 2018-12-01 12:59+0300\n"
 "PO-Revision-Date: 2013-07-16 23:45+0400\n"
 "Last-Translator: cyberbat <cyberbat83@gmail.com>\n"
 "Language-Team: Russian <>\n"
@@ -95,8 +95,8 @@ msgid "Weekly"
 msgstr "Раз в неделю"
 
 #: backend.php:103
-#: classes/pref/users.php:47
 #: classes/pref/system.php:51
+#: classes/pref/users.php:47
 msgid "User"
 msgstr "Пользователь"
 
@@ -170,33 +170,33 @@ msgstr "Пользователь не найден"
 
 #: index.php:151
 #: index.php:167
-#: index.php:285
+#: index.php:282
 #: prefs.php:120
 #: classes/backend.php:5
 #: classes/pref/labels.php:294
-#: classes/pref/feeds.php:1230
 #: classes/pref/filters.php:822
-#: js/feedlist.js:148
-#: js/feedlist.js:491
-#: js/feedlist.js:539
-#: js/functions.js:314
-#: js/functions.js:1336
-#: js/prefs.js:562
-#: js/prefs.js:754
-#: js/prefs.js:1488
-#: js/prefs.js:1503
-#: js/tt-rss.js:547
-#: js/viewfeed.js:1180
+#: classes/pref/feeds.php:1229
+#: js/feedlist.js:118
+#: js/feedlist.js:446
+#: js/feedlist.js:487
+#: js/functions.js:328
+#: js/functions.js:551
+#: js/functions.js:1286
+#: js/prefs.js:477
+#: js/prefs.js:617
+#: js/prefs.js:956
+#: js/prefs.js:1000
+#: js/prefs.js:1028
+#: js/prefs.js:1037
+#: js/prefs.js:1045
+#: js/prefs.js:1057
+#: js/tt-rss.js:497
+#: js/viewfeed.js:509
+#: js/viewfeed.js:928
 #: plugins/import_export/import_export.js:17
-#: js/functions.js:565
-#: js/prefs.js:1200
-#: js/prefs.js:1253
-#: js/prefs.js:1292
-#: js/prefs.js:1305
-#: js/prefs.js:1316
-#: js/prefs.js:1331
-#: js/tt-rss.js:564
-#: js/viewfeed.js:760
+#: js/prefs.js:1192
+#: js/prefs.js:1205
+#: js/tt-rss.js:510
 msgid "Loading, please wait..."
 msgstr "Идет загрузка..."
 
@@ -213,13 +213,13 @@ msgid "All Articles"
 msgstr "Все статьи"
 
 #: index.php:194
-#: include/functions.php:1227
+#: include/functions.php:1172
 #: classes/feeds.php:110
 msgid "Starred"
 msgstr "Отмеченные"
 
 #: index.php:195
-#: include/functions.php:1228
+#: include/functions.php:1173
 #: classes/feeds.php:111
 msgid "Published"
 msgstr "Опубликован"
@@ -259,11 +259,11 @@ msgid "Title"
 msgstr "Заголовок"
 
 #: index.php:211
-#: index.php:251
-#: include/functions.php:1215
+#: index.php:250
+#: include/functions.php:1160
 #: classes/feeds.php:115
-#: js/FeedTree.js:41
-#: js/FeedTree.js:69
+#: js/FeedTree.js:42
+#: js/FeedTree.js:70
 msgid "Mark as read"
 msgstr "Как прочитанные"
 
@@ -300,7 +300,7 @@ msgid "Feed actions:"
 msgstr "Действия над каналами:"
 
 #: index.php:246
-#: classes/handler/public.php:551
+#: classes/handler/public.php:575
 msgid "Subscribe to feed..."
 msgstr "Подписаться на канал..."
 
@@ -309,56 +309,44 @@ msgid "Edit this feed..."
 msgstr "Редактировать канал..."
 
 #: index.php:248
-msgid "Rescore feed"
-msgstr "Заново оценить канал"
-
-#: index.php:249
-#: classes/pref/feeds.php:770
-#: classes/pref/feeds.php:1203
-#: js/PrefFeedTree.js:61
+#: classes/pref/feeds.php:769
+#: classes/pref/feeds.php:1202
+#: js/PrefFeedTree.js:62
 msgid "Unsubscribe"
 msgstr "Отписаться"
 
-#: index.php:250
+#: index.php:249
 msgid "All feeds:"
 msgstr "Все каналы:"
 
-#: index.php:252
+#: index.php:251
 msgid "(Un)hide read feeds"
 msgstr "Показать/скрыть прочитанные"
 
-#: index.php:253
+#: index.php:252
 msgid "Other actions:"
 msgstr "Другие действия:"
 
-#: index.php:254
-#: include/functions.php:1201
+#: index.php:253
+#: include/functions.php:1146
 msgid "Toggle widescreen mode"
 msgstr "Переключить широкоэкранный режим"
 
-#: index.php:255
-msgid "Create label..."
-msgstr "Создать метку..."
-
-#: index.php:256
-msgid "Create filter..."
-msgstr "Создать фильтр..."
-
-#: index.php:257
+#: index.php:254
 msgid "Keyboard shortcuts help"
 msgstr "Горячие клавиши"
 
-#: index.php:266
+#: index.php:263
 msgid "Logout"
 msgstr "Выход"
 
-#: index.php:272
+#: index.php:269
 msgid "Updates are available from Git."
 msgstr ""
 
 #: prefs.php:33
 #: prefs.php:138
-#: include/functions.php:1230
+#: include/functions.php:1175
 #: classes/pref/prefs.php:425
 msgid "Preferences"
 msgstr "Настройки"
@@ -373,8 +361,8 @@ msgstr "Закрыть настройки"
 
 #: prefs.php:141
 #: classes/pref/feeds.php:114
-#: classes/pref/feeds.php:1138
-#: classes/pref/feeds.php:1192
+#: classes/pref/feeds.php:1137
+#: classes/pref/feeds.php:1191
 msgid "Feeds"
 msgstr "Каналы"
 
@@ -384,8 +372,8 @@ msgid "Filters"
 msgstr "Фильтры"
 
 #: prefs.php:147
+#: classes/feeds.php:1696
 #: classes/pref/labels.php:94
-#: classes/feeds.php:1710
 msgid "Labels"
 msgstr "Метки"
 
@@ -397,80 +385,80 @@ msgstr "Пользователи"
 msgid "System"
 msgstr "Система"
 
-#: register.php:186
+#: register.php:185
 #: include/login_form.php:162
 msgid "Create new account"
 msgstr "Создать новый аккаунт"
 
-#: register.php:192
+#: register.php:191
 msgid "New user registrations are administratively disabled."
 msgstr "Регистрация новых пользователей запрещена."
 
-#: register.php:196
-#: register.php:241
-#: register.php:254
-#: register.php:269
-#: register.php:288
-#: register.php:336
-#: register.php:346
-#: register.php:358
-#: classes/handler/public.php:623
-#: classes/handler/public.php:697
-#: classes/handler/public.php:798
-#: classes/handler/public.php:877
-#: classes/handler/public.php:891
-#: classes/handler/public.php:898
-#: classes/handler/public.php:923
+#: register.php:195
+#: register.php:240
+#: register.php:253
+#: register.php:268
+#: register.php:287
+#: register.php:334
+#: register.php:344
+#: register.php:356
+#: classes/handler/public.php:647
+#: classes/handler/public.php:721
+#: 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"
 
-#: register.php:217
+#: register.php:216
 msgid "Your temporary password will be sent to the specified email. Accounts, which were not logged in once, are erased automatically 24 hours after temporary password is sent."
 msgstr "Временный пароль будет отправлен на указанный e-mail. Если аккаунт не будет активирован в течении 24 часов, то он будет удалён."
 
-#: register.php:223
+#: register.php:222
 msgid "Desired login:"
 msgstr "Желаемый логин:"
 
-#: register.php:226
+#: register.php:225
 msgid "Check availability"
 msgstr "Проверить доступность"
 
-#: register.php:228
-#: classes/handler/public.php:713
+#: register.php:227
+#: classes/handler/public.php:737
 msgid "Email:"
 msgstr "E-mail: "
 
-#: register.php:231
-#: classes/handler/public.php:718
+#: register.php:230
+#: classes/handler/public.php:742
 msgid "How much is two plus two:"
 msgstr "Сколько будет, два плюс два:"
 
-#: register.php:234
+#: register.php:233
 msgid "Submit registration"
 msgstr "Зарегистрироваться"
 
-#: register.php:252
+#: register.php:251
 msgid "Your registration information is incomplete."
 msgstr "Не полностью заполнена ваша регистрационная информация."
 
-#: register.php:267
+#: register.php:266
 msgid "Sorry, this username is already taken."
 msgstr "Извините, такое имя пользователя уже существует."
 
-#: register.php:286
+#: register.php:285
 msgid "Registration failed."
 msgstr "Неудачная регистрация."
 
-#: register.php:333
+#: register.php:331
 msgid "Account created successfully."
 msgstr "Аккаунт успешно создан."
 
-#: register.php:355
+#: register.php:353
 msgid "New user registrations are currently closed."
 msgstr "Регистрация новых пользователей временно закрыта."
 
-#: update.php:66
+#: update.php:67
 msgid "Tiny Tiny RSS data update script."
 msgstr "Скрипт обновления данных Tiny Tiny RSS"
 
@@ -483,10 +471,10 @@ msgstr "Все каналы"
 
 #: include/controls.php:138
 #: include/controls.php:230
-#: classes/opml.php:512
-#: classes/digest.php:120
+#: classes/digest.php:124
+#: classes/feeds.php:1708
 #: classes/pref/feeds.php:233
-#: classes/feeds.php:1722
+#: classes/opml.php:512
 msgid "Uncategorized"
 msgstr "Без категории"
 
@@ -502,287 +490,287 @@ msgstr[2] "%d архивных статей"
 msgid "No feeds found."
 msgstr "Каналы не найдены."
 
-#: include/functions.php:983
+#: include/functions.php:928
 #, php-format
 msgid "%d min"
 msgstr ""
 
-#: include/functions.php:1177
+#: include/functions.php:1122
 msgid "Navigation"
 msgstr "Навигация"
 
-#: include/functions.php:1178
+#: include/functions.php:1123
 msgid "Open next feed"
 msgstr "Открыть следующий канал"
 
-#: include/functions.php:1179
+#: include/functions.php:1124
 msgid "Open previous feed"
 msgstr "Открыть предыдущий канал"
 
-#: include/functions.php:1180
+#: include/functions.php:1125
 msgid "Open next article"
 msgstr "Открыть следующую статью"
 
-#: include/functions.php:1181
+#: include/functions.php:1126
 msgid "Open previous article"
 msgstr "Открыть предыдущую статью"
 
-#: include/functions.php:1182
+#: include/functions.php:1127
 msgid "Open next article (don't scroll long articles)"
 msgstr "Открыть следующую статью (не прокручивать длинные статьи)"
 
-#: include/functions.php:1183
+#: include/functions.php:1128
 msgid "Open previous article (don't scroll long articles)"
 msgstr "Открыть предыдущую статью (не прокручивать длинные статьи)"
 
-#: include/functions.php:1184
+#: include/functions.php:1129
 msgid "Move to next article (don't expand or mark read)"
 msgstr "Перейти к следующей статье (не разворачивать или помечать прочитанной)"
 
-#: include/functions.php:1185
+#: include/functions.php:1130
 msgid "Move to previous article (don't expand or mark read)"
 msgstr "Перейти к предыдущей статье (не разворачивать или помечать прочитанной)"
 
-#: include/functions.php:1186
+#: include/functions.php:1131
 msgid "Show search dialog"
 msgstr "Показать диалог поиска"
 
-#: include/functions.php:1187
+#: include/functions.php:1132
 msgid "Article"
 msgstr "Статья"
 
-#: include/functions.php:1188
-#: js/viewfeed.js:1695
+#: include/functions.php:1133
+#: js/viewfeed.js:1341
 msgid "Toggle starred"
 msgstr "Отметить / снять отметку"
 
-#: include/functions.php:1189
-#: js/viewfeed.js:1707
+#: include/functions.php:1134
+#: js/viewfeed.js:1353
 msgid "Toggle published"
 msgstr "Опубликовано / не опубликовано"
 
-#: include/functions.php:1190
-#: js/viewfeed.js:1682
+#: include/functions.php:1135
+#: js/viewfeed.js:1328
 msgid "Toggle unread"
 msgstr "Прочитано / не прочитано"
 
-#: include/functions.php:1191
+#: include/functions.php:1136
 msgid "Edit tags"
 msgstr "Редактировать теги"
 
-#: include/functions.php:1192
+#: include/functions.php:1137
 msgid "Open in new window"
 msgstr "Открыть в новом окне"
 
-#: include/functions.php:1193
-#: js/viewfeed.js:1728
+#: include/functions.php:1138
+#: js/viewfeed.js:1374
 msgid "Mark below as read"
 msgstr "Отметить статьи ниже как прочитанные"
 
-#: include/functions.php:1194
-#: js/viewfeed.js:1721
+#: include/functions.php:1139
+#: js/viewfeed.js:1367
 msgid "Mark above as read"
 msgstr "Отметить статьи выше как прочитанные"
 
-#: include/functions.php:1195
+#: include/functions.php:1140
 msgid "Scroll down"
 msgstr "Пролистать вниз"
 
-#: include/functions.php:1196
+#: include/functions.php:1141
 msgid "Scroll up"
 msgstr "Пролистать вверх"
 
-#: include/functions.php:1197
+#: include/functions.php:1142
 msgid "Select article under cursor"
 msgstr "Выбрать статью под курсором мыши"
 
-#: include/functions.php:1198
+#: include/functions.php:1143
 msgid "Email article"
 msgstr "Отправить по почте"
 
-#: include/functions.php:1199
+#: include/functions.php:1144
 msgid "Close/collapse article"
 msgstr "Закрыть статью"
 
-#: include/functions.php:1200
+#: include/functions.php:1145
 msgid "Toggle article expansion (combined mode)"
 msgstr "Переключить растяжение статьи (комбинированный режим)"
 
-#: include/functions.php:1202
+#: include/functions.php:1147
 #: plugins/embed_original/init.php:33
 msgid "Toggle embed original"
 msgstr "Переключить отображение оригинала"
 
-#: include/functions.php:1203
+#: include/functions.php:1148
 msgid "Article selection"
 msgstr "Выбрать статью"
 
-#: include/functions.php:1204
+#: include/functions.php:1149
 msgid "Select all articles"
 msgstr "Выбрать все статьи"
 
-#: include/functions.php:1205
+#: include/functions.php:1150
 msgid "Select unread"
 msgstr "Выбрать непрочитанные"
 
-#: include/functions.php:1206
+#: include/functions.php:1151
 msgid "Select starred"
 msgstr "Выбрать отмеченные"
 
-#: include/functions.php:1207
+#: include/functions.php:1152
 msgid "Select published"
 msgstr "Выбрать опубликованные"
 
-#: include/functions.php:1208
+#: include/functions.php:1153
 msgid "Invert selection"
 msgstr "Инвертировать выделение"
 
-#: include/functions.php:1209
+#: include/functions.php:1154
 msgid "Deselect everything"
 msgstr "Снять выделение"
 
-#: include/functions.php:1210
-#: classes/pref/feeds.php:522
-#: classes/pref/feeds.php:794
+#: include/functions.php:1155
+#: classes/pref/feeds.php:521
+#: classes/pref/feeds.php:793
 msgid "Feed"
 msgstr "Канал"
 
-#: include/functions.php:1211
+#: include/functions.php:1156
 msgid "Refresh current feed"
 msgstr "Обновить активный канал"
 
-#: include/functions.php:1212
+#: include/functions.php:1157
 msgid "Un/hide read feeds"
 msgstr "Показать/скрыть прочитанные"
 
-#: include/functions.php:1213
-#: classes/pref/feeds.php:1195
+#: include/functions.php:1158
+#: classes/pref/feeds.php:1194
 msgid "Subscribe to feed"
 msgstr "Подписаться на канал"
 
-#: include/functions.php:1214
-#: js/FeedTree.js:48
-#: js/PrefFeedTree.js:55
-#: js/viewfeed.js:1846
+#: include/functions.php:1159
+#: js/FeedTree.js:49
+#: js/PrefFeedTree.js:56
+#: js/viewfeed.js:1492
 msgid "Edit feed"
 msgstr "Редактировать канал"
 
-#: include/functions.php:1216
+#: include/functions.php:1161
 msgid "Reverse headlines"
 msgstr "Обратный порядок заголовков"
 
-#: include/functions.php:1217
+#: include/functions.php:1162
 msgid "Toggle headline grouping"
 msgstr ""
 
-#: include/functions.php:1218
+#: include/functions.php:1163
 msgid "Debug feed update"
 msgstr "Отлаживать обновление канала"
 
-#: include/functions.php:1219
+#: include/functions.php:1164
 #, fuzzy
 msgid "Debug viewfeed()"
 msgstr "Отлаживать обновление канала"
 
-#: include/functions.php:1220
-#: js/FeedTree.js:97
+#: include/functions.php:1165
+#: js/FeedTree.js:98
 msgid "Mark all feeds as read"
 msgstr "Отметить все каналы как прочитанные"
 
-#: include/functions.php:1221
+#: include/functions.php:1166
 msgid "Un/collapse current category"
 msgstr "Свернуть/развернуть категорию"
 
-#: include/functions.php:1222
-msgid "Toggle combined mode"
-msgstr "Переключить комбинированный режим"
-
-#: include/functions.php:1223
+#: include/functions.php:1167
 msgid "Toggle auto expand in combined mode"
 msgstr "Переключить автоматическое разворачивание в комбинированном режиме"
 
-#: include/functions.php:1224
+#: include/functions.php:1168
+msgid "Toggle combined mode"
+msgstr "Переключить комбинированный режим"
+
+#: include/functions.php:1169
 msgid "Go to"
 msgstr "Перейти к.."
 
-#: include/functions.php:1225
-#: classes/feeds.php:1583
+#: include/functions.php:1170
+#: classes/feeds.php:1569
 msgid "All articles"
 msgstr "Все статьи"
 
-#: include/functions.php:1226
+#: include/functions.php:1171
 msgid "Fresh"
 msgstr "Свежие"
 
-#: include/functions.php:1229
-#: js/tt-rss.js:491
-#: js/tt-rss.js:660
+#: include/functions.php:1174
+#: js/tt-rss.js:439
+#: js/tt-rss.js:599
 msgid "Tag cloud"
 msgstr "Облако тегов"
 
-#: include/functions.php:1231
+#: include/functions.php:1176
 msgid "Other"
 msgstr "Другой"
 
-#: include/functions.php:1232
+#: include/functions.php:1177
 #: classes/pref/labels.php:279
 msgid "Create label"
 msgstr "Создать метку"
 
-#: include/functions.php:1233
+#: include/functions.php:1178
 #: classes/pref/filters.php:801
 msgid "Create filter"
 msgstr "Создать фильтр"
 
-#: include/functions.php:1234
+#: include/functions.php:1179
 msgid "Un/collapse sidebar"
 msgstr "Свернуть/развернуть боковую панель"
 
-#: include/functions.php:1235
+#: include/functions.php:1180
 msgid "Show help dialog"
 msgstr "Показать диалог помощи"
 
-#: include/functions.php:2582
+#: include/functions.php:2529
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: include/functions.php:2583
+#: include/functions.php:2530
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: include/functions.php:2584
+#: include/functions.php:2531
 msgid "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form"
 msgstr ""
 
-#: include/functions.php:2585
+#: include/functions.php:2532
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: include/functions.php:2586
+#: include/functions.php:2533
 #, fuzzy
 msgid "No file was uploaded"
 msgstr "Ни одного файла не загружено."
 
-#: include/functions.php:2587
+#: include/functions.php:2534
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: include/functions.php:2588
+#: include/functions.php:2535
 msgid "Failed to write file to disk."
 msgstr ""
 
-#: include/functions.php:2589
+#: include/functions.php:2536
 msgid "A PHP extension stopped the file upload."
 msgstr ""
 
 #: include/login_form.php:107
-#: classes/handler/public.php:446
-#: classes/handler/public.php:708
+#: classes/handler/public.php:466
+#: classes/handler/public.php:732
 msgid "Login:"
 msgstr "Логин:"
 
 #: include/login_form.php:117
-#: classes/handler/public.php:449
+#: classes/handler/public.php:469
 msgid "Password:"
 msgstr "Пароль:"
 
@@ -795,9 +783,9 @@ msgid "Profile:"
 msgstr "Профиль:"
 
 #: include/login_form.php:133
-#: classes/handler/public.php:252
 #: classes/pref/prefs.php:1037
 #: classes/rpc.php:69
+#: classes/handler/public.php:272
 msgid "Default profile"
 msgstr "Профиль по умолчанию"
 
@@ -814,208 +802,27 @@ msgid "Remember me"
 msgstr "Запомнить меня"
 
 #: include/login_form.php:159
-#: classes/handler/public.php:454
+#: classes/handler/public.php:474
 msgid "Log in"
 msgstr "Войти"
 
-#: include/sessions.php:46
+#: include/sessions.php:45
 msgid "Session failed to validate (schema version changed)"
 msgstr "Ошибка проверки сессии (изменилась версия схемы)"
 
-#: include/sessions.php:62
+#: include/sessions.php:53
+#, fuzzy
+msgid "Session failed to validate (UA changed)."
+msgstr "Ошибка проверки сессии (пароль изменен)"
+
+#: include/sessions.php:67
 msgid "Session failed to validate (password changed)"
 msgstr "Ошибка проверки сессии (пароль изменен)"
 
-#: include/sessions.php:69
+#: include/sessions.php:74
 msgid "Session failed to validate (user not found)"
 msgstr "Ошибка проверки сессии (пользователь не найден)"
 
-#: classes/article.php:26
-msgid "Article not found."
-msgstr "Статья не найдена"
-
-#: classes/article.php:211
-msgid "Tags for this article (separated by commas):"
-msgstr "Теги для этой статьи (разделенные запятыми):"
-
-#: classes/article.php:236
-#: classes/pref/labels.php:82
-#: classes/pref/users.php:103
-#: classes/pref/feeds.php:774
-#: classes/pref/feeds.php:914
-#: classes/pref/filters.php:525
-#: classes/pref/prefs.php:982
-#: plugins/nsfw/init.php:85
-#: plugins/note/init.php:58
-#: plugins/af_readability/init.php:80
-#: plugins/af_redditimgur/init.php:66
-#: plugins/af_psql_trgm/init.php:188
-#: plugins/mail/init.php:65
-#: plugins/af_zz_imgproxy/init.php:238
-msgid "Save"
-msgstr "Сохранить"
-
-#: classes/article.php:238
-#: classes/handler/public.php:423
-#: classes/handler/public.php:457
-#: classes/pref/labels.php:84
-#: classes/pref/users.php:105
-#: classes/pref/feeds.php:775
-#: classes/pref/feeds.php:917
-#: classes/pref/feeds.php:1672
-#: classes/pref/filters.php:528
-#: classes/pref/filters.php:945
-#: classes/pref/filters.php:1022
-#: classes/pref/filters.php:1115
-#: classes/pref/prefs.php:984
-#: classes/feeds.php:1037
-#: classes/feeds.php:1089
-#: classes/feeds.php:1128
-#: plugins/note/init.php:60
-#: plugins/mail/init.php:179
-msgid "Cancel"
-msgstr "Отмена"
-
-#: classes/article.php:337
-#: classes/article.php:720
-#: classes/article.php:875
-msgid "no tags"
-msgstr "нет тегов"
-
-#: classes/article.php:448
-msgid "unknown type"
-msgstr "неизвестный тип"
-
-#: classes/article.php:525
-msgid "Attachments"
-msgstr "Вложения"
-
-#: classes/article.php:626
-#: classes/feeds.php:661
-msgid "comment"
-msgid_plural "comments"
-msgstr[0] "комментарий"
-msgstr[1] "комментария"
-msgstr[2] "комментариев"
-
-#: classes/article.php:630
-#: classes/feeds.php:665
-msgid "comments"
-msgstr "комментарии"
-
-#: classes/article.php:689
-msgid " - "
-msgstr " - "
-
-#: classes/article.php:730
-#: classes/feeds.php:647
-msgid "Edit tags for this article"
-msgstr "Редактировать теги статьи"
-
-#: classes/article.php:763
-#: classes/feeds.php:602
-msgid "Originally from:"
-msgstr "Оригинал:"
-
-#: classes/article.php:774
-#: classes/pref/feeds.php:539
-#: classes/feeds.php:613
-msgid "Feed URL"
-msgstr "URL канала"
-
-#: classes/article.php:811
-#: classes/backend.php:103
-#: classes/dlg.php:33
-#: classes/dlg.php:56
-#: classes/dlg.php:89
-#: classes/dlg.php:154
-#: classes/dlg.php:181
-#: classes/dlg.php:197
-#: classes/pref/feeds.php:1466
-#: classes/pref/feeds.php:1533
-#: classes/pref/filters.php:208
-#: classes/pref/prefs.php:1099
-#: plugins/af_psql_trgm/init.php:109
-#: plugins/import_export/init.php:446
-#: plugins/import_export/init.php:490
-#: plugins/share/init.php:128
-msgid "Close this window"
-msgstr "Закрыть это окно"
-
-#: classes/article.php:913
-msgid "(edit note)"
-msgstr "(править заметку)"
-
-#: classes/opml.php:31
-#: classes/opml.php:36
-msgid "OPML Utility"
-msgstr "Утилита OPML"
-
-#: classes/opml.php:40
-msgid "Importing OPML..."
-msgstr "Импортирую OPML..."
-
-#: classes/opml.php:45
-msgid "Return to preferences"
-msgstr "Вернуться к настройкам"
-
-#: classes/opml.php:301
-#, php-format
-msgid "Adding feed: %s"
-msgstr "Добавляю канал: %s"
-
-#: classes/opml.php:312
-#, php-format
-msgid "Duplicate feed: %s"
-msgstr "Канал уже существует: %s"
-
-#: classes/opml.php:326
-#, php-format
-msgid "Adding label %s"
-msgstr "Добавляю метку %s"
-
-#: classes/opml.php:329
-#, php-format
-msgid "Duplicate label: %s"
-msgstr "Метка уже существует: %s"
-
-#: classes/opml.php:341
-#, php-format
-msgid "Setting preference key %s to %s"
-msgstr "Устанавливаю ключ настроек %s в %s"
-
-#: classes/opml.php:377
-msgid "Adding filter..."
-msgstr "Добавляю фильтр..."
-
-#: classes/opml.php:512
-#, php-format
-msgid "Processing category: %s"
-msgstr "Обрабатываю категорию: %s"
-
-#: classes/opml.php:558
-#, php-format
-msgid "Upload failed with error code %d"
-msgstr "Ошибка загрузки, код ошибки: %d"
-
-#: classes/opml.php:570
-#: plugins/import_export/init.php:471
-msgid "Unable to move uploaded file."
-msgstr "Не могу переместить загруженный файл."
-
-#: classes/opml.php:574
-#: plugins/import_export/init.php:475
-msgid "Error: please upload OPML file."
-msgstr "Ошибка: пожалуйста загрузите OPML файл."
-
-#: classes/opml.php:585
-msgid "Error: unable to find moved OPML file."
-msgstr "Ошибка: не могу найти перемещенный OPML файл."
-
-#: classes/opml.php:594
-msgid "Error while parsing document."
-msgstr "Ошибка при разборе документа."
-
 #: classes/backend.php:31
 msgid "Other interface tips are available in the Tiny Tiny RSS wiki."
 msgstr "Другие советы по использованию доступны в вики проекта  Tiny Tiny RSS."
@@ -1036,167 +843,355 @@ msgstr "Ctrl"
 msgid "Help topic not found."
 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/backend.php:103
+#: classes/pref/filters.php:208
+#: classes/pref/feeds.php:1465
+#: classes/pref/feeds.php:1532
+#: classes/pref/prefs.php:1099
+#: classes/dlg.php:33
+#: classes/dlg.php:56
+#: classes/dlg.php:89
+#: classes/dlg.php:154
+#: classes/dlg.php:181
+#: classes/dlg.php:197
+#: classes/article.php:810
+#: plugins/af_psql_trgm/init.php:109
+#: plugins/import_export/init.php:446
+#: plugins/import_export/init.php:490
+#: plugins/share/init.php:128
+msgid "Close this window"
+msgstr "Закрыть это окно"
 
-#: classes/dlg.php:44
-msgid "Your Public OPML URL is:"
-msgstr "Ссылка на ваш опубликованный OPML:"
+#: classes/feeds.php:53
+msgid "View as RSS feed"
+msgstr "Показать в виде RSS-канала"
 
-#: classes/dlg.php:53
-#: classes/dlg.php:178
-#: plugins/share/init.php:125
-msgid "Generate new URL"
-msgstr "Создать новую ссылку"
+#: classes/feeds.php:54
+#: classes/feeds.php:140
+#: classes/pref/feeds.php:1326
+msgid "View as RSS"
+msgstr "Показать в формате RSS"
 
-#: classes/dlg.php:67
-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 ""
-"Демон обновлений разрешён в вашей конфигурации, но процесс демона не запущен. Он необходим для обновления всех каналов.\n"
-"Пожалуйста, запустите демон обновлений или сообщите администратору."
+#: classes/feeds.php:62
+#, php-format
+msgid "Last updated: %s"
+msgstr "Последнее обновление: %s"
 
-#: classes/dlg.php:71
-#: classes/dlg.php:80
-msgid "Last update:"
-msgstr "Последнее обновление:"
-
-#: classes/dlg.php:76
-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 ""
-"Tiny Tiny RSS определил что демон обновлений не работает уже очень давно.\n"
-"Это обозначает что существует проблема подобная краху или зависанию демона.\n"
-"Пожалуйста проверьте процесс демона или сообщите администратору."
-
-#: classes/dlg.php:169
-msgid "You can view this feed as RSS using the following URL:"
-msgstr "Вы можете использовать данный канал через RSS с помощью следующего URL:"
-
-#: classes/dlg.php:190
-msgid "You are using default tt-rss password. Please change it in the Preferences (Personal data / Authentication)."
-msgstr ""
-
-#: classes/dlg.php:194
+#: classes/feeds.php:100
 #, fuzzy
-msgid "Open Preferences"
-msgstr "Настройки"
+msgid "Select..."
+msgstr "Выбрать"
 
-#: classes/handler/public.php:387
-#: plugins/bookmarklets/init.php:40
-msgid "Share with Tiny Tiny RSS"
-msgstr "Опубликовать с помощью Tiny Tiny RSS"
+#: classes/feeds.php:102
+#: classes/pref/labels.php:273
+#: classes/pref/filters.php:391
+#: classes/pref/filters.php:449
+#: classes/pref/filters.php:795
+#: classes/pref/filters.php:878
+#: classes/pref/filters.php:905
+#: classes/pref/feeds.php:1185
+#: classes/pref/feeds.php:1416
+#: classes/pref/feeds.php:1481
+#: classes/pref/users.php:358
+#: classes/pref/prefs.php:996
+msgid "All"
+msgstr "Все"
 
-#: classes/handler/public.php:395
-msgid "Title:"
-msgstr "Заголовок:"
+#: classes/feeds.php:104
+msgid "Invert"
+msgstr "Инвертировать"
 
-#: classes/handler/public.php:397
-#: classes/pref/feeds.php:537
-msgid "URL:"
-msgstr "URL:"
+#: classes/feeds.php:105
+#: classes/pref/labels.php:275
+#: classes/pref/filters.php:393
+#: classes/pref/filters.php:451
+#: classes/pref/filters.php:797
+#: classes/pref/filters.php:880
+#: classes/pref/filters.php:907
+#: classes/pref/feeds.php:1187
+#: classes/pref/feeds.php:1418
+#: classes/pref/feeds.php:1483
+#: classes/pref/users.php:360
+#: classes/pref/prefs.php:998
+msgid "None"
+msgstr "Ничего"
 
-#: classes/handler/public.php:399
-msgid "Content:"
-msgstr "Содержимое:"
+#: classes/feeds.php:107
+msgid "Selection toggle:"
+msgstr "Переключить выбранное:"
 
-#: classes/handler/public.php:401
-msgid "Labels:"
-msgstr "Метки:"
+#: classes/feeds.php:113
+msgid "Selection:"
+msgstr "Выбрано:"
 
-#: classes/handler/public.php:420
-msgid "Shared article will appear in the Published feed."
-msgstr "Опубликованная статья появится в канале \"Опубликованные\""
+#: classes/feeds.php:116
+msgid "Set score"
+msgstr "Оценить"
 
-#: classes/handler/public.php:422
-msgid "Share"
-msgstr "Опубликовать"
+#: classes/feeds.php:119
+msgid "Archive"
+msgstr "Архивировать"
 
-#: classes/handler/public.php:444
-msgid "Not logged in"
-msgstr "Вход не произведен"
+#: classes/feeds.php:121
+msgid "Move back"
+msgstr "Переместить назад"
 
-#: classes/handler/public.php:504
-msgid "Incorrect username or password"
-msgstr "Некорректное имя пользователя или пароль"
+#: classes/feeds.php:122
+#: classes/pref/filters.php:400
+#: classes/pref/filters.php:458
+#: classes/pref/filters.php:887
+#: classes/pref/filters.php:914
+msgid "Delete"
+msgstr "Удалить"
 
-#: classes/handler/public.php:557
+#: classes/feeds.php:127
+#: classes/feeds.php:132
+#: plugins/mailto/init.php:25
+#: plugins/mail/init.php:76
+msgid "Forward by email"
+msgstr "Отправить по почте"
+
+#: classes/feeds.php:136
+msgid "Feed:"
+msgstr "Канал:"
+
+#: classes/feeds.php:193
+#: classes/feeds.php:802
+msgid "Feed not found."
+msgstr "Канал не найден."
+
+#: classes/feeds.php:255
+msgid "Never"
+msgstr "Никогда"
+
+#: classes/feeds.php:341
 #, php-format
-msgid "Already subscribed to <b>%s</b>."
-msgstr "Канал <b>%s</b> уже подписан."
+msgid "Imported at %s"
+msgstr "Импортировано в %s"
 
-#: classes/handler/public.php:560
+#: classes/feeds.php:391
+#: classes/feeds.php:484
+msgid "mark feed as read"
+msgstr "Отметить канал как прочитанный"
+
+#: classes/feeds.php:540
+msgid "Collapse article"
+msgstr "Свернуть статью"
+
+#: classes/feeds.php:592
+#: classes/article.php:762
+msgid "Originally from:"
+msgstr "Оригинал:"
+
+#: classes/feeds.php:603
+#: classes/pref/feeds.php:538
+#: classes/article.php:773
+msgid "Feed URL"
+msgstr "URL канала"
+
+#: classes/feeds.php:630
+#: classes/article.php:729
+msgid "Edit tags for this article"
+msgstr "Редактировать теги статьи"
+
+#: classes/feeds.php:644
+#: classes/article.php:625
+msgid "comment"
+msgid_plural "comments"
+msgstr[0] "комментарий"
+msgstr[1] "комментария"
+msgstr[2] "комментариев"
+
+#: classes/feeds.php:648
+#: classes/article.php:629
+msgid "comments"
+msgstr "комментарии"
+
+#: classes/feeds.php:686
+msgid "No unread articles found to display."
+msgstr "Не найдено не прочитанных статей"
+
+#: classes/feeds.php:689
+msgid "No updated articles found to display."
+msgstr "Не найдено не прочитанных статей."
+
+#: classes/feeds.php:692
+msgid "No starred articles found to display."
+msgstr "Не найдено отмеченных статей"
+
+#: classes/feeds.php:696
+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:698
+msgid "No articles found to display."
+msgstr "Статей не найдено."
+
+#: classes/feeds.php:714
+#: classes/feeds.php:905
 #, php-format
-msgid "Subscribed to <b>%s</b>."
-msgstr "Добавлена подписка на <b>%s</b>."
+msgid "Feeds last updated at %s"
+msgstr "Последнее обновление в %s"
 
-#: classes/handler/public.php:563
+#: classes/feeds.php:726
+#: classes/feeds.php:917
+msgid "Some feeds have update errors (click for details)"
+msgstr "Некоторые каналы не могут быть обновлены (щёлкните для подробностей)"
+
+#: classes/feeds.php:894
+msgid "No feed selected."
+msgstr "Канал не выбран."
+
+#: classes/feeds.php:958
+#: classes/feeds.php:966
+msgid "Feed or site URL"
+msgstr "Канал или URL сайта"
+
+#: classes/feeds.php:972
+#: classes/pref/feeds.php:559
+#: classes/pref/feeds.php:800
+#: classes/pref/feeds.php:1632
+msgid "Place in category:"
+msgstr "Поместить в категорию:"
+
+#: classes/feeds.php:980
+msgid "Available feeds"
+msgstr "Доступные каналы"
+
+#: classes/feeds.php:992
+#: classes/pref/feeds.php:621
+#: classes/pref/feeds.php:848
+#: classes/pref/users.php:61
+msgid "Authentication"
+msgstr "Авторизация"
+
+#: classes/feeds.php:996
+#: classes/pref/feeds.php:625
+#: classes/pref/feeds.php:852
+#: classes/pref/feeds.php:1646
+#: classes/pref/users.php:403
+msgid "Login"
+msgstr "Пользователь:"
+
+#: classes/feeds.php:1000
+#: classes/pref/feeds.php:631
+#: classes/pref/feeds.php:860
+#: classes/pref/feeds.php:1649
+#: classes/pref/prefs.php:243
+msgid "Password"
+msgstr "Пароль"
+
+#: classes/feeds.php:1011
+#: classes/pref/feeds.php:645
+msgid "This feed requires authentication."
+msgstr "Этот канал требует авторизации."
+
+#: classes/feeds.php:1014
+#: classes/feeds.php:1070
+#: classes/pref/feeds.php:1668
+msgid "Subscribe"
+msgstr "Подписаться"
+
+#: classes/feeds.php:1017
+msgid "More feeds"
+msgstr "Другие каналы"
+
+#: classes/feeds.php:1020
+#: classes/feeds.php:1072
+#: classes/feeds.php:1111
+#: classes/pref/labels.php:84
+#: classes/pref/filters.php:528
+#: classes/pref/filters.php:945
+#: classes/pref/filters.php:1022
+#: classes/pref/filters.php:1115
+#: classes/pref/feeds.php:774
+#: classes/pref/feeds.php:916
+#: classes/pref/feeds.php:1669
+#: classes/pref/users.php:105
+#: classes/pref/prefs.php:984
+#: classes/article.php:238
+#: classes/handler/public.php:443
+#: classes/handler/public.php:477
+#: plugins/mail/init.php:179
+#: plugins/note/init.php:60
+msgid "Cancel"
+msgstr "Отмена"
+
+#: classes/feeds.php:1042
+#: classes/feeds.php:1110
+#: classes/pref/filters.php:788
+#: classes/pref/feeds.php:1178
+#: classes/pref/users.php:345
+#: js/tt-rss.js:152
+msgid "Search"
+msgstr "Поиск"
+
+#: classes/feeds.php:1046
+msgid "Popular feeds"
+msgstr "Популярные каналы"
+
+#: classes/feeds.php:1047
+msgid "Feed archive"
+msgstr "Архив канала"
+
+#: classes/feeds.php:1050
+msgid "limit:"
+msgstr "Ограничение:"
+
+#: classes/feeds.php:1071
+#: classes/pref/labels.php:282
+#: classes/pref/filters.php:518
+#: classes/pref/filters.php:814
+#: classes/pref/feeds.php:751
+#: classes/pref/users.php:369
+msgid "Remove"
+msgstr "Удалить"
+
+#: classes/feeds.php:1084
+msgid "Look for"
+msgstr "Искать"
+
+#: classes/feeds.php:1092
 #, php-format
-msgid "Could not subscribe to <b>%s</b>."
-msgstr "Не могу подписаться на <b>%s</b>."
+msgid "in %s"
+msgstr ""
 
-#: classes/handler/public.php:566
+#: classes/feeds.php:1097
+msgid "Used for word stemming"
+msgstr ""
+
+#: classes/feeds.php:1106
+msgid "Search syntax"
+msgstr "Искать метку"
+
+#: classes/feeds.php:1563
+msgid "Starred articles"
+msgstr "Отмеченные"
+
+#: classes/feeds.php:1565
+msgid "Published articles"
+msgstr "Опубликованные"
+
+#: classes/feeds.php:1567
+msgid "Fresh articles"
+msgstr "Свежие"
+
+#: classes/feeds.php:1571
+msgid "Archived articles"
+msgstr "Архив статей"
+
+#: classes/feeds.php:1573
+msgid "Recently read"
+msgstr "Недавно прочитанные"
+
+#: classes/feeds.php:1694
+msgid "Special"
+msgstr "Особые"
+
+#: classes/feeds.php:1951
 #, php-format
-msgid "No feeds found in <b>%s</b>."
-msgstr "Не найдены каналы в <b>%s</b>."
-
-#: classes/handler/public.php:569
-msgid "Multiple feed URLs found."
-msgstr "Обнаружено несколько URL канала."
-
-#: classes/handler/public.php:573
-#, 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:591
-msgid "Subscribe to selected feed"
-msgstr "Подписаться на выбранные каналы"
-
-#: classes/handler/public.php:618
-msgid "Edit subscription options"
-msgstr "Редактировать опции  подписки"
-
-#: classes/handler/public.php:656
-msgid "Password recovery"
-msgstr "Восстановление пароля"
-
-#: classes/handler/public.php:701
-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:723
-#: classes/pref/users.php:372
-msgid "Reset password"
-msgstr "Сбросить пароль"
-
-#: classes/handler/public.php:733
-msgid "Some of the required form parameters are missing or incorrect."
-msgstr "Некоторые поля формы пусты или некорректно заполнены"
-
-#: classes/handler/public.php:737
-#: classes/handler/public.php:806
-msgid "Go back"
-msgstr "Перейти назад"
-
-#: classes/handler/public.php:775
-msgid "[tt-rss] Password reset request"
-msgstr "[tt-rss] Уведомление о смене пароля"
-
-#: classes/handler/public.php:802
-msgid "Sorry, login and email combination not found."
-msgstr "Извините, комбинация логина и электронного адреса не обнаружена."
-
-#: classes/handler/public.php:824
-msgid "Your access level is insufficient to run this script."
-msgstr "В доступе отказано - недостаточный уровень привилегий."
-
-#: classes/handler/public.php:850
-msgid "Database Updater"
-msgstr "Обновление базы данных"
-
-#: classes/handler/public.php:915
-msgid "Perform updates"
-msgstr "Применить обновления"
+msgid "Search results: %s"
+msgstr "Результаты поиска: %s"
 
 #: classes/pref/labels.php:25
 #: classes/pref/filters.php:377
@@ -1216,201 +1211,196 @@ msgstr "Передний план:"
 msgid "Background:"
 msgstr "Фон:"
 
+#: classes/pref/labels.php:82
+#: classes/pref/filters.php:525
+#: classes/pref/feeds.php:773
+#: classes/pref/feeds.php:913
+#: classes/pref/users.php:103
+#: classes/pref/prefs.php:982
+#: classes/article.php:236
+#: plugins/af_zz_imgproxy/init.php:238
+#: plugins/af_redditimgur/init.php:66
+#: plugins/af_psql_trgm/init.php:188
+#: plugins/af_readability/init.php:80
+#: plugins/nsfw/init.php:85
+#: plugins/mail/init.php:65
+#: plugins/note/init.php:58
+msgid "Save"
+msgstr "Сохранить"
+
 #: classes/pref/labels.php:244
 #, php-format
 msgid "Created label <b>%s</b>"
 msgstr "Добавлена метка <b>%s</b>"
 
 #: classes/pref/labels.php:270
-#: classes/pref/users.php:356
-#: classes/pref/feeds.php:1183
-#: classes/pref/feeds.php:1414
-#: classes/pref/feeds.php:1479
 #: classes/pref/filters.php:388
 #: classes/pref/filters.php:446
 #: classes/pref/filters.php:792
 #: classes/pref/filters.php:875
 #: classes/pref/filters.php:902
+#: classes/pref/feeds.php:1182
+#: classes/pref/feeds.php:1413
+#: classes/pref/feeds.php:1478
+#: classes/pref/users.php:355
 #: classes/pref/prefs.php:993
 msgid "Select"
 msgstr "Выбрать"
 
-#: classes/pref/labels.php:273
-#: classes/pref/users.php:359
-#: classes/pref/feeds.php:1186
-#: classes/pref/feeds.php:1417
-#: classes/pref/feeds.php:1482
-#: classes/pref/filters.php:391
-#: classes/pref/filters.php:449
-#: classes/pref/filters.php:795
-#: classes/pref/filters.php:878
-#: classes/pref/filters.php:905
-#: classes/pref/prefs.php:996
-#: classes/feeds.php:102
-msgid "All"
-msgstr "Все"
-
-#: classes/pref/labels.php:275
-#: classes/pref/users.php:361
-#: classes/pref/feeds.php:1188
-#: classes/pref/feeds.php:1419
-#: classes/pref/feeds.php:1484
-#: classes/pref/filters.php:393
-#: classes/pref/filters.php:451
-#: classes/pref/filters.php:797
-#: classes/pref/filters.php:880
-#: classes/pref/filters.php:907
-#: classes/pref/prefs.php:998
-#: classes/feeds.php:105
-msgid "None"
-msgstr "Ничего"
-
-#: classes/pref/labels.php:282
-#: classes/pref/users.php:370
-#: classes/pref/feeds.php:752
-#: classes/pref/filters.php:518
-#: classes/pref/filters.php:814
-#: classes/feeds.php:1088
-msgid "Remove"
-msgstr "Удалить"
-
 #: classes/pref/labels.php:285
 msgid "Clear colors"
 msgstr "Очистить цвета"
 
-#: classes/pref/users.php:6
-#: classes/pref/system.php:8
-msgid "Your access level is insufficient to open this tab."
-msgstr "Вашего уровня доступа недостаточно для открытия этой вкладки."
-
-#: classes/pref/users.php:26
+#: classes/pref/filters.php:155
 #, fuzzy
-msgid "Edit user"
-msgstr "Редактировать правило"
+msgid "Preview article"
+msgstr "Отфильтровать статью"
 
-#: classes/pref/users.php:61
-#: classes/pref/feeds.php:622
-#: classes/pref/feeds.php:849
-#: classes/feeds.php:1009
-msgid "Authentication"
-msgstr "Авторизация"
+#: classes/pref/filters.php:267
+#: classes/pref/filters.php:573
+msgid "(inverse)"
+msgstr "(Инвертирован)"
 
-#: classes/pref/users.php:64
-msgid "Access level: "
-msgstr "Уровень доступа:"
-
-#: classes/pref/users.php:82
-#: classes/pref/feeds.php:648
-#: classes/pref/feeds.php:867
-msgid "Options"
-msgstr "Опции:"
-
-#: classes/pref/users.php:96
-#: js/prefs.js:479
-msgid "User details"
-msgstr "Подробнее..."
-
-#: classes/pref/users.php:136
-#: classes/pref/users.php:407
-msgid "Registered"
-msgstr "Зарегистрирован"
-
-#: classes/pref/users.php:137
-msgid "Last logged in"
-msgstr "Последний вход"
-
-#: classes/pref/users.php:145
-msgid "Subscribed feeds count"
-msgstr "Количество подписанных каналов"
-
-#: classes/pref/users.php:146
-#, fuzzy
-msgid "Stored articles"
-msgstr "Отмеченные"
-
-#: classes/pref/users.php:150
-#: classes/pref/users.php:406
-msgid "Subscribed feeds"
-msgstr "Подписан на каналы"
-
-#: classes/pref/users.php:176
-msgid "User not found"
-msgstr "Пользователь не найден"
-
-#: classes/pref/users.php:246
+#: classes/pref/filters.php:263
+#: classes/pref/filters.php:572
 #, php-format
-msgid "Added user <b>%s</b> with password <b>%s</b>"
-msgstr "Добавлен пользователь <b>%s</b> с паролем <b>%s</b>"
+msgid "%s on %s in %s %s"
+msgstr "%s на %s в %s %s"
 
-#: classes/pref/users.php:253
-#, php-format
-msgid "Could not create user <b>%s</b>"
-msgstr "Не могу добавить пользователя <b>%s</b>"
+#: classes/pref/filters.php:383
+#: classes/pref/filters.php:870
+#: classes/pref/filters.php:977
+msgid "Match"
+msgstr "Искать"
 
-#: classes/pref/users.php:257
-#, php-format
-msgid "User <b>%s</b> already exists."
-msgstr "Пользователь <b>%s</b> уже существует."
+#: classes/pref/filters.php:397
+#: classes/pref/filters.php:455
+#: classes/pref/filters.php:884
+#: classes/pref/filters.php:911
+msgid "Add"
+msgstr "Добавить"
 
-#: classes/pref/users.php:285
-#, php-format
-msgid "Changed password of user <b>%s</b> to <b>%s</b>"
-msgstr "Пароль пользователя <b>%s</b> изменен на <b>%s</b>"
+#: classes/pref/filters.php:441
+#: classes/pref/filters.php:897
+msgid "Apply actions"
+msgstr "Применить действия"
 
-#: classes/pref/users.php:287
-#, php-format
-msgid "Sending new password of user <b>%s</b> to <b>%s</b>"
-msgstr "Пароль пользователя <b>%s</b> изменен на <b>%s</b>"
+#: classes/pref/filters.php:492
+#: classes/pref/filters.php:926
+msgid "Enabled"
+msgstr "Включен"
 
-#: classes/pref/users.php:311
-msgid "[tt-rss] Password change notification"
-msgstr "[tt-rss] Уведомление о смене пароля"
+#: classes/pref/filters.php:501
+#: classes/pref/filters.php:929
+msgid "Match any rule"
+msgstr "Удовлетворяет любому правилу"
 
-#: classes/pref/users.php:346
-#: classes/pref/feeds.php:1179
-#: classes/pref/filters.php:788
-#: classes/feeds.php:1059
-#: classes/feeds.php:1127
-#: js/tt-rss.js:165
-msgid "Search"
-msgstr "Поиск"
+#: classes/pref/filters.php:510
+#: classes/pref/filters.php:932
+msgid "Inverse matching"
+msgstr "Инвертировать фильтр"
 
-#: classes/pref/users.php:364
-msgid "Create user"
-msgstr "Добавить пользователя"
+#: classes/pref/filters.php:522
+#: classes/pref/filters.php:939
+msgid "Test"
+msgstr "Проверить"
+
+#: classes/pref/filters.php:804
+msgid "Combine"
+msgstr "Комбинировать"
 
-#: classes/pref/users.php:368
 #: classes/pref/filters.php:807
+#: classes/pref/users.php:367
 msgid "Edit"
 msgstr "Редактировать"
 
-#: classes/pref/users.php:404
-#: classes/pref/feeds.php:626
-#: classes/pref/feeds.php:853
-#: classes/pref/feeds.php:1649
-#: classes/feeds.php:1013
-msgid "Login"
-msgstr "Пользователь:"
+#: classes/pref/filters.php:810
+#: classes/pref/feeds.php:1198
+#: classes/pref/feeds.php:1212
+msgid "Reset sort order"
+msgstr "Сбросить сортировку"
 
-#: classes/pref/users.php:405
-msgid "Access Level"
-msgstr "Уровень доступа:"
+#: classes/pref/filters.php:942
+msgid "Create"
+msgstr "Создать"
 
-#: classes/pref/users.php:408
-msgid "Last login"
-msgstr "Последний вход"
+#: classes/pref/filters.php:987
+msgid "Regular expression, without outer delimiters (i.e. slashes)"
+msgstr ""
 
-#: classes/pref/users.php:427
-msgid "Click to edit"
-msgstr "Щёлкните для редактирования"
+#: classes/pref/filters.php:993
+msgid "Inverse regular expression matching"
+msgstr "Инвертировать совпадение с регулярным выражением"
 
-#: classes/pref/users.php:447
-msgid "No users defined."
-msgstr "Пользователи не определены."
+#: classes/pref/filters.php:995
+msgid "on field"
+msgstr "по полю:"
 
-#: classes/pref/users.php:449
-msgid "No matching users found."
-msgstr "Подходящих пользователей не найдено."
+#: classes/pref/filters.php:1001
+#: js/PrefFilterTree.js:44
+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:764
+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:786
+msgid "Add action"
+msgstr "Добавить действие"
+
+#: classes/pref/filters.php:1139
+msgid "[No caption]"
+msgstr "[Нет заголовка]"
+
+#: classes/pref/filters.php:1141
+#, 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:1155
+#, fuzzy
+msgid "matches any rule"
+msgstr "Удовлетворяет любому правилу"
+
+#: classes/pref/filters.php:1158
+#, 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/system.php:8
+#: classes/pref/users.php:6
+msgid "Your access level is insufficient to open this tab."
+msgstr "Вашего уровня доступа недостаточно для открытия этой вкладки."
 
 #: classes/pref/system.php:29
 msgid "Error Log"
@@ -1456,387 +1446,316 @@ msgstr[0] "(%d канал)"
 msgstr[1] "(%d канала)"
 msgstr[2] "(%d каналов)"
 
-#: classes/pref/feeds.php:514
+#: classes/pref/feeds.php:513
 #: classes/pref/prefs.php:18
 msgid "General"
 msgstr "Общие"
 
-#: classes/pref/feeds.php:528
+#: classes/pref/feeds.php:527
 msgid "Feed Title"
 msgstr "Заголовок"
 
-#: classes/pref/feeds.php:560
-#: classes/pref/feeds.php:801
-#: classes/pref/feeds.php:1635
-#: classes/feeds.php:989
-msgid "Place in category:"
-msgstr "Поместить в категорию:"
+#: classes/pref/feeds.php:536
+#: classes/handler/public.php:417
+msgid "URL:"
+msgstr "URL:"
 
-#: classes/pref/feeds.php:572
+#: classes/pref/feeds.php:571
 #, fuzzy
 msgid "Site URL:"
 msgstr "Сайт:"
 
-#: classes/pref/feeds.php:574
+#: classes/pref/feeds.php:573
 #, fuzzy
 msgid "Site URL"
 msgstr "URL канала"
 
-#: classes/pref/feeds.php:585
-#: classes/pref/feeds.php:815
+#: classes/pref/feeds.php:584
+#: classes/pref/feeds.php:814
 #, fuzzy
 msgid "Language:"
 msgstr "Язык"
 
-#: classes/pref/feeds.php:592
-#: classes/pref/feeds.php:824
+#: classes/pref/feeds.php:591
+#: classes/pref/feeds.php:823
 msgid "Update"
 msgstr "Обновить"
 
-#: classes/pref/feeds.php:607
-#: classes/pref/feeds.php:840
+#: classes/pref/feeds.php:606
+#: classes/pref/feeds.php:839
 msgid "Article purging:"
 msgstr "Удаление сообщений:"
 
-#: classes/pref/feeds.php:632
-#: classes/pref/feeds.php:861
-#: classes/pref/feeds.php:1652
-#: classes/pref/prefs.php:243
-#: classes/feeds.php:1017
-msgid "Password"
-msgstr "Пароль"
-
-#: classes/pref/feeds.php:636
+#: classes/pref/feeds.php:635
 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:646
-#: classes/feeds.php:1028
-msgid "This feed requires authentication."
-msgstr "Этот канал требует авторизации."
+#: classes/pref/feeds.php:647
+#: classes/pref/feeds.php:866
+#: classes/pref/users.php:82
+msgid "Options"
+msgstr "Опции:"
 
-#: classes/pref/feeds.php:662
-#: classes/pref/feeds.php:871
+#: classes/pref/feeds.php:661
+#: classes/pref/feeds.php:870
 msgid "Hide from Popular feeds"
 msgstr "Спрятать из списка популярных каналов"
 
-#: classes/pref/feeds.php:674
-#: classes/pref/feeds.php:877
+#: classes/pref/feeds.php:673
+#: classes/pref/feeds.php:876
 msgid "Include in e-mail digest"
 msgstr "Включить в e-mail дайджест"
 
-#: classes/pref/feeds.php:687
-#: classes/pref/feeds.php:883
+#: classes/pref/feeds.php:686
+#: classes/pref/feeds.php:882
 msgid "Always display image attachments"
 msgstr "Всегда показывать вложенные изображения"
 
-#: classes/pref/feeds.php:700
-#: classes/pref/feeds.php:891
+#: classes/pref/feeds.php:699
+#: classes/pref/feeds.php:890
 #, fuzzy
 msgid "Do not embed media"
 msgstr "Не показывать изображения"
 
-#: classes/pref/feeds.php:713
-#: classes/pref/feeds.php:899
+#: classes/pref/feeds.php:712
+#: classes/pref/feeds.php:898
 msgid "Cache media"
 msgstr ""
 
-#: classes/pref/feeds.php:725
-#: classes/pref/feeds.php:905
+#: classes/pref/feeds.php:724
+#: classes/pref/feeds.php:904
 msgid "Mark updated articles as unread"
 msgstr "Отметить обновлённые статьи как непрочитанные"
 
-#: classes/pref/feeds.php:729
+#: classes/pref/feeds.php:728
 msgid "Icon"
 msgstr "Иконка"
 
-#: classes/pref/feeds.php:743
-#: classes/pref/feeds.php:1284
+#: classes/pref/feeds.php:742
+#: classes/pref/feeds.php:1283
 #: plugins/import_export/init.php:71
 #, fuzzy
 msgid "Choose file..."
 msgstr "Создать фильтр..."
 
-#: classes/pref/feeds.php:750
+#: classes/pref/feeds.php:749
 msgid "Replace"
 msgstr "Заменить"
 
-#: classes/pref/feeds.php:757
+#: classes/pref/feeds.php:756
 #: classes/pref/prefs.php:679
 msgid "Plugins"
 msgstr "Плагины"
 
-#: classes/pref/feeds.php:1154
+#: classes/pref/feeds.php:1153
 msgid "Feeds with errors"
 msgstr "Каналы с ошибками"
 
-#: classes/pref/feeds.php:1161
+#: classes/pref/feeds.php:1160
 msgid "Inactive feeds"
 msgstr "Неактивные каналы"
 
-#: classes/pref/feeds.php:1197
+#: classes/pref/feeds.php:1196
 msgid "Edit selected feeds"
 msgstr "Редактировать выбранные каналы"
 
-#: classes/pref/feeds.php:1199
-#: classes/pref/feeds.php:1213
-#: classes/pref/filters.php:810
-msgid "Reset sort order"
-msgstr "Сбросить сортировку"
-
-#: classes/pref/feeds.php:1201
-#: js/prefs.js:1462
+#: classes/pref/feeds.php:1200
+#: js/prefs.js:1171
 msgid "Batch subscribe"
 msgstr "Массовая подписка"
 
-#: classes/pref/feeds.php:1208
+#: classes/pref/feeds.php:1207
 msgid "Categories"
 msgstr "Категории"
 
-#: classes/pref/feeds.php:1211
+#: classes/pref/feeds.php:1210
 msgid "Add category"
 msgstr "Добавить категорию"
 
-#: classes/pref/feeds.php:1215
+#: classes/pref/feeds.php:1214
 msgid "Remove selected"
 msgstr "Удалить выбранное"
 
-#: classes/pref/feeds.php:1272
+#: classes/pref/feeds.php:1271
 msgid "OPML"
 msgstr "OPML"
 
-#: classes/pref/feeds.php:1274
+#: classes/pref/feeds.php:1273
 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:1275
+#: classes/pref/feeds.php:1274
 msgid "Only main settings profile can be migrated using OPML."
 msgstr "Только главный профиль настроек будет экспортирован в OPML."
 
-#: classes/pref/feeds.php:1290
+#: classes/pref/feeds.php:1289
 msgid "Import my OPML"
 msgstr "Импортировать мой OPML"
 
-#: classes/pref/feeds.php:1296
+#: classes/pref/feeds.php:1295
 msgid "Filename:"
 msgstr "Имя файла:"
 
-#: classes/pref/feeds.php:1298
+#: classes/pref/feeds.php:1297
 msgid "Include settings"
 msgstr "Включить настройки"
 
-#: classes/pref/feeds.php:1302
+#: classes/pref/feeds.php:1301
 msgid "Export OPML"
 msgstr "Экспортировать OPML"
 
-#: classes/pref/feeds.php:1306
+#: classes/pref/feeds.php:1305
 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:1310
+#: classes/pref/feeds.php:1309
 msgid "Public OPML URL"
 msgstr "Публичная ссылка на OPML"
 
-#: classes/pref/feeds.php:1311
+#: classes/pref/feeds.php:1310
 msgid "Display published OPML URL"
 msgstr "Отобразить публичный OPML URL"
 
-#: classes/pref/feeds.php:1318
+#: classes/pref/feeds.php:1317
 msgid "Published & shared articles / Generated feeds"
 msgstr "Опубликованные & общие каналы / Автоматически созданные каналы"
 
-#: classes/pref/feeds.php:1320
+#: classes/pref/feeds.php:1319
 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:1327
-#: classes/feeds.php:54
-#: classes/feeds.php:140
-msgid "View as RSS"
-msgstr "Показать в формате RSS"
-
-#: classes/pref/feeds.php:1328
 msgid "Display URL"
 msgstr "Показать URL"
 
-#: classes/pref/feeds.php:1331
+#: classes/pref/feeds.php:1330
 msgid "Clear all generated URLs"
 msgstr "Очистить все созданные URL"
 
-#: classes/pref/feeds.php:1410
+#: classes/pref/feeds.php:1409
 msgid "These feeds have not been updated with new content for 3 months (oldest first):"
 msgstr "Эти каналы не были обновлены в течение трех месяцев:"
 
-#: classes/pref/feeds.php:1444
-#: classes/pref/feeds.php:1509
+#: classes/pref/feeds.php:1443
+#: classes/pref/feeds.php:1508
 msgid "Click to edit feed"
 msgstr "Щёлкните для редактирования"
 
-#: classes/pref/feeds.php:1462
-#: classes/pref/feeds.php:1529
+#: classes/pref/feeds.php:1461
+#: classes/pref/feeds.php:1528
 msgid "Unsubscribe from selected feeds"
 msgstr "Отписаться от выбранных каналов?"
 
-#: classes/pref/feeds.php:1632
+#: classes/pref/feeds.php:1629
 msgid "Add one valid RSS feed per line (no feed detection is done)"
 msgstr "Впишите по одному действительному RSS каналу на строчку (валидность канала не проверяется)"
 
-#: classes/pref/feeds.php:1641
+#: classes/pref/feeds.php:1638
 msgid "Feeds to subscribe, One per line"
 msgstr "Каналы для подписки. По одному на строчку"
 
-#: classes/pref/feeds.php:1664
+#: classes/pref/feeds.php:1661
 msgid "Feeds require authentication."
 msgstr "Каналы требуют авторизацию."
 
-#: classes/pref/feeds.php:1671
-#: classes/feeds.php:1031
-#: classes/feeds.php:1087
-msgid "Subscribe"
-msgstr "Подписаться"
-
-#: classes/pref/filters.php:155
+#: classes/pref/users.php:26
 #, fuzzy
-msgid "Preview article"
-msgstr "Отфильтровать статью"
+msgid "Edit user"
+msgstr "Редактировать правило"
 
-#: classes/pref/filters.php:267
-#: classes/pref/filters.php:573
-msgid "(inverse)"
-msgstr "(Инвертирован)"
+#: classes/pref/users.php:64
+msgid "Access level: "
+msgstr "Уровень доступа:"
 
-#: classes/pref/filters.php:263
-#: classes/pref/filters.php:572
-#, php-format
-msgid "%s on %s in %s %s"
-msgstr "%s на %s в %s %s"
+#: classes/pref/users.php:96
+#: js/prefs.js:403
+msgid "User details"
+msgstr "Подробнее..."
 
-#: classes/pref/filters.php:383
-#: classes/pref/filters.php:870
-#: classes/pref/filters.php:977
-msgid "Match"
-msgstr "Искать"
+#: classes/pref/users.php:136
+#: classes/pref/users.php:406
+msgid "Registered"
+msgstr "Зарегистрирован"
 
-#: classes/pref/filters.php:397
-#: classes/pref/filters.php:455
-#: classes/pref/filters.php:884
-#: classes/pref/filters.php:911
-msgid "Add"
-msgstr "Добавить"
+#: classes/pref/users.php:137
+msgid "Last logged in"
+msgstr "Последний вход"
 
-#: classes/pref/filters.php:400
-#: classes/pref/filters.php:458
-#: classes/pref/filters.php:887
-#: classes/pref/filters.php:914
-#: classes/feeds.php:122
-msgid "Delete"
-msgstr "Удалить"
+#: classes/pref/users.php:145
+msgid "Subscribed feeds count"
+msgstr "Количество подписанных каналов"
 
-#: classes/pref/filters.php:441
-#: classes/pref/filters.php:897
-msgid "Apply actions"
-msgstr "Применить действия"
-
-#: classes/pref/filters.php:492
-#: classes/pref/filters.php:926
-msgid "Enabled"
-msgstr "Включен"
-
-#: classes/pref/filters.php:501
-#: classes/pref/filters.php:929
-msgid "Match any rule"
-msgstr "Удовлетворяет любому правилу"
-
-#: classes/pref/filters.php:510
-#: classes/pref/filters.php:932
-msgid "Inverse matching"
-msgstr "Инвертировать фильтр"
-
-#: classes/pref/filters.php:522
-#: classes/pref/filters.php:939
-msgid "Test"
-msgstr "Проверить"
-
-#: classes/pref/filters.php:804
-msgid "Combine"
-msgstr "Комбинировать"
-
-#: classes/pref/filters.php:942
-msgid "Create"
-msgstr "Создать"
-
-#: classes/pref/filters.php:987
-msgid "Regular expression, without outer delimiters (i.e. slashes)"
-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:43
-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:797
-msgid "Add rule"
-msgstr "Добавить правило..."
-
-#: classes/pref/filters.php:1042
-msgid "Perform Action"
-msgstr "Выполнить действия"
-
-#: classes/pref/filters.php:1093
+#: classes/pref/users.php:146
 #, fuzzy
-msgid "No actions available"
-msgstr "Доступная новая версия!"
+msgid "Stored articles"
+msgstr "Отмеченные"
 
-#: classes/pref/filters.php:1112
-msgid "Save action"
-msgstr "Сохранить действие"
+#: classes/pref/users.php:150
+#: classes/pref/users.php:405
+msgid "Subscribed feeds"
+msgstr "Подписан на каналы"
 
-#: classes/pref/filters.php:1112
-#: js/functions.js:819
-msgid "Add action"
-msgstr "Добавить действие"
+#: classes/pref/users.php:176
+msgid "User not found"
+msgstr "Пользователь не найден"
 
-#: classes/pref/filters.php:1139
-msgid "[No caption]"
-msgstr "[Нет заголовка]"
-
-#: classes/pref/filters.php:1141
+#: classes/pref/users.php:246
 #, php-format
-msgid "%s (%d rule)"
-msgid_plural "%s (%d rules)"
-msgstr[0] "%s (%d метка)"
-msgstr[1] "%s (%d метки)"
-msgstr[2] "%s (%d меток)"
+msgid "Added user <b>%s</b> with password <b>%s</b>"
+msgstr "Добавлен пользователь <b>%s</b> с паролем <b>%s</b>"
 
-#: classes/pref/filters.php:1155
-#, fuzzy
-msgid "matches any rule"
-msgstr "Удовлетворяет любому правилу"
-
-#: classes/pref/filters.php:1158
+#: classes/pref/users.php:253
 #, php-format
-msgid "%s (+%d action)"
-msgid_plural "%s (+%d actions)"
-msgstr[0] "%s (+%d действие)"
-msgstr[1] "%s (+%d действия)"
-msgstr[2] "%s (+%d действий)"
+msgid "Could not create user <b>%s</b>"
+msgstr "Не могу добавить пользователя <b>%s</b>"
+
+#: classes/pref/users.php:257
+#, php-format
+msgid "User <b>%s</b> already exists."
+msgstr "Пользователь <b>%s</b> уже существует."
+
+#: classes/pref/users.php:285
+#, 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:287
+#, 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:310
+msgid "[tt-rss] Password change notification"
+msgstr "[tt-rss] Уведомление о смене пароля"
+
+#: classes/pref/users.php:363
+msgid "Create user"
+msgstr "Добавить пользователя"
+
+#: classes/pref/users.php:371
+#: classes/handler/public.php:747
+msgid "Reset password"
+msgstr "Сбросить пароль"
+
+#: classes/pref/users.php:404
+msgid "Access Level"
+msgstr "Уровень доступа:"
+
+#: classes/pref/users.php:407
+msgid "Last login"
+msgstr "Последний вход"
+
+#: classes/pref/users.php:426
+msgid "Click to edit"
+msgstr "Щёлкните для редактирования"
+
+#: classes/pref/users.php:446
+msgid "No users defined."
+msgstr "Пользователи не определены."
+
+#: classes/pref/users.php:448
+msgid "No matching users found."
+msgstr "Подходящих пользователей не найдено."
 
 #: classes/pref/prefs.php:19
 msgid "Interface"
@@ -2012,7 +1931,7 @@ msgid "Strip all but most common HTML tags when reading articles."
 msgstr "Вырезать все, кроме основных HTML тегов при показе статей."
 
 #: classes/pref/prefs.php:53
-#: js/prefs.js:1424
+#: js/prefs.js:1136
 msgid "Customize stylesheet"
 msgstr "Изменить пользовательские стили"
 
@@ -2255,254 +2174,303 @@ msgstr "Удалить выбранные профили?"
 msgid "Activate profile"
 msgstr "Активировать профиль"
 
-#: classes/feeds.php:53
-msgid "View as RSS feed"
-msgstr "Показать в виде RSS-канала"
+#: 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/feeds.php:62
-#, php-format
-msgid "Last updated: %s"
-msgstr "Последнее обновление: %s"
+#: classes/dlg.php:44
+msgid "Your Public OPML URL is:"
+msgstr "Ссылка на ваш опубликованный OPML:"
 
-#: classes/feeds.php:100
+#: classes/dlg.php:53
+#: classes/dlg.php:178
+#: plugins/share/init.php:125
+msgid "Generate new URL"
+msgstr "Создать новую ссылку"
+
+#: classes/dlg.php:67
+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 ""
+"Демон обновлений разрешён в вашей конфигурации, но процесс демона не запущен. Он необходим для обновления всех каналов.\n"
+"Пожалуйста, запустите демон обновлений или сообщите администратору."
+
+#: classes/dlg.php:71
+#: classes/dlg.php:80
+msgid "Last update:"
+msgstr "Последнее обновление:"
+
+#: classes/dlg.php:76
+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 ""
+"Tiny Tiny RSS определил что демон обновлений не работает уже очень давно.\n"
+"Это обозначает что существует проблема подобная краху или зависанию демона.\n"
+"Пожалуйста проверьте процесс демона или сообщите администратору."
+
+#: classes/dlg.php:169
+msgid "You can view this feed as RSS using the following URL:"
+msgstr "Вы можете использовать данный канал через RSS с помощью следующего URL:"
+
+#: classes/dlg.php:190
+msgid "You are using default tt-rss password. Please change it in the Preferences (Personal data / Authentication)."
+msgstr ""
+
+#: classes/dlg.php:194
 #, fuzzy
-msgid "Select..."
-msgstr "Выбрать"
+msgid "Open Preferences"
+msgstr "Настройки"
 
-#: classes/feeds.php:104
-msgid "Invert"
-msgstr "Инвертировать"
+#: classes/opml.php:31
+#: classes/opml.php:36
+msgid "OPML Utility"
+msgstr "Утилита OPML"
 
-#: classes/feeds.php:107
-msgid "Selection toggle:"
-msgstr "Переключить выбранное:"
+#: classes/opml.php:40
+msgid "Importing OPML..."
+msgstr "Импортирую OPML..."
 
-#: classes/feeds.php:113
-msgid "Selection:"
-msgstr "Выбрано:"
+#: classes/opml.php:45
+msgid "Return to preferences"
+msgstr "Вернуться к настройкам"
 
-#: classes/feeds.php:116
-msgid "Set score"
-msgstr "Оценить"
-
-#: classes/feeds.php:119
-msgid "Archive"
-msgstr "Архивировать"
-
-#: classes/feeds.php:121
-msgid "Move back"
-msgstr "Переместить назад"
-
-#: classes/feeds.php:127
-#: classes/feeds.php:132
-#: plugins/mail/init.php:76
-#: plugins/mailto/init.php:25
-msgid "Forward by email"
-msgstr "Отправить по почте"
-
-#: classes/feeds.php:136
-msgid "Feed:"
-msgstr "Канал:"
-
-#: classes/feeds.php:193
-#: classes/feeds.php:819
-msgid "Feed not found."
-msgstr "Канал не найден."
-
-#: classes/feeds.php:255
-msgid "Never"
-msgstr "Никогда"
-
-#: classes/feeds.php:342
+#: classes/opml.php:301
 #, php-format
-msgid "Imported at %s"
-msgstr "Импортировано в %s"
+msgid "Adding feed: %s"
+msgstr "Добавляю канал: %s"
 
-#: classes/feeds.php:394
-#: classes/feeds.php:487
-msgid "mark feed as read"
-msgstr "Отметить канал как прочитанный"
-
-#: classes/feeds.php:542
-msgid "Collapse article"
-msgstr "Свернуть статью"
-
-#: classes/feeds.php:703
-msgid "No unread articles found to display."
-msgstr "Не найдено не прочитанных статей"
-
-#: classes/feeds.php:706
-msgid "No updated articles found to display."
-msgstr "Не найдено не прочитанных статей."
-
-#: classes/feeds.php:709
-msgid "No starred articles found to display."
-msgstr "Не найдено отмеченных статей"
-
-#: classes/feeds.php:713
-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:715
-msgid "No articles found to display."
-msgstr "Статей не найдено."
-
-#: classes/feeds.php:731
-#: classes/feeds.php:922
+#: classes/opml.php:312
 #, php-format
-msgid "Feeds last updated at %s"
-msgstr "Последнее обновление в %s"
+msgid "Duplicate feed: %s"
+msgstr "Канал уже существует: %s"
 
-#: classes/feeds.php:743
-#: classes/feeds.php:934
-msgid "Some feeds have update errors (click for details)"
-msgstr "Некоторые каналы не могут быть обновлены (щёлкните для подробностей)"
-
-#: classes/feeds.php:911
-msgid "No feed selected."
-msgstr "Канал не выбран."
-
-#: classes/feeds.php:975
-#: classes/feeds.php:983
-msgid "Feed or site URL"
-msgstr "Канал или URL сайта"
-
-#: classes/feeds.php:997
-msgid "Available feeds"
-msgstr "Доступные каналы"
-
-#: classes/feeds.php:1034
-msgid "More feeds"
-msgstr "Другие каналы"
-
-#: classes/feeds.php:1063
-msgid "Popular feeds"
-msgstr "Популярные каналы"
-
-#: classes/feeds.php:1064
-msgid "Feed archive"
-msgstr "Архив канала"
-
-#: classes/feeds.php:1067
-msgid "limit:"
-msgstr "Ограничение:"
-
-#: classes/feeds.php:1101
-msgid "Look for"
-msgstr "Искать"
-
-#: classes/feeds.php:1109
+#: classes/opml.php:326
 #, php-format
-msgid "in %s"
+msgid "Adding label %s"
+msgstr "Добавляю метку %s"
+
+#: classes/opml.php:329
+#, php-format
+msgid "Duplicate label: %s"
+msgstr "Метка уже существует: %s"
+
+#: classes/opml.php:341
+#, php-format
+msgid "Setting preference key %s to %s"
+msgstr "Устанавливаю ключ настроек %s в %s"
+
+#: classes/opml.php:377
+msgid "Adding filter..."
+msgstr "Добавляю фильтр..."
+
+#: classes/opml.php:512
+#, php-format
+msgid "Processing category: %s"
+msgstr "Обрабатываю категорию: %s"
+
+#: classes/opml.php:558
+#, php-format
+msgid "Upload failed with error code %d"
+msgstr "Ошибка загрузки, код ошибки: %d"
+
+#: classes/opml.php:570
+#: plugins/import_export/init.php:471
+msgid "Unable to move uploaded file."
+msgstr "Не могу переместить загруженный файл."
+
+#: classes/opml.php:574
+#: plugins/import_export/init.php:475
+msgid "Error: please upload OPML file."
+msgstr "Ошибка: пожалуйста загрузите OPML файл."
+
+#: classes/opml.php:585
+msgid "Error: unable to find moved OPML file."
+msgstr "Ошибка: не могу найти перемещенный OPML файл."
+
+#: classes/opml.php:594
+msgid "Error while parsing document."
+msgstr "Ошибка при разборе документа."
+
+#: classes/article.php:26
+msgid "Article not found."
+msgstr "Статья не найдена"
+
+#: classes/article.php:211
+msgid "Tags for this article (separated by commas):"
+msgstr "Теги для этой статьи (разделенные запятыми):"
+
+#: classes/article.php:337
+#: classes/article.php:719
+#: classes/article.php:874
+msgid "no tags"
+msgstr "нет тегов"
+
+#: classes/article.php:447
+msgid "unknown type"
+msgstr "неизвестный тип"
+
+#: classes/article.php:524
+msgid "Attachments"
+msgstr "Вложения"
+
+#: classes/article.php:688
+msgid " - "
+msgstr " - "
+
+#: classes/article.php:912
+msgid "(edit note)"
+msgstr "(править заметку)"
+
+#: classes/handler/public.php:407
+#: plugins/bookmarklets/init.php:40
+msgid "Share with Tiny Tiny RSS"
+msgstr "Опубликовать с помощью Tiny Tiny RSS"
+
+#: classes/handler/public.php:415
+msgid "Title:"
+msgstr "Заголовок:"
+
+#: classes/handler/public.php:419
+msgid "Content:"
+msgstr "Содержимое:"
+
+#: classes/handler/public.php:421
+msgid "Labels:"
+msgstr "Метки:"
+
+#: classes/handler/public.php:440
+msgid "Shared article will appear in the Published feed."
+msgstr "Опубликованная статья появится в канале \"Опубликованные\""
+
+#: classes/handler/public.php:442
+msgid "Share"
+msgstr "Опубликовать"
+
+#: classes/handler/public.php:464
+msgid "Not logged in"
+msgstr "Вход не произведен"
+
+#: classes/handler/public.php:527
+msgid "Incorrect username or password"
+msgstr "Некорректное имя пользователя или пароль"
+
+#: classes/handler/public.php:581
+#, php-format
+msgid "Already subscribed to <b>%s</b>."
+msgstr "Канал <b>%s</b> уже подписан."
+
+#: classes/handler/public.php:584
+#, php-format
+msgid "Subscribed to <b>%s</b>."
+msgstr "Добавлена подписка на <b>%s</b>."
+
+#: classes/handler/public.php:587
+#, php-format
+msgid "Could not subscribe to <b>%s</b>."
+msgstr "Не могу подписаться на <b>%s</b>."
+
+#: classes/handler/public.php:590
+#, php-format
+msgid "No feeds found in <b>%s</b>."
+msgstr "Не найдены каналы в <b>%s</b>."
+
+#: classes/handler/public.php:593
+msgid "Multiple feed URLs found."
+msgstr "Обнаружено несколько URL канала."
+
+#: classes/handler/public.php:597
+#, 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:615
+msgid "Subscribe to selected feed"
+msgstr "Подписаться на выбранные каналы"
+
+#: classes/handler/public.php:642
+msgid "Edit subscription options"
+msgstr "Редактировать опции  подписки"
+
+#: classes/handler/public.php:680
+msgid "Password recovery"
+msgstr "Восстановление пароля"
+
+#: classes/handler/public.php:725
+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:757
+msgid "Some of the required form parameters are missing or incorrect."
+msgstr "Некоторые поля формы пусты или некорректно заполнены"
+
+#: classes/handler/public.php:761
+#: classes/handler/public.php:830
+msgid "Go back"
+msgstr "Перейти назад"
+
+#: classes/handler/public.php:799
+msgid "[tt-rss] Password reset request"
+msgstr "[tt-rss] Уведомление о смене пароля"
+
+#: classes/handler/public.php:826
+msgid "Sorry, login and email combination not found."
+msgstr "Извините, комбинация логина и электронного адреса не обнаружена."
+
+#: classes/handler/public.php:848
+msgid "Your access level is insufficient to run this script."
+msgstr "В доступе отказано - недостаточный уровень привилегий."
+
+#: classes/handler/public.php:874
+msgid "Database Updater"
+msgstr "Обновление базы данных"
+
+#: classes/handler/public.php:939
+msgid "Perform updates"
+msgstr "Применить обновления"
+
+#: plugins/af_zz_imgproxy/init.php:208
+msgid "Image proxy settings (af_zz_imgproxy)"
 msgstr ""
 
-#: classes/feeds.php:1114
-msgid "Used for word stemming"
-msgstr ""
+#: plugins/af_zz_imgproxy/init.php:232
+#, fuzzy
+msgid "Enable proxy for all remote images."
+msgstr "Обновить все каналы"
 
-#: classes/feeds.php:1123
-msgid "Search syntax"
-msgstr "Искать метку"
+#: plugins/af_zz_imgproxy/init.php:236
+#, fuzzy
+msgid "Don't cache files locally."
+msgstr "Кэшировать изображения локально"
 
-#: classes/feeds.php:1577
-msgid "Starred articles"
-msgstr "Отмеченные"
-
-#: classes/feeds.php:1579
-msgid "Published articles"
-msgstr "Опубликованные"
-
-#: classes/feeds.php:1581
-msgid "Fresh articles"
-msgstr "Свежие"
-
-#: classes/feeds.php:1585
-msgid "Archived articles"
-msgstr "Архив статей"
-
-#: classes/feeds.php:1587
-msgid "Recently read"
-msgstr "Недавно прочитанные"
-
-#: classes/feeds.php:1708
-msgid "Special"
-msgstr "Особые"
-
-#: classes/feeds.php:1965
-#, php-format
-msgid "Search results: %s"
-msgstr "Результаты поиска: %s"
-
-#: 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."
+#: plugins/af_zz_imgproxy/init.php:252
+#: plugins/af_redditimgur/init.php:79
+#, fuzzy
+msgid "Configuration saved"
 msgstr "Конфигурация сохранена."
 
-#: plugins/note/init.php:28
-#: plugins/note/note.js:11
-msgid "Edit article note"
-msgstr "Редактировать заметку"
-
 #: plugins/vf_shared/init.php:17
 #: plugins/vf_shared/init.php:73
 msgid "Shared articles"
 msgstr "Общие статьи"
 
-#: plugins/auth_internal/init.php:67
-msgid "Please enter your one time password:"
-msgstr "Пожалуйста, введите Ваш одноразовый пароль:"
+#: plugins/bookmarklets/init.php:20
+msgid "Bookmarklets"
+msgstr "Букмарклеты"
 
-#: plugins/auth_internal/init.php:208
-msgid "Password has been changed."
-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/auth_internal/init.php:210
-msgid "Old password is incorrect."
-msgstr "Старый пароль неправилен."
+#: plugins/bookmarklets/init.php:26
+#, php-format
+msgid "Subscribe to %s in Tiny Tiny RSS?"
+msgstr "Подписаться на %s в Tiny Tiny RSS?"
 
-#: plugins/af_readability/init.php:25
-msgid "Data saved."
-msgstr ""
+#: plugins/bookmarklets/init.php:31
+msgid "Subscribe in Tiny Tiny RSS"
+msgstr "Подписаться в Tiny Tiny RSS"
 
-#: plugins/af_readability/init.php:41
-#, fuzzy
-msgid "Inline content"
-msgstr "Прокрутить содержимое статьи"
-
-#: plugins/af_readability/init.php:47
-msgid "Readability settings (af_readability)"
-msgstr ""
-
-#: plugins/af_readability/init.php:78
-msgid "Use Readability for pages shared via bookmarklet."
-msgstr ""
-
-#: plugins/af_readability/init.php:90
-#: plugins/af_psql_trgm/init.php:198
-msgid "Currently enabled for (click to edit):"
-msgstr ""
-
-#: plugins/af_readability/init.php:107
-#, fuzzy
-msgid "Readability"
-msgstr "Проверить доступность"
-
-#: plugins/af_readability/init.php:118
-#, fuzzy
-msgid "Inline article content"
-msgstr "Прокрутить содержимое статьи"
+#: plugins/bookmarklets/init.php:34
+msgid "Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS"
+msgstr "Используйте этот букмарклет для опубликования отдельных страниц с помощью Tiny Tiny RSS"
 
 #: plugins/af_redditimgur/init.php:30
 msgid "Reddit content settings (af_redditimgur)"
@@ -2516,11 +2484,21 @@ msgstr ""
 msgid "Enable additional duplicate checking"
 msgstr ""
 
-#: plugins/af_redditimgur/init.php:79
-#: plugins/af_zz_imgproxy/init.php:252
-#, fuzzy
-msgid "Configuration saved"
-msgstr "Конфигурация сохранена."
+#: plugins/af_comics/init.php:49
+msgid "Feeds supported by af_comics"
+msgstr ""
+
+#: plugins/af_comics/init.php:51
+msgid "The following comics are currently supported:"
+msgstr ""
+
+#: plugins/af_comics/init.php:69
+msgid "To subscribe to GoComics use the comic's regular web page as the feed URL (e.g. for the <em>Garfield</em> comic use <code>http://www.gocomics.com/garfield</code>)."
+msgstr ""
+
+#: plugins/af_comics/init.php:71
+msgid "Drop any updated filters into <code>filters.local</code> in plugin directory."
+msgstr ""
 
 #: plugins/af_psql_trgm/init.php:29
 #, php-format
@@ -2557,25 +2535,86 @@ msgstr ""
 msgid "Enable for all feeds:"
 msgstr "Обновить все каналы"
 
+#: plugins/af_psql_trgm/init.php:198
+#: plugins/af_readability/init.php:90
+msgid "Currently enabled for (click to edit):"
+msgstr ""
+
 #: plugins/af_psql_trgm/init.php:216
 msgid "Similarity (pg_trgm)"
 msgstr ""
 
-#: plugins/af_comics/init.php:49
-msgid "Feeds supported by af_comics"
+#: plugins/af_readability/init.php:25
+msgid "Data saved."
 msgstr ""
 
-#: plugins/af_comics/init.php:51
-msgid "The following comics are currently supported:"
+#: plugins/af_readability/init.php:41
+#, fuzzy
+msgid "Inline content"
+msgstr "Прокрутить содержимое статьи"
+
+#: plugins/af_readability/init.php:47
+msgid "Readability settings (af_readability)"
 msgstr ""
 
-#: plugins/af_comics/init.php:69
-msgid "To subscribe to GoComics use the comic's regular web page as the feed URL (e.g. for the <em>Garfield</em> comic use <code>http://www.gocomics.com/garfield</code>)."
+#: plugins/af_readability/init.php:78
+msgid "Use Readability for pages shared via bookmarklet."
 msgstr ""
 
-#: plugins/af_comics/init.php:71
-msgid "Drop any updated filters into <code>filters.local</code> in plugin directory."
-msgstr ""
+#: plugins/af_readability/init.php:107
+#, fuzzy
+msgid "Readability"
+msgstr "Проверить доступность"
+
+#: plugins/af_readability/init.php:118
+#, fuzzy
+msgid "Inline article content"
+msgstr "Прокрутить содержимое статьи"
+
+#: plugins/mailto/init.php:50
+#: plugins/mailto/init.php:58
+#: plugins/mail/init.php:118
+#: plugins/mail/init.php:124
+msgid "[Forwarded]"
+msgstr "[Переслано]"
+
+#: plugins/mailto/init.php:50
+#: plugins/mail/init.php:118
+msgid "Multiple articles"
+msgstr "Все статьи"
+
+#: plugins/mailto/init.php:74
+msgid "Clicking the following link to invoke your mail client:"
+msgstr "Кликните по следующей ссылке, чтоб запустить Ваш почтовый клиент:"
+
+#: plugins/mailto/init.php:78
+msgid "Forward selected article(s) by email."
+msgstr "Переслать выбранные статьи по электронной почте"
+
+#: plugins/mailto/init.php:81
+msgid "You should be able to edit the message before sending in your mail client."
+msgstr "Вы сможете отредактировать сообщение перед посылкой в почтовом клиенте."
+
+#: plugins/mailto/init.php:86
+msgid "Close this dialog"
+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/import_export/init.php:53
 msgid "Import and export"
@@ -2646,101 +2685,6 @@ msgstr "Ошибка загрузки, код ошибки: %d"
 msgid "No file uploaded."
 msgstr "Ни одного файла не загружено."
 
-#: plugins/mail/init.php:29
-msgid "Mail addresses saved."
-msgstr ""
-
-#: plugins/mail/init.php:35
-msgid "Mail plugin"
-msgstr "Почтовый плагин"
-
-#: plugins/mail/init.php:37
-msgid "You can set predefined email addressed here (comma-separated list):"
-msgstr ""
-
-#: plugins/mail/init.php:118
-#: plugins/mail/init.php:124
-#: plugins/mailto/init.php:50
-#: plugins/mailto/init.php:58
-msgid "[Forwarded]"
-msgstr "[Переслано]"
-
-#: plugins/mail/init.php:118
-#: plugins/mailto/init.php:50
-msgid "Multiple articles"
-msgstr "Все статьи"
-
-#: plugins/mail/init.php:146
-msgid "To:"
-msgstr "Кому:"
-
-#: plugins/mail/init.php:161
-msgid "Subject:"
-msgstr "Заголовок:"
-
-#: plugins/mail/init.php:178
-msgid "Send e-mail"
-msgstr "Отправить письмо"
-
-#: plugins/close_button/init.php:25
-msgid "Close article"
-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 "Подписаться на %s в Tiny Tiny RSS?"
-
-#: 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 "Используйте этот букмарклет для опубликования отдельных страниц с помощью Tiny Tiny RSS"
-
-#: plugins/toggle_sidebar/init.php:23
-msgid "Collapse feedlist"
-msgstr "Свернуть список каналов"
-
-#: plugins/af_zz_imgproxy/init.php:208
-msgid "Image proxy settings (af_zz_imgproxy)"
-msgstr ""
-
-#: plugins/af_zz_imgproxy/init.php:232
-#, fuzzy
-msgid "Enable proxy for all remote images."
-msgstr "Обновить все каналы"
-
-#: plugins/af_zz_imgproxy/init.php:236
-#, fuzzy
-msgid "Don't cache files locally."
-msgstr "Кэшировать изображения локально"
-
-#: plugins/mailto/init.php:74
-msgid "Clicking the following link to invoke your mail client:"
-msgstr "Кликните по следующей ссылке, чтоб запустить Ваш почтовый клиент:"
-
-#: plugins/mailto/init.php:78
-msgid "Forward selected article(s) by email."
-msgstr "Переслать выбранные статьи по электронной почте"
-
-#: plugins/mailto/init.php:81
-msgid "You should be able to edit the message before sending in your mail client."
-msgstr "Вы сможете отредактировать сообщение перед посылкой в почтовом клиенте."
-
-#: plugins/mailto/init.php:86
-msgid "Close this dialog"
-msgstr "Закрыть это окно"
-
 #: plugins/share/init.php:41
 msgid "You can disable all articles shared by unique URLs here."
 msgstr "Здесь Вы можете отключить все статьи в общем доступе через уникальные URL."
@@ -2761,356 +2705,481 @@ msgstr "Вы можете опубликовать данную статью с
 msgid "Unshare article"
 msgstr "Убрать статью из общего доступа"
 
-#: js/FeedTree.js:75
+#: plugins/toggle_sidebar/init.php:23
+msgid "Collapse feedlist"
+msgstr "Свернуть список каналов"
+
+#: plugins/close_button/init.php:25
+msgid "Close article"
+msgstr "Закрыть статью"
+
+#: plugins/mail/init.php:29
+msgid "Mail addresses saved."
+msgstr ""
+
+#: plugins/mail/init.php:35
+msgid "Mail plugin"
+msgstr "Почтовый плагин"
+
+#: plugins/mail/init.php:37
+msgid "You can set predefined email addressed here (comma-separated list):"
+msgstr ""
+
+#: plugins/mail/init.php:146
+msgid "To:"
+msgstr "Кому:"
+
+#: plugins/mail/init.php:161
+msgid "Subject:"
+msgstr "Заголовок:"
+
+#: plugins/mail/init.php:178
+msgid "Send e-mail"
+msgstr "Отправить письмо"
+
+#: plugins/note/init.php:28
+#: plugins/note/note.js:11
+msgid "Edit article note"
+msgstr "Редактировать заметку"
+
+#: plugins/auth_internal/init.php:67
+msgid "Please enter your one time password:"
+msgstr "Пожалуйста, введите Ваш одноразовый пароль:"
+
+#: plugins/auth_internal/init.php:208
+msgid "Password has been changed."
+msgstr "Пароль был изменен."
+
+#: plugins/auth_internal/init.php:210
+msgid "Old password is incorrect."
+msgstr "Старый пароль неправилен."
+
+#: js/FeedTree.js:76
 #, fuzzy
 msgid "(Un)collapse"
 msgstr "Свернуть/развернуть боковую панель"
 
-#: js/PrefFeedTree.js:35
+#: js/PrefFeedTree.js:36
 msgid "Edit category"
 msgstr "Редактировать категорию"
 
-#: js/PrefFeedTree.js:42
+#: js/PrefFeedTree.js:43
 msgid "Remove category"
 msgstr "Удалить категорию"
 
-#: js/PrefFilterTree.js:46
+#: js/PrefFilterTree.js:47
 msgid "Inverse"
 msgstr "(Инвертировать)"
 
-#: js/feedlist.js:511
+#: js/feedlist.js:461
 #, fuzzy
 msgid "Mark %w in %s older than 1 day as read?"
 msgstr "Отметить все статьи в %s старше 1 дня как прочитанные?"
 
-#: js/feedlist.js:514
+#: js/feedlist.js:464
 #, fuzzy
 msgid "Mark %w in %s older than 1 week as read?"
 msgstr "Отметить все статьи в %s старше 1 недели как прочитанные?"
 
-#: js/feedlist.js:517
+#: js/feedlist.js:467
 #, fuzzy
 msgid "Mark %w in %s older than 2 weeks as read?"
 msgstr "Отметить все статьи в %s старше 2 недель как прочитанные?"
 
-#: js/feedlist.js:520
+#: js/feedlist.js:470
 #, fuzzy
 msgid "Mark %w in %s as read?"
 msgstr "Отметить все статьи в %s как прочитанные?"
 
-#: js/feedlist.js:523
+#: js/feedlist.js:473
 #, fuzzy
 msgid "search results"
 msgstr "Результаты поиска"
 
-#: js/feedlist.js:523
+#: js/feedlist.js:473
 #, fuzzy
 msgid "all articles"
 msgstr "Все статьи"
 
-#: js/functions.js:74
+#: js/functions.js:100
 msgid "Close"
 msgstr ""
 
-#: js/functions.js:141
+#: js/functions.js:167
 msgid "Click to close"
 msgstr "Нажмите, чтобы закрыть"
 
-#: js/functions.js:448
+#: js/functions.js:456
 msgid "Error explained"
 msgstr "Ошибка разъяснена"
 
-#: js/functions.js:592
+#: js/functions.js:490
+msgid "Upload complete."
+msgstr "Загрузка завершена"
+
+#: js/functions.js:508
+msgid "Remove stored feed icon?"
+msgstr "Удалить сохраненную иконку канала?"
+
+#: js/functions.js:510
+msgid "Removing feed icon..."
+msgstr "Удаляется иконка канала..."
+
+#: js/functions.js:515
+msgid "Feed icon removed."
+msgstr "Иконка канала удалена."
+
+#: js/functions.js:532
+msgid "Please select an image file to upload."
+msgstr "Пожалуйста, выберите файл с изображением для загрузки."
+
+#: js/functions.js:533
+msgid "Upload new icon for this feed?"
+msgstr "Загрузить новую иконку для канала?"
+
+#: js/functions.js:534
+msgid "Uploading, please wait..."
+msgstr "Идет загрузка, пожалуйста подождите..."
+
+#: js/functions.js:542
+msgid "Please enter label caption:"
+msgstr "Пожалуйста, введите заголовок метки:"
+
+#: js/functions.js:575
 msgid "Subscribe to Feed"
 msgstr "Подписаться на канал"
 
-#: js/functions.js:621
+#: js/functions.js:602
 msgid "Failed to parse output. This can indicate server timeout and/or network issues. Backend output was logged to browser console."
 msgstr ""
 
-#: js/functions.js:636
+#: js/functions.js:617
 #, perl-format
 msgid "Subscribed to %s"
 msgstr "Подписаны на %s"
 
-#: js/functions.js:641
+#: js/functions.js:622
 msgid "Specified URL seems to be invalid."
 msgstr "Указанный URL выглядит неправильно."
 
-#: js/functions.js:644
+#: js/functions.js:625
 msgid "Specified URL doesn't seem to contain any feeds."
 msgstr "Указанный URL не содержит каналов."
 
-#: js/functions.js:656
+#: js/functions.js:637
 msgid "Expand to select feed"
 msgstr "Развернуть к выбранному каналу"
 
-#: js/functions.js:668
+#: js/functions.js:649
 #, perl-format
 msgid "Couldn't download the specified URL: %s"
 msgstr "Не могу загрузить указанный URL: %s"
 
-#: js/functions.js:672
+#: js/functions.js:653
 #, perl-format
 msgid "XML validation failed: %s"
 msgstr "Проверка XML прошла неудачно: %s"
 
-#: js/functions.js:676
+#: js/functions.js:657
 msgid "You are already subscribed to this feed."
 msgstr "Вы уже подписаны на этот канал."
 
-#: js/functions.js:1136
+#: js/functions.js:1098
 msgid "Generate new syndication address for this feed?"
 msgstr "Создать новый адрес распространения для этого канала?"
 
-#: js/functions.js:1140
-#: js/prefs.js:1095
+#: js/functions.js:1100
+#: js/prefs.js:870
 msgid "Trying to change address..."
 msgstr "Попытка изменить адрес.."
 
-#: js/functions.js:1245
-#: js/tt-rss.js:446
-#: js/tt-rss.js:673
+#: js/functions.js:1199
+#: js/tt-rss.js:399
+#: js/tt-rss.js:612
 msgid "You can't edit this kind of feed."
 msgstr "Вы не можете редактировать этот канал."
 
-#: js/functions.js:1260
+#: js/functions.js:1213
 msgid "Edit Feed"
 msgstr "Редактировать канал"
 
-#: js/functions.js:1266
-#: js/prefs.js:100
-#: js/prefs.js:209
-#: js/prefs.js:647
+#: js/functions.js:1217
+#: js/prefs.js:176
+#: js/prefs.js:523
+#: js/prefs.js:1139
+#: js/prefs.js:78
 msgid "Saving data..."
 msgstr "Идёт сохранение..."
 
-#: js/functions.js:1293
+#: js/functions.js:1243
 msgid "More Feeds"
 msgstr "Больше каналов"
 
-#: js/functions.js:1355
-#: js/functions.js:1464
-#: js/prefs.js:398
-#: js/prefs.js:540
-#: js/prefs.js:558
-#: js/prefs.js:1077
+#: js/functions.js:1297
+#: js/functions.js:1383
+#: js/prefs.js:332
+#: js/prefs.js:455
+#: js/prefs.js:473
+#: js/prefs.js:855
 msgid "No feeds are selected."
 msgstr "Нет выбранных каналов."
 
-#: js/functions.js:1398
+#: js/functions.js:1329
 msgid "Remove selected feeds from the archive? Feeds with stored articles will not be removed."
 msgstr "Удалить выбранные каналы из архива? Каналы с сохраненным статьями удалены не будут."
 
-#: js/functions.js:1435
+#: js/functions.js:1360
 msgid "Feeds with update errors"
 msgstr "Канала с ошибками обновления"
 
-#: js/functions.js:1446
-#: js/prefs.js:1058
+#: js/functions.js:1369
+#: js/prefs.js:841
 msgid "Remove selected feeds?"
 msgstr "Удалить выбранные каналы?"
 
-#: js/functions.js:1449
-#: js/prefs.js:1061
+#: js/functions.js:1370
+#: js/prefs.js:842
 msgid "Removing selected feeds..."
 msgstr "Выбранные каналы удаляются..."
 
-#: js/prefs.js:60
-msgid "Please enter login:"
-msgstr "Пожалуйста, введите логин:"
-
-#: js/prefs.js:67
-msgid "Can't create user: no login specified."
-msgstr "Не могу добавить пользователя: не указан логин."
-
-#: js/prefs.js:71
-msgid "Adding user..."
-msgstr "Пользователь добавляется..."
-
-#: js/prefs.js:96
-msgid "User Editor"
-msgstr "Редактор пользователей"
-
-#: js/prefs.js:131
-msgid "Edit Filter"
-msgstr "Редактировать фильтр"
-
-#: js/prefs.js:170
+#: js/prefs.js:143
 msgid "Remove filter?"
 msgstr "Удалить фильтр?"
 
-#: js/prefs.js:175
+#: js/prefs.js:148
 msgid "Removing filter..."
 msgstr "Удаление фильтра..."
 
-#: js/prefs.js:292
+#: js/prefs.js:251
 msgid "Remove selected labels?"
 msgstr "Удалить выбранные метки?"
 
-#: js/prefs.js:295
+#: js/prefs.js:252
 msgid "Removing selected labels..."
 msgstr "Выбранные метки удаляются..."
 
-#: js/prefs.js:308
-#: js/prefs.js:1144
+#: js/prefs.js:262
+#: js/prefs.js:909
 msgid "No labels are selected."
 msgstr "Нет выбранных меток."
 
-#: js/prefs.js:320
+#: js/prefs.js:274
 msgid "Remove selected users? Neither default admin nor your account will be removed."
 msgstr "Удалить выбранных пользователей? Ни администратор по умолчанию, ни Ваш аккаунт не могут быть удалены."
 
-#: js/prefs.js:323
+#: js/prefs.js:275
 msgid "Removing selected users..."
 msgstr "Выбранные пользователи удаляются..."
 
-#: js/prefs.js:338
-#: js/prefs.js:408
-#: js/prefs.js:427
-#: js/prefs.js:461
+#: js/prefs.js:286
+#: js/prefs.js:342
+#: js/prefs.js:361
+#: js/prefs.js:387
 msgid "No users are selected."
 msgstr "Нет выбранных пользователей."
 
-#: js/prefs.js:350
+#: js/prefs.js:297
 msgid "Remove selected filters?"
 msgstr "Удалить выбранные фильтры?"
 
-#: js/prefs.js:353
+#: js/prefs.js:298
 msgid "Removing selected filters..."
 msgstr "Выбранные фильтры удаляются..."
 
-#: js/prefs.js:366
-#: js/prefs.js:495
-#: js/prefs.js:514
+#: js/prefs.js:308
+#: js/prefs.js:419
+#: js/prefs.js:438
 msgid "No filters are selected."
 msgstr "Нет выбранных фильтров."
 
-#: js/prefs.js:378
+#: js/prefs.js:319
 msgid "Unsubscribe from selected feeds?"
 msgstr "Отписаться от выбранных каналов?"
 
-#: js/prefs.js:382
+#: js/prefs.js:321
 msgid "Unsubscribing from selected feeds..."
 msgstr "Выбранные каналы удаляются..."
 
-#: js/prefs.js:413
-#: js/prefs.js:432
-#: js/prefs.js:466
+#: js/prefs.js:347
+#: js/prefs.js:366
+#: js/prefs.js:392
 msgid "Please select only one user."
 msgstr "Пожалуйста выберите только одного пользователя."
 
-#: js/prefs.js:436
+#: js/prefs.js:370
 msgid "Reset password of selected user?"
 msgstr "Сбросить пароль выбранного пользователя?"
 
-#: js/prefs.js:439
+#: js/prefs.js:371
 msgid "Resetting password for selected user..."
 msgstr "Пароль пользователя сбрасывается..."
 
-#: js/prefs.js:500
+#: js/prefs.js:424
 msgid "Please select only one filter."
 msgstr "Пожалуйста выберите только один фильтр."
 
-#: js/prefs.js:518
+#: js/prefs.js:442
 msgid "Combine selected filters?"
 msgstr "Комбинировать выбранные фильтры?"
 
-#: js/prefs.js:521
+#: js/prefs.js:443
 msgid "Joining filters..."
 msgstr "Объединение фильтров..."
 
-#: js/prefs.js:580
+#: js/prefs.js:487
 msgid "Edit Multiple Feeds"
 msgstr "Редактировать несколько каналов"
 
-#: js/prefs.js:604
+#: js/prefs.js:511
 msgid "Save changes to selected feeds?"
 msgstr "Сохранить изменения выбранных каналов?"
 
-#: js/prefs.js:681
+#: js/prefs.js:552
 msgid "OPML Import"
 msgstr "Импорт OPML"
 
-#: js/prefs.js:700
+#: js/prefs.js:571
 msgid "Please choose an OPML file first."
 msgstr "Пожалуйста выберите файл OPML."
 
-#: js/prefs.js:703
+#: js/prefs.js:574
 #: plugins/import_export/import_export.js:115
 msgid "Importing, please wait..."
 msgstr "Идет импорт, пожалуйста, подождите..."
 
-#: js/prefs.js:869
+#: js/prefs.js:737
 msgid "Reset to defaults?"
 msgstr "Сбросить настройки?"
 
-#: js/prefs.js:1468
-msgid "Subscribing to feeds..."
-msgstr "Подписываюсь на каналы..."
+#: js/prefs.js:777
+#, perl-format
+msgid "Remove category %s? Any nested feeds would be placed into Uncategorized."
+msgstr "Удалите категорию %s? Все вложенные каналы будут помещены в \"Без категории\"."
 
-#: js/prefs.js:1487
-msgid "Clear stored data for this plugin?"
-msgstr "Удалить сохраненные данные для этого плагина?"
+#: js/prefs.js:778
+msgid "Removing category..."
+msgstr "Удаляю категорию..."
 
-#: js/prefs.js:1501
-msgid "Clear all messages in the error log?"
-msgstr "Удалить все сообщения в логе ошибок?"
+#: js/prefs.js:794
+msgid "Remove selected categories?"
+msgstr "Удалить выбранные категории?"
 
-#: js/tt-rss.js:118
+#: js/prefs.js:795
+msgid "Removing selected categories..."
+msgstr "Выбранные категории удаляются..."
+
+#: js/prefs.js:805
+msgid "No categories are selected."
+msgstr "Нет выбранных категорий."
+
+#: js/prefs.js:812
+msgid "Category title:"
+msgstr "Название категории:"
+
+#: js/prefs.js:815
+msgid "Creating category..."
+msgstr "Создаю категорию..."
+
+#: js/prefs.js:832
+msgid "Feeds without recent updates"
+msgstr "Давно не обновлявшиеся каналы"
+
+#: js/prefs.js:869
+msgid "Replace current OPML publishing address with a new one?"
+msgstr "Изменить текущий адрес публикации OPML на новый?"
+
+#: js/prefs.js:898
+msgid "Reset selected labels to default colors?"
+msgstr "Сбросить текущие метки на цвета по умолчанию?"
+
+#: js/prefs.js:926
+msgid "Settings Profiles"
+msgstr "Профили настроек"
+
+#: js/prefs.js:935
+msgid "Remove selected profiles? Active and default profiles will not be removed."
+msgstr "Удалить выбранные профили? Активный и профиль по умолчанию удалены не будут."
+
+#: js/prefs.js:936
+msgid "Removing selected profiles..."
+msgstr "Выбранные профили удаляются..."
+
+#: js/prefs.js:948
+msgid "No profiles are selected."
+msgstr "Профиль не выбран"
+
+#: js/prefs.js:955
+#: js/prefs.js:997
+msgid "Activate selected profile?"
+msgstr "Активировать выбранный профиль?"
+
+#: js/prefs.js:964
+#: js/prefs.js:1008
+msgid "Please choose a profile to activate."
+msgstr "Пожалуйста выберите какой-нибудь профиль."
+
+#: js/prefs.js:969
+msgid "Creating profile..."
+msgstr "Создаю профиль..."
+
+#: js/prefs.js:1016
+msgid "This will invalidate all previously generated feed URLs. Continue?"
+msgstr "Это сделает недействительными все ранее созданные URL канала. Продолжить?"
+
+#: js/prefs.js:1017
+#: plugins/share/share_prefs.js:3
+msgid "Clearing URLs..."
+msgstr "Очистка URL..."
+
+#: js/prefs.js:1020
+msgid "Generated URLs cleared."
+msgstr "Созданные URL очищены."
+
+#: js/prefs.js:1053
+#, fuzzy
+msgid "Rename category to:"
+msgstr "Удалить категорию"
+
+#: js/prefs.js:1074
+msgid "Label Editor"
+msgstr "Редактор Меток"
+
+#: js/tt-rss.js:111
 msgid "Mark all articles as read?"
 msgstr "Пометить все статьи как прочитанные?"
 
-#: js/tt-rss.js:124
+#: js/tt-rss.js:115
 msgid "Marking all feeds as read..."
 msgstr "Помечаю все каналы как прочитанные..."
 
-#: js/tt-rss.js:398
+#: js/tt-rss.js:351
 msgid "Please enable mail plugin first."
 msgstr "Пожалуйста, сначала включите плагин mail."
 
-#: js/tt-rss.js:527
+#: js/tt-rss.js:477
 msgid "Please enable embed_original plugin first."
 msgstr "Пожалуйста, сначала включите плагин embed_original."
 
-#: js/tt-rss.js:540
-#: js/tt-rss.js:723
+#: js/tt-rss.js:490
+#: js/tt-rss.js:653
 msgid "Widescreen is not available in combined mode."
 msgstr ""
 
-#: js/tt-rss.js:821
-msgid "You can't rescore this kind of feed."
-msgstr "Вы не можете снова оценить этот канал."
-
-#: js/tt-rss.js:826
-#: js/tt-rss.js:686
-msgid "Please select some feed first."
-msgstr "Пожалуйста выберите какой-нибудь канал."
-
-#: js/tt-rss.js:831
-#, perl-format
-msgid "Rescore articles in %s?"
-msgstr "Установить оценку статьям в %s?"
-
-#: js/tt-rss.js:834
-msgid "Rescoring articles..."
-msgstr "Переоценка статей..."
-
-#: js/viewfeed.js:917
-#: js/viewfeed.js:955
-#: js/viewfeed.js:1003
-#: js/viewfeed.js:1924
-#: plugins/mail/mail.js:7
+#: js/viewfeed.js:444
+#: js/viewfeed.js:461
+#: js/viewfeed.js:484
+#: js/viewfeed.js:521
+#: js/viewfeed.js:542
+#: js/viewfeed.js:651
+#: js/viewfeed.js:685
+#: js/viewfeed.js:727
+#: js/viewfeed.js:1564
 #: plugins/mailto/init.js:7
-#: js/viewfeed.js:675
-#: js/viewfeed.js:697
-#: js/viewfeed.js:718
-#: js/viewfeed.js:777
-#: js/viewfeed.js:805
+#: plugins/mail/mail.js:7
 msgid "No articles are selected."
 msgstr "Нет выбранных статей."
 
-#: js/viewfeed.js:925
+#: js/viewfeed.js:659
 #, perl-format
 msgid "Delete %d selected article in %s?"
 msgid_plural "Delete %d selected articles in %s?"
@@ -3118,7 +3187,7 @@ msgstr[0] "Удалить %d выбранную статью в %s?"
 msgstr[1] "Удалить %d выбранных статьи(ей) в %s?"
 msgstr[2] "Удалить %d выбранных статьи(ей) в %s?"
 
-#: js/viewfeed.js:927
+#: js/viewfeed.js:661
 #, perl-format
 msgid "Delete %d selected article?"
 msgid_plural "Delete %d selected articles?"
@@ -3126,7 +3195,7 @@ msgstr[0] "Удалить %d выбранную статью?"
 msgstr[1] "Удалить %d выбранных статьи(ей)?"
 msgstr[2] "Удалить %d выбранных статьи(ей)?"
 
-#: js/viewfeed.js:964
+#: js/viewfeed.js:694
 #, perl-format
 msgid "Archive %d selected article in %s?"
 msgid_plural "Archive %d selected articles in %s?"
@@ -3134,7 +3203,7 @@ msgstr[0] "Архивировать %d выбранную статью в %s?"
 msgstr[1] "Архивировать %d выбранных статьи(ей) в %s?"
 msgstr[2] "Архивировать %d выбранных статьи(ей) в %s?"
 
-#: js/viewfeed.js:967
+#: js/viewfeed.js:697
 #, perl-format
 msgid "Move %d archived article back?"
 msgid_plural "Move %d archived articles back?"
@@ -3142,11 +3211,11 @@ msgstr[0] "Переместить %d архивированную статью 
 msgstr[1] "Переместить %d архивированных статьи(ей) назад?"
 msgstr[2] "Переместить %d архивированных статьи(ей) назад?"
 
-#: js/viewfeed.js:969
+#: js/viewfeed.js:698
 msgid "Please note that unstarred articles might get purged on next feed update."
 msgstr "Пожалуйста, учтите, что не отмеченные звездочкой статьи могут быть удалены при следующем обновлении каналов"
 
-#: js/viewfeed.js:1009
+#: js/viewfeed.js:733
 #, perl-format
 msgid "Mark %d selected article in %s as read?"
 msgid_plural "Mark %d selected articles in %s as read?"
@@ -3154,62 +3223,87 @@ msgstr[0] "Отметить %d выбранную статью в %s как пр
 msgstr[1] "Отметить %d выбранных(ые) статьи(ей) в %s как прочитанные?"
 msgstr[2] "Отметить %d выбранных(ые) статьи(ей) в %s как прочитанные?"
 
-#: js/viewfeed.js:1029
+#: js/viewfeed.js:753
 msgid "Edit article Tags"
 msgstr "Редактировать теги"
 
-#: js/viewfeed.js:1035
+#: js/viewfeed.js:757
 msgid "Saving article tags..."
 msgstr "Сохранить теги статьи..."
 
-#: js/viewfeed.js:1666
+#: js/viewfeed.js:1015
+msgid "No article is selected."
+msgstr "Статья не выбрана"
+
+#: js/viewfeed.js:1050
+msgid "No articles found to mark"
+msgstr "Статей для отметки не найдено."
+
+#: js/viewfeed.js:1052
+#, perl-format
+msgid "Mark %d article as read?"
+msgid_plural "Mark %d articles as read?"
+msgstr[0] "Отметить %d статью как прочитанную?"
+msgstr[1] "Отметить %d статьи(ей) как прочитанные?"
+msgstr[2] "Отметить %d статьи(ей) как прочитанные?"
+
+#: js/viewfeed.js:1312
 msgid "Open original article"
 msgstr "Показать оригинальное содержимое статьи"
 
-#: js/viewfeed.js:1673
+#: js/viewfeed.js:1319
 msgid "Display article URL"
 msgstr "Отобразить URL статьи"
 
-#: js/viewfeed.js:1780
+#: js/viewfeed.js:1426
 msgid "Assign label"
 msgstr "Применить метку"
 
-#: js/viewfeed.js:1785
+#: js/viewfeed.js:1431
 msgid "Remove label"
 msgstr "Удалить метку"
 
-#: js/viewfeed.js:1817
+#: js/viewfeed.js:1463
 msgid "Select articles in group"
 msgstr "Выбрать статьи в группе"
 
-#: js/viewfeed.js:1827
+#: js/viewfeed.js:1473
 msgid "Mark group as read"
 msgstr "Пометить группу как прочитанную"
 
-#: js/viewfeed.js:1839
+#: js/viewfeed.js:1485
 msgid "Mark feed as read"
 msgstr "Отметить канал как прочитанный"
 
-#: js/viewfeed.js:1892
+#: js/viewfeed.js:1538
 msgid "Please enter new score for selected articles:"
 msgstr "Пожалуйста, укажите новый рейтинг для выбранных статей:"
 
-#: js/viewfeed.js:1955
+#: js/viewfeed.js:1571
 msgid "Please enter new score for this article:"
 msgstr "Пожалуйста, укажите новый рейтинг для этой статьи:"
 
-#: js/viewfeed.js:1986
+#: js/viewfeed.js:1591
 msgid "Article URL:"
 msgstr "URL статьи:"
 
-#: plugins/note/note.js:17
-msgid "Saving article note..."
-msgstr "Сохраняю заметку..."
+#: plugins/embed_original/init.js:6
+msgid "Sorry, your browser does not support sandboxed iframes."
+msgstr "Извините, Ваш броузер не поддерживает sandboxed iframes."
 
 #: plugins/af_psql_trgm/init.js:11
 msgid "Related articles"
 msgstr "Похожие статьи"
 
+#: plugins/mailto/init.js:21
+#: plugins/mail/mail.js:21
+msgid "Forward article by email"
+msgstr "Переслать статью по электронной почте"
+
+#: plugins/shorten_expanded/init.js:43
+msgid "Click to expand article"
+msgstr "Щёлкните чтобы развернуть статью"
+
 #: plugins/import_export/import_export.js:13
 msgid "Export Data"
 msgstr "Экспортировать данные"
@@ -3230,261 +3324,171 @@ msgstr "Импортировать данные"
 msgid "Please choose the file first."
 msgstr "Пожалуйста выберите файл."
 
-#: plugins/mail/mail.js:21
-#: plugins/mailto/init.js:21
-msgid "Forward article by email"
-msgstr "Переслать статью по электронной почте"
+#: plugins/share/share_prefs.js:2
+msgid "This will invalidate all previously shared article URLs. Continue?"
+msgstr "Это сделает недействительными все ранее опубликованные URL статьи. Продолжить?"
 
-#: plugins/mail/mail.js:36
-msgid "Error sending email:"
-msgstr ""
-
-#: plugins/mail/mail.js:38
-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:45
-msgid "Click to expand article"
-msgstr "Щёлкните чтобы развернуть статью"
+#: plugins/share/share_prefs.js:8
+msgid "Shared URLs cleared."
+msgstr "Общие URL очищены."
 
 #: plugins/share/share.js:10
 msgid "Share article by URL"
 msgstr "Расшарить статью по ссылке"
 
-#: plugins/share/share.js:14
+#: plugins/share/share.js:13
 msgid "Generate new share URL for this article?"
 msgstr "Создать новый публичный URL для этой статьи?"
 
-#: plugins/share/share.js:18
+#: plugins/share/share.js:15
 msgid "Trying to change URL..."
 msgstr "Пытаюсь изменить URL..."
 
-#: plugins/share/share.js:55
+#: plugins/share/share.js:48
 msgid "Remove sharing for this article?"
 msgstr "Убрать данную статью из публичного доступа?"
 
-#: plugins/share/share.js:59
+#: plugins/share/share.js:50
 msgid "Trying to unshare..."
 msgstr "Пытаюсь убрать из публичного доступа..."
 
-#: plugins/share/share_prefs.js:3
-msgid "This will invalidate all previously shared article URLs. Continue?"
-msgstr "Это сделает недействительными все ранее опубликованные URL статьи. Продолжить?"
+#: plugins/mail/mail.js:30
+msgid "Error sending email:"
+msgstr ""
 
-#: plugins/share/share_prefs.js:6
-#: js/prefs.js:1277
-msgid "Clearing URLs..."
-msgstr "Очистка URL..."
+#: plugins/mail/mail.js:32
+msgid "Your message has been sent."
+msgstr "Ваше сообщение было отправлено."
 
-#: plugins/share/share_prefs.js:13
-msgid "Shared URLs cleared."
-msgstr "Общие URL очищены."
+#: plugins/note/note.js:15
+msgid "Saving article note..."
+msgstr "Сохраняю заметку..."
 
-#: js/feedlist.js:204
+#: js/feedlist.js:168
 #, fuzzy
 msgid "Your password is at default value"
 msgstr "Используется пароль по умолчанию, пожалуйста, измените его."
 
-#: js/feedlist.js:453
+#: js/feedlist.js:413
 msgid "Mark all articles in %s as read?"
 msgstr "Отметить все статьи в %s как прочитанные?"
 
-#: js/functions.js:494
-msgid "Upload complete."
-msgstr "Загрузка завершена"
-
-#: js/functions.js:511
-msgid "Remove stored feed icon?"
-msgstr "Удалить сохраненную иконку канала?"
-
-#: js/functions.js:516
-msgid "Removing feed icon..."
-msgstr "Удаляется иконка канала..."
-
-#: js/functions.js:521
-msgid "Feed icon removed."
-msgstr "Иконка канала удалена."
-
-#: js/functions.js:537
-msgid "Please select an image file to upload."
-msgstr "Пожалуйста, выберите файл с изображением для загрузки."
-
-#: js/functions.js:539
-msgid "Upload new icon for this feed?"
-msgstr "Загрузить новую иконку для канала?"
-
-#: js/functions.js:540
-msgid "Uploading, please wait..."
-msgstr "Идет загрузка, пожалуйста подождите..."
-
-#: js/functions.js:550
-msgid "Please enter label caption:"
-msgstr "Пожалуйста, введите заголовок метки:"
-
-#: js/functions.js:555
-msgid "Can't create label: missing caption."
-msgstr "Не могу создать метку: отсутствует заголовок."
-
-#: js/functions.js:797
+#: js/functions.js:764
 msgid "Edit rule"
 msgstr "Редактировать правило"
 
-#: js/functions.js:819
+#: js/functions.js:786
 msgid "Edit action"
 msgstr "Редактировать действие"
 
-#: js/functions.js:860
+#: js/functions.js:825
 msgid "Looking for articles (%d processed, %f found)..."
 msgstr ""
 
-#: js/functions.js:890
+#: js/functions.js:855
 #, fuzzy
 msgid "Found %d articles matching this filter:"
 msgstr "Статьи, удовлетворяющие фильтру:"
 
-#: js/functions.js:942
+#: js/functions.js:907
 msgid "Create Filter"
 msgstr "Создать фильтр"
 
-#: js/functions.js:1060
-#: js/tt-rss.js:692
+#: js/functions.js:1016
+#: js/tt-rss.js:631
 msgid "Unsubscribe from %s?"
 msgstr "Отписаться от %s?"
 
-#: js/functions.js:1063
+#: js/functions.js:1019
 msgid "Removing feed..."
 msgstr "Канал удаляется..."
 
-#: js/functions.js:1489
+#: js/functions.js:1410
 msgid "Help"
 msgstr "Помощь"
 
-#: js/prefs.js:973
-msgid "Remove category %s? Any nested feeds would be placed into Uncategorized."
-msgstr "Удалите категорию %s? Все вложенные каналы будут помещены в \"Без категории\"."
+#: js/prefs.js:44
+msgid "Please enter login:"
+msgstr "Пожалуйста, введите логин:"
 
-#: js/prefs.js:979
-msgid "Removing category..."
-msgstr "Удаляю категорию..."
+#: js/prefs.js:51
+msgid "Can't create user: no login specified."
+msgstr "Не могу добавить пользователя: не указан логин."
 
-#: js/prefs.js:997
-msgid "Remove selected categories?"
-msgstr "Удалить выбранные категории?"
+#: js/prefs.js:55
+msgid "Adding user..."
+msgstr "Пользователь добавляется..."
 
-#: js/prefs.js:1000
-msgid "Removing selected categories..."
-msgstr "Выбранные категории удаляются..."
+#: js/prefs.js:74
+msgid "User Editor"
+msgstr "Редактор пользователей"
 
-#: js/prefs.js:1013
-msgid "No categories are selected."
-msgstr "Нет выбранных категорий."
+#: js/prefs.js:104
+msgid "Edit Filter"
+msgstr "Редактировать фильтр"
 
-#: js/prefs.js:1020
-msgid "Category title:"
-msgstr "Название категории:"
+#: js/prefs.js:1175
+msgid "Subscribing to feeds..."
+msgstr "Подписываюсь на каналы..."
 
-#: js/prefs.js:1024
-msgid "Creating category..."
-msgstr "Создаю категорию..."
+#: js/prefs.js:1191
+msgid "Clear stored data for this plugin?"
+msgstr "Удалить сохраненные данные для этого плагина?"
 
-#: js/prefs.js:1047
-msgid "Feeds without recent updates"
-msgstr "Давно не обновлявшиеся каналы"
+#: js/prefs.js:1203
+msgid "Clear all messages in the error log?"
+msgstr "Удалить все сообщения в логе ошибок?"
 
-#: js/prefs.js:1091
-msgid "Replace current OPML publishing address with a new one?"
-msgstr "Изменить текущий адрес публикации OPML на новый?"
-
-#: js/prefs.js:1129
-msgid "Reset selected labels to default colors?"
-msgstr "Сбросить текущие метки на цвета по умолчанию?"
-
-#: js/prefs.js:1161
-msgid "Settings Profiles"
-msgstr "Профили настроек"
-
-#: js/prefs.js:1170
-msgid "Remove selected profiles? Active and default profiles will not be removed."
-msgstr "Удалить выбранные профили? Активный и профиль по умолчанию удалены не будут."
-
-#: js/prefs.js:1173
-msgid "Removing selected profiles..."
-msgstr "Выбранные профили удаляются..."
-
-#: js/prefs.js:1189
-msgid "No profiles are selected."
-msgstr "Профиль не выбран"
-
-#: js/prefs.js:1197
-#: js/prefs.js:1250
-msgid "Activate selected profile?"
-msgstr "Активировать выбранный профиль?"
-
-#: js/prefs.js:1214
-#: js/prefs.js:1266
-msgid "Please choose a profile to activate."
-msgstr "Пожалуйста выберите какой-нибудь профиль."
-
-#: js/prefs.js:1219
-msgid "Creating profile..."
-msgstr "Создаю профиль..."
-
-#: js/prefs.js:1274
-msgid "This will invalidate all previously generated feed URLs. Continue?"
-msgstr "Это сделает недействительными все ранее созданные URL канала. Продолжить?"
-
-#: js/prefs.js:1284
-msgid "Generated URLs cleared."
-msgstr "Созданные URL очищены."
-
-#: js/prefs.js:1356
-msgid "Label Editor"
-msgstr "Редактор Меток"
-
-#: js/tt-rss.js:681
+#: js/tt-rss.js:620
 msgid "You can't unsubscribe from the category."
 msgstr "Нельзя отписаться от категории."
 
-#: js/viewfeed.js:127
-#: js/viewfeed.js:177
-#: js/viewfeed.js:194
+#: js/tt-rss.js:625
+msgid "Please select some feed first."
+msgstr "Пожалуйста выберите какой-нибудь канал."
+
+#: js/viewfeed.js:89
+#: js/viewfeed.js:135
+#: js/viewfeed.js:152
 msgid "Click to open next unread feed."
 msgstr "Щёлкните чтоб открыть следующий непрочитанный канал."
 
-#: js/viewfeed.js:131
+#: js/viewfeed.js:93
 msgid "Cancel search"
 msgstr "Отменить поиск"
 
-#: js/viewfeed.js:191
+#: js/viewfeed.js:149
 #, fuzzy
 msgid "New articles found, reload feed to continue."
 msgstr "Статей не найдено."
 
-#: js/viewfeed.js:620
+#: js/viewfeed.js:405
 msgid "%d article selected"
 msgid_plural "%d articles selected"
 msgstr[0] "%d статья выбрана"
 msgstr[1] "%d статьи(ей) выбрано"
 msgstr[2] "%d статьи(ей) выбрано"
 
-#: js/viewfeed.js:1284
-msgid "No article is selected."
-msgstr "Статья не выбрана"
+#~ msgid "Rescore feed"
+#~ msgstr "Заново оценить канал"
 
-#: js/viewfeed.js:1319
-msgid "No articles found to mark"
-msgstr "Статей для отметки не найдено."
+#~ msgid "Create label..."
+#~ msgstr "Создать метку..."
 
-#: js/viewfeed.js:1321
-msgid "Mark %d article as read?"
-msgid_plural "Mark %d articles as read?"
-msgstr[0] "Отметить %d статью как прочитанную?"
-msgstr[1] "Отметить %d статьи(ей) как прочитанные?"
-msgstr[2] "Отметить %d статьи(ей) как прочитанные?"
+#~ msgid "Create filter..."
+#~ msgstr "Создать фильтр..."
+
+#~ msgid "You can't rescore this kind of feed."
+#~ msgstr "Вы не можете снова оценить этот канал."
+
+#~ msgid "Rescore articles in %s?"
+#~ msgstr "Установить оценку статьям в %s?"
+
+#~ msgid "Rescoring articles..."
+#~ msgstr "Переоценка статей..."
+
+#~ msgid "Can't create label: missing caption."
+#~ msgstr "Не могу создать метку: отсутствует заголовок."
 
 #~ msgid "Firefox integration"
 #~ msgstr "Интеграция в Firefox"
diff --git a/locale/sv_SE/LC_MESSAGES/messages.mo b/locale/sv_SE/LC_MESSAGES/messages.mo
index b81575542..f1755b1fc 100644
Binary files a/locale/sv_SE/LC_MESSAGES/messages.mo and b/locale/sv_SE/LC_MESSAGES/messages.mo differ
diff --git a/locale/sv_SE/LC_MESSAGES/messages.po b/locale/sv_SE/LC_MESSAGES/messages.po
index 47e77c44c..e93acf95a 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: 2018-10-10 08:24+0300\n"
+"POT-Creation-Date: 2018-12-01 12:59+0300\n"
 "PO-Revision-Date: 2013-05-24 19:41+0100\n"
 "Last-Translator: Mattias Tengblad <mst@eyesx.com>\n"
 "Language-Team: Mattias Tengblad <mst@eyesx.com>\n"
@@ -100,8 +100,8 @@ msgid "Weekly"
 msgstr "Veckovis"
 
 #: backend.php:103
-#: classes/pref/users.php:47
 #: classes/pref/system.php:51
+#: classes/pref/users.php:47
 msgid "User"
 msgstr "Användare"
 
@@ -173,33 +173,33 @@ msgstr "Hittade inte användaren"
 
 #: index.php:151
 #: index.php:167
-#: index.php:285
+#: index.php:282
 #: prefs.php:120
 #: classes/backend.php:5
 #: classes/pref/labels.php:294
-#: classes/pref/feeds.php:1230
 #: classes/pref/filters.php:822
-#: js/feedlist.js:148
-#: js/feedlist.js:491
-#: js/feedlist.js:539
-#: js/functions.js:314
-#: js/functions.js:1336
-#: js/prefs.js:562
-#: js/prefs.js:754
-#: js/prefs.js:1488
-#: js/prefs.js:1503
-#: js/tt-rss.js:547
-#: js/viewfeed.js:1180
+#: classes/pref/feeds.php:1229
+#: js/feedlist.js:118
+#: js/feedlist.js:446
+#: js/feedlist.js:487
+#: js/functions.js:328
+#: js/functions.js:551
+#: js/functions.js:1286
+#: js/prefs.js:477
+#: js/prefs.js:617
+#: js/prefs.js:956
+#: js/prefs.js:1000
+#: js/prefs.js:1028
+#: js/prefs.js:1037
+#: js/prefs.js:1045
+#: js/prefs.js:1057
+#: js/tt-rss.js:497
+#: js/viewfeed.js:509
+#: js/viewfeed.js:928
 #: plugins/import_export/import_export.js:17
-#: js/functions.js:565
-#: js/prefs.js:1200
-#: js/prefs.js:1253
-#: js/prefs.js:1292
-#: js/prefs.js:1305
-#: js/prefs.js:1316
-#: js/prefs.js:1331
-#: js/tt-rss.js:564
-#: js/viewfeed.js:760
+#: js/prefs.js:1192
+#: js/prefs.js:1205
+#: js/tt-rss.js:510
 msgid "Loading, please wait..."
 msgstr "Laddar, vänta..."
 
@@ -216,13 +216,13 @@ msgid "All Articles"
 msgstr "Alla artiklar"
 
 #: index.php:194
-#: include/functions.php:1227
+#: include/functions.php:1172
 #: classes/feeds.php:110
 msgid "Starred"
 msgstr "Stjärnmärkta"
 
 #: index.php:195
-#: include/functions.php:1228
+#: include/functions.php:1173
 #: classes/feeds.php:111
 msgid "Published"
 msgstr "Publicerade"
@@ -262,11 +262,11 @@ msgid "Title"
 msgstr "Titel"
 
 #: index.php:211
-#: index.php:251
-#: include/functions.php:1215
+#: index.php:250
+#: include/functions.php:1160
 #: classes/feeds.php:115
-#: js/FeedTree.js:41
-#: js/FeedTree.js:69
+#: js/FeedTree.js:42
+#: js/FeedTree.js:70
 msgid "Mark as read"
 msgstr "Markera som läst"
 
@@ -303,7 +303,7 @@ msgid "Feed actions:"
 msgstr "Flödesåtgärder:"
 
 #: index.php:246
-#: classes/handler/public.php:551
+#: classes/handler/public.php:575
 msgid "Subscribe to feed..."
 msgstr "Prenumerera på flöde..."
 
@@ -312,56 +312,44 @@ msgid "Edit this feed..."
 msgstr "Redigera detta flöde..."
 
 #: index.php:248
-msgid "Rescore feed"
-msgstr "Beräkna flödets poäng på nytt"
-
-#: index.php:249
-#: classes/pref/feeds.php:770
-#: classes/pref/feeds.php:1203
-#: js/PrefFeedTree.js:61
+#: classes/pref/feeds.php:769
+#: classes/pref/feeds.php:1202
+#: js/PrefFeedTree.js:62
 msgid "Unsubscribe"
 msgstr "Avsluta prenumeration"
 
-#: index.php:250
+#: index.php:249
 msgid "All feeds:"
 msgstr "Alla flöden:"
 
-#: index.php:252
+#: index.php:251
 msgid "(Un)hide read feeds"
 msgstr "Visa/dölj lästa flöden"
 
-#: index.php:253
+#: index.php:252
 msgid "Other actions:"
 msgstr "Andra aktiviteter:"
 
-#: index.php:254
-#: include/functions.php:1201
+#: index.php:253
+#: include/functions.php:1146
 msgid "Toggle widescreen mode"
 msgstr "Växla widescreenläge"
 
-#: index.php:255
-msgid "Create label..."
-msgstr "Skapa etikett..."
-
-#: index.php:256
-msgid "Create filter..."
-msgstr "Skapa filter..."
-
-#: index.php:257
+#: index.php:254
 msgid "Keyboard shortcuts help"
 msgstr "Hjälp för kortkommandon..."
 
-#: index.php:266
+#: index.php:263
 msgid "Logout"
 msgstr "Logga ut"
 
-#: index.php:272
+#: index.php:269
 msgid "Updates are available from Git."
 msgstr ""
 
 #: prefs.php:33
 #: prefs.php:138
-#: include/functions.php:1230
+#: include/functions.php:1175
 #: classes/pref/prefs.php:425
 msgid "Preferences"
 msgstr "Inställningar"
@@ -376,8 +364,8 @@ msgstr "Lämna inställningarna"
 
 #: prefs.php:141
 #: classes/pref/feeds.php:114
-#: classes/pref/feeds.php:1138
-#: classes/pref/feeds.php:1192
+#: classes/pref/feeds.php:1137
+#: classes/pref/feeds.php:1191
 msgid "Feeds"
 msgstr "Flöden"
 
@@ -387,8 +375,8 @@ msgid "Filters"
 msgstr "Filter"
 
 #: prefs.php:147
+#: classes/feeds.php:1696
 #: classes/pref/labels.php:94
-#: classes/feeds.php:1710
 msgid "Labels"
 msgstr "Etiketter"
 
@@ -400,80 +388,80 @@ msgstr "Användare"
 msgid "System"
 msgstr "System"
 
-#: register.php:186
+#: register.php:185
 #: include/login_form.php:162
 msgid "Create new account"
 msgstr "Skapa ett nytt konto"
 
-#: register.php:192
+#: register.php:191
 msgid "New user registrations are administratively disabled."
 msgstr "Nyregistrering av användare är inaktiverat."
 
-#: register.php:196
-#: register.php:241
-#: register.php:254
-#: register.php:269
-#: register.php:288
-#: register.php:336
-#: register.php:346
-#: register.php:358
-#: classes/handler/public.php:623
-#: classes/handler/public.php:697
-#: classes/handler/public.php:798
-#: classes/handler/public.php:877
-#: classes/handler/public.php:891
-#: classes/handler/public.php:898
-#: classes/handler/public.php:923
+#: register.php:195
+#: register.php:240
+#: register.php:253
+#: register.php:268
+#: register.php:287
+#: register.php:334
+#: register.php:344
+#: register.php:356
+#: classes/handler/public.php:647
+#: classes/handler/public.php:721
+#: 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"
 
-#: register.php:217
+#: register.php:216
 msgid "Your temporary password will be sent to the specified email. Accounts, which were not logged in once, are erased automatically 24 hours after temporary password is sent."
 msgstr "Ditt tillfälliga lösenords skickas till angiven e-postadress. Om du inte loggar in inom 24 timmar kommer kontot automatiskt att raderas"
 
-#: register.php:223
+#: register.php:222
 msgid "Desired login:"
 msgstr "Önskat användarnamn:"
 
-#: register.php:226
+#: register.php:225
 msgid "Check availability"
 msgstr "Kontrollera tillgänglighet"
 
-#: register.php:228
-#: classes/handler/public.php:713
+#: register.php:227
+#: classes/handler/public.php:737
 msgid "Email:"
 msgstr "E-post:"
 
-#: register.php:231
-#: classes/handler/public.php:718
+#: register.php:230
+#: classes/handler/public.php:742
 msgid "How much is two plus two:"
 msgstr "Hur mycket är två plus två?:"
 
-#: register.php:234
+#: register.php:233
 msgid "Submit registration"
 msgstr "Skicka registrering"
 
-#: register.php:252
+#: register.php:251
 msgid "Your registration information is incomplete."
 msgstr "Fll i samtliga uppgifter."
 
-#: register.php:267
+#: register.php:266
 msgid "Sorry, this username is already taken."
 msgstr "Användarnamnet är tyvärr redan upptaget."
 
-#: register.php:286
+#: register.php:285
 msgid "Registration failed."
 msgstr "Registrering misslyckades."
 
-#: register.php:333
+#: register.php:331
 msgid "Account created successfully."
 msgstr "Konto skapat."
 
-#: register.php:355
+#: register.php:353
 msgid "New user registrations are currently closed."
 msgstr "Nyregistrering av användare är för närvarande avstängt."
 
-#: update.php:66
+#: update.php:67
 msgid "Tiny Tiny RSS data update script."
 msgstr "Skript för att uppdatera Tiny Tiny RSS."
 
@@ -486,10 +474,10 @@ msgstr "Alla flöden"
 
 #: include/controls.php:138
 #: include/controls.php:230
-#: classes/opml.php:512
-#: classes/digest.php:120
+#: classes/digest.php:124
+#: classes/feeds.php:1708
 #: classes/pref/feeds.php:233
-#: classes/feeds.php:1722
+#: classes/opml.php:512
 msgid "Uncategorized"
 msgstr "Okategoriserat"
 
@@ -504,287 +492,287 @@ msgstr[1] "%d arkiverade artiklar"
 msgid "No feeds found."
 msgstr "Inga flöden funna."
 
-#: include/functions.php:983
+#: include/functions.php:928
 #, php-format
 msgid "%d min"
 msgstr ""
 
-#: include/functions.php:1177
+#: include/functions.php:1122
 msgid "Navigation"
 msgstr "Navigation"
 
-#: include/functions.php:1178
+#: include/functions.php:1123
 msgid "Open next feed"
 msgstr "Öppna nästa flöde"
 
-#: include/functions.php:1179
+#: include/functions.php:1124
 msgid "Open previous feed"
 msgstr "Öppna föregående flöde"
 
-#: include/functions.php:1180
+#: include/functions.php:1125
 msgid "Open next article"
 msgstr "Öppna näst artikel"
 
-#: include/functions.php:1181
+#: include/functions.php:1126
 msgid "Open previous article"
 msgstr "Öppna föregående artikel"
 
-#: include/functions.php:1182
+#: include/functions.php:1127
 msgid "Open next article (don't scroll long articles)"
 msgstr "Öppna nästa artikel (skrolla inte långa artiklar)"
 
-#: include/functions.php:1183
+#: include/functions.php:1128
 msgid "Open previous article (don't scroll long articles)"
 msgstr "Öppna föregående artikel (skrolla inte långa artiklar)"
 
-#: include/functions.php:1184
+#: include/functions.php:1129
 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/functions.php:1185
+#: include/functions.php:1130
 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/functions.php:1186
+#: include/functions.php:1131
 msgid "Show search dialog"
 msgstr "Visa sökdialogen"
 
-#: include/functions.php:1187
+#: include/functions.php:1132
 msgid "Article"
 msgstr "Artikel"
 
-#: include/functions.php:1188
-#: js/viewfeed.js:1695
+#: include/functions.php:1133
+#: js/viewfeed.js:1341
 msgid "Toggle starred"
 msgstr "Växla stjärnmarkering"
 
-#: include/functions.php:1189
-#: js/viewfeed.js:1707
+#: include/functions.php:1134
+#: js/viewfeed.js:1353
 msgid "Toggle published"
 msgstr "Växla publicering"
 
-#: include/functions.php:1190
-#: js/viewfeed.js:1682
+#: include/functions.php:1135
+#: js/viewfeed.js:1328
 msgid "Toggle unread"
 msgstr "Växla olästa"
 
-#: include/functions.php:1191
+#: include/functions.php:1136
 msgid "Edit tags"
 msgstr "Redigera taggar"
 
-#: include/functions.php:1192
+#: include/functions.php:1137
 msgid "Open in new window"
 msgstr "Öppna i nytt fönster"
 
-#: include/functions.php:1193
-#: js/viewfeed.js:1728
+#: include/functions.php:1138
+#: js/viewfeed.js:1374
 msgid "Mark below as read"
 msgstr "Märk nedanstående som lästa"
 
-#: include/functions.php:1194
-#: js/viewfeed.js:1721
+#: include/functions.php:1139
+#: js/viewfeed.js:1367
 msgid "Mark above as read"
 msgstr "Märk ovanstående som lästa"
 
-#: include/functions.php:1195
+#: include/functions.php:1140
 msgid "Scroll down"
 msgstr "Skrolla ned"
 
-#: include/functions.php:1196
+#: include/functions.php:1141
 msgid "Scroll up"
 msgstr "Skrolla upp"
 
-#: include/functions.php:1197
+#: include/functions.php:1142
 msgid "Select article under cursor"
 msgstr "Välj artikel under pekare"
 
-#: include/functions.php:1198
+#: include/functions.php:1143
 msgid "Email article"
 msgstr "Skicka artikel med e-post"
 
-#: include/functions.php:1199
+#: include/functions.php:1144
 msgid "Close/collapse article"
 msgstr "Stäng/minimera artikel"
 
-#: include/functions.php:1200
+#: include/functions.php:1145
 msgid "Toggle article expansion (combined mode)"
 msgstr "Växla expanderat artikelläge (kombinerat läge)"
 
-#: include/functions.php:1202
+#: include/functions.php:1147
 #: plugins/embed_original/init.php:33
 msgid "Toggle embed original"
 msgstr "Stäng av/sätt på inbäddade original"
 
-#: include/functions.php:1203
+#: include/functions.php:1148
 msgid "Article selection"
 msgstr "Artikelval"
 
-#: include/functions.php:1204
+#: include/functions.php:1149
 msgid "Select all articles"
 msgstr "Välj alla artiklar"
 
-#: include/functions.php:1205
+#: include/functions.php:1150
 msgid "Select unread"
 msgstr "Välj olästa"
 
-#: include/functions.php:1206
+#: include/functions.php:1151
 msgid "Select starred"
 msgstr "Välj markerade"
 
-#: include/functions.php:1207
+#: include/functions.php:1152
 msgid "Select published"
 msgstr "Välj publicerade"
 
-#: include/functions.php:1208
+#: include/functions.php:1153
 msgid "Invert selection"
 msgstr "Invertera val"
 
-#: include/functions.php:1209
+#: include/functions.php:1154
 msgid "Deselect everything"
 msgstr "Avmarkera allt"
 
-#: include/functions.php:1210
-#: classes/pref/feeds.php:522
-#: classes/pref/feeds.php:794
+#: include/functions.php:1155
+#: classes/pref/feeds.php:521
+#: classes/pref/feeds.php:793
 msgid "Feed"
 msgstr "Flöde"
 
-#: include/functions.php:1211
+#: include/functions.php:1156
 msgid "Refresh current feed"
 msgstr "Uppdatera aktuellt flöde"
 
-#: include/functions.php:1212
+#: include/functions.php:1157
 msgid "Un/hide read feeds"
 msgstr "Visa/dölj lästa flöden"
 
-#: include/functions.php:1213
-#: classes/pref/feeds.php:1195
+#: include/functions.php:1158
+#: classes/pref/feeds.php:1194
 msgid "Subscribe to feed"
 msgstr "Prenumerera på flöde"
 
-#: include/functions.php:1214
-#: js/FeedTree.js:48
-#: js/PrefFeedTree.js:55
-#: js/viewfeed.js:1846
+#: include/functions.php:1159
+#: js/FeedTree.js:49
+#: js/PrefFeedTree.js:56
+#: js/viewfeed.js:1492
 msgid "Edit feed"
 msgstr "Redigera flöde"
 
-#: include/functions.php:1216
+#: include/functions.php:1161
 msgid "Reverse headlines"
 msgstr "Omvänd sortering på rubrik"
 
-#: include/functions.php:1217
+#: include/functions.php:1162
 msgid "Toggle headline grouping"
 msgstr ""
 
-#: include/functions.php:1218
+#: include/functions.php:1163
 msgid "Debug feed update"
 msgstr "Felsök flödesuppdatering"
 
-#: include/functions.php:1219
+#: include/functions.php:1164
 #, fuzzy
 msgid "Debug viewfeed()"
 msgstr "Felsök flödesuppdatering"
 
-#: include/functions.php:1220
-#: js/FeedTree.js:97
+#: include/functions.php:1165
+#: js/FeedTree.js:98
 msgid "Mark all feeds as read"
 msgstr "Märk alla flöden som lästa"
 
-#: include/functions.php:1221
+#: include/functions.php:1166
 msgid "Un/collapse current category"
 msgstr "Öppna/stäng aktuell kategori:"
 
-#: include/functions.php:1222
-msgid "Toggle combined mode"
-msgstr "Växla komboläge"
-
-#: include/functions.php:1223
+#: include/functions.php:1167
 msgid "Toggle auto expand in combined mode"
 msgstr "Aktivera automatisk expandering i kombinerat läge"
 
-#: include/functions.php:1224
+#: include/functions.php:1168
+msgid "Toggle combined mode"
+msgstr "Växla komboläge"
+
+#: include/functions.php:1169
 msgid "Go to"
 msgstr "Gå till"
 
-#: include/functions.php:1225
-#: classes/feeds.php:1583
+#: include/functions.php:1170
+#: classes/feeds.php:1569
 msgid "All articles"
 msgstr "Alla artiklar"
 
-#: include/functions.php:1226
+#: include/functions.php:1171
 msgid "Fresh"
 msgstr "Nya"
 
-#: include/functions.php:1229
-#: js/tt-rss.js:491
-#: js/tt-rss.js:660
+#: include/functions.php:1174
+#: js/tt-rss.js:439
+#: js/tt-rss.js:599
 msgid "Tag cloud"
 msgstr "Taggmoln"
 
-#: include/functions.php:1231
+#: include/functions.php:1176
 msgid "Other"
 msgstr "Övriga"
 
-#: include/functions.php:1232
+#: include/functions.php:1177
 #: classes/pref/labels.php:279
 msgid "Create label"
 msgstr "Skapa etikett"
 
-#: include/functions.php:1233
+#: include/functions.php:1178
 #: classes/pref/filters.php:801
 msgid "Create filter"
 msgstr "Skapa filter"
 
-#: include/functions.php:1234
+#: include/functions.php:1179
 msgid "Un/collapse sidebar"
 msgstr "Visa/dölj sidofält"
 
-#: include/functions.php:1235
+#: include/functions.php:1180
 msgid "Show help dialog"
 msgstr "Visa hjälpfönster"
 
-#: include/functions.php:2582
+#: include/functions.php:2529
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: include/functions.php:2583
+#: include/functions.php:2530
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: include/functions.php:2584
+#: include/functions.php:2531
 msgid "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form"
 msgstr ""
 
-#: include/functions.php:2585
+#: include/functions.php:2532
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: include/functions.php:2586
+#: include/functions.php:2533
 #, fuzzy
 msgid "No file was uploaded"
 msgstr "Ingen fil uppladdad."
 
-#: include/functions.php:2587
+#: include/functions.php:2534
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: include/functions.php:2588
+#: include/functions.php:2535
 msgid "Failed to write file to disk."
 msgstr ""
 
-#: include/functions.php:2589
+#: include/functions.php:2536
 msgid "A PHP extension stopped the file upload."
 msgstr ""
 
 #: include/login_form.php:107
-#: classes/handler/public.php:446
-#: classes/handler/public.php:708
+#: classes/handler/public.php:466
+#: classes/handler/public.php:732
 msgid "Login:"
 msgstr "Användarnamn:"
 
 #: include/login_form.php:117
-#: classes/handler/public.php:449
+#: classes/handler/public.php:469
 msgid "Password:"
 msgstr "Lösenord:"
 
@@ -797,9 +785,9 @@ msgid "Profile:"
 msgstr "Profil:"
 
 #: include/login_form.php:133
-#: classes/handler/public.php:252
 #: classes/pref/prefs.php:1037
 #: classes/rpc.php:69
+#: classes/handler/public.php:272
 msgid "Default profile"
 msgstr "Standardprofil"
 
@@ -816,212 +804,30 @@ msgid "Remember me"
 msgstr "Kom ihåg mig"
 
 #: include/login_form.php:159
-#: classes/handler/public.php:454
+#: classes/handler/public.php:474
 msgid "Log in"
 msgstr "Logga in"
 
-#: include/sessions.php:46
+#: include/sessions.php:45
 #, fuzzy
 msgid "Session failed to validate (schema version changed)"
 msgstr "Kunde inte verifiera session (fel IP)"
 
-#: include/sessions.php:62
+#: include/sessions.php:53
+#, fuzzy
+msgid "Session failed to validate (UA changed)."
+msgstr "Kunde inte verifiera session (fel IP)"
+
+#: include/sessions.php:67
 #, fuzzy
 msgid "Session failed to validate (password changed)"
 msgstr "Kunde inte verifiera session (fel IP)"
 
-#: include/sessions.php:69
+#: include/sessions.php:74
 #, fuzzy
 msgid "Session failed to validate (user not found)"
 msgstr "Kunde inte verifiera session (fel IP)"
 
-#: classes/article.php:26
-msgid "Article not found."
-msgstr "Hittar inte artikel."
-
-#: classes/article.php:211
-msgid "Tags for this article (separated by commas):"
-msgstr "Taggar för denna artikel (kommaseparerade):"
-
-#: classes/article.php:236
-#: classes/pref/labels.php:82
-#: classes/pref/users.php:103
-#: classes/pref/feeds.php:774
-#: classes/pref/feeds.php:914
-#: classes/pref/filters.php:525
-#: classes/pref/prefs.php:982
-#: plugins/nsfw/init.php:85
-#: plugins/note/init.php:58
-#: plugins/af_readability/init.php:80
-#: plugins/af_redditimgur/init.php:66
-#: plugins/af_psql_trgm/init.php:188
-#: plugins/mail/init.php:65
-#: plugins/af_zz_imgproxy/init.php:238
-msgid "Save"
-msgstr "Spara"
-
-#: classes/article.php:238
-#: classes/handler/public.php:423
-#: classes/handler/public.php:457
-#: classes/pref/labels.php:84
-#: classes/pref/users.php:105
-#: classes/pref/feeds.php:775
-#: classes/pref/feeds.php:917
-#: classes/pref/feeds.php:1672
-#: classes/pref/filters.php:528
-#: classes/pref/filters.php:945
-#: classes/pref/filters.php:1022
-#: classes/pref/filters.php:1115
-#: classes/pref/prefs.php:984
-#: classes/feeds.php:1037
-#: classes/feeds.php:1089
-#: classes/feeds.php:1128
-#: plugins/note/init.php:60
-#: plugins/mail/init.php:179
-msgid "Cancel"
-msgstr "Avbryt"
-
-#: classes/article.php:337
-#: classes/article.php:720
-#: classes/article.php:875
-msgid "no tags"
-msgstr "Inga taggar"
-
-#: classes/article.php:448
-msgid "unknown type"
-msgstr "Okänd typ"
-
-#: classes/article.php:525
-msgid "Attachments"
-msgstr "Bilagor"
-
-#: classes/article.php:626
-#: classes/feeds.php:661
-#, fuzzy
-msgid "comment"
-msgid_plural "comments"
-msgstr[0] "Kommentarer?"
-msgstr[1] "Kommentarer?"
-
-#: classes/article.php:630
-#: classes/feeds.php:665
-#, fuzzy
-msgid "comments"
-msgstr "Kommentarer?"
-
-#: classes/article.php:689
-msgid " - "
-msgstr " - "
-
-#: classes/article.php:730
-#: classes/feeds.php:647
-msgid "Edit tags for this article"
-msgstr "Redigera taggar för denna artikel"
-
-#: classes/article.php:763
-#: classes/feeds.php:602
-msgid "Originally from:"
-msgstr "Ursprungligen från:"
-
-#: classes/article.php:774
-#: classes/pref/feeds.php:539
-#: classes/feeds.php:613
-msgid "Feed URL"
-msgstr "URL för flöde"
-
-#: classes/article.php:811
-#: classes/backend.php:103
-#: classes/dlg.php:33
-#: classes/dlg.php:56
-#: classes/dlg.php:89
-#: classes/dlg.php:154
-#: classes/dlg.php:181
-#: classes/dlg.php:197
-#: classes/pref/feeds.php:1466
-#: classes/pref/feeds.php:1533
-#: classes/pref/filters.php:208
-#: classes/pref/prefs.php:1099
-#: plugins/af_psql_trgm/init.php:109
-#: plugins/import_export/init.php:446
-#: plugins/import_export/init.php:490
-#: plugins/share/init.php:128
-msgid "Close this window"
-msgstr "Stäng fönstret"
-
-#: classes/article.php:913
-msgid "(edit note)"
-msgstr "(Redigera notering)"
-
-#: classes/opml.php:31
-#: classes/opml.php:36
-msgid "OPML Utility"
-msgstr "OPML-verktyg"
-
-#: classes/opml.php:40
-msgid "Importing OPML..."
-msgstr "Importera OPML..."
-
-#: classes/opml.php:45
-msgid "Return to preferences"
-msgstr "Återgå till inställningar"
-
-#: classes/opml.php:301
-#, php-format
-msgid "Adding feed: %s"
-msgstr "Lägger till flöde: %s"
-
-#: classes/opml.php:312
-#, php-format
-msgid "Duplicate feed: %s"
-msgstr "Dublett av flöde: %s"
-
-#: classes/opml.php:326
-#, php-format
-msgid "Adding label %s"
-msgstr "Lägger till etikett %s"
-
-#: classes/opml.php:329
-#, php-format
-msgid "Duplicate label: %s"
-msgstr "Etikettsdubblett: %s"
-
-#: classes/opml.php:341
-#, php-format
-msgid "Setting preference key %s to %s"
-msgstr "Sätter %s till %s"
-
-#: classes/opml.php:377
-msgid "Adding filter..."
-msgstr "Lägger till filter..."
-
-#: classes/opml.php:512
-#, php-format
-msgid "Processing category: %s"
-msgstr "Bearbetar kategori: %s"
-
-#: classes/opml.php:558
-#, php-format
-msgid "Upload failed with error code %d"
-msgstr "Uppladdningen misslyckades med felkod %d"
-
-#: classes/opml.php:570
-#: plugins/import_export/init.php:471
-msgid "Unable to move uploaded file."
-msgstr "Fel: kunde inte flytta uppladdad fil."
-
-#: classes/opml.php:574
-#: plugins/import_export/init.php:475
-msgid "Error: please upload OPML file."
-msgstr "Fel: vänligen ladda upp en OPMLfil."
-
-#: classes/opml.php:585
-msgid "Error: unable to find moved OPML file."
-msgstr "Fel: kunde inte hitta flyttad OPML-fil."
-
-#: classes/opml.php:594
-msgid "Error while parsing document."
-msgstr "Fel vid tolkning av dokument."
-
 #: classes/backend.php:31
 msgid "Other interface tips are available in the Tiny Tiny RSS wiki."
 msgstr "Fler tips finns i wikin."
@@ -1042,164 +848,358 @@ msgstr "Ctrl"
 msgid "Help topic not found."
 msgstr "Hittade inte något hjälpavsnitt."
 
-#: 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"
+#: classes/backend.php:103
+#: classes/pref/filters.php:208
+#: classes/pref/feeds.php:1465
+#: classes/pref/feeds.php:1532
+#: classes/pref/prefs.php:1099
+#: classes/dlg.php:33
+#: classes/dlg.php:56
+#: classes/dlg.php:89
+#: classes/dlg.php:154
+#: classes/dlg.php:181
+#: classes/dlg.php:197
+#: classes/article.php:810
+#: plugins/af_psql_trgm/init.php:109
+#: plugins/import_export/init.php:446
+#: plugins/import_export/init.php:490
+#: plugins/share/init.php:128
+msgid "Close this window"
+msgstr "Stäng fönstret"
 
-#: classes/dlg.php:44
-msgid "Your Public OPML URL is:"
-msgstr "Din publika OPML-URL är:"
+#: classes/feeds.php:53
+msgid "View as RSS feed"
+msgstr "Visa RSS-flöde"
 
-#: classes/dlg.php:53
-#: classes/dlg.php:178
-#: plugins/share/init.php:125
-msgid "Generate new URL"
-msgstr "Skapa ny URL"
+#: classes/feeds.php:54
+#: classes/feeds.php:140
+#: classes/pref/feeds.php:1326
+msgid "View as RSS"
+msgstr "Visa som RSS"
 
-#: classes/dlg.php:67
-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 "Uppdateringsdemon är aktiverad i konfigurationen, men processen körs inte. Detta förhindrar alla flöden från att uppdateras. Starta om processen eller kontakta den som administrerar instansen."
+#: classes/feeds.php:62
+#, php-format
+msgid "Last updated: %s"
+msgstr "Senast uppdaterat: %s"
 
-#: classes/dlg.php:71
-#: classes/dlg.php:80
-msgid "Last update:"
-msgstr "Senaste uppdatering:"
-
-#: classes/dlg.php:76
-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 "Uppdateringsprocessen tar för lång tid på sig att uppdatera. Detta kan indikera en låsning eller hängning. Kontrollera processen eller kontakta administratören."
-
-#: classes/dlg.php:169
-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/dlg.php:190
-msgid "You are using default tt-rss password. Please change it in the Preferences (Personal data / Authentication)."
-msgstr ""
-
-#: classes/dlg.php:194
+#: classes/feeds.php:100
 #, fuzzy
-msgid "Open Preferences"
-msgstr "Inställningar"
+msgid "Select..."
+msgstr "Markera"
 
-#: classes/handler/public.php:387
-#: plugins/bookmarklets/init.php:40
-msgid "Share with Tiny Tiny RSS"
-msgstr "Dela med Tiny Tiny RSS"
+#: classes/feeds.php:102
+#: classes/pref/labels.php:273
+#: classes/pref/filters.php:391
+#: classes/pref/filters.php:449
+#: classes/pref/filters.php:795
+#: classes/pref/filters.php:878
+#: classes/pref/filters.php:905
+#: classes/pref/feeds.php:1185
+#: classes/pref/feeds.php:1416
+#: classes/pref/feeds.php:1481
+#: classes/pref/users.php:358
+#: classes/pref/prefs.php:996
+msgid "All"
+msgstr "Alla"
 
-#: classes/handler/public.php:395
-msgid "Title:"
-msgstr "Titel:"
+#: classes/feeds.php:104
+msgid "Invert"
+msgstr "Invertera"
 
-#: classes/handler/public.php:397
-#: classes/pref/feeds.php:537
-msgid "URL:"
-msgstr "URL:"
+#: classes/feeds.php:105
+#: classes/pref/labels.php:275
+#: classes/pref/filters.php:393
+#: classes/pref/filters.php:451
+#: classes/pref/filters.php:797
+#: classes/pref/filters.php:880
+#: classes/pref/filters.php:907
+#: classes/pref/feeds.php:1187
+#: classes/pref/feeds.php:1418
+#: classes/pref/feeds.php:1483
+#: classes/pref/users.php:360
+#: classes/pref/prefs.php:998
+msgid "None"
+msgstr "Ingen"
 
-#: classes/handler/public.php:399
-msgid "Content:"
-msgstr "Innehåll:"
+#: classes/feeds.php:107
+msgid "Selection toggle:"
+msgstr "Invertera val:"
 
-#: classes/handler/public.php:401
-msgid "Labels:"
-msgstr "Etiketter:"
+#: classes/feeds.php:113
+msgid "Selection:"
+msgstr "Markering:"
 
-#: classes/handler/public.php:420
-msgid "Shared article will appear in the Published feed."
-msgstr "Delad artikel visas i 'Publicerade artiklar'."
+#: classes/feeds.php:116
+msgid "Set score"
+msgstr "Ange poäng"
 
-#: classes/handler/public.php:422
-msgid "Share"
-msgstr "Dela"
+#: classes/feeds.php:119
+msgid "Archive"
+msgstr "Arkiv"
 
-#: classes/handler/public.php:444
-msgid "Not logged in"
-msgstr "Inte inloggad"
-
-#: classes/handler/public.php:504
-msgid "Incorrect username or password"
-msgstr "Felaktigt användarnamn eller lösenord"
-
-#: classes/handler/public.php:557
-#, php-format
-msgid "Already subscribed to <b>%s</b>."
-msgstr "Du prenumererar redan på <b>%s</b>."
-
-#: classes/handler/public.php:560
-#, php-format
-msgid "Subscribed to <b>%s</b>."
-msgstr "Prenumererar på <b>%s</b>."
-
-#: classes/handler/public.php:563
-#, php-format
-msgid "Could not subscribe to <b>%s</b>."
-msgstr "Kunde inte prenumerera på  <b>%s</b>."
-
-#: classes/handler/public.php:566
-#, php-format
-msgid "No feeds found in <b>%s</b>."
-msgstr "Hittade inga flöden i <b>%s</b>."
-
-#: classes/handler/public.php:569
-msgid "Multiple feed URLs found."
-msgstr "Hittade flera flödes-URLer."
-
-#: classes/handler/public.php:573
-#, 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:591
-msgid "Subscribe to selected feed"
-msgstr "Prenumerera på valt flöde"
-
-#: classes/handler/public.php:618
-msgid "Edit subscription options"
-msgstr "Redigera prenumerationsinställningar"
-
-#: classes/handler/public.php:656
-msgid "Password recovery"
-msgstr "Återställning av lösenord"
-
-#: classes/handler/public.php:701
-#, 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:723
-#: classes/pref/users.php:372
-msgid "Reset password"
-msgstr "Återställ lösenord"
-
-#: classes/handler/public.php:733
-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:737
-#: classes/handler/public.php:806
-msgid "Go back"
+#: classes/feeds.php:121
+msgid "Move back"
 msgstr "Gå tillbaka"
 
-#: classes/handler/public.php:775
+#: classes/feeds.php:122
+#: classes/pref/filters.php:400
+#: classes/pref/filters.php:458
+#: classes/pref/filters.php:887
+#: classes/pref/filters.php:914
+msgid "Delete"
+msgstr "Radera"
+
+#: classes/feeds.php:127
+#: classes/feeds.php:132
+#: plugins/mailto/init.php:25
+#: plugins/mail/init.php:76
+msgid "Forward by email"
+msgstr "Skicka med e-post"
+
+#: classes/feeds.php:136
+msgid "Feed:"
+msgstr "Flöde:"
+
+#: classes/feeds.php:193
+#: classes/feeds.php:802
+msgid "Feed not found."
+msgstr "Kunde inte hitta flöde."
+
+#: classes/feeds.php:255
+msgid "Never"
+msgstr "Aldrig"
+
+#: classes/feeds.php:341
+#, php-format
+msgid "Imported at %s"
+msgstr "Importerad kl. %s"
+
+#: classes/feeds.php:391
+#: classes/feeds.php:484
 #, fuzzy
-msgid "[tt-rss] Password reset request"
-msgstr "[tt-rss] Notifikation för ändring av lösenord"
+msgid "mark feed as read"
+msgstr "Flagga kanal som läst"
 
-#: classes/handler/public.php:802
-msgid "Sorry, login and email combination not found."
-msgstr "Beklagar, kombinationen av användarnamn och e-postadress kunde inte hittas."
+#: classes/feeds.php:540
+msgid "Collapse article"
+msgstr "Minimera artikel"
 
-#: classes/handler/public.php:824
-msgid "Your access level is insufficient to run this script."
-msgstr "Du har inte behörighet att köra detta skript."
+#: classes/feeds.php:592
+#: classes/article.php:762
+msgid "Originally from:"
+msgstr "Ursprungligen från:"
 
-#: classes/handler/public.php:850
-msgid "Database Updater"
-msgstr "Databasuppdatering"
+#: classes/feeds.php:603
+#: classes/pref/feeds.php:538
+#: classes/article.php:773
+msgid "Feed URL"
+msgstr "URL för flöde"
 
-#: classes/handler/public.php:915
-msgid "Perform updates"
-msgstr "Utför uppdatering"
+#: classes/feeds.php:630
+#: classes/article.php:729
+msgid "Edit tags for this article"
+msgstr "Redigera taggar för denna artikel"
+
+#: classes/feeds.php:644
+#: classes/article.php:625
+#, fuzzy
+msgid "comment"
+msgid_plural "comments"
+msgstr[0] "Kommentarer?"
+msgstr[1] "Kommentarer?"
+
+#: classes/feeds.php:648
+#: classes/article.php:629
+#, fuzzy
+msgid "comments"
+msgstr "Kommentarer?"
+
+#: classes/feeds.php:686
+msgid "No unread articles found to display."
+msgstr "Hittade inga olästa artiklar."
+
+#: classes/feeds.php:689
+msgid "No updated articles found to display."
+msgstr "Hittade inga uppdaterade artiklar."
+
+#: classes/feeds.php:692
+msgid "No starred articles found to display."
+msgstr "Hittade inga stjärnmarkerade artiklar."
+
+#: classes/feeds.php:696
+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:698
+msgid "No articles found to display."
+msgstr "Hittade inga artiklar att visa."
+
+#: classes/feeds.php:714
+#: classes/feeds.php:905
+#, php-format
+msgid "Feeds last updated at %s"
+msgstr "Flöden senast uppdaterade %s"
+
+#: classes/feeds.php:726
+#: classes/feeds.php:917
+msgid "Some feeds have update errors (click for details)"
+msgstr "Vissa flöden har uppdateringsfel (klicka för detaljer)"
+
+#: classes/feeds.php:894
+msgid "No feed selected."
+msgstr "Inget flöde valt."
+
+#: classes/feeds.php:958
+#: classes/feeds.php:966
+msgid "Feed or site URL"
+msgstr "URL för flöde eller webbplats"
+
+#: classes/feeds.php:972
+#: classes/pref/feeds.php:559
+#: classes/pref/feeds.php:800
+#: classes/pref/feeds.php:1632
+msgid "Place in category:"
+msgstr "Placera i kategori:"
+
+#: classes/feeds.php:980
+msgid "Available feeds"
+msgstr "Tillgängliga flöden"
+
+#: classes/feeds.php:992
+#: classes/pref/feeds.php:621
+#: classes/pref/feeds.php:848
+#: classes/pref/users.php:61
+msgid "Authentication"
+msgstr "Autentisering"
+
+#: classes/feeds.php:996
+#: classes/pref/feeds.php:625
+#: classes/pref/feeds.php:852
+#: classes/pref/feeds.php:1646
+#: classes/pref/users.php:403
+msgid "Login"
+msgstr "Användarnamn"
+
+#: classes/feeds.php:1000
+#: classes/pref/feeds.php:631
+#: classes/pref/feeds.php:860
+#: classes/pref/feeds.php:1649
+#: classes/pref/prefs.php:243
+msgid "Password"
+msgstr "Lösenord"
+
+#: classes/feeds.php:1011
+#: classes/pref/feeds.php:645
+msgid "This feed requires authentication."
+msgstr "Detta flöde kräver autentisering."
+
+#: classes/feeds.php:1014
+#: classes/feeds.php:1070
+#: classes/pref/feeds.php:1668
+msgid "Subscribe"
+msgstr "Prenumerera"
+
+#: classes/feeds.php:1017
+msgid "More feeds"
+msgstr "Fler flöden"
+
+#: classes/feeds.php:1020
+#: classes/feeds.php:1072
+#: classes/feeds.php:1111
+#: classes/pref/labels.php:84
+#: classes/pref/filters.php:528
+#: classes/pref/filters.php:945
+#: classes/pref/filters.php:1022
+#: classes/pref/filters.php:1115
+#: classes/pref/feeds.php:774
+#: classes/pref/feeds.php:916
+#: classes/pref/feeds.php:1669
+#: classes/pref/users.php:105
+#: classes/pref/prefs.php:984
+#: classes/article.php:238
+#: classes/handler/public.php:443
+#: classes/handler/public.php:477
+#: plugins/mail/init.php:179
+#: plugins/note/init.php:60
+msgid "Cancel"
+msgstr "Avbryt"
+
+#: classes/feeds.php:1042
+#: classes/feeds.php:1110
+#: classes/pref/filters.php:788
+#: classes/pref/feeds.php:1178
+#: classes/pref/users.php:345
+#: js/tt-rss.js:152
+msgid "Search"
+msgstr "Sök"
+
+#: classes/feeds.php:1046
+msgid "Popular feeds"
+msgstr "Populära flöden"
+
+#: classes/feeds.php:1047
+msgid "Feed archive"
+msgstr "Flödesarkiv"
+
+#: classes/feeds.php:1050
+msgid "limit:"
+msgstr "gräns:"
+
+#: classes/feeds.php:1071
+#: classes/pref/labels.php:282
+#: classes/pref/filters.php:518
+#: classes/pref/filters.php:814
+#: classes/pref/feeds.php:751
+#: classes/pref/users.php:369
+msgid "Remove"
+msgstr "Ta bort"
+
+#: classes/feeds.php:1084
+msgid "Look for"
+msgstr "Sök efter"
+
+#: classes/feeds.php:1092
+#, php-format
+msgid "in %s"
+msgstr ""
+
+#: classes/feeds.php:1097
+msgid "Used for word stemming"
+msgstr ""
+
+#: classes/feeds.php:1106
+#, fuzzy
+msgid "Search syntax"
+msgstr "Sök"
+
+#: classes/feeds.php:1563
+msgid "Starred articles"
+msgstr "Stjärnmärkta artiklar"
+
+#: classes/feeds.php:1565
+msgid "Published articles"
+msgstr "Publicerade artiklar"
+
+#: classes/feeds.php:1567
+msgid "Fresh articles"
+msgstr "Nya artiklar"
+
+#: classes/feeds.php:1571
+msgid "Archived articles"
+msgstr "Arkiverade artiklar"
+
+#: classes/feeds.php:1573
+msgid "Recently read"
+msgstr "Nyligen lästa"
+
+#: classes/feeds.php:1694
+msgid "Special"
+msgstr "Special"
+
+#: classes/feeds.php:1951
+#, php-format
+msgid "Search results: %s"
+msgstr "Sökresultat: %s"
 
 #: classes/pref/labels.php:25
 #: classes/pref/filters.php:377
@@ -1219,201 +1219,195 @@ msgstr "Förgrund:"
 msgid "Background:"
 msgstr "Bakgrund:"
 
+#: classes/pref/labels.php:82
+#: classes/pref/filters.php:525
+#: classes/pref/feeds.php:773
+#: classes/pref/feeds.php:913
+#: classes/pref/users.php:103
+#: classes/pref/prefs.php:982
+#: classes/article.php:236
+#: plugins/af_zz_imgproxy/init.php:238
+#: plugins/af_redditimgur/init.php:66
+#: plugins/af_psql_trgm/init.php:188
+#: plugins/af_readability/init.php:80
+#: plugins/nsfw/init.php:85
+#: plugins/mail/init.php:65
+#: plugins/note/init.php:58
+msgid "Save"
+msgstr "Spara"
+
 #: classes/pref/labels.php:244
 #, php-format
 msgid "Created label <b>%s</b>"
 msgstr "Skapade etikett <b>%s</b>"
 
 #: classes/pref/labels.php:270
-#: classes/pref/users.php:356
-#: classes/pref/feeds.php:1183
-#: classes/pref/feeds.php:1414
-#: classes/pref/feeds.php:1479
 #: classes/pref/filters.php:388
 #: classes/pref/filters.php:446
 #: classes/pref/filters.php:792
 #: classes/pref/filters.php:875
 #: classes/pref/filters.php:902
+#: classes/pref/feeds.php:1182
+#: classes/pref/feeds.php:1413
+#: classes/pref/feeds.php:1478
+#: classes/pref/users.php:355
 #: classes/pref/prefs.php:993
 msgid "Select"
 msgstr "Markera"
 
-#: classes/pref/labels.php:273
-#: classes/pref/users.php:359
-#: classes/pref/feeds.php:1186
-#: classes/pref/feeds.php:1417
-#: classes/pref/feeds.php:1482
-#: classes/pref/filters.php:391
-#: classes/pref/filters.php:449
-#: classes/pref/filters.php:795
-#: classes/pref/filters.php:878
-#: classes/pref/filters.php:905
-#: classes/pref/prefs.php:996
-#: classes/feeds.php:102
-msgid "All"
-msgstr "Alla"
-
-#: classes/pref/labels.php:275
-#: classes/pref/users.php:361
-#: classes/pref/feeds.php:1188
-#: classes/pref/feeds.php:1419
-#: classes/pref/feeds.php:1484
-#: classes/pref/filters.php:393
-#: classes/pref/filters.php:451
-#: classes/pref/filters.php:797
-#: classes/pref/filters.php:880
-#: classes/pref/filters.php:907
-#: classes/pref/prefs.php:998
-#: classes/feeds.php:105
-msgid "None"
-msgstr "Ingen"
-
-#: classes/pref/labels.php:282
-#: classes/pref/users.php:370
-#: classes/pref/feeds.php:752
-#: classes/pref/filters.php:518
-#: classes/pref/filters.php:814
-#: classes/feeds.php:1088
-msgid "Remove"
-msgstr "Ta bort"
-
 #: classes/pref/labels.php:285
 msgid "Clear colors"
 msgstr "Rensa färger"
 
-#: classes/pref/users.php:6
-#: classes/pref/system.php:8
-msgid "Your access level is insufficient to open this tab."
-msgstr "Du saknar behörighet för att öppna denna flik"
-
-#: classes/pref/users.php:26
+#: classes/pref/filters.php:155
 #, fuzzy
-msgid "Edit user"
-msgstr "Redigera regel"
+msgid "Preview article"
+msgstr "Nya artiklar"
 
-#: classes/pref/users.php:61
-#: classes/pref/feeds.php:622
-#: classes/pref/feeds.php:849
-#: classes/feeds.php:1009
-msgid "Authentication"
-msgstr "Autentisering"
+#: classes/pref/filters.php:267
+#: classes/pref/filters.php:573
+msgid "(inverse)"
+msgstr "(invertera)"
 
-#: classes/pref/users.php:64
-msgid "Access level: "
-msgstr "Behörighetsnivå: "
-
-#: classes/pref/users.php:82
-#: classes/pref/feeds.php:648
-#: classes/pref/feeds.php:867
-msgid "Options"
-msgstr "Alternativ"
-
-#: classes/pref/users.php:96
-#: js/prefs.js:479
-msgid "User details"
-msgstr "Användardetaljer"
-
-#: classes/pref/users.php:136
-#: classes/pref/users.php:407
-msgid "Registered"
-msgstr "Registrerad"
-
-#: classes/pref/users.php:137
-msgid "Last logged in"
-msgstr "Senast inloggad"
-
-#: classes/pref/users.php:145
-msgid "Subscribed feeds count"
-msgstr "Antal flödesprenumerationer"
-
-#: classes/pref/users.php:146
-#, fuzzy
-msgid "Stored articles"
-msgstr "Stjärnmärkta artiklar"
-
-#: classes/pref/users.php:150
-#: classes/pref/users.php:406
-msgid "Subscribed feeds"
-msgstr "Prenumererade flöden"
-
-#: classes/pref/users.php:176
-msgid "User not found"
-msgstr "Hittade inte användaren"
-
-#: classes/pref/users.php:246
+#: classes/pref/filters.php:263
+#: classes/pref/filters.php:572
 #, php-format
-msgid "Added user <b>%s</b> with password <b>%s</b>"
-msgstr "Lade till användare <b>%s</b> med lösenord <b>%s</b>"
+msgid "%s on %s in %s %s"
+msgstr "%s på %s i %s %s"
 
-#: classes/pref/users.php:253
-#, php-format
-msgid "Could not create user <b>%s</b>"
-msgstr "Kunde inte skapa användare <b>%s</b>"
+#: classes/pref/filters.php:383
+#: classes/pref/filters.php:870
+#: classes/pref/filters.php:977
+msgid "Match"
+msgstr "Matcha"
 
-#: classes/pref/users.php:257
-#, php-format
-msgid "User <b>%s</b> already exists."
-msgstr "Användaren <b>%s</b> finns redan."
+#: classes/pref/filters.php:397
+#: classes/pref/filters.php:455
+#: classes/pref/filters.php:884
+#: classes/pref/filters.php:911
+msgid "Add"
+msgstr "Lägg till"
 
-#: classes/pref/users.php:285
-#, 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/filters.php:441
+#: classes/pref/filters.php:897
+msgid "Apply actions"
+msgstr "Tillämpa åtgärder"
 
-#: classes/pref/users.php:287
-#, 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/filters.php:492
+#: classes/pref/filters.php:926
+msgid "Enabled"
+msgstr "Aktiverat"
 
-#: classes/pref/users.php:311
-msgid "[tt-rss] Password change notification"
-msgstr "[tt-rss] Notifikation för ändring av lösenord"
+#: classes/pref/filters.php:501
+#: classes/pref/filters.php:929
+msgid "Match any rule"
+msgstr "Matcha alla regler"
 
-#: classes/pref/users.php:346
-#: classes/pref/feeds.php:1179
-#: classes/pref/filters.php:788
-#: classes/feeds.php:1059
-#: classes/feeds.php:1127
-#: js/tt-rss.js:165
-msgid "Search"
-msgstr "Sök"
+#: classes/pref/filters.php:510
+#: classes/pref/filters.php:932
+msgid "Inverse matching"
+msgstr "Invertera matchning"
 
-#: classes/pref/users.php:364
-msgid "Create user"
-msgstr "Skapa användare"
+#: classes/pref/filters.php:522
+#: classes/pref/filters.php:939
+msgid "Test"
+msgstr "Test"
+
+#: classes/pref/filters.php:804
+msgid "Combine"
+msgstr "Kombinera"
 
-#: classes/pref/users.php:368
 #: classes/pref/filters.php:807
+#: classes/pref/users.php:367
 msgid "Edit"
 msgstr "Redigera"
 
-#: classes/pref/users.php:404
-#: classes/pref/feeds.php:626
-#: classes/pref/feeds.php:853
-#: classes/pref/feeds.php:1649
-#: classes/feeds.php:1013
-msgid "Login"
-msgstr "Användarnamn"
+#: classes/pref/filters.php:810
+#: classes/pref/feeds.php:1198
+#: classes/pref/feeds.php:1212
+msgid "Reset sort order"
+msgstr "Återställ sorteringsordning"
 
-#: classes/pref/users.php:405
-msgid "Access Level"
-msgstr "Behörighetsnivå"
+#: classes/pref/filters.php:942
+msgid "Create"
+msgstr "Skapa"
 
-#: classes/pref/users.php:408
-msgid "Last login"
-msgstr "Senaste inloggning"
+#: classes/pref/filters.php:987
+msgid "Regular expression, without outer delimiters (i.e. slashes)"
+msgstr ""
 
-#: classes/pref/users.php:427
-msgid "Click to edit"
-msgstr "Klicka för att redigera"
+#: classes/pref/filters.php:993
+msgid "Inverse regular expression matching"
+msgstr "Invertera matchning av regulära uttryck"
 
-#: classes/pref/users.php:447
-msgid "No users defined."
-msgstr "Inga användare definierade."
+#: classes/pref/filters.php:995
+msgid "on field"
+msgstr "i fält"
 
-#: classes/pref/users.php:449
-msgid "No matching users found."
-msgstr "Hittade inga matchande användare."
+#: classes/pref/filters.php:1001
+#: js/PrefFilterTree.js:44
+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:764
+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:786
+msgid "Add action"
+msgstr "Lägg till aktivitet"
+
+#: classes/pref/filters.php:1139
+msgid "[No caption]"
+msgstr "[Inge titel]"
+
+#: classes/pref/filters.php:1141
+#, 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:1155
+#, fuzzy
+msgid "matches any rule"
+msgstr "Matcha alla regler"
+
+#: classes/pref/filters.php:1158
+#, 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/system.php:8
+#: classes/pref/users.php:6
+msgid "Your access level is insufficient to open this tab."
+msgstr "Du saknar behörighet för att öppna denna flik"
 
 #: classes/pref/system.php:29
 msgid "Error Log"
@@ -1459,386 +1453,316 @@ msgid_plural "(%d feeds)"
 msgstr[0] "(%d kanaler)"
 msgstr[1] "(%d kanaler)"
 
-#: classes/pref/feeds.php:514
+#: classes/pref/feeds.php:513
 #: classes/pref/prefs.php:18
 msgid "General"
 msgstr "Generellt"
 
-#: classes/pref/feeds.php:528
+#: classes/pref/feeds.php:527
 msgid "Feed Title"
 msgstr "Flödestitel"
 
-#: classes/pref/feeds.php:560
-#: classes/pref/feeds.php:801
-#: classes/pref/feeds.php:1635
-#: classes/feeds.php:989
-msgid "Place in category:"
-msgstr "Placera i kategori:"
+#: classes/pref/feeds.php:536
+#: classes/handler/public.php:417
+msgid "URL:"
+msgstr "URL:"
 
-#: classes/pref/feeds.php:572
+#: classes/pref/feeds.php:571
 #, fuzzy
 msgid "Site URL:"
 msgstr "URL för artikel:"
 
-#: classes/pref/feeds.php:574
+#: classes/pref/feeds.php:573
 #, fuzzy
 msgid "Site URL"
 msgstr "URL för flöde"
 
-#: classes/pref/feeds.php:585
-#: classes/pref/feeds.php:815
+#: classes/pref/feeds.php:584
+#: classes/pref/feeds.php:814
 #, fuzzy
 msgid "Language:"
 msgstr "Språk"
 
-#: classes/pref/feeds.php:592
-#: classes/pref/feeds.php:824
+#: classes/pref/feeds.php:591
+#: classes/pref/feeds.php:823
 msgid "Update"
 msgstr "Uppdatera"
 
-#: classes/pref/feeds.php:607
-#: classes/pref/feeds.php:840
+#: classes/pref/feeds.php:606
+#: classes/pref/feeds.php:839
 msgid "Article purging:"
 msgstr "Artikelrensning:"
 
-#: classes/pref/feeds.php:632
-#: classes/pref/feeds.php:861
-#: classes/pref/feeds.php:1652
-#: classes/pref/prefs.php:243
-#: classes/feeds.php:1017
-msgid "Password"
-msgstr "Lösenord"
-
-#: classes/pref/feeds.php:636
+#: classes/pref/feeds.php:635
 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:646
-#: classes/feeds.php:1028
-msgid "This feed requires authentication."
-msgstr "Detta flöde kräver autentisering."
+#: classes/pref/feeds.php:647
+#: classes/pref/feeds.php:866
+#: classes/pref/users.php:82
+msgid "Options"
+msgstr "Alternativ"
 
-#: classes/pref/feeds.php:662
-#: classes/pref/feeds.php:871
+#: classes/pref/feeds.php:661
+#: classes/pref/feeds.php:870
 msgid "Hide from Popular feeds"
 msgstr "Dölj från populära flöden"
 
-#: classes/pref/feeds.php:674
-#: classes/pref/feeds.php:877
+#: classes/pref/feeds.php:673
+#: classes/pref/feeds.php:876
 msgid "Include in e-mail digest"
 msgstr "Inkludera i e-postsammanfattning"
 
-#: classes/pref/feeds.php:687
-#: classes/pref/feeds.php:883
+#: classes/pref/feeds.php:686
+#: classes/pref/feeds.php:882
 msgid "Always display image attachments"
 msgstr "Visa alltid bilder"
 
-#: classes/pref/feeds.php:700
-#: classes/pref/feeds.php:891
+#: classes/pref/feeds.php:699
+#: classes/pref/feeds.php:890
 #, fuzzy
 msgid "Do not embed media"
 msgstr "Bädda inte in bilder"
 
-#: classes/pref/feeds.php:713
-#: classes/pref/feeds.php:899
+#: classes/pref/feeds.php:712
+#: classes/pref/feeds.php:898
 msgid "Cache media"
 msgstr ""
 
-#: classes/pref/feeds.php:725
-#: classes/pref/feeds.php:905
+#: classes/pref/feeds.php:724
+#: classes/pref/feeds.php:904
 msgid "Mark updated articles as unread"
 msgstr "Makera uppdaterade artiklar som olästa"
 
-#: classes/pref/feeds.php:729
+#: classes/pref/feeds.php:728
 msgid "Icon"
 msgstr "Ikon"
 
-#: classes/pref/feeds.php:743
-#: classes/pref/feeds.php:1284
+#: classes/pref/feeds.php:742
+#: classes/pref/feeds.php:1283
 #: plugins/import_export/init.php:71
 #, fuzzy
 msgid "Choose file..."
 msgstr "Skapa filter..."
 
-#: classes/pref/feeds.php:750
+#: classes/pref/feeds.php:749
 msgid "Replace"
 msgstr "Ersätt"
 
-#: classes/pref/feeds.php:757
+#: classes/pref/feeds.php:756
 #: classes/pref/prefs.php:679
 msgid "Plugins"
 msgstr "Tillägg"
 
-#: classes/pref/feeds.php:1154
+#: classes/pref/feeds.php:1153
 msgid "Feeds with errors"
 msgstr "Flöden med fel"
 
-#: classes/pref/feeds.php:1161
+#: classes/pref/feeds.php:1160
 msgid "Inactive feeds"
 msgstr "Inaktiva flöden"
 
-#: classes/pref/feeds.php:1197
+#: classes/pref/feeds.php:1196
 msgid "Edit selected feeds"
 msgstr "Redigera valda flöden"
 
-#: classes/pref/feeds.php:1199
-#: classes/pref/feeds.php:1213
-#: classes/pref/filters.php:810
-msgid "Reset sort order"
-msgstr "Återställ sorteringsordning"
-
-#: classes/pref/feeds.php:1201
-#: js/prefs.js:1462
+#: classes/pref/feeds.php:1200
+#: js/prefs.js:1171
 msgid "Batch subscribe"
 msgstr "Massprenumerera"
 
-#: classes/pref/feeds.php:1208
+#: classes/pref/feeds.php:1207
 msgid "Categories"
 msgstr "Kategorier"
 
-#: classes/pref/feeds.php:1211
+#: classes/pref/feeds.php:1210
 msgid "Add category"
 msgstr "Lägg till kategori"
 
-#: classes/pref/feeds.php:1215
+#: classes/pref/feeds.php:1214
 msgid "Remove selected"
 msgstr "Ta bort markerade"
 
-#: classes/pref/feeds.php:1272
+#: classes/pref/feeds.php:1271
 msgid "OPML"
 msgstr "OPML"
 
-#: classes/pref/feeds.php:1274
+#: classes/pref/feeds.php:1273
 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:1275
+#: classes/pref/feeds.php:1274
 msgid "Only main settings profile can be migrated using OPML."
 msgstr "Endast huvudprofilens inställningar kan migreras med OPML."
 
-#: classes/pref/feeds.php:1290
+#: classes/pref/feeds.php:1289
 msgid "Import my OPML"
 msgstr "Importera OPML"
 
-#: classes/pref/feeds.php:1296
+#: classes/pref/feeds.php:1295
 msgid "Filename:"
 msgstr "Filnamn:"
 
-#: classes/pref/feeds.php:1298
+#: classes/pref/feeds.php:1297
 msgid "Include settings"
 msgstr "Inkludera inställningar"
 
-#: classes/pref/feeds.php:1302
+#: classes/pref/feeds.php:1301
 msgid "Export OPML"
 msgstr "Exportera OPML"
 
-#: classes/pref/feeds.php:1306
+#: classes/pref/feeds.php:1305
 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:1310
+#: classes/pref/feeds.php:1309
 msgid "Public OPML URL"
 msgstr "Publik OPML-URL"
 
-#: classes/pref/feeds.php:1311
+#: classes/pref/feeds.php:1310
 msgid "Display published OPML URL"
 msgstr "Visa publicerad OPML-URL"
 
-#: classes/pref/feeds.php:1318
+#: classes/pref/feeds.php:1317
 msgid "Published & shared articles / Generated feeds"
 msgstr "Publicerade och delade artiklar / Genererade flöden"
 
-#: classes/pref/feeds.php:1320
+#: classes/pref/feeds.php:1319
 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:1327
-#: classes/feeds.php:54
-#: classes/feeds.php:140
-msgid "View as RSS"
-msgstr "Visa som RSS"
-
-#: classes/pref/feeds.php:1328
 msgid "Display URL"
 msgstr "Visa URL"
 
-#: classes/pref/feeds.php:1331
+#: classes/pref/feeds.php:1330
 msgid "Clear all generated URLs"
 msgstr "Rensa alla genererade URLer"
 
-#: classes/pref/feeds.php:1410
+#: classes/pref/feeds.php:1409
 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:1444
-#: classes/pref/feeds.php:1509
+#: classes/pref/feeds.php:1443
+#: classes/pref/feeds.php:1508
 msgid "Click to edit feed"
 msgstr "Klicka för att redigera flöde"
 
-#: classes/pref/feeds.php:1462
-#: classes/pref/feeds.php:1529
+#: classes/pref/feeds.php:1461
+#: classes/pref/feeds.php:1528
 msgid "Unsubscribe from selected feeds"
 msgstr "Ta bort prenumeration för valda flöden"
 
-#: classes/pref/feeds.php:1632
+#: classes/pref/feeds.php:1629
 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:1641
+#: classes/pref/feeds.php:1638
 msgid "Feeds to subscribe, One per line"
 msgstr "Flöden att prenumerera på, ett per rad"
 
-#: classes/pref/feeds.php:1664
+#: classes/pref/feeds.php:1661
 msgid "Feeds require authentication."
 msgstr "Flödet kräver inloggning."
 
-#: classes/pref/feeds.php:1671
-#: classes/feeds.php:1031
-#: classes/feeds.php:1087
-msgid "Subscribe"
-msgstr "Prenumerera"
-
-#: classes/pref/filters.php:155
+#: classes/pref/users.php:26
 #, fuzzy
-msgid "Preview article"
-msgstr "Nya artiklar"
+msgid "Edit user"
+msgstr "Redigera regel"
 
-#: classes/pref/filters.php:267
-#: classes/pref/filters.php:573
-msgid "(inverse)"
-msgstr "(invertera)"
+#: classes/pref/users.php:64
+msgid "Access level: "
+msgstr "Behörighetsnivå: "
 
-#: classes/pref/filters.php:263
-#: classes/pref/filters.php:572
+#: classes/pref/users.php:96
+#: js/prefs.js:403
+msgid "User details"
+msgstr "Användardetaljer"
+
+#: classes/pref/users.php:136
+#: classes/pref/users.php:406
+msgid "Registered"
+msgstr "Registrerad"
+
+#: classes/pref/users.php:137
+msgid "Last logged in"
+msgstr "Senast inloggad"
+
+#: classes/pref/users.php:145
+msgid "Subscribed feeds count"
+msgstr "Antal flödesprenumerationer"
+
+#: classes/pref/users.php:146
+#, fuzzy
+msgid "Stored articles"
+msgstr "Stjärnmärkta artiklar"
+
+#: classes/pref/users.php:150
+#: classes/pref/users.php:405
+msgid "Subscribed feeds"
+msgstr "Prenumererade flöden"
+
+#: classes/pref/users.php:176
+msgid "User not found"
+msgstr "Hittade inte användaren"
+
+#: classes/pref/users.php:246
 #, php-format
-msgid "%s on %s in %s %s"
-msgstr "%s på %s i %s %s"
+msgid "Added user <b>%s</b> with password <b>%s</b>"
+msgstr "Lade till användare <b>%s</b> med lösenord <b>%s</b>"
 
-#: classes/pref/filters.php:383
-#: classes/pref/filters.php:870
-#: classes/pref/filters.php:977
-msgid "Match"
-msgstr "Matcha"
+#: classes/pref/users.php:253
+#, php-format
+msgid "Could not create user <b>%s</b>"
+msgstr "Kunde inte skapa användare <b>%s</b>"
 
-#: classes/pref/filters.php:397
-#: classes/pref/filters.php:455
-#: classes/pref/filters.php:884
-#: classes/pref/filters.php:911
-msgid "Add"
-msgstr "Lägg till"
+#: classes/pref/users.php:257
+#, php-format
+msgid "User <b>%s</b> already exists."
+msgstr "Användaren <b>%s</b> finns redan."
 
-#: classes/pref/filters.php:400
-#: classes/pref/filters.php:458
-#: classes/pref/filters.php:887
-#: classes/pref/filters.php:914
-#: classes/feeds.php:122
-msgid "Delete"
-msgstr "Radera"
+#: classes/pref/users.php:285
+#, 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/filters.php:441
-#: classes/pref/filters.php:897
-msgid "Apply actions"
-msgstr "Tillämpa åtgärder"
+#: classes/pref/users.php:287
+#, 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/filters.php:492
-#: classes/pref/filters.php:926
-msgid "Enabled"
-msgstr "Aktiverat"
+#: classes/pref/users.php:310
+msgid "[tt-rss] Password change notification"
+msgstr "[tt-rss] Notifikation för ändring av lösenord"
 
-#: classes/pref/filters.php:501
-#: classes/pref/filters.php:929
-msgid "Match any rule"
-msgstr "Matcha alla regler"
+#: classes/pref/users.php:363
+msgid "Create user"
+msgstr "Skapa användare"
 
-#: classes/pref/filters.php:510
-#: classes/pref/filters.php:932
-msgid "Inverse matching"
-msgstr "Invertera matchning"
+#: classes/pref/users.php:371
+#: classes/handler/public.php:747
+msgid "Reset password"
+msgstr "Återställ lösenord"
 
-#: classes/pref/filters.php:522
-#: classes/pref/filters.php:939
-msgid "Test"
-msgstr "Test"
+#: classes/pref/users.php:404
+msgid "Access Level"
+msgstr "Behörighetsnivå"
 
-#: classes/pref/filters.php:804
-msgid "Combine"
-msgstr "Kombinera"
+#: classes/pref/users.php:407
+msgid "Last login"
+msgstr "Senaste inloggning"
 
-#: classes/pref/filters.php:942
-msgid "Create"
-msgstr "Skapa"
+#: classes/pref/users.php:426
+msgid "Click to edit"
+msgstr "Klicka för att redigera"
 
-#: classes/pref/filters.php:987
-msgid "Regular expression, without outer delimiters (i.e. slashes)"
-msgstr ""
+#: classes/pref/users.php:446
+msgid "No users defined."
+msgstr "Inga användare definierade."
 
-#: 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:43
-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:797
-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:819
-msgid "Add action"
-msgstr "Lägg till aktivitet"
-
-#: classes/pref/filters.php:1139
-msgid "[No caption]"
-msgstr "[Inge titel]"
-
-#: classes/pref/filters.php:1141
-#, 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:1155
-#, fuzzy
-msgid "matches any rule"
-msgstr "Matcha alla regler"
-
-#: classes/pref/filters.php:1158
-#, 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:448
+msgid "No matching users found."
+msgstr "Hittade inga matchande användare."
 
 #: classes/pref/prefs.php:19
 msgid "Interface"
@@ -2014,7 +1938,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:1424
+#: js/prefs.js:1136
 msgid "Customize stylesheet"
 msgstr "Anpassa stilmall"
 
@@ -2257,257 +2181,301 @@ msgstr "Radera markerade profiler"
 msgid "Activate profile"
 msgstr "Aktivera profil"
 
-#: classes/feeds.php:53
-msgid "View as RSS feed"
-msgstr "Visa RSS-flöde"
+#: 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"
 
-#: classes/feeds.php:62
-#, php-format
-msgid "Last updated: %s"
-msgstr "Senast uppdaterat: %s"
+#: classes/dlg.php:44
+msgid "Your Public OPML URL is:"
+msgstr "Din publika OPML-URL är:"
 
-#: classes/feeds.php:100
+#: classes/dlg.php:53
+#: classes/dlg.php:178
+#: plugins/share/init.php:125
+msgid "Generate new URL"
+msgstr "Skapa ny URL"
+
+#: classes/dlg.php:67
+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 "Uppdateringsdemon är aktiverad i konfigurationen, men processen körs inte. Detta förhindrar alla flöden från att uppdateras. Starta om processen eller kontakta den som administrerar instansen."
+
+#: classes/dlg.php:71
+#: classes/dlg.php:80
+msgid "Last update:"
+msgstr "Senaste uppdatering:"
+
+#: classes/dlg.php:76
+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 "Uppdateringsprocessen tar för lång tid på sig att uppdatera. Detta kan indikera en låsning eller hängning. Kontrollera processen eller kontakta administratören."
+
+#: classes/dlg.php:169
+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/dlg.php:190
+msgid "You are using default tt-rss password. Please change it in the Preferences (Personal data / Authentication)."
+msgstr ""
+
+#: classes/dlg.php:194
 #, fuzzy
-msgid "Select..."
-msgstr "Markera"
+msgid "Open Preferences"
+msgstr "Inställningar"
 
-#: classes/feeds.php:104
-msgid "Invert"
-msgstr "Invertera"
+#: classes/opml.php:31
+#: classes/opml.php:36
+msgid "OPML Utility"
+msgstr "OPML-verktyg"
 
-#: classes/feeds.php:107
-msgid "Selection toggle:"
-msgstr "Invertera val:"
+#: classes/opml.php:40
+msgid "Importing OPML..."
+msgstr "Importera OPML..."
 
-#: classes/feeds.php:113
-msgid "Selection:"
-msgstr "Markering:"
+#: classes/opml.php:45
+msgid "Return to preferences"
+msgstr "Återgå till inställningar"
 
-#: classes/feeds.php:116
-msgid "Set score"
-msgstr "Ange poäng"
+#: classes/opml.php:301
+#, php-format
+msgid "Adding feed: %s"
+msgstr "Lägger till flöde: %s"
 
-#: classes/feeds.php:119
-msgid "Archive"
-msgstr "Arkiv"
+#: classes/opml.php:312
+#, php-format
+msgid "Duplicate feed: %s"
+msgstr "Dublett av flöde: %s"
 
-#: classes/feeds.php:121
-msgid "Move back"
+#: classes/opml.php:326
+#, php-format
+msgid "Adding label %s"
+msgstr "Lägger till etikett %s"
+
+#: classes/opml.php:329
+#, php-format
+msgid "Duplicate label: %s"
+msgstr "Etikettsdubblett: %s"
+
+#: classes/opml.php:341
+#, php-format
+msgid "Setting preference key %s to %s"
+msgstr "Sätter %s till %s"
+
+#: classes/opml.php:377
+msgid "Adding filter..."
+msgstr "Lägger till filter..."
+
+#: classes/opml.php:512
+#, php-format
+msgid "Processing category: %s"
+msgstr "Bearbetar kategori: %s"
+
+#: classes/opml.php:558
+#, php-format
+msgid "Upload failed with error code %d"
+msgstr "Uppladdningen misslyckades med felkod %d"
+
+#: classes/opml.php:570
+#: plugins/import_export/init.php:471
+msgid "Unable to move uploaded file."
+msgstr "Fel: kunde inte flytta uppladdad fil."
+
+#: classes/opml.php:574
+#: plugins/import_export/init.php:475
+msgid "Error: please upload OPML file."
+msgstr "Fel: vänligen ladda upp en OPMLfil."
+
+#: classes/opml.php:585
+msgid "Error: unable to find moved OPML file."
+msgstr "Fel: kunde inte hitta flyttad OPML-fil."
+
+#: classes/opml.php:594
+msgid "Error while parsing document."
+msgstr "Fel vid tolkning av dokument."
+
+#: classes/article.php:26
+msgid "Article not found."
+msgstr "Hittar inte artikel."
+
+#: classes/article.php:211
+msgid "Tags for this article (separated by commas):"
+msgstr "Taggar för denna artikel (kommaseparerade):"
+
+#: classes/article.php:337
+#: classes/article.php:719
+#: classes/article.php:874
+msgid "no tags"
+msgstr "Inga taggar"
+
+#: classes/article.php:447
+msgid "unknown type"
+msgstr "Okänd typ"
+
+#: classes/article.php:524
+msgid "Attachments"
+msgstr "Bilagor"
+
+#: classes/article.php:688
+msgid " - "
+msgstr " - "
+
+#: classes/article.php:912
+msgid "(edit note)"
+msgstr "(Redigera notering)"
+
+#: classes/handler/public.php:407
+#: plugins/bookmarklets/init.php:40
+msgid "Share with Tiny Tiny RSS"
+msgstr "Dela med Tiny Tiny RSS"
+
+#: classes/handler/public.php:415
+msgid "Title:"
+msgstr "Titel:"
+
+#: classes/handler/public.php:419
+msgid "Content:"
+msgstr "Innehåll:"
+
+#: classes/handler/public.php:421
+msgid "Labels:"
+msgstr "Etiketter:"
+
+#: classes/handler/public.php:440
+msgid "Shared article will appear in the Published feed."
+msgstr "Delad artikel visas i 'Publicerade artiklar'."
+
+#: classes/handler/public.php:442
+msgid "Share"
+msgstr "Dela"
+
+#: classes/handler/public.php:464
+msgid "Not logged in"
+msgstr "Inte inloggad"
+
+#: classes/handler/public.php:527
+msgid "Incorrect username or password"
+msgstr "Felaktigt användarnamn eller lösenord"
+
+#: classes/handler/public.php:581
+#, php-format
+msgid "Already subscribed to <b>%s</b>."
+msgstr "Du prenumererar redan på <b>%s</b>."
+
+#: classes/handler/public.php:584
+#, php-format
+msgid "Subscribed to <b>%s</b>."
+msgstr "Prenumererar på <b>%s</b>."
+
+#: classes/handler/public.php:587
+#, php-format
+msgid "Could not subscribe to <b>%s</b>."
+msgstr "Kunde inte prenumerera på  <b>%s</b>."
+
+#: classes/handler/public.php:590
+#, php-format
+msgid "No feeds found in <b>%s</b>."
+msgstr "Hittade inga flöden i <b>%s</b>."
+
+#: classes/handler/public.php:593
+msgid "Multiple feed URLs found."
+msgstr "Hittade flera flödes-URLer."
+
+#: classes/handler/public.php:597
+#, 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:615
+msgid "Subscribe to selected feed"
+msgstr "Prenumerera på valt flöde"
+
+#: classes/handler/public.php:642
+msgid "Edit subscription options"
+msgstr "Redigera prenumerationsinställningar"
+
+#: classes/handler/public.php:680
+msgid "Password recovery"
+msgstr "Återställning av lösenord"
+
+#: classes/handler/public.php:725
+#, 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:757
+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:761
+#: classes/handler/public.php:830
+msgid "Go back"
 msgstr "Gå tillbaka"
 
-#: classes/feeds.php:127
-#: classes/feeds.php:132
-#: plugins/mail/init.php:76
-#: plugins/mailto/init.php:25
-msgid "Forward by email"
-msgstr "Skicka med e-post"
-
-#: classes/feeds.php:136
-msgid "Feed:"
-msgstr "Flöde:"
-
-#: classes/feeds.php:193
-#: classes/feeds.php:819
-msgid "Feed not found."
-msgstr "Kunde inte hitta flöde."
-
-#: classes/feeds.php:255
-msgid "Never"
-msgstr "Aldrig"
-
-#: classes/feeds.php:342
-#, php-format
-msgid "Imported at %s"
-msgstr "Importerad kl. %s"
-
-#: classes/feeds.php:394
-#: classes/feeds.php:487
+#: classes/handler/public.php:799
 #, fuzzy
-msgid "mark feed as read"
-msgstr "Flagga kanal som läst"
+msgid "[tt-rss] Password reset request"
+msgstr "[tt-rss] Notifikation för ändring av lösenord"
 
-#: classes/feeds.php:542
-msgid "Collapse article"
-msgstr "Minimera artikel"
+#: 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/feeds.php:703
-msgid "No unread articles found to display."
-msgstr "Hittade inga olästa artiklar."
+#: 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/feeds.php:706
-msgid "No updated articles found to display."
-msgstr "Hittade inga uppdaterade artiklar."
+#: classes/handler/public.php:874
+msgid "Database Updater"
+msgstr "Databasuppdatering"
 
-#: classes/feeds.php:709
-msgid "No starred articles found to display."
-msgstr "Hittade inga stjärnmarkerade artiklar."
+#: classes/handler/public.php:939
+msgid "Perform updates"
+msgstr "Utför uppdatering"
 
-#: classes/feeds.php:713
-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:715
-msgid "No articles found to display."
-msgstr "Hittade inga artiklar att visa."
-
-#: classes/feeds.php:731
-#: classes/feeds.php:922
-#, php-format
-msgid "Feeds last updated at %s"
-msgstr "Flöden senast uppdaterade %s"
-
-#: classes/feeds.php:743
-#: classes/feeds.php:934
-msgid "Some feeds have update errors (click for details)"
-msgstr "Vissa flöden har uppdateringsfel (klicka för detaljer)"
-
-#: classes/feeds.php:911
-msgid "No feed selected."
-msgstr "Inget flöde valt."
-
-#: classes/feeds.php:975
-#: classes/feeds.php:983
-msgid "Feed or site URL"
-msgstr "URL för flöde eller webbplats"
-
-#: classes/feeds.php:997
-msgid "Available feeds"
-msgstr "Tillgängliga flöden"
-
-#: classes/feeds.php:1034
-msgid "More feeds"
-msgstr "Fler flöden"
-
-#: classes/feeds.php:1063
-msgid "Popular feeds"
-msgstr "Populära flöden"
-
-#: classes/feeds.php:1064
-msgid "Feed archive"
-msgstr "Flödesarkiv"
-
-#: classes/feeds.php:1067
-msgid "limit:"
-msgstr "gräns:"
-
-#: classes/feeds.php:1101
-msgid "Look for"
-msgstr "Sök efter"
-
-#: classes/feeds.php:1109
-#, php-format
-msgid "in %s"
+#: plugins/af_zz_imgproxy/init.php:208
+msgid "Image proxy settings (af_zz_imgproxy)"
 msgstr ""
 
-#: classes/feeds.php:1114
-msgid "Used for word stemming"
-msgstr ""
-
-#: classes/feeds.php:1123
+#: plugins/af_zz_imgproxy/init.php:232
 #, fuzzy
-msgid "Search syntax"
-msgstr "Sök"
+msgid "Enable proxy for all remote images."
+msgstr "Aktivera kategorier"
 
-#: classes/feeds.php:1577
-msgid "Starred articles"
-msgstr "Stjärnmärkta artiklar"
+#: plugins/af_zz_imgproxy/init.php:236
+#, fuzzy
+msgid "Don't cache files locally."
+msgstr "Cacha bilder lokalt"
 
-#: classes/feeds.php:1579
-msgid "Published articles"
-msgstr "Publicerade artiklar"
-
-#: classes/feeds.php:1581
-msgid "Fresh articles"
-msgstr "Nya artiklar"
-
-#: classes/feeds.php:1585
-msgid "Archived articles"
-msgstr "Arkiverade artiklar"
-
-#: classes/feeds.php:1587
-msgid "Recently read"
-msgstr "Nyligen lästa"
-
-#: classes/feeds.php:1708
-msgid "Special"
-msgstr "Special"
-
-#: classes/feeds.php:1965
-#, php-format
-msgid "Search results: %s"
-msgstr "Sökresultat: %s"
-
-#: 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."
+#: plugins/af_zz_imgproxy/init.php:252
+#: plugins/af_redditimgur/init.php:79
+#, fuzzy
+msgid "Configuration saved"
 msgstr "Inställningar sparade."
 
-#: plugins/note/init.php:28
-#: plugins/note/note.js:11
-msgid "Edit article note"
-msgstr "Redigera artikelnotering"
-
 #: plugins/vf_shared/init.php:17
 #: plugins/vf_shared/init.php:73
 #, fuzzy
 msgid "Shared articles"
 msgstr "Stjärnmärkta artiklar"
 
-#: plugins/auth_internal/init.php:67
-msgid "Please enter your one time password:"
-msgstr "Ange ditt engångslösenord:"
+#: plugins/bookmarklets/init.php:20
+msgid "Bookmarklets"
+msgstr "Bookmarklets"
 
-#: plugins/auth_internal/init.php:208
-msgid "Password has been changed."
-msgstr "Lösenord uppdaterat."
+#: 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 "Dra länken nedan till din webbläsares verktygsrad, öppna det flöde du är intresserad av i webbläsaren och klicka på länken för att prenumerara på det."
 
-#: plugins/auth_internal/init.php:210
-msgid "Old password is incorrect."
-msgstr "Felaktigt gammalt lösenord."
+#: plugins/bookmarklets/init.php:26
+#, php-format
+msgid "Subscribe to %s in Tiny Tiny RSS?"
+msgstr "Prenumerera på %s i Tiny Tiny RSS?"
 
-#: plugins/af_readability/init.php:25
-msgid "Data saved."
-msgstr ""
+#: plugins/bookmarklets/init.php:31
+msgid "Subscribe in Tiny Tiny RSS"
+msgstr "Prenumerera i Tiny Tiny RSS"
 
-#: plugins/af_readability/init.php:41
-#, fuzzy
-msgid "Inline content"
-msgstr "Skrolla artikelinnehåll"
-
-#: plugins/af_readability/init.php:47
-msgid "Readability settings (af_readability)"
-msgstr ""
-
-#: plugins/af_readability/init.php:78
-msgid "Use Readability for pages shared via bookmarklet."
-msgstr ""
-
-#: plugins/af_readability/init.php:90
-#: plugins/af_psql_trgm/init.php:198
-msgid "Currently enabled for (click to edit):"
-msgstr ""
-
-#: plugins/af_readability/init.php:107
-#, fuzzy
-msgid "Readability"
-msgstr "Kontrollera tillgänglighet"
-
-#: plugins/af_readability/init.php:118
-#, fuzzy
-msgid "Inline article content"
-msgstr "Skrolla artikelinnehåll"
+#: plugins/bookmarklets/init.php:34
+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_redditimgur/init.php:30
 msgid "Reddit content settings (af_redditimgur)"
@@ -2521,11 +2489,21 @@ msgstr ""
 msgid "Enable additional duplicate checking"
 msgstr ""
 
-#: plugins/af_redditimgur/init.php:79
-#: plugins/af_zz_imgproxy/init.php:252
-#, fuzzy
-msgid "Configuration saved"
-msgstr "Inställningar sparade."
+#: plugins/af_comics/init.php:49
+msgid "Feeds supported by af_comics"
+msgstr ""
+
+#: plugins/af_comics/init.php:51
+msgid "The following comics are currently supported:"
+msgstr ""
+
+#: plugins/af_comics/init.php:69
+msgid "To subscribe to GoComics use the comic's regular web page as the feed URL (e.g. for the <em>Garfield</em> comic use <code>http://www.gocomics.com/garfield</code>)."
+msgstr ""
+
+#: plugins/af_comics/init.php:71
+msgid "Drop any updated filters into <code>filters.local</code> in plugin directory."
+msgstr ""
 
 #: plugins/af_psql_trgm/init.php:29
 #, php-format
@@ -2565,25 +2543,86 @@ msgstr ""
 msgid "Enable for all feeds:"
 msgstr "Aktivera kategorier"
 
+#: plugins/af_psql_trgm/init.php:198
+#: plugins/af_readability/init.php:90
+msgid "Currently enabled for (click to edit):"
+msgstr ""
+
 #: plugins/af_psql_trgm/init.php:216
 msgid "Similarity (pg_trgm)"
 msgstr ""
 
-#: plugins/af_comics/init.php:49
-msgid "Feeds supported by af_comics"
+#: plugins/af_readability/init.php:25
+msgid "Data saved."
 msgstr ""
 
-#: plugins/af_comics/init.php:51
-msgid "The following comics are currently supported:"
+#: plugins/af_readability/init.php:41
+#, fuzzy
+msgid "Inline content"
+msgstr "Skrolla artikelinnehåll"
+
+#: plugins/af_readability/init.php:47
+msgid "Readability settings (af_readability)"
 msgstr ""
 
-#: plugins/af_comics/init.php:69
-msgid "To subscribe to GoComics use the comic's regular web page as the feed URL (e.g. for the <em>Garfield</em> comic use <code>http://www.gocomics.com/garfield</code>)."
+#: plugins/af_readability/init.php:78
+msgid "Use Readability for pages shared via bookmarklet."
 msgstr ""
 
-#: plugins/af_comics/init.php:71
-msgid "Drop any updated filters into <code>filters.local</code> in plugin directory."
-msgstr ""
+#: plugins/af_readability/init.php:107
+#, fuzzy
+msgid "Readability"
+msgstr "Kontrollera tillgänglighet"
+
+#: plugins/af_readability/init.php:118
+#, fuzzy
+msgid "Inline article content"
+msgstr "Skrolla artikelinnehåll"
+
+#: plugins/mailto/init.php:50
+#: plugins/mailto/init.php:58
+#: plugins/mail/init.php:118
+#: plugins/mail/init.php:124
+msgid "[Forwarded]"
+msgstr "[Vidarebefordrat]"
+
+#: plugins/mailto/init.php:50
+#: plugins/mail/init.php:118
+msgid "Multiple articles"
+msgstr "Flera artiklar"
+
+#: plugins/mailto/init.php:74
+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/mailto/init.php:78
+msgid "Forward selected article(s) by email."
+msgstr "Vidarebefordra markerade artiklar med e-post"
+
+#: plugins/mailto/init.php:81
+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/mailto/init.php:86
+msgid "Close this dialog"
+msgstr "Stäng denna dialogruta"
+
+#: 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/import_export/init.php:53
 msgid "Import and export"
@@ -2652,102 +2691,6 @@ msgstr "Uppladdningen misslyckades med felkod %d"
 msgid "No file uploaded."
 msgstr "Ingen fil uppladdad."
 
-#: plugins/mail/init.php:29
-msgid "Mail addresses saved."
-msgstr ""
-
-#: plugins/mail/init.php:35
-#, fuzzy
-msgid "Mail plugin"
-msgstr "Användartillägg"
-
-#: plugins/mail/init.php:37
-msgid "You can set predefined email addressed here (comma-separated list):"
-msgstr ""
-
-#: plugins/mail/init.php:118
-#: plugins/mail/init.php:124
-#: plugins/mailto/init.php:50
-#: plugins/mailto/init.php:58
-msgid "[Forwarded]"
-msgstr "[Vidarebefordrat]"
-
-#: plugins/mail/init.php:118
-#: plugins/mailto/init.php:50
-msgid "Multiple articles"
-msgstr "Flera artiklar"
-
-#: plugins/mail/init.php:146
-msgid "To:"
-msgstr "Till:"
-
-#: plugins/mail/init.php:161
-msgid "Subject:"
-msgstr "Ämne:"
-
-#: plugins/mail/init.php:178
-msgid "Send e-mail"
-msgstr "Skicka e-post"
-
-#: plugins/close_button/init.php:25
-msgid "Close article"
-msgstr "Stäng artikel"
-
-#: plugins/bookmarklets/init.php:20
-msgid "Bookmarklets"
-msgstr "Bookmarklets"
-
-#: plugins/bookmarklets/init.php:22
-msgid "Drag the link below to your browser toolbar, open the feed you're interested in in your browser and click on the link to subscribe to it."
-msgstr "Dra länken nedan till din webbläsares verktygsrad, öppna det flöde du är intresserad av i webbläsaren och klicka på länken för att prenumerara på det."
-
-#: plugins/bookmarklets/init.php:26
-#, php-format
-msgid "Subscribe to %s in Tiny Tiny RSS?"
-msgstr "Prenumerera på %s i Tiny Tiny RSS?"
-
-#: plugins/bookmarklets/init.php:31
-msgid "Subscribe in Tiny Tiny RSS"
-msgstr "Prenumerera i Tiny Tiny RSS"
-
-#: plugins/bookmarklets/init.php:34
-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/toggle_sidebar/init.php:23
-msgid "Collapse feedlist"
-msgstr "Visa/dölj flödeslista"
-
-#: plugins/af_zz_imgproxy/init.php:208
-msgid "Image proxy settings (af_zz_imgproxy)"
-msgstr ""
-
-#: plugins/af_zz_imgproxy/init.php:232
-#, fuzzy
-msgid "Enable proxy for all remote images."
-msgstr "Aktivera kategorier"
-
-#: plugins/af_zz_imgproxy/init.php:236
-#, fuzzy
-msgid "Don't cache files locally."
-msgstr "Cacha bilder lokalt"
-
-#: plugins/mailto/init.php:74
-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/mailto/init.php:78
-msgid "Forward selected article(s) by email."
-msgstr "Vidarebefordra markerade artiklar med e-post"
-
-#: plugins/mailto/init.php:81
-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/mailto/init.php:86
-msgid "Close this dialog"
-msgstr "Stäng denna dialogruta"
-
 #: plugins/share/init.php:41
 msgid "You can disable all articles shared by unique URLs here."
 msgstr "Du kan inaktivera alla artiklar som delas ut med unik URL här."
@@ -2769,454 +2712,605 @@ msgstr "Du kan dela denna artikel genom följande unika URL:"
 msgid "Unshare article"
 msgstr "Ta bort stjärnmarkering från artikeln"
 
-#: js/FeedTree.js:75
+#: plugins/toggle_sidebar/init.php:23
+msgid "Collapse feedlist"
+msgstr "Visa/dölj flödeslista"
+
+#: plugins/close_button/init.php:25
+msgid "Close article"
+msgstr "Stäng artikel"
+
+#: plugins/mail/init.php:29
+msgid "Mail addresses saved."
+msgstr ""
+
+#: plugins/mail/init.php:35
+#, fuzzy
+msgid "Mail plugin"
+msgstr "Användartillägg"
+
+#: plugins/mail/init.php:37
+msgid "You can set predefined email addressed here (comma-separated list):"
+msgstr ""
+
+#: plugins/mail/init.php:146
+msgid "To:"
+msgstr "Till:"
+
+#: plugins/mail/init.php:161
+msgid "Subject:"
+msgstr "Ämne:"
+
+#: plugins/mail/init.php:178
+msgid "Send e-mail"
+msgstr "Skicka e-post"
+
+#: plugins/note/init.php:28
+#: plugins/note/note.js:11
+msgid "Edit article note"
+msgstr "Redigera artikelnotering"
+
+#: plugins/auth_internal/init.php:67
+msgid "Please enter your one time password:"
+msgstr "Ange ditt engångslösenord:"
+
+#: plugins/auth_internal/init.php:208
+msgid "Password has been changed."
+msgstr "Lösenord uppdaterat."
+
+#: plugins/auth_internal/init.php:210
+msgid "Old password is incorrect."
+msgstr "Felaktigt gammalt lösenord."
+
+#: js/FeedTree.js:76
 #, fuzzy
 msgid "(Un)collapse"
 msgstr "Visa/dölj sidofält"
 
-#: js/PrefFeedTree.js:35
+#: js/PrefFeedTree.js:36
 msgid "Edit category"
 msgstr "Redigera kategori"
 
-#: js/PrefFeedTree.js:42
+#: js/PrefFeedTree.js:43
 msgid "Remove category"
 msgstr "Ta bort kategori"
 
-#: js/PrefFilterTree.js:46
+#: js/PrefFilterTree.js:47
 msgid "Inverse"
 msgstr "Invertera"
 
-#: js/feedlist.js:511
+#: js/feedlist.js:461
 #, 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:514
+#: js/feedlist.js:464
 #, 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:517
+#: js/feedlist.js:467
 #, 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:520
+#: js/feedlist.js:470
 #, fuzzy
 msgid "Mark %w in %s as read?"
 msgstr "Märk alla artiklar i %s som lästa?"
 
-#: js/feedlist.js:523
+#: js/feedlist.js:473
 #, fuzzy
 msgid "search results"
 msgstr "Sökresultat: %s"
 
-#: js/feedlist.js:523
+#: js/feedlist.js:473
 #, fuzzy
 msgid "all articles"
 msgstr "Alla artiklar"
 
-#: js/functions.js:74
+#: js/functions.js:100
 #, fuzzy
 msgid "Close"
 msgstr "stäng"
 
-#: js/functions.js:141
+#: js/functions.js:167
 msgid "Click to close"
 msgstr "Klicka för att stänga"
 
-#: js/functions.js:448
+#: js/functions.js:456
 msgid "Error explained"
 msgstr "Fel förklarat"
 
-#: js/functions.js:592
+#: js/functions.js:490
+msgid "Upload complete."
+msgstr "Uppladdning klar."
+
+#: js/functions.js:508
+msgid "Remove stored feed icon?"
+msgstr "Ta bort sparad ikon för flöden?"
+
+#: js/functions.js:510
+msgid "Removing feed icon..."
+msgstr "Tar bort flödesikon..."
+
+#: js/functions.js:515
+msgid "Feed icon removed."
+msgstr "Flödesikon borttagen."
+
+#: js/functions.js:532
+msgid "Please select an image file to upload."
+msgstr "Välj en bild att ladda upp."
+
+#: js/functions.js:533
+msgid "Upload new icon for this feed?"
+msgstr "Ladda upp ny ikon för detta flöde?"
+
+#: js/functions.js:534
+msgid "Uploading, please wait..."
+msgstr "Laddar upp, vänligen vänta..."
+
+#: js/functions.js:542
+msgid "Please enter label caption:"
+msgstr "Ange titel för etikett:"
+
+#: js/functions.js:575
 msgid "Subscribe to Feed"
 msgstr "Prenumerera på flöde"
 
-#: js/functions.js:621
+#: js/functions.js:602
 msgid "Failed to parse output. This can indicate server timeout and/or network issues. Backend output was logged to browser console."
 msgstr ""
 
-#: js/functions.js:636
+#: js/functions.js:617
 #, perl-format
 msgid "Subscribed to %s"
 msgstr "Prenumererar på %s"
 
-#: js/functions.js:641
+#: js/functions.js:622
 msgid "Specified URL seems to be invalid."
 msgstr "Den angivna URLen verkar vara felaktig."
 
-#: js/functions.js:644
+#: js/functions.js:625
 msgid "Specified URL doesn't seem to contain any feeds."
 msgstr "Den angivna URLen verkar inte innehålla något flöde."
 
-#: js/functions.js:656
+#: js/functions.js:637
 msgid "Expand to select feed"
 msgstr "Expandera för att välja flöde"
 
-#: js/functions.js:668
+#: js/functions.js:649
 #, perl-format
 msgid "Couldn't download the specified URL: %s"
 msgstr "Kunde inte ladda ned följande URL: %s"
 
-#: js/functions.js:672
+#: js/functions.js:653
 #, perl-format
 msgid "XML validation failed: %s"
 msgstr "Validering av XML misslyckades: %s"
 
-#: js/functions.js:676
+#: js/functions.js:657
 msgid "You are already subscribed to this feed."
 msgstr "Du prenumererar redan på detta flöde."
 
-#: js/functions.js:1136
+#: js/functions.js:1098
 msgid "Generate new syndication address for this feed?"
 msgstr "Generera en ny syndikeringsadress för detta flöde?"
 
-#: js/functions.js:1140
-#: js/prefs.js:1095
+#: js/functions.js:1100
+#: js/prefs.js:870
 msgid "Trying to change address..."
 msgstr "Försöker ändra adress..."
 
-#: js/functions.js:1245
-#: js/tt-rss.js:446
-#: js/tt-rss.js:673
+#: js/functions.js:1199
+#: js/tt-rss.js:399
+#: js/tt-rss.js:612
 msgid "You can't edit this kind of feed."
 msgstr "Detta typ av flöde kan inte redigeras."
 
-#: js/functions.js:1260
+#: js/functions.js:1213
 msgid "Edit Feed"
 msgstr "Redigera flöde"
 
-#: js/functions.js:1266
-#: js/prefs.js:100
-#: js/prefs.js:209
-#: js/prefs.js:647
+#: js/functions.js:1217
+#: js/prefs.js:176
+#: js/prefs.js:523
+#: js/prefs.js:1139
+#: js/prefs.js:78
 msgid "Saving data..."
 msgstr "Sparar data..."
 
-#: js/functions.js:1293
+#: js/functions.js:1243
 msgid "More Feeds"
 msgstr "Fler flöden"
 
-#: js/functions.js:1355
-#: js/functions.js:1464
-#: js/prefs.js:398
-#: js/prefs.js:540
-#: js/prefs.js:558
-#: js/prefs.js:1077
+#: js/functions.js:1297
+#: js/functions.js:1383
+#: js/prefs.js:332
+#: js/prefs.js:455
+#: js/prefs.js:473
+#: js/prefs.js:855
 msgid "No feeds are selected."
 msgstr "Inget flöde valt."
 
-#: js/functions.js:1398
+#: js/functions.js:1329
 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:1435
+#: js/functions.js:1360
 msgid "Feeds with update errors"
 msgstr "Flöden med uppdateringsfel"
 
-#: js/functions.js:1446
-#: js/prefs.js:1058
+#: js/functions.js:1369
+#: js/prefs.js:841
 msgid "Remove selected feeds?"
 msgstr "Ta bort markerade flöden?"
 
-#: js/functions.js:1449
-#: js/prefs.js:1061
+#: js/functions.js:1370
+#: js/prefs.js:842
 msgid "Removing selected feeds..."
 msgstr "Tar bort valda flöden..."
 
-#: js/prefs.js:60
-msgid "Please enter login:"
-msgstr "Ange inloggning:"
-
-#: js/prefs.js:67
-msgid "Can't create user: no login specified."
-msgstr "Kan inte skapa användare, ingen inloggning angiven."
-
-#: js/prefs.js:71
-msgid "Adding user..."
-msgstr "Lägger till användare..."
-
-#: js/prefs.js:96
-msgid "User Editor"
-msgstr "Användareditor"
-
-#: js/prefs.js:131
-msgid "Edit Filter"
-msgstr "Redigera filter"
-
-#: js/prefs.js:170
+#: js/prefs.js:143
 msgid "Remove filter?"
 msgstr "Radera filter?"
 
-#: js/prefs.js:175
+#: js/prefs.js:148
 msgid "Removing filter..."
 msgstr "Tar bort filter..."
 
-#: js/prefs.js:292
+#: js/prefs.js:251
 msgid "Remove selected labels?"
 msgstr "Radera markerade etiketter?"
 
-#: js/prefs.js:295
+#: js/prefs.js:252
 msgid "Removing selected labels..."
 msgstr "Tar bort valda etiketter..."
 
-#: js/prefs.js:308
-#: js/prefs.js:1144
+#: js/prefs.js:262
+#: js/prefs.js:909
 msgid "No labels are selected."
 msgstr "Inga etiketter valda."
 
-#: js/prefs.js:320
+#: js/prefs.js:274
 msgid "Remove selected users? Neither default admin nor your account will be removed."
 msgstr "Radera markerade användare? Varken admin eller ditt konto kan raderas."
 
-#: js/prefs.js:323
+#: js/prefs.js:275
 msgid "Removing selected users..."
 msgstr "Tar bort valda användare..."
 
-#: js/prefs.js:338
-#: js/prefs.js:408
-#: js/prefs.js:427
-#: js/prefs.js:461
+#: js/prefs.js:286
+#: js/prefs.js:342
+#: js/prefs.js:361
+#: js/prefs.js:387
 msgid "No users are selected."
 msgstr "Ingen användare vald."
 
-#: js/prefs.js:350
+#: js/prefs.js:297
 msgid "Remove selected filters?"
 msgstr "Radera markerade filter?"
 
-#: js/prefs.js:353
+#: js/prefs.js:298
 msgid "Removing selected filters..."
 msgstr "Tar bort valda filter..."
 
-#: js/prefs.js:366
-#: js/prefs.js:495
-#: js/prefs.js:514
+#: js/prefs.js:308
+#: js/prefs.js:419
+#: js/prefs.js:438
 msgid "No filters are selected."
 msgstr "Inga filter valda."
 
-#: js/prefs.js:378
+#: js/prefs.js:319
 msgid "Unsubscribe from selected feeds?"
 msgstr "Avsluta prenumeration på markerade flöden?"
 
-#: js/prefs.js:382
+#: js/prefs.js:321
 msgid "Unsubscribing from selected feeds..."
 msgstr "Tar bort prenumeration för valda flöden..."
 
-#: js/prefs.js:413
-#: js/prefs.js:432
-#: js/prefs.js:466
+#: js/prefs.js:347
+#: js/prefs.js:366
+#: js/prefs.js:392
 msgid "Please select only one user."
 msgstr "Markera endast en användare."
 
-#: js/prefs.js:436
+#: js/prefs.js:370
 msgid "Reset password of selected user?"
 msgstr "Återställ lösenordet för markerad användare?"
 
-#: js/prefs.js:439
+#: js/prefs.js:371
 msgid "Resetting password for selected user..."
 msgstr "Återställer lösenord för vald användare..."
 
-#: js/prefs.js:500
+#: js/prefs.js:424
 msgid "Please select only one filter."
 msgstr "Markera endast ett filter."
 
-#: js/prefs.js:518
+#: js/prefs.js:442
 msgid "Combine selected filters?"
 msgstr "Slå ihop markerade filter?"
 
-#: js/prefs.js:521
+#: js/prefs.js:443
 msgid "Joining filters..."
 msgstr "Slår ihop filter..."
 
-#: js/prefs.js:580
+#: js/prefs.js:487
 msgid "Edit Multiple Feeds"
 msgstr "Redigera flera flöden"
 
-#: js/prefs.js:604
+#: js/prefs.js:511
 msgid "Save changes to selected feeds?"
 msgstr "Spara ändringar för valda flöden?"
 
-#: js/prefs.js:681
+#: js/prefs.js:552
 msgid "OPML Import"
 msgstr "OPML-import"
 
-#: js/prefs.js:700
+#: js/prefs.js:571
 msgid "Please choose an OPML file first."
 msgstr "Välj en OPML-fil först."
 
-#: js/prefs.js:703
+#: js/prefs.js:574
 #: plugins/import_export/import_export.js:115
 msgid "Importing, please wait..."
 msgstr "Importerar, vänligen vänta..."
 
-#: js/prefs.js:869
+#: js/prefs.js:737
 msgid "Reset to defaults?"
 msgstr "Återställ till standardvärden?"
 
-#: js/prefs.js:1468
-msgid "Subscribing to feeds..."
-msgstr "Prenumererar på flöden..."
+#: js/prefs.js:777
+#, perl-format
+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:1487
-msgid "Clear stored data for this plugin?"
-msgstr "Radera lagrad data för detta tillägg?"
+#: js/prefs.js:778
+msgid "Removing category..."
+msgstr "Tar bort kategori..."
 
-#: js/prefs.js:1501
-msgid "Clear all messages in the error log?"
-msgstr ""
+#: js/prefs.js:794
+msgid "Remove selected categories?"
+msgstr "Radera markekrade kategorier?"
 
-#: js/tt-rss.js:118
+#: js/prefs.js:795
+msgid "Removing selected categories..."
+msgstr "Raderar valda kategorier..."
+
+#: js/prefs.js:805
+msgid "No categories are selected."
+msgstr "Inga kategorier valda."
+
+#: js/prefs.js:812
+msgid "Category title:"
+msgstr "Kategorinamn:"
+
+#: js/prefs.js:815
+msgid "Creating category..."
+msgstr "Skapar kategori..."
+
+#: js/prefs.js:832
+msgid "Feeds without recent updates"
+msgstr "Flöden som inte uppdaterats på länge"
+
+#: js/prefs.js:869
+msgid "Replace current OPML publishing address with a new one?"
+msgstr "Byt nuvarande OPML-adress med en ny?"
+
+#: js/prefs.js:898
+msgid "Reset selected labels to default colors?"
+msgstr "Återställ valda etiketter till standardfärger?"
+
+#: js/prefs.js:926
+msgid "Settings Profiles"
+msgstr "Inställningsprofiler"
+
+#: js/prefs.js:935
+msgid "Remove selected profiles? Active and default profiles will not be removed."
+msgstr "Radera markerade profiler? Aktiva profiler tas inte bort."
+
+#: js/prefs.js:936
+msgid "Removing selected profiles..."
+msgstr "Raderar valda profiler...."
+
+#: js/prefs.js:948
+msgid "No profiles are selected."
+msgstr "Inga profiler valda."
+
+#: js/prefs.js:955
+#: js/prefs.js:997
+msgid "Activate selected profile?"
+msgstr "Aktivera markerad profil?"
+
+#: js/prefs.js:964
+#: js/prefs.js:1008
+msgid "Please choose a profile to activate."
+msgstr "Välj en profil att aktivera."
+
+#: js/prefs.js:969
+msgid "Creating profile..."
+msgstr "Skapar profil..."
+
+#: js/prefs.js:1016
+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:1017
+#: plugins/share/share_prefs.js:3
+msgid "Clearing URLs..."
+msgstr "Rensar URLer..."
+
+#: js/prefs.js:1020
+msgid "Generated URLs cleared."
+msgstr "Genererade URLer rensade."
+
+#: js/prefs.js:1053
+#, fuzzy
+msgid "Rename category to:"
+msgstr "Ta bort kategori"
+
+#: js/prefs.js:1074
+msgid "Label Editor"
+msgstr "Etikettseditor"
+
+#: js/tt-rss.js:111
 msgid "Mark all articles as read?"
 msgstr "Flagga alla artiklar som lästa?"
 
-#: js/tt-rss.js:124
+#: js/tt-rss.js:115
 msgid "Marking all feeds as read..."
 msgstr "Markerar alla flöden som lästa..."
 
-#: js/tt-rss.js:398
+#: js/tt-rss.js:351
 msgid "Please enable mail plugin first."
 msgstr "Aktivera e-post-tillägget först."
 
-#: js/tt-rss.js:527
+#: js/tt-rss.js:477
 msgid "Please enable embed_original plugin first."
 msgstr "Vänligen aktivera tillägget embed_original först."
 
-#: js/tt-rss.js:540
-#: js/tt-rss.js:723
+#: js/tt-rss.js:490
+#: js/tt-rss.js:653
 msgid "Widescreen is not available in combined mode."
 msgstr ""
 
-#: js/tt-rss.js:821
-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:826
-#: js/tt-rss.js:686
-msgid "Please select some feed first."
-msgstr "Välj några flöden först."
-
-#: js/tt-rss.js:831
-#, perl-format
-msgid "Rescore articles in %s?"
-msgstr "Beräkna om poängen för artiklarna i %s?"
-
-#: js/tt-rss.js:834
-msgid "Rescoring articles..."
-msgstr "Räknar om artikelpoäng..."
-
-#: js/viewfeed.js:917
-#: js/viewfeed.js:955
-#: js/viewfeed.js:1003
-#: js/viewfeed.js:1924
-#: plugins/mail/mail.js:7
+#: js/viewfeed.js:444
+#: js/viewfeed.js:461
+#: js/viewfeed.js:484
+#: js/viewfeed.js:521
+#: js/viewfeed.js:542
+#: js/viewfeed.js:651
+#: js/viewfeed.js:685
+#: js/viewfeed.js:727
+#: js/viewfeed.js:1564
 #: plugins/mailto/init.js:7
-#: js/viewfeed.js:675
-#: js/viewfeed.js:697
-#: js/viewfeed.js:718
-#: js/viewfeed.js:777
-#: js/viewfeed.js:805
+#: plugins/mail/mail.js:7
 msgid "No articles are selected."
 msgstr "Inga artiklar valda."
 
-#: js/viewfeed.js:925
+#: js/viewfeed.js:659
 #, 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:927
+#: js/viewfeed.js:661
 #, 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:964
+#: js/viewfeed.js:694
 #, 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:967
+#: js/viewfeed.js:697
 #, 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:969
+#: js/viewfeed.js:698
 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:1009
+#: js/viewfeed.js:733
 #, 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:1029
+#: js/viewfeed.js:753
 msgid "Edit article Tags"
 msgstr "Redigera artikeltaggar"
 
-#: js/viewfeed.js:1035
+#: js/viewfeed.js:757
 msgid "Saving article tags..."
 msgstr "Sparar artikeltaggar..."
 
-#: js/viewfeed.js:1666
+#: js/viewfeed.js:1015
+msgid "No article is selected."
+msgstr "Ingen artikel vald."
+
+#: js/viewfeed.js:1050
+msgid "No articles found to mark"
+msgstr "Hittade inga artiklar att flagga"
+
+#: js/viewfeed.js:1052
+#, perl-format
+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?"
+
+#: js/viewfeed.js:1312
 msgid "Open original article"
 msgstr "Öppna orginalartikeln"
 
-#: js/viewfeed.js:1673
+#: js/viewfeed.js:1319
 msgid "Display article URL"
 msgstr "Visa artikel-URL"
 
-#: js/viewfeed.js:1780
+#: js/viewfeed.js:1426
 msgid "Assign label"
 msgstr "Ange etikett"
 
-#: js/viewfeed.js:1785
+#: js/viewfeed.js:1431
 msgid "Remove label"
 msgstr "Ta bort etikett"
 
-#: js/viewfeed.js:1817
+#: js/viewfeed.js:1463
 #, fuzzy
 msgid "Select articles in group"
 msgstr "Välj artikel under pekare"
 
-#: js/viewfeed.js:1827
+#: js/viewfeed.js:1473
 #, fuzzy
 msgid "Mark group as read"
 msgstr "Markera som läst"
 
-#: js/viewfeed.js:1839
+#: js/viewfeed.js:1485
 msgid "Mark feed as read"
 msgstr "Flagga kanal som läst"
 
-#: js/viewfeed.js:1892
+#: js/viewfeed.js:1538
 msgid "Please enter new score for selected articles:"
 msgstr "Ange ny poäng för markerade artiklar:"
 
-#: js/viewfeed.js:1955
+#: js/viewfeed.js:1571
 msgid "Please enter new score for this article:"
 msgstr "Ange ny poäng för denna artikel:"
 
-#: js/viewfeed.js:1986
+#: js/viewfeed.js:1591
 msgid "Article URL:"
 msgstr "URL för artikel:"
 
-#: plugins/note/note.js:17
-msgid "Saving article note..."
-msgstr "Sparar artikelnotering..."
+#: 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/af_psql_trgm/init.js:11
 #, fuzzy
 msgid "Related articles"
 msgstr "Radera artikel"
 
+#: plugins/mailto/init.js:21
+#: plugins/mail/mail.js:21
+msgid "Forward article by email"
+msgstr "Vidarebefordra artikel via e-post"
+
+#: plugins/shorten_expanded/init.js:43
+#, fuzzy
+msgid "Click to expand article"
+msgstr "Klicka för att expandera artikeln."
+
 #: plugins/import_export/import_export.js:13
 msgid "Export Data"
 msgstr "Exportera data"
@@ -3236,266 +3330,176 @@ 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
-msgid "Forward article by email"
-msgstr "Vidarebefordra artikel via e-post"
+#: plugins/share/share_prefs.js:2
+msgid "This will invalidate all previously shared article URLs. Continue?"
+msgstr "Detta tar bort alla tidigare delade artikel-URLer. Fortsätt?"
 
-#: plugins/mail/mail.js:36
-msgid "Error sending email:"
-msgstr ""
-
-#: plugins/mail/mail.js:38
-#, fuzzy
-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:45
-#, fuzzy
-msgid "Click to expand article"
-msgstr "Klicka för att expandera artikeln."
+#: plugins/share/share_prefs.js:8
+msgid "Shared URLs cleared."
+msgstr "Delade URLer rensade."
 
 #: plugins/share/share.js:10
 msgid "Share article by URL"
 msgstr "Dela artikel via URL"
 
-#: plugins/share/share.js:14
+#: plugins/share/share.js:13
 #, fuzzy
 msgid "Generate new share URL for this article?"
 msgstr "Ange ny poäng för denna artikel:"
 
-#: plugins/share/share.js:18
+#: plugins/share/share.js:15
 #, fuzzy
 msgid "Trying to change URL..."
 msgstr "Försöker ändra adress..."
 
-#: plugins/share/share.js:55
+#: plugins/share/share.js:48
 #, fuzzy
 msgid "Remove sharing for this article?"
 msgstr "Redigera taggar för denna artikel"
 
-#: plugins/share/share.js:59
+#: plugins/share/share.js:50
 #, fuzzy
 msgid "Trying to unshare..."
 msgstr "Försöker ändra adress..."
 
-#: plugins/share/share_prefs.js:3
-msgid "This will invalidate all previously shared article URLs. Continue?"
-msgstr "Detta tar bort alla tidigare delade artikel-URLer. Fortsätt?"
+#: plugins/mail/mail.js:30
+msgid "Error sending email:"
+msgstr ""
 
-#: plugins/share/share_prefs.js:6
-#: js/prefs.js:1277
-msgid "Clearing URLs..."
-msgstr "Rensar URLer..."
+#: plugins/mail/mail.js:32
+#, fuzzy
+msgid "Your message has been sent."
+msgstr "Dina personliga data sparas."
 
-#: plugins/share/share_prefs.js:13
-msgid "Shared URLs cleared."
-msgstr "Delade URLer rensade."
+#: plugins/note/note.js:15
+msgid "Saving article note..."
+msgstr "Sparar artikelnotering..."
 
-#: js/feedlist.js:204
+#: js/feedlist.js:168
 #, fuzzy
 msgid "Your password is at default value"
 msgstr "Byt lösenord."
 
-#: js/feedlist.js:453
+#: js/feedlist.js:413
 msgid "Mark all articles in %s as read?"
 msgstr "Märk alla artiklar i %s som lästa?"
 
-#: js/functions.js:494
-msgid "Upload complete."
-msgstr "Uppladdning klar."
-
-#: js/functions.js:511
-msgid "Remove stored feed icon?"
-msgstr "Ta bort sparad ikon för flöden?"
-
-#: js/functions.js:516
-msgid "Removing feed icon..."
-msgstr "Tar bort flödesikon..."
-
-#: js/functions.js:521
-msgid "Feed icon removed."
-msgstr "Flödesikon borttagen."
-
-#: js/functions.js:537
-msgid "Please select an image file to upload."
-msgstr "Välj en bild att ladda upp."
-
-#: js/functions.js:539
-msgid "Upload new icon for this feed?"
-msgstr "Ladda upp ny ikon för detta flöde?"
-
-#: js/functions.js:540
-msgid "Uploading, please wait..."
-msgstr "Laddar upp, vänligen vänta..."
-
-#: js/functions.js:550
-msgid "Please enter label caption:"
-msgstr "Ange titel för etikett:"
-
-#: js/functions.js:555
-msgid "Can't create label: missing caption."
-msgstr "Kan inte skapa etikett: titel saknas"
-
-#: js/functions.js:797
+#: js/functions.js:764
 msgid "Edit rule"
 msgstr "Redigera regel"
 
-#: js/functions.js:819
+#: js/functions.js:786
 msgid "Edit action"
 msgstr "Redigera åtgärd"
 
-#: js/functions.js:860
+#: js/functions.js:825
 msgid "Looking for articles (%d processed, %f found)..."
 msgstr ""
 
-#: js/functions.js:890
+#: js/functions.js:855
 #, fuzzy
 msgid "Found %d articles matching this filter:"
 msgstr "Artiklar som matchar detta filter: "
 
-#: js/functions.js:942
+#: js/functions.js:907
 msgid "Create Filter"
 msgstr "Skapa filter"
 
-#: js/functions.js:1060
-#: js/tt-rss.js:692
+#: js/functions.js:1016
+#: js/tt-rss.js:631
 msgid "Unsubscribe from %s?"
 msgstr "Säg upp prenumeration på %s?"
 
-#: js/functions.js:1063
+#: js/functions.js:1019
 msgid "Removing feed..."
 msgstr "Tar bort flöde..."
 
-#: js/functions.js:1489
+#: js/functions.js:1410
 msgid "Help"
 msgstr "Hjälp"
 
-#: js/prefs.js:973
-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:44
+msgid "Please enter login:"
+msgstr "Ange inloggning:"
 
-#: js/prefs.js:979
-msgid "Removing category..."
-msgstr "Tar bort kategori..."
+#: js/prefs.js:51
+msgid "Can't create user: no login specified."
+msgstr "Kan inte skapa användare, ingen inloggning angiven."
 
-#: js/prefs.js:997
-msgid "Remove selected categories?"
-msgstr "Radera markekrade kategorier?"
+#: js/prefs.js:55
+msgid "Adding user..."
+msgstr "Lägger till användare..."
 
-#: js/prefs.js:1000
-msgid "Removing selected categories..."
-msgstr "Raderar valda kategorier..."
+#: js/prefs.js:74
+msgid "User Editor"
+msgstr "Användareditor"
 
-#: js/prefs.js:1013
-msgid "No categories are selected."
-msgstr "Inga kategorier valda."
+#: js/prefs.js:104
+msgid "Edit Filter"
+msgstr "Redigera filter"
 
-#: js/prefs.js:1020
-msgid "Category title:"
-msgstr "Kategorinamn:"
+#: js/prefs.js:1175
+msgid "Subscribing to feeds..."
+msgstr "Prenumererar på flöden..."
 
-#: js/prefs.js:1024
-msgid "Creating category..."
-msgstr "Skapar kategori..."
+#: js/prefs.js:1191
+msgid "Clear stored data for this plugin?"
+msgstr "Radera lagrad data för detta tillägg?"
 
-#: js/prefs.js:1047
-msgid "Feeds without recent updates"
-msgstr "Flöden som inte uppdaterats på länge"
+#: js/prefs.js:1203
+msgid "Clear all messages in the error log?"
+msgstr ""
 
-#: js/prefs.js:1091
-msgid "Replace current OPML publishing address with a new one?"
-msgstr "Byt nuvarande OPML-adress med en ny?"
-
-#: js/prefs.js:1129
-msgid "Reset selected labels to default colors?"
-msgstr "Återställ valda etiketter till standardfärger?"
-
-#: js/prefs.js:1161
-msgid "Settings Profiles"
-msgstr "Inställningsprofiler"
-
-#: js/prefs.js:1170
-msgid "Remove selected profiles? Active and default profiles will not be removed."
-msgstr "Radera markerade profiler? Aktiva profiler tas inte bort."
-
-#: js/prefs.js:1173
-msgid "Removing selected profiles..."
-msgstr "Raderar valda profiler...."
-
-#: js/prefs.js:1189
-msgid "No profiles are selected."
-msgstr "Inga profiler valda."
-
-#: js/prefs.js:1197
-#: js/prefs.js:1250
-msgid "Activate selected profile?"
-msgstr "Aktivera markerad profil?"
-
-#: js/prefs.js:1214
-#: js/prefs.js:1266
-msgid "Please choose a profile to activate."
-msgstr "Välj en profil att aktivera."
-
-#: js/prefs.js:1219
-msgid "Creating profile..."
-msgstr "Skapar profil..."
-
-#: js/prefs.js:1274
-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:1284
-msgid "Generated URLs cleared."
-msgstr "Genererade URLer rensade."
-
-#: js/prefs.js:1356
-msgid "Label Editor"
-msgstr "Etikettseditor"
-
-#: js/tt-rss.js:681
+#: js/tt-rss.js:620
 msgid "You can't unsubscribe from the category."
 msgstr "Du kan inte säga upp prenumeration på kategorin."
 
-#: js/viewfeed.js:127
-#: js/viewfeed.js:177
-#: js/viewfeed.js:194
+#: js/tt-rss.js:625
+msgid "Please select some feed first."
+msgstr "Välj några flöden först."
+
+#: js/viewfeed.js:89
+#: js/viewfeed.js:135
+#: js/viewfeed.js:152
 #, fuzzy
 msgid "Click to open next unread feed."
 msgstr "Klicka för att redigera flöde"
 
-#: js/viewfeed.js:131
+#: js/viewfeed.js:93
 msgid "Cancel search"
 msgstr "Avbryt sökning"
 
-#: js/viewfeed.js:191
+#: js/viewfeed.js:149
 #, fuzzy
 msgid "New articles found, reload feed to continue."
 msgstr "Hittade inga artiklar att visa."
 
-#: js/viewfeed.js:620
+#: js/viewfeed.js:405
 msgid "%d article selected"
 msgid_plural "%d articles selected"
 msgstr[0] "%d artikel vald"
 msgstr[1] "%d artiklar valda"
 
-#: js/viewfeed.js:1284
-msgid "No article is selected."
-msgstr "Ingen artikel vald."
+#~ msgid "Rescore feed"
+#~ msgstr "Beräkna flödets poäng på nytt"
 
-#: js/viewfeed.js:1319
-msgid "No articles found to mark"
-msgstr "Hittade inga artiklar att flagga"
+#~ msgid "Create label..."
+#~ msgstr "Skapa etikett..."
 
-#: js/viewfeed.js:1321
-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 "Create filter..."
+#~ msgstr "Skapa filter..."
+
+#~ msgid "You can't rescore this kind of feed."
+#~ msgstr "Den här typen av flöden kan inte poängsättas."
+
+#~ msgid "Rescore articles in %s?"
+#~ msgstr "Beräkna om poängen för artiklarna i %s?"
+
+#~ msgid "Rescoring articles..."
+#~ msgstr "Räknar om artikelpoäng..."
+
+#~ msgid "Can't create label: missing caption."
+#~ msgstr "Kan inte skapa etikett: titel saknas"
 
 #~ msgid "Firefox integration"
 #~ msgstr "Firefox-integration"
diff --git a/locale/tr_TR/LC_MESSAGES/messages.mo b/locale/tr_TR/LC_MESSAGES/messages.mo
index 71d8eef12..2070564bc 100644
Binary files a/locale/tr_TR/LC_MESSAGES/messages.mo and b/locale/tr_TR/LC_MESSAGES/messages.mo differ
diff --git a/locale/tr_TR/LC_MESSAGES/messages.po b/locale/tr_TR/LC_MESSAGES/messages.po
index b5af34cc4..349bb2daa 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: 2018-10-10 08:24+0300\n"
+"POT-Creation-Date: 2018-12-01 12:59+0300\n"
 "PO-Revision-Date: 2013-12-08 20:20+0200\n"
 "Last-Translator: akapar <akapar@gmail.com>\n"
 "Language-Team: TURKISH <akapar@gmail.com>\n"
@@ -95,8 +95,8 @@ msgid "Weekly"
 msgstr "Haftada bir"
 
 #: backend.php:103
-#: classes/pref/users.php:47
 #: classes/pref/system.php:51
+#: classes/pref/users.php:47
 msgid "User"
 msgstr "Kullanıcı"
 
@@ -168,33 +168,33 @@ msgstr "Kullanıcı bulunamadı"
 
 #: index.php:151
 #: index.php:167
-#: index.php:285
+#: index.php:282
 #: prefs.php:120
 #: classes/backend.php:5
 #: classes/pref/labels.php:294
-#: classes/pref/feeds.php:1230
 #: classes/pref/filters.php:822
-#: js/feedlist.js:148
-#: js/feedlist.js:491
-#: js/feedlist.js:539
-#: js/functions.js:314
-#: js/functions.js:1336
-#: js/prefs.js:562
-#: js/prefs.js:754
-#: js/prefs.js:1488
-#: js/prefs.js:1503
-#: js/tt-rss.js:547
-#: js/viewfeed.js:1180
+#: classes/pref/feeds.php:1229
+#: js/feedlist.js:118
+#: js/feedlist.js:446
+#: js/feedlist.js:487
+#: js/functions.js:328
+#: js/functions.js:551
+#: js/functions.js:1286
+#: js/prefs.js:477
+#: js/prefs.js:617
+#: js/prefs.js:956
+#: js/prefs.js:1000
+#: js/prefs.js:1028
+#: js/prefs.js:1037
+#: js/prefs.js:1045
+#: js/prefs.js:1057
+#: js/tt-rss.js:497
+#: js/viewfeed.js:509
+#: js/viewfeed.js:928
 #: plugins/import_export/import_export.js:17
-#: js/functions.js:565
-#: js/prefs.js:1200
-#: js/prefs.js:1253
-#: js/prefs.js:1292
-#: js/prefs.js:1305
-#: js/prefs.js:1316
-#: js/prefs.js:1331
-#: js/tt-rss.js:564
-#: js/viewfeed.js:760
+#: js/prefs.js:1192
+#: js/prefs.js:1205
+#: js/tt-rss.js:510
 msgid "Loading, please wait..."
 msgstr "Yükleniyor, lütfen bekleyin..."
 
@@ -211,13 +211,13 @@ msgid "All Articles"
 msgstr "Tüm yazılar"
 
 #: index.php:194
-#: include/functions.php:1227
+#: include/functions.php:1172
 #: classes/feeds.php:110
 msgid "Starred"
 msgstr "Favoriler"
 
 #: index.php:195
-#: include/functions.php:1228
+#: include/functions.php:1173
 #: classes/feeds.php:111
 msgid "Published"
 msgstr "Yayınladıklarım"
@@ -257,11 +257,11 @@ msgid "Title"
 msgstr "Başlık"
 
 #: index.php:211
-#: index.php:251
-#: include/functions.php:1215
+#: index.php:250
+#: include/functions.php:1160
 #: classes/feeds.php:115
-#: js/FeedTree.js:41
-#: js/FeedTree.js:69
+#: js/FeedTree.js:42
+#: js/FeedTree.js:70
 msgid "Mark as read"
 msgstr "Okundu olarak işaretle"
 
@@ -298,7 +298,7 @@ msgid "Feed actions:"
 msgstr "Özet akışı ile ilgili..."
 
 #: index.php:246
-#: classes/handler/public.php:551
+#: classes/handler/public.php:575
 msgid "Subscribe to feed..."
 msgstr "Özet akışına üye ol"
 
@@ -307,56 +307,44 @@ msgid "Edit this feed..."
 msgstr "Bu özet akışını düzenle..."
 
 #: index.php:248
-msgid "Rescore feed"
-msgstr "Özet akışını yeniden değerlendir..."
-
-#: index.php:249
-#: classes/pref/feeds.php:770
-#: classes/pref/feeds.php:1203
-#: js/PrefFeedTree.js:61
+#: classes/pref/feeds.php:769
+#: classes/pref/feeds.php:1202
+#: js/PrefFeedTree.js:62
 msgid "Unsubscribe"
 msgstr "Üyelikten çık"
 
-#: index.php:250
+#: index.php:249
 msgid "All feeds:"
 msgstr "Tüm özet akışları:"
 
-#: index.php:252
+#: index.php:251
 msgid "(Un)hide read feeds"
 msgstr "Okunmuş özet akışlarını görüntüle(me)"
 
-#: index.php:253
+#: index.php:252
 msgid "Other actions:"
 msgstr "Diğerleri:"
 
-#: index.php:254
-#: include/functions.php:1201
+#: index.php:253
+#: include/functions.php:1146
 msgid "Toggle widescreen mode"
 msgstr "Tam ekran görüntüle"
 
-#: index.php:255
-msgid "Create label..."
-msgstr "Arama başlığı tanımla..."
-
-#: index.php:256
-msgid "Create filter..."
-msgstr "Filtre tanımla..."
-
-#: index.php:257
+#: index.php:254
 msgid "Keyboard shortcuts help"
 msgstr "Klavye kısayolları yardım"
 
-#: index.php:266
+#: index.php:263
 msgid "Logout"
 msgstr "Oturumu kapat"
 
-#: index.php:272
+#: index.php:269
 msgid "Updates are available from Git."
 msgstr ""
 
 #: prefs.php:33
 #: prefs.php:138
-#: include/functions.php:1230
+#: include/functions.php:1175
 #: classes/pref/prefs.php:425
 msgid "Preferences"
 msgstr "Tercihler"
@@ -371,8 +359,8 @@ msgstr "Tercihleri kapat"
 
 #: prefs.php:141
 #: classes/pref/feeds.php:114
-#: classes/pref/feeds.php:1138
-#: classes/pref/feeds.php:1192
+#: classes/pref/feeds.php:1137
+#: classes/pref/feeds.php:1191
 msgid "Feeds"
 msgstr "Özet akışları"
 
@@ -382,8 +370,8 @@ msgid "Filters"
 msgstr "Filtreler"
 
 #: prefs.php:147
+#: classes/feeds.php:1696
 #: classes/pref/labels.php:94
-#: classes/feeds.php:1710
 msgid "Labels"
 msgstr "Arama başlıkları"
 
@@ -395,80 +383,80 @@ msgstr "Kullanıcılar"
 msgid "System"
 msgstr "Sistem"
 
-#: register.php:186
+#: register.php:185
 #: include/login_form.php:162
 msgid "Create new account"
 msgstr "Yeni bir hesap tanımla"
 
-#: register.php:192
+#: register.php:191
 msgid "New user registrations are administratively disabled."
 msgstr "Yeni kullanıcı kayıtları durdurulmuştur."
 
-#: register.php:196
-#: register.php:241
-#: register.php:254
-#: register.php:269
-#: register.php:288
-#: register.php:336
-#: register.php:346
-#: register.php:358
-#: classes/handler/public.php:623
-#: classes/handler/public.php:697
-#: classes/handler/public.php:798
-#: classes/handler/public.php:877
-#: classes/handler/public.php:891
-#: classes/handler/public.php:898
-#: classes/handler/public.php:923
+#: register.php:195
+#: register.php:240
+#: register.php:253
+#: register.php:268
+#: register.php:287
+#: register.php:334
+#: register.php:344
+#: register.php:356
+#: classes/handler/public.php:647
+#: classes/handler/public.php:721
+#: 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"
 
-#: register.php:217
+#: register.php:216
 msgid "Your temporary password will be sent to the specified email. Accounts, which were not logged in once, are erased automatically 24 hours after temporary password is sent."
 msgstr "Geçici şifreniz girdiğiniz e-posta adresine yollanacak. Geçici şifre ile 24 saat içinde giriş yapmanız gerekiyor yoksa geçerliliğini yitirecektir."
 
-#: register.php:223
+#: register.php:222
 msgid "Desired login:"
 msgstr "İstenen kullanıcı adı:"
 
-#: register.php:226
+#: register.php:225
 msgid "Check availability"
 msgstr "Kullanılırlığını kontrol et"
 
-#: register.php:228
-#: classes/handler/public.php:713
+#: register.php:227
+#: classes/handler/public.php:737
 msgid "Email:"
 msgstr "E-posta:"
 
-#: register.php:231
-#: classes/handler/public.php:718
+#: register.php:230
+#: classes/handler/public.php:742
 msgid "How much is two plus two:"
 msgstr "İki kere iki kaç eder:"
 
-#: register.php:234
+#: register.php:233
 msgid "Submit registration"
 msgstr "Kaydı işleme al"
 
-#: register.php:252
+#: register.php:251
 msgid "Your registration information is incomplete."
 msgstr "Kayıt bilgilerinizde eksiklik var."
 
-#: register.php:267
+#: register.php:266
 msgid "Sorry, this username is already taken."
 msgstr "Bu kullanıcı adı halihazırda kullanılıyor."
 
-#: register.php:286
+#: register.php:285
 msgid "Registration failed."
 msgstr "Kayıt işlemi başarısız oldu."
 
-#: register.php:333
+#: register.php:331
 msgid "Account created successfully."
 msgstr "Hesap yaratıldı."
 
-#: register.php:355
+#: register.php:353
 msgid "New user registrations are currently closed."
 msgstr "Yeni kullanıcı kayıtları şu an için kapalıdır."
 
-#: update.php:66
+#: update.php:67
 msgid "Tiny Tiny RSS data update script."
 msgstr "Tiny Tiny RSS veri yenileme komut dosyası."
 
@@ -481,10 +469,10 @@ msgstr "Tüm özet akışları"
 
 #: include/controls.php:138
 #: include/controls.php:230
-#: classes/opml.php:512
-#: classes/digest.php:120
+#: classes/digest.php:124
+#: classes/feeds.php:1708
 #: classes/pref/feeds.php:233
-#: classes/feeds.php:1722
+#: classes/opml.php:512
 msgid "Uncategorized"
 msgstr "Kategorilenmemiş"
 
@@ -499,287 +487,287 @@ msgstr[1] "%d arşivlenmiş yazılar"
 msgid "No feeds found."
 msgstr "Özet akışı bulunamadı."
 
-#: include/functions.php:983
+#: include/functions.php:928
 #, php-format
 msgid "%d min"
 msgstr ""
 
-#: include/functions.php:1177
+#: include/functions.php:1122
 msgid "Navigation"
 msgstr "Dolaşma"
 
-#: include/functions.php:1178
+#: include/functions.php:1123
 msgid "Open next feed"
 msgstr "Sonraki özet akışına geç"
 
-#: include/functions.php:1179
+#: include/functions.php:1124
 msgid "Open previous feed"
 msgstr "Önceki özet akışına geç"
 
-#: include/functions.php:1180
+#: include/functions.php:1125
 msgid "Open next article"
 msgstr "Sonraki yazıya geç"
 
-#: include/functions.php:1181
+#: include/functions.php:1126
 msgid "Open previous article"
 msgstr "Önceki yazıya geç"
 
-#: include/functions.php:1182
+#: include/functions.php:1127
 msgid "Open next article (don't scroll long articles)"
 msgstr "Sonraki yazıya geç (uzun yazıları kısa geç)"
 
-#: include/functions.php:1183
+#: include/functions.php:1128
 msgid "Open previous article (don't scroll long articles)"
 msgstr "Önceki yazıya geç (uzun yazıları kısa geç)"
 
-#: include/functions.php:1184
+#: include/functions.php:1129
 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/functions.php:1185
+#: include/functions.php:1130
 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/functions.php:1186
+#: include/functions.php:1131
 msgid "Show search dialog"
 msgstr "Arama geçmişini göster"
 
-#: include/functions.php:1187
+#: include/functions.php:1132
 msgid "Article"
 msgstr "Yazı"
 
-#: include/functions.php:1188
-#: js/viewfeed.js:1695
+#: include/functions.php:1133
+#: js/viewfeed.js:1341
 msgid "Toggle starred"
 msgstr "Favorileri değişir"
 
-#: include/functions.php:1189
-#: js/viewfeed.js:1707
+#: include/functions.php:1134
+#: js/viewfeed.js:1353
 msgid "Toggle published"
 msgstr "Yayınlanmışları değiştir"
 
-#: include/functions.php:1190
-#: js/viewfeed.js:1682
+#: include/functions.php:1135
+#: js/viewfeed.js:1328
 msgid "Toggle unread"
 msgstr "Okunmamışları değiştir"
 
-#: include/functions.php:1191
+#: include/functions.php:1136
 msgid "Edit tags"
 msgstr "Etiketleri değiştir"
 
-#: include/functions.php:1192
+#: include/functions.php:1137
 msgid "Open in new window"
 msgstr "Yeni bir pencerede aç"
 
-#: include/functions.php:1193
-#: js/viewfeed.js:1728
+#: include/functions.php:1138
+#: js/viewfeed.js:1374
 msgid "Mark below as read"
 msgstr "Aşağıdakini okundu işaretle"
 
-#: include/functions.php:1194
-#: js/viewfeed.js:1721
+#: include/functions.php:1139
+#: js/viewfeed.js:1367
 msgid "Mark above as read"
 msgstr "Yukarıdakini okundu işaretle"
 
-#: include/functions.php:1195
+#: include/functions.php:1140
 msgid "Scroll down"
 msgstr "Aşağı git"
 
-#: include/functions.php:1196
+#: include/functions.php:1141
 msgid "Scroll up"
 msgstr "Yukarı git"
 
-#: include/functions.php:1197
+#: include/functions.php:1142
 msgid "Select article under cursor"
 msgstr "İmleç altındaki yazıyı seç"
 
-#: include/functions.php:1198
+#: include/functions.php:1143
 msgid "Email article"
 msgstr "Yazıyı e-posta ile yolla"
 
-#: include/functions.php:1199
+#: include/functions.php:1144
 msgid "Close/collapse article"
 msgstr "Yazıyı kapat"
 
-#: include/functions.php:1200
+#: include/functions.php:1145
 msgid "Toggle article expansion (combined mode)"
 msgstr "Yazı büyütmeyi değiştir (birleşik mod)"
 
-#: include/functions.php:1202
+#: include/functions.php:1147
 #: plugins/embed_original/init.php:33
 msgid "Toggle embed original"
 msgstr "Aslını içte göstermeyi değiştir"
 
-#: include/functions.php:1203
+#: include/functions.php:1148
 msgid "Article selection"
 msgstr "Yazı seçimi"
 
-#: include/functions.php:1204
+#: include/functions.php:1149
 msgid "Select all articles"
 msgstr "Tüm yazıları seç"
 
-#: include/functions.php:1205
+#: include/functions.php:1150
 msgid "Select unread"
 msgstr "Okunmamışları seç"
 
-#: include/functions.php:1206
+#: include/functions.php:1151
 msgid "Select starred"
 msgstr "Favorileri seç"
 
-#: include/functions.php:1207
+#: include/functions.php:1152
 msgid "Select published"
 msgstr "Yayınlanmışları seç"
 
-#: include/functions.php:1208
+#: include/functions.php:1153
 msgid "Invert selection"
 msgstr "Seçimi evir"
 
-#: include/functions.php:1209
+#: include/functions.php:1154
 msgid "Deselect everything"
 msgstr "Hiçbirini seçme"
 
-#: include/functions.php:1210
-#: classes/pref/feeds.php:522
-#: classes/pref/feeds.php:794
+#: include/functions.php:1155
+#: classes/pref/feeds.php:521
+#: classes/pref/feeds.php:793
 msgid "Feed"
 msgstr "Özet akışı"
 
-#: include/functions.php:1211
+#: include/functions.php:1156
 msgid "Refresh current feed"
 msgstr "Özet akışını tazele"
 
-#: include/functions.php:1212
+#: include/functions.php:1157
 msgid "Un/hide read feeds"
 msgstr "Okunmuş özet akışlarını gizle(me)"
 
-#: include/functions.php:1213
-#: classes/pref/feeds.php:1195
+#: include/functions.php:1158
+#: classes/pref/feeds.php:1194
 msgid "Subscribe to feed"
 msgstr "Özet akışına abone ol"
 
-#: include/functions.php:1214
-#: js/FeedTree.js:48
-#: js/PrefFeedTree.js:55
-#: js/viewfeed.js:1846
+#: include/functions.php:1159
+#: js/FeedTree.js:49
+#: js/PrefFeedTree.js:56
+#: js/viewfeed.js:1492
 msgid "Edit feed"
 msgstr "Veri akışı aboneliğini düzenle"
 
-#: include/functions.php:1216
+#: include/functions.php:1161
 msgid "Reverse headlines"
 msgstr "Yazı başlıklarını ters diz"
 
-#: include/functions.php:1217
+#: include/functions.php:1162
 msgid "Toggle headline grouping"
 msgstr ""
 
-#: include/functions.php:1218
+#: include/functions.php:1163
 msgid "Debug feed update"
 msgstr "Özet akışı yenilemesinde hata ayıkla"
 
-#: include/functions.php:1219
+#: include/functions.php:1164
 #, fuzzy
 msgid "Debug viewfeed()"
 msgstr "Özet akışı yenilemesinde hata ayıkla"
 
-#: include/functions.php:1220
-#: js/FeedTree.js:97
+#: include/functions.php:1165
+#: js/FeedTree.js:98
 msgid "Mark all feeds as read"
 msgstr "Tüm özet akışlarını okundu işaretle"
 
-#: include/functions.php:1221
+#: include/functions.php:1166
 msgid "Un/collapse current category"
 msgstr "Bu kategoriyi aç/kapa"
 
-#: include/functions.php:1222
-msgid "Toggle combined mode"
-msgstr "Birleşik modu değiştir"
-
-#: include/functions.php:1223
+#: include/functions.php:1167
 msgid "Toggle auto expand in combined mode"
 msgstr "Birleşik modda otomatik genişlemeyi değiştir"
 
-#: include/functions.php:1224
+#: include/functions.php:1168
+msgid "Toggle combined mode"
+msgstr "Birleşik modu değiştir"
+
+#: include/functions.php:1169
 msgid "Go to"
 msgstr "Git"
 
-#: include/functions.php:1225
-#: classes/feeds.php:1583
+#: include/functions.php:1170
+#: classes/feeds.php:1569
 msgid "All articles"
 msgstr "Tüm yazılar"
 
-#: include/functions.php:1226
+#: include/functions.php:1171
 msgid "Fresh"
 msgstr "Taze"
 
-#: include/functions.php:1229
-#: js/tt-rss.js:491
-#: js/tt-rss.js:660
+#: include/functions.php:1174
+#: js/tt-rss.js:439
+#: js/tt-rss.js:599
 msgid "Tag cloud"
 msgstr "Etiket öbeği"
 
-#: include/functions.php:1231
+#: include/functions.php:1176
 msgid "Other"
 msgstr "Diğer"
 
-#: include/functions.php:1232
+#: include/functions.php:1177
 #: classes/pref/labels.php:279
 msgid "Create label"
 msgstr "Arama başlığı tanımla"
 
-#: include/functions.php:1233
+#: include/functions.php:1178
 #: classes/pref/filters.php:801
 msgid "Create filter"
 msgstr "Filtre tanımla"
 
-#: include/functions.php:1234
+#: include/functions.php:1179
 msgid "Un/collapse sidebar"
 msgstr "Kenar çubuğunu aç/kapa"
 
-#: include/functions.php:1235
+#: include/functions.php:1180
 msgid "Show help dialog"
 msgstr "Yardım diyaloğunu göster"
 
-#: include/functions.php:2582
+#: include/functions.php:2529
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: include/functions.php:2583
+#: include/functions.php:2530
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: include/functions.php:2584
+#: include/functions.php:2531
 msgid "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form"
 msgstr ""
 
-#: include/functions.php:2585
+#: include/functions.php:2532
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: include/functions.php:2586
+#: include/functions.php:2533
 #, fuzzy
 msgid "No file was uploaded"
 msgstr "Dosya yüklenemedi."
 
-#: include/functions.php:2587
+#: include/functions.php:2534
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: include/functions.php:2588
+#: include/functions.php:2535
 msgid "Failed to write file to disk."
 msgstr ""
 
-#: include/functions.php:2589
+#: include/functions.php:2536
 msgid "A PHP extension stopped the file upload."
 msgstr ""
 
 #: include/login_form.php:107
-#: classes/handler/public.php:446
-#: classes/handler/public.php:708
+#: classes/handler/public.php:466
+#: classes/handler/public.php:732
 msgid "Login:"
 msgstr "Oturum aç:"
 
 #: include/login_form.php:117
-#: classes/handler/public.php:449
+#: classes/handler/public.php:469
 msgid "Password:"
 msgstr "Şifre:"
 
@@ -792,9 +780,9 @@ msgid "Profile:"
 msgstr "Profil:"
 
 #: include/login_form.php:133
-#: classes/handler/public.php:252
 #: classes/pref/prefs.php:1037
 #: classes/rpc.php:69
+#: classes/handler/public.php:272
 msgid "Default profile"
 msgstr "Öntanımlı profil"
 
@@ -811,207 +799,27 @@ msgid "Remember me"
 msgstr "Beni hatırla"
 
 #: include/login_form.php:159
-#: classes/handler/public.php:454
+#: classes/handler/public.php:474
 msgid "Log in"
 msgstr "Oturum aç"
 
-#: include/sessions.php:46
+#: include/sessions.php:45
 msgid "Session failed to validate (schema version changed)"
 msgstr "Oturum doğrulanamadı (şema versiyonu değişti)"
 
-#: include/sessions.php:62
+#: include/sessions.php:53
+#, fuzzy
+msgid "Session failed to validate (UA changed)."
+msgstr "Oturum doğrulanamadı (şifre değiştirildi)"
+
+#: include/sessions.php:67
 msgid "Session failed to validate (password changed)"
 msgstr "Oturum doğrulanamadı (şifre değiştirildi)"
 
-#: include/sessions.php:69
+#: include/sessions.php:74
 msgid "Session failed to validate (user not found)"
 msgstr "Oturum doğrulanamadı (kullanıcı adı bulunamadı)"
 
-#: classes/article.php:26
-msgid "Article not found."
-msgstr "Yazı bulunamadı."
-
-#: classes/article.php:211
-msgid "Tags for this article (separated by commas):"
-msgstr "Bu yazı için etiketler (virgülle ayrılmış):"
-
-#: classes/article.php:236
-#: classes/pref/labels.php:82
-#: classes/pref/users.php:103
-#: classes/pref/feeds.php:774
-#: classes/pref/feeds.php:914
-#: classes/pref/filters.php:525
-#: classes/pref/prefs.php:982
-#: plugins/nsfw/init.php:85
-#: plugins/note/init.php:58
-#: plugins/af_readability/init.php:80
-#: plugins/af_redditimgur/init.php:66
-#: plugins/af_psql_trgm/init.php:188
-#: plugins/mail/init.php:65
-#: plugins/af_zz_imgproxy/init.php:238
-msgid "Save"
-msgstr "Kaydet"
-
-#: classes/article.php:238
-#: classes/handler/public.php:423
-#: classes/handler/public.php:457
-#: classes/pref/labels.php:84
-#: classes/pref/users.php:105
-#: classes/pref/feeds.php:775
-#: classes/pref/feeds.php:917
-#: classes/pref/feeds.php:1672
-#: classes/pref/filters.php:528
-#: classes/pref/filters.php:945
-#: classes/pref/filters.php:1022
-#: classes/pref/filters.php:1115
-#: classes/pref/prefs.php:984
-#: classes/feeds.php:1037
-#: classes/feeds.php:1089
-#: classes/feeds.php:1128
-#: plugins/note/init.php:60
-#: plugins/mail/init.php:179
-msgid "Cancel"
-msgstr "İptal"
-
-#: classes/article.php:337
-#: classes/article.php:720
-#: classes/article.php:875
-msgid "no tags"
-msgstr "Etiketi yok"
-
-#: classes/article.php:448
-msgid "unknown type"
-msgstr "bilinmeyen tür"
-
-#: classes/article.php:525
-msgid "Attachments"
-msgstr "Ekler"
-
-#: classes/article.php:626
-#: classes/feeds.php:661
-msgid "comment"
-msgid_plural "comments"
-msgstr[0] "yorum"
-msgstr[1] "yorumlar"
-
-#: classes/article.php:630
-#: classes/feeds.php:665
-msgid "comments"
-msgstr "Yorumlar"
-
-#: classes/article.php:689
-msgid " - "
-msgstr "-"
-
-#: classes/article.php:730
-#: classes/feeds.php:647
-msgid "Edit tags for this article"
-msgstr "Bu yazı için etiketler tanımla"
-
-#: classes/article.php:763
-#: classes/feeds.php:602
-msgid "Originally from:"
-msgstr "Asıl kaynağı:"
-
-#: classes/article.php:774
-#: classes/pref/feeds.php:539
-#: classes/feeds.php:613
-msgid "Feed URL"
-msgstr "Özet akışı internet adresi"
-
-#: classes/article.php:811
-#: classes/backend.php:103
-#: classes/dlg.php:33
-#: classes/dlg.php:56
-#: classes/dlg.php:89
-#: classes/dlg.php:154
-#: classes/dlg.php:181
-#: classes/dlg.php:197
-#: classes/pref/feeds.php:1466
-#: classes/pref/feeds.php:1533
-#: classes/pref/filters.php:208
-#: classes/pref/prefs.php:1099
-#: plugins/af_psql_trgm/init.php:109
-#: plugins/import_export/init.php:446
-#: plugins/import_export/init.php:490
-#: plugins/share/init.php:128
-msgid "Close this window"
-msgstr "Bu pencereyi kapa"
-
-#: classes/article.php:913
-msgid "(edit note)"
-msgstr "(notu değiştir)"
-
-#: classes/opml.php:31
-#: classes/opml.php:36
-msgid "OPML Utility"
-msgstr "OPML Utility"
-
-#: classes/opml.php:40
-msgid "Importing OPML..."
-msgstr "OPML içe aktarılıyor..."
-
-#: classes/opml.php:45
-msgid "Return to preferences"
-msgstr "Tercihlere geri dön"
-
-#: classes/opml.php:301
-#, php-format
-msgid "Adding feed: %s"
-msgstr "Özet akışı ekleniyor: %s"
-
-#: classes/opml.php:312
-#, php-format
-msgid "Duplicate feed: %s"
-msgstr "Zaten var olan özet akışı: %s"
-
-#: classes/opml.php:326
-#, php-format
-msgid "Adding label %s"
-msgstr "Arama başlığı ekleniyor %s"
-
-#: classes/opml.php:329
-#, php-format
-msgid "Duplicate label: %s"
-msgstr "Aynı arama başlığı mevcut: %s"
-
-#: classes/opml.php:341
-#, php-format
-msgid "Setting preference key %s to %s"
-msgstr "Tercih anahtarı %s %s'e ayarlanıyor"
-
-#: classes/opml.php:377
-msgid "Adding filter..."
-msgstr "Filtre ekleniyor..."
-
-#: classes/opml.php:512
-#, php-format
-msgid "Processing category: %s"
-msgstr "Kategori işleniyor: %s"
-
-#: classes/opml.php:558
-#, php-format
-msgid "Upload failed with error code %d"
-msgstr "Yükleme başarısız oldu hata kodu %d"
-
-#: classes/opml.php:570
-#: plugins/import_export/init.php:471
-msgid "Unable to move uploaded file."
-msgstr "Yüklenen dosya taşınamadı."
-
-#: classes/opml.php:574
-#: plugins/import_export/init.php:475
-msgid "Error: please upload OPML file."
-msgstr "Hata: lütfen OPML dosyasını yükleyin."
-
-#: classes/opml.php:585
-msgid "Error: unable to find moved OPML file."
-msgstr "Hata: Taşınan OPML dosyası bulunamıyor."
-
-#: classes/opml.php:594
-msgid "Error while parsing document."
-msgstr "Belge çözümlenirken hata oluştu."
-
 #: 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."
@@ -1032,164 +840,356 @@ msgstr "Ctrl"
 msgid "Help topic not found."
 msgstr "Yardım konusu bulunamadı."
 
-#: 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."
+#: classes/backend.php:103
+#: classes/pref/filters.php:208
+#: classes/pref/feeds.php:1465
+#: classes/pref/feeds.php:1532
+#: classes/pref/prefs.php:1099
+#: classes/dlg.php:33
+#: classes/dlg.php:56
+#: classes/dlg.php:89
+#: classes/dlg.php:154
+#: classes/dlg.php:181
+#: classes/dlg.php:197
+#: classes/article.php:810
+#: plugins/af_psql_trgm/init.php:109
+#: plugins/import_export/init.php:446
+#: plugins/import_export/init.php:490
+#: plugins/share/init.php:128
+msgid "Close this window"
+msgstr "Bu pencereyi kapa"
 
-#: classes/dlg.php:44
-msgid "Your Public OPML URL is:"
-msgstr "Herkese açık OPML internet adresiniz:"
+#: classes/feeds.php:53
+msgid "View as RSS feed"
+msgstr "RSS özet akışı olarak görüntüle"
 
-#: classes/dlg.php:53
-#: classes/dlg.php:178
-#: plugins/share/init.php:125
-msgid "Generate new URL"
-msgstr "Yeni internet adresi oluştur"
+#: classes/feeds.php:54
+#: classes/feeds.php:140
+#: classes/pref/feeds.php:1326
+msgid "View as RSS"
+msgstr "RSS olarak görüntüle"
 
-#: classes/dlg.php:67
-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 "Konfigürasyonda geri plan yordamı etkinleştirildi ama geri plan yordamı çalışmıyor ve bu tüm özet akışlarının yenilenmesini engelliyor. Lütfen geri plan yordamını başlatın ya da olgu sahibiyle irtibata geçin. "
+#: classes/feeds.php:62
+#, php-format
+msgid "Last updated: %s"
+msgstr "Son yenileme: %s"
 
-#: classes/dlg.php:71
-#: classes/dlg.php:80
-msgid "Last update:"
-msgstr "Son yenileme:"
-
-#: classes/dlg.php:76
-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 "Yenileme geri plan yordamı çok uzun süredir çalışıyor. Bir problem olabilir. Lütfen geri plan yordamını kontrol edin ya da olgu sahibiyle irtibata geçin."
-
-#: classes/dlg.php:169
-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/dlg.php:190
-msgid "You are using default tt-rss password. Please change it in the Preferences (Personal data / Authentication)."
-msgstr ""
-
-#: classes/dlg.php:194
+#: classes/feeds.php:100
 #, fuzzy
-msgid "Open Preferences"
-msgstr "Tercihler"
+msgid "Select..."
+msgstr "Seç"
 
-#: classes/handler/public.php:387
-#: plugins/bookmarklets/init.php:40
-msgid "Share with Tiny Tiny RSS"
-msgstr "Tiny Tiny RSS ile paylaş"
+#: classes/feeds.php:102
+#: classes/pref/labels.php:273
+#: classes/pref/filters.php:391
+#: classes/pref/filters.php:449
+#: classes/pref/filters.php:795
+#: classes/pref/filters.php:878
+#: classes/pref/filters.php:905
+#: classes/pref/feeds.php:1185
+#: classes/pref/feeds.php:1416
+#: classes/pref/feeds.php:1481
+#: classes/pref/users.php:358
+#: classes/pref/prefs.php:996
+msgid "All"
+msgstr "Tümü"
 
-#: classes/handler/public.php:395
-msgid "Title:"
-msgstr "Başlık:"
+#: classes/feeds.php:104
+msgid "Invert"
+msgstr "Ters çevir"
 
-#: classes/handler/public.php:397
-#: classes/pref/feeds.php:537
-msgid "URL:"
-msgstr "Internet adresi:"
+#: classes/feeds.php:105
+#: classes/pref/labels.php:275
+#: classes/pref/filters.php:393
+#: classes/pref/filters.php:451
+#: classes/pref/filters.php:797
+#: classes/pref/filters.php:880
+#: classes/pref/filters.php:907
+#: classes/pref/feeds.php:1187
+#: classes/pref/feeds.php:1418
+#: classes/pref/feeds.php:1483
+#: classes/pref/users.php:360
+#: classes/pref/prefs.php:998
+msgid "None"
+msgstr "Hiçbiri"
 
-#: classes/handler/public.php:399
-msgid "Content:"
-msgstr "İçerik:"
+#: classes/feeds.php:107
+msgid "Selection toggle:"
+msgstr "Seçimi değiştir:"
 
-#: classes/handler/public.php:401
-msgid "Labels:"
-msgstr "Arama başlıkları:"
+#: classes/feeds.php:113
+msgid "Selection:"
+msgstr "Seçim:"
 
-#: classes/handler/public.php:420
-msgid "Shared article will appear in the Published feed."
-msgstr "Paylaşılan yazı Yayınlananlar'da gözükecek"
+#: classes/feeds.php:116
+msgid "Set score"
+msgstr "Skor ata"
 
-#: classes/handler/public.php:422
-msgid "Share"
-msgstr "Paylaş"
+#: classes/feeds.php:119
+msgid "Archive"
+msgstr "Arşiv"
 
-#: classes/handler/public.php:444
-msgid "Not logged in"
-msgstr "Giriş yapılmamış"
-
-#: classes/handler/public.php:504
-msgid "Incorrect username or password"
-msgstr "Geçersiz kullanıcı adı ya da şifresi"
-
-#: classes/handler/public.php:557
-#, php-format
-msgid "Already subscribed to <b>%s</b>."
-msgstr "<b>%s</b>'e zaten abonesiniz."
-
-#: classes/handler/public.php:560
-#, php-format
-msgid "Subscribed to <b>%s</b>."
-msgstr "<b>%s</b>'e abone oldunuz."
-
-#: classes/handler/public.php:563
-#, php-format
-msgid "Could not subscribe to <b>%s</b>."
-msgstr "<b>%s</b>'e abone olunamadı."
-
-#: classes/handler/public.php:566
-#, php-format
-msgid "No feeds found in <b>%s</b>."
-msgstr "<b>%s</b>'de özet akışı bulunamadı."
-
-#: classes/handler/public.php:569
-msgid "Multiple feed URLs found."
-msgstr "Birçok özet akışı internet adresi bulundu."
-
-#: classes/handler/public.php:573
-#, 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:591
-msgid "Subscribe to selected feed"
-msgstr "Seçilen özet akışlarına abone ol"
-
-#: classes/handler/public.php:618
-msgid "Edit subscription options"
-msgstr "Abonelik tercihlerini düzenle"
-
-#: classes/handler/public.php:656
-msgid "Password recovery"
-msgstr "Şifre bulma"
-
-#: classes/handler/public.php:701
-#, 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:723
-#: classes/pref/users.php:372
-msgid "Reset password"
-msgstr "Şifremi yenile"
-
-#: classes/handler/public.php:733
-msgid "Some of the required form parameters are missing or incorrect."
-msgstr "Bazı gerekli form parametreleri eksik ya da yanlış."
-
-#: classes/handler/public.php:737
-#: classes/handler/public.php:806
-msgid "Go back"
+#: classes/feeds.php:121
+msgid "Move back"
 msgstr "Geri git"
 
-#: classes/handler/public.php:775
+#: classes/feeds.php:122
+#: classes/pref/filters.php:400
+#: classes/pref/filters.php:458
+#: classes/pref/filters.php:887
+#: classes/pref/filters.php:914
+msgid "Delete"
+msgstr "Sil"
+
+#: classes/feeds.php:127
+#: classes/feeds.php:132
+#: plugins/mailto/init.php:25
+#: plugins/mail/init.php:76
+msgid "Forward by email"
+msgstr "E-posta ile yolla"
+
+#: classes/feeds.php:136
+msgid "Feed:"
+msgstr "Özet akışı:"
+
+#: classes/feeds.php:193
+#: classes/feeds.php:802
+msgid "Feed not found."
+msgstr "Özet akışı bulunamadı."
+
+#: classes/feeds.php:255
+msgid "Never"
+msgstr "Asla"
+
+#: classes/feeds.php:341
+#, php-format
+msgid "Imported at %s"
+msgstr "%s de içe aktarıldı"
+
+#: classes/feeds.php:391
+#: classes/feeds.php:484
 #, fuzzy
-msgid "[tt-rss] Password reset request"
-msgstr "[tt-rss] Şifre değiştirme hatırlatması"
+msgid "mark feed as read"
+msgstr "Okundu olarak işaretle"
 
-#: classes/handler/public.php:802
-msgid "Sorry, login and email combination not found."
-msgstr "Üzgünüz, kullanıcı adı ve e-posta kombinasyonu bulunamadı."
+#: classes/feeds.php:540
+msgid "Collapse article"
+msgstr "Yazıyı kapat"
 
-#: classes/handler/public.php:824
-msgid "Your access level is insufficient to run this script."
-msgstr "Bu kodu çalıştırmak için yeterli yetkiniz yok."
+#: classes/feeds.php:592
+#: classes/article.php:762
+msgid "Originally from:"
+msgstr "Asıl kaynağı:"
 
-#: classes/handler/public.php:850
-msgid "Database Updater"
-msgstr "Veritabanı Yenileyicisi"
+#: classes/feeds.php:603
+#: classes/pref/feeds.php:538
+#: classes/article.php:773
+msgid "Feed URL"
+msgstr "Özet akışı internet adresi"
 
-#: classes/handler/public.php:915
-msgid "Perform updates"
-msgstr "Yenilemeleri yap"
+#: classes/feeds.php:630
+#: classes/article.php:729
+msgid "Edit tags for this article"
+msgstr "Bu yazı için etiketler tanımla"
+
+#: classes/feeds.php:644
+#: classes/article.php:625
+msgid "comment"
+msgid_plural "comments"
+msgstr[0] "yorum"
+msgstr[1] "yorumlar"
+
+#: classes/feeds.php:648
+#: classes/article.php:629
+msgid "comments"
+msgstr "Yorumlar"
+
+#: classes/feeds.php:686
+msgid "No unread articles found to display."
+msgstr "Okunmamış yazı bulunamadı."
+
+#: classes/feeds.php:689
+msgid "No updated articles found to display."
+msgstr "Yenilenmiş yazı bulunamadı."
+
+#: classes/feeds.php:692
+msgid "No starred articles found to display."
+msgstr "Favori yazı bulunamadı."
+
+#: classes/feeds.php:696
+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:698
+msgid "No articles found to display."
+msgstr "Yazı bulunamadı."
+
+#: classes/feeds.php:714
+#: classes/feeds.php:905
+#, php-format
+msgid "Feeds last updated at %s"
+msgstr "Özet akışları en son %s de yenilendi"
+
+#: classes/feeds.php:726
+#: classes/feeds.php:917
+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:894
+msgid "No feed selected."
+msgstr "Hiçbir özet akışı seçilmedi."
+
+#: classes/feeds.php:958
+#: classes/feeds.php:966
+msgid "Feed or site URL"
+msgstr "Özet akışı ya da site adresi"
+
+#: classes/feeds.php:972
+#: classes/pref/feeds.php:559
+#: classes/pref/feeds.php:800
+#: classes/pref/feeds.php:1632
+msgid "Place in category:"
+msgstr "Kategoriye yerleştir"
+
+#: classes/feeds.php:980
+msgid "Available feeds"
+msgstr "Mevcut veri akışları"
+
+#: classes/feeds.php:992
+#: classes/pref/feeds.php:621
+#: classes/pref/feeds.php:848
+#: classes/pref/users.php:61
+msgid "Authentication"
+msgstr "Doğrulama"
+
+#: classes/feeds.php:996
+#: classes/pref/feeds.php:625
+#: classes/pref/feeds.php:852
+#: classes/pref/feeds.php:1646
+#: classes/pref/users.php:403
+msgid "Login"
+msgstr "Oturum aç"
+
+#: classes/feeds.php:1000
+#: classes/pref/feeds.php:631
+#: classes/pref/feeds.php:860
+#: classes/pref/feeds.php:1649
+#: classes/pref/prefs.php:243
+msgid "Password"
+msgstr "Şifre"
+
+#: classes/feeds.php:1011
+#: classes/pref/feeds.php:645
+msgid "This feed requires authentication."
+msgstr "Bu özet akışı doğrulama gerektiriyor."
+
+#: classes/feeds.php:1014
+#: classes/feeds.php:1070
+#: classes/pref/feeds.php:1668
+msgid "Subscribe"
+msgstr "Abone ol"
+
+#: classes/feeds.php:1017
+msgid "More feeds"
+msgstr "Daha fazla özet akışı"
+
+#: classes/feeds.php:1020
+#: classes/feeds.php:1072
+#: classes/feeds.php:1111
+#: classes/pref/labels.php:84
+#: classes/pref/filters.php:528
+#: classes/pref/filters.php:945
+#: classes/pref/filters.php:1022
+#: classes/pref/filters.php:1115
+#: classes/pref/feeds.php:774
+#: classes/pref/feeds.php:916
+#: classes/pref/feeds.php:1669
+#: classes/pref/users.php:105
+#: classes/pref/prefs.php:984
+#: classes/article.php:238
+#: classes/handler/public.php:443
+#: classes/handler/public.php:477
+#: plugins/mail/init.php:179
+#: plugins/note/init.php:60
+msgid "Cancel"
+msgstr "İptal"
+
+#: classes/feeds.php:1042
+#: classes/feeds.php:1110
+#: classes/pref/filters.php:788
+#: classes/pref/feeds.php:1178
+#: classes/pref/users.php:345
+#: js/tt-rss.js:152
+msgid "Search"
+msgstr "Ara"
+
+#: classes/feeds.php:1046
+msgid "Popular feeds"
+msgstr "Popüler özet akışları"
+
+#: classes/feeds.php:1047
+msgid "Feed archive"
+msgstr "Özet akışı arşivi"
+
+#: classes/feeds.php:1050
+msgid "limit:"
+msgstr "limit:"
+
+#: classes/feeds.php:1071
+#: classes/pref/labels.php:282
+#: classes/pref/filters.php:518
+#: classes/pref/filters.php:814
+#: classes/pref/feeds.php:751
+#: classes/pref/users.php:369
+msgid "Remove"
+msgstr "Kaldır"
+
+#: classes/feeds.php:1084
+msgid "Look for"
+msgstr "Arama yap"
+
+#: classes/feeds.php:1092
+#, php-format
+msgid "in %s"
+msgstr ""
+
+#: classes/feeds.php:1097
+msgid "Used for word stemming"
+msgstr ""
+
+#: classes/feeds.php:1106
+#, fuzzy
+msgid "Search syntax"
+msgstr "Ara"
+
+#: classes/feeds.php:1563
+msgid "Starred articles"
+msgstr "Favori yazılar"
+
+#: classes/feeds.php:1565
+msgid "Published articles"
+msgstr "Yayınlanmış yazılar"
+
+#: classes/feeds.php:1567
+msgid "Fresh articles"
+msgstr "Tazeler"
+
+#: classes/feeds.php:1571
+msgid "Archived articles"
+msgstr "Arşivlenmiş yazılar"
+
+#: classes/feeds.php:1573
+msgid "Recently read"
+msgstr "Yakın zamanda okunanlar"
+
+#: classes/feeds.php:1694
+msgid "Special"
+msgstr "Özet"
+
+#: classes/feeds.php:1951
+#, php-format
+msgid "Search results: %s"
+msgstr "Arama sonuçları: %s"
 
 #: classes/pref/labels.php:25
 #: classes/pref/filters.php:377
@@ -1209,201 +1209,195 @@ msgstr "Önplan:"
 msgid "Background:"
 msgstr "Arkaplan:"
 
+#: classes/pref/labels.php:82
+#: classes/pref/filters.php:525
+#: classes/pref/feeds.php:773
+#: classes/pref/feeds.php:913
+#: classes/pref/users.php:103
+#: classes/pref/prefs.php:982
+#: classes/article.php:236
+#: plugins/af_zz_imgproxy/init.php:238
+#: plugins/af_redditimgur/init.php:66
+#: plugins/af_psql_trgm/init.php:188
+#: plugins/af_readability/init.php:80
+#: plugins/nsfw/init.php:85
+#: plugins/mail/init.php:65
+#: plugins/note/init.php:58
+msgid "Save"
+msgstr "Kaydet"
+
 #: classes/pref/labels.php:244
 #, php-format
 msgid "Created label <b>%s</b>"
 msgstr "Arama başlığı tanımlandı <b>%s</b>"
 
 #: classes/pref/labels.php:270
-#: classes/pref/users.php:356
-#: classes/pref/feeds.php:1183
-#: classes/pref/feeds.php:1414
-#: classes/pref/feeds.php:1479
 #: classes/pref/filters.php:388
 #: classes/pref/filters.php:446
 #: classes/pref/filters.php:792
 #: classes/pref/filters.php:875
 #: classes/pref/filters.php:902
+#: classes/pref/feeds.php:1182
+#: classes/pref/feeds.php:1413
+#: classes/pref/feeds.php:1478
+#: classes/pref/users.php:355
 #: classes/pref/prefs.php:993
 msgid "Select"
 msgstr "Seç"
 
-#: classes/pref/labels.php:273
-#: classes/pref/users.php:359
-#: classes/pref/feeds.php:1186
-#: classes/pref/feeds.php:1417
-#: classes/pref/feeds.php:1482
-#: classes/pref/filters.php:391
-#: classes/pref/filters.php:449
-#: classes/pref/filters.php:795
-#: classes/pref/filters.php:878
-#: classes/pref/filters.php:905
-#: classes/pref/prefs.php:996
-#: classes/feeds.php:102
-msgid "All"
-msgstr "Tümü"
-
-#: classes/pref/labels.php:275
-#: classes/pref/users.php:361
-#: classes/pref/feeds.php:1188
-#: classes/pref/feeds.php:1419
-#: classes/pref/feeds.php:1484
-#: classes/pref/filters.php:393
-#: classes/pref/filters.php:451
-#: classes/pref/filters.php:797
-#: classes/pref/filters.php:880
-#: classes/pref/filters.php:907
-#: classes/pref/prefs.php:998
-#: classes/feeds.php:105
-msgid "None"
-msgstr "Hiçbiri"
-
-#: classes/pref/labels.php:282
-#: classes/pref/users.php:370
-#: classes/pref/feeds.php:752
-#: classes/pref/filters.php:518
-#: classes/pref/filters.php:814
-#: classes/feeds.php:1088
-msgid "Remove"
-msgstr "Kaldır"
-
 #: classes/pref/labels.php:285
 msgid "Clear colors"
 msgstr "Renkleri kaldır"
 
-#: classes/pref/users.php:6
-#: classes/pref/system.php:8
-msgid "Your access level is insufficient to open this tab."
-msgstr "Bu sekmeyi açmak için yeterli yetkiniz yok."
-
-#: classes/pref/users.php:26
+#: classes/pref/filters.php:155
 #, fuzzy
-msgid "Edit user"
-msgstr "Kuralı düzenle"
+msgid "Preview article"
+msgstr "Tazeler"
 
-#: classes/pref/users.php:61
-#: classes/pref/feeds.php:622
-#: classes/pref/feeds.php:849
-#: classes/feeds.php:1009
-msgid "Authentication"
-msgstr "Doğrulama"
+#: classes/pref/filters.php:267
+#: classes/pref/filters.php:573
+msgid "(inverse)"
+msgstr "(ters çevir)"
 
-#: classes/pref/users.php:64
-msgid "Access level: "
-msgstr "Erişim seviyesi:"
-
-#: classes/pref/users.php:82
-#: classes/pref/feeds.php:648
-#: classes/pref/feeds.php:867
-msgid "Options"
-msgstr "Opsiyonlar"
-
-#: classes/pref/users.php:96
-#: js/prefs.js:479
-msgid "User details"
-msgstr "Kullanıcı detayları"
-
-#: classes/pref/users.php:136
-#: classes/pref/users.php:407
-msgid "Registered"
-msgstr "Kaydedildi"
-
-#: classes/pref/users.php:137
-msgid "Last logged in"
-msgstr "Son giriş"
-
-#: classes/pref/users.php:145
-msgid "Subscribed feeds count"
-msgstr "Abone olunan özet akışı sayısı"
-
-#: classes/pref/users.php:146
-#, fuzzy
-msgid "Stored articles"
-msgstr "Favori yazılar"
-
-#: classes/pref/users.php:150
-#: classes/pref/users.php:406
-msgid "Subscribed feeds"
-msgstr "Abone olunan özet akışları"
-
-#: classes/pref/users.php:176
-msgid "User not found"
-msgstr "Kullanıcı bulunamadı"
-
-#: classes/pref/users.php:246
+#: classes/pref/filters.php:263
+#: classes/pref/filters.php:572
 #, php-format
-msgid "Added user <b>%s</b> with password <b>%s</b>"
-msgstr "Kullanıcı <b>%s</b> <b>%s</b> şifresi ile eklendi"
+msgid "%s on %s in %s %s"
+msgstr "%s de %s de %s %s"
 
-#: classes/pref/users.php:253
-#, php-format
-msgid "Could not create user <b>%s</b>"
-msgstr "Kullanıcı <b>%s</b> tanımlanamadı"
+#: classes/pref/filters.php:383
+#: classes/pref/filters.php:870
+#: classes/pref/filters.php:977
+msgid "Match"
+msgstr "Eşle"
 
-#: classes/pref/users.php:257
-#, php-format
-msgid "User <b>%s</b> already exists."
-msgstr "Kullanıcı <b>%s</b> zaten var."
+#: classes/pref/filters.php:397
+#: classes/pref/filters.php:455
+#: classes/pref/filters.php:884
+#: classes/pref/filters.php:911
+msgid "Add"
+msgstr "Ekle"
 
-#: classes/pref/users.php:285
-#, 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/filters.php:441
+#: classes/pref/filters.php:897
+msgid "Apply actions"
+msgstr "Uygula"
 
-#: classes/pref/users.php:287
-#, 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/filters.php:492
+#: classes/pref/filters.php:926
+msgid "Enabled"
+msgstr "Etkin"
 
-#: classes/pref/users.php:311
-msgid "[tt-rss] Password change notification"
-msgstr "[tt-rss] Şifre değiştirme hatırlatması"
+#: classes/pref/filters.php:501
+#: classes/pref/filters.php:929
+msgid "Match any rule"
+msgstr "Herhangi bir kurala eşle"
 
-#: classes/pref/users.php:346
-#: classes/pref/feeds.php:1179
-#: classes/pref/filters.php:788
-#: classes/feeds.php:1059
-#: classes/feeds.php:1127
-#: js/tt-rss.js:165
-msgid "Search"
-msgstr "Ara"
+#: classes/pref/filters.php:510
+#: classes/pref/filters.php:932
+msgid "Inverse matching"
+msgstr "Eşlemeyi ters çevir"
 
-#: classes/pref/users.php:364
-msgid "Create user"
-msgstr "Kullanıcı tanımla"
+#: classes/pref/filters.php:522
+#: classes/pref/filters.php:939
+msgid "Test"
+msgstr "Deneme"
+
+#: classes/pref/filters.php:804
+msgid "Combine"
+msgstr "Birleştir"
 
-#: classes/pref/users.php:368
 #: classes/pref/filters.php:807
+#: classes/pref/users.php:367
 msgid "Edit"
 msgstr "Düzenle"
 
-#: classes/pref/users.php:404
-#: classes/pref/feeds.php:626
-#: classes/pref/feeds.php:853
-#: classes/pref/feeds.php:1649
-#: classes/feeds.php:1013
-msgid "Login"
-msgstr "Oturum aç"
+#: classes/pref/filters.php:810
+#: classes/pref/feeds.php:1198
+#: classes/pref/feeds.php:1212
+msgid "Reset sort order"
+msgstr "Sıralamayı eski haline getir"
 
-#: classes/pref/users.php:405
-msgid "Access Level"
-msgstr "Erişim seviyesi"
+#: classes/pref/filters.php:942
+msgid "Create"
+msgstr "Tanımla"
 
-#: classes/pref/users.php:408
-msgid "Last login"
-msgstr "Son giriş"
+#: classes/pref/filters.php:987
+msgid "Regular expression, without outer delimiters (i.e. slashes)"
+msgstr ""
 
-#: classes/pref/users.php:427
-msgid "Click to edit"
-msgstr "Düzenlemek için tıklayın"
+#: classes/pref/filters.php:993
+msgid "Inverse regular expression matching"
+msgstr "Düzenli ifade eşlemesini ters duruma getir"
 
-#: classes/pref/users.php:447
-msgid "No users defined."
-msgstr "Hiçbir kullanıcı tanımlanmadı."
+#: classes/pref/filters.php:995
+msgid "on field"
+msgstr "alanda"
 
-#: classes/pref/users.php:449
-msgid "No matching users found."
-msgstr "Uyan kullanıcı bulunamadı."
+#: classes/pref/filters.php:1001
+#: js/PrefFilterTree.js:44
+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:764
+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:786
+msgid "Add action"
+msgstr "Ekle"
+
+#: classes/pref/filters.php:1139
+msgid "[No caption]"
+msgstr "[altyazısız]"
+
+#: classes/pref/filters.php:1141
+#, 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:1155
+#, fuzzy
+msgid "matches any rule"
+msgstr "Herhangi bir kurala eşle"
+
+#: classes/pref/filters.php:1158
+#, fuzzy, php-format
+msgid "%s (+%d action)"
+msgid_plural "%s (+%d actions)"
+msgstr[0] "%s (+%d eylem)"
+msgstr[1] "%s (+%d eylem)"
+
+#: classes/pref/system.php:8
+#: classes/pref/users.php:6
+msgid "Your access level is insufficient to open this tab."
+msgstr "Bu sekmeyi açmak için yeterli yetkiniz yok."
 
 #: classes/pref/system.php:29
 msgid "Error Log"
@@ -1448,386 +1442,316 @@ msgid_plural "(%d feeds)"
 msgstr[0] "(%d özet akışı)"
 msgstr[1] "(%d özet akışı)"
 
-#: classes/pref/feeds.php:514
+#: classes/pref/feeds.php:513
 #: classes/pref/prefs.php:18
 msgid "General"
 msgstr "Genel"
 
-#: classes/pref/feeds.php:528
+#: classes/pref/feeds.php:527
 msgid "Feed Title"
 msgstr "Özet akışı başlığı"
 
-#: classes/pref/feeds.php:560
-#: classes/pref/feeds.php:801
-#: classes/pref/feeds.php:1635
-#: classes/feeds.php:989
-msgid "Place in category:"
-msgstr "Kategoriye yerleştir"
+#: classes/pref/feeds.php:536
+#: classes/handler/public.php:417
+msgid "URL:"
+msgstr "Internet adresi:"
 
-#: classes/pref/feeds.php:572
+#: classes/pref/feeds.php:571
 #, fuzzy
 msgid "Site URL:"
 msgstr "Yazı adresi:"
 
-#: classes/pref/feeds.php:574
+#: classes/pref/feeds.php:573
 #, fuzzy
 msgid "Site URL"
 msgstr "Özet akışı internet adresi"
 
-#: classes/pref/feeds.php:585
-#: classes/pref/feeds.php:815
+#: classes/pref/feeds.php:584
+#: classes/pref/feeds.php:814
 #, fuzzy
 msgid "Language:"
 msgstr "Dil"
 
-#: classes/pref/feeds.php:592
-#: classes/pref/feeds.php:824
+#: classes/pref/feeds.php:591
+#: classes/pref/feeds.php:823
 msgid "Update"
 msgstr "Yenileme"
 
-#: classes/pref/feeds.php:607
-#: classes/pref/feeds.php:840
+#: classes/pref/feeds.php:606
+#: classes/pref/feeds.php:839
 msgid "Article purging:"
 msgstr "Yazıları temizleme:"
 
-#: classes/pref/feeds.php:632
-#: classes/pref/feeds.php:861
-#: classes/pref/feeds.php:1652
-#: classes/pref/prefs.php:243
-#: classes/feeds.php:1017
-msgid "Password"
-msgstr "Şifre"
-
-#: classes/pref/feeds.php:636
+#: classes/pref/feeds.php:635
 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:646
-#: classes/feeds.php:1028
-msgid "This feed requires authentication."
-msgstr "Bu özet akışı doğrulama gerektiriyor."
+#: classes/pref/feeds.php:647
+#: classes/pref/feeds.php:866
+#: classes/pref/users.php:82
+msgid "Options"
+msgstr "Opsiyonlar"
 
-#: classes/pref/feeds.php:662
-#: classes/pref/feeds.php:871
+#: classes/pref/feeds.php:661
+#: classes/pref/feeds.php:870
 msgid "Hide from Popular feeds"
 msgstr "Popüler özet akışlarında görünmesin"
 
-#: classes/pref/feeds.php:674
-#: classes/pref/feeds.php:877
+#: classes/pref/feeds.php:673
+#: classes/pref/feeds.php:876
 msgid "Include in e-mail digest"
 msgstr "E-posta özetine ekle"
 
-#: classes/pref/feeds.php:687
-#: classes/pref/feeds.php:883
+#: classes/pref/feeds.php:686
+#: classes/pref/feeds.php:882
 msgid "Always display image attachments"
 msgstr "Daima resimleri göster"
 
-#: classes/pref/feeds.php:700
-#: classes/pref/feeds.php:891
+#: classes/pref/feeds.php:699
+#: classes/pref/feeds.php:890
 #, fuzzy
 msgid "Do not embed media"
 msgstr "Resimleri gösterme"
 
-#: classes/pref/feeds.php:713
-#: classes/pref/feeds.php:899
+#: classes/pref/feeds.php:712
+#: classes/pref/feeds.php:898
 msgid "Cache media"
 msgstr ""
 
-#: classes/pref/feeds.php:725
-#: classes/pref/feeds.php:905
+#: classes/pref/feeds.php:724
+#: classes/pref/feeds.php:904
 msgid "Mark updated articles as unread"
 msgstr "Yenilenen yazıları okunmamış işaretle"
 
-#: classes/pref/feeds.php:729
+#: classes/pref/feeds.php:728
 msgid "Icon"
 msgstr "İkon"
 
-#: classes/pref/feeds.php:743
-#: classes/pref/feeds.php:1284
+#: classes/pref/feeds.php:742
+#: classes/pref/feeds.php:1283
 #: plugins/import_export/init.php:71
 #, fuzzy
 msgid "Choose file..."
 msgstr "Filtre tanımla..."
 
-#: classes/pref/feeds.php:750
+#: classes/pref/feeds.php:749
 msgid "Replace"
 msgstr "Değiştir"
 
-#: classes/pref/feeds.php:757
+#: classes/pref/feeds.php:756
 #: classes/pref/prefs.php:679
 msgid "Plugins"
 msgstr "Eklentiler"
 
-#: classes/pref/feeds.php:1154
+#: classes/pref/feeds.php:1153
 msgid "Feeds with errors"
 msgstr "Hatalı özet akışları"
 
-#: classes/pref/feeds.php:1161
+#: classes/pref/feeds.php:1160
 msgid "Inactive feeds"
 msgstr "Aktif olmayan özet akışları"
 
-#: classes/pref/feeds.php:1197
+#: classes/pref/feeds.php:1196
 msgid "Edit selected feeds"
 msgstr "Seçili özet akışlarını düzenle"
 
-#: classes/pref/feeds.php:1199
-#: classes/pref/feeds.php:1213
-#: classes/pref/filters.php:810
-msgid "Reset sort order"
-msgstr "Sıralamayı eski haline getir"
-
-#: classes/pref/feeds.php:1201
-#: js/prefs.js:1462
+#: classes/pref/feeds.php:1200
+#: js/prefs.js:1171
 msgid "Batch subscribe"
 msgstr "Toplu abone ol"
 
-#: classes/pref/feeds.php:1208
+#: classes/pref/feeds.php:1207
 msgid "Categories"
 msgstr "Kategoriler"
 
-#: classes/pref/feeds.php:1211
+#: classes/pref/feeds.php:1210
 msgid "Add category"
 msgstr "Kategori ekle"
 
-#: classes/pref/feeds.php:1215
+#: classes/pref/feeds.php:1214
 msgid "Remove selected"
 msgstr "Seçileni kaldır"
 
-#: classes/pref/feeds.php:1272
+#: classes/pref/feeds.php:1271
 msgid "OPML"
 msgstr "OPML"
 
-#: classes/pref/feeds.php:1274
+#: classes/pref/feeds.php:1273
 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:1275
+#: classes/pref/feeds.php:1274
 msgid "Only main settings profile can be migrated using OPML."
 msgstr "OPML ile sadece ana tercihler profili nakli yapılabilir. "
 
-#: classes/pref/feeds.php:1290
+#: classes/pref/feeds.php:1289
 msgid "Import my OPML"
 msgstr "OPML'imi içe aktar"
 
-#: classes/pref/feeds.php:1296
+#: classes/pref/feeds.php:1295
 msgid "Filename:"
 msgstr "Dosya adı:"
 
-#: classes/pref/feeds.php:1298
+#: classes/pref/feeds.php:1297
 msgid "Include settings"
 msgstr "Ayarları dahil et"
 
-#: classes/pref/feeds.php:1302
+#: classes/pref/feeds.php:1301
 msgid "Export OPML"
 msgstr "OPML'i dışa aktar"
 
-#: classes/pref/feeds.php:1306
+#: classes/pref/feeds.php:1305
 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:1310
+#: classes/pref/feeds.php:1309
 msgid "Public OPML URL"
 msgstr "Herkese açık OPML adresi"
 
-#: classes/pref/feeds.php:1311
+#: classes/pref/feeds.php:1310
 msgid "Display published OPML URL"
 msgstr "Yayınlanan OPML adresini göster"
 
-#: classes/pref/feeds.php:1318
+#: classes/pref/feeds.php:1317
 msgid "Published & shared articles / Generated feeds"
 msgstr "Yayınlanmış ve paylaşılmış yazılar / Oluşturulan özet akışları"
 
-#: classes/pref/feeds.php:1320
+#: classes/pref/feeds.php:1319
 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:1327
-#: classes/feeds.php:54
-#: classes/feeds.php:140
-msgid "View as RSS"
-msgstr "RSS olarak görüntüle"
-
-#: classes/pref/feeds.php:1328
 msgid "Display URL"
 msgstr "Adresi göster"
 
-#: classes/pref/feeds.php:1331
+#: classes/pref/feeds.php:1330
 msgid "Clear all generated URLs"
 msgstr "Tüm üretilmiş adresleri temizle"
 
-#: classes/pref/feeds.php:1410
+#: classes/pref/feeds.php:1409
 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:1444
-#: classes/pref/feeds.php:1509
+#: classes/pref/feeds.php:1443
+#: classes/pref/feeds.php:1508
 msgid "Click to edit feed"
 msgstr "Özet akışını düzenlemek için tıklayın"
 
-#: classes/pref/feeds.php:1462
-#: classes/pref/feeds.php:1529
+#: classes/pref/feeds.php:1461
+#: classes/pref/feeds.php:1528
 msgid "Unsubscribe from selected feeds"
 msgstr "Seçilen özet akışlarının aboneliğinden ayrıl"
 
-#: classes/pref/feeds.php:1632
+#: classes/pref/feeds.php:1629
 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:1641
+#: classes/pref/feeds.php:1638
 msgid "Feeds to subscribe, One per line"
 msgstr "Abone olunacak özet akışları, satır başına bir tane"
 
-#: classes/pref/feeds.php:1664
+#: classes/pref/feeds.php:1661
 msgid "Feeds require authentication."
 msgstr "Onaylama gereken özet akışları."
 
-#: classes/pref/feeds.php:1671
-#: classes/feeds.php:1031
-#: classes/feeds.php:1087
-msgid "Subscribe"
-msgstr "Abone ol"
-
-#: classes/pref/filters.php:155
+#: classes/pref/users.php:26
 #, fuzzy
-msgid "Preview article"
-msgstr "Tazeler"
+msgid "Edit user"
+msgstr "Kuralı düzenle"
 
-#: classes/pref/filters.php:267
-#: classes/pref/filters.php:573
-msgid "(inverse)"
-msgstr "(ters çevir)"
+#: classes/pref/users.php:64
+msgid "Access level: "
+msgstr "Erişim seviyesi:"
 
-#: classes/pref/filters.php:263
-#: classes/pref/filters.php:572
+#: classes/pref/users.php:96
+#: js/prefs.js:403
+msgid "User details"
+msgstr "Kullanıcı detayları"
+
+#: classes/pref/users.php:136
+#: classes/pref/users.php:406
+msgid "Registered"
+msgstr "Kaydedildi"
+
+#: classes/pref/users.php:137
+msgid "Last logged in"
+msgstr "Son giriş"
+
+#: classes/pref/users.php:145
+msgid "Subscribed feeds count"
+msgstr "Abone olunan özet akışı sayısı"
+
+#: classes/pref/users.php:146
+#, fuzzy
+msgid "Stored articles"
+msgstr "Favori yazılar"
+
+#: classes/pref/users.php:150
+#: classes/pref/users.php:405
+msgid "Subscribed feeds"
+msgstr "Abone olunan özet akışları"
+
+#: classes/pref/users.php:176
+msgid "User not found"
+msgstr "Kullanıcı bulunamadı"
+
+#: classes/pref/users.php:246
 #, php-format
-msgid "%s on %s in %s %s"
-msgstr "%s de %s de %s %s"
+msgid "Added user <b>%s</b> with password <b>%s</b>"
+msgstr "Kullanıcı <b>%s</b> <b>%s</b> şifresi ile eklendi"
 
-#: classes/pref/filters.php:383
-#: classes/pref/filters.php:870
-#: classes/pref/filters.php:977
-msgid "Match"
-msgstr "Eşle"
-
-#: classes/pref/filters.php:397
-#: classes/pref/filters.php:455
-#: classes/pref/filters.php:884
-#: classes/pref/filters.php:911
-msgid "Add"
-msgstr "Ekle"
-
-#: classes/pref/filters.php:400
-#: classes/pref/filters.php:458
-#: classes/pref/filters.php:887
-#: classes/pref/filters.php:914
-#: classes/feeds.php:122
-msgid "Delete"
-msgstr "Sil"
-
-#: classes/pref/filters.php:441
-#: classes/pref/filters.php:897
-msgid "Apply actions"
-msgstr "Uygula"
-
-#: classes/pref/filters.php:492
-#: classes/pref/filters.php:926
-msgid "Enabled"
-msgstr "Etkin"
-
-#: classes/pref/filters.php:501
-#: classes/pref/filters.php:929
-msgid "Match any rule"
-msgstr "Herhangi bir kurala eşle"
-
-#: classes/pref/filters.php:510
-#: classes/pref/filters.php:932
-msgid "Inverse matching"
-msgstr "Eşlemeyi ters çevir"
-
-#: classes/pref/filters.php:522
-#: classes/pref/filters.php:939
-msgid "Test"
-msgstr "Deneme"
-
-#: classes/pref/filters.php:804
-msgid "Combine"
-msgstr "Birleştir"
-
-#: classes/pref/filters.php:942
-msgid "Create"
-msgstr "Tanımla"
-
-#: classes/pref/filters.php:987
-msgid "Regular expression, without outer delimiters (i.e. slashes)"
-msgstr ""
-
-#: 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:43
-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:797
-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:819
-msgid "Add action"
-msgstr "Ekle"
-
-#: classes/pref/filters.php:1139
-msgid "[No caption]"
-msgstr "[altyazısız]"
-
-#: classes/pref/filters.php:1141
+#: classes/pref/users.php:253
 #, php-format
-msgid "%s (%d rule)"
-msgid_plural "%s (%d rules)"
-msgstr[0] "%s (%d kural)"
-msgstr[1] "%s (%d kurallar)"
+msgid "Could not create user <b>%s</b>"
+msgstr "Kullanıcı <b>%s</b> tanımlanamadı"
 
-#: classes/pref/filters.php:1155
-#, fuzzy
-msgid "matches any rule"
-msgstr "Herhangi bir kurala eşle"
+#: classes/pref/users.php:257
+#, php-format
+msgid "User <b>%s</b> already exists."
+msgstr "Kullanıcı <b>%s</b> zaten var."
 
-#: classes/pref/filters.php:1158
-#, 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:285
+#, 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:287
+#, 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:310
+msgid "[tt-rss] Password change notification"
+msgstr "[tt-rss] Şifre değiştirme hatırlatması"
+
+#: classes/pref/users.php:363
+msgid "Create user"
+msgstr "Kullanıcı tanımla"
+
+#: classes/pref/users.php:371
+#: classes/handler/public.php:747
+msgid "Reset password"
+msgstr "Şifremi yenile"
+
+#: classes/pref/users.php:404
+msgid "Access Level"
+msgstr "Erişim seviyesi"
+
+#: classes/pref/users.php:407
+msgid "Last login"
+msgstr "Son giriş"
+
+#: classes/pref/users.php:426
+msgid "Click to edit"
+msgstr "Düzenlemek için tıklayın"
+
+#: classes/pref/users.php:446
+msgid "No users defined."
+msgstr "Hiçbir kullanıcı tanımlanmadı."
+
+#: classes/pref/users.php:448
+msgid "No matching users found."
+msgstr "Uyan kullanıcı bulunamadı."
 
 #: classes/pref/prefs.php:19
 msgid "Interface"
@@ -2003,7 +1927,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:1424
+#: js/prefs.js:1136
 msgid "Customize stylesheet"
 msgstr "Stil sayfasını biçimlendir"
 
@@ -2246,256 +2170,300 @@ msgstr "Seçili profilleri kaldır"
 msgid "Activate profile"
 msgstr "Profili aktifleştir"
 
-#: classes/feeds.php:53
-msgid "View as RSS feed"
-msgstr "RSS özet akışı olarak görüntüle"
+#: 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."
 
-#: classes/feeds.php:62
-#, php-format
-msgid "Last updated: %s"
-msgstr "Son yenileme: %s"
+#: classes/dlg.php:44
+msgid "Your Public OPML URL is:"
+msgstr "Herkese açık OPML internet adresiniz:"
 
-#: classes/feeds.php:100
+#: classes/dlg.php:53
+#: classes/dlg.php:178
+#: plugins/share/init.php:125
+msgid "Generate new URL"
+msgstr "Yeni internet adresi oluştur"
+
+#: classes/dlg.php:67
+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 "Konfigürasyonda geri plan yordamı etkinleştirildi ama geri plan yordamı çalışmıyor ve bu tüm özet akışlarının yenilenmesini engelliyor. Lütfen geri plan yordamını başlatın ya da olgu sahibiyle irtibata geçin. "
+
+#: classes/dlg.php:71
+#: classes/dlg.php:80
+msgid "Last update:"
+msgstr "Son yenileme:"
+
+#: classes/dlg.php:76
+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 "Yenileme geri plan yordamı çok uzun süredir çalışıyor. Bir problem olabilir. Lütfen geri plan yordamını kontrol edin ya da olgu sahibiyle irtibata geçin."
+
+#: classes/dlg.php:169
+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/dlg.php:190
+msgid "You are using default tt-rss password. Please change it in the Preferences (Personal data / Authentication)."
+msgstr ""
+
+#: classes/dlg.php:194
 #, fuzzy
-msgid "Select..."
-msgstr "Seç"
+msgid "Open Preferences"
+msgstr "Tercihler"
 
-#: classes/feeds.php:104
-msgid "Invert"
-msgstr "Ters çevir"
+#: classes/opml.php:31
+#: classes/opml.php:36
+msgid "OPML Utility"
+msgstr "OPML Utility"
 
-#: classes/feeds.php:107
-msgid "Selection toggle:"
-msgstr "Seçimi değiştir:"
+#: classes/opml.php:40
+msgid "Importing OPML..."
+msgstr "OPML içe aktarılıyor..."
 
-#: classes/feeds.php:113
-msgid "Selection:"
-msgstr "Seçim:"
+#: classes/opml.php:45
+msgid "Return to preferences"
+msgstr "Tercihlere geri dön"
 
-#: classes/feeds.php:116
-msgid "Set score"
-msgstr "Skor ata"
-
-#: classes/feeds.php:119
-msgid "Archive"
-msgstr "Arşiv"
-
-#: classes/feeds.php:121
-msgid "Move back"
-msgstr "Geri git"
-
-#: classes/feeds.php:127
-#: classes/feeds.php:132
-#: plugins/mail/init.php:76
-#: plugins/mailto/init.php:25
-msgid "Forward by email"
-msgstr "E-posta ile yolla"
-
-#: classes/feeds.php:136
-msgid "Feed:"
-msgstr "Özet akışı:"
-
-#: classes/feeds.php:193
-#: classes/feeds.php:819
-msgid "Feed not found."
-msgstr "Özet akışı bulunamadı."
-
-#: classes/feeds.php:255
-msgid "Never"
-msgstr "Asla"
-
-#: classes/feeds.php:342
+#: classes/opml.php:301
 #, php-format
-msgid "Imported at %s"
-msgstr "%s de içe aktarıldı"
+msgid "Adding feed: %s"
+msgstr "Özet akışı ekleniyor: %s"
 
-#: classes/feeds.php:394
-#: classes/feeds.php:487
-#, fuzzy
-msgid "mark feed as read"
-msgstr "Okundu olarak işaretle"
+#: classes/opml.php:312
+#, php-format
+msgid "Duplicate feed: %s"
+msgstr "Zaten var olan özet akışı: %s"
 
-#: classes/feeds.php:542
-msgid "Collapse article"
-msgstr "Yazıyı kapat"
+#: classes/opml.php:326
+#, php-format
+msgid "Adding label %s"
+msgstr "Arama başlığı ekleniyor %s"
 
-#: classes/feeds.php:703
-msgid "No unread articles found to display."
-msgstr "Okunmamış yazı bulunamadı."
+#: classes/opml.php:329
+#, php-format
+msgid "Duplicate label: %s"
+msgstr "Aynı arama başlığı mevcut: %s"
 
-#: classes/feeds.php:706
-msgid "No updated articles found to display."
-msgstr "Yenilenmiş yazı bulunamadı."
+#: classes/opml.php:341
+#, php-format
+msgid "Setting preference key %s to %s"
+msgstr "Tercih anahtarı %s %s'e ayarlanıyor"
 
-#: classes/feeds.php:709
-msgid "No starred articles found to display."
-msgstr "Favori yazı bulunamadı."
+#: classes/opml.php:377
+msgid "Adding filter..."
+msgstr "Filtre ekleniyor..."
 
-#: classes/feeds.php:713
-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/opml.php:512
+#, php-format
+msgid "Processing category: %s"
+msgstr "Kategori işleniyor: %s"
 
-#: classes/feeds.php:715
-msgid "No articles found to display."
+#: classes/opml.php:558
+#, php-format
+msgid "Upload failed with error code %d"
+msgstr "Yükleme başarısız oldu hata kodu %d"
+
+#: classes/opml.php:570
+#: plugins/import_export/init.php:471
+msgid "Unable to move uploaded file."
+msgstr "Yüklenen dosya taşınamadı."
+
+#: classes/opml.php:574
+#: plugins/import_export/init.php:475
+msgid "Error: please upload OPML file."
+msgstr "Hata: lütfen OPML dosyasını yükleyin."
+
+#: classes/opml.php:585
+msgid "Error: unable to find moved OPML file."
+msgstr "Hata: Taşınan OPML dosyası bulunamıyor."
+
+#: classes/opml.php:594
+msgid "Error while parsing document."
+msgstr "Belge çözümlenirken hata oluştu."
+
+#: classes/article.php:26
+msgid "Article not found."
 msgstr "Yazı bulunamadı."
 
-#: classes/feeds.php:731
-#: classes/feeds.php:922
+#: classes/article.php:211
+msgid "Tags for this article (separated by commas):"
+msgstr "Bu yazı için etiketler (virgülle ayrılmış):"
+
+#: classes/article.php:337
+#: classes/article.php:719
+#: classes/article.php:874
+msgid "no tags"
+msgstr "Etiketi yok"
+
+#: classes/article.php:447
+msgid "unknown type"
+msgstr "bilinmeyen tür"
+
+#: classes/article.php:524
+msgid "Attachments"
+msgstr "Ekler"
+
+#: classes/article.php:688
+msgid " - "
+msgstr "-"
+
+#: classes/article.php:912
+msgid "(edit note)"
+msgstr "(notu değiştir)"
+
+#: classes/handler/public.php:407
+#: plugins/bookmarklets/init.php:40
+msgid "Share with Tiny Tiny RSS"
+msgstr "Tiny Tiny RSS ile paylaş"
+
+#: classes/handler/public.php:415
+msgid "Title:"
+msgstr "Başlık:"
+
+#: classes/handler/public.php:419
+msgid "Content:"
+msgstr "İçerik:"
+
+#: classes/handler/public.php:421
+msgid "Labels:"
+msgstr "Arama başlıkları:"
+
+#: classes/handler/public.php:440
+msgid "Shared article will appear in the Published feed."
+msgstr "Paylaşılan yazı Yayınlananlar'da gözükecek"
+
+#: classes/handler/public.php:442
+msgid "Share"
+msgstr "Paylaş"
+
+#: classes/handler/public.php:464
+msgid "Not logged in"
+msgstr "Giriş yapılmamış"
+
+#: classes/handler/public.php:527
+msgid "Incorrect username or password"
+msgstr "Geçersiz kullanıcı adı ya da şifresi"
+
+#: classes/handler/public.php:581
 #, php-format
-msgid "Feeds last updated at %s"
-msgstr "Özet akışları en son %s de yenilendi"
+msgid "Already subscribed to <b>%s</b>."
+msgstr "<b>%s</b>'e zaten abonesiniz."
 
-#: classes/feeds.php:743
-#: classes/feeds.php:934
-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:911
-msgid "No feed selected."
-msgstr "Hiçbir özet akışı seçilmedi."
-
-#: classes/feeds.php:975
-#: classes/feeds.php:983
-msgid "Feed or site URL"
-msgstr "Özet akışı ya da site adresi"
-
-#: classes/feeds.php:997
-msgid "Available feeds"
-msgstr "Mevcut veri akışları"
-
-#: classes/feeds.php:1034
-msgid "More feeds"
-msgstr "Daha fazla özet akışı"
-
-#: classes/feeds.php:1063
-msgid "Popular feeds"
-msgstr "Popüler özet akışları"
-
-#: classes/feeds.php:1064
-msgid "Feed archive"
-msgstr "Özet akışı arşivi"
-
-#: classes/feeds.php:1067
-msgid "limit:"
-msgstr "limit:"
-
-#: classes/feeds.php:1101
-msgid "Look for"
-msgstr "Arama yap"
-
-#: classes/feeds.php:1109
+#: classes/handler/public.php:584
 #, php-format
-msgid "in %s"
-msgstr ""
+msgid "Subscribed to <b>%s</b>."
+msgstr "<b>%s</b>'e abone oldunuz."
 
-#: classes/feeds.php:1114
-msgid "Used for word stemming"
-msgstr ""
+#: classes/handler/public.php:587
+#, php-format
+msgid "Could not subscribe to <b>%s</b>."
+msgstr "<b>%s</b>'e abone olunamadı."
 
-#: classes/feeds.php:1123
+#: classes/handler/public.php:590
+#, php-format
+msgid "No feeds found in <b>%s</b>."
+msgstr "<b>%s</b>'de özet akışı bulunamadı."
+
+#: classes/handler/public.php:593
+msgid "Multiple feed URLs found."
+msgstr "Birçok özet akışı internet adresi bulundu."
+
+#: classes/handler/public.php:597
+#, 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:615
+msgid "Subscribe to selected feed"
+msgstr "Seçilen özet akışlarına abone ol"
+
+#: classes/handler/public.php:642
+msgid "Edit subscription options"
+msgstr "Abonelik tercihlerini düzenle"
+
+#: classes/handler/public.php:680
+msgid "Password recovery"
+msgstr "Şifre bulma"
+
+#: classes/handler/public.php:725
 #, fuzzy
-msgid "Search syntax"
-msgstr "Ara"
+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/feeds.php:1577
-msgid "Starred articles"
-msgstr "Favori yazılar"
+#: classes/handler/public.php:757
+msgid "Some of the required form parameters are missing or incorrect."
+msgstr "Bazı gerekli form parametreleri eksik ya da yanlış."
 
-#: classes/feeds.php:1579
-msgid "Published articles"
-msgstr "Yayınlanmış yazılar"
+#: classes/handler/public.php:761
+#: classes/handler/public.php:830
+msgid "Go back"
+msgstr "Geri git"
 
-#: classes/feeds.php:1581
-msgid "Fresh articles"
-msgstr "Tazeler"
+#: classes/handler/public.php:799
+#, fuzzy
+msgid "[tt-rss] Password reset request"
+msgstr "[tt-rss] Şifre değiştirme hatırlatması"
 
-#: classes/feeds.php:1585
-msgid "Archived articles"
-msgstr "Arşivlenmiş yazılar"
+#: 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/feeds.php:1587
-msgid "Recently read"
-msgstr "Yakın zamanda okunanlar"
+#: 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/feeds.php:1708
-msgid "Special"
-msgstr "Özet"
+#: classes/handler/public.php:874
+msgid "Database Updater"
+msgstr "Veritabanı Yenileyicisi"
 
-#: classes/feeds.php:1965
-#, php-format
-msgid "Search results: %s"
-msgstr "Arama sonuçları: %s"
+#: classes/handler/public.php:939
+msgid "Perform updates"
+msgstr "Yenilemeleri yap"
 
-#: 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/af_zz_imgproxy/init.php:208
+msgid "Image proxy settings (af_zz_imgproxy)"
+msgstr ""
 
-#: plugins/nsfw/init.php:52
-msgid "NSFW Plugin"
-msgstr "NSFW eklentisi"
+#: plugins/af_zz_imgproxy/init.php:232
+#, fuzzy
+msgid "Enable proxy for all remote images."
+msgstr "Özet akışı kategorilerini etkinleştir"
 
-#: 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/af_zz_imgproxy/init.php:236
+#, fuzzy
+msgid "Don't cache files locally."
+msgstr "Resimleri sunucuda sakla"
 
-#: plugins/nsfw/init.php:100
-msgid "Configuration saved."
+#: plugins/af_zz_imgproxy/init.php:252
+#: plugins/af_redditimgur/init.php:79
+#, fuzzy
+msgid "Configuration saved"
 msgstr "Konfigürasyon kaydedildi."
 
-#: plugins/note/init.php:28
-#: plugins/note/note.js:11
-msgid "Edit article note"
-msgstr "Yazı notunu düzenle"
-
 #: plugins/vf_shared/init.php:17
 #: plugins/vf_shared/init.php:73
 msgid "Shared articles"
 msgstr "Paylaşılmış yazılar"
 
-#: plugins/auth_internal/init.php:67
-msgid "Please enter your one time password:"
-msgstr "Lütfen tek seferlik şifrenizi girin:"
+#: plugins/bookmarklets/init.php:20
+msgid "Bookmarklets"
+msgstr "Bookmarklets"
 
-#: plugins/auth_internal/init.php:208
-msgid "Password has been changed."
-msgstr "Şifre değiştirildi."
+#: 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 "Aşağıdaki bağlantıyı internet tarayıcınızın araç çubuğuna taşıyın, tarayıcınızda ilgilendiğiniz özet akışını açın ve abone olmak istediğiniz bağlantıya tıklayın."
 
-#: plugins/auth_internal/init.php:210
-msgid "Old password is incorrect."
-msgstr "Eski şifreniz yanlış."
+#: plugins/bookmarklets/init.php:26
+#, php-format
+msgid "Subscribe to %s in Tiny Tiny RSS?"
+msgstr "%s e abone olunsun mu?"
 
-#: plugins/af_readability/init.php:25
-msgid "Data saved."
-msgstr ""
+#: plugins/bookmarklets/init.php:31
+msgid "Subscribe in Tiny Tiny RSS"
+msgstr "Tiny Tiny RSS ile abone ol"
 
-#: plugins/af_readability/init.php:41
-#, fuzzy
-msgid "Inline content"
-msgstr "Yazı notunu düzenle"
-
-#: plugins/af_readability/init.php:47
-msgid "Readability settings (af_readability)"
-msgstr ""
-
-#: plugins/af_readability/init.php:78
-msgid "Use Readability for pages shared via bookmarklet."
-msgstr ""
-
-#: plugins/af_readability/init.php:90
-#: plugins/af_psql_trgm/init.php:198
-msgid "Currently enabled for (click to edit):"
-msgstr ""
-
-#: plugins/af_readability/init.php:107
-#, fuzzy
-msgid "Readability"
-msgstr "Kullanılırlığını kontrol et"
-
-#: plugins/af_readability/init.php:118
-#, fuzzy
-msgid "Inline article content"
-msgstr "Yazı notunu düzenle"
+#: plugins/bookmarklets/init.php:34
+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_redditimgur/init.php:30
 msgid "Reddit content settings (af_redditimgur)"
@@ -2509,11 +2477,21 @@ msgstr ""
 msgid "Enable additional duplicate checking"
 msgstr ""
 
-#: plugins/af_redditimgur/init.php:79
-#: plugins/af_zz_imgproxy/init.php:252
-#, fuzzy
-msgid "Configuration saved"
-msgstr "Konfigürasyon kaydedildi."
+#: plugins/af_comics/init.php:49
+msgid "Feeds supported by af_comics"
+msgstr ""
+
+#: plugins/af_comics/init.php:51
+msgid "The following comics are currently supported:"
+msgstr ""
+
+#: plugins/af_comics/init.php:69
+msgid "To subscribe to GoComics use the comic's regular web page as the feed URL (e.g. for the <em>Garfield</em> comic use <code>http://www.gocomics.com/garfield</code>)."
+msgstr ""
+
+#: plugins/af_comics/init.php:71
+msgid "Drop any updated filters into <code>filters.local</code> in plugin directory."
+msgstr ""
 
 #: plugins/af_psql_trgm/init.php:29
 #, php-format
@@ -2553,25 +2531,86 @@ msgstr ""
 msgid "Enable for all feeds:"
 msgstr "Özet akışı kategorilerini etkinleştir"
 
+#: plugins/af_psql_trgm/init.php:198
+#: plugins/af_readability/init.php:90
+msgid "Currently enabled for (click to edit):"
+msgstr ""
+
 #: plugins/af_psql_trgm/init.php:216
 msgid "Similarity (pg_trgm)"
 msgstr ""
 
-#: plugins/af_comics/init.php:49
-msgid "Feeds supported by af_comics"
+#: plugins/af_readability/init.php:25
+msgid "Data saved."
 msgstr ""
 
-#: plugins/af_comics/init.php:51
-msgid "The following comics are currently supported:"
+#: plugins/af_readability/init.php:41
+#, fuzzy
+msgid "Inline content"
+msgstr "Yazı notunu düzenle"
+
+#: plugins/af_readability/init.php:47
+msgid "Readability settings (af_readability)"
 msgstr ""
 
-#: plugins/af_comics/init.php:69
-msgid "To subscribe to GoComics use the comic's regular web page as the feed URL (e.g. for the <em>Garfield</em> comic use <code>http://www.gocomics.com/garfield</code>)."
+#: plugins/af_readability/init.php:78
+msgid "Use Readability for pages shared via bookmarklet."
 msgstr ""
 
-#: plugins/af_comics/init.php:71
-msgid "Drop any updated filters into <code>filters.local</code> in plugin directory."
-msgstr ""
+#: plugins/af_readability/init.php:107
+#, fuzzy
+msgid "Readability"
+msgstr "Kullanılırlığını kontrol et"
+
+#: plugins/af_readability/init.php:118
+#, fuzzy
+msgid "Inline article content"
+msgstr "Yazı notunu düzenle"
+
+#: plugins/mailto/init.php:50
+#: plugins/mailto/init.php:58
+#: plugins/mail/init.php:118
+#: plugins/mail/init.php:124
+msgid "[Forwarded]"
+msgstr "[İletildi]"
+
+#: plugins/mailto/init.php:50
+#: plugins/mail/init.php:118
+msgid "Multiple articles"
+msgstr "Birçok yazı"
+
+#: plugins/mailto/init.php:74
+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/mailto/init.php:78
+msgid "Forward selected article(s) by email."
+msgstr "Seçilmiş yazıları e-posta ile iletin."
+
+#: plugins/mailto/init.php:81
+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/mailto/init.php:86
+msgid "Close this dialog"
+msgstr "Bu ekranı kapatın"
+
+#: 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/import_export/init.php:53
 msgid "Import and export"
@@ -2639,102 +2678,6 @@ msgstr "Yükleme başarısız oldu hata kodu %d"
 msgid "No file uploaded."
 msgstr "Dosya yüklenemedi."
 
-#: plugins/mail/init.php:29
-msgid "Mail addresses saved."
-msgstr ""
-
-#: plugins/mail/init.php:35
-#, fuzzy
-msgid "Mail plugin"
-msgstr "Kullanıcı eklentileri"
-
-#: plugins/mail/init.php:37
-msgid "You can set predefined email addressed here (comma-separated list):"
-msgstr ""
-
-#: plugins/mail/init.php:118
-#: plugins/mail/init.php:124
-#: plugins/mailto/init.php:50
-#: plugins/mailto/init.php:58
-msgid "[Forwarded]"
-msgstr "[İletildi]"
-
-#: plugins/mail/init.php:118
-#: plugins/mailto/init.php:50
-msgid "Multiple articles"
-msgstr "Birçok yazı"
-
-#: plugins/mail/init.php:146
-msgid "To:"
-msgstr "Kime:"
-
-#: plugins/mail/init.php:161
-msgid "Subject:"
-msgstr "Başlık:"
-
-#: plugins/mail/init.php:178
-msgid "Send e-mail"
-msgstr "E-posta yolla"
-
-#: plugins/close_button/init.php:25
-msgid "Close article"
-msgstr "Yazıyı kapat"
-
-#: plugins/bookmarklets/init.php:20
-msgid "Bookmarklets"
-msgstr "Bookmarklets"
-
-#: plugins/bookmarklets/init.php:22
-msgid "Drag the link below to your browser toolbar, open the feed you're interested in in your browser and click on the link to subscribe to it."
-msgstr "Aşağıdaki bağlantıyı internet tarayıcınızın araç çubuğuna taşıyın, tarayıcınızda ilgilendiğiniz özet akışını açın ve abone olmak istediğiniz bağlantıya tıklayın."
-
-#: plugins/bookmarklets/init.php:26
-#, php-format
-msgid "Subscribe to %s in Tiny Tiny RSS?"
-msgstr "%s e abone olunsun mu?"
-
-#: plugins/bookmarklets/init.php:31
-msgid "Subscribe in Tiny Tiny RSS"
-msgstr "Tiny Tiny RSS ile abone ol"
-
-#: plugins/bookmarklets/init.php:34
-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/toggle_sidebar/init.php:23
-msgid "Collapse feedlist"
-msgstr "Özet akışı listesini kapat"
-
-#: plugins/af_zz_imgproxy/init.php:208
-msgid "Image proxy settings (af_zz_imgproxy)"
-msgstr ""
-
-#: plugins/af_zz_imgproxy/init.php:232
-#, fuzzy
-msgid "Enable proxy for all remote images."
-msgstr "Özet akışı kategorilerini etkinleştir"
-
-#: plugins/af_zz_imgproxy/init.php:236
-#, fuzzy
-msgid "Don't cache files locally."
-msgstr "Resimleri sunucuda sakla"
-
-#: plugins/mailto/init.php:74
-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/mailto/init.php:78
-msgid "Forward selected article(s) by email."
-msgstr "Seçilmiş yazıları e-posta ile iletin."
-
-#: plugins/mailto/init.php:81
-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/mailto/init.php:86
-msgid "Close this dialog"
-msgstr "Bu ekranı kapatın"
-
 #: plugins/share/init.php:41
 msgid "You can disable all articles shared by unique URLs here."
 msgstr "Tek internet adresinden paylaşılan tüm yazıları buradan etkinsizleştirebilirsiniz."
@@ -2755,454 +2698,604 @@ msgstr "Bu yazıyı bu internet adresi ile paylaşabilirsiniz:"
 msgid "Unshare article"
 msgstr "Bu yazı paylaşımını iptal et"
 
-#: js/FeedTree.js:75
+#: plugins/toggle_sidebar/init.php:23
+msgid "Collapse feedlist"
+msgstr "Özet akışı listesini kapat"
+
+#: plugins/close_button/init.php:25
+msgid "Close article"
+msgstr "Yazıyı kapat"
+
+#: plugins/mail/init.php:29
+msgid "Mail addresses saved."
+msgstr ""
+
+#: plugins/mail/init.php:35
+#, fuzzy
+msgid "Mail plugin"
+msgstr "Kullanıcı eklentileri"
+
+#: plugins/mail/init.php:37
+msgid "You can set predefined email addressed here (comma-separated list):"
+msgstr ""
+
+#: plugins/mail/init.php:146
+msgid "To:"
+msgstr "Kime:"
+
+#: plugins/mail/init.php:161
+msgid "Subject:"
+msgstr "Başlık:"
+
+#: plugins/mail/init.php:178
+msgid "Send e-mail"
+msgstr "E-posta yolla"
+
+#: plugins/note/init.php:28
+#: plugins/note/note.js:11
+msgid "Edit article note"
+msgstr "Yazı notunu düzenle"
+
+#: plugins/auth_internal/init.php:67
+msgid "Please enter your one time password:"
+msgstr "Lütfen tek seferlik şifrenizi girin:"
+
+#: plugins/auth_internal/init.php:208
+msgid "Password has been changed."
+msgstr "Şifre değiştirildi."
+
+#: plugins/auth_internal/init.php:210
+msgid "Old password is incorrect."
+msgstr "Eski şifreniz yanlış."
+
+#: js/FeedTree.js:76
 #, fuzzy
 msgid "(Un)collapse"
 msgstr "Kenar çubuğunu aç/kapa"
 
-#: js/PrefFeedTree.js:35
+#: js/PrefFeedTree.js:36
 msgid "Edit category"
 msgstr "Kategoriyi düzenle"
 
-#: js/PrefFeedTree.js:42
+#: js/PrefFeedTree.js:43
 msgid "Remove category"
 msgstr "Kategoriyi kaldır"
 
-#: js/PrefFilterTree.js:46
+#: js/PrefFilterTree.js:47
 msgid "Inverse"
 msgstr "Seçimi ters çevir"
 
-#: js/feedlist.js:511
+#: js/feedlist.js:461
 #, 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:514
+#: js/feedlist.js:464
 #, 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:517
+#: js/feedlist.js:467
 #, 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:520
+#: js/feedlist.js:470
 #, fuzzy
 msgid "Mark %w in %s as read?"
 msgstr "%s'deki tüm yazılar okundu işaretlensin mi?"
 
-#: js/feedlist.js:523
+#: js/feedlist.js:473
 #, fuzzy
 msgid "search results"
 msgstr "Arama sonuçları: %s"
 
-#: js/feedlist.js:523
+#: js/feedlist.js:473
 #, fuzzy
 msgid "all articles"
 msgstr "Tüm yazılar"
 
-#: js/functions.js:74
+#: js/functions.js:100
 msgid "Close"
 msgstr ""
 
-#: js/functions.js:141
+#: js/functions.js:167
 msgid "Click to close"
 msgstr "Kapamak için tıklayın"
 
-#: js/functions.js:448
+#: js/functions.js:456
 msgid "Error explained"
 msgstr "Hata açıklandı"
 
-#: js/functions.js:592
+#: js/functions.js:490
+msgid "Upload complete."
+msgstr "Yükleme tamamlandı."
+
+#: js/functions.js:508
+msgid "Remove stored feed icon?"
+msgstr "Kaydedilmiş özet akışı ikonu silinsin mi?"
+
+#: js/functions.js:510
+msgid "Removing feed icon..."
+msgstr "Özet akışı ikonu kaldırılıyor..."
+
+#: js/functions.js:515
+msgid "Feed icon removed."
+msgstr "Özet akışı ikonu kaldırıldı."
+
+#: js/functions.js:532
+msgid "Please select an image file to upload."
+msgstr "Lütfen yüklemek için bir resim dosyası seçin."
+
+#: js/functions.js:533
+msgid "Upload new icon for this feed?"
+msgstr "Bu özet akışı için yeni bir ikon yüklensin mi?"
+
+#: js/functions.js:534
+msgid "Uploading, please wait..."
+msgstr "Yükleniyor, lütfen bekleyin..."
+
+#: js/functions.js:542
+msgid "Please enter label caption:"
+msgstr "Lütfen arama başlığı altyazısı girin:"
+
+#: js/functions.js:575
 msgid "Subscribe to Feed"
 msgstr "Özet akışına abone ol"
 
-#: js/functions.js:621
+#: js/functions.js:602
 msgid "Failed to parse output. This can indicate server timeout and/or network issues. Backend output was logged to browser console."
 msgstr ""
 
-#: js/functions.js:636
+#: js/functions.js:617
 #, perl-format
 msgid "Subscribed to %s"
 msgstr "%s'e abone olundu"
 
-#: js/functions.js:641
+#: js/functions.js:622
 msgid "Specified URL seems to be invalid."
 msgstr "Belirtilen adres geçersiz görünüyor."
 
-#: js/functions.js:644
+#: js/functions.js:625
 msgid "Specified URL doesn't seem to contain any feeds."
 msgstr "Belirtilen adreste hiçbir özet akışı bulunamadı."
 
-#: js/functions.js:656
+#: js/functions.js:637
 msgid "Expand to select feed"
 msgstr "Özet akışını genişletmek için tıklayın"
 
-#: js/functions.js:668
+#: js/functions.js:649
 #, perl-format
 msgid "Couldn't download the specified URL: %s"
 msgstr "Belirtilen internet adresinden indirilemedi: %s"
 
-#: js/functions.js:672
+#: js/functions.js:653
 #, perl-format
 msgid "XML validation failed: %s"
 msgstr "XML doğrulaması başarısız oldu: %s"
 
-#: js/functions.js:676
+#: js/functions.js:657
 msgid "You are already subscribed to this feed."
 msgstr "Bu özet akışına zaten abonesiniz."
 
-#: js/functions.js:1136
+#: js/functions.js:1098
 msgid "Generate new syndication address for this feed?"
 msgstr "Bu özet akışı için yeni bir sendikasyon adresi üretilsin mi?"
 
-#: js/functions.js:1140
-#: js/prefs.js:1095
+#: js/functions.js:1100
+#: js/prefs.js:870
 msgid "Trying to change address..."
 msgstr "Adres değiştirilmeye çalışılınıyor..."
 
-#: js/functions.js:1245
-#: js/tt-rss.js:446
-#: js/tt-rss.js:673
+#: js/functions.js:1199
+#: js/tt-rss.js:399
+#: js/tt-rss.js:612
 msgid "You can't edit this kind of feed."
 msgstr "Bu türde bir özet akışını düzenleyemezsiniz."
 
-#: js/functions.js:1260
+#: js/functions.js:1213
 msgid "Edit Feed"
 msgstr "Özet akışını düzenle"
 
-#: js/functions.js:1266
-#: js/prefs.js:100
-#: js/prefs.js:209
-#: js/prefs.js:647
+#: js/functions.js:1217
+#: js/prefs.js:176
+#: js/prefs.js:523
+#: js/prefs.js:1139
+#: js/prefs.js:78
 msgid "Saving data..."
 msgstr "Veri kaydediliyor..."
 
-#: js/functions.js:1293
+#: js/functions.js:1243
 msgid "More Feeds"
 msgstr "Daha fazla özet akışı"
 
-#: js/functions.js:1355
-#: js/functions.js:1464
-#: js/prefs.js:398
-#: js/prefs.js:540
-#: js/prefs.js:558
-#: js/prefs.js:1077
+#: js/functions.js:1297
+#: js/functions.js:1383
+#: js/prefs.js:332
+#: js/prefs.js:455
+#: js/prefs.js:473
+#: js/prefs.js:855
 msgid "No feeds are selected."
 msgstr "Hiçbir özet akışı seçilmedi."
 
-#: js/functions.js:1398
+#: js/functions.js:1329
 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:1435
+#: js/functions.js:1360
 msgid "Feeds with update errors"
 msgstr "Yenileme hatası veren özet akışları"
 
-#: js/functions.js:1446
-#: js/prefs.js:1058
+#: js/functions.js:1369
+#: js/prefs.js:841
 msgid "Remove selected feeds?"
 msgstr "Seçilen özet akışları kaldırılsın mı?"
 
-#: js/functions.js:1449
-#: js/prefs.js:1061
+#: js/functions.js:1370
+#: js/prefs.js:842
 msgid "Removing selected feeds..."
 msgstr "Seçilen özet akışları kaldırılıyor..."
 
-#: js/prefs.js:60
-msgid "Please enter login:"
-msgstr "Lütfen kullanıcı adı girin:"
-
-#: js/prefs.js:67
-msgid "Can't create user: no login specified."
-msgstr "Kullanıcı tanımlanamadı: kullanıcı adı eksik."
-
-#: js/prefs.js:71
-msgid "Adding user..."
-msgstr "Kullanıcı oluşturuluyor..."
-
-#: js/prefs.js:96
-msgid "User Editor"
-msgstr "Kullanıcı editörü"
-
-#: js/prefs.js:131
-msgid "Edit Filter"
-msgstr "Filtreyi düzenle "
-
-#: js/prefs.js:170
+#: js/prefs.js:143
 msgid "Remove filter?"
 msgstr "Filtre kaldırılsın mı?"
 
-#: js/prefs.js:175
+#: js/prefs.js:148
 msgid "Removing filter..."
 msgstr "Filtre kaldırılıyor..."
 
-#: js/prefs.js:292
+#: js/prefs.js:251
 msgid "Remove selected labels?"
 msgstr "Seçilen arama başlıkları kaldırılsın mı?"
 
-#: js/prefs.js:295
+#: js/prefs.js:252
 msgid "Removing selected labels..."
 msgstr "Seçilen arama başlıkları kaldırılıyor..."
 
-#: js/prefs.js:308
-#: js/prefs.js:1144
+#: js/prefs.js:262
+#: js/prefs.js:909
 msgid "No labels are selected."
 msgstr "Hiçbir arama başlığı seçilmedi."
 
-#: js/prefs.js:320
+#: js/prefs.js:274
 msgid "Remove selected users? Neither default admin nor your account will be removed."
 msgstr "Seçilen kullanıcılar kaldırılsın mı? Admin ve sizin hesabınız kaldırılmayacak."
 
-#: js/prefs.js:323
+#: js/prefs.js:275
 msgid "Removing selected users..."
 msgstr "Seçilen hesaplar kaldırılıyor..."
 
-#: js/prefs.js:338
-#: js/prefs.js:408
-#: js/prefs.js:427
-#: js/prefs.js:461
+#: js/prefs.js:286
+#: js/prefs.js:342
+#: js/prefs.js:361
+#: js/prefs.js:387
 msgid "No users are selected."
 msgstr "Hiçbir kullanıcı seçilmedi."
 
-#: js/prefs.js:350
+#: js/prefs.js:297
 msgid "Remove selected filters?"
 msgstr "Seçilen filtreler kaldırılsın mı?"
 
-#: js/prefs.js:353
+#: js/prefs.js:298
 msgid "Removing selected filters..."
 msgstr "Seçilen filtreler kaldırılıyor..."
 
-#: js/prefs.js:366
-#: js/prefs.js:495
-#: js/prefs.js:514
+#: js/prefs.js:308
+#: js/prefs.js:419
+#: js/prefs.js:438
 msgid "No filters are selected."
 msgstr "Hiçbir filtre seçilmedi."
 
-#: js/prefs.js:378
+#: js/prefs.js:319
 msgid "Unsubscribe from selected feeds?"
 msgstr "Seçilen özet akışlarının aboneliğinden ayrılınsın mı?"
 
-#: js/prefs.js:382
+#: js/prefs.js:321
 msgid "Unsubscribing from selected feeds..."
 msgstr "Seçilen özet akışlarının aboneliklerinden ayrılınıyor..."
 
-#: js/prefs.js:413
-#: js/prefs.js:432
-#: js/prefs.js:466
+#: js/prefs.js:347
+#: js/prefs.js:366
+#: js/prefs.js:392
 msgid "Please select only one user."
 msgstr "Lütfen sadece bir kullanıcı seçin."
 
-#: js/prefs.js:436
+#: js/prefs.js:370
 msgid "Reset password of selected user?"
 msgstr "Seçilen kullanıcının şifresi tekrar oluşturulsun mu?"
 
-#: js/prefs.js:439
+#: js/prefs.js:371
 msgid "Resetting password for selected user..."
 msgstr "Seçilen kullanıcı için tekrar şifre oluşturuluyor..."
 
-#: js/prefs.js:500
+#: js/prefs.js:424
 msgid "Please select only one filter."
 msgstr "Lütfen sadece bir filtre seçin."
 
-#: js/prefs.js:518
+#: js/prefs.js:442
 msgid "Combine selected filters?"
 msgstr "Seçilen filtreler birleştirilsin mi?"
 
-#: js/prefs.js:521
+#: js/prefs.js:443
 msgid "Joining filters..."
 msgstr "Filtreler birleştiriliyor..."
 
-#: js/prefs.js:580
+#: js/prefs.js:487
 msgid "Edit Multiple Feeds"
 msgstr "Birden fazla özet akışını düzenle"
 
-#: js/prefs.js:604
+#: js/prefs.js:511
 msgid "Save changes to selected feeds?"
 msgstr "Seçilen özet akışları için değişiklikler kaydedilsin mi?"
 
-#: js/prefs.js:681
+#: js/prefs.js:552
 msgid "OPML Import"
 msgstr "OPML içe aktarma"
 
-#: js/prefs.js:700
+#: js/prefs.js:571
 msgid "Please choose an OPML file first."
 msgstr "Lütfen önce bir OPML dosyası seçin"
 
-#: js/prefs.js:703
+#: js/prefs.js:574
 #: plugins/import_export/import_export.js:115
 msgid "Importing, please wait..."
 msgstr "İçe aktarılıyor, lütfen bekleyin..."
 
-#: js/prefs.js:869
+#: js/prefs.js:737
 msgid "Reset to defaults?"
 msgstr "Öntanımlı ayarlara geri dönülsün mü?"
 
-#: js/prefs.js:1468
-msgid "Subscribing to feeds..."
-msgstr "Özet akışlarına abone olunuyor..."
+#: js/prefs.js:777
+#, perl-format
+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:1487
-msgid "Clear stored data for this plugin?"
-msgstr "Bu eklenti için kaydedilmiş veriler silinsin mi?"
+#: js/prefs.js:778
+msgid "Removing category..."
+msgstr "Kategori kaldırılıyor..."
 
-#: js/prefs.js:1501
-msgid "Clear all messages in the error log?"
-msgstr "Hata günlüğündeki tüm mesajlar silinsin mi?"
+#: js/prefs.js:794
+msgid "Remove selected categories?"
+msgstr "Seçilen kategoriler kaldırılsın mı?"
 
-#: js/tt-rss.js:118
+#: js/prefs.js:795
+msgid "Removing selected categories..."
+msgstr "Seçilen kategoriler kaldırılıyor..."
+
+#: js/prefs.js:805
+msgid "No categories are selected."
+msgstr "Hiçbir kategori seçilmedi."
+
+#: js/prefs.js:812
+msgid "Category title:"
+msgstr "Kategori başlığı:"
+
+#: js/prefs.js:815
+msgid "Creating category..."
+msgstr "Kategori tanımlanıyor..."
+
+#: js/prefs.js:832
+msgid "Feeds without recent updates"
+msgstr "Yakın zamanda yenilenmeyen özet akışları"
+
+#: js/prefs.js:869
+msgid "Replace current OPML publishing address with a new one?"
+msgstr "Mevcut OPML yayınlama adresi yenisiyle değiştirilsin mi?"
+
+#: js/prefs.js:898
+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:926
+msgid "Settings Profiles"
+msgstr "Profil ayarları"
+
+#: js/prefs.js:935
+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:936
+msgid "Removing selected profiles..."
+msgstr "Seçilen profiller kaldırılıyor..."
+
+#: js/prefs.js:948
+msgid "No profiles are selected."
+msgstr "Hiçbir profil seçilmedi."
+
+#: js/prefs.js:955
+#: js/prefs.js:997
+msgid "Activate selected profile?"
+msgstr "Seçilen profil aktif hale getirilsin mi?"
+
+#: js/prefs.js:964
+#: js/prefs.js:1008
+msgid "Please choose a profile to activate."
+msgstr "Lütfen aktif hale getirilecek profili seçin."
+
+#: js/prefs.js:969
+msgid "Creating profile..."
+msgstr "Profil yaratılıyor..."
+
+#: js/prefs.js:1016
+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:1017
+#: plugins/share/share_prefs.js:3
+msgid "Clearing URLs..."
+msgstr "İnternet adresleri temizleniyor..."
+
+#: js/prefs.js:1020
+msgid "Generated URLs cleared."
+msgstr "Oluşturulan internet adresleri temizlendi."
+
+#: js/prefs.js:1053
+#, fuzzy
+msgid "Rename category to:"
+msgstr "Kategoriyi kaldır"
+
+#: js/prefs.js:1074
+msgid "Label Editor"
+msgstr "Arama başlığı editörü"
+
+#: js/tt-rss.js:111
 msgid "Mark all articles as read?"
 msgstr "Tüm yazıları okundu işaretle?"
 
-#: js/tt-rss.js:124
+#: js/tt-rss.js:115
 msgid "Marking all feeds as read..."
 msgstr "Tüm yazılar okundu olarak işaretleniyor..."
 
-#: js/tt-rss.js:398
+#: js/tt-rss.js:351
 msgid "Please enable mail plugin first."
 msgstr "Lütfen önce e-posta eklentisini aktif hale getirin."
 
-#: js/tt-rss.js:527
+#: js/tt-rss.js:477
 msgid "Please enable embed_original plugin first."
 msgstr "Lütfen önce embed_original eklentisini aktif hale getirin."
 
-#: js/tt-rss.js:540
-#: js/tt-rss.js:723
+#: js/tt-rss.js:490
+#: js/tt-rss.js:653
 msgid "Widescreen is not available in combined mode."
 msgstr ""
 
-#: js/tt-rss.js:821
-msgid "You can't rescore this kind of feed."
-msgstr "Bu tipte bir özet akışını tekrar skorlayamazsınız."
-
-#: js/tt-rss.js:826
-#: js/tt-rss.js:686
-msgid "Please select some feed first."
-msgstr "Lütfen önce özet akışı seçin."
-
-#: js/tt-rss.js:831
-#, perl-format
-msgid "Rescore articles in %s?"
-msgstr "%s'deki yazılar tekrar skorlansın mı?"
-
-#: js/tt-rss.js:834
-msgid "Rescoring articles..."
-msgstr "Yazılar tekrar skorlanıyor..."
-
-#: js/viewfeed.js:917
-#: js/viewfeed.js:955
-#: js/viewfeed.js:1003
-#: js/viewfeed.js:1924
-#: plugins/mail/mail.js:7
+#: js/viewfeed.js:444
+#: js/viewfeed.js:461
+#: js/viewfeed.js:484
+#: js/viewfeed.js:521
+#: js/viewfeed.js:542
+#: js/viewfeed.js:651
+#: js/viewfeed.js:685
+#: js/viewfeed.js:727
+#: js/viewfeed.js:1564
 #: plugins/mailto/init.js:7
-#: js/viewfeed.js:675
-#: js/viewfeed.js:697
-#: js/viewfeed.js:718
-#: js/viewfeed.js:777
-#: js/viewfeed.js:805
+#: plugins/mail/mail.js:7
 msgid "No articles are selected."
 msgstr "Hiç yazı seçilmedi."
 
-#: js/viewfeed.js:925
+#: js/viewfeed.js:659
 #, 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:927
+#: js/viewfeed.js:661
 #, 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:964
+#: js/viewfeed.js:694
 #, 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:967
+#: js/viewfeed.js:697
 #, 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:969
+#: js/viewfeed.js:698
 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:1009
+#: js/viewfeed.js:733
 #, 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:1029
+#: js/viewfeed.js:753
 msgid "Edit article Tags"
 msgstr "Yazı etiketlerini düzenle"
 
-#: js/viewfeed.js:1035
+#: js/viewfeed.js:757
 msgid "Saving article tags..."
 msgstr "Yazı etiketlerini kaydediyor..."
 
-#: js/viewfeed.js:1666
+#: js/viewfeed.js:1015
+msgid "No article is selected."
+msgstr "Hiçbir yazı seçilmedi."
+
+#: js/viewfeed.js:1050
+msgid "No articles found to mark"
+msgstr "Hiçbir yazı bulunamadı. "
+
+#: js/viewfeed.js:1052
+#, fuzzy, perl-format
+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?"
+
+#: js/viewfeed.js:1312
 msgid "Open original article"
 msgstr "Yazının aslını aç"
 
-#: js/viewfeed.js:1673
+#: js/viewfeed.js:1319
 msgid "Display article URL"
 msgstr "Yazı adresini göster "
 
-#: js/viewfeed.js:1780
+#: js/viewfeed.js:1426
 msgid "Assign label"
 msgstr "Arama başlığı tayin et"
 
-#: js/viewfeed.js:1785
+#: js/viewfeed.js:1431
 msgid "Remove label"
 msgstr "Arama başlığını kaldır"
 
-#: js/viewfeed.js:1817
+#: js/viewfeed.js:1463
 #, fuzzy
 msgid "Select articles in group"
 msgstr "İmleç altındaki yazıyı seç"
 
-#: js/viewfeed.js:1827
+#: js/viewfeed.js:1473
 #, fuzzy
 msgid "Mark group as read"
 msgstr "Okundu olarak işaretle"
 
-#: js/viewfeed.js:1839
+#: js/viewfeed.js:1485
 #, fuzzy
 msgid "Mark feed as read"
 msgstr "Tüm özet akışlarını okundu işaretle"
 
-#: js/viewfeed.js:1892
+#: js/viewfeed.js:1538
 msgid "Please enter new score for selected articles:"
 msgstr "Seçilen yazılar için yeni skor girin:"
 
-#: js/viewfeed.js:1955
+#: js/viewfeed.js:1571
 msgid "Please enter new score for this article:"
 msgstr "Bu yazı için yeni skor girin:"
 
-#: js/viewfeed.js:1986
+#: js/viewfeed.js:1591
 msgid "Article URL:"
 msgstr "Yazı adresi:"
 
-#: plugins/note/note.js:17
-msgid "Saving article note..."
-msgstr "Not kaydediliyor..."
+#: 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/af_psql_trgm/init.js:11
 #, fuzzy
 msgid "Related articles"
 msgstr "Paylaşılmış yazılar"
 
+#: plugins/mailto/init.js:21
+#: plugins/mail/mail.js:21
+msgid "Forward article by email"
+msgstr "Yazıyı e-posta ile yolla"
+
+#: plugins/shorten_expanded/init.js:43
+msgid "Click to expand article"
+msgstr "Yazıyı genişletmek için tıklayın"
+
 #: plugins/import_export/import_export.js:13
 msgid "Export Data"
 msgstr "Veriyi dışa aktar"
@@ -3222,263 +3315,173 @@ 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
-msgid "Forward article by email"
-msgstr "Yazıyı e-posta ile yolla"
+#: plugins/share/share_prefs.js:2
+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/mail/mail.js:36
-msgid "Error sending email:"
-msgstr ""
-
-#: plugins/mail/mail.js:38
-#, fuzzy
-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:45
-msgid "Click to expand article"
-msgstr "Yazıyı genişletmek için tıklayın"
+#: plugins/share/share_prefs.js:8
+msgid "Shared URLs cleared."
+msgstr "Seçilen internet adresleri temizlendi."
 
 #: plugins/share/share.js:10
 msgid "Share article by URL"
 msgstr "Yazıyı internet adresini kullanarak paylaş"
 
-#: plugins/share/share.js:14
+#: plugins/share/share.js:13
 msgid "Generate new share URL for this article?"
 msgstr "Bu yazı için yeni bir internet adresi yaratılsın mı?"
 
-#: plugins/share/share.js:18
+#: plugins/share/share.js:15
 msgid "Trying to change URL..."
 msgstr "İnternet adresini değiştirmeye çalışıyor..."
 
-#: plugins/share/share.js:55
+#: plugins/share/share.js:48
 msgid "Remove sharing for this article?"
 msgstr "Bu yazı için paylaşım kaldırılsın mı?"
 
-#: plugins/share/share.js:59
+#: plugins/share/share.js:50
 msgid "Trying to unshare..."
 msgstr "Paylaşımı kaldırmaya çalışıyor..."
 
-#: plugins/share/share_prefs.js:3
-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/mail/mail.js:30
+msgid "Error sending email:"
+msgstr ""
 
-#: plugins/share/share_prefs.js:6
-#: js/prefs.js:1277
-msgid "Clearing URLs..."
-msgstr "İnternet adresleri temizleniyor..."
+#: plugins/mail/mail.js:32
+#, fuzzy
+msgid "Your message has been sent."
+msgstr "Kişisel bilgileriniz kaydedildi."
 
-#: plugins/share/share_prefs.js:13
-msgid "Shared URLs cleared."
-msgstr "Seçilen internet adresleri temizlendi."
+#: plugins/note/note.js:15
+msgid "Saving article note..."
+msgstr "Not kaydediliyor..."
 
-#: js/feedlist.js:204
+#: js/feedlist.js:168
 #, fuzzy
 msgid "Your password is at default value"
 msgstr "Şifreniz öntanımlı şifre, güvenliğiniz için lütfen şifrenizi değiştirin"
 
-#: js/feedlist.js:453
+#: js/feedlist.js:413
 msgid "Mark all articles in %s as read?"
 msgstr "%s'deki tüm yazılar okundu işaretlensin mi?"
 
-#: js/functions.js:494
-msgid "Upload complete."
-msgstr "Yükleme tamamlandı."
-
-#: js/functions.js:511
-msgid "Remove stored feed icon?"
-msgstr "Kaydedilmiş özet akışı ikonu silinsin mi?"
-
-#: js/functions.js:516
-msgid "Removing feed icon..."
-msgstr "Özet akışı ikonu kaldırılıyor..."
-
-#: js/functions.js:521
-msgid "Feed icon removed."
-msgstr "Özet akışı ikonu kaldırıldı."
-
-#: js/functions.js:537
-msgid "Please select an image file to upload."
-msgstr "Lütfen yüklemek için bir resim dosyası seçin."
-
-#: js/functions.js:539
-msgid "Upload new icon for this feed?"
-msgstr "Bu özet akışı için yeni bir ikon yüklensin mi?"
-
-#: js/functions.js:540
-msgid "Uploading, please wait..."
-msgstr "Yükleniyor, lütfen bekleyin..."
-
-#: js/functions.js:550
-msgid "Please enter label caption:"
-msgstr "Lütfen arama başlığı altyazısı girin:"
-
-#: js/functions.js:555
-msgid "Can't create label: missing caption."
-msgstr "Arama başlığı tanımlanamadı: altyazı eksik."
-
-#: js/functions.js:797
+#: js/functions.js:764
 msgid "Edit rule"
 msgstr "Kuralı düzenle"
 
-#: js/functions.js:819
+#: js/functions.js:786
 msgid "Edit action"
 msgstr "Eylemi düzenle"
 
-#: js/functions.js:860
+#: js/functions.js:825
 msgid "Looking for articles (%d processed, %f found)..."
 msgstr ""
 
-#: js/functions.js:890
+#: js/functions.js:855
 #, fuzzy
 msgid "Found %d articles matching this filter:"
 msgstr "Bu filtreye uyan yazılar:"
 
-#: js/functions.js:942
+#: js/functions.js:907
 msgid "Create Filter"
 msgstr "Filtre tanımla"
 
-#: js/functions.js:1060
-#: js/tt-rss.js:692
+#: js/functions.js:1016
+#: js/tt-rss.js:631
 msgid "Unsubscribe from %s?"
 msgstr "%s abonelikten ayrıl?"
 
-#: js/functions.js:1063
+#: js/functions.js:1019
 msgid "Removing feed..."
 msgstr "Özet akışı siliniyor..."
 
-#: js/functions.js:1489
+#: js/functions.js:1410
 msgid "Help"
 msgstr "Yardım"
 
-#: js/prefs.js:973
-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:44
+msgid "Please enter login:"
+msgstr "Lütfen kullanıcı adı girin:"
 
-#: js/prefs.js:979
-msgid "Removing category..."
-msgstr "Kategori kaldırılıyor..."
+#: js/prefs.js:51
+msgid "Can't create user: no login specified."
+msgstr "Kullanıcı tanımlanamadı: kullanıcı adı eksik."
 
-#: js/prefs.js:997
-msgid "Remove selected categories?"
-msgstr "Seçilen kategoriler kaldırılsın mı?"
+#: js/prefs.js:55
+msgid "Adding user..."
+msgstr "Kullanıcı oluşturuluyor..."
 
-#: js/prefs.js:1000
-msgid "Removing selected categories..."
-msgstr "Seçilen kategoriler kaldırılıyor..."
+#: js/prefs.js:74
+msgid "User Editor"
+msgstr "Kullanıcı editörü"
 
-#: js/prefs.js:1013
-msgid "No categories are selected."
-msgstr "Hiçbir kategori seçilmedi."
+#: js/prefs.js:104
+msgid "Edit Filter"
+msgstr "Filtreyi düzenle "
 
-#: js/prefs.js:1020
-msgid "Category title:"
-msgstr "Kategori başlığı:"
+#: js/prefs.js:1175
+msgid "Subscribing to feeds..."
+msgstr "Özet akışlarına abone olunuyor..."
 
-#: js/prefs.js:1024
-msgid "Creating category..."
-msgstr "Kategori tanımlanıyor..."
+#: js/prefs.js:1191
+msgid "Clear stored data for this plugin?"
+msgstr "Bu eklenti için kaydedilmiş veriler silinsin mi?"
 
-#: js/prefs.js:1047
-msgid "Feeds without recent updates"
-msgstr "Yakın zamanda yenilenmeyen özet akışları"
+#: js/prefs.js:1203
+msgid "Clear all messages in the error log?"
+msgstr "Hata günlüğündeki tüm mesajlar silinsin mi?"
 
-#: js/prefs.js:1091
-msgid "Replace current OPML publishing address with a new one?"
-msgstr "Mevcut OPML yayınlama adresi yenisiyle değiştirilsin mi?"
-
-#: js/prefs.js:1129
-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:1161
-msgid "Settings Profiles"
-msgstr "Profil ayarları"
-
-#: js/prefs.js:1170
-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:1173
-msgid "Removing selected profiles..."
-msgstr "Seçilen profiller kaldırılıyor..."
-
-#: js/prefs.js:1189
-msgid "No profiles are selected."
-msgstr "Hiçbir profil seçilmedi."
-
-#: js/prefs.js:1197
-#: js/prefs.js:1250
-msgid "Activate selected profile?"
-msgstr "Seçilen profil aktif hale getirilsin mi?"
-
-#: js/prefs.js:1214
-#: js/prefs.js:1266
-msgid "Please choose a profile to activate."
-msgstr "Lütfen aktif hale getirilecek profili seçin."
-
-#: js/prefs.js:1219
-msgid "Creating profile..."
-msgstr "Profil yaratılıyor..."
-
-#: js/prefs.js:1274
-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:1284
-msgid "Generated URLs cleared."
-msgstr "Oluşturulan internet adresleri temizlendi."
-
-#: js/prefs.js:1356
-msgid "Label Editor"
-msgstr "Arama başlığı editörü"
-
-#: js/tt-rss.js:681
+#: js/tt-rss.js:620
 msgid "You can't unsubscribe from the category."
 msgstr "Kategori aboneliğinden ayrılamazsınız."
 
-#: js/viewfeed.js:127
-#: js/viewfeed.js:177
-#: js/viewfeed.js:194
+#: js/tt-rss.js:625
+msgid "Please select some feed first."
+msgstr "Lütfen önce özet akışı seçin."
+
+#: js/viewfeed.js:89
+#: js/viewfeed.js:135
+#: js/viewfeed.js:152
 #, fuzzy
 msgid "Click to open next unread feed."
 msgstr "Özet akışını düzenlemek için tıklayın"
 
-#: js/viewfeed.js:131
+#: js/viewfeed.js:93
 msgid "Cancel search"
 msgstr "Aramayı iptal et"
 
-#: js/viewfeed.js:191
+#: js/viewfeed.js:149
 #, fuzzy
 msgid "New articles found, reload feed to continue."
 msgstr "Yazı bulunamadı."
 
-#: js/viewfeed.js:620
+#: js/viewfeed.js:405
 #, 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:1284
-msgid "No article is selected."
-msgstr "Hiçbir yazı seçilmedi."
+#~ msgid "Rescore feed"
+#~ msgstr "Özet akışını yeniden değerlendir..."
 
-#: js/viewfeed.js:1319
-msgid "No articles found to mark"
-msgstr "Hiçbir yazı bulunamadı. "
+#~ msgid "Create label..."
+#~ msgstr "Arama başlığı tanımla..."
 
-#: js/viewfeed.js:1321
-#, 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 "Create filter..."
+#~ msgstr "Filtre tanımla..."
+
+#~ msgid "You can't rescore this kind of feed."
+#~ msgstr "Bu tipte bir özet akışını tekrar skorlayamazsınız."
+
+#~ msgid "Rescore articles in %s?"
+#~ msgstr "%s'deki yazılar tekrar skorlansın mı?"
+
+#~ msgid "Rescoring articles..."
+#~ msgstr "Yazılar tekrar skorlanıyor..."
+
+#~ msgid "Can't create label: missing caption."
+#~ msgstr "Arama başlığı tanımlanamadı: altyazı eksik."
 
 #~ msgid "Firefox integration"
 #~ msgstr "Firefox bütünleşimi"
diff --git a/locale/zh_CN/LC_MESSAGES/messages.mo b/locale/zh_CN/LC_MESSAGES/messages.mo
index b1b1b93b2..4f194079f 100644
Binary files a/locale/zh_CN/LC_MESSAGES/messages.mo and b/locale/zh_CN/LC_MESSAGES/messages.mo differ
diff --git a/locale/zh_CN/LC_MESSAGES/messages.po b/locale/zh_CN/LC_MESSAGES/messages.po
index c661564a4..2141d363b 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: 2018-10-10 08:24+0300\n"
+"POT-Creation-Date: 2018-12-01 12:59+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"
@@ -95,8 +95,8 @@ msgid "Weekly"
 msgstr "每周"
 
 #: backend.php:103
-#: classes/pref/users.php:47
 #: classes/pref/system.php:51
+#: classes/pref/users.php:47
 msgid "User"
 msgstr "普通用户"
 
@@ -172,33 +172,33 @@ msgstr "未找到用户"
 
 #: index.php:151
 #: index.php:167
-#: index.php:285
+#: index.php:282
 #: prefs.php:120
 #: classes/backend.php:5
 #: classes/pref/labels.php:294
-#: classes/pref/feeds.php:1230
 #: classes/pref/filters.php:822
-#: js/feedlist.js:148
-#: js/feedlist.js:491
-#: js/feedlist.js:539
-#: js/functions.js:314
-#: js/functions.js:1336
-#: js/prefs.js:562
-#: js/prefs.js:754
-#: js/prefs.js:1488
-#: js/prefs.js:1503
-#: js/tt-rss.js:547
-#: js/viewfeed.js:1180
+#: classes/pref/feeds.php:1229
+#: js/feedlist.js:118
+#: js/feedlist.js:446
+#: js/feedlist.js:487
+#: js/functions.js:328
+#: js/functions.js:551
+#: js/functions.js:1286
+#: js/prefs.js:477
+#: js/prefs.js:617
+#: js/prefs.js:956
+#: js/prefs.js:1000
+#: js/prefs.js:1028
+#: js/prefs.js:1037
+#: js/prefs.js:1045
+#: js/prefs.js:1057
+#: js/tt-rss.js:497
+#: js/viewfeed.js:509
+#: js/viewfeed.js:928
 #: plugins/import_export/import_export.js:17
-#: js/functions.js:565
-#: js/prefs.js:1200
-#: js/prefs.js:1253
-#: js/prefs.js:1292
-#: js/prefs.js:1305
-#: js/prefs.js:1316
-#: js/prefs.js:1331
-#: js/tt-rss.js:564
-#: js/viewfeed.js:760
+#: js/prefs.js:1192
+#: js/prefs.js:1205
+#: js/tt-rss.js:510
 msgid "Loading, please wait..."
 msgstr "读取中，请稍候……"
 
@@ -215,13 +215,13 @@ msgid "All Articles"
 msgstr "全部文章"
 
 #: index.php:194
-#: include/functions.php:1227
+#: include/functions.php:1172
 #: classes/feeds.php:110
 msgid "Starred"
 msgstr "加星标的"
 
 #: index.php:195
-#: include/functions.php:1228
+#: include/functions.php:1173
 #: classes/feeds.php:111
 msgid "Published"
 msgstr "已发布"
@@ -261,11 +261,11 @@ msgid "Title"
 msgstr "标题"
 
 #: index.php:211
-#: index.php:251
-#: include/functions.php:1215
+#: index.php:250
+#: include/functions.php:1160
 #: classes/feeds.php:115
-#: js/FeedTree.js:41
-#: js/FeedTree.js:69
+#: js/FeedTree.js:42
+#: js/FeedTree.js:70
 msgid "Mark as read"
 msgstr "标记为已读"
 
@@ -303,7 +303,7 @@ msgid "Feed actions:"
 msgstr "信息源操作："
 
 #: index.php:246
-#: classes/handler/public.php:551
+#: classes/handler/public.php:575
 msgid "Subscribe to feed..."
 msgstr "订阅信息源"
 
@@ -312,57 +312,45 @@ msgid "Edit this feed..."
 msgstr "编辑信息源"
 
 #: index.php:248
-msgid "Rescore feed"
-msgstr "为信息源重新评分"
-
-#: index.php:249
-#: classes/pref/feeds.php:770
-#: classes/pref/feeds.php:1203
-#: js/PrefFeedTree.js:61
+#: classes/pref/feeds.php:769
+#: classes/pref/feeds.php:1202
+#: js/PrefFeedTree.js:62
 msgid "Unsubscribe"
 msgstr "取消订阅"
 
-#: index.php:250
+#: index.php:249
 msgid "All feeds:"
 msgstr "全部信息源："
 
-#: index.php:252
+#: index.php:251
 msgid "(Un)hide read feeds"
 msgstr "隐藏（显示）已读信息"
 
-#: index.php:253
+#: index.php:252
 msgid "Other actions:"
 msgstr "其他操作："
 
-#: index.php:254
-#: include/functions.php:1201
+#: index.php:253
+#: include/functions.php:1146
 #, fuzzy
 msgid "Toggle widescreen mode"
 msgstr "切换宽屏模式"
 
-#: index.php:255
-msgid "Create label..."
-msgstr "创建预定义标签"
-
-#: index.php:256
-msgid "Create filter..."
-msgstr "创建过滤器"
-
-#: index.php:257
+#: index.php:254
 msgid "Keyboard shortcuts help"
 msgstr "快捷键帮助"
 
-#: index.php:266
+#: index.php:263
 msgid "Logout"
 msgstr "注销"
 
-#: index.php:272
+#: index.php:269
 msgid "Updates are available from Git."
 msgstr ""
 
 #: prefs.php:33
 #: prefs.php:138
-#: include/functions.php:1230
+#: include/functions.php:1175
 #: classes/pref/prefs.php:425
 msgid "Preferences"
 msgstr "偏好设置"
@@ -377,8 +365,8 @@ msgstr "退出偏好设置"
 
 #: prefs.php:141
 #: classes/pref/feeds.php:114
-#: classes/pref/feeds.php:1138
-#: classes/pref/feeds.php:1192
+#: classes/pref/feeds.php:1137
+#: classes/pref/feeds.php:1191
 msgid "Feeds"
 msgstr "信息源"
 
@@ -388,8 +376,8 @@ msgid "Filters"
 msgstr "过滤器"
 
 #: prefs.php:147
+#: classes/feeds.php:1696
 #: classes/pref/labels.php:94
-#: classes/feeds.php:1710
 msgid "Labels"
 msgstr "预定义标签"
 
@@ -401,80 +389,80 @@ msgstr "用户"
 msgid "System"
 msgstr "系统"
 
-#: register.php:186
+#: register.php:185
 #: include/login_form.php:162
 msgid "Create new account"
 msgstr "创建新的帐号"
 
-#: register.php:192
+#: register.php:191
 msgid "New user registrations are administratively disabled."
 msgstr "新用户注册功能已被管理员禁用。"
 
-#: register.php:196
-#: register.php:241
-#: register.php:254
-#: register.php:269
-#: register.php:288
-#: register.php:336
-#: register.php:346
-#: register.php:358
-#: classes/handler/public.php:623
-#: classes/handler/public.php:697
-#: classes/handler/public.php:798
-#: classes/handler/public.php:877
-#: classes/handler/public.php:891
-#: classes/handler/public.php:898
-#: classes/handler/public.php:923
+#: register.php:195
+#: register.php:240
+#: register.php:253
+#: register.php:268
+#: register.php:287
+#: register.php:334
+#: register.php:344
+#: register.php:356
+#: classes/handler/public.php:647
+#: classes/handler/public.php:721
+#: 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"
 
-#: register.php:217
+#: register.php:216
 msgid "Your temporary password will be sent to the specified email. Accounts, which were not logged in once, are erased automatically 24 hours after temporary password is sent."
 msgstr "您的临时密码将被发送至您的邮箱。邮件发送后，24小时之内没有登录的帐号会被自动清理。"
 
-#: register.php:223
+#: register.php:222
 msgid "Desired login:"
 msgstr "希望使用的用户名："
 
-#: register.php:226
+#: register.php:225
 msgid "Check availability"
 msgstr "检查可用性"
 
-#: register.php:228
-#: classes/handler/public.php:713
+#: register.php:227
+#: classes/handler/public.php:737
 msgid "Email:"
 msgstr "电子邮箱："
 
-#: register.php:231
-#: classes/handler/public.php:718
+#: register.php:230
+#: classes/handler/public.php:742
 msgid "How much is two plus two:"
 msgstr "二加二等于几："
 
-#: register.php:234
+#: register.php:233
 msgid "Submit registration"
 msgstr "提交注册信息"
 
-#: register.php:252
+#: register.php:251
 msgid "Your registration information is incomplete."
 msgstr "您的注册信息不完整。"
 
-#: register.php:267
+#: register.php:266
 msgid "Sorry, this username is already taken."
 msgstr "抱歉，该用户名已被占用。"
 
-#: register.php:286
+#: register.php:285
 msgid "Registration failed."
 msgstr "注册失败。"
 
-#: register.php:333
+#: register.php:331
 msgid "Account created successfully."
 msgstr "帐号创建成功。"
 
-#: register.php:355
+#: register.php:353
 msgid "New user registrations are currently closed."
 msgstr "用户注册功能目前没有启用。"
 
-#: update.php:66
+#: update.php:67
 #, fuzzy
 msgid "Tiny Tiny RSS data update script."
 msgstr "Tiny Tiny RSS 数据更新脚本。"
@@ -488,10 +476,10 @@ msgstr "全部信息源"
 
 #: include/controls.php:138
 #: include/controls.php:230
-#: classes/opml.php:512
-#: classes/digest.php:120
+#: classes/digest.php:124
+#: classes/feeds.php:1708
 #: classes/pref/feeds.php:233
-#: classes/feeds.php:1722
+#: classes/opml.php:512
 msgid "Uncategorized"
 msgstr "未分类"
 
@@ -505,314 +493,314 @@ msgstr[0] "%d 个存档的文章"
 msgid "No feeds found."
 msgstr "未找到信息源。"
 
-#: include/functions.php:983
+#: include/functions.php:928
 #, php-format
 msgid "%d min"
 msgstr ""
 
-#: include/functions.php:1177
+#: include/functions.php:1122
 msgid "Navigation"
 msgstr "导航"
 
-#: include/functions.php:1178
+#: include/functions.php:1123
 #, fuzzy
 msgid "Open next feed"
 msgstr "显示下一个信息源"
 
-#: include/functions.php:1179
+#: include/functions.php:1124
 msgid "Open previous feed"
 msgstr "显示前一个信息源"
 
-#: include/functions.php:1180
+#: include/functions.php:1125
 #, fuzzy
 msgid "Open next article"
 msgstr "显示下一篇文章"
 
-#: include/functions.php:1181
+#: include/functions.php:1126
 #, fuzzy
 msgid "Open previous article"
 msgstr "显示前一篇文章"
 
-#: include/functions.php:1182
+#: include/functions.php:1127
 msgid "Open next article (don't scroll long articles)"
 msgstr "显示下一篇文章 (不要在长文章中滚动)"
 
-#: include/functions.php:1183
+#: include/functions.php:1128
 msgid "Open previous article (don't scroll long articles)"
 msgstr "显示前一篇文章 (不要在长文章中滚动)"
 
-#: include/functions.php:1184
+#: include/functions.php:1129
 msgid "Move to next article (don't expand or mark read)"
 msgstr "跳转至下一篇文章 (不要展开或标记为已读)"
 
-#: include/functions.php:1185
+#: include/functions.php:1130
 msgid "Move to previous article (don't expand or mark read)"
 msgstr "跳转至前一篇文章 (不要展开或标记为已读)"
 
-#: include/functions.php:1186
+#: include/functions.php:1131
 msgid "Show search dialog"
 msgstr "显示搜索对话框"
 
-#: include/functions.php:1187
+#: include/functions.php:1132
 #, fuzzy
 msgid "Article"
 msgstr "全部文章"
 
-#: include/functions.php:1188
-#: js/viewfeed.js:1695
+#: include/functions.php:1133
+#: js/viewfeed.js:1341
 msgid "Toggle starred"
 msgstr "加星此文章"
 
-#: include/functions.php:1189
-#: js/viewfeed.js:1707
+#: include/functions.php:1134
+#: js/viewfeed.js:1353
 msgid "Toggle published"
 msgstr "发布此文章"
 
-#: include/functions.php:1190
-#: js/viewfeed.js:1682
+#: include/functions.php:1135
+#: js/viewfeed.js:1328
 msgid "Toggle unread"
 msgstr "标记为未读"
 
-#: include/functions.php:1191
+#: include/functions.php:1136
 msgid "Edit tags"
 msgstr "编辑自定义标签"
 
-#: include/functions.php:1192
+#: include/functions.php:1137
 #, fuzzy
 msgid "Open in new window"
 msgstr "在新窗口打开文章"
 
-#: include/functions.php:1193
-#: js/viewfeed.js:1728
+#: include/functions.php:1138
+#: js/viewfeed.js:1374
 msgid "Mark below as read"
 msgstr "将下面文章标为已读"
 
-#: include/functions.php:1194
-#: js/viewfeed.js:1721
+#: include/functions.php:1139
+#: js/viewfeed.js:1367
 msgid "Mark above as read"
 msgstr "将上面文章标为已读"
 
-#: include/functions.php:1195
+#: include/functions.php:1140
 #, fuzzy
 msgid "Scroll down"
 msgstr "向下滚动"
 
-#: include/functions.php:1196
+#: include/functions.php:1141
 msgid "Scroll up"
 msgstr "向上滚动"
 
-#: include/functions.php:1197
+#: include/functions.php:1142
 #, fuzzy
 msgid "Select article under cursor"
 msgstr "选择鼠标指向的文章"
 
-#: include/functions.php:1198
+#: include/functions.php:1143
 msgid "Email article"
 msgstr "通过邮件发送文章"
 
-#: include/functions.php:1199
+#: include/functions.php:1144
 #, fuzzy
 msgid "Close/collapse article"
 msgstr "关闭/折叠文章"
 
-#: include/functions.php:1200
+#: include/functions.php:1145
 #, fuzzy
 msgid "Toggle article expansion (combined mode)"
 msgstr "切换文章展开 (合并模式)"
 
-#: include/functions.php:1202
+#: include/functions.php:1147
 #: plugins/embed_original/init.php:33
 #, fuzzy
 msgid "Toggle embed original"
 msgstr "切换嵌入模式"
 
-#: include/functions.php:1203
+#: include/functions.php:1148
 #, fuzzy
 msgid "Article selection"
 msgstr "文章选择"
 
-#: include/functions.php:1204
+#: include/functions.php:1149
 msgid "Select all articles"
 msgstr "选择所有文章"
 
-#: include/functions.php:1205
+#: include/functions.php:1150
 #, fuzzy
 msgid "Select unread"
 msgstr "选择未读文章"
 
-#: include/functions.php:1206
+#: include/functions.php:1151
 #, fuzzy
 msgid "Select starred"
 msgstr "选择加星标文章"
 
-#: include/functions.php:1207
+#: include/functions.php:1152
 #, fuzzy
 msgid "Select published"
 msgstr "选择已发布文章"
 
-#: include/functions.php:1208
+#: include/functions.php:1153
 #, fuzzy
 msgid "Invert selection"
 msgstr "反选文章"
 
-#: include/functions.php:1209
+#: include/functions.php:1154
 #, fuzzy
 msgid "Deselect everything"
 msgstr "取消选择所有文章"
 
-#: include/functions.php:1210
-#: classes/pref/feeds.php:522
-#: classes/pref/feeds.php:794
+#: include/functions.php:1155
+#: classes/pref/feeds.php:521
+#: classes/pref/feeds.php:793
 msgid "Feed"
 msgstr "信息源"
 
-#: include/functions.php:1211
+#: include/functions.php:1156
 #, fuzzy
 msgid "Refresh current feed"
 msgstr "刷新当前信息源"
 
-#: include/functions.php:1212
+#: include/functions.php:1157
 #, fuzzy
 msgid "Un/hide read feeds"
 msgstr "显示/隐藏 已读信息"
 
-#: include/functions.php:1213
-#: classes/pref/feeds.php:1195
+#: include/functions.php:1158
+#: classes/pref/feeds.php:1194
 msgid "Subscribe to feed"
 msgstr "订阅信息源"
 
-#: include/functions.php:1214
-#: js/FeedTree.js:48
-#: js/PrefFeedTree.js:55
-#: js/viewfeed.js:1846
+#: include/functions.php:1159
+#: js/FeedTree.js:49
+#: js/PrefFeedTree.js:56
+#: js/viewfeed.js:1492
 msgid "Edit feed"
 msgstr "编辑信息源"
 
-#: include/functions.php:1216
+#: include/functions.php:1161
 #, fuzzy
 msgid "Reverse headlines"
 msgstr "反向排序"
 
-#: include/functions.php:1217
+#: include/functions.php:1162
 msgid "Toggle headline grouping"
 msgstr ""
 
-#: include/functions.php:1218
+#: include/functions.php:1163
 #, fuzzy
 msgid "Debug feed update"
 msgstr "调试信息源更新"
 
-#: include/functions.php:1219
+#: include/functions.php:1164
 #, fuzzy
 msgid "Debug viewfeed()"
 msgstr "调试 viewfeed()"
 
-#: include/functions.php:1220
-#: js/FeedTree.js:97
+#: include/functions.php:1165
+#: js/FeedTree.js:98
 msgid "Mark all feeds as read"
 msgstr "标记所有信息源为已读"
 
-#: include/functions.php:1221
+#: include/functions.php:1166
 #, fuzzy
 msgid "Un/collapse current category"
 msgstr "展开/折叠 当前分类"
 
-#: include/functions.php:1222
-#, fuzzy
-msgid "Toggle combined mode"
-msgstr "切换合并模式"
-
-#: include/functions.php:1223
+#: include/functions.php:1167
 #, fuzzy
 msgid "Toggle auto expand in combined mode"
 msgstr "切换合并模式中的自动展开功能"
 
-#: include/functions.php:1224
+#: include/functions.php:1168
+#, fuzzy
+msgid "Toggle combined mode"
+msgstr "切换合并模式"
+
+#: include/functions.php:1169
 #, fuzzy
 msgid "Go to"
 msgstr "跳转至……"
 
-#: include/functions.php:1225
-#: classes/feeds.php:1583
+#: include/functions.php:1170
+#: classes/feeds.php:1569
 msgid "All articles"
 msgstr "全部文章"
 
-#: include/functions.php:1226
+#: include/functions.php:1171
 msgid "Fresh"
 msgstr "最新的"
 
-#: include/functions.php:1229
-#: js/tt-rss.js:491
-#: js/tt-rss.js:660
+#: include/functions.php:1174
+#: js/tt-rss.js:439
+#: js/tt-rss.js:599
 msgid "Tag cloud"
 msgstr "标签云"
 
-#: include/functions.php:1231
+#: include/functions.php:1176
 #, fuzzy
 msgid "Other"
 msgstr "其他信息源"
 
-#: include/functions.php:1232
+#: include/functions.php:1177
 #: classes/pref/labels.php:279
 msgid "Create label"
 msgstr "创建预定义标签"
 
-#: include/functions.php:1233
+#: include/functions.php:1178
 #: classes/pref/filters.php:801
 msgid "Create filter"
 msgstr "创建过滤器"
 
-#: include/functions.php:1234
+#: include/functions.php:1179
 #, fuzzy
 msgid "Un/collapse sidebar"
 msgstr "收起侧边栏"
 
-#: include/functions.php:1235
+#: include/functions.php:1180
 #, fuzzy
 msgid "Show help dialog"
 msgstr "显示帮助对话框"
 
-#: include/functions.php:2582
+#: include/functions.php:2529
 msgid "There is no error, the file uploaded with success"
 msgstr "没有错误，文件上传成功"
 
-#: include/functions.php:2583
+#: include/functions.php:2530
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "上传的文件大小超过了 php.ini 中定义的限制 upload_max_filesize"
 
-#: include/functions.php:2584
+#: include/functions.php:2531
 msgid "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form"
 msgstr "上传的文件大小超过了 HTML form 中定义的限制 MAX_FILE_SIZE"
 
-#: include/functions.php:2585
+#: include/functions.php:2532
 msgid "The uploaded file was only partially uploaded"
 msgstr "上传文件中断"
 
-#: include/functions.php:2586
+#: include/functions.php:2533
 #, fuzzy
 msgid "No file was uploaded"
 msgstr "没有文件上传。"
 
-#: include/functions.php:2587
+#: include/functions.php:2534
 msgid "Missing a temporary folder"
 msgstr "无法找到临时文件夹"
 
-#: include/functions.php:2588
+#: include/functions.php:2535
 msgid "Failed to write file to disk."
 msgstr "文件写入硬盘失败"
 
-#: include/functions.php:2589
+#: include/functions.php:2536
 msgid "A PHP extension stopped the file upload."
 msgstr "文件上传被某个 PHP 扩展终止"
 
 #: include/login_form.php:107
-#: classes/handler/public.php:446
-#: classes/handler/public.php:708
+#: classes/handler/public.php:466
+#: classes/handler/public.php:732
 msgid "Login:"
 msgstr "登陆："
 
 #: include/login_form.php:117
-#: classes/handler/public.php:449
+#: classes/handler/public.php:469
 msgid "Password:"
 msgstr "密码："
 
@@ -826,9 +814,9 @@ msgid "Profile:"
 msgstr "偏好："
 
 #: include/login_form.php:133
-#: classes/handler/public.php:252
 #: classes/pref/prefs.php:1037
 #: classes/rpc.php:69
+#: classes/handler/public.php:272
 msgid "Default profile"
 msgstr "默认偏好设置"
 
@@ -845,215 +833,30 @@ msgid "Remember me"
 msgstr "记住我"
 
 #: include/login_form.php:159
-#: classes/handler/public.php:454
+#: classes/handler/public.php:474
 msgid "Log in"
 msgstr "登录"
 
-#: include/sessions.php:46
+#: include/sessions.php:45
 #, fuzzy
 msgid "Session failed to validate (schema version changed)"
 msgstr "无法验证会话（schema版本发生变化）"
 
-#: include/sessions.php:62
+#: include/sessions.php:53
+#, fuzzy
+msgid "Session failed to validate (UA changed)."
+msgstr "无法验证会话（密码错误）"
+
+#: include/sessions.php:67
 #, fuzzy
 msgid "Session failed to validate (password changed)"
 msgstr "无法验证会话（密码错误）"
 
-#: include/sessions.php:69
+#: include/sessions.php:74
 #, fuzzy
 msgid "Session failed to validate (user not found)"
 msgstr "无法验证会话（没有找到该用户）"
 
-#: classes/article.php:26
-msgid "Article not found."
-msgstr "找不到文章。"
-
-#: classes/article.php:211
-msgid "Tags for this article (separated by commas):"
-msgstr "本文的标签，请用逗号分开："
-
-#: classes/article.php:236
-#: classes/pref/labels.php:82
-#: classes/pref/users.php:103
-#: classes/pref/feeds.php:774
-#: classes/pref/feeds.php:914
-#: classes/pref/filters.php:525
-#: classes/pref/prefs.php:982
-#: plugins/nsfw/init.php:85
-#: plugins/note/init.php:58
-#: plugins/af_readability/init.php:80
-#: plugins/af_redditimgur/init.php:66
-#: plugins/af_psql_trgm/init.php:188
-#: plugins/mail/init.php:65
-#: plugins/af_zz_imgproxy/init.php:238
-msgid "Save"
-msgstr "保存"
-
-#: classes/article.php:238
-#: classes/handler/public.php:423
-#: classes/handler/public.php:457
-#: classes/pref/labels.php:84
-#: classes/pref/users.php:105
-#: classes/pref/feeds.php:775
-#: classes/pref/feeds.php:917
-#: classes/pref/feeds.php:1672
-#: classes/pref/filters.php:528
-#: classes/pref/filters.php:945
-#: classes/pref/filters.php:1022
-#: classes/pref/filters.php:1115
-#: classes/pref/prefs.php:984
-#: classes/feeds.php:1037
-#: classes/feeds.php:1089
-#: classes/feeds.php:1128
-#: plugins/note/init.php:60
-#: plugins/mail/init.php:179
-msgid "Cancel"
-msgstr "取消"
-
-#: classes/article.php:337
-#: classes/article.php:720
-#: classes/article.php:875
-msgid "no tags"
-msgstr "无标签"
-
-#: classes/article.php:448
-msgid "unknown type"
-msgstr "未知类型"
-
-#: classes/article.php:525
-#, fuzzy
-msgid "Attachments"
-msgstr "附件："
-
-#: classes/article.php:626
-#: classes/feeds.php:661
-#, fuzzy
-msgid "comment"
-msgid_plural "comments"
-msgstr[0] "评论些什么？"
-
-#: classes/article.php:630
-#: classes/feeds.php:665
-#, fuzzy
-msgid "comments"
-msgstr "评论些什么？"
-
-#: classes/article.php:689
-msgid " - "
-msgstr " - "
-
-#: classes/article.php:730
-#: classes/feeds.php:647
-msgid "Edit tags for this article"
-msgstr "为本文编辑自定义标签"
-
-#: classes/article.php:763
-#: classes/feeds.php:602
-msgid "Originally from:"
-msgstr "来源："
-
-#: classes/article.php:774
-#: classes/pref/feeds.php:539
-#: classes/feeds.php:613
-msgid "Feed URL"
-msgstr "信息源 URL"
-
-#: classes/article.php:811
-#: classes/backend.php:103
-#: classes/dlg.php:33
-#: classes/dlg.php:56
-#: classes/dlg.php:89
-#: classes/dlg.php:154
-#: classes/dlg.php:181
-#: classes/dlg.php:197
-#: classes/pref/feeds.php:1466
-#: classes/pref/feeds.php:1533
-#: classes/pref/filters.php:208
-#: classes/pref/prefs.php:1099
-#: plugins/af_psql_trgm/init.php:109
-#: plugins/import_export/init.php:446
-#: plugins/import_export/init.php:490
-#: plugins/share/init.php:128
-msgid "Close this window"
-msgstr "关闭本窗口"
-
-#: classes/article.php:913
-msgid "(edit note)"
-msgstr "（编辑注记）"
-
-#: classes/opml.php:31
-#: classes/opml.php:36
-msgid "OPML Utility"
-msgstr "OPML 工具"
-
-#: classes/opml.php:40
-msgid "Importing OPML..."
-msgstr "正在导入 OPML ……"
-
-#: classes/opml.php:45
-msgid "Return to preferences"
-msgstr "返回偏好设置"
-
-#: classes/opml.php:301
-#, php-format
-msgid "Adding feed: %s"
-msgstr "添加信息源: %s"
-
-#: classes/opml.php:312
-#, fuzzy, php-format
-msgid "Duplicate feed: %s"
-msgstr "重复的信息源"
-
-#: classes/opml.php:326
-#, php-format
-msgid "Adding label %s"
-msgstr "添加预定义标签%s"
-
-#: classes/opml.php:329
-#, php-format
-msgid "Duplicate label: %s"
-msgstr "重复预定义标签: %s"
-
-#: classes/opml.php:341
-#, php-format
-msgid "Setting preference key %s to %s"
-msgstr "将偏好按键从 %s 设置为 %s"
-
-#: classes/opml.php:377
-#, fuzzy
-msgid "Adding filter..."
-msgstr "创建过滤器"
-
-#: classes/opml.php:512
-#, fuzzy, php-format
-msgid "Processing category: %s"
-msgstr "加入到类别："
-
-#: classes/opml.php:558
-#, php-format
-msgid "Upload failed with error code %d"
-msgstr "上传错误，错误代码：%d"
-
-#: classes/opml.php:570
-#: plugins/import_export/init.php:471
-#, fuzzy
-msgid "Unable to move uploaded file."
-msgstr "无法移动已上传文件。"
-
-#: classes/opml.php:574
-#: plugins/import_export/init.php:475
-msgid "Error: please upload OPML file."
-msgstr "错误：请上传 OPML 文件。"
-
-#: classes/opml.php:585
-#, fuzzy
-msgid "Error: unable to find moved OPML file."
-msgstr "错误：无法找到移动的OPML文件。"
-
-#: classes/opml.php:594
-msgid "Error while parsing document."
-msgstr "解析文档时发生错误。"
-
 #: classes/backend.php:31
 msgid "Other interface tips are available in the Tiny Tiny RSS wiki."
 msgstr "在 Tiny Tiny RSS 的维基上可以找到其他界面技巧。"
@@ -1074,171 +877,362 @@ msgstr "Ctrl"
 msgid "Help topic not found."
 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/backend.php:103
+#: classes/pref/filters.php:208
+#: classes/pref/feeds.php:1465
+#: classes/pref/feeds.php:1532
+#: classes/pref/prefs.php:1099
+#: classes/dlg.php:33
+#: classes/dlg.php:56
+#: classes/dlg.php:89
+#: classes/dlg.php:154
+#: classes/dlg.php:181
+#: classes/dlg.php:197
+#: classes/article.php:810
+#: plugins/af_psql_trgm/init.php:109
+#: plugins/import_export/init.php:446
+#: plugins/import_export/init.php:490
+#: plugins/share/init.php:128
+msgid "Close this window"
+msgstr "关闭本窗口"
 
-#: classes/dlg.php:44
-msgid "Your Public OPML URL is:"
-msgstr "你的公共 OPML URL 是："
+#: classes/feeds.php:53
+msgid "View as RSS feed"
+msgstr "以 RSS 信息源方式阅读"
 
-#: classes/dlg.php:53
-#: classes/dlg.php:178
-#: plugins/share/init.php:125
-msgid "Generate new URL"
-msgstr "生成一个新的 URL"
+#: classes/feeds.php:54
+#: classes/feeds.php:140
+#: classes/pref/feeds.php:1326
+msgid "View as RSS"
+msgstr "以 RSS 形式阅读"
 
-#: classes/dlg.php:67
-msgid "Update daemon is enabled in configuration, but daemon process is not running, which prevents all feeds from updating. Please start the daemon process or contact instance owner."
-msgstr "更新进程已在配置中启用，但守护进程没有运行，导致无法抓取信息。请启动守护进程，或联系管理员。"
-
-#: classes/dlg.php:71
-#: classes/dlg.php:80
-msgid "Last update:"
+#: classes/feeds.php:62
+#, fuzzy, php-format
+msgid "Last updated: %s"
 msgstr "上次更新："
 
-#: classes/dlg.php:76
-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/feeds.php:100
+#, fuzzy
+msgid "Select..."
+msgstr "选择"
 
-#: classes/dlg.php:169
-msgid "You can view this feed as RSS using the following URL:"
-msgstr "您可以通过如下 URL 以 RSS 方式查看本信息源："
+#: classes/feeds.php:102
+#: classes/pref/labels.php:273
+#: classes/pref/filters.php:391
+#: classes/pref/filters.php:449
+#: classes/pref/filters.php:795
+#: classes/pref/filters.php:878
+#: classes/pref/filters.php:905
+#: classes/pref/feeds.php:1185
+#: classes/pref/feeds.php:1416
+#: classes/pref/feeds.php:1481
+#: classes/pref/users.php:358
+#: classes/pref/prefs.php:996
+msgid "All"
+msgstr "全部"
 
-#: classes/dlg.php:190
-msgid "You are using default tt-rss password. Please change it in the Preferences (Personal data / Authentication)."
+#: classes/feeds.php:104
+msgid "Invert"
+msgstr "反选"
+
+#: classes/feeds.php:105
+#: classes/pref/labels.php:275
+#: classes/pref/filters.php:393
+#: classes/pref/filters.php:451
+#: classes/pref/filters.php:797
+#: classes/pref/filters.php:880
+#: classes/pref/filters.php:907
+#: classes/pref/feeds.php:1187
+#: classes/pref/feeds.php:1418
+#: classes/pref/feeds.php:1483
+#: classes/pref/users.php:360
+#: classes/pref/prefs.php:998
+msgid "None"
+msgstr "无"
+
+#: classes/feeds.php:107
+msgid "Selection toggle:"
+msgstr "锁定选择："
+
+#: classes/feeds.php:113
+msgid "Selection:"
+msgstr "选择："
+
+#: classes/feeds.php:116
+#, fuzzy
+msgid "Set score"
+msgstr "评分"
+
+#: classes/feeds.php:119
+msgid "Archive"
+msgstr "存档"
+
+#: classes/feeds.php:121
+msgid "Move back"
+msgstr "移回原位"
+
+#: classes/feeds.php:122
+#: classes/pref/filters.php:400
+#: classes/pref/filters.php:458
+#: classes/pref/filters.php:887
+#: classes/pref/filters.php:914
+msgid "Delete"
+msgstr "删除"
+
+#: classes/feeds.php:127
+#: classes/feeds.php:132
+#: plugins/mailto/init.php:25
+#: plugins/mail/init.php:76
+msgid "Forward by email"
+msgstr "通过邮件转发"
+
+#: classes/feeds.php:136
+msgid "Feed:"
+msgstr "信息源："
+
+#: classes/feeds.php:193
+#: classes/feeds.php:802
+msgid "Feed not found."
+msgstr "找不到信息源。"
+
+#: classes/feeds.php:255
+#, fuzzy
+msgid "Never"
+msgstr "从不清理"
+
+#: classes/feeds.php:341
+#, fuzzy, php-format
+msgid "Imported at %s"
+msgstr "导入"
+
+#: classes/feeds.php:391
+#: classes/feeds.php:484
+#, fuzzy
+msgid "mark feed as read"
+msgstr "标记信息源为已读"
+
+#: classes/feeds.php:540
+#, fuzzy
+msgid "Collapse article"
+msgstr "折叠文章"
+
+#: classes/feeds.php:592
+#: classes/article.php:762
+msgid "Originally from:"
+msgstr "来源："
+
+#: classes/feeds.php:603
+#: classes/pref/feeds.php:538
+#: classes/article.php:773
+msgid "Feed URL"
+msgstr "信息源 URL"
+
+#: classes/feeds.php:630
+#: classes/article.php:729
+msgid "Edit tags for this article"
+msgstr "为本文编辑自定义标签"
+
+#: classes/feeds.php:644
+#: classes/article.php:625
+#, fuzzy
+msgid "comment"
+msgid_plural "comments"
+msgstr[0] "评论些什么？"
+
+#: classes/feeds.php:648
+#: classes/article.php:629
+#, fuzzy
+msgid "comments"
+msgstr "评论些什么？"
+
+#: classes/feeds.php:686
+msgid "No unread articles found to display."
+msgstr "没有未读文章。"
+
+#: classes/feeds.php:689
+msgid "No updated articles found to display."
+msgstr "没有最新更新的文章。"
+
+#: classes/feeds.php:692
+msgid "No starred articles found to display."
+msgstr "没有加星标的文章。"
+
+#: classes/feeds.php:696
+#, 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:698
+msgid "No articles found to display."
+msgstr "暂时没有文章。"
+
+#: classes/feeds.php:714
+#: classes/feeds.php:905
+#, php-format
+msgid "Feeds last updated at %s"
+msgstr "上次信息源更新时间：%s"
+
+#: classes/feeds.php:726
+#: classes/feeds.php:917
+msgid "Some feeds have update errors (click for details)"
+msgstr "部分信息源更新错误（点击了解详情）"
+
+#: classes/feeds.php:894
+msgid "No feed selected."
+msgstr "没有选中的信息源。"
+
+#: classes/feeds.php:958
+#: classes/feeds.php:966
+#, fuzzy
+msgid "Feed or site URL"
+msgstr "信息源 URL"
+
+#: classes/feeds.php:972
+#: classes/pref/feeds.php:559
+#: classes/pref/feeds.php:800
+#: classes/pref/feeds.php:1632
+msgid "Place in category:"
+msgstr "加入到类别："
+
+#: classes/feeds.php:980
+msgid "Available feeds"
+msgstr "可用的信息源"
+
+#: classes/feeds.php:992
+#: classes/pref/feeds.php:621
+#: classes/pref/feeds.php:848
+#: classes/pref/users.php:61
+msgid "Authentication"
+msgstr "登录认证"
+
+#: classes/feeds.php:996
+#: classes/pref/feeds.php:625
+#: classes/pref/feeds.php:852
+#: classes/pref/feeds.php:1646
+#: classes/pref/users.php:403
+msgid "Login"
+msgstr "登陆"
+
+#: classes/feeds.php:1000
+#: classes/pref/feeds.php:631
+#: classes/pref/feeds.php:860
+#: classes/pref/feeds.php:1649
+#: classes/pref/prefs.php:243
+msgid "Password"
+msgstr "密码"
+
+#: classes/feeds.php:1011
+#: classes/pref/feeds.php:645
+msgid "This feed requires authentication."
+msgstr "这个信息源需要认证"
+
+#: classes/feeds.php:1014
+#: classes/feeds.php:1070
+#: classes/pref/feeds.php:1668
+msgid "Subscribe"
+msgstr "订阅"
+
+#: classes/feeds.php:1017
+msgid "More feeds"
+msgstr "更多信息源"
+
+#: classes/feeds.php:1020
+#: classes/feeds.php:1072
+#: classes/feeds.php:1111
+#: classes/pref/labels.php:84
+#: classes/pref/filters.php:528
+#: classes/pref/filters.php:945
+#: classes/pref/filters.php:1022
+#: classes/pref/filters.php:1115
+#: classes/pref/feeds.php:774
+#: classes/pref/feeds.php:916
+#: classes/pref/feeds.php:1669
+#: classes/pref/users.php:105
+#: classes/pref/prefs.php:984
+#: classes/article.php:238
+#: classes/handler/public.php:443
+#: classes/handler/public.php:477
+#: plugins/mail/init.php:179
+#: plugins/note/init.php:60
+msgid "Cancel"
+msgstr "取消"
+
+#: classes/feeds.php:1042
+#: classes/feeds.php:1110
+#: classes/pref/filters.php:788
+#: classes/pref/feeds.php:1178
+#: classes/pref/users.php:345
+#: js/tt-rss.js:152
+msgid "Search"
+msgstr "搜索"
+
+#: classes/feeds.php:1046
+msgid "Popular feeds"
+msgstr "热门信息源"
+
+#: classes/feeds.php:1047
+msgid "Feed archive"
+msgstr "信息源存档"
+
+#: classes/feeds.php:1050
+msgid "limit:"
+msgstr "限制："
+
+#: classes/feeds.php:1071
+#: classes/pref/labels.php:282
+#: classes/pref/filters.php:518
+#: classes/pref/filters.php:814
+#: classes/pref/feeds.php:751
+#: classes/pref/users.php:369
+msgid "Remove"
+msgstr "移除"
+
+#: classes/feeds.php:1084
+msgid "Look for"
+msgstr "查找"
+
+#: classes/feeds.php:1092
+#, php-format
+msgid "in %s"
 msgstr ""
 
-#: classes/dlg.php:194
+#: classes/feeds.php:1097
+msgid "Used for word stemming"
+msgstr "词干提取"
+
+#: classes/feeds.php:1106
 #, fuzzy
-msgid "Open Preferences"
-msgstr "偏好设置"
+msgid "Search syntax"
+msgstr "搜索语法"
 
-#: classes/handler/public.php:387
-#: plugins/bookmarklets/init.php:40
-#, fuzzy
-msgid "Share with Tiny Tiny RSS"
-msgstr "在 Tiny Tiny RSS 中分享订阅"
+#: classes/feeds.php:1563
+msgid "Starred articles"
+msgstr "加星标文章"
 
-#: classes/handler/public.php:395
-#, fuzzy
-msgid "Title:"
-msgstr "标题"
+#: classes/feeds.php:1565
+msgid "Published articles"
+msgstr "已发布文章"
 
-#: classes/handler/public.php:397
-#: classes/pref/feeds.php:537
-msgid "URL:"
-msgstr "URL："
+#: classes/feeds.php:1567
+msgid "Fresh articles"
+msgstr "最新更新的文章"
 
-#: classes/handler/public.php:399
-#, fuzzy
-msgid "Content:"
-msgstr "内容"
+#: classes/feeds.php:1571
+msgid "Archived articles"
+msgstr "存档的文章"
 
-#: classes/handler/public.php:401
-#, fuzzy
-msgid "Labels:"
-msgstr "预定义标签"
+#: classes/feeds.php:1573
+msgid "Recently read"
+msgstr "最近的阅读"
 
-#: classes/handler/public.php:420
-msgid "Shared article will appear in the Published feed."
-msgstr "被分享的文章将会出现在已发布信息源中。"
+#: classes/feeds.php:1694
+msgid "Special"
+msgstr "特殊区域"
 
-#: classes/handler/public.php:422
-msgid "Share"
-msgstr "分享"
-
-#: classes/handler/public.php:444
-#, fuzzy
-msgid "Not logged in"
-msgstr "未登录"
-
-#: classes/handler/public.php:504
-msgid "Incorrect username or password"
-msgstr "用户名或密码错误"
-
-#: classes/handler/public.php:557
+#: classes/feeds.php:1951
 #, php-format
-msgid "Already subscribed to <b>%s</b>."
-msgstr "已经订阅到 <b>%s</b>."
-
-#: classes/handler/public.php:560
-#, php-format
-msgid "Subscribed to <b>%s</b>."
-msgstr "订阅到 <b>%s</b>."
-
-#: classes/handler/public.php:563
-#, php-format
-msgid "Could not subscribe to <b>%s</b>."
-msgstr "无法订阅到 <b>%s</b>。"
-
-#: classes/handler/public.php:566
-#, php-format
-msgid "No feeds found in <b>%s</b>."
-msgstr "在 <b>%s</b> 中没有找到信息源。"
-
-#: classes/handler/public.php:569
-#, fuzzy
-msgid "Multiple feed URLs found."
-msgstr "发现了多个信息源。"
-
-#: classes/handler/public.php:573
-#, 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:591
-msgid "Subscribe to selected feed"
-msgstr "订阅选中的信息源"
-
-#: classes/handler/public.php:618
-msgid "Edit subscription options"
-msgstr "编辑订阅选项"
-
-#: classes/handler/public.php:656
-#, fuzzy
-msgid "Password recovery"
-msgstr "找回密码"
-
-#: classes/handler/public.php:701
-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:723
-#: classes/pref/users.php:372
-msgid "Reset password"
-msgstr "重置密码"
-
-#: classes/handler/public.php:733
-msgid "Some of the required form parameters are missing or incorrect."
-msgstr "表单中的信息不完整或不正确。"
-
-#: classes/handler/public.php:737
-#: classes/handler/public.php:806
-#, fuzzy
-msgid "Go back"
-msgstr "返回"
-
-#: classes/handler/public.php:775
-#, fuzzy
-msgid "[tt-rss] Password reset request"
-msgstr "[tt-rss] 密码重置请求"
-
-#: classes/handler/public.php:802
-msgid "Sorry, login and email combination not found."
-msgstr "对不起，没有找到用户名和Email组合。"
-
-#: classes/handler/public.php:824
-msgid "Your access level is insufficient to run this script."
-msgstr "访问级别不足，无法运行脚本。"
-
-#: classes/handler/public.php:850
-msgid "Database Updater"
-msgstr "数据库更新管理器"
-
-#: classes/handler/public.php:915
-msgid "Perform updates"
-msgstr "执行更新"
+msgid "Search results: %s"
+msgstr "搜索结果：%s"
 
 #: classes/pref/labels.php:25
 #: classes/pref/filters.php:377
@@ -1258,201 +1252,200 @@ msgstr "前端："
 msgid "Background:"
 msgstr "背景："
 
+#: classes/pref/labels.php:82
+#: classes/pref/filters.php:525
+#: classes/pref/feeds.php:773
+#: classes/pref/feeds.php:913
+#: classes/pref/users.php:103
+#: classes/pref/prefs.php:982
+#: classes/article.php:236
+#: plugins/af_zz_imgproxy/init.php:238
+#: plugins/af_redditimgur/init.php:66
+#: plugins/af_psql_trgm/init.php:188
+#: plugins/af_readability/init.php:80
+#: plugins/nsfw/init.php:85
+#: plugins/mail/init.php:65
+#: plugins/note/init.php:58
+msgid "Save"
+msgstr "保存"
+
 #: classes/pref/labels.php:244
 #, php-format
 msgid "Created label <b>%s</b>"
 msgstr "创建预定义标签 <b>%s</b>"
 
 #: classes/pref/labels.php:270
-#: classes/pref/users.php:356
-#: classes/pref/feeds.php:1183
-#: classes/pref/feeds.php:1414
-#: classes/pref/feeds.php:1479
 #: classes/pref/filters.php:388
 #: classes/pref/filters.php:446
 #: classes/pref/filters.php:792
 #: classes/pref/filters.php:875
 #: classes/pref/filters.php:902
+#: classes/pref/feeds.php:1182
+#: classes/pref/feeds.php:1413
+#: classes/pref/feeds.php:1478
+#: classes/pref/users.php:355
 #: classes/pref/prefs.php:993
 msgid "Select"
 msgstr "选择"
 
-#: classes/pref/labels.php:273
-#: classes/pref/users.php:359
-#: classes/pref/feeds.php:1186
-#: classes/pref/feeds.php:1417
-#: classes/pref/feeds.php:1482
-#: classes/pref/filters.php:391
-#: classes/pref/filters.php:449
-#: classes/pref/filters.php:795
-#: classes/pref/filters.php:878
-#: classes/pref/filters.php:905
-#: classes/pref/prefs.php:996
-#: classes/feeds.php:102
-msgid "All"
-msgstr "全部"
-
-#: classes/pref/labels.php:275
-#: classes/pref/users.php:361
-#: classes/pref/feeds.php:1188
-#: classes/pref/feeds.php:1419
-#: classes/pref/feeds.php:1484
-#: classes/pref/filters.php:393
-#: classes/pref/filters.php:451
-#: classes/pref/filters.php:797
-#: classes/pref/filters.php:880
-#: classes/pref/filters.php:907
-#: classes/pref/prefs.php:998
-#: classes/feeds.php:105
-msgid "None"
-msgstr "无"
-
-#: classes/pref/labels.php:282
-#: classes/pref/users.php:370
-#: classes/pref/feeds.php:752
-#: classes/pref/filters.php:518
-#: classes/pref/filters.php:814
-#: classes/feeds.php:1088
-msgid "Remove"
-msgstr "移除"
-
 #: classes/pref/labels.php:285
 msgid "Clear colors"
 msgstr "清空颜色"
 
-#: classes/pref/users.php:6
-#: classes/pref/system.php:8
-msgid "Your access level is insufficient to open this tab."
-msgstr "您的访问级别不够，无法打开这个舌签。"
-
-#: classes/pref/users.php:26
+#: classes/pref/filters.php:155
 #, fuzzy
-msgid "Edit user"
-msgstr "编辑过滤器"
+msgid "Preview article"
+msgstr "最新更新的文章"
 
-#: classes/pref/users.php:61
-#: classes/pref/feeds.php:622
-#: classes/pref/feeds.php:849
-#: classes/feeds.php:1009
-msgid "Authentication"
-msgstr "登录认证"
-
-#: classes/pref/users.php:64
-msgid "Access level: "
-msgstr "访问级别："
-
-#: classes/pref/users.php:82
-#: classes/pref/feeds.php:648
-#: classes/pref/feeds.php:867
-msgid "Options"
-msgstr "选项"
-
-#: classes/pref/users.php:96
-#: js/prefs.js:479
-msgid "User details"
-msgstr "用户详细资料"
-
-#: classes/pref/users.php:136
-#: classes/pref/users.php:407
-msgid "Registered"
-msgstr "注册时间"
-
-#: classes/pref/users.php:137
-msgid "Last logged in"
-msgstr "上次登录"
-
-#: classes/pref/users.php:145
-msgid "Subscribed feeds count"
-msgstr "订阅的信息源数量"
-
-#: classes/pref/users.php:146
+#: classes/pref/filters.php:267
+#: classes/pref/filters.php:573
 #, fuzzy
-msgid "Stored articles"
-msgstr "加星标文章"
+msgid "(inverse)"
+msgstr "反选"
 
-#: classes/pref/users.php:150
-#: classes/pref/users.php:406
-msgid "Subscribed feeds"
-msgstr "订阅的信息源"
-
-#: classes/pref/users.php:176
-msgid "User not found"
-msgstr "未找到用户"
-
-#: classes/pref/users.php:246
+#: classes/pref/filters.php:263
+#: classes/pref/filters.php:572
 #, php-format
-msgid "Added user <b>%s</b> with password <b>%s</b>"
-msgstr "已添加用户 <b>%s</b> ，密码为<b>%s</b>"
+msgid "%s on %s in %s %s"
+msgstr ""
 
-#: classes/pref/users.php:253
-#, php-format
-msgid "Could not create user <b>%s</b>"
-msgstr "无法创建用户 <b>%s</b> "
+#: classes/pref/filters.php:383
+#: classes/pref/filters.php:870
+#: classes/pref/filters.php:977
+msgid "Match"
+msgstr "匹配"
 
-#: classes/pref/users.php:257
-#, php-format
-msgid "User <b>%s</b> already exists."
-msgstr "用户 <b>%s</b> 已存在。"
+#: classes/pref/filters.php:397
+#: classes/pref/filters.php:455
+#: classes/pref/filters.php:884
+#: classes/pref/filters.php:911
+msgid "Add"
+msgstr "添加"
 
-#: classes/pref/users.php:285
-#, fuzzy, php-format
-msgid "Changed password of user <b>%s</b> to <b>%s</b>"
-msgstr "用户 <b>%s</b> ，密码修改为<b>%s</b>"
+#: classes/pref/filters.php:441
+#: classes/pref/filters.php:897
+#, fuzzy
+msgid "Apply actions"
+msgstr "应用操作"
 
-#: classes/pref/users.php:287
-#, 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/filters.php:492
+#: classes/pref/filters.php:926
+msgid "Enabled"
+msgstr "已启用"
 
-#: classes/pref/users.php:311
-msgid "[tt-rss] Password change notification"
-msgstr "[tt-rss] 密码更换提醒"
+#: classes/pref/filters.php:501
+#: classes/pref/filters.php:929
+msgid "Match any rule"
+msgstr "匹配任意规则"
 
-#: classes/pref/users.php:346
-#: classes/pref/feeds.php:1179
-#: classes/pref/filters.php:788
-#: classes/feeds.php:1059
-#: classes/feeds.php:1127
-#: js/tt-rss.js:165
-msgid "Search"
-msgstr "搜索"
+#: classes/pref/filters.php:510
+#: classes/pref/filters.php:932
+#, fuzzy
+msgid "Inverse matching"
+msgstr "反向匹配"
 
-#: classes/pref/users.php:364
-msgid "Create user"
-msgstr "创建用户"
+#: classes/pref/filters.php:522
+#: classes/pref/filters.php:939
+msgid "Test"
+msgstr "测试"
+
+#: classes/pref/filters.php:804
+msgid "Combine"
+msgstr "合并"
 
-#: classes/pref/users.php:368
 #: classes/pref/filters.php:807
+#: classes/pref/users.php:367
 msgid "Edit"
 msgstr "编辑"
 
-#: classes/pref/users.php:404
-#: classes/pref/feeds.php:626
-#: classes/pref/feeds.php:853
-#: classes/pref/feeds.php:1649
-#: classes/feeds.php:1013
-msgid "Login"
-msgstr "登陆"
+#: classes/pref/filters.php:810
+#: classes/pref/feeds.php:1198
+#: classes/pref/feeds.php:1212
+msgid "Reset sort order"
+msgstr "重置排序"
 
-#: classes/pref/users.php:405
-msgid "Access Level"
-msgstr "访问级别"
+#: classes/pref/filters.php:942
+msgid "Create"
+msgstr "创建"
 
-#: classes/pref/users.php:408
-msgid "Last login"
-msgstr "最后登陆"
+#: classes/pref/filters.php:987
+msgid "Regular expression, without outer delimiters (i.e. slashes)"
+msgstr ""
 
-#: classes/pref/users.php:427
-msgid "Click to edit"
-msgstr "点击进行编辑"
+#: classes/pref/filters.php:993
+msgid "Inverse regular expression matching"
+msgstr "反选正则表达式匹配结果"
 
-#: classes/pref/users.php:447
-msgid "No users defined."
-msgstr "没有定义用户。"
+#: classes/pref/filters.php:995
+msgid "on field"
+msgstr "on field"
 
-#: classes/pref/users.php:449
-msgid "No matching users found."
-msgstr "没有匹配的用户。"
+#: classes/pref/filters.php:1001
+#: js/PrefFilterTree.js:44
+msgid "in"
+msgstr "在"
+
+#: classes/pref/filters.php:1014
+#, fuzzy
+msgid "Wiki: Filters"
+msgstr "Wiki: 过滤器"
+
+#: classes/pref/filters.php:1019
+#, fuzzy
+msgid "Save rule"
+msgstr "保存规则"
+
+#: classes/pref/filters.php:1019
+#: js/functions.js:764
+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:786
+#, fuzzy
+msgid "Add action"
+msgstr "添加操作"
+
+#: classes/pref/filters.php:1139
+#, fuzzy
+msgid "[No caption]"
+msgstr "[无题注]"
+
+#: classes/pref/filters.php:1141
+#, php-format
+msgid "%s (%d rule)"
+msgid_plural "%s (%d rules)"
+msgstr[0] "%s (%d 规则)"
+
+#: classes/pref/filters.php:1155
+#, fuzzy
+msgid "matches any rule"
+msgstr "匹配任意规则"
+
+#: classes/pref/filters.php:1158
+#, fuzzy, php-format
+msgid "%s (+%d action)"
+msgid_plural "%s (+%d actions)"
+msgstr[0] "信息源动作"
+
+#: classes/pref/system.php:8
+#: classes/pref/users.php:6
+msgid "Your access level is insufficient to open this tab."
+msgstr "您的访问级别不够，无法打开这个舌签。"
 
 #: classes/pref/system.php:29
 msgid "Error Log"
@@ -1498,399 +1491,324 @@ msgid "(%d feed)"
 msgid_plural "(%d feeds)"
 msgstr[0] "(%d 个信息源)"
 
-#: classes/pref/feeds.php:514
+#: classes/pref/feeds.php:513
 #: classes/pref/prefs.php:18
 msgid "General"
 msgstr "通用"
 
-#: classes/pref/feeds.php:528
+#: classes/pref/feeds.php:527
 msgid "Feed Title"
 msgstr "信息源标题"
 
-#: classes/pref/feeds.php:560
-#: classes/pref/feeds.php:801
-#: classes/pref/feeds.php:1635
-#: classes/feeds.php:989
-msgid "Place in category:"
-msgstr "加入到类别："
+#: classes/pref/feeds.php:536
+#: classes/handler/public.php:417
+msgid "URL:"
+msgstr "URL："
 
-#: classes/pref/feeds.php:572
+#: classes/pref/feeds.php:571
 #, fuzzy
 msgid "Site URL:"
 msgstr "全部文章"
 
-#: classes/pref/feeds.php:574
+#: classes/pref/feeds.php:573
 #, fuzzy
 msgid "Site URL"
 msgstr "信息源 URL"
 
-#: classes/pref/feeds.php:585
-#: classes/pref/feeds.php:815
+#: classes/pref/feeds.php:584
+#: classes/pref/feeds.php:814
 #, fuzzy
 msgid "Language:"
 msgstr "语言："
 
-#: classes/pref/feeds.php:592
-#: classes/pref/feeds.php:824
+#: classes/pref/feeds.php:591
+#: classes/pref/feeds.php:823
 msgid "Update"
 msgstr "更新列表"
 
-#: classes/pref/feeds.php:607
-#: classes/pref/feeds.php:840
+#: classes/pref/feeds.php:606
+#: classes/pref/feeds.php:839
 msgid "Article purging:"
 msgstr "文章清理："
 
-#: classes/pref/feeds.php:632
-#: classes/pref/feeds.php:861
-#: classes/pref/feeds.php:1652
-#: classes/pref/prefs.php:243
-#: classes/feeds.php:1017
-msgid "Password"
-msgstr "密码"
-
-#: classes/pref/feeds.php:636
+#: classes/pref/feeds.php:635
 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:646
-#: classes/feeds.php:1028
-msgid "This feed requires authentication."
-msgstr "这个信息源需要认证"
+#: classes/pref/feeds.php:647
+#: classes/pref/feeds.php:866
+#: classes/pref/users.php:82
+msgid "Options"
+msgstr "选项"
 
-#: classes/pref/feeds.php:662
-#: classes/pref/feeds.php:871
+#: classes/pref/feeds.php:661
+#: classes/pref/feeds.php:870
 msgid "Hide from Popular feeds"
 msgstr "从最受欢迎的信息源中隐藏"
 
-#: classes/pref/feeds.php:674
-#: classes/pref/feeds.php:877
+#: classes/pref/feeds.php:673
+#: classes/pref/feeds.php:876
 msgid "Include in e-mail digest"
 msgstr "包含电子邮件摘要"
 
-#: classes/pref/feeds.php:687
-#: classes/pref/feeds.php:883
+#: classes/pref/feeds.php:686
+#: classes/pref/feeds.php:882
 msgid "Always display image attachments"
 msgstr "始终显示图片附件"
 
-#: classes/pref/feeds.php:700
-#: classes/pref/feeds.php:891
+#: classes/pref/feeds.php:699
+#: classes/pref/feeds.php:890
 #, fuzzy
 msgid "Do not embed media"
 msgstr "不要嵌入图片"
 
-#: classes/pref/feeds.php:713
-#: classes/pref/feeds.php:899
+#: classes/pref/feeds.php:712
+#: classes/pref/feeds.php:898
 msgid "Cache media"
 msgstr ""
 
-#: classes/pref/feeds.php:725
-#: classes/pref/feeds.php:905
+#: classes/pref/feeds.php:724
+#: classes/pref/feeds.php:904
 msgid "Mark updated articles as unread"
 msgstr "将已更新的文章标记为未读"
 
-#: classes/pref/feeds.php:729
+#: classes/pref/feeds.php:728
 msgid "Icon"
 msgstr "图标"
 
-#: classes/pref/feeds.php:743
-#: classes/pref/feeds.php:1284
+#: classes/pref/feeds.php:742
+#: classes/pref/feeds.php:1283
 #: plugins/import_export/init.php:71
 #, fuzzy
 msgid "Choose file..."
 msgstr "创建过滤器"
 
-#: classes/pref/feeds.php:750
+#: classes/pref/feeds.php:749
 msgid "Replace"
 msgstr "替换"
 
-#: classes/pref/feeds.php:757
+#: classes/pref/feeds.php:756
 #: classes/pref/prefs.php:679
 msgid "Plugins"
 msgstr "插件"
 
-#: classes/pref/feeds.php:1154
+#: classes/pref/feeds.php:1153
 msgid "Feeds with errors"
 msgstr "有错误的信息源"
 
-#: classes/pref/feeds.php:1161
+#: classes/pref/feeds.php:1160
 #, fuzzy
 msgid "Inactive feeds"
 msgstr "刷新活动的信息源"
 
-#: classes/pref/feeds.php:1197
+#: classes/pref/feeds.php:1196
 msgid "Edit selected feeds"
 msgstr "编辑选定的信息源"
 
-#: classes/pref/feeds.php:1199
-#: classes/pref/feeds.php:1213
-#: classes/pref/filters.php:810
-msgid "Reset sort order"
-msgstr "重置排序"
-
-#: classes/pref/feeds.php:1201
-#: js/prefs.js:1462
+#: classes/pref/feeds.php:1200
+#: js/prefs.js:1171
 msgid "Batch subscribe"
 msgstr "批量订阅"
 
-#: classes/pref/feeds.php:1208
+#: classes/pref/feeds.php:1207
 #, fuzzy
 msgid "Categories"
 msgstr "信息源类别"
 
-#: classes/pref/feeds.php:1211
+#: classes/pref/feeds.php:1210
 #, fuzzy
 msgid "Add category"
 msgstr "编辑类别"
 
-#: classes/pref/feeds.php:1215
+#: classes/pref/feeds.php:1214
 #, fuzzy
 msgid "Remove selected"
 msgstr "移除选中的信息源"
 
-#: classes/pref/feeds.php:1272
+#: classes/pref/feeds.php:1271
 msgid "OPML"
 msgstr "OPML"
 
-#: classes/pref/feeds.php:1274
+#: classes/pref/feeds.php:1273
 msgid "Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings."
 msgstr "使用OPML你可以导出或导入信息源feeds列表、过滤器、标签以及设置。"
 
-#: classes/pref/feeds.php:1275
+#: classes/pref/feeds.php:1274
 msgid "Only main settings profile can be migrated using OPML."
 msgstr "只有主要设置能够通过OPML文件来进行迁移。"
 
-#: classes/pref/feeds.php:1290
+#: classes/pref/feeds.php:1289
 #, fuzzy
 msgid "Import my OPML"
 msgstr "正在导入 OPML ……"
 
-#: classes/pref/feeds.php:1296
+#: classes/pref/feeds.php:1295
 msgid "Filename:"
 msgstr "文件名："
 
-#: classes/pref/feeds.php:1298
+#: classes/pref/feeds.php:1297
 msgid "Include settings"
 msgstr "包含设置"
 
-#: classes/pref/feeds.php:1302
+#: classes/pref/feeds.php:1301
 #, fuzzy
 msgid "Export OPML"
 msgstr "正在导入 OPML ……"
 
-#: classes/pref/feeds.php:1306
+#: classes/pref/feeds.php:1305
 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:1310
+#: classes/pref/feeds.php:1309
 msgid "Public OPML URL"
 msgstr "公开的 OPML URL"
 
-#: classes/pref/feeds.php:1311
+#: classes/pref/feeds.php:1310
 #, fuzzy
 msgid "Display published OPML URL"
 msgstr "公开的 OPML URL"
 
-#: classes/pref/feeds.php:1318
+#: classes/pref/feeds.php:1317
 #, fuzzy
 msgid "Published & shared articles / Generated feeds"
 msgstr "已发布的文章和生成的信息源"
 
-#: classes/pref/feeds.php:1320
+#: classes/pref/feeds.php:1319
 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:1327
-#: classes/feeds.php:54
-#: classes/feeds.php:140
-msgid "View as RSS"
-msgstr "以 RSS 形式阅读"
-
-#: classes/pref/feeds.php:1328
 msgid "Display URL"
 msgstr "显示 URL"
 
-#: classes/pref/feeds.php:1331
+#: classes/pref/feeds.php:1330
 msgid "Clear all generated URLs"
 msgstr "清空所有生成的 URL"
 
-#: classes/pref/feeds.php:1410
+#: classes/pref/feeds.php:1409
 msgid "These feeds have not been updated with new content for 3 months (oldest first):"
 msgstr "以下信息源已经有三个月没有内容更新了（最旧的在最上）："
 
-#: classes/pref/feeds.php:1444
-#: classes/pref/feeds.php:1509
+#: classes/pref/feeds.php:1443
+#: classes/pref/feeds.php:1508
 msgid "Click to edit feed"
 msgstr "点击以编辑信息源"
 
-#: classes/pref/feeds.php:1462
-#: classes/pref/feeds.php:1529
+#: classes/pref/feeds.php:1461
+#: classes/pref/feeds.php:1528
 msgid "Unsubscribe from selected feeds"
 msgstr "取消订阅选中的信息源"
 
-#: classes/pref/feeds.php:1632
+#: classes/pref/feeds.php:1629
 msgid "Add one valid RSS feed per line (no feed detection is done)"
 msgstr "每行添加一条RSS源"
 
-#: classes/pref/feeds.php:1641
+#: classes/pref/feeds.php:1638
 msgid "Feeds to subscribe, One per line"
 msgstr "所有将订阅的Feeds, 每行一条"
 
-#: classes/pref/feeds.php:1664
+#: classes/pref/feeds.php:1661
 msgid "Feeds require authentication."
 msgstr "Feed需要登录认证。"
 
-#: classes/pref/feeds.php:1671
-#: classes/feeds.php:1031
-#: classes/feeds.php:1087
-msgid "Subscribe"
-msgstr "订阅"
-
-#: classes/pref/filters.php:155
+#: classes/pref/users.php:26
 #, fuzzy
-msgid "Preview article"
-msgstr "最新更新的文章"
+msgid "Edit user"
+msgstr "编辑过滤器"
 
-#: classes/pref/filters.php:267
-#: classes/pref/filters.php:573
+#: classes/pref/users.php:64
+msgid "Access level: "
+msgstr "访问级别："
+
+#: classes/pref/users.php:96
+#: js/prefs.js:403
+msgid "User details"
+msgstr "用户详细资料"
+
+#: classes/pref/users.php:136
+#: classes/pref/users.php:406
+msgid "Registered"
+msgstr "注册时间"
+
+#: classes/pref/users.php:137
+msgid "Last logged in"
+msgstr "上次登录"
+
+#: classes/pref/users.php:145
+msgid "Subscribed feeds count"
+msgstr "订阅的信息源数量"
+
+#: classes/pref/users.php:146
 #, fuzzy
-msgid "(inverse)"
-msgstr "反选"
+msgid "Stored articles"
+msgstr "加星标文章"
 
-#: classes/pref/filters.php:263
-#: classes/pref/filters.php:572
+#: classes/pref/users.php:150
+#: classes/pref/users.php:405
+msgid "Subscribed feeds"
+msgstr "订阅的信息源"
+
+#: classes/pref/users.php:176
+msgid "User not found"
+msgstr "未找到用户"
+
+#: classes/pref/users.php:246
 #, php-format
-msgid "%s on %s in %s %s"
-msgstr ""
+msgid "Added user <b>%s</b> with password <b>%s</b>"
+msgstr "已添加用户 <b>%s</b> ，密码为<b>%s</b>"
 
-#: classes/pref/filters.php:383
-#: classes/pref/filters.php:870
-#: classes/pref/filters.php:977
-msgid "Match"
-msgstr "匹配"
-
-#: classes/pref/filters.php:397
-#: classes/pref/filters.php:455
-#: classes/pref/filters.php:884
-#: classes/pref/filters.php:911
-msgid "Add"
-msgstr "添加"
-
-#: classes/pref/filters.php:400
-#: classes/pref/filters.php:458
-#: classes/pref/filters.php:887
-#: classes/pref/filters.php:914
-#: classes/feeds.php:122
-msgid "Delete"
-msgstr "删除"
-
-#: classes/pref/filters.php:441
-#: classes/pref/filters.php:897
-#, fuzzy
-msgid "Apply actions"
-msgstr "应用操作"
-
-#: classes/pref/filters.php:492
-#: classes/pref/filters.php:926
-msgid "Enabled"
-msgstr "已启用"
-
-#: classes/pref/filters.php:501
-#: classes/pref/filters.php:929
-msgid "Match any rule"
-msgstr "匹配任意规则"
-
-#: classes/pref/filters.php:510
-#: classes/pref/filters.php:932
-#, fuzzy
-msgid "Inverse matching"
-msgstr "反向匹配"
-
-#: classes/pref/filters.php:522
-#: classes/pref/filters.php:939
-msgid "Test"
-msgstr "测试"
-
-#: classes/pref/filters.php:804
-msgid "Combine"
-msgstr "合并"
-
-#: classes/pref/filters.php:942
-msgid "Create"
-msgstr "创建"
-
-#: classes/pref/filters.php:987
-msgid "Regular expression, without outer delimiters (i.e. slashes)"
-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:43
-msgid "in"
-msgstr "在"
-
-#: classes/pref/filters.php:1014
-#, fuzzy
-msgid "Wiki: Filters"
-msgstr "Wiki: 过滤器"
-
-#: classes/pref/filters.php:1019
-#, fuzzy
-msgid "Save rule"
-msgstr "保存规则"
-
-#: classes/pref/filters.php:1019
-#: js/functions.js:797
-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:819
-#, fuzzy
-msgid "Add action"
-msgstr "添加操作"
-
-#: classes/pref/filters.php:1139
-#, fuzzy
-msgid "[No caption]"
-msgstr "[无题注]"
-
-#: classes/pref/filters.php:1141
+#: classes/pref/users.php:253
 #, php-format
-msgid "%s (%d rule)"
-msgid_plural "%s (%d rules)"
-msgstr[0] "%s (%d 规则)"
+msgid "Could not create user <b>%s</b>"
+msgstr "无法创建用户 <b>%s</b> "
 
-#: classes/pref/filters.php:1155
-#, fuzzy
-msgid "matches any rule"
-msgstr "匹配任意规则"
+#: classes/pref/users.php:257
+#, php-format
+msgid "User <b>%s</b> already exists."
+msgstr "用户 <b>%s</b> 已存在。"
 
-#: classes/pref/filters.php:1158
+#: classes/pref/users.php:285
 #, fuzzy, php-format
-msgid "%s (+%d action)"
-msgid_plural "%s (+%d actions)"
-msgstr[0] "信息源动作"
+msgid "Changed password of user <b>%s</b> to <b>%s</b>"
+msgstr "用户 <b>%s</b> ，密码修改为<b>%s</b>"
+
+#: classes/pref/users.php:287
+#, 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:310
+msgid "[tt-rss] Password change notification"
+msgstr "[tt-rss] 密码更换提醒"
+
+#: classes/pref/users.php:363
+msgid "Create user"
+msgstr "创建用户"
+
+#: classes/pref/users.php:371
+#: classes/handler/public.php:747
+msgid "Reset password"
+msgstr "重置密码"
+
+#: classes/pref/users.php:404
+msgid "Access Level"
+msgstr "访问级别"
+
+#: classes/pref/users.php:407
+msgid "Last login"
+msgstr "最后登陆"
+
+#: classes/pref/users.php:426
+msgid "Click to edit"
+msgstr "点击进行编辑"
+
+#: classes/pref/users.php:446
+msgid "No users defined."
+msgstr "没有定义用户。"
+
+#: classes/pref/users.php:448
+msgid "No matching users found."
+msgstr "没有匹配的用户。"
 
 #: classes/pref/prefs.php:19
 msgid "Interface"
@@ -2075,7 +1993,7 @@ msgid "Strip all but most common HTML tags when reading articles."
 msgstr "仅加载几个最常用的 HTML 标签"
 
 #: classes/pref/prefs.php:53
-#: js/prefs.js:1424
+#: js/prefs.js:1136
 msgid "Customize stylesheet"
 msgstr "自定义样式"
 
@@ -2330,213 +2248,285 @@ msgstr "移除选中的偏好文件"
 msgid "Activate profile"
 msgstr "启用偏好文件"
 
-#: classes/feeds.php:53
-msgid "View as RSS feed"
-msgstr "以 RSS 信息源方式阅读"
+#: 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/feeds.php:62
-#, fuzzy, php-format
-msgid "Last updated: %s"
+#: classes/dlg.php:44
+msgid "Your Public OPML URL is:"
+msgstr "你的公共 OPML URL 是："
+
+#: classes/dlg.php:53
+#: classes/dlg.php:178
+#: plugins/share/init.php:125
+msgid "Generate new URL"
+msgstr "生成一个新的 URL"
+
+#: classes/dlg.php:67
+msgid "Update daemon is enabled in configuration, but daemon process is not running, which prevents all feeds from updating. Please start the daemon process or contact instance owner."
+msgstr "更新进程已在配置中启用，但守护进程没有运行，导致无法抓取信息。请启动守护进程，或联系管理员。"
+
+#: classes/dlg.php:71
+#: classes/dlg.php:80
+msgid "Last update:"
 msgstr "上次更新："
 
-#: classes/feeds.php:100
-#, fuzzy
-msgid "Select..."
-msgstr "选择"
+#: classes/dlg.php:76
+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/feeds.php:104
-msgid "Invert"
-msgstr "反选"
+#: classes/dlg.php:169
+msgid "You can view this feed as RSS using the following URL:"
+msgstr "您可以通过如下 URL 以 RSS 方式查看本信息源："
 
-#: classes/feeds.php:107
-msgid "Selection toggle:"
-msgstr "锁定选择："
-
-#: classes/feeds.php:113
-msgid "Selection:"
-msgstr "选择："
-
-#: classes/feeds.php:116
-#, fuzzy
-msgid "Set score"
-msgstr "评分"
-
-#: classes/feeds.php:119
-msgid "Archive"
-msgstr "存档"
-
-#: classes/feeds.php:121
-msgid "Move back"
-msgstr "移回原位"
-
-#: classes/feeds.php:127
-#: classes/feeds.php:132
-#: plugins/mail/init.php:76
-#: plugins/mailto/init.php:25
-msgid "Forward by email"
-msgstr "通过邮件转发"
-
-#: classes/feeds.php:136
-msgid "Feed:"
-msgstr "信息源："
-
-#: classes/feeds.php:193
-#: classes/feeds.php:819
-msgid "Feed not found."
-msgstr "找不到信息源。"
-
-#: classes/feeds.php:255
-#, fuzzy
-msgid "Never"
-msgstr "从不清理"
-
-#: classes/feeds.php:342
-#, fuzzy, php-format
-msgid "Imported at %s"
-msgstr "导入"
-
-#: classes/feeds.php:394
-#: classes/feeds.php:487
-#, fuzzy
-msgid "mark feed as read"
-msgstr "标记信息源为已读"
-
-#: classes/feeds.php:542
-#, fuzzy
-msgid "Collapse article"
-msgstr "折叠文章"
-
-#: classes/feeds.php:703
-msgid "No unread articles found to display."
-msgstr "没有未读文章。"
-
-#: classes/feeds.php:706
-msgid "No updated articles found to display."
-msgstr "没有最新更新的文章。"
-
-#: classes/feeds.php:709
-msgid "No starred articles found to display."
-msgstr "没有加星标的文章。"
-
-#: classes/feeds.php:713
-#, 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:715
-msgid "No articles found to display."
-msgstr "暂时没有文章。"
-
-#: classes/feeds.php:731
-#: classes/feeds.php:922
-#, php-format
-msgid "Feeds last updated at %s"
-msgstr "上次信息源更新时间：%s"
-
-#: classes/feeds.php:743
-#: classes/feeds.php:934
-msgid "Some feeds have update errors (click for details)"
-msgstr "部分信息源更新错误（点击了解详情）"
-
-#: classes/feeds.php:911
-msgid "No feed selected."
-msgstr "没有选中的信息源。"
-
-#: classes/feeds.php:975
-#: classes/feeds.php:983
-#, fuzzy
-msgid "Feed or site URL"
-msgstr "信息源 URL"
-
-#: classes/feeds.php:997
-msgid "Available feeds"
-msgstr "可用的信息源"
-
-#: classes/feeds.php:1034
-msgid "More feeds"
-msgstr "更多信息源"
-
-#: classes/feeds.php:1063
-msgid "Popular feeds"
-msgstr "热门信息源"
-
-#: classes/feeds.php:1064
-msgid "Feed archive"
-msgstr "信息源存档"
-
-#: classes/feeds.php:1067
-msgid "limit:"
-msgstr "限制："
-
-#: classes/feeds.php:1101
-msgid "Look for"
-msgstr "查找"
-
-#: classes/feeds.php:1109
-#, php-format
-msgid "in %s"
+#: classes/dlg.php:190
+msgid "You are using default tt-rss password. Please change it in the Preferences (Personal data / Authentication)."
 msgstr ""
 
-#: classes/feeds.php:1114
-msgid "Used for word stemming"
-msgstr "词干提取"
-
-#: classes/feeds.php:1123
+#: classes/dlg.php:194
 #, fuzzy
-msgid "Search syntax"
-msgstr "搜索语法"
+msgid "Open Preferences"
+msgstr "偏好设置"
 
-#: classes/feeds.php:1577
-msgid "Starred articles"
-msgstr "加星标文章"
+#: classes/opml.php:31
+#: classes/opml.php:36
+msgid "OPML Utility"
+msgstr "OPML 工具"
 
-#: classes/feeds.php:1579
-msgid "Published articles"
-msgstr "已发布文章"
+#: classes/opml.php:40
+msgid "Importing OPML..."
+msgstr "正在导入 OPML ……"
 
-#: classes/feeds.php:1581
-msgid "Fresh articles"
-msgstr "最新更新的文章"
+#: classes/opml.php:45
+msgid "Return to preferences"
+msgstr "返回偏好设置"
 
-#: classes/feeds.php:1585
-msgid "Archived articles"
-msgstr "存档的文章"
-
-#: classes/feeds.php:1587
-msgid "Recently read"
-msgstr "最近的阅读"
-
-#: classes/feeds.php:1708
-msgid "Special"
-msgstr "特殊区域"
-
-#: classes/feeds.php:1965
+#: classes/opml.php:301
 #, php-format
-msgid "Search results: %s"
-msgstr "搜索结果：%s"
+msgid "Adding feed: %s"
+msgstr "添加信息源: %s"
 
-#: plugins/nsfw/init.php:30
-#: plugins/nsfw/init.php:42
-msgid "Not work safe (click to toggle)"
-msgstr "不宜在工作场所观看（点击开启）"
+#: classes/opml.php:312
+#, fuzzy, php-format
+msgid "Duplicate feed: %s"
+msgstr "重复的信息源"
 
-#: plugins/nsfw/init.php:52
-msgid "NSFW Plugin"
-msgstr "NSFW 插件"
+#: classes/opml.php:326
+#, php-format
+msgid "Adding label %s"
+msgstr "添加预定义标签%s"
 
-#: plugins/nsfw/init.php:79
-msgid "Tags to consider NSFW (comma-separated)"
-msgstr "不宜在工作场所观看的标签（多个标签以逗号分隔）"
+#: classes/opml.php:329
+#, php-format
+msgid "Duplicate label: %s"
+msgstr "重复预定义标签: %s"
 
-#: plugins/nsfw/init.php:100
+#: classes/opml.php:341
+#, php-format
+msgid "Setting preference key %s to %s"
+msgstr "将偏好按键从 %s 设置为 %s"
+
+#: classes/opml.php:377
 #, fuzzy
-msgid "Configuration saved."
-msgstr "设置已保存。"
+msgid "Adding filter..."
+msgstr "创建过滤器"
 
-#: plugins/note/init.php:28
-#: plugins/note/note.js:11
-msgid "Edit article note"
-msgstr "编辑文章注记"
+#: classes/opml.php:512
+#, fuzzy, php-format
+msgid "Processing category: %s"
+msgstr "加入到类别："
+
+#: classes/opml.php:558
+#, php-format
+msgid "Upload failed with error code %d"
+msgstr "上传错误，错误代码：%d"
+
+#: classes/opml.php:570
+#: plugins/import_export/init.php:471
+#, fuzzy
+msgid "Unable to move uploaded file."
+msgstr "无法移动已上传文件。"
+
+#: classes/opml.php:574
+#: plugins/import_export/init.php:475
+msgid "Error: please upload OPML file."
+msgstr "错误：请上传 OPML 文件。"
+
+#: classes/opml.php:585
+#, fuzzy
+msgid "Error: unable to find moved OPML file."
+msgstr "错误：无法找到移动的OPML文件。"
+
+#: classes/opml.php:594
+msgid "Error while parsing document."
+msgstr "解析文档时发生错误。"
+
+#: classes/article.php:26
+msgid "Article not found."
+msgstr "找不到文章。"
+
+#: classes/article.php:211
+msgid "Tags for this article (separated by commas):"
+msgstr "本文的标签，请用逗号分开："
+
+#: classes/article.php:337
+#: classes/article.php:719
+#: classes/article.php:874
+msgid "no tags"
+msgstr "无标签"
+
+#: classes/article.php:447
+msgid "unknown type"
+msgstr "未知类型"
+
+#: classes/article.php:524
+#, fuzzy
+msgid "Attachments"
+msgstr "附件："
+
+#: classes/article.php:688
+msgid " - "
+msgstr " - "
+
+#: classes/article.php:912
+msgid "(edit note)"
+msgstr "（编辑注记）"
+
+#: classes/handler/public.php:407
+#: plugins/bookmarklets/init.php:40
+#, fuzzy
+msgid "Share with Tiny Tiny RSS"
+msgstr "在 Tiny Tiny RSS 中分享订阅"
+
+#: classes/handler/public.php:415
+#, fuzzy
+msgid "Title:"
+msgstr "标题"
+
+#: classes/handler/public.php:419
+#, fuzzy
+msgid "Content:"
+msgstr "内容"
+
+#: classes/handler/public.php:421
+#, fuzzy
+msgid "Labels:"
+msgstr "预定义标签"
+
+#: classes/handler/public.php:440
+msgid "Shared article will appear in the Published feed."
+msgstr "被分享的文章将会出现在已发布信息源中。"
+
+#: classes/handler/public.php:442
+msgid "Share"
+msgstr "分享"
+
+#: classes/handler/public.php:464
+#, fuzzy
+msgid "Not logged in"
+msgstr "未登录"
+
+#: classes/handler/public.php:527
+msgid "Incorrect username or password"
+msgstr "用户名或密码错误"
+
+#: classes/handler/public.php:581
+#, php-format
+msgid "Already subscribed to <b>%s</b>."
+msgstr "已经订阅到 <b>%s</b>."
+
+#: classes/handler/public.php:584
+#, php-format
+msgid "Subscribed to <b>%s</b>."
+msgstr "订阅到 <b>%s</b>."
+
+#: classes/handler/public.php:587
+#, php-format
+msgid "Could not subscribe to <b>%s</b>."
+msgstr "无法订阅到 <b>%s</b>。"
+
+#: classes/handler/public.php:590
+#, php-format
+msgid "No feeds found in <b>%s</b>."
+msgstr "在 <b>%s</b> 中没有找到信息源。"
+
+#: classes/handler/public.php:593
+#, fuzzy
+msgid "Multiple feed URLs found."
+msgstr "发现了多个信息源。"
+
+#: classes/handler/public.php:597
+#, 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:615
+msgid "Subscribe to selected feed"
+msgstr "订阅选中的信息源"
+
+#: classes/handler/public.php:642
+msgid "Edit subscription options"
+msgstr "编辑订阅选项"
+
+#: classes/handler/public.php:680
+#, fuzzy
+msgid "Password recovery"
+msgstr "找回密码"
+
+#: classes/handler/public.php:725
+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:757
+msgid "Some of the required form parameters are missing or incorrect."
+msgstr "表单中的信息不完整或不正确。"
+
+#: classes/handler/public.php:761
+#: classes/handler/public.php:830
+#, fuzzy
+msgid "Go back"
+msgstr "返回"
+
+#: classes/handler/public.php:799
+#, fuzzy
+msgid "[tt-rss] Password reset request"
+msgstr "[tt-rss] 密码重置请求"
+
+#: classes/handler/public.php:826
+msgid "Sorry, login and email combination not found."
+msgstr "对不起，没有找到用户名和Email组合。"
+
+#: classes/handler/public.php:848
+msgid "Your access level is insufficient to run this script."
+msgstr "访问级别不足，无法运行脚本。"
+
+#: classes/handler/public.php:874
+msgid "Database Updater"
+msgstr "数据库更新管理器"
+
+#: classes/handler/public.php:939
+msgid "Perform updates"
+msgstr "执行更新"
+
+#: plugins/af_zz_imgproxy/init.php:208
+msgid "Image proxy settings (af_zz_imgproxy)"
+msgstr "图片代理设置 (af_zz_imgproxy)"
+
+#: plugins/af_zz_imgproxy/init.php:232
+#, fuzzy
+msgid "Enable proxy for all remote images."
+msgstr "启用信息源分类"
+
+#: plugins/af_zz_imgproxy/init.php:236
+#, fuzzy
+msgid "Don't cache files locally."
+msgstr "本地缓存图片"
+
+#: plugins/af_zz_imgproxy/init.php:252
+#: plugins/af_redditimgur/init.php:79
+#, fuzzy
+msgid "Configuration saved"
+msgstr "设置已保存。"
 
 #: plugins/vf_shared/init.php:17
 #: plugins/vf_shared/init.php:73
@@ -2544,51 +2534,27 @@ msgstr "编辑文章注记"
 msgid "Shared articles"
 msgstr "加星标文章"
 
-#: plugins/auth_internal/init.php:67
-#, fuzzy
-msgid "Please enter your one time password:"
-msgstr "请填写类别名称："
+#: plugins/bookmarklets/init.php:20
+msgid "Bookmarklets"
+msgstr "小书签"
 
-#: plugins/auth_internal/init.php:208
-msgid "Password has been changed."
-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/auth_internal/init.php:210
-msgid "Old password is incorrect."
-msgstr "原密码输入错误。"
+#: plugins/bookmarklets/init.php:26
+#, php-format
+msgid "Subscribe to %s in Tiny Tiny RSS?"
+msgstr "在 Tiny Tiny RSS 中订阅 %s ？"
 
-#: plugins/af_readability/init.php:25
-msgid "Data saved."
-msgstr "数据已保存"
+#: plugins/bookmarklets/init.php:31
+msgid "Subscribe in Tiny Tiny RSS"
+msgstr "在 Tiny Tiny RSS 中订阅"
 
-#: plugins/af_readability/init.php:41
-#, fuzzy
-msgid "Inline content"
-msgstr "滚动文章内容"
-
-#: plugins/af_readability/init.php:47
-msgid "Readability settings (af_readability)"
-msgstr "Readability 设置 (af_readability)"
-
-#: plugins/af_readability/init.php:78
-msgid "Use Readability for pages shared via bookmarklet."
+#: plugins/bookmarklets/init.php:34
+msgid "Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS"
 msgstr ""
 
-#: plugins/af_readability/init.php:90
-#: plugins/af_psql_trgm/init.php:198
-msgid "Currently enabled for (click to edit):"
-msgstr "当前启用（点击编辑）"
-
-#: plugins/af_readability/init.php:107
-#, fuzzy
-msgid "Readability"
-msgstr "检查可用性"
-
-#: plugins/af_readability/init.php:118
-#, fuzzy
-msgid "Inline article content"
-msgstr "滚动文章内容"
-
 #: plugins/af_redditimgur/init.php:30
 msgid "Reddit content settings (af_redditimgur)"
 msgstr "Reddit 内容设置"
@@ -2601,11 +2567,21 @@ msgstr "使用 Readability 提取缺失的内容"
 msgid "Enable additional duplicate checking"
 msgstr "开启额外的重复检查"
 
-#: plugins/af_redditimgur/init.php:79
-#: plugins/af_zz_imgproxy/init.php:252
-#, fuzzy
-msgid "Configuration saved"
-msgstr "设置已保存。"
+#: plugins/af_comics/init.php:49
+msgid "Feeds supported by af_comics"
+msgstr "af_comics 的 feed 源"
+
+#: plugins/af_comics/init.php:51
+msgid "The following comics are currently supported:"
+msgstr "漫画支持支持："
+
+#: plugins/af_comics/init.php:69
+msgid "To subscribe to GoComics use the comic's regular web page as the feed URL (e.g. for the <em>Garfield</em> comic use <code>http://www.gocomics.com/garfield</code>)."
+msgstr "订阅 GoComics 时，使用漫画网址作为源地址。例如 <em>Garfield</em>，则地址为<code>http://www.gocomics.com/garfield</code>。"
+
+#: plugins/af_comics/init.php:71
+msgid "Drop any updated filters into <code>filters.local</code> in plugin directory."
+msgstr "将新版的过滤器放置于插件目录下的 <code>filters.local</code> 文件夹中"
 
 #: plugins/af_psql_trgm/init.php:29
 #, php-format
@@ -2645,25 +2621,89 @@ msgstr "最短标题长度："
 msgid "Enable for all feeds:"
 msgstr "启用信息源分类"
 
+#: plugins/af_psql_trgm/init.php:198
+#: plugins/af_readability/init.php:90
+msgid "Currently enabled for (click to edit):"
+msgstr "当前启用（点击编辑）"
+
 #: plugins/af_psql_trgm/init.php:216
 msgid "Similarity (pg_trgm)"
 msgstr "相似度 (pg_trgm)"
 
-#: plugins/af_comics/init.php:49
-msgid "Feeds supported by af_comics"
-msgstr "af_comics 的 feed 源"
+#: plugins/af_readability/init.php:25
+msgid "Data saved."
+msgstr "数据已保存"
 
-#: plugins/af_comics/init.php:51
-msgid "The following comics are currently supported:"
-msgstr "漫画支持支持："
+#: plugins/af_readability/init.php:41
+#, fuzzy
+msgid "Inline content"
+msgstr "滚动文章内容"
 
-#: plugins/af_comics/init.php:69
-msgid "To subscribe to GoComics use the comic's regular web page as the feed URL (e.g. for the <em>Garfield</em> comic use <code>http://www.gocomics.com/garfield</code>)."
-msgstr "订阅 GoComics 时，使用漫画网址作为源地址。例如 <em>Garfield</em>，则地址为<code>http://www.gocomics.com/garfield</code>。"
+#: plugins/af_readability/init.php:47
+msgid "Readability settings (af_readability)"
+msgstr "Readability 设置 (af_readability)"
 
-#: plugins/af_comics/init.php:71
-msgid "Drop any updated filters into <code>filters.local</code> in plugin directory."
-msgstr "将新版的过滤器放置于插件目录下的 <code>filters.local</code> 文件夹中"
+#: plugins/af_readability/init.php:78
+msgid "Use Readability for pages shared via bookmarklet."
+msgstr ""
+
+#: plugins/af_readability/init.php:107
+#, fuzzy
+msgid "Readability"
+msgstr "检查可用性"
+
+#: plugins/af_readability/init.php:118
+#, fuzzy
+msgid "Inline article content"
+msgstr "滚动文章内容"
+
+#: plugins/mailto/init.php:50
+#: plugins/mailto/init.php:58
+#: plugins/mail/init.php:118
+#: plugins/mail/init.php:124
+msgid "[Forwarded]"
+msgstr "[已转发]"
+
+#: plugins/mailto/init.php:50
+#: plugins/mail/init.php:118
+msgid "Multiple articles"
+msgstr "多篇文章"
+
+#: plugins/mailto/init.php:74
+msgid "Clicking the following link to invoke your mail client:"
+msgstr "点击下面链接来启动你的邮件客户端："
+
+#: plugins/mailto/init.php:78
+#, fuzzy
+msgid "Forward selected article(s) by email."
+msgstr "用邮件转发文章"
+
+#: plugins/mailto/init.php:81
+msgid "You should be able to edit the message before sending in your mail client."
+msgstr "在邮件发送前，你能够编辑消息。"
+
+#: plugins/mailto/init.php:86
+#, fuzzy
+msgid "Close this dialog"
+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 "不宜在工作场所观看的标签（多个标签以逗号分隔）"
+
+#: plugins/nsfw/init.php:100
+#, fuzzy
+msgid "Configuration saved."
+msgstr "设置已保存。"
 
 #: plugins/import_export/init.php:53
 msgid "Import and export"
@@ -2728,104 +2768,6 @@ msgstr "上传错误，错误代码：%d"
 msgid "No file uploaded."
 msgstr "没有文件上传。"
 
-#: plugins/mail/init.php:29
-msgid "Mail addresses saved."
-msgstr "邮件地址已保存"
-
-#: plugins/mail/init.php:35
-#, fuzzy
-msgid "Mail plugin"
-msgstr "邮件插件"
-
-#: plugins/mail/init.php:37
-msgid "You can set predefined email addressed here (comma-separated list):"
-msgstr ""
-
-#: plugins/mail/init.php:118
-#: plugins/mail/init.php:124
-#: plugins/mailto/init.php:50
-#: plugins/mailto/init.php:58
-msgid "[Forwarded]"
-msgstr "[已转发]"
-
-#: plugins/mail/init.php:118
-#: plugins/mailto/init.php:50
-msgid "Multiple articles"
-msgstr "多篇文章"
-
-#: plugins/mail/init.php:146
-msgid "To:"
-msgstr "收信人："
-
-#: plugins/mail/init.php:161
-msgid "Subject:"
-msgstr "主题："
-
-#: plugins/mail/init.php:178
-msgid "Send e-mail"
-msgstr "发送邮件"
-
-#: plugins/close_button/init.php:25
-msgid "Close article"
-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/toggle_sidebar/init.php:23
-msgid "Collapse feedlist"
-msgstr "收缩侧边栏"
-
-#: plugins/af_zz_imgproxy/init.php:208
-msgid "Image proxy settings (af_zz_imgproxy)"
-msgstr "图片代理设置 (af_zz_imgproxy)"
-
-#: plugins/af_zz_imgproxy/init.php:232
-#, fuzzy
-msgid "Enable proxy for all remote images."
-msgstr "启用信息源分类"
-
-#: plugins/af_zz_imgproxy/init.php:236
-#, fuzzy
-msgid "Don't cache files locally."
-msgstr "本地缓存图片"
-
-#: plugins/mailto/init.php:74
-msgid "Clicking the following link to invoke your mail client:"
-msgstr "点击下面链接来启动你的邮件客户端："
-
-#: plugins/mailto/init.php:78
-#, fuzzy
-msgid "Forward selected article(s) by email."
-msgstr "用邮件转发文章"
-
-#: plugins/mailto/init.php:81
-msgid "You should be able to edit the message before sending in your mail client."
-msgstr "在邮件发送前，你能够编辑消息。"
-
-#: plugins/mailto/init.php:86
-#, fuzzy
-msgid "Close this dialog"
-msgstr "关闭本界面"
-
 #: plugins/share/init.php:41
 msgid "You can disable all articles shared by unique URLs here."
 msgstr "您可以取消所有通过 URL 分享的文章。"
@@ -2847,475 +2789,633 @@ msgstr "您可以通过以下唯一 URL 分享本文："
 msgid "Unshare article"
 msgstr "取消星标"
 
-#: js/FeedTree.js:75
+#: plugins/toggle_sidebar/init.php:23
+msgid "Collapse feedlist"
+msgstr "收缩侧边栏"
+
+#: plugins/close_button/init.php:25
+msgid "Close article"
+msgstr "关闭文章"
+
+#: plugins/mail/init.php:29
+msgid "Mail addresses saved."
+msgstr "邮件地址已保存"
+
+#: plugins/mail/init.php:35
+#, fuzzy
+msgid "Mail plugin"
+msgstr "邮件插件"
+
+#: plugins/mail/init.php:37
+msgid "You can set predefined email addressed here (comma-separated list):"
+msgstr ""
+
+#: plugins/mail/init.php:146
+msgid "To:"
+msgstr "收信人："
+
+#: plugins/mail/init.php:161
+msgid "Subject:"
+msgstr "主题："
+
+#: plugins/mail/init.php:178
+msgid "Send e-mail"
+msgstr "发送邮件"
+
+#: plugins/note/init.php:28
+#: plugins/note/note.js:11
+msgid "Edit article note"
+msgstr "编辑文章注记"
+
+#: plugins/auth_internal/init.php:67
+#, fuzzy
+msgid "Please enter your one time password:"
+msgstr "请填写类别名称："
+
+#: plugins/auth_internal/init.php:208
+msgid "Password has been changed."
+msgstr "密码更改成功。"
+
+#: plugins/auth_internal/init.php:210
+msgid "Old password is incorrect."
+msgstr "原密码输入错误。"
+
+#: js/FeedTree.js:76
 #, fuzzy
 msgid "(Un)collapse"
 msgstr "收起侧边栏"
 
-#: js/PrefFeedTree.js:35
+#: js/PrefFeedTree.js:36
 #, fuzzy
 msgid "Edit category"
 msgstr "编辑类别"
 
-#: js/PrefFeedTree.js:42
+#: js/PrefFeedTree.js:43
 #, fuzzy
 msgid "Remove category"
 msgstr "创建类别"
 
-#: js/PrefFilterTree.js:46
+#: js/PrefFilterTree.js:47
 msgid "Inverse"
 msgstr "反选"
 
-#: js/feedlist.js:511
+#: js/feedlist.js:461
 #, fuzzy
 msgid "Mark %w in %s older than 1 day as read?"
 msgstr "将 %s 中的一天前的全部文章标记为已读？"
 
-#: js/feedlist.js:514
+#: js/feedlist.js:464
 #, fuzzy
 msgid "Mark %w in %s older than 1 week as read?"
 msgstr "将 %s 中的一周前的全部文章标记为已读？"
 
-#: js/feedlist.js:517
+#: js/feedlist.js:467
 #, fuzzy
 msgid "Mark %w in %s older than 2 weeks as read?"
 msgstr "将 %s 中的两周前的全部文章标记为已读？"
 
-#: js/feedlist.js:520
+#: js/feedlist.js:470
 #, fuzzy
 msgid "Mark %w in %s as read?"
 msgstr "将 %s 中的全部文章标记为已读？"
 
-#: js/feedlist.js:523
+#: js/feedlist.js:473
 #, fuzzy
 msgid "search results"
 msgstr "搜索结果：%s"
 
-#: js/feedlist.js:523
+#: js/feedlist.js:473
 #, fuzzy
 msgid "all articles"
 msgstr "全部文章"
 
-#: js/functions.js:74
+#: js/functions.js:100
 msgid "Close"
 msgstr "关闭"
 
-#: js/functions.js:141
+#: js/functions.js:167
 #, fuzzy
 msgid "Click to close"
 msgstr "点击暂停"
 
-#: js/functions.js:448
+#: js/functions.js:456
 msgid "Error explained"
 msgstr "Error释义 "
 
-#: js/functions.js:592
+#: js/functions.js:490
+msgid "Upload complete."
+msgstr "上传完成。"
+
+#: js/functions.js:508
+msgid "Remove stored feed icon?"
+msgstr "移除已保存的信息源图标？"
+
+#: js/functions.js:510
+#, fuzzy
+msgid "Removing feed icon..."
+msgstr "移除已保存的信息源图标？"
+
+#: js/functions.js:515
+#, fuzzy
+msgid "Feed icon removed."
+msgstr "找不到信息源。"
+
+#: js/functions.js:532
+msgid "Please select an image file to upload."
+msgstr "请选择图片文件上传。"
+
+#: js/functions.js:533
+msgid "Upload new icon for this feed?"
+msgstr "为本信息源上传一个新的图标？"
+
+#: js/functions.js:534
+#, fuzzy
+msgid "Uploading, please wait..."
+msgstr "读取中，请稍候……"
+
+#: js/functions.js:542
+msgid "Please enter label caption:"
+msgstr "请填写预定义标签的说明："
+
+#: js/functions.js:575
 msgid "Subscribe to Feed"
 msgstr "订阅信息源"
 
-#: js/functions.js:621
+#: js/functions.js:602
 msgid "Failed to parse output. This can indicate server timeout and/or network issues. Backend output was logged to browser console."
 msgstr "解析输出失败。 这可能由于服务器超时或网络问题。 服务器的输出已经被记录在浏览器console控制台中。"
 
-#: js/functions.js:636
+#: js/functions.js:617
 #, perl-format
 msgid "Subscribed to %s"
 msgstr "已订阅至 %s"
 
-#: js/functions.js:641
+#: js/functions.js:622
 msgid "Specified URL seems to be invalid."
 msgstr "指定的 URL 无效。"
 
-#: js/functions.js:644
+#: js/functions.js:625
 msgid "Specified URL doesn't seem to contain any feeds."
 msgstr "指定的 URL 没有包含任何信息源。"
 
-#: js/functions.js:656
+#: js/functions.js:637
 #, fuzzy
 msgid "Expand to select feed"
 msgstr "编辑选定的信息源"
 
-#: js/functions.js:668
+#: js/functions.js:649
 #, fuzzy, perl-format
 msgid "Couldn't download the specified URL: %s"
 msgstr "无法下载指定的 URL 。"
 
-#: js/functions.js:672
+#: js/functions.js:653
 #, fuzzy, perl-format
 msgid "XML validation failed: %s"
 msgstr "XML 验证失败："
 
-#: js/functions.js:676
+#: js/functions.js:657
 msgid "You are already subscribed to this feed."
 msgstr "您已经订阅过这个信息源啦。"
 
-#: js/functions.js:1136
+#: js/functions.js:1098
 msgid "Generate new syndication address for this feed?"
 msgstr "为本信息源生成新的群地址？"
 
-#: js/functions.js:1140
-#: js/prefs.js:1095
+#: js/functions.js:1100
+#: js/prefs.js:870
 msgid "Trying to change address..."
 msgstr "尝试更改地址..."
 
-#: js/functions.js:1245
-#: js/tt-rss.js:446
-#: js/tt-rss.js:673
+#: js/functions.js:1199
+#: js/tt-rss.js:399
+#: js/tt-rss.js:612
 msgid "You can't edit this kind of feed."
 msgstr "您无法编辑这种类型的信息源。"
 
-#: js/functions.js:1260
+#: js/functions.js:1213
 msgid "Edit Feed"
 msgstr "编辑信息源"
 
-#: js/functions.js:1266
-#: js/prefs.js:100
-#: js/prefs.js:209
-#: js/prefs.js:647
+#: js/functions.js:1217
+#: js/prefs.js:176
+#: js/prefs.js:523
+#: js/prefs.js:1139
+#: js/prefs.js:78
 #, fuzzy
 msgid "Saving data..."
 msgstr "保存信息"
 
-#: js/functions.js:1293
+#: js/functions.js:1243
 msgid "More Feeds"
 msgstr "更多信息源"
 
-#: js/functions.js:1355
-#: js/functions.js:1464
-#: js/prefs.js:398
-#: js/prefs.js:540
-#: js/prefs.js:558
-#: js/prefs.js:1077
+#: js/functions.js:1297
+#: js/functions.js:1383
+#: js/prefs.js:332
+#: js/prefs.js:455
+#: js/prefs.js:473
+#: js/prefs.js:855
 msgid "No feeds are selected."
 msgstr "没有选择任何信息源。"
 
-#: js/functions.js:1398
+#: js/functions.js:1329
 msgid "Remove selected feeds from the archive? Feeds with stored articles will not be removed."
 msgstr "将选中的信息源从存档中移除？包含已保存文章的信息源不会被移除。"
 
-#: js/functions.js:1435
+#: js/functions.js:1360
 msgid "Feeds with update errors"
 msgstr "更新错误的信息源"
 
-#: js/functions.js:1446
-#: js/prefs.js:1058
+#: js/functions.js:1369
+#: js/prefs.js:841
 msgid "Remove selected feeds?"
 msgstr "移除选中的信息源？"
 
-#: js/functions.js:1449
-#: js/prefs.js:1061
+#: js/functions.js:1370
+#: js/prefs.js:842
 #, fuzzy
 msgid "Removing selected feeds..."
 msgstr "移除选中的信息源？"
 
-#: js/prefs.js:60
-msgid "Please enter login:"
-msgstr "请输入登录名："
-
-#: js/prefs.js:67
-msgid "Can't create user: no login specified."
-msgstr "无法创建用户：没有指定登录名。"
-
-#: js/prefs.js:71
-#, fuzzy
-msgid "Adding user..."
-msgstr "创建过滤器"
-
-#: js/prefs.js:96
-msgid "User Editor"
-msgstr "编辑用户信息"
-
-#: js/prefs.js:131
-msgid "Edit Filter"
-msgstr "编辑过滤器"
-
-#: js/prefs.js:170
+#: js/prefs.js:143
 #, fuzzy
 msgid "Remove filter?"
 msgstr "移除这个过滤器： %s ？"
 
-#: js/prefs.js:175
+#: js/prefs.js:148
 #, fuzzy
 msgid "Removing filter..."
 msgstr "创建过滤器"
 
-#: js/prefs.js:292
+#: js/prefs.js:251
 msgid "Remove selected labels?"
 msgstr "移除选中的预定义标签？"
 
-#: js/prefs.js:295
+#: js/prefs.js:252
 #, fuzzy
 msgid "Removing selected labels..."
 msgstr "移除选中的预定义标签？"
 
-#: js/prefs.js:308
-#: js/prefs.js:1144
+#: js/prefs.js:262
+#: js/prefs.js:909
 msgid "No labels are selected."
 msgstr "没有选择任何预定义标签。"
 
-#: js/prefs.js:320
+#: js/prefs.js:274
 msgid "Remove selected users? Neither default admin nor your account will be removed."
 msgstr "移除选中的用户？默认管理员和您的帐户不会被移除。"
 
-#: js/prefs.js:323
+#: js/prefs.js:275
 #, fuzzy
 msgid "Removing selected users..."
 msgstr "移除选定的过滤器？"
 
-#: js/prefs.js:338
-#: js/prefs.js:408
-#: js/prefs.js:427
-#: js/prefs.js:461
+#: js/prefs.js:286
+#: js/prefs.js:342
+#: js/prefs.js:361
+#: js/prefs.js:387
 msgid "No users are selected."
 msgstr "没有选中任何用户。"
 
-#: js/prefs.js:350
+#: js/prefs.js:297
 msgid "Remove selected filters?"
 msgstr "移除选定的过滤器？"
 
-#: js/prefs.js:353
+#: js/prefs.js:298
 #, fuzzy
 msgid "Removing selected filters..."
 msgstr "移除选定的过滤器？"
 
-#: js/prefs.js:366
-#: js/prefs.js:495
-#: js/prefs.js:514
+#: js/prefs.js:308
+#: js/prefs.js:419
+#: js/prefs.js:438
 msgid "No filters are selected."
 msgstr "没有选中的过滤器。"
 
-#: js/prefs.js:378
+#: js/prefs.js:319
 msgid "Unsubscribe from selected feeds?"
 msgstr "从选中的信息源取消订阅？"
 
-#: js/prefs.js:382
+#: js/prefs.js:321
 #, fuzzy
 msgid "Unsubscribing from selected feeds..."
 msgstr "取消订阅选中的信息源"
 
-#: js/prefs.js:413
-#: js/prefs.js:432
-#: js/prefs.js:466
+#: js/prefs.js:347
+#: js/prefs.js:366
+#: js/prefs.js:392
 msgid "Please select only one user."
 msgstr "请仅选择一个用户。"
 
-#: js/prefs.js:436
+#: js/prefs.js:370
 msgid "Reset password of selected user?"
 msgstr "重置选定用户的密码？"
 
-#: js/prefs.js:439
+#: js/prefs.js:371
 #, fuzzy
 msgid "Resetting password for selected user..."
 msgstr "重置选定用户的密码？"
 
-#: js/prefs.js:500
+#: js/prefs.js:424
 msgid "Please select only one filter."
 msgstr "请仅选择一个过滤器。"
 
-#: js/prefs.js:518
+#: js/prefs.js:442
 #, fuzzy
 msgid "Combine selected filters?"
 msgstr "移除选定的过滤器？"
 
-#: js/prefs.js:521
+#: js/prefs.js:443
 #, fuzzy
 msgid "Joining filters..."
 msgstr "创建过滤器"
 
-#: js/prefs.js:580
+#: js/prefs.js:487
 msgid "Edit Multiple Feeds"
 msgstr "编辑多个信息源"
 
-#: js/prefs.js:604
+#: js/prefs.js:511
 msgid "Save changes to selected feeds?"
 msgstr "保存对信息源的更改？"
 
-#: js/prefs.js:681
+#: js/prefs.js:552
 msgid "OPML Import"
 msgstr "OPML 导入"
 
-#: js/prefs.js:700
+#: js/prefs.js:571
 msgid "Please choose an OPML file first."
 msgstr "请先选择一个 OPML 文件。"
 
-#: js/prefs.js:703
+#: js/prefs.js:574
 #: plugins/import_export/import_export.js:115
 #, fuzzy
 msgid "Importing, please wait..."
 msgstr "读取中，请稍候……"
 
-#: js/prefs.js:869
+#: js/prefs.js:737
 msgid "Reset to defaults?"
 msgstr "重置为默认状态？"
 
-#: js/prefs.js:1468
-msgid "Subscribing to feeds..."
-msgstr "订阅至信息源.."
+#: js/prefs.js:777
+#, perl-format
+msgid "Remove category %s? Any nested feeds would be placed into Uncategorized."
+msgstr "删除类别 %s？该类别下的源将被归入未分类中。"
 
-#: js/prefs.js:1487
-msgid "Clear stored data for this plugin?"
-msgstr "清除本插件已保存的数据？"
+#: js/prefs.js:778
+#, fuzzy
+msgid "Removing category..."
+msgstr "创建类别"
 
-#: js/prefs.js:1501
-msgid "Clear all messages in the error log?"
-msgstr "清除错误日志里的所有消息"
+#: js/prefs.js:794
+msgid "Remove selected categories?"
+msgstr "移除选中的类别？"
 
-#: js/tt-rss.js:118
+#: js/prefs.js:795
+#, fuzzy
+msgid "Removing selected categories..."
+msgstr "移除选定的类别"
+
+#: js/prefs.js:805
+msgid "No categories are selected."
+msgstr "没有选中任何类别。"
+
+#: js/prefs.js:812
+#, fuzzy
+msgid "Category title:"
+msgstr "类别"
+
+#: js/prefs.js:815
+#, fuzzy
+msgid "Creating category..."
+msgstr "创建过滤器"
+
+#: js/prefs.js:832
+msgid "Feeds without recent updates"
+msgstr "最近没更新的信息源"
+
+#: js/prefs.js:869
+msgid "Replace current OPML publishing address with a new one?"
+msgstr "将当前的 OPML 发布地址更改替换为新地址？"
+
+#: js/prefs.js:898
+msgid "Reset selected labels to default colors?"
+msgstr "将选中的可选标签重置为默认颜色？"
+
+#: js/prefs.js:926
+msgid "Settings Profiles"
+msgstr "偏好文件的设置"
+
+#: js/prefs.js:935
+msgid "Remove selected profiles? Active and default profiles will not be removed."
+msgstr "移除选中的偏好文件？当前偏好与默认偏好不会被移除。"
+
+#: js/prefs.js:936
+#, fuzzy
+msgid "Removing selected profiles..."
+msgstr "移除选中的偏好文件"
+
+#: js/prefs.js:948
+msgid "No profiles are selected."
+msgstr "未选择偏好文件。"
+
+#: js/prefs.js:955
+#: js/prefs.js:997
+msgid "Activate selected profile?"
+msgstr "启用选中的偏好文件？"
+
+#: js/prefs.js:964
+#: js/prefs.js:1008
+msgid "Please choose a profile to activate."
+msgstr "请选择希望启用的偏好文件。"
+
+#: js/prefs.js:969
+#, fuzzy
+msgid "Creating profile..."
+msgstr "创建偏好文件"
+
+#: js/prefs.js:1016
+msgid "This will invalidate all previously generated feed URLs. Continue?"
+msgstr "之前生成的信息源 URL 将会回到未认证状态。是否继续？"
+
+#: js/prefs.js:1017
+#: plugins/share/share_prefs.js:3
+msgid "Clearing URLs..."
+msgstr "清理 URLs..."
+
+#: js/prefs.js:1020
+#, fuzzy
+msgid "Generated URLs cleared."
+msgstr "生成一个新的 URL"
+
+#: js/prefs.js:1053
+#, fuzzy
+msgid "Rename category to:"
+msgstr "创建类别"
+
+#: js/prefs.js:1074
+msgid "Label Editor"
+msgstr "编辑预定义标签"
+
+#: js/tt-rss.js:111
 msgid "Mark all articles as read?"
 msgstr "将所有文章标记为已读？"
 
-#: js/tt-rss.js:124
+#: js/tt-rss.js:115
 #, fuzzy
 msgid "Marking all feeds as read..."
 msgstr "标记所有信息源为已读"
 
-#: js/tt-rss.js:398
+#: js/tt-rss.js:351
 #, fuzzy
 msgid "Please enable mail plugin first."
 msgstr "请先选几个信息源吧。"
 
-#: js/tt-rss.js:527
+#: js/tt-rss.js:477
 #, fuzzy
 msgid "Please enable embed_original plugin first."
 msgstr "请先选几个信息源吧。"
 
-#: js/tt-rss.js:540
-#: js/tt-rss.js:723
+#: js/tt-rss.js:490
+#: js/tt-rss.js:653
 msgid "Widescreen is not available in combined mode."
 msgstr "在合并模式下无法启用宽"
 
-#: js/tt-rss.js:821
-msgid "You can't rescore this kind of feed."
-msgstr "无法重置本类信息源的评分。"
-
-#: js/tt-rss.js:826
-#: js/tt-rss.js:686
-msgid "Please select some feed first."
-msgstr "请选择信息源。"
-
-#: js/tt-rss.js:831
-#, perl-format
-msgid "Rescore articles in %s?"
-msgstr "重置 %s 中文章的评分？"
-
-#: js/tt-rss.js:834
-#, fuzzy
-msgid "Rescoring articles..."
-msgstr "为文章重新评分"
-
-#: js/viewfeed.js:917
-#: js/viewfeed.js:955
-#: js/viewfeed.js:1003
-#: js/viewfeed.js:1924
-#: plugins/mail/mail.js:7
+#: js/viewfeed.js:444
+#: js/viewfeed.js:461
+#: js/viewfeed.js:484
+#: js/viewfeed.js:521
+#: js/viewfeed.js:542
+#: js/viewfeed.js:651
+#: js/viewfeed.js:685
+#: js/viewfeed.js:727
+#: js/viewfeed.js:1564
 #: plugins/mailto/init.js:7
-#: js/viewfeed.js:675
-#: js/viewfeed.js:697
-#: js/viewfeed.js:718
-#: js/viewfeed.js:777
-#: js/viewfeed.js:805
+#: plugins/mail/mail.js:7
 msgid "No articles are selected."
 msgstr "没有选中任何文章。"
 
-#: js/viewfeed.js:925
+#: js/viewfeed.js:659
 #, 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:927
+#: js/viewfeed.js:661
 #, fuzzy, perl-format
 msgid "Delete %d selected article?"
 msgid_plural "Delete %d selected articles?"
 msgstr[0] "删除选中的 %d 篇文章？"
 
-#: js/viewfeed.js:964
+#: js/viewfeed.js:694
 #, 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:967
+#: js/viewfeed.js:697
 #, fuzzy, perl-format
 msgid "Move %d archived article back?"
 msgid_plural "Move %d archived articles back?"
 msgstr[0] "将存档的 %d 篇文章移回原处？"
 
-#: js/viewfeed.js:969
+#: js/viewfeed.js:698
 msgid "Please note that unstarred articles might get purged on next feed update."
 msgstr "未加星的文章可能在下一次文章更新中被清除"
 
-#: js/viewfeed.js:1009
+#: js/viewfeed.js:733
 #, 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:1029
+#: js/viewfeed.js:753
 msgid "Edit article Tags"
 msgstr "编辑文章的自定义标签"
 
-#: js/viewfeed.js:1035
+#: js/viewfeed.js:757
 #, fuzzy
 msgid "Saving article tags..."
 msgstr "编辑文章的自定义标签"
 
-#: js/viewfeed.js:1666
+#: js/viewfeed.js:1015
+msgid "No article is selected."
+msgstr "未选中任何文章。"
+
+#: js/viewfeed.js:1050
+msgid "No articles found to mark"
+msgstr "未找到需要标记的文章"
+
+#: js/viewfeed.js:1052
+#, fuzzy, perl-format
+msgid "Mark %d article as read?"
+msgid_plural "Mark %d articles as read?"
+msgstr[0] "将 %d 篇文章标记为已读？"
+
+#: js/viewfeed.js:1312
 msgid "Open original article"
 msgstr "打开原文"
 
-#: js/viewfeed.js:1673
+#: js/viewfeed.js:1319
 #, fuzzy
 msgid "Display article URL"
 msgstr "显示 URL"
 
-#: js/viewfeed.js:1780
+#: js/viewfeed.js:1426
 msgid "Assign label"
 msgstr "添加预定义标签"
 
-#: js/viewfeed.js:1785
+#: js/viewfeed.js:1431
 msgid "Remove label"
 msgstr "移除预定义标签"
 
-#: js/viewfeed.js:1817
+#: js/viewfeed.js:1463
 #, fuzzy
 msgid "Select articles in group"
 msgstr "选择鼠标指向的文章"
 
-#: js/viewfeed.js:1827
+#: js/viewfeed.js:1473
 #, fuzzy
 msgid "Mark group as read"
 msgstr "标记为已读"
 
-#: js/viewfeed.js:1839
+#: js/viewfeed.js:1485
 msgid "Mark feed as read"
 msgstr "标记信息源为已读"
 
-#: js/viewfeed.js:1892
+#: js/viewfeed.js:1538
 #, fuzzy
 msgid "Please enter new score for selected articles:"
 msgstr "删除选中的 %d 篇文章？"
 
-#: js/viewfeed.js:1955
+#: js/viewfeed.js:1571
 #, fuzzy
 msgid "Please enter new score for this article:"
 msgstr "请填写类别名称："
 
-#: js/viewfeed.js:1986
+#: js/viewfeed.js:1591
 #, fuzzy
 msgid "Article URL:"
 msgstr "全部文章"
 
-#: plugins/note/note.js:17
-#, fuzzy
-msgid "Saving article note..."
-msgstr "编辑文章注记"
+#: plugins/embed_original/init.js:6
+msgid "Sorry, your browser does not support sandboxed iframes."
+msgstr "对不起，你的浏览器不支持沙箱iframe。"
 
 #: plugins/af_psql_trgm/init.js:11
 #, fuzzy
 msgid "Related articles"
 msgstr "删除文章"
 
+#: plugins/mailto/init.js:21
+#: plugins/mail/mail.js:21
+msgid "Forward article by email"
+msgstr "用邮件转发文章"
+
+#: plugins/shorten_expanded/init.js:43
+#, fuzzy
+msgid "Click to expand article"
+msgstr "点击以展开文章。"
+
 #: plugins/import_export/import_export.js:13
 msgid "Export Data"
 msgstr "导出数据"
@@ -3334,277 +3434,180 @@ msgstr "导入数据"
 msgid "Please choose the file first."
 msgstr "请先选择文件。"
 
-#: plugins/mail/mail.js:21
-#: plugins/mailto/init.js:21
-msgid "Forward article by email"
-msgstr "用邮件转发文章"
+#: plugins/share/share_prefs.js:2
+msgid "This will invalidate all previously shared article URLs. Continue?"
+msgstr "之前共享文章的 URL 将会回到未认证状态。是否继续？"
 
-#: plugins/mail/mail.js:36
-msgid "Error sending email:"
-msgstr "邮件发送错误："
-
-#: plugins/mail/mail.js:38
-#, fuzzy
-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:45
-#, fuzzy
-msgid "Click to expand article"
-msgstr "点击以展开文章。"
+#: plugins/share/share_prefs.js:8
+msgid "Shared URLs cleared."
+msgstr "分享的 URL 已被清除。"
 
 #: plugins/share/share.js:10
 msgid "Share article by URL"
 msgstr "通过 URL 分享文章"
 
-#: plugins/share/share.js:14
+#: plugins/share/share.js:13
 #, fuzzy
 msgid "Generate new share URL for this article?"
 msgstr "请填写类别名称："
 
-#: plugins/share/share.js:18
+#: plugins/share/share.js:15
 msgid "Trying to change URL..."
 msgstr "尝试更改 URL..."
 
-#: plugins/share/share.js:55
+#: plugins/share/share.js:48
 #, fuzzy
 msgid "Remove sharing for this article?"
 msgstr "不再分享此文章？"
 
-#: plugins/share/share.js:59
+#: plugins/share/share.js:50
 msgid "Trying to unshare..."
 msgstr "尝试取消分享..."
 
-#: plugins/share/share_prefs.js:3
-msgid "This will invalidate all previously shared article URLs. Continue?"
-msgstr "之前共享文章的 URL 将会回到未认证状态。是否继续？"
+#: plugins/mail/mail.js:30
+msgid "Error sending email:"
+msgstr "邮件发送错误："
 
-#: plugins/share/share_prefs.js:6
-#: js/prefs.js:1277
-msgid "Clearing URLs..."
-msgstr "清理 URLs..."
+#: plugins/mail/mail.js:32
+#, fuzzy
+msgid "Your message has been sent."
+msgstr "您的个人数据已保存。"
 
-#: plugins/share/share_prefs.js:13
-msgid "Shared URLs cleared."
-msgstr "分享的 URL 已被清除。"
+#: plugins/note/note.js:15
+#, fuzzy
+msgid "Saving article note..."
+msgstr "编辑文章注记"
 
-#: js/feedlist.js:204
+#: js/feedlist.js:168
 #, fuzzy
 msgid "Your password is at default value"
 msgstr "您还在使用系统默认的密码，请修改。"
 
-#: js/feedlist.js:453
+#: js/feedlist.js:413
 msgid "Mark all articles in %s as read?"
 msgstr "将 %s 中的全部文章标记为已读？"
 
-#: js/functions.js:494
-msgid "Upload complete."
-msgstr "上传完成。"
-
-#: js/functions.js:511
-msgid "Remove stored feed icon?"
-msgstr "移除已保存的信息源图标？"
-
-#: js/functions.js:516
-#, fuzzy
-msgid "Removing feed icon..."
-msgstr "移除已保存的信息源图标？"
-
-#: js/functions.js:521
-#, fuzzy
-msgid "Feed icon removed."
-msgstr "找不到信息源。"
-
-#: js/functions.js:537
-msgid "Please select an image file to upload."
-msgstr "请选择图片文件上传。"
-
-#: js/functions.js:539
-msgid "Upload new icon for this feed?"
-msgstr "为本信息源上传一个新的图标？"
-
-#: js/functions.js:540
-#, fuzzy
-msgid "Uploading, please wait..."
-msgstr "读取中，请稍候……"
-
-#: js/functions.js:550
-msgid "Please enter label caption:"
-msgstr "请填写预定义标签的说明："
-
-#: js/functions.js:555
-msgid "Can't create label: missing caption."
-msgstr "创建标签失败：没有标题。"
-
-#: js/functions.js:797
+#: js/functions.js:764
 #, fuzzy
 msgid "Edit rule"
 msgstr "编辑过滤器"
 
-#: js/functions.js:819
+#: js/functions.js:786
 #, fuzzy
 msgid "Edit action"
 msgstr "信息源动作"
 
-#: js/functions.js:860
+#: js/functions.js:825
 msgid "Looking for articles (%d processed, %f found)..."
 msgstr "搜索文章中 (%d 已处理, %f 已发现)..."
 
-#: js/functions.js:890
+#: js/functions.js:855
 #, fuzzy
 msgid "Found %d articles matching this filter:"
 msgstr "符合本过滤器条件的文章："
 
-#: js/functions.js:942
+#: js/functions.js:907
 msgid "Create Filter"
 msgstr "创建过滤器"
 
-#: js/functions.js:1060
-#: js/tt-rss.js:692
+#: js/functions.js:1016
+#: js/tt-rss.js:631
 msgid "Unsubscribe from %s?"
 msgstr "从 %s 取消订阅？"
 
-#: js/functions.js:1063
+#: js/functions.js:1019
 msgid "Removing feed..."
 msgstr "删除 feed..."
 
-#: js/functions.js:1489
+#: js/functions.js:1410
 msgid "Help"
 msgstr "帮助"
 
-#: js/prefs.js:973
-msgid "Remove category %s? Any nested feeds would be placed into Uncategorized."
-msgstr "删除类别 %s？该类别下的源将被归入未分类中。"
+#: js/prefs.js:44
+msgid "Please enter login:"
+msgstr "请输入登录名："
 
-#: js/prefs.js:979
+#: js/prefs.js:51
+msgid "Can't create user: no login specified."
+msgstr "无法创建用户：没有指定登录名。"
+
+#: js/prefs.js:55
 #, fuzzy
-msgid "Removing category..."
-msgstr "创建类别"
-
-#: js/prefs.js:997
-msgid "Remove selected categories?"
-msgstr "移除选中的类别？"
-
-#: js/prefs.js:1000
-#, fuzzy
-msgid "Removing selected categories..."
-msgstr "移除选定的类别"
-
-#: js/prefs.js:1013
-msgid "No categories are selected."
-msgstr "没有选中任何类别。"
-
-#: js/prefs.js:1020
-#, fuzzy
-msgid "Category title:"
-msgstr "类别"
-
-#: js/prefs.js:1024
-#, fuzzy
-msgid "Creating category..."
+msgid "Adding user..."
 msgstr "创建过滤器"
 
-#: js/prefs.js:1047
-msgid "Feeds without recent updates"
-msgstr "最近没更新的信息源"
+#: js/prefs.js:74
+msgid "User Editor"
+msgstr "编辑用户信息"
 
-#: js/prefs.js:1091
-msgid "Replace current OPML publishing address with a new one?"
-msgstr "将当前的 OPML 发布地址更改替换为新地址？"
+#: js/prefs.js:104
+msgid "Edit Filter"
+msgstr "编辑过滤器"
 
-#: js/prefs.js:1129
-msgid "Reset selected labels to default colors?"
-msgstr "将选中的可选标签重置为默认颜色？"
+#: js/prefs.js:1175
+msgid "Subscribing to feeds..."
+msgstr "订阅至信息源.."
 
-#: js/prefs.js:1161
-msgid "Settings Profiles"
-msgstr "偏好文件的设置"
+#: js/prefs.js:1191
+msgid "Clear stored data for this plugin?"
+msgstr "清除本插件已保存的数据？"
 
-#: js/prefs.js:1170
-msgid "Remove selected profiles? Active and default profiles will not be removed."
-msgstr "移除选中的偏好文件？当前偏好与默认偏好不会被移除。"
+#: js/prefs.js:1203
+msgid "Clear all messages in the error log?"
+msgstr "清除错误日志里的所有消息"
 
-#: js/prefs.js:1173
-#, fuzzy
-msgid "Removing selected profiles..."
-msgstr "移除选中的偏好文件"
-
-#: js/prefs.js:1189
-msgid "No profiles are selected."
-msgstr "未选择偏好文件。"
-
-#: js/prefs.js:1197
-#: js/prefs.js:1250
-msgid "Activate selected profile?"
-msgstr "启用选中的偏好文件？"
-
-#: js/prefs.js:1214
-#: js/prefs.js:1266
-msgid "Please choose a profile to activate."
-msgstr "请选择希望启用的偏好文件。"
-
-#: js/prefs.js:1219
-#, fuzzy
-msgid "Creating profile..."
-msgstr "创建偏好文件"
-
-#: js/prefs.js:1274
-msgid "This will invalidate all previously generated feed URLs. Continue?"
-msgstr "之前生成的信息源 URL 将会回到未认证状态。是否继续？"
-
-#: js/prefs.js:1284
-#, fuzzy
-msgid "Generated URLs cleared."
-msgstr "生成一个新的 URL"
-
-#: js/prefs.js:1356
-msgid "Label Editor"
-msgstr "编辑预定义标签"
-
-#: js/tt-rss.js:681
+#: js/tt-rss.js:620
 msgid "You can't unsubscribe from the category."
 msgstr "您不能取消订阅一个类别。"
 
-#: js/viewfeed.js:127
-#: js/viewfeed.js:177
-#: js/viewfeed.js:194
+#: js/tt-rss.js:625
+msgid "Please select some feed first."
+msgstr "请选择信息源。"
+
+#: js/viewfeed.js:89
+#: js/viewfeed.js:135
+#: js/viewfeed.js:152
 #, fuzzy
 msgid "Click to open next unread feed."
 msgstr "点击以编辑信息源"
 
-#: js/viewfeed.js:131
+#: js/viewfeed.js:93
 #, fuzzy
 msgid "Cancel search"
 msgstr "取消"
 
-#: js/viewfeed.js:191
+#: js/viewfeed.js:149
 #, fuzzy
 msgid "New articles found, reload feed to continue."
 msgstr "暂时没有文章。"
 
-#: js/viewfeed.js:620
+#: js/viewfeed.js:405
 #, fuzzy
 msgid "%d article selected"
 msgid_plural "%d articles selected"
 msgstr[0] "未选中任何文章。"
 
-#: js/viewfeed.js:1284
-msgid "No article is selected."
-msgstr "未选中任何文章。"
+#~ msgid "Rescore feed"
+#~ msgstr "为信息源重新评分"
 
-#: js/viewfeed.js:1319
-msgid "No articles found to mark"
-msgstr "未找到需要标记的文章"
+#~ msgid "Create label..."
+#~ msgstr "创建预定义标签"
+
+#~ msgid "Create filter..."
+#~ msgstr "创建过滤器"
+
+#~ msgid "You can't rescore this kind of feed."
+#~ msgstr "无法重置本类信息源的评分。"
+
+#~ msgid "Rescore articles in %s?"
+#~ msgstr "重置 %s 中文章的评分？"
 
-#: js/viewfeed.js:1321
 #, fuzzy
-msgid "Mark %d article as read?"
-msgid_plural "Mark %d articles as read?"
-msgstr[0] "将 %d 篇文章标记为已读？"
+#~ msgid "Rescoring articles..."
+#~ msgstr "为文章重新评分"
+
+#~ msgid "Can't create label: missing caption."
+#~ msgstr "创建标签失败：没有标题。"
 
 #~ msgid "Firefox integration"
 #~ msgstr "Firefox 集成"
diff --git a/locale/zh_TW/LC_MESSAGES/messages.mo b/locale/zh_TW/LC_MESSAGES/messages.mo
index 9e9dd084f..d64e4ab08 100644
Binary files a/locale/zh_TW/LC_MESSAGES/messages.mo and b/locale/zh_TW/LC_MESSAGES/messages.mo differ
diff --git a/locale/zh_TW/LC_MESSAGES/messages.po b/locale/zh_TW/LC_MESSAGES/messages.po
index def75f3e6..6474aa2b3 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: 2018-10-10 08:24+0300\n"
+"POT-Creation-Date: 2018-12-01 12:59+0300\n"
 "PO-Revision-Date: 2014-02-17 23:12+0800\n"
 "Last-Translator: Yuan Chiu <me@yuaner.tw>\n"
 "Language-Team: Yuan Chiu <me@yuaner.tw>\n"
@@ -95,8 +95,8 @@ msgid "Weekly"
 msgstr "每周"
 
 #: backend.php:103
-#: classes/pref/users.php:47
 #: classes/pref/system.php:51
+#: classes/pref/users.php:47
 msgid "User"
 msgstr "使用者"
 
@@ -170,33 +170,33 @@ msgstr "未找到使用者"
 
 #: index.php:151
 #: index.php:167
-#: index.php:285
+#: index.php:282
 #: prefs.php:120
 #: classes/backend.php:5
 #: classes/pref/labels.php:294
-#: classes/pref/feeds.php:1230
 #: classes/pref/filters.php:822
-#: js/feedlist.js:148
-#: js/feedlist.js:491
-#: js/feedlist.js:539
-#: js/functions.js:314
-#: js/functions.js:1336
-#: js/prefs.js:562
-#: js/prefs.js:754
-#: js/prefs.js:1488
-#: js/prefs.js:1503
-#: js/tt-rss.js:547
-#: js/viewfeed.js:1180
+#: classes/pref/feeds.php:1229
+#: js/feedlist.js:118
+#: js/feedlist.js:446
+#: js/feedlist.js:487
+#: js/functions.js:328
+#: js/functions.js:551
+#: js/functions.js:1286
+#: js/prefs.js:477
+#: js/prefs.js:617
+#: js/prefs.js:956
+#: js/prefs.js:1000
+#: js/prefs.js:1028
+#: js/prefs.js:1037
+#: js/prefs.js:1045
+#: js/prefs.js:1057
+#: js/tt-rss.js:497
+#: js/viewfeed.js:509
+#: js/viewfeed.js:928
 #: plugins/import_export/import_export.js:17
-#: js/functions.js:565
-#: js/prefs.js:1200
-#: js/prefs.js:1253
-#: js/prefs.js:1292
-#: js/prefs.js:1305
-#: js/prefs.js:1316
-#: js/prefs.js:1331
-#: js/tt-rss.js:564
-#: js/viewfeed.js:760
+#: js/prefs.js:1192
+#: js/prefs.js:1205
+#: js/tt-rss.js:510
 msgid "Loading, please wait..."
 msgstr "載入中，請稍候……"
 
@@ -213,13 +213,13 @@ msgid "All Articles"
 msgstr "全部文章"
 
 #: index.php:194
-#: include/functions.php:1227
+#: include/functions.php:1172
 #: classes/feeds.php:110
 msgid "Starred"
 msgstr "星標"
 
 #: index.php:195
-#: include/functions.php:1228
+#: include/functions.php:1173
 #: classes/feeds.php:111
 msgid "Published"
 msgstr "已發布"
@@ -259,11 +259,11 @@ msgid "Title"
 msgstr "標題"
 
 #: index.php:211
-#: index.php:251
-#: include/functions.php:1215
+#: index.php:250
+#: include/functions.php:1160
 #: classes/feeds.php:115
-#: js/FeedTree.js:41
-#: js/FeedTree.js:69
+#: js/FeedTree.js:42
+#: js/FeedTree.js:70
 msgid "Mark as read"
 msgstr "標記為已讀"
 
@@ -300,7 +300,7 @@ msgid "Feed actions:"
 msgstr "摘要操作："
 
 #: index.php:246
-#: classes/handler/public.php:551
+#: classes/handler/public.php:575
 msgid "Subscribe to feed..."
 msgstr "訂閱摘要"
 
@@ -309,56 +309,44 @@ msgid "Edit this feed..."
 msgstr "編輯摘要"
 
 #: index.php:248
-msgid "Rescore feed"
-msgstr "為摘要重新評分"
-
-#: index.php:249
-#: classes/pref/feeds.php:770
-#: classes/pref/feeds.php:1203
-#: js/PrefFeedTree.js:61
+#: classes/pref/feeds.php:769
+#: classes/pref/feeds.php:1202
+#: js/PrefFeedTree.js:62
 msgid "Unsubscribe"
 msgstr "取消訂閱"
 
-#: index.php:250
+#: index.php:249
 msgid "All feeds:"
 msgstr "全部摘要："
 
-#: index.php:252
+#: index.php:251
 msgid "(Un)hide read feeds"
 msgstr "隱藏（顯示）已讀信息"
 
-#: index.php:253
+#: index.php:252
 msgid "Other actions:"
 msgstr "其他操作："
 
-#: index.php:254
-#: include/functions.php:1201
+#: index.php:253
+#: include/functions.php:1146
 msgid "Toggle widescreen mode"
 msgstr "切換版面顯示"
 
-#: index.php:255
-msgid "Create label..."
-msgstr "建立標籤"
-
-#: index.php:256
-msgid "Create filter..."
-msgstr "建立過濾器"
-
-#: index.php:257
+#: index.php:254
 msgid "Keyboard shortcuts help"
 msgstr "快捷鍵說明"
 
-#: index.php:266
+#: index.php:263
 msgid "Logout"
 msgstr "登出"
 
-#: index.php:272
+#: index.php:269
 msgid "Updates are available from Git."
 msgstr ""
 
 #: prefs.php:33
 #: prefs.php:138
-#: include/functions.php:1230
+#: include/functions.php:1175
 #: classes/pref/prefs.php:425
 msgid "Preferences"
 msgstr "偏好設定"
@@ -373,8 +361,8 @@ msgstr "退出偏好設定"
 
 #: prefs.php:141
 #: classes/pref/feeds.php:114
-#: classes/pref/feeds.php:1138
-#: classes/pref/feeds.php:1192
+#: classes/pref/feeds.php:1137
+#: classes/pref/feeds.php:1191
 msgid "Feeds"
 msgstr "摘要"
 
@@ -384,8 +372,8 @@ msgid "Filters"
 msgstr "過濾器"
 
 #: prefs.php:147
+#: classes/feeds.php:1696
 #: classes/pref/labels.php:94
-#: classes/feeds.php:1710
 msgid "Labels"
 msgstr "預定義標籤"
 
@@ -397,80 +385,80 @@ msgstr "使用者"
 msgid "System"
 msgstr "系統"
 
-#: register.php:186
+#: register.php:185
 #: include/login_form.php:162
 msgid "Create new account"
 msgstr "建立新的帳號"
 
-#: register.php:192
+#: register.php:191
 msgid "New user registrations are administratively disabled."
 msgstr "新使用者註冊功能被管理員禁用。"
 
-#: register.php:196
-#: register.php:241
-#: register.php:254
-#: register.php:269
-#: register.php:288
-#: register.php:336
-#: register.php:346
-#: register.php:358
-#: classes/handler/public.php:623
-#: classes/handler/public.php:697
-#: classes/handler/public.php:798
-#: classes/handler/public.php:877
-#: classes/handler/public.php:891
-#: classes/handler/public.php:898
-#: classes/handler/public.php:923
+#: register.php:195
+#: register.php:240
+#: register.php:253
+#: register.php:268
+#: register.php:287
+#: register.php:334
+#: register.php:344
+#: register.php:356
+#: classes/handler/public.php:647
+#: classes/handler/public.php:721
+#: 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"
 
-#: register.php:217
+#: register.php:216
 msgid "Your temporary password will be sent to the specified email. Accounts, which were not logged in once, are erased automatically 24 hours after temporary password is sent."
 msgstr "您的臨時密碼將被發送至您的郵箱。24小時之內沒有登錄的帳號會被自動清理。"
 
-#: register.php:223
+#: register.php:222
 msgid "Desired login:"
 msgstr "希望使用的使用者名："
 
-#: register.php:226
+#: register.php:225
 msgid "Check availability"
 msgstr "檢查可用性"
 
-#: register.php:228
-#: classes/handler/public.php:713
+#: register.php:227
+#: classes/handler/public.php:737
 msgid "Email:"
 msgstr "電子郵箱："
 
-#: register.php:231
-#: classes/handler/public.php:718
+#: register.php:230
+#: classes/handler/public.php:742
 msgid "How much is two plus two:"
 msgstr "二加二等於几："
 
-#: register.php:234
+#: register.php:233
 msgid "Submit registration"
 msgstr "提交註冊信息"
 
-#: register.php:252
+#: register.php:251
 msgid "Your registration information is incomplete."
 msgstr "您的註冊信息不完整。"
 
-#: register.php:267
+#: register.php:266
 msgid "Sorry, this username is already taken."
 msgstr "抱歉，該使用者名已被占用。"
 
-#: register.php:286
+#: register.php:285
 msgid "Registration failed."
 msgstr "註冊失敗。"
 
-#: register.php:333
+#: register.php:331
 msgid "Account created successfully."
 msgstr "帳號建立成功。"
 
-#: register.php:355
+#: register.php:353
 msgid "New user registrations are currently closed."
 msgstr "使用者註冊功能目前沒有啟用。"
 
-#: update.php:66
+#: update.php:67
 msgid "Tiny Tiny RSS data update script."
 msgstr "Tiny Tiny RSS 資料庫是最新版。"
 
@@ -483,10 +471,10 @@ msgstr "全部摘要"
 
 #: include/controls.php:138
 #: include/controls.php:230
-#: classes/opml.php:512
-#: classes/digest.php:120
+#: classes/digest.php:124
+#: classes/feeds.php:1708
 #: classes/pref/feeds.php:233
-#: classes/feeds.php:1722
+#: classes/opml.php:512
 msgid "Uncategorized"
 msgstr "未分類"
 
@@ -500,298 +488,298 @@ msgstr[0] "%d 個存檔的文章"
 msgid "No feeds found."
 msgstr "未找到摘要。"
 
-#: include/functions.php:983
+#: include/functions.php:928
 #, php-format
 msgid "%d min"
 msgstr ""
 
-#: include/functions.php:1177
+#: include/functions.php:1122
 msgid "Navigation"
 msgstr "導航"
 
-#: include/functions.php:1178
+#: include/functions.php:1123
 msgid "Open next feed"
 msgstr "顯示下一個摘要"
 
-#: include/functions.php:1179
+#: include/functions.php:1124
 msgid "Open previous feed"
 msgstr ""
 
-#: include/functions.php:1180
+#: include/functions.php:1125
 msgid "Open next article"
 msgstr "開啟下一個文章"
 
-#: include/functions.php:1181
+#: include/functions.php:1126
 msgid "Open previous article"
 msgstr "開啟上一個文章"
 
-#: include/functions.php:1182
+#: include/functions.php:1127
 msgid "Open next article (don't scroll long articles)"
 msgstr ""
 
-#: include/functions.php:1183
+#: include/functions.php:1128
 msgid "Open previous article (don't scroll long articles)"
 msgstr ""
 
-#: include/functions.php:1184
+#: include/functions.php:1129
 msgid "Move to next article (don't expand or mark read)"
 msgstr ""
 
-#: include/functions.php:1185
+#: include/functions.php:1130
 msgid "Move to previous article (don't expand or mark read)"
 msgstr ""
 
-#: include/functions.php:1186
+#: include/functions.php:1131
 msgid "Show search dialog"
 msgstr "顯示搜尋對話框"
 
-#: include/functions.php:1187
+#: include/functions.php:1132
 msgid "Article"
 msgstr "文章"
 
-#: include/functions.php:1188
-#: js/viewfeed.js:1695
+#: include/functions.php:1133
+#: js/viewfeed.js:1341
 msgid "Toggle starred"
 msgstr "加星此文章"
 
-#: include/functions.php:1189
-#: js/viewfeed.js:1707
+#: include/functions.php:1134
+#: js/viewfeed.js:1353
 msgid "Toggle published"
 msgstr "發布此文章"
 
-#: include/functions.php:1190
-#: js/viewfeed.js:1682
+#: include/functions.php:1135
+#: js/viewfeed.js:1328
 msgid "Toggle unread"
 msgstr "標記為未讀"
 
-#: include/functions.php:1191
+#: include/functions.php:1136
 msgid "Edit tags"
 msgstr "編輯自訂標籤"
 
-#: include/functions.php:1192
+#: include/functions.php:1137
 msgid "Open in new window"
 msgstr "在新視窗打開文章"
 
-#: include/functions.php:1193
-#: js/viewfeed.js:1728
+#: include/functions.php:1138
+#: js/viewfeed.js:1374
 msgid "Mark below as read"
 msgstr "以下標記為已讀"
 
-#: include/functions.php:1194
-#: js/viewfeed.js:1721
+#: include/functions.php:1139
+#: js/viewfeed.js:1367
 msgid "Mark above as read"
 msgstr "以上標記為已讀"
 
-#: include/functions.php:1195
+#: include/functions.php:1140
 msgid "Scroll down"
 msgstr "向下捲動"
 
-#: include/functions.php:1196
+#: include/functions.php:1141
 msgid "Scroll up"
 msgstr "向上捲動"
 
-#: include/functions.php:1197
+#: include/functions.php:1142
 #, fuzzy
 msgid "Select article under cursor"
 msgstr "選擇滑鼠指向的文章"
 
-#: include/functions.php:1198
+#: include/functions.php:1143
 #, fuzzy
 msgid "Email article"
 msgstr "透過郵件發送文章"
 
-#: include/functions.php:1199
+#: include/functions.php:1144
 #, fuzzy
 msgid "Close/collapse article"
 msgstr "選擇所有文章"
 
-#: include/functions.php:1200
+#: include/functions.php:1145
 #, fuzzy
 msgid "Toggle article expansion (combined mode)"
 msgstr "鎖定發布的項"
 
-#: include/functions.php:1202
+#: include/functions.php:1147
 #: plugins/embed_original/init.php:33
 msgid "Toggle embed original"
 msgstr "切換為原網頁顯示"
 
-#: include/functions.php:1203
+#: include/functions.php:1148
 msgid "Article selection"
 msgstr "選擇文章"
 
-#: include/functions.php:1204
+#: include/functions.php:1149
 msgid "Select all articles"
 msgstr "選擇所有文章"
 
-#: include/functions.php:1205
+#: include/functions.php:1150
 msgid "Select unread"
 msgstr "選擇未讀文章"
 
-#: include/functions.php:1206
+#: include/functions.php:1151
 msgid "Select starred"
 msgstr "選擇星標的"
 
-#: include/functions.php:1207
+#: include/functions.php:1152
 msgid "Select published"
 msgstr "選擇已發佈文章"
 
-#: include/functions.php:1208
+#: include/functions.php:1153
 msgid "Invert selection"
 msgstr "反向選取"
 
-#: include/functions.php:1209
+#: include/functions.php:1154
 msgid "Deselect everything"
 msgstr "取消選擇所有文章"
 
-#: include/functions.php:1210
-#: classes/pref/feeds.php:522
-#: classes/pref/feeds.php:794
+#: include/functions.php:1155
+#: classes/pref/feeds.php:521
+#: classes/pref/feeds.php:793
 msgid "Feed"
 msgstr "摘要"
 
-#: include/functions.php:1211
+#: include/functions.php:1156
 msgid "Refresh current feed"
 msgstr "重新整理目前摘要"
 
-#: include/functions.php:1212
+#: include/functions.php:1157
 msgid "Un/hide read feeds"
 msgstr "隱藏（顯示）已讀信息"
 
-#: include/functions.php:1213
-#: classes/pref/feeds.php:1195
+#: include/functions.php:1158
+#: classes/pref/feeds.php:1194
 msgid "Subscribe to feed"
 msgstr "訂閱摘要"
 
-#: include/functions.php:1214
-#: js/FeedTree.js:48
-#: js/PrefFeedTree.js:55
-#: js/viewfeed.js:1846
+#: include/functions.php:1159
+#: js/FeedTree.js:49
+#: js/PrefFeedTree.js:56
+#: js/viewfeed.js:1492
 msgid "Edit feed"
 msgstr "編輯摘要"
 
-#: include/functions.php:1216
+#: include/functions.php:1161
 #, fuzzy
 msgid "Reverse headlines"
 msgstr "反向排序"
 
-#: include/functions.php:1217
+#: include/functions.php:1162
 msgid "Toggle headline grouping"
 msgstr ""
 
-#: include/functions.php:1218
+#: include/functions.php:1163
 #, fuzzy
 msgid "Debug feed update"
 msgstr "禁用更新"
 
-#: include/functions.php:1219
+#: include/functions.php:1164
 #, fuzzy
 msgid "Debug viewfeed()"
 msgstr "禁用更新"
 
-#: include/functions.php:1220
-#: js/FeedTree.js:97
+#: include/functions.php:1165
+#: js/FeedTree.js:98
 msgid "Mark all feeds as read"
 msgstr "標記所有摘要為已讀"
 
-#: include/functions.php:1221
+#: include/functions.php:1166
 #, fuzzy
 msgid "Un/collapse current category"
 msgstr "加入到類別："
 
-#: include/functions.php:1222
-#, fuzzy
-msgid "Toggle combined mode"
-msgstr "鎖定發布的項"
-
-#: include/functions.php:1223
+#: include/functions.php:1167
 #, fuzzy
 msgid "Toggle auto expand in combined mode"
 msgstr "鎖定發布的項"
 
-#: include/functions.php:1224
+#: include/functions.php:1168
+#, fuzzy
+msgid "Toggle combined mode"
+msgstr "鎖定發布的項"
+
+#: include/functions.php:1169
 msgid "Go to"
 msgstr "跳到……"
 
-#: include/functions.php:1225
-#: classes/feeds.php:1583
+#: include/functions.php:1170
+#: classes/feeds.php:1569
 msgid "All articles"
 msgstr "全部文章"
 
-#: include/functions.php:1226
+#: include/functions.php:1171
 msgid "Fresh"
 msgstr ""
 
-#: include/functions.php:1229
-#: js/tt-rss.js:491
-#: js/tt-rss.js:660
+#: include/functions.php:1174
+#: js/tt-rss.js:439
+#: js/tt-rss.js:599
 msgid "Tag cloud"
 msgstr "標籤雲"
 
-#: include/functions.php:1231
+#: include/functions.php:1176
 msgid "Other"
 msgstr "其他"
 
-#: include/functions.php:1232
+#: include/functions.php:1177
 #: classes/pref/labels.php:279
 msgid "Create label"
 msgstr "建立預定義標籤"
 
-#: include/functions.php:1233
+#: include/functions.php:1178
 #: classes/pref/filters.php:801
 msgid "Create filter"
 msgstr "建立過濾器"
 
-#: include/functions.php:1234
+#: include/functions.php:1179
 #, fuzzy
 msgid "Un/collapse sidebar"
 msgstr "折疊側邊欄"
 
-#: include/functions.php:1235
+#: include/functions.php:1180
 #, fuzzy
 msgid "Show help dialog"
 msgstr "顯示搜尋對話框"
 
-#: include/functions.php:2582
+#: include/functions.php:2529
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: include/functions.php:2583
+#: include/functions.php:2530
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: include/functions.php:2584
+#: include/functions.php:2531
 msgid "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form"
 msgstr ""
 
-#: include/functions.php:2585
+#: include/functions.php:2532
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: include/functions.php:2586
+#: include/functions.php:2533
 #, fuzzy
 msgid "No file was uploaded"
 msgstr "沒有上傳檔案"
 
-#: include/functions.php:2587
+#: include/functions.php:2534
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: include/functions.php:2588
+#: include/functions.php:2535
 msgid "Failed to write file to disk."
 msgstr ""
 
-#: include/functions.php:2589
+#: include/functions.php:2536
 msgid "A PHP extension stopped the file upload."
 msgstr ""
 
 #: include/login_form.php:107
-#: classes/handler/public.php:446
-#: classes/handler/public.php:708
+#: classes/handler/public.php:466
+#: classes/handler/public.php:732
 msgid "Login:"
 msgstr "登入："
 
 #: include/login_form.php:117
-#: classes/handler/public.php:449
+#: classes/handler/public.php:469
 msgid "Password:"
 msgstr "密碼："
 
@@ -804,9 +792,9 @@ msgid "Profile:"
 msgstr "偏好："
 
 #: include/login_form.php:133
-#: classes/handler/public.php:252
 #: classes/pref/prefs.php:1037
 #: classes/rpc.php:69
+#: classes/handler/public.php:272
 msgid "Default profile"
 msgstr "預設偏好設定"
 
@@ -823,210 +811,29 @@ msgid "Remember me"
 msgstr "記住我"
 
 #: include/login_form.php:159
-#: classes/handler/public.php:454
+#: classes/handler/public.php:474
 msgid "Log in"
 msgstr "登入"
 
-#: include/sessions.php:46
+#: include/sessions.php:45
 #, fuzzy
 msgid "Session failed to validate (schema version changed)"
 msgstr "無法驗證會話（IP 錯誤）"
 
-#: include/sessions.php:62
+#: include/sessions.php:53
+#, fuzzy
+msgid "Session failed to validate (UA changed)."
+msgstr "無法驗證會話（IP 錯誤）"
+
+#: include/sessions.php:67
 msgid "Session failed to validate (password changed)"
 msgstr "無法驗證會話（IP 錯誤）"
 
-#: include/sessions.php:69
+#: include/sessions.php:74
 #, fuzzy
 msgid "Session failed to validate (user not found)"
 msgstr "無法驗證會話（IP 錯誤）"
 
-#: classes/article.php:26
-msgid "Article not found."
-msgstr "找不到文章。"
-
-#: classes/article.php:211
-msgid "Tags for this article (separated by commas):"
-msgstr "本文的標籤，請用逗號分開："
-
-#: classes/article.php:236
-#: classes/pref/labels.php:82
-#: classes/pref/users.php:103
-#: classes/pref/feeds.php:774
-#: classes/pref/feeds.php:914
-#: classes/pref/filters.php:525
-#: classes/pref/prefs.php:982
-#: plugins/nsfw/init.php:85
-#: plugins/note/init.php:58
-#: plugins/af_readability/init.php:80
-#: plugins/af_redditimgur/init.php:66
-#: plugins/af_psql_trgm/init.php:188
-#: plugins/mail/init.php:65
-#: plugins/af_zz_imgproxy/init.php:238
-msgid "Save"
-msgstr "儲存"
-
-#: classes/article.php:238
-#: classes/handler/public.php:423
-#: classes/handler/public.php:457
-#: classes/pref/labels.php:84
-#: classes/pref/users.php:105
-#: classes/pref/feeds.php:775
-#: classes/pref/feeds.php:917
-#: classes/pref/feeds.php:1672
-#: classes/pref/filters.php:528
-#: classes/pref/filters.php:945
-#: classes/pref/filters.php:1022
-#: classes/pref/filters.php:1115
-#: classes/pref/prefs.php:984
-#: classes/feeds.php:1037
-#: classes/feeds.php:1089
-#: classes/feeds.php:1128
-#: plugins/note/init.php:60
-#: plugins/mail/init.php:179
-msgid "Cancel"
-msgstr "取消"
-
-#: classes/article.php:337
-#: classes/article.php:720
-#: classes/article.php:875
-msgid "no tags"
-msgstr "無標籤"
-
-#: classes/article.php:448
-msgid "unknown type"
-msgstr "未知類型"
-
-#: classes/article.php:525
-msgid "Attachments"
-msgstr "附件："
-
-#: classes/article.php:626
-#: classes/feeds.php:661
-msgid "comment"
-msgid_plural "comments"
-msgstr[0] "回應"
-
-#: classes/article.php:630
-#: classes/feeds.php:665
-msgid "comments"
-msgstr "回應"
-
-#: classes/article.php:689
-msgid " - "
-msgstr " - "
-
-#: classes/article.php:730
-#: classes/feeds.php:647
-msgid "Edit tags for this article"
-msgstr "為本文編輯自訂標籤"
-
-#: classes/article.php:763
-#: classes/feeds.php:602
-msgid "Originally from:"
-msgstr "來源："
-
-#: classes/article.php:774
-#: classes/pref/feeds.php:539
-#: classes/feeds.php:613
-msgid "Feed URL"
-msgstr "摘要 URL"
-
-#: classes/article.php:811
-#: classes/backend.php:103
-#: classes/dlg.php:33
-#: classes/dlg.php:56
-#: classes/dlg.php:89
-#: classes/dlg.php:154
-#: classes/dlg.php:181
-#: classes/dlg.php:197
-#: classes/pref/feeds.php:1466
-#: classes/pref/feeds.php:1533
-#: classes/pref/filters.php:208
-#: classes/pref/prefs.php:1099
-#: plugins/af_psql_trgm/init.php:109
-#: plugins/import_export/init.php:446
-#: plugins/import_export/init.php:490
-#: plugins/share/init.php:128
-msgid "Close this window"
-msgstr "關閉本視窗"
-
-#: classes/article.php:913
-msgid "(edit note)"
-msgstr "（編輯註記）"
-
-#: classes/opml.php:31
-#: classes/opml.php:36
-msgid "OPML Utility"
-msgstr "OPML 工具"
-
-#: classes/opml.php:40
-msgid "Importing OPML..."
-msgstr "正在匯入 OPML ……"
-
-#: classes/opml.php:45
-msgid "Return to preferences"
-msgstr "返回偏好設定"
-
-#: classes/opml.php:301
-#, php-format
-msgid "Adding feed: %s"
-msgstr "新增摘要: %s"
-
-#: classes/opml.php:312
-#, fuzzy, php-format
-msgid "Duplicate feed: %s"
-msgstr "更新摘要"
-
-#: classes/opml.php:326
-#, php-format
-msgid "Adding label %s"
-msgstr "新增標籤: %s"
-
-#: classes/opml.php:329
-#, php-format
-msgid "Duplicate label: %s"
-msgstr "重複的標籤: %s"
-
-#: classes/opml.php:341
-#, php-format
-msgid "Setting preference key %s to %s"
-msgstr "將偏好按鍵從 %s 設定為 %s"
-
-#: classes/opml.php:377
-msgid "Adding filter..."
-msgstr "建立過濾器"
-
-#: classes/opml.php:512
-#, fuzzy, php-format
-msgid "Processing category: %s"
-msgstr "加入到類別："
-
-#: classes/opml.php:558
-#, php-format
-msgid "Upload failed with error code %d"
-msgstr "上傳失敗，失敗碼 %d"
-
-#: classes/opml.php:570
-#: plugins/import_export/init.php:471
-#, fuzzy
-msgid "Unable to move uploaded file."
-msgstr "錯誤：無法載入文章。"
-
-#: classes/opml.php:574
-#: plugins/import_export/init.php:475
-msgid "Error: please upload OPML file."
-msgstr "錯誤：請上傳 OPML 文件。"
-
-#: classes/opml.php:585
-#, fuzzy
-msgid "Error: unable to find moved OPML file."
-msgstr "錯誤：無法載入文章。"
-
-#: classes/opml.php:594
-msgid "Error while parsing document."
-msgstr "解析文檔時發生錯誤。"
-
 #: classes/backend.php:31
 msgid "Other interface tips are available in the Tiny Tiny RSS wiki."
 msgstr "在 Tiny Tiny RSS 的維基上可以找到其他界面技巧。"
@@ -1047,165 +854,358 @@ msgstr ""
 msgid "Help topic not found."
 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."
+#: classes/backend.php:103
+#: classes/pref/filters.php:208
+#: classes/pref/feeds.php:1465
+#: classes/pref/feeds.php:1532
+#: classes/pref/prefs.php:1099
+#: classes/dlg.php:33
+#: classes/dlg.php:56
+#: classes/dlg.php:89
+#: classes/dlg.php:154
+#: classes/dlg.php:181
+#: classes/dlg.php:197
+#: classes/article.php:810
+#: plugins/af_psql_trgm/init.php:109
+#: plugins/import_export/init.php:446
+#: plugins/import_export/init.php:490
+#: plugins/share/init.php:128
+msgid "Close this window"
+msgstr "關閉本視窗"
+
+#: classes/feeds.php:53
+msgid "View as RSS feed"
+msgstr "以RSS摘要方式閱讀"
+
+#: classes/feeds.php:54
+#: classes/feeds.php:140
+#: classes/pref/feeds.php:1326
+msgid "View as RSS"
+msgstr "以 RSS 形式閱讀"
+
+#: classes/feeds.php:62
+#, php-format
+msgid "Last updated: %s"
+msgstr "上次更新： %s"
+
+#: classes/feeds.php:100
+#, fuzzy
+msgid "Select..."
+msgstr "選擇"
+
+#: classes/feeds.php:102
+#: classes/pref/labels.php:273
+#: classes/pref/filters.php:391
+#: classes/pref/filters.php:449
+#: classes/pref/filters.php:795
+#: classes/pref/filters.php:878
+#: classes/pref/filters.php:905
+#: classes/pref/feeds.php:1185
+#: classes/pref/feeds.php:1416
+#: classes/pref/feeds.php:1481
+#: classes/pref/users.php:358
+#: classes/pref/prefs.php:996
+msgid "All"
+msgstr "全部"
+
+#: classes/feeds.php:104
+msgid "Invert"
+msgstr "反向選取"
+
+#: classes/feeds.php:105
+#: classes/pref/labels.php:275
+#: classes/pref/filters.php:393
+#: classes/pref/filters.php:451
+#: classes/pref/filters.php:797
+#: classes/pref/filters.php:880
+#: classes/pref/filters.php:907
+#: classes/pref/feeds.php:1187
+#: classes/pref/feeds.php:1418
+#: classes/pref/feeds.php:1483
+#: classes/pref/users.php:360
+#: classes/pref/prefs.php:998
+msgid "None"
+msgstr "無"
+
+#: classes/feeds.php:107
+msgid "Selection toggle:"
+msgstr "標記為："
+
+#: classes/feeds.php:113
+msgid "Selection:"
+msgstr "所有選取的："
+
+#: classes/feeds.php:116
+msgid "Set score"
+msgstr "評分"
+
+#: classes/feeds.php:119
+msgid "Archive"
+msgstr "存檔"
+
+#: classes/feeds.php:121
+msgid "Move back"
+msgstr "移回原位"
+
+#: classes/feeds.php:122
+#: classes/pref/filters.php:400
+#: classes/pref/filters.php:458
+#: classes/pref/filters.php:887
+#: classes/pref/filters.php:914
+msgid "Delete"
+msgstr "刪除"
+
+#: classes/feeds.php:127
+#: classes/feeds.php:132
+#: plugins/mailto/init.php:25
+#: plugins/mail/init.php:76
+#, fuzzy
+msgid "Forward by email"
+msgstr "透過郵件轉發"
+
+#: classes/feeds.php:136
+msgid "Feed:"
+msgstr "摘要："
+
+#: classes/feeds.php:193
+#: classes/feeds.php:802
+msgid "Feed not found."
+msgstr "找不到摘要。"
+
+#: classes/feeds.php:255
+msgid "Never"
+msgstr "從未"
+
+#: classes/feeds.php:341
+#, fuzzy, php-format
+msgid "Imported at %s"
+msgstr "匯入"
+
+#: classes/feeds.php:391
+#: classes/feeds.php:484
+msgid "mark feed as read"
+msgstr "標記摘要為已讀"
+
+#: classes/feeds.php:540
+#, fuzzy
+msgid "Collapse article"
+msgstr "全部文章"
+
+#: classes/feeds.php:592
+#: classes/article.php:762
+msgid "Originally from:"
+msgstr "來源："
+
+#: classes/feeds.php:603
+#: classes/pref/feeds.php:538
+#: classes/article.php:773
+msgid "Feed URL"
+msgstr "摘要 URL"
+
+#: classes/feeds.php:630
+#: classes/article.php:729
+msgid "Edit tags for this article"
+msgstr "為本文編輯自訂標籤"
+
+#: classes/feeds.php:644
+#: classes/article.php:625
+msgid "comment"
+msgid_plural "comments"
+msgstr[0] "回應"
+
+#: classes/feeds.php:648
+#: classes/article.php:629
+msgid "comments"
+msgstr "回應"
+
+#: classes/feeds.php:686
+msgid "No unread articles found to display."
+msgstr "沒有未讀文章。"
+
+#: classes/feeds.php:689
+msgid "No updated articles found to display."
+msgstr "沒有最新更新的文章。"
+
+#: classes/feeds.php:692
+msgid "No starred articles found to display."
+msgstr "沒有加星標的文章。"
+
+#: classes/feeds.php:696
+#, 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:698
+msgid "No articles found to display."
+msgstr "暫時沒有文章。"
+
+#: classes/feeds.php:714
+#: classes/feeds.php:905
+#, php-format
+msgid "Feeds last updated at %s"
+msgstr "上次摘要更新時間：%s"
+
+#: classes/feeds.php:726
+#: classes/feeds.php:917
+msgid "Some feeds have update errors (click for details)"
+msgstr "部分摘要更新錯誤（點擊了解詳情）"
+
+#: classes/feeds.php:894
+msgid "No feed selected."
+msgstr "沒有選取的摘要。"
+
+#: classes/feeds.php:958
+#: classes/feeds.php:966
+#, fuzzy
+msgid "Feed or site URL"
+msgstr "摘要 URL"
+
+#: classes/feeds.php:972
+#: classes/pref/feeds.php:559
+#: classes/pref/feeds.php:800
+#: classes/pref/feeds.php:1632
+msgid "Place in category:"
+msgstr "加入到類別："
+
+#: classes/feeds.php:980
+msgid "Available feeds"
+msgstr "可用的摘要"
+
+#: classes/feeds.php:992
+#: classes/pref/feeds.php:621
+#: classes/pref/feeds.php:848
+#: classes/pref/users.php:61
+msgid "Authentication"
+msgstr "登入驗證"
+
+#: classes/feeds.php:996
+#: classes/pref/feeds.php:625
+#: classes/pref/feeds.php:852
+#: classes/pref/feeds.php:1646
+#: classes/pref/users.php:403
+msgid "Login"
+msgstr "登入"
+
+#: classes/feeds.php:1000
+#: classes/pref/feeds.php:631
+#: classes/pref/feeds.php:860
+#: classes/pref/feeds.php:1649
+#: classes/pref/prefs.php:243
+msgid "Password"
+msgstr "密碼"
+
+#: classes/feeds.php:1011
+#: classes/pref/feeds.php:645
+msgid "This feed requires authentication."
+msgstr "這個摘要需要認證"
+
+#: classes/feeds.php:1014
+#: classes/feeds.php:1070
+#: classes/pref/feeds.php:1668
+msgid "Subscribe"
+msgstr "訂閱"
+
+#: classes/feeds.php:1017
+msgid "More feeds"
+msgstr "更多摘要"
+
+#: classes/feeds.php:1020
+#: classes/feeds.php:1072
+#: classes/feeds.php:1111
+#: classes/pref/labels.php:84
+#: classes/pref/filters.php:528
+#: classes/pref/filters.php:945
+#: classes/pref/filters.php:1022
+#: classes/pref/filters.php:1115
+#: classes/pref/feeds.php:774
+#: classes/pref/feeds.php:916
+#: classes/pref/feeds.php:1669
+#: classes/pref/users.php:105
+#: classes/pref/prefs.php:984
+#: classes/article.php:238
+#: classes/handler/public.php:443
+#: classes/handler/public.php:477
+#: plugins/mail/init.php:179
+#: plugins/note/init.php:60
+msgid "Cancel"
+msgstr "取消"
+
+#: classes/feeds.php:1042
+#: classes/feeds.php:1110
+#: classes/pref/filters.php:788
+#: classes/pref/feeds.php:1178
+#: classes/pref/users.php:345
+#: js/tt-rss.js:152
+msgid "Search"
+msgstr "搜尋"
+
+#: classes/feeds.php:1046
+msgid "Popular feeds"
+msgstr "最受歡迎的摘要"
+
+#: classes/feeds.php:1047
+msgid "Feed archive"
+msgstr "摘要存檔"
+
+#: classes/feeds.php:1050
+msgid "limit:"
+msgstr "限制："
+
+#: classes/feeds.php:1071
+#: classes/pref/labels.php:282
+#: classes/pref/filters.php:518
+#: classes/pref/filters.php:814
+#: classes/pref/feeds.php:751
+#: classes/pref/users.php:369
+msgid "Remove"
+msgstr "移除"
+
+#: classes/feeds.php:1084
+msgid "Look for"
+msgstr "查找"
+
+#: classes/feeds.php:1092
+#, php-format
+msgid "in %s"
 msgstr ""
 
-#: classes/dlg.php:44
-msgid "Your Public OPML URL is:"
-msgstr "你的公共 OPML URL 是："
-
-#: classes/dlg.php:53
-#: classes/dlg.php:178
-#: plugins/share/init.php:125
-msgid "Generate new URL"
-msgstr "產生一個新的 URL"
-
-#: classes/dlg.php:67
-msgid "Update daemon is enabled in configuration, but daemon process is not running, which prevents all feeds from updating. Please start the daemon process or contact instance owner."
-msgstr "更新進程已在配置中啟用，但守護進程沒有運行，無法抓取信息。請啟動守護進程，或聯系管理員。"
-
-#: classes/dlg.php:71
-#: classes/dlg.php:80
-msgid "Last update:"
-msgstr "上次更新："
-
-#: classes/dlg.php:76
-msgid "Update daemon is taking too long to perform a feed update. This could indicate a problem like crash or a hang. Please check the daemon process or contact instance owner."
-msgstr "更新進程在抓取信息更新時花費了太長時間，可能已經崩潰。請檢查守護進程或聯系管理員。"
-
-#: classes/dlg.php:169
-msgid "You can view this feed as RSS using the following URL:"
-msgstr "您可以透過如下 URL 以 RSS 方式查看本摘要："
-
-#: classes/dlg.php:190
-msgid "You are using default tt-rss password. Please change it in the Preferences (Personal data / Authentication)."
+#: classes/feeds.php:1097
+msgid "Used for word stemming"
 msgstr ""
 
-#: classes/dlg.php:194
+#: classes/feeds.php:1106
 #, fuzzy
-msgid "Open Preferences"
-msgstr "偏好設定"
+msgid "Search syntax"
+msgstr "搜尋"
 
-#: classes/handler/public.php:387
-#: plugins/bookmarklets/init.php:40
-msgid "Share with Tiny Tiny RSS"
-msgstr "分享 Tiny Tiny RSS 中訂閱"
+#: classes/feeds.php:1563
+msgid "Starred articles"
+msgstr "加星標文章"
 
-#: classes/handler/public.php:395
-msgid "Title:"
-msgstr "標題： "
+#: classes/feeds.php:1565
+msgid "Published articles"
+msgstr "已發布文章"
 
-#: classes/handler/public.php:397
-#: classes/pref/feeds.php:537
-msgid "URL:"
-msgstr "URL："
+#: classes/feeds.php:1567
+msgid "Fresh articles"
+msgstr "最新更新的文章"
 
-#: classes/handler/public.php:399
-msgid "Content:"
-msgstr "內容： "
+#: classes/feeds.php:1571
+msgid "Archived articles"
+msgstr "已儲存的文章"
 
-#: classes/handler/public.php:401
-msgid "Labels:"
-msgstr "標籤"
+#: classes/feeds.php:1573
+msgid "Recently read"
+msgstr "閱讀紀錄"
 
-#: classes/handler/public.php:420
-msgid "Shared article will appear in the Published feed."
-msgstr ""
+#: classes/feeds.php:1694
+msgid "Special"
+msgstr "特殊區域"
 
-#: classes/handler/public.php:422
-msgid "Share"
-msgstr "分享"
-
-#: classes/handler/public.php:444
-msgid "Not logged in"
-msgstr "沒有登入"
-
-#: classes/handler/public.php:504
-msgid "Incorrect username or password"
-msgstr "使用者名或密碼錯誤"
-
-#: classes/handler/public.php:557
+#: classes/feeds.php:1951
 #, php-format
-msgid "Already subscribed to <b>%s</b>."
-msgstr "已經訂閱到 <b>%s</b>."
-
-#: classes/handler/public.php:560
-#, php-format
-msgid "Subscribed to <b>%s</b>."
-msgstr "訂閱到 <b>%s</b>."
-
-#: classes/handler/public.php:563
-#, php-format
-msgid "Could not subscribe to <b>%s</b>."
-msgstr "無法訂閱 <b>%s</b>。"
-
-#: classes/handler/public.php:566
-#, php-format
-msgid "No feeds found in <b>%s</b>."
-msgstr "在 <b>%s</b> 中沒有找到摘要。"
-
-#: classes/handler/public.php:569
-#, fuzzy
-msgid "Multiple feed URLs found."
-msgstr "未找到摘要。"
-
-#: classes/handler/public.php:573
-#, 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:591
-msgid "Subscribe to selected feed"
-msgstr "訂閱選取的摘要"
-
-#: classes/handler/public.php:618
-msgid "Edit subscription options"
-msgstr "編輯訂閱選項"
-
-#: classes/handler/public.php:656
-msgid "Password recovery"
-msgstr "密碼救援"
-
-#: classes/handler/public.php:701
-#, 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:723
-#: classes/pref/users.php:372
-msgid "Reset password"
-msgstr "重設密碼"
-
-#: classes/handler/public.php:733
-msgid "Some of the required form parameters are missing or incorrect."
-msgstr ""
-
-#: classes/handler/public.php:737
-#: classes/handler/public.php:806
-msgid "Go back"
-msgstr "回去"
-
-#: classes/handler/public.php:775
-#, fuzzy
-msgid "[tt-rss] Password reset request"
-msgstr "[tt-rss] 密碼更換提醒"
-
-#: classes/handler/public.php:802
-msgid "Sorry, login and email combination not found."
-msgstr "對不起，沒有找到符合的帳號密碼。"
-
-#: classes/handler/public.php:824
-msgid "Your access level is insufficient to run this script."
-msgstr "此帳號等級不足，無法運行腳本。"
-
-#: classes/handler/public.php:850
-msgid "Database Updater"
-msgstr "資料庫更新管理器"
-
-#: classes/handler/public.php:915
-msgid "Perform updates"
-msgstr "執行更新"
+msgid "Search results: %s"
+msgstr "搜尋結果： %s"
 
 #: classes/pref/labels.php:25
 #: classes/pref/filters.php:377
@@ -1225,201 +1225,198 @@ msgstr "前端："
 msgid "Background:"
 msgstr "背景："
 
+#: classes/pref/labels.php:82
+#: classes/pref/filters.php:525
+#: classes/pref/feeds.php:773
+#: classes/pref/feeds.php:913
+#: classes/pref/users.php:103
+#: classes/pref/prefs.php:982
+#: classes/article.php:236
+#: plugins/af_zz_imgproxy/init.php:238
+#: plugins/af_redditimgur/init.php:66
+#: plugins/af_psql_trgm/init.php:188
+#: plugins/af_readability/init.php:80
+#: plugins/nsfw/init.php:85
+#: plugins/mail/init.php:65
+#: plugins/note/init.php:58
+msgid "Save"
+msgstr "儲存"
+
 #: classes/pref/labels.php:244
 #, php-format
 msgid "Created label <b>%s</b>"
 msgstr "建立預定義標籤 <b>%s</b>"
 
 #: classes/pref/labels.php:270
-#: classes/pref/users.php:356
-#: classes/pref/feeds.php:1183
-#: classes/pref/feeds.php:1414
-#: classes/pref/feeds.php:1479
 #: classes/pref/filters.php:388
 #: classes/pref/filters.php:446
 #: classes/pref/filters.php:792
 #: classes/pref/filters.php:875
 #: classes/pref/filters.php:902
+#: classes/pref/feeds.php:1182
+#: classes/pref/feeds.php:1413
+#: classes/pref/feeds.php:1478
+#: classes/pref/users.php:355
 #: classes/pref/prefs.php:993
 msgid "Select"
 msgstr "選擇"
 
-#: classes/pref/labels.php:273
-#: classes/pref/users.php:359
-#: classes/pref/feeds.php:1186
-#: classes/pref/feeds.php:1417
-#: classes/pref/feeds.php:1482
-#: classes/pref/filters.php:391
-#: classes/pref/filters.php:449
-#: classes/pref/filters.php:795
-#: classes/pref/filters.php:878
-#: classes/pref/filters.php:905
-#: classes/pref/prefs.php:996
-#: classes/feeds.php:102
-msgid "All"
-msgstr "全部"
-
-#: classes/pref/labels.php:275
-#: classes/pref/users.php:361
-#: classes/pref/feeds.php:1188
-#: classes/pref/feeds.php:1419
-#: classes/pref/feeds.php:1484
-#: classes/pref/filters.php:393
-#: classes/pref/filters.php:451
-#: classes/pref/filters.php:797
-#: classes/pref/filters.php:880
-#: classes/pref/filters.php:907
-#: classes/pref/prefs.php:998
-#: classes/feeds.php:105
-msgid "None"
-msgstr "無"
-
-#: classes/pref/labels.php:282
-#: classes/pref/users.php:370
-#: classes/pref/feeds.php:752
-#: classes/pref/filters.php:518
-#: classes/pref/filters.php:814
-#: classes/feeds.php:1088
-msgid "Remove"
-msgstr "移除"
-
 #: classes/pref/labels.php:285
 msgid "Clear colors"
 msgstr "清空顏色"
 
-#: classes/pref/users.php:6
-#: classes/pref/system.php:8
-msgid "Your access level is insufficient to open this tab."
-msgstr "您的帳號等級不夠，無法打開這個頁籤。"
-
-#: classes/pref/users.php:26
+#: classes/pref/filters.php:155
 #, fuzzy
-msgid "Edit user"
-msgstr "編輯過濾器"
+msgid "Preview article"
+msgstr "最新更新的文章"
 
-#: classes/pref/users.php:61
-#: classes/pref/feeds.php:622
-#: classes/pref/feeds.php:849
-#: classes/feeds.php:1009
-msgid "Authentication"
-msgstr "登入驗證"
+#: classes/pref/filters.php:267
+#: classes/pref/filters.php:573
+msgid "(inverse)"
+msgstr "反向選取"
 
-#: classes/pref/users.php:64
-msgid "Access level: "
-msgstr "帳號等級："
+#: classes/pref/filters.php:263
+#: classes/pref/filters.php:572
+#, php-format
+msgid "%s on %s in %s %s"
+msgstr ""
 
-#: classes/pref/users.php:82
-#: classes/pref/feeds.php:648
-#: classes/pref/feeds.php:867
-msgid "Options"
-msgstr "選項"
+#: classes/pref/filters.php:383
+#: classes/pref/filters.php:870
+#: classes/pref/filters.php:977
+msgid "Match"
+msgstr "匹配"
 
-#: classes/pref/users.php:96
-#: js/prefs.js:479
-msgid "User details"
-msgstr "使用者詳細資料"
+#: classes/pref/filters.php:397
+#: classes/pref/filters.php:455
+#: classes/pref/filters.php:884
+#: classes/pref/filters.php:911
+msgid "Add"
+msgstr "新增"
 
-#: classes/pref/users.php:136
-#: classes/pref/users.php:407
-msgid "Registered"
-msgstr "註冊時間"
-
-#: classes/pref/users.php:137
-msgid "Last logged in"
-msgstr "上次登入"
-
-#: classes/pref/users.php:145
-msgid "Subscribed feeds count"
-msgstr "訂閱的摘要數量"
-
-#: classes/pref/users.php:146
+#: classes/pref/filters.php:441
+#: classes/pref/filters.php:897
 #, fuzzy
-msgid "Stored articles"
-msgstr "加星標文章"
+msgid "Apply actions"
+msgstr "摘要動作"
 
-#: classes/pref/users.php:150
-#: classes/pref/users.php:406
-msgid "Subscribed feeds"
-msgstr "訂閱的摘要"
+#: classes/pref/filters.php:492
+#: classes/pref/filters.php:926
+msgid "Enabled"
+msgstr "已啟用"
 
-#: classes/pref/users.php:176
-msgid "User not found"
-msgstr "未找到使用者"
+#: classes/pref/filters.php:501
+#: classes/pref/filters.php:929
+msgid "Match any rule"
+msgstr ""
 
-#: classes/pref/users.php:246
-#, php-format
-msgid "Added user <b>%s</b> with password <b>%s</b>"
-msgstr "已添加使用者 <b>%s</b> ，密碼為<b>%s</b>"
+#: classes/pref/filters.php:510
+#: classes/pref/filters.php:932
+#, fuzzy
+msgid "Inverse matching"
+msgstr "反向匹配"
 
-#: classes/pref/users.php:253
-#, php-format
-msgid "Could not create user <b>%s</b>"
-msgstr "無法建立使用者 <b>%s</b> "
+#: classes/pref/filters.php:522
+#: classes/pref/filters.php:939
+msgid "Test"
+msgstr "測試"
 
-#: classes/pref/users.php:257
-#, php-format
-msgid "User <b>%s</b> already exists."
-msgstr "使用者 <b>%s</b> 已存在。"
+#: classes/pref/filters.php:804
+msgid "Combine"
+msgstr ""
 
-#: classes/pref/users.php:285
-#, 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:287
-#, 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:311
-msgid "[tt-rss] Password change notification"
-msgstr "[tt-rss] 密碼更換提醒"
-
-#: classes/pref/users.php:346
-#: classes/pref/feeds.php:1179
-#: classes/pref/filters.php:788
-#: classes/feeds.php:1059
-#: classes/feeds.php:1127
-#: js/tt-rss.js:165
-msgid "Search"
-msgstr "搜尋"
-
-#: classes/pref/users.php:364
-msgid "Create user"
-msgstr "建立使用者"
-
-#: classes/pref/users.php:368
 #: classes/pref/filters.php:807
+#: classes/pref/users.php:367
 msgid "Edit"
 msgstr "編輯"
 
-#: classes/pref/users.php:404
-#: classes/pref/feeds.php:626
-#: classes/pref/feeds.php:853
-#: classes/pref/feeds.php:1649
-#: classes/feeds.php:1013
-msgid "Login"
-msgstr "登入"
+#: classes/pref/filters.php:810
+#: classes/pref/feeds.php:1198
+#: classes/pref/feeds.php:1212
+msgid "Reset sort order"
+msgstr "重新排序"
 
-#: classes/pref/users.php:405
-msgid "Access Level"
-msgstr "帳號等級"
+#: classes/pref/filters.php:942
+msgid "Create"
+msgstr "建立"
 
-#: classes/pref/users.php:408
-msgid "Last login"
-msgstr "最後登入"
+#: classes/pref/filters.php:987
+msgid "Regular expression, without outer delimiters (i.e. slashes)"
+msgstr ""
 
-#: classes/pref/users.php:427
-msgid "Click to edit"
-msgstr "點擊進行編輯"
+#: classes/pref/filters.php:993
+msgid "Inverse regular expression matching"
+msgstr ""
 
-#: classes/pref/users.php:447
-msgid "No users defined."
-msgstr "沒有定義使用者。"
+#: classes/pref/filters.php:995
+msgid "on field"
+msgstr "on field"
 
-#: classes/pref/users.php:449
-msgid "No matching users found."
-msgstr "沒有匹配的使用者。"
+#: classes/pref/filters.php:1001
+#: js/PrefFilterTree.js:44
+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:764
+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:786
+#, fuzzy
+msgid "Add action"
+msgstr "摘要動作"
+
+#: classes/pref/filters.php:1139
+#, fuzzy
+msgid "[No caption]"
+msgstr "標題"
+
+#: classes/pref/filters.php:1141
+#, php-format
+msgid "%s (%d rule)"
+msgid_plural "%s (%d rules)"
+msgstr[0] ""
+
+#: classes/pref/filters.php:1155
+msgid "matches any rule"
+msgstr ""
+
+#: classes/pref/filters.php:1158
+#, fuzzy, php-format
+msgid "%s (+%d action)"
+msgid_plural "%s (+%d actions)"
+msgstr[0] "摘要動作"
+
+#: classes/pref/system.php:8
+#: classes/pref/users.php:6
+msgid "Your access level is insufficient to open this tab."
+msgstr "您的帳號等級不夠，無法打開這個頁籤。"
 
 #: classes/pref/system.php:29
 msgid "Error Log"
@@ -1463,393 +1460,320 @@ msgid "(%d feed)"
 msgid_plural "(%d feeds)"
 msgstr[0] "(%d 個摘要)"
 
-#: classes/pref/feeds.php:514
+#: classes/pref/feeds.php:513
 #: classes/pref/prefs.php:18
 msgid "General"
 msgstr "通用"
 
-#: classes/pref/feeds.php:528
+#: classes/pref/feeds.php:527
 msgid "Feed Title"
 msgstr "摘要標題"
 
-#: classes/pref/feeds.php:560
-#: classes/pref/feeds.php:801
-#: classes/pref/feeds.php:1635
-#: classes/feeds.php:989
-msgid "Place in category:"
-msgstr "加入到類別："
+#: classes/pref/feeds.php:536
+#: classes/handler/public.php:417
+msgid "URL:"
+msgstr "URL："
 
-#: classes/pref/feeds.php:572
+#: classes/pref/feeds.php:571
 #, fuzzy
 msgid "Site URL:"
 msgstr "文章網址： "
 
-#: classes/pref/feeds.php:574
+#: classes/pref/feeds.php:573
 #, fuzzy
 msgid "Site URL"
 msgstr "摘要 URL"
 
-#: classes/pref/feeds.php:585
-#: classes/pref/feeds.php:815
+#: classes/pref/feeds.php:584
+#: classes/pref/feeds.php:814
 #, fuzzy
 msgid "Language:"
 msgstr "語言："
 
-#: classes/pref/feeds.php:592
-#: classes/pref/feeds.php:824
+#: classes/pref/feeds.php:591
+#: classes/pref/feeds.php:823
 msgid "Update"
 msgstr "更新列表"
 
-#: classes/pref/feeds.php:607
-#: classes/pref/feeds.php:840
+#: classes/pref/feeds.php:606
+#: classes/pref/feeds.php:839
 msgid "Article purging:"
 msgstr "文章清理："
 
-#: classes/pref/feeds.php:632
-#: classes/pref/feeds.php:861
-#: classes/pref/feeds.php:1652
-#: classes/pref/prefs.php:243
-#: classes/feeds.php:1017
-msgid "Password"
-msgstr "密碼"
-
-#: classes/pref/feeds.php:636
+#: classes/pref/feeds.php:635
 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:646
-#: classes/feeds.php:1028
-msgid "This feed requires authentication."
-msgstr "這個摘要需要認證"
+#: classes/pref/feeds.php:647
+#: classes/pref/feeds.php:866
+#: classes/pref/users.php:82
+msgid "Options"
+msgstr "選項"
 
-#: classes/pref/feeds.php:662
-#: classes/pref/feeds.php:871
+#: classes/pref/feeds.php:661
+#: classes/pref/feeds.php:870
 msgid "Hide from Popular feeds"
 msgstr "從最受歡迎的摘要中隱藏"
 
-#: classes/pref/feeds.php:674
-#: classes/pref/feeds.php:877
+#: classes/pref/feeds.php:673
+#: classes/pref/feeds.php:876
 msgid "Include in e-mail digest"
 msgstr "包含電子郵件摘要"
 
-#: classes/pref/feeds.php:687
-#: classes/pref/feeds.php:883
+#: classes/pref/feeds.php:686
+#: classes/pref/feeds.php:882
 msgid "Always display image attachments"
 msgstr "始終顯示圖片附件"
 
-#: classes/pref/feeds.php:700
-#: classes/pref/feeds.php:891
+#: classes/pref/feeds.php:699
+#: classes/pref/feeds.php:890
 #, fuzzy
 msgid "Do not embed media"
 msgstr "不要包含圖片"
 
-#: classes/pref/feeds.php:713
-#: classes/pref/feeds.php:899
+#: classes/pref/feeds.php:712
+#: classes/pref/feeds.php:898
 msgid "Cache media"
 msgstr ""
 
-#: classes/pref/feeds.php:725
-#: classes/pref/feeds.php:905
+#: classes/pref/feeds.php:724
+#: classes/pref/feeds.php:904
 msgid "Mark updated articles as unread"
 msgstr "將已更新的文章標記為未讀"
 
-#: classes/pref/feeds.php:729
+#: classes/pref/feeds.php:728
 msgid "Icon"
 msgstr "圖示"
 
-#: classes/pref/feeds.php:743
-#: classes/pref/feeds.php:1284
+#: classes/pref/feeds.php:742
+#: classes/pref/feeds.php:1283
 #: plugins/import_export/init.php:71
 #, fuzzy
 msgid "Choose file..."
 msgstr "建立過濾器"
 
-#: classes/pref/feeds.php:750
+#: classes/pref/feeds.php:749
 msgid "Replace"
 msgstr "替換"
 
-#: classes/pref/feeds.php:757
+#: classes/pref/feeds.php:756
 #: classes/pref/prefs.php:679
 msgid "Plugins"
 msgstr "擴充套件"
 
-#: classes/pref/feeds.php:1154
+#: classes/pref/feeds.php:1153
 msgid "Feeds with errors"
 msgstr "有錯誤的摘要"
 
-#: classes/pref/feeds.php:1161
+#: classes/pref/feeds.php:1160
 msgid "Inactive feeds"
 msgstr "不活躍的摘要"
 
-#: classes/pref/feeds.php:1197
+#: classes/pref/feeds.php:1196
 msgid "Edit selected feeds"
 msgstr "編輯選定的摘要"
 
-#: classes/pref/feeds.php:1199
-#: classes/pref/feeds.php:1213
-#: classes/pref/filters.php:810
-msgid "Reset sort order"
-msgstr "重新排序"
-
-#: classes/pref/feeds.php:1201
-#: js/prefs.js:1462
+#: classes/pref/feeds.php:1200
+#: js/prefs.js:1171
 msgid "Batch subscribe"
 msgstr ""
 
-#: classes/pref/feeds.php:1208
+#: classes/pref/feeds.php:1207
 msgid "Categories"
 msgstr "類別"
 
-#: classes/pref/feeds.php:1211
+#: classes/pref/feeds.php:1210
 msgid "Add category"
 msgstr "新增類別"
 
-#: classes/pref/feeds.php:1215
+#: classes/pref/feeds.php:1214
 msgid "Remove selected"
 msgstr "移除所選擇的"
 
-#: classes/pref/feeds.php:1272
+#: classes/pref/feeds.php:1271
 msgid "OPML"
 msgstr "OPML"
 
-#: classes/pref/feeds.php:1274
+#: classes/pref/feeds.php:1273
 msgid "Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings."
 msgstr ""
 
-#: classes/pref/feeds.php:1275
+#: classes/pref/feeds.php:1274
 msgid "Only main settings profile can be migrated using OPML."
 msgstr ""
 
-#: classes/pref/feeds.php:1290
+#: classes/pref/feeds.php:1289
 #, fuzzy
 msgid "Import my OPML"
 msgstr "正在匯入 OPML ……"
 
-#: classes/pref/feeds.php:1296
+#: classes/pref/feeds.php:1295
 msgid "Filename:"
 msgstr "文件名："
 
-#: classes/pref/feeds.php:1298
+#: classes/pref/feeds.php:1297
 msgid "Include settings"
 msgstr "包含設定"
 
-#: classes/pref/feeds.php:1302
+#: classes/pref/feeds.php:1301
 #, fuzzy
 msgid "Export OPML"
 msgstr "正在匯入 OPML ……"
 
-#: classes/pref/feeds.php:1306
+#: classes/pref/feeds.php:1305
 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:1310
+#: classes/pref/feeds.php:1309
 msgid "Public OPML URL"
 msgstr "公開的 OPML URL"
 
-#: classes/pref/feeds.php:1311
+#: classes/pref/feeds.php:1310
 #, fuzzy
 msgid "Display published OPML URL"
 msgstr "公開的 OPML URL"
 
-#: classes/pref/feeds.php:1318
+#: classes/pref/feeds.php:1317
 #, fuzzy
 msgid "Published & shared articles / Generated feeds"
 msgstr "已發布的文章和產生的摘要"
 
-#: classes/pref/feeds.php:1320
+#: classes/pref/feeds.php:1319
 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:1327
-#: classes/feeds.php:54
-#: classes/feeds.php:140
-msgid "View as RSS"
-msgstr "以 RSS 形式閱讀"
-
-#: classes/pref/feeds.php:1328
 msgid "Display URL"
 msgstr "顯示 URL"
 
-#: classes/pref/feeds.php:1331
+#: classes/pref/feeds.php:1330
 msgid "Clear all generated URLs"
 msgstr "清空所有產生的 URL"
 
-#: classes/pref/feeds.php:1410
+#: classes/pref/feeds.php:1409
 msgid "These feeds have not been updated with new content for 3 months (oldest first):"
 msgstr "以下摘要已經有三個月沒有內容更新了（最舊的在最上）："
 
-#: classes/pref/feeds.php:1444
-#: classes/pref/feeds.php:1509
+#: classes/pref/feeds.php:1443
+#: classes/pref/feeds.php:1508
 msgid "Click to edit feed"
 msgstr "點擊以編輯摘要"
 
-#: classes/pref/feeds.php:1462
-#: classes/pref/feeds.php:1529
+#: classes/pref/feeds.php:1461
+#: classes/pref/feeds.php:1528
 msgid "Unsubscribe from selected feeds"
 msgstr "取消訂閱選取的摘要"
 
-#: classes/pref/feeds.php:1632
+#: classes/pref/feeds.php:1629
 msgid "Add one valid RSS feed per line (no feed detection is done)"
 msgstr ""
 
-#: classes/pref/feeds.php:1641
+#: classes/pref/feeds.php:1638
 msgid "Feeds to subscribe, One per line"
 msgstr ""
 
-#: classes/pref/feeds.php:1664
+#: classes/pref/feeds.php:1661
 msgid "Feeds require authentication."
 msgstr ""
 
-#: classes/pref/feeds.php:1671
-#: classes/feeds.php:1031
-#: classes/feeds.php:1087
-msgid "Subscribe"
-msgstr "訂閱"
-
-#: classes/pref/filters.php:155
+#: classes/pref/users.php:26
 #, fuzzy
-msgid "Preview article"
-msgstr "最新更新的文章"
+msgid "Edit user"
+msgstr "編輯過濾器"
 
-#: classes/pref/filters.php:267
-#: classes/pref/filters.php:573
-msgid "(inverse)"
-msgstr "反向選取"
+#: classes/pref/users.php:64
+msgid "Access level: "
+msgstr "帳號等級："
 
-#: classes/pref/filters.php:263
-#: classes/pref/filters.php:572
+#: classes/pref/users.php:96
+#: js/prefs.js:403
+msgid "User details"
+msgstr "使用者詳細資料"
+
+#: classes/pref/users.php:136
+#: classes/pref/users.php:406
+msgid "Registered"
+msgstr "註冊時間"
+
+#: classes/pref/users.php:137
+msgid "Last logged in"
+msgstr "上次登入"
+
+#: classes/pref/users.php:145
+msgid "Subscribed feeds count"
+msgstr "訂閱的摘要數量"
+
+#: classes/pref/users.php:146
+#, fuzzy
+msgid "Stored articles"
+msgstr "加星標文章"
+
+#: classes/pref/users.php:150
+#: classes/pref/users.php:405
+msgid "Subscribed feeds"
+msgstr "訂閱的摘要"
+
+#: classes/pref/users.php:176
+msgid "User not found"
+msgstr "未找到使用者"
+
+#: classes/pref/users.php:246
 #, php-format
-msgid "%s on %s in %s %s"
-msgstr ""
+msgid "Added user <b>%s</b> with password <b>%s</b>"
+msgstr "已添加使用者 <b>%s</b> ，密碼為<b>%s</b>"
 
-#: classes/pref/filters.php:383
-#: classes/pref/filters.php:870
-#: classes/pref/filters.php:977
-msgid "Match"
-msgstr "匹配"
-
-#: classes/pref/filters.php:397
-#: classes/pref/filters.php:455
-#: classes/pref/filters.php:884
-#: classes/pref/filters.php:911
-msgid "Add"
-msgstr "新增"
-
-#: classes/pref/filters.php:400
-#: classes/pref/filters.php:458
-#: classes/pref/filters.php:887
-#: classes/pref/filters.php:914
-#: classes/feeds.php:122
-msgid "Delete"
-msgstr "刪除"
-
-#: classes/pref/filters.php:441
-#: classes/pref/filters.php:897
-#, fuzzy
-msgid "Apply actions"
-msgstr "摘要動作"
-
-#: classes/pref/filters.php:492
-#: classes/pref/filters.php:926
-msgid "Enabled"
-msgstr "已啟用"
-
-#: classes/pref/filters.php:501
-#: classes/pref/filters.php:929
-msgid "Match any rule"
-msgstr ""
-
-#: classes/pref/filters.php:510
-#: classes/pref/filters.php:932
-#, fuzzy
-msgid "Inverse matching"
-msgstr "反向匹配"
-
-#: classes/pref/filters.php:522
-#: classes/pref/filters.php:939
-msgid "Test"
-msgstr "測試"
-
-#: classes/pref/filters.php:804
-msgid "Combine"
-msgstr ""
-
-#: classes/pref/filters.php:942
-msgid "Create"
-msgstr "建立"
-
-#: classes/pref/filters.php:987
-msgid "Regular expression, without outer delimiters (i.e. slashes)"
-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:43
-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:797
-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:819
-#, fuzzy
-msgid "Add action"
-msgstr "摘要動作"
-
-#: classes/pref/filters.php:1139
-#, fuzzy
-msgid "[No caption]"
-msgstr "標題"
-
-#: classes/pref/filters.php:1141
+#: classes/pref/users.php:253
 #, php-format
-msgid "%s (%d rule)"
-msgid_plural "%s (%d rules)"
-msgstr[0] ""
+msgid "Could not create user <b>%s</b>"
+msgstr "無法建立使用者 <b>%s</b> "
 
-#: classes/pref/filters.php:1155
-msgid "matches any rule"
-msgstr ""
+#: classes/pref/users.php:257
+#, php-format
+msgid "User <b>%s</b> already exists."
+msgstr "使用者 <b>%s</b> 已存在。"
 
-#: classes/pref/filters.php:1158
+#: classes/pref/users.php:285
 #, fuzzy, php-format
-msgid "%s (+%d action)"
-msgid_plural "%s (+%d actions)"
-msgstr[0] "摘要動作"
+msgid "Changed password of user <b>%s</b> to <b>%s</b>"
+msgstr "已添加使用者 <b>%s</b> ，密碼為<b>%s</b>"
+
+#: classes/pref/users.php:287
+#, 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:310
+msgid "[tt-rss] Password change notification"
+msgstr "[tt-rss] 密碼更換提醒"
+
+#: classes/pref/users.php:363
+msgid "Create user"
+msgstr "建立使用者"
+
+#: classes/pref/users.php:371
+#: classes/handler/public.php:747
+msgid "Reset password"
+msgstr "重設密碼"
+
+#: classes/pref/users.php:404
+msgid "Access Level"
+msgstr "帳號等級"
+
+#: classes/pref/users.php:407
+msgid "Last login"
+msgstr "最後登入"
+
+#: classes/pref/users.php:426
+msgid "Click to edit"
+msgstr "點擊進行編輯"
+
+#: classes/pref/users.php:446
+msgid "No users defined."
+msgstr "沒有定義使用者。"
+
+#: classes/pref/users.php:448
+msgid "No matching users found."
+msgstr "沒有匹配的使用者。"
 
 #: classes/pref/prefs.php:19
 msgid "Interface"
@@ -2026,7 +1950,7 @@ msgid "Strip all but most common HTML tags when reading articles."
 msgstr "僅載入几個最常用的 HTML 標籤"
 
 #: classes/pref/prefs.php:53
-#: js/prefs.js:1424
+#: js/prefs.js:1136
 msgid "Customize stylesheet"
 msgstr "自訂樣式"
 
@@ -2274,261 +2198,304 @@ msgstr "移除選取的偏好文件"
 msgid "Activate profile"
 msgstr "啟用偏好文件"
 
-#: classes/feeds.php:53
-msgid "View as RSS feed"
-msgstr "以RSS摘要方式閱讀"
+#: 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/feeds.php:62
+#: classes/dlg.php:44
+msgid "Your Public OPML URL is:"
+msgstr "你的公共 OPML URL 是："
+
+#: classes/dlg.php:53
+#: classes/dlg.php:178
+#: plugins/share/init.php:125
+msgid "Generate new URL"
+msgstr "產生一個新的 URL"
+
+#: classes/dlg.php:67
+msgid "Update daemon is enabled in configuration, but daemon process is not running, which prevents all feeds from updating. Please start the daemon process or contact instance owner."
+msgstr "更新進程已在配置中啟用，但守護進程沒有運行，無法抓取信息。請啟動守護進程，或聯系管理員。"
+
+#: classes/dlg.php:71
+#: classes/dlg.php:80
+msgid "Last update:"
+msgstr "上次更新："
+
+#: classes/dlg.php:76
+msgid "Update daemon is taking too long to perform a feed update. This could indicate a problem like crash or a hang. Please check the daemon process or contact instance owner."
+msgstr "更新進程在抓取信息更新時花費了太長時間，可能已經崩潰。請檢查守護進程或聯系管理員。"
+
+#: classes/dlg.php:169
+msgid "You can view this feed as RSS using the following URL:"
+msgstr "您可以透過如下 URL 以 RSS 方式查看本摘要："
+
+#: classes/dlg.php:190
+msgid "You are using default tt-rss password. Please change it in the Preferences (Personal data / Authentication)."
+msgstr ""
+
+#: classes/dlg.php:194
+#, fuzzy
+msgid "Open Preferences"
+msgstr "偏好設定"
+
+#: classes/opml.php:31
+#: classes/opml.php:36
+msgid "OPML Utility"
+msgstr "OPML 工具"
+
+#: classes/opml.php:40
+msgid "Importing OPML..."
+msgstr "正在匯入 OPML ……"
+
+#: classes/opml.php:45
+msgid "Return to preferences"
+msgstr "返回偏好設定"
+
+#: classes/opml.php:301
 #, php-format
-msgid "Last updated: %s"
-msgstr "上次更新： %s"
+msgid "Adding feed: %s"
+msgstr "新增摘要: %s"
 
-#: classes/feeds.php:100
-#, fuzzy
-msgid "Select..."
-msgstr "選擇"
-
-#: classes/feeds.php:104
-msgid "Invert"
-msgstr "反向選取"
-
-#: classes/feeds.php:107
-msgid "Selection toggle:"
-msgstr "標記為："
-
-#: classes/feeds.php:113
-msgid "Selection:"
-msgstr "所有選取的："
-
-#: classes/feeds.php:116
-msgid "Set score"
-msgstr "評分"
-
-#: classes/feeds.php:119
-msgid "Archive"
-msgstr "存檔"
-
-#: classes/feeds.php:121
-msgid "Move back"
-msgstr "移回原位"
-
-#: classes/feeds.php:127
-#: classes/feeds.php:132
-#: plugins/mail/init.php:76
-#: plugins/mailto/init.php:25
-#, fuzzy
-msgid "Forward by email"
-msgstr "透過郵件轉發"
-
-#: classes/feeds.php:136
-msgid "Feed:"
-msgstr "摘要："
-
-#: classes/feeds.php:193
-#: classes/feeds.php:819
-msgid "Feed not found."
-msgstr "找不到摘要。"
-
-#: classes/feeds.php:255
-msgid "Never"
-msgstr "從未"
-
-#: classes/feeds.php:342
+#: classes/opml.php:312
 #, fuzzy, php-format
-msgid "Imported at %s"
-msgstr "匯入"
+msgid "Duplicate feed: %s"
+msgstr "更新摘要"
 
-#: classes/feeds.php:394
-#: classes/feeds.php:487
-msgid "mark feed as read"
-msgstr "標記摘要為已讀"
-
-#: classes/feeds.php:542
-#, fuzzy
-msgid "Collapse article"
-msgstr "全部文章"
-
-#: classes/feeds.php:703
-msgid "No unread articles found to display."
-msgstr "沒有未讀文章。"
-
-#: classes/feeds.php:706
-msgid "No updated articles found to display."
-msgstr "沒有最新更新的文章。"
-
-#: classes/feeds.php:709
-msgid "No starred articles found to display."
-msgstr "沒有加星標的文章。"
-
-#: classes/feeds.php:713
-#, 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:715
-msgid "No articles found to display."
-msgstr "暫時沒有文章。"
-
-#: classes/feeds.php:731
-#: classes/feeds.php:922
+#: classes/opml.php:326
 #, php-format
-msgid "Feeds last updated at %s"
-msgstr "上次摘要更新時間：%s"
+msgid "Adding label %s"
+msgstr "新增標籤: %s"
 
-#: classes/feeds.php:743
-#: classes/feeds.php:934
-msgid "Some feeds have update errors (click for details)"
-msgstr "部分摘要更新錯誤（點擊了解詳情）"
-
-#: classes/feeds.php:911
-msgid "No feed selected."
-msgstr "沒有選取的摘要。"
-
-#: classes/feeds.php:975
-#: classes/feeds.php:983
-#, fuzzy
-msgid "Feed or site URL"
-msgstr "摘要 URL"
-
-#: classes/feeds.php:997
-msgid "Available feeds"
-msgstr "可用的摘要"
-
-#: classes/feeds.php:1034
-msgid "More feeds"
-msgstr "更多摘要"
-
-#: classes/feeds.php:1063
-msgid "Popular feeds"
-msgstr "最受歡迎的摘要"
-
-#: classes/feeds.php:1064
-msgid "Feed archive"
-msgstr "摘要存檔"
-
-#: classes/feeds.php:1067
-msgid "limit:"
-msgstr "限制："
-
-#: classes/feeds.php:1101
-msgid "Look for"
-msgstr "查找"
-
-#: classes/feeds.php:1109
+#: classes/opml.php:329
 #, php-format
-msgid "in %s"
-msgstr ""
+msgid "Duplicate label: %s"
+msgstr "重複的標籤: %s"
 
-#: classes/feeds.php:1114
-msgid "Used for word stemming"
-msgstr ""
-
-#: classes/feeds.php:1123
-#, fuzzy
-msgid "Search syntax"
-msgstr "搜尋"
-
-#: classes/feeds.php:1577
-msgid "Starred articles"
-msgstr "加星標文章"
-
-#: classes/feeds.php:1579
-msgid "Published articles"
-msgstr "已發布文章"
-
-#: classes/feeds.php:1581
-msgid "Fresh articles"
-msgstr "最新更新的文章"
-
-#: classes/feeds.php:1585
-msgid "Archived articles"
-msgstr "已儲存的文章"
-
-#: classes/feeds.php:1587
-msgid "Recently read"
-msgstr "閱讀紀錄"
-
-#: classes/feeds.php:1708
-msgid "Special"
-msgstr "特殊區域"
-
-#: classes/feeds.php:1965
+#: classes/opml.php:341
 #, php-format
-msgid "Search results: %s"
-msgstr "搜尋結果： %s"
+msgid "Setting preference key %s to %s"
+msgstr "將偏好按鍵從 %s 設定為 %s"
 
-#: plugins/nsfw/init.php:30
-#: plugins/nsfw/init.php:42
-msgid "Not work safe (click to toggle)"
+#: classes/opml.php:377
+msgid "Adding filter..."
+msgstr "建立過濾器"
+
+#: classes/opml.php:512
+#, fuzzy, php-format
+msgid "Processing category: %s"
+msgstr "加入到類別："
+
+#: classes/opml.php:558
+#, php-format
+msgid "Upload failed with error code %d"
+msgstr "上傳失敗，失敗碼 %d"
+
+#: classes/opml.php:570
+#: plugins/import_export/init.php:471
+#, fuzzy
+msgid "Unable to move uploaded file."
+msgstr "錯誤：無法載入文章。"
+
+#: classes/opml.php:574
+#: plugins/import_export/init.php:475
+msgid "Error: please upload OPML file."
+msgstr "錯誤：請上傳 OPML 文件。"
+
+#: classes/opml.php:585
+#, fuzzy
+msgid "Error: unable to find moved OPML file."
+msgstr "錯誤：無法載入文章。"
+
+#: classes/opml.php:594
+msgid "Error while parsing document."
+msgstr "解析文檔時發生錯誤。"
+
+#: classes/article.php:26
+msgid "Article not found."
+msgstr "找不到文章。"
+
+#: classes/article.php:211
+msgid "Tags for this article (separated by commas):"
+msgstr "本文的標籤，請用逗號分開："
+
+#: classes/article.php:337
+#: classes/article.php:719
+#: classes/article.php:874
+msgid "no tags"
+msgstr "無標籤"
+
+#: classes/article.php:447
+msgid "unknown type"
+msgstr "未知類型"
+
+#: classes/article.php:524
+msgid "Attachments"
+msgstr "附件："
+
+#: classes/article.php:688
+msgid " - "
+msgstr " - "
+
+#: classes/article.php:912
+msgid "(edit note)"
+msgstr "（編輯註記）"
+
+#: classes/handler/public.php:407
+#: plugins/bookmarklets/init.php:40
+msgid "Share with Tiny Tiny RSS"
+msgstr "分享 Tiny Tiny RSS 中訂閱"
+
+#: classes/handler/public.php:415
+msgid "Title:"
+msgstr "標題： "
+
+#: classes/handler/public.php:419
+msgid "Content:"
+msgstr "內容： "
+
+#: classes/handler/public.php:421
+msgid "Labels:"
+msgstr "標籤"
+
+#: classes/handler/public.php:440
+msgid "Shared article will appear in the Published feed."
 msgstr ""
 
-#: plugins/nsfw/init.php:52
-msgid "NSFW Plugin"
+#: classes/handler/public.php:442
+msgid "Share"
+msgstr "分享"
+
+#: classes/handler/public.php:464
+msgid "Not logged in"
+msgstr "沒有登入"
+
+#: classes/handler/public.php:527
+msgid "Incorrect username or password"
+msgstr "使用者名或密碼錯誤"
+
+#: classes/handler/public.php:581
+#, php-format
+msgid "Already subscribed to <b>%s</b>."
+msgstr "已經訂閱到 <b>%s</b>."
+
+#: classes/handler/public.php:584
+#, php-format
+msgid "Subscribed to <b>%s</b>."
+msgstr "訂閱到 <b>%s</b>."
+
+#: classes/handler/public.php:587
+#, php-format
+msgid "Could not subscribe to <b>%s</b>."
+msgstr "無法訂閱 <b>%s</b>。"
+
+#: classes/handler/public.php:590
+#, php-format
+msgid "No feeds found in <b>%s</b>."
+msgstr "在 <b>%s</b> 中沒有找到摘要。"
+
+#: classes/handler/public.php:593
+#, fuzzy
+msgid "Multiple feed URLs found."
+msgstr "未找到摘要。"
+
+#: classes/handler/public.php:597
+#, 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:615
+msgid "Subscribe to selected feed"
+msgstr "訂閱選取的摘要"
+
+#: classes/handler/public.php:642
+msgid "Edit subscription options"
+msgstr "編輯訂閱選項"
+
+#: classes/handler/public.php:680
+msgid "Password recovery"
+msgstr "密碼救援"
+
+#: classes/handler/public.php:725
+#, 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:757
+msgid "Some of the required form parameters are missing or incorrect."
 msgstr ""
 
-#: plugins/nsfw/init.php:79
-msgid "Tags to consider NSFW (comma-separated)"
+#: classes/handler/public.php:761
+#: classes/handler/public.php:830
+msgid "Go back"
+msgstr "回去"
+
+#: classes/handler/public.php:799
+#, fuzzy
+msgid "[tt-rss] Password reset request"
+msgstr "[tt-rss] 密碼更換提醒"
+
+#: classes/handler/public.php:826
+msgid "Sorry, login and email combination not found."
+msgstr "對不起，沒有找到符合的帳號密碼。"
+
+#: classes/handler/public.php:848
+msgid "Your access level is insufficient to run this script."
+msgstr "此帳號等級不足，無法運行腳本。"
+
+#: classes/handler/public.php:874
+msgid "Database Updater"
+msgstr "資料庫更新管理器"
+
+#: classes/handler/public.php:939
+msgid "Perform updates"
+msgstr "執行更新"
+
+#: plugins/af_zz_imgproxy/init.php:208
+msgid "Image proxy settings (af_zz_imgproxy)"
 msgstr ""
 
-#: plugins/nsfw/init.php:100
-msgid "Configuration saved."
+#: plugins/af_zz_imgproxy/init.php:232
+#, fuzzy
+msgid "Enable proxy for all remote images."
+msgstr "啟用摘要分類"
+
+#: plugins/af_zz_imgproxy/init.php:236
+#, fuzzy
+msgid "Don't cache files locally."
+msgstr "本地快取圖片"
+
+#: plugins/af_zz_imgproxy/init.php:252
+#: plugins/af_redditimgur/init.php:79
+#, fuzzy
+msgid "Configuration saved"
 msgstr "設定已儲存。"
 
-#: plugins/note/init.php:28
-#: plugins/note/note.js:11
-msgid "Edit article note"
-msgstr "編輯文章註記"
-
 #: plugins/vf_shared/init.php:17
 #: plugins/vf_shared/init.php:73
 msgid "Shared articles"
 msgstr "已分享的文章"
 
-#: plugins/auth_internal/init.php:67
-#, fuzzy
-msgid "Please enter your one time password:"
-msgstr "請填寫類別名稱："
+#: plugins/bookmarklets/init.php:20
+msgid "Bookmarklets"
+msgstr "書籤"
 
-#: plugins/auth_internal/init.php:208
-msgid "Password has been changed."
-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/auth_internal/init.php:210
-msgid "Old password is incorrect."
-msgstr "原密碼輸入錯誤。"
+#: plugins/bookmarklets/init.php:26
+#, php-format
+msgid "Subscribe to %s in Tiny Tiny RSS?"
+msgstr "在 Tiny Tiny RSS 中訂閱 %s ？"
 
-#: plugins/af_readability/init.php:25
-msgid "Data saved."
+#: 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_readability/init.php:41
-#, fuzzy
-msgid "Inline content"
-msgstr "滾動文章內容"
-
-#: plugins/af_readability/init.php:47
-msgid "Readability settings (af_readability)"
-msgstr ""
-
-#: plugins/af_readability/init.php:78
-msgid "Use Readability for pages shared via bookmarklet."
-msgstr ""
-
-#: plugins/af_readability/init.php:90
-#: plugins/af_psql_trgm/init.php:198
-msgid "Currently enabled for (click to edit):"
-msgstr ""
-
-#: plugins/af_readability/init.php:107
-#, fuzzy
-msgid "Readability"
-msgstr "檢查可用性"
-
-#: plugins/af_readability/init.php:118
-#, fuzzy
-msgid "Inline article content"
-msgstr "滾動文章內容"
-
 #: plugins/af_redditimgur/init.php:30
 msgid "Reddit content settings (af_redditimgur)"
 msgstr ""
@@ -2541,11 +2508,21 @@ msgstr ""
 msgid "Enable additional duplicate checking"
 msgstr ""
 
-#: plugins/af_redditimgur/init.php:79
-#: plugins/af_zz_imgproxy/init.php:252
-#, fuzzy
-msgid "Configuration saved"
-msgstr "設定已儲存。"
+#: plugins/af_comics/init.php:49
+msgid "Feeds supported by af_comics"
+msgstr ""
+
+#: plugins/af_comics/init.php:51
+msgid "The following comics are currently supported:"
+msgstr ""
+
+#: plugins/af_comics/init.php:69
+msgid "To subscribe to GoComics use the comic's regular web page as the feed URL (e.g. for the <em>Garfield</em> comic use <code>http://www.gocomics.com/garfield</code>)."
+msgstr ""
+
+#: plugins/af_comics/init.php:71
+msgid "Drop any updated filters into <code>filters.local</code> in plugin directory."
+msgstr ""
 
 #: plugins/af_psql_trgm/init.php:29
 #, php-format
@@ -2585,26 +2562,88 @@ msgstr ""
 msgid "Enable for all feeds:"
 msgstr "啟用摘要分類"
 
+#: plugins/af_psql_trgm/init.php:198
+#: plugins/af_readability/init.php:90
+msgid "Currently enabled for (click to edit):"
+msgstr ""
+
 #: plugins/af_psql_trgm/init.php:216
 msgid "Similarity (pg_trgm)"
 msgstr ""
 
-#: plugins/af_comics/init.php:49
-msgid "Feeds supported by af_comics"
+#: plugins/af_readability/init.php:25
+msgid "Data saved."
 msgstr ""
 
-#: plugins/af_comics/init.php:51
-msgid "The following comics are currently supported:"
+#: plugins/af_readability/init.php:41
+#, fuzzy
+msgid "Inline content"
+msgstr "滾動文章內容"
+
+#: plugins/af_readability/init.php:47
+msgid "Readability settings (af_readability)"
 msgstr ""
 
-#: plugins/af_comics/init.php:69
-msgid "To subscribe to GoComics use the comic's regular web page as the feed URL (e.g. for the <em>Garfield</em> comic use <code>http://www.gocomics.com/garfield</code>)."
+#: plugins/af_readability/init.php:78
+msgid "Use Readability for pages shared via bookmarklet."
 msgstr ""
 
-#: plugins/af_comics/init.php:71
-msgid "Drop any updated filters into <code>filters.local</code> in plugin directory."
+#: plugins/af_readability/init.php:107
+#, fuzzy
+msgid "Readability"
+msgstr "檢查可用性"
+
+#: plugins/af_readability/init.php:118
+#, fuzzy
+msgid "Inline article content"
+msgstr "滾動文章內容"
+
+#: plugins/mailto/init.php:50
+#: plugins/mailto/init.php:58
+#: plugins/mail/init.php:118
+#: plugins/mail/init.php:124
+msgid "[Forwarded]"
+msgstr "[已轉發]"
+
+#: plugins/mailto/init.php:50
+#: plugins/mail/init.php:118
+msgid "Multiple articles"
+msgstr "多個文章"
+
+#: plugins/mailto/init.php:74
+msgid "Clicking the following link to invoke your mail client:"
 msgstr ""
 
+#: plugins/mailto/init.php:78
+#, fuzzy
+msgid "Forward selected article(s) by email."
+msgstr "用郵件轉發文章"
+
+#: plugins/mailto/init.php:81
+msgid "You should be able to edit the message before sending in your mail client."
+msgstr ""
+
+#: plugins/mailto/init.php:86
+msgid "Close this dialog"
+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/import_export/init.php:53
 msgid "Import and export"
 msgstr "匯入和匯出"
@@ -2668,103 +2707,6 @@ msgstr "上傳失敗，失敗碼 %d"
 msgid "No file uploaded."
 msgstr "沒有上傳檔案"
 
-#: plugins/mail/init.php:29
-msgid "Mail addresses saved."
-msgstr ""
-
-#: plugins/mail/init.php:35
-#, fuzzy
-msgid "Mail plugin"
-msgstr "使用者擴充套件"
-
-#: plugins/mail/init.php:37
-msgid "You can set predefined email addressed here (comma-separated list):"
-msgstr ""
-
-#: plugins/mail/init.php:118
-#: plugins/mail/init.php:124
-#: plugins/mailto/init.php:50
-#: plugins/mailto/init.php:58
-msgid "[Forwarded]"
-msgstr "[已轉發]"
-
-#: plugins/mail/init.php:118
-#: plugins/mailto/init.php:50
-msgid "Multiple articles"
-msgstr "多個文章"
-
-#: plugins/mail/init.php:146
-msgid "To:"
-msgstr "收信人："
-
-#: plugins/mail/init.php:161
-msgid "Subject:"
-msgstr "主題："
-
-#: plugins/mail/init.php:178
-msgid "Send e-mail"
-msgstr "發送郵件"
-
-#: plugins/close_button/init.php:25
-msgid "Close article"
-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/toggle_sidebar/init.php:23
-msgid "Collapse feedlist"
-msgstr "收縮側邊欄"
-
-#: plugins/af_zz_imgproxy/init.php:208
-msgid "Image proxy settings (af_zz_imgproxy)"
-msgstr ""
-
-#: plugins/af_zz_imgproxy/init.php:232
-#, fuzzy
-msgid "Enable proxy for all remote images."
-msgstr "啟用摘要分類"
-
-#: plugins/af_zz_imgproxy/init.php:236
-#, fuzzy
-msgid "Don't cache files locally."
-msgstr "本地快取圖片"
-
-#: plugins/mailto/init.php:74
-msgid "Clicking the following link to invoke your mail client:"
-msgstr ""
-
-#: plugins/mailto/init.php:78
-#, fuzzy
-msgid "Forward selected article(s) by email."
-msgstr "用郵件轉發文章"
-
-#: plugins/mailto/init.php:81
-msgid "You should be able to edit the message before sending in your mail client."
-msgstr ""
-
-#: plugins/mailto/init.php:86
-msgid "Close this dialog"
-msgstr "關閉本對話框"
-
 #: plugins/share/init.php:41
 msgid "You can disable all articles shared by unique URLs here."
 msgstr "您可以取消所有透過 URL 分享的文章。"
@@ -2785,467 +2727,621 @@ msgstr "您可以透過此 URL 分享本文章："
 msgid "Unshare article"
 msgstr "取些分享文章"
 
-#: js/FeedTree.js:75
+#: plugins/toggle_sidebar/init.php:23
+msgid "Collapse feedlist"
+msgstr "收縮側邊欄"
+
+#: plugins/close_button/init.php:25
+msgid "Close article"
+msgstr "關閉文章"
+
+#: plugins/mail/init.php:29
+msgid "Mail addresses saved."
+msgstr ""
+
+#: plugins/mail/init.php:35
+#, fuzzy
+msgid "Mail plugin"
+msgstr "使用者擴充套件"
+
+#: plugins/mail/init.php:37
+msgid "You can set predefined email addressed here (comma-separated list):"
+msgstr ""
+
+#: plugins/mail/init.php:146
+msgid "To:"
+msgstr "收信人："
+
+#: plugins/mail/init.php:161
+msgid "Subject:"
+msgstr "主題："
+
+#: plugins/mail/init.php:178
+msgid "Send e-mail"
+msgstr "發送郵件"
+
+#: plugins/note/init.php:28
+#: plugins/note/note.js:11
+msgid "Edit article note"
+msgstr "編輯文章註記"
+
+#: plugins/auth_internal/init.php:67
+#, fuzzy
+msgid "Please enter your one time password:"
+msgstr "請填寫類別名稱："
+
+#: plugins/auth_internal/init.php:208
+msgid "Password has been changed."
+msgstr "密碼更改成功。"
+
+#: plugins/auth_internal/init.php:210
+msgid "Old password is incorrect."
+msgstr "原密碼輸入錯誤。"
+
+#: js/FeedTree.js:76
 #, fuzzy
 msgid "(Un)collapse"
 msgstr "折疊側邊欄"
 
-#: js/PrefFeedTree.js:35
+#: js/PrefFeedTree.js:36
 msgid "Edit category"
 msgstr "編輯類別"
 
-#: js/PrefFeedTree.js:42
+#: js/PrefFeedTree.js:43
 msgid "Remove category"
 msgstr "移除類別"
 
-#: js/PrefFilterTree.js:46
+#: js/PrefFilterTree.js:47
 msgid "Inverse"
 msgstr "反向選取"
 
-#: js/feedlist.js:511
+#: js/feedlist.js:461
 #, fuzzy
 msgid "Mark %w in %s older than 1 day as read?"
 msgstr "將 %s 中的全部文章標記為已讀？"
 
-#: js/feedlist.js:514
+#: js/feedlist.js:464
 #, fuzzy
 msgid "Mark %w in %s older than 1 week as read?"
 msgstr "將 %s 中的全部文章標記為已讀？"
 
-#: js/feedlist.js:517
+#: js/feedlist.js:467
 #, fuzzy
 msgid "Mark %w in %s older than 2 weeks as read?"
 msgstr "將 %s 中的全部文章標記為已讀？"
 
-#: js/feedlist.js:520
+#: js/feedlist.js:470
 #, fuzzy
 msgid "Mark %w in %s as read?"
 msgstr "將 %s 中的全部文章標記為已讀？"
 
-#: js/feedlist.js:523
+#: js/feedlist.js:473
 #, fuzzy
 msgid "search results"
 msgstr "搜尋結果： %s"
 
-#: js/feedlist.js:523
+#: js/feedlist.js:473
 #, fuzzy
 msgid "all articles"
 msgstr "全部文章"
 
-#: js/functions.js:74
+#: js/functions.js:100
 msgid "Close"
 msgstr ""
 
-#: js/functions.js:141
+#: js/functions.js:167
 #, fuzzy
 msgid "Click to close"
 msgstr "點擊暫停"
 
-#: js/functions.js:448
+#: js/functions.js:456
 msgid "Error explained"
 msgstr ""
 
-#: js/functions.js:592
+#: js/functions.js:490
+msgid "Upload complete."
+msgstr "上傳完成！"
+
+#: js/functions.js:508
+msgid "Remove stored feed icon?"
+msgstr "移除已保存的摘要圖示？"
+
+#: js/functions.js:510
+msgid "Removing feed icon..."
+msgstr "移除已保存的摘要圖示？"
+
+#: js/functions.js:515
+msgid "Feed icon removed."
+msgstr "摘要圖示已移除。"
+
+#: js/functions.js:532
+msgid "Please select an image file to upload."
+msgstr "請選擇圖片文件上傳。"
+
+#: js/functions.js:533
+msgid "Upload new icon for this feed?"
+msgstr "為本摘要上傳一個新的圖示？"
+
+#: js/functions.js:534
+msgid "Uploading, please wait..."
+msgstr "上傳中，請稍候……"
+
+#: js/functions.js:542
+msgid "Please enter label caption:"
+msgstr "請填寫預定義標籤的說明："
+
+#: js/functions.js:575
 msgid "Subscribe to Feed"
 msgstr "訂閱摘要"
 
-#: js/functions.js:621
+#: js/functions.js:602
 msgid "Failed to parse output. This can indicate server timeout and/or network issues. Backend output was logged to browser console."
 msgstr ""
 
-#: js/functions.js:636
+#: js/functions.js:617
 #, perl-format
 msgid "Subscribed to %s"
 msgstr "已訂閱至 %s"
 
-#: js/functions.js:641
+#: js/functions.js:622
 msgid "Specified URL seems to be invalid."
 msgstr "指定的 URL 無效。"
 
-#: js/functions.js:644
+#: js/functions.js:625
 msgid "Specified URL doesn't seem to contain any feeds."
 msgstr "指定的 URL 沒有包含任何摘要。"
 
-#: js/functions.js:656
+#: js/functions.js:637
 #, fuzzy
 msgid "Expand to select feed"
 msgstr "編輯選定的摘要"
 
-#: js/functions.js:668
+#: js/functions.js:649
 #, fuzzy, perl-format
 msgid "Couldn't download the specified URL: %s"
 msgstr "無法下載指定的 URL 。"
 
-#: js/functions.js:672
+#: js/functions.js:653
 #, perl-format
 msgid "XML validation failed: %s"
 msgstr ""
 
-#: js/functions.js:676
+#: js/functions.js:657
 msgid "You are already subscribed to this feed."
 msgstr "您已經訂閱過這個摘要啦。"
 
-#: js/functions.js:1136
+#: js/functions.js:1098
 msgid "Generate new syndication address for this feed?"
 msgstr "為本摘要產生新的群地址？"
 
-#: js/functions.js:1140
-#: js/prefs.js:1095
+#: js/functions.js:1100
+#: js/prefs.js:870
 msgid "Trying to change address..."
 msgstr ""
 
-#: js/functions.js:1245
-#: js/tt-rss.js:446
-#: js/tt-rss.js:673
+#: js/functions.js:1199
+#: js/tt-rss.js:399
+#: js/tt-rss.js:612
 msgid "You can't edit this kind of feed."
 msgstr "您無法編輯這種類型的摘要。"
 
-#: js/functions.js:1260
+#: js/functions.js:1213
 msgid "Edit Feed"
 msgstr "編輯摘要"
 
-#: js/functions.js:1266
-#: js/prefs.js:100
-#: js/prefs.js:209
-#: js/prefs.js:647
+#: js/functions.js:1217
+#: js/prefs.js:176
+#: js/prefs.js:523
+#: js/prefs.js:1139
+#: js/prefs.js:78
 msgid "Saving data..."
 msgstr " 儲存資料"
 
-#: js/functions.js:1293
+#: js/functions.js:1243
 msgid "More Feeds"
 msgstr "更多摘要"
 
-#: js/functions.js:1355
-#: js/functions.js:1464
-#: js/prefs.js:398
-#: js/prefs.js:540
-#: js/prefs.js:558
-#: js/prefs.js:1077
+#: js/functions.js:1297
+#: js/functions.js:1383
+#: js/prefs.js:332
+#: js/prefs.js:455
+#: js/prefs.js:473
+#: js/prefs.js:855
 msgid "No feeds are selected."
 msgstr "沒有選擇任何摘要。"
 
-#: js/functions.js:1398
+#: js/functions.js:1329
 msgid "Remove selected feeds from the archive? Feeds with stored articles will not be removed."
 msgstr "將選取的摘要從存檔中移除？包含已保存文章的摘要不會被移除。"
 
-#: js/functions.js:1435
+#: js/functions.js:1360
 msgid "Feeds with update errors"
 msgstr "更新錯誤的摘要"
 
-#: js/functions.js:1446
-#: js/prefs.js:1058
+#: js/functions.js:1369
+#: js/prefs.js:841
 msgid "Remove selected feeds?"
 msgstr "移除選取的摘要？"
 
-#: js/functions.js:1449
-#: js/prefs.js:1061
+#: js/functions.js:1370
+#: js/prefs.js:842
 msgid "Removing selected feeds..."
 msgstr "移除選取的摘要？"
 
-#: js/prefs.js:60
-msgid "Please enter login:"
-msgstr "請輸入帳號名稱："
-
-#: js/prefs.js:67
-msgid "Can't create user: no login specified."
-msgstr "無法建立使用者：沒有指定登錄名。"
-
-#: js/prefs.js:71
-msgid "Adding user..."
-msgstr "使用者新增中..."
-
-#: js/prefs.js:96
-msgid "User Editor"
-msgstr "編輯使用者信息"
-
-#: js/prefs.js:131
-msgid "Edit Filter"
-msgstr "編輯過濾器"
-
-#: js/prefs.js:170
+#: js/prefs.js:143
 #, fuzzy
 msgid "Remove filter?"
 msgstr "移除這個過濾器： %s ？"
 
-#: js/prefs.js:175
+#: js/prefs.js:148
 #, fuzzy
 msgid "Removing filter..."
 msgstr "建立過濾器"
 
-#: js/prefs.js:292
+#: js/prefs.js:251
 msgid "Remove selected labels?"
 msgstr "移除選取的預定義標籤？"
 
-#: js/prefs.js:295
+#: js/prefs.js:252
 #, fuzzy
 msgid "Removing selected labels..."
 msgstr "移除選取的預定義標籤？"
 
-#: js/prefs.js:308
-#: js/prefs.js:1144
+#: js/prefs.js:262
+#: js/prefs.js:909
 msgid "No labels are selected."
 msgstr "沒有選擇任何預定義標籤。"
 
-#: js/prefs.js:320
+#: js/prefs.js:274
 msgid "Remove selected users? Neither default admin nor your account will be removed."
 msgstr "移除選取的使用者？預設管理員和您的帳戶不會被移除。"
 
-#: js/prefs.js:323
+#: js/prefs.js:275
 #, fuzzy
 msgid "Removing selected users..."
 msgstr "移除選定的過濾器？"
 
-#: js/prefs.js:338
-#: js/prefs.js:408
-#: js/prefs.js:427
-#: js/prefs.js:461
+#: js/prefs.js:286
+#: js/prefs.js:342
+#: js/prefs.js:361
+#: js/prefs.js:387
 msgid "No users are selected."
 msgstr "沒有選取任何使用者。"
 
-#: js/prefs.js:350
+#: js/prefs.js:297
 msgid "Remove selected filters?"
 msgstr "移除選定的過濾器？"
 
-#: js/prefs.js:353
+#: js/prefs.js:298
 #, fuzzy
 msgid "Removing selected filters..."
 msgstr "移除選定的過濾器？"
 
-#: js/prefs.js:366
-#: js/prefs.js:495
-#: js/prefs.js:514
+#: js/prefs.js:308
+#: js/prefs.js:419
+#: js/prefs.js:438
 msgid "No filters are selected."
 msgstr "沒有選取的過濾器。"
 
-#: js/prefs.js:378
+#: js/prefs.js:319
 msgid "Unsubscribe from selected feeds?"
 msgstr "從選取的摘要取消訂閱？"
 
-#: js/prefs.js:382
+#: js/prefs.js:321
 #, fuzzy
 msgid "Unsubscribing from selected feeds..."
 msgstr "取消訂閱選取的摘要"
 
-#: js/prefs.js:413
-#: js/prefs.js:432
-#: js/prefs.js:466
+#: js/prefs.js:347
+#: js/prefs.js:366
+#: js/prefs.js:392
 msgid "Please select only one user."
 msgstr "請僅選擇一個使用者。"
 
-#: js/prefs.js:436
+#: js/prefs.js:370
 msgid "Reset password of selected user?"
 msgstr "重置選定使用者的密碼？"
 
-#: js/prefs.js:439
+#: js/prefs.js:371
 #, fuzzy
 msgid "Resetting password for selected user..."
 msgstr "重置選定使用者的密碼？"
 
-#: js/prefs.js:500
+#: js/prefs.js:424
 msgid "Please select only one filter."
 msgstr "請僅選擇一個過濾器。"
 
-#: js/prefs.js:518
+#: js/prefs.js:442
 #, fuzzy
 msgid "Combine selected filters?"
 msgstr "移除選定的過濾器？"
 
-#: js/prefs.js:521
+#: js/prefs.js:443
 #, fuzzy
 msgid "Joining filters..."
 msgstr "建立過濾器"
 
-#: js/prefs.js:580
+#: js/prefs.js:487
 msgid "Edit Multiple Feeds"
 msgstr "編輯多個摘要"
 
-#: js/prefs.js:604
+#: js/prefs.js:511
 msgid "Save changes to selected feeds?"
 msgstr "儲存對摘要的更改？"
 
-#: js/prefs.js:681
+#: js/prefs.js:552
 msgid "OPML Import"
 msgstr "OPML 匯入"
 
-#: js/prefs.js:700
+#: js/prefs.js:571
 msgid "Please choose an OPML file first."
 msgstr "請先選擇一個 OPML 文件。"
 
-#: js/prefs.js:703
+#: js/prefs.js:574
 #: plugins/import_export/import_export.js:115
 msgid "Importing, please wait..."
 msgstr "匯入中，請稍候……"
 
-#: js/prefs.js:869
+#: js/prefs.js:737
 msgid "Reset to defaults?"
 msgstr "重置為預設狀態？"
 
-#: js/prefs.js:1468
-msgid "Subscribing to feeds..."
+#: js/prefs.js:777
+#, perl-format
+msgid "Remove category %s? Any nested feeds would be placed into Uncategorized."
 msgstr ""
 
-#: js/prefs.js:1487
-msgid "Clear stored data for this plugin?"
+#: js/prefs.js:778
+#, fuzzy
+msgid "Removing category..."
+msgstr "建立類別"
+
+#: js/prefs.js:794
+msgid "Remove selected categories?"
+msgstr "移除所有選擇的類別？"
+
+#: js/prefs.js:795
+#, fuzzy
+msgid "Removing selected categories..."
+msgstr "移除選定的類別"
+
+#: js/prefs.js:805
+msgid "No categories are selected."
+msgstr "沒有選取任何類別。"
+
+#: js/prefs.js:812
+#, fuzzy
+msgid "Category title:"
+msgstr "類別"
+
+#: js/prefs.js:815
+#, fuzzy
+msgid "Creating category..."
+msgstr "建立過濾器"
+
+#: js/prefs.js:832
+msgid "Feeds without recent updates"
+msgstr "最近沒更新的摘要"
+
+#: js/prefs.js:869
+msgid "Replace current OPML publishing address with a new one?"
+msgstr "將當前的 OPML 發布地址更改替換為新地址？"
+
+#: js/prefs.js:898
+msgid "Reset selected labels to default colors?"
+msgstr "將選取的可選標籤重置為預設顏色？"
+
+#: js/prefs.js:926
+msgid "Settings Profiles"
+msgstr "偏好設定的設定"
+
+#: js/prefs.js:935
+msgid "Remove selected profiles? Active and default profiles will not be removed."
+msgstr "移除選取的偏好設定？當前偏好與預設偏好不會被移除。"
+
+#: js/prefs.js:936
+msgid "Removing selected profiles..."
+msgstr "移除選取的偏好設定檔"
+
+#: js/prefs.js:948
+msgid "No profiles are selected."
+msgstr "未選擇偏好設定。"
+
+#: js/prefs.js:955
+#: js/prefs.js:997
+msgid "Activate selected profile?"
+msgstr "啟用選取的偏好設定？"
+
+#: js/prefs.js:964
+#: js/prefs.js:1008
+msgid "Please choose a profile to activate."
+msgstr "請選擇希望啟用的偏好設定。"
+
+#: js/prefs.js:969
+msgid "Creating profile..."
+msgstr "建立偏好設定檔..."
+
+#: js/prefs.js:1016
+msgid "This will invalidate all previously generated feed URLs. Continue?"
+msgstr "之前產生的摘要 URL 將會回到未認證狀態。是否繼續？"
+
+#: js/prefs.js:1017
+#: plugins/share/share_prefs.js:3
+msgid "Clearing URLs..."
 msgstr ""
 
-#: js/prefs.js:1501
-msgid "Clear all messages in the error log?"
-msgstr ""
+#: js/prefs.js:1020
+#, fuzzy
+msgid "Generated URLs cleared."
+msgstr "產生一個新的 URL"
 
-#: js/tt-rss.js:118
+#: js/prefs.js:1053
+#, fuzzy
+msgid "Rename category to:"
+msgstr "移除類別"
+
+#: js/prefs.js:1074
+msgid "Label Editor"
+msgstr "編輯預定義標籤"
+
+#: js/tt-rss.js:111
 msgid "Mark all articles as read?"
 msgstr "將所有文章標記為已讀？"
 
-#: js/tt-rss.js:124
+#: js/tt-rss.js:115
 #, fuzzy
 msgid "Marking all feeds as read..."
 msgstr "標記所有摘要為已讀"
 
-#: js/tt-rss.js:398
+#: js/tt-rss.js:351
 #, fuzzy
 msgid "Please enable mail plugin first."
 msgstr "請先選几個摘要吧。"
 
-#: js/tt-rss.js:527
+#: js/tt-rss.js:477
 #, fuzzy
 msgid "Please enable embed_original plugin first."
 msgstr "請先選几個摘要吧。"
 
-#: js/tt-rss.js:540
-#: js/tt-rss.js:723
+#: js/tt-rss.js:490
+#: js/tt-rss.js:653
 msgid "Widescreen is not available in combined mode."
 msgstr ""
 
-#: js/tt-rss.js:821
-msgid "You can't rescore this kind of feed."
-msgstr "無法重置此分類的摘要的評分。"
-
-#: js/tt-rss.js:826
-#: js/tt-rss.js:686
-msgid "Please select some feed first."
-msgstr "請先選幾個摘要吧。"
-
-#: js/tt-rss.js:831
-#, perl-format
-msgid "Rescore articles in %s?"
-msgstr "重置 %s 中文章的評分？"
-
-#: js/tt-rss.js:834
-#, fuzzy
-msgid "Rescoring articles..."
-msgstr "為文章重新評分"
-
-#: js/viewfeed.js:917
-#: js/viewfeed.js:955
-#: js/viewfeed.js:1003
-#: js/viewfeed.js:1924
-#: plugins/mail/mail.js:7
+#: js/viewfeed.js:444
+#: js/viewfeed.js:461
+#: js/viewfeed.js:484
+#: js/viewfeed.js:521
+#: js/viewfeed.js:542
+#: js/viewfeed.js:651
+#: js/viewfeed.js:685
+#: js/viewfeed.js:727
+#: js/viewfeed.js:1564
 #: plugins/mailto/init.js:7
-#: js/viewfeed.js:675
-#: js/viewfeed.js:697
-#: js/viewfeed.js:718
-#: js/viewfeed.js:777
-#: js/viewfeed.js:805
+#: plugins/mail/mail.js:7
 msgid "No articles are selected."
 msgstr "沒有選取任何文章。"
 
-#: js/viewfeed.js:925
+#: js/viewfeed.js:659
 #, 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:927
+#: js/viewfeed.js:661
 #, fuzzy, perl-format
 msgid "Delete %d selected article?"
 msgid_plural "Delete %d selected articles?"
 msgstr[0] "刪除選取的 %d 篇文章？"
 
-#: js/viewfeed.js:964
+#: js/viewfeed.js:694
 #, 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:967
+#: js/viewfeed.js:697
 #, fuzzy, perl-format
 msgid "Move %d archived article back?"
 msgid_plural "Move %d archived articles back?"
 msgstr[0] "將存檔的 %d 篇文章移回原處？"
 
-#: js/viewfeed.js:969
+#: js/viewfeed.js:698
 msgid "Please note that unstarred articles might get purged on next feed update."
 msgstr ""
 
-#: js/viewfeed.js:1009
+#: js/viewfeed.js:733
 #, 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:1029
+#: js/viewfeed.js:753
 msgid "Edit article Tags"
 msgstr "編輯文章的自訂標籤"
 
-#: js/viewfeed.js:1035
+#: js/viewfeed.js:757
 #, fuzzy
 msgid "Saving article tags..."
 msgstr "編輯文章的自訂標籤"
 
-#: js/viewfeed.js:1666
+#: js/viewfeed.js:1015
+msgid "No article is selected."
+msgstr "未選取任何文章。"
+
+#: js/viewfeed.js:1050
+msgid "No articles found to mark"
+msgstr "未找到需要標記的文章"
+
+#: js/viewfeed.js:1052
+#, fuzzy, perl-format
+msgid "Mark %d article as read?"
+msgid_plural "Mark %d articles as read?"
+msgstr[0] "將 %d 篇文章標記為已讀？"
+
+#: js/viewfeed.js:1312
 msgid "Open original article"
 msgstr "打開原始文章"
 
-#: js/viewfeed.js:1673
+#: js/viewfeed.js:1319
 msgid "Display article URL"
 msgstr "顯示文章網址"
 
-#: js/viewfeed.js:1780
+#: js/viewfeed.js:1426
 msgid "Assign label"
 msgstr "添加預定義標籤"
 
-#: js/viewfeed.js:1785
+#: js/viewfeed.js:1431
 msgid "Remove label"
 msgstr "移除預定義標籤"
 
-#: js/viewfeed.js:1817
+#: js/viewfeed.js:1463
 #, fuzzy
 msgid "Select articles in group"
 msgstr "選擇滑鼠指向的文章"
 
-#: js/viewfeed.js:1827
+#: js/viewfeed.js:1473
 #, fuzzy
 msgid "Mark group as read"
 msgstr "標記為已讀"
 
-#: js/viewfeed.js:1839
+#: js/viewfeed.js:1485
 msgid "Mark feed as read"
 msgstr "標記摘要為已讀"
 
-#: js/viewfeed.js:1892
+#: js/viewfeed.js:1538
 #, fuzzy
 msgid "Please enter new score for selected articles:"
 msgstr "刪除選取的 %d 篇文章？"
 
-#: js/viewfeed.js:1955
+#: js/viewfeed.js:1571
 #, fuzzy
 msgid "Please enter new score for this article:"
 msgstr "請填寫類別名稱："
 
-#: js/viewfeed.js:1986
+#: js/viewfeed.js:1591
 msgid "Article URL:"
 msgstr "文章網址： "
 
-#: plugins/note/note.js:17
-#, fuzzy
-msgid "Saving article note..."
-msgstr "編輯文章註記"
+#: plugins/embed_original/init.js:6
+msgid "Sorry, your browser does not support sandboxed iframes."
+msgstr ""
 
 #: plugins/af_psql_trgm/init.js:11
 #, fuzzy
 msgid "Related articles"
 msgstr "刪除文章"
 
+#: plugins/mailto/init.js:21
+#: plugins/mail/mail.js:21
+msgid "Forward article by email"
+msgstr "用郵件轉發文章"
+
+#: plugins/shorten_expanded/init.js:43
+#, fuzzy
+msgid "Click to expand article"
+msgstr "點擊以展開文章。"
+
 #: plugins/import_export/import_export.js:13
 msgid "Export Data"
 msgstr ""
@@ -3264,270 +3360,177 @@ msgstr "資料匯入"
 msgid "Please choose the file first."
 msgstr "請選擇檔案。"
 
-#: plugins/mail/mail.js:21
-#: plugins/mailto/init.js:21
-msgid "Forward article by email"
-msgstr "用郵件轉發文章"
+#: plugins/share/share_prefs.js:2
+msgid "This will invalidate all previously shared article URLs. Continue?"
+msgstr "之前共享文章的 URL 將會回到未認證狀態。是否繼續？"
 
-#: plugins/mail/mail.js:36
-msgid "Error sending email:"
+#: plugins/share/share_prefs.js:8
+msgid "Shared URLs cleared."
 msgstr ""
 
-#: plugins/mail/mail.js:38
-#, fuzzy
-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:45
-#, fuzzy
-msgid "Click to expand article"
-msgstr "點擊以展開文章。"
-
 #: plugins/share/share.js:10
 msgid "Share article by URL"
 msgstr "透過 URL 分享文章"
 
-#: plugins/share/share.js:14
+#: plugins/share/share.js:13
 #, fuzzy
 msgid "Generate new share URL for this article?"
 msgstr "請填寫類別名稱："
 
-#: plugins/share/share.js:18
+#: plugins/share/share.js:15
 msgid "Trying to change URL..."
 msgstr ""
 
-#: plugins/share/share.js:55
+#: plugins/share/share.js:48
 msgid "Remove sharing for this article?"
 msgstr "要取消分享此文章嗎？"
 
-#: plugins/share/share.js:59
+#: plugins/share/share.js:50
 msgid "Trying to unshare..."
 msgstr "正在取消分享..."
 
-#: plugins/share/share_prefs.js:3
-msgid "This will invalidate all previously shared article URLs. Continue?"
-msgstr "之前共享文章的 URL 將會回到未認證狀態。是否繼續？"
-
-#: plugins/share/share_prefs.js:6
-#: js/prefs.js:1277
-msgid "Clearing URLs..."
+#: plugins/mail/mail.js:30
+msgid "Error sending email:"
 msgstr ""
 
-#: plugins/share/share_prefs.js:13
-msgid "Shared URLs cleared."
-msgstr ""
+#: plugins/mail/mail.js:32
+#, fuzzy
+msgid "Your message has been sent."
+msgstr "您的個人數據已儲存。"
 
-#: js/feedlist.js:204
+#: plugins/note/note.js:15
+#, fuzzy
+msgid "Saving article note..."
+msgstr "編輯文章註記"
+
+#: js/feedlist.js:168
 #, fuzzy
 msgid "Your password is at default value"
 msgstr "您還在使用系統預設的密碼，請修改。"
 
-#: js/feedlist.js:453
+#: js/feedlist.js:413
 msgid "Mark all articles in %s as read?"
 msgstr "將 %s 中的全部文章標記為已讀？"
 
-#: js/functions.js:494
-msgid "Upload complete."
-msgstr "上傳完成！"
-
-#: js/functions.js:511
-msgid "Remove stored feed icon?"
-msgstr "移除已保存的摘要圖示？"
-
-#: js/functions.js:516
-msgid "Removing feed icon..."
-msgstr "移除已保存的摘要圖示？"
-
-#: js/functions.js:521
-msgid "Feed icon removed."
-msgstr "摘要圖示已移除。"
-
-#: js/functions.js:537
-msgid "Please select an image file to upload."
-msgstr "請選擇圖片文件上傳。"
-
-#: js/functions.js:539
-msgid "Upload new icon for this feed?"
-msgstr "為本摘要上傳一個新的圖示？"
-
-#: js/functions.js:540
-msgid "Uploading, please wait..."
-msgstr "上傳中，請稍候……"
-
-#: js/functions.js:550
-msgid "Please enter label caption:"
-msgstr "請填寫預定義標籤的說明："
-
-#: js/functions.js:555
-msgid "Can't create label: missing caption."
-msgstr "建立標籤失敗：沒有標題。"
-
-#: js/functions.js:797
+#: js/functions.js:764
 #, fuzzy
 msgid "Edit rule"
 msgstr "編輯過濾器"
 
-#: js/functions.js:819
+#: js/functions.js:786
 #, fuzzy
 msgid "Edit action"
 msgstr "摘要動作"
 
-#: js/functions.js:860
+#: js/functions.js:825
 msgid "Looking for articles (%d processed, %f found)..."
 msgstr ""
 
-#: js/functions.js:890
+#: js/functions.js:855
 #, fuzzy
 msgid "Found %d articles matching this filter:"
 msgstr "符合本過濾器條件的文章："
 
-#: js/functions.js:942
+#: js/functions.js:907
 msgid "Create Filter"
 msgstr "建立過濾器"
 
-#: js/functions.js:1060
-#: js/tt-rss.js:692
+#: js/functions.js:1016
+#: js/tt-rss.js:631
 msgid "Unsubscribe from %s?"
 msgstr "從 %s 取消訂閱？"
 
-#: js/functions.js:1063
+#: js/functions.js:1019
 msgid "Removing feed..."
 msgstr "移除摘要"
 
-#: js/functions.js:1489
+#: js/functions.js:1410
 msgid "Help"
 msgstr "說明"
 
-#: js/prefs.js:973
-msgid "Remove category %s? Any nested feeds would be placed into Uncategorized."
+#: js/prefs.js:44
+msgid "Please enter login:"
+msgstr "請輸入帳號名稱："
+
+#: js/prefs.js:51
+msgid "Can't create user: no login specified."
+msgstr "無法建立使用者：沒有指定登錄名。"
+
+#: js/prefs.js:55
+msgid "Adding user..."
+msgstr "使用者新增中..."
+
+#: js/prefs.js:74
+msgid "User Editor"
+msgstr "編輯使用者信息"
+
+#: js/prefs.js:104
+msgid "Edit Filter"
+msgstr "編輯過濾器"
+
+#: js/prefs.js:1175
+msgid "Subscribing to feeds..."
 msgstr ""
 
-#: js/prefs.js:979
-#, fuzzy
-msgid "Removing category..."
-msgstr "建立類別"
+#: js/prefs.js:1191
+msgid "Clear stored data for this plugin?"
+msgstr ""
 
-#: js/prefs.js:997
-msgid "Remove selected categories?"
-msgstr "移除所有選擇的類別？"
+#: js/prefs.js:1203
+msgid "Clear all messages in the error log?"
+msgstr ""
 
-#: js/prefs.js:1000
-#, fuzzy
-msgid "Removing selected categories..."
-msgstr "移除選定的類別"
-
-#: js/prefs.js:1013
-msgid "No categories are selected."
-msgstr "沒有選取任何類別。"
-
-#: js/prefs.js:1020
-#, fuzzy
-msgid "Category title:"
-msgstr "類別"
-
-#: js/prefs.js:1024
-#, fuzzy
-msgid "Creating category..."
-msgstr "建立過濾器"
-
-#: js/prefs.js:1047
-msgid "Feeds without recent updates"
-msgstr "最近沒更新的摘要"
-
-#: js/prefs.js:1091
-msgid "Replace current OPML publishing address with a new one?"
-msgstr "將當前的 OPML 發布地址更改替換為新地址？"
-
-#: js/prefs.js:1129
-msgid "Reset selected labels to default colors?"
-msgstr "將選取的可選標籤重置為預設顏色？"
-
-#: js/prefs.js:1161
-msgid "Settings Profiles"
-msgstr "偏好設定的設定"
-
-#: js/prefs.js:1170
-msgid "Remove selected profiles? Active and default profiles will not be removed."
-msgstr "移除選取的偏好設定？當前偏好與預設偏好不會被移除。"
-
-#: js/prefs.js:1173
-msgid "Removing selected profiles..."
-msgstr "移除選取的偏好設定檔"
-
-#: js/prefs.js:1189
-msgid "No profiles are selected."
-msgstr "未選擇偏好設定。"
-
-#: js/prefs.js:1197
-#: js/prefs.js:1250
-msgid "Activate selected profile?"
-msgstr "啟用選取的偏好設定？"
-
-#: js/prefs.js:1214
-#: js/prefs.js:1266
-msgid "Please choose a profile to activate."
-msgstr "請選擇希望啟用的偏好設定。"
-
-#: js/prefs.js:1219
-msgid "Creating profile..."
-msgstr "建立偏好設定檔..."
-
-#: js/prefs.js:1274
-msgid "This will invalidate all previously generated feed URLs. Continue?"
-msgstr "之前產生的摘要 URL 將會回到未認證狀態。是否繼續？"
-
-#: js/prefs.js:1284
-#, fuzzy
-msgid "Generated URLs cleared."
-msgstr "產生一個新的 URL"
-
-#: js/prefs.js:1356
-msgid "Label Editor"
-msgstr "編輯預定義標籤"
-
-#: js/tt-rss.js:681
+#: js/tt-rss.js:620
 msgid "You can't unsubscribe from the category."
 msgstr "您不能取消訂閱一個類別。"
 
-#: js/viewfeed.js:127
-#: js/viewfeed.js:177
-#: js/viewfeed.js:194
+#: js/tt-rss.js:625
+msgid "Please select some feed first."
+msgstr "請先選幾個摘要吧。"
+
+#: js/viewfeed.js:89
+#: js/viewfeed.js:135
+#: js/viewfeed.js:152
 #, fuzzy
 msgid "Click to open next unread feed."
 msgstr "點擊以編輯摘要"
 
-#: js/viewfeed.js:131
+#: js/viewfeed.js:93
 msgid "Cancel search"
 msgstr "取消搜尋"
 
-#: js/viewfeed.js:191
+#: js/viewfeed.js:149
 #, fuzzy
 msgid "New articles found, reload feed to continue."
 msgstr "暫時沒有文章。"
 
-#: js/viewfeed.js:620
+#: js/viewfeed.js:405
 #, fuzzy
 msgid "%d article selected"
 msgid_plural "%d articles selected"
 msgstr[0] "未選取任何文章。"
 
-#: js/viewfeed.js:1284
-msgid "No article is selected."
-msgstr "未選取任何文章。"
+#~ msgid "Rescore feed"
+#~ msgstr "為摘要重新評分"
 
-#: js/viewfeed.js:1319
-msgid "No articles found to mark"
-msgstr "未找到需要標記的文章"
+#~ msgid "Create label..."
+#~ msgstr "建立標籤"
+
+#~ msgid "Create filter..."
+#~ msgstr "建立過濾器"
+
+#~ msgid "You can't rescore this kind of feed."
+#~ msgstr "無法重置此分類的摘要的評分。"
+
+#~ msgid "Rescore articles in %s?"
+#~ msgstr "重置 %s 中文章的評分？"
 
-#: js/viewfeed.js:1321
 #, fuzzy
-msgid "Mark %d article as read?"
-msgid_plural "Mark %d articles as read?"
-msgstr[0] "將 %d 篇文章標記為已讀？"
+#~ msgid "Rescoring articles..."
+#~ msgstr "為文章重新評分"
+
+#~ msgid "Can't create label: missing caption."
+#~ msgstr "建立標籤失敗：沒有標題。"
 
 #~ msgid "Firefox integration"
 #~ msgstr "Firefox 整合"
diff --git a/messages.pot b/messages.pot
index a7956d41e..91f672d69 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: 2018-10-10 08:24+0300\n"
+"POT-Creation-Date: 2018-12-01 12:59+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Weekly"
 msgstr ""
 
-#: backend.php:103 classes/pref/users.php:47 classes/pref/system.php:51
+#: backend.php:103 classes/pref/system.php:51 classes/pref/users.php:47
 msgid "User"
 msgstr ""
 
@@ -160,15 +160,15 @@ msgstr ""
 msgid "Plugin not found"
 msgstr ""
 
-#: index.php:151 index.php:167 index.php:285 prefs.php:120
+#: index.php:151 index.php:167 index.php:282 prefs.php:120
 #: classes/backend.php:5 classes/pref/labels.php:294
-#: classes/pref/feeds.php:1230 classes/pref/filters.php:822 js/feedlist.js:148
-#: js/feedlist.js:491 js/feedlist.js:539 js/functions.js:314
-#: js/functions.js:1336 js/prefs.js:562 js/prefs.js:754 js/prefs.js:1488
-#: js/prefs.js:1503 js/tt-rss.js:547 js/viewfeed.js:1180
-#: plugins/import_export/import_export.js:17 js/functions.js:565
-#: js/prefs.js:1200 js/prefs.js:1253 js/prefs.js:1292 js/prefs.js:1305
-#: js/prefs.js:1316 js/prefs.js:1331 js/tt-rss.js:564 js/viewfeed.js:760
+#: classes/pref/filters.php:822 classes/pref/feeds.php:1229 js/feedlist.js:118
+#: js/feedlist.js:446 js/feedlist.js:487 js/functions.js:328
+#: js/functions.js:551 js/functions.js:1286 js/prefs.js:477 js/prefs.js:617
+#: js/prefs.js:956 js/prefs.js:1000 js/prefs.js:1028 js/prefs.js:1037
+#: js/prefs.js:1045 js/prefs.js:1057 js/tt-rss.js:497 js/viewfeed.js:509
+#: js/viewfeed.js:928 plugins/import_export/import_export.js:17
+#: js/prefs.js:1192 js/prefs.js:1205 js/tt-rss.js:510
 msgid "Loading, please wait..."
 msgstr ""
 
@@ -184,11 +184,11 @@ msgstr ""
 msgid "All Articles"
 msgstr ""
 
-#: index.php:194 include/functions.php:1227 classes/feeds.php:110
+#: index.php:194 include/functions.php:1172 classes/feeds.php:110
 msgid "Starred"
 msgstr ""
 
-#: index.php:195 include/functions.php:1228 classes/feeds.php:111
+#: index.php:195 include/functions.php:1173 classes/feeds.php:111
 msgid "Published"
 msgstr ""
 
@@ -224,8 +224,8 @@ msgstr ""
 msgid "Title"
 msgstr ""
 
-#: index.php:211 index.php:251 include/functions.php:1215 classes/feeds.php:115
-#: js/FeedTree.js:41 js/FeedTree.js:69
+#: index.php:211 index.php:250 include/functions.php:1160 classes/feeds.php:115
+#: js/FeedTree.js:42 js/FeedTree.js:70
 msgid "Mark as read"
 msgstr ""
 
@@ -261,7 +261,7 @@ msgstr ""
 msgid "Feed actions:"
 msgstr ""
 
-#: index.php:246 classes/handler/public.php:551
+#: index.php:246 classes/handler/public.php:575
 msgid "Subscribe to feed..."
 msgstr ""
 
@@ -269,52 +269,40 @@ msgstr ""
 msgid "Edit this feed..."
 msgstr ""
 
-#: index.php:248
-msgid "Rescore feed"
-msgstr ""
-
-#: index.php:249 classes/pref/feeds.php:770 classes/pref/feeds.php:1203
-#: js/PrefFeedTree.js:61
+#: index.php:248 classes/pref/feeds.php:769 classes/pref/feeds.php:1202
+#: js/PrefFeedTree.js:62
 msgid "Unsubscribe"
 msgstr ""
 
-#: index.php:250
+#: index.php:249
 msgid "All feeds:"
 msgstr ""
 
-#: index.php:252
+#: index.php:251
 msgid "(Un)hide read feeds"
 msgstr ""
 
-#: index.php:253
+#: index.php:252
 msgid "Other actions:"
 msgstr ""
 
-#: index.php:254 include/functions.php:1201
+#: index.php:253 include/functions.php:1146
 msgid "Toggle widescreen mode"
 msgstr ""
 
-#: index.php:255
-msgid "Create label..."
-msgstr ""
-
-#: index.php:256
-msgid "Create filter..."
-msgstr ""
-
-#: index.php:257
+#: index.php:254
 msgid "Keyboard shortcuts help"
 msgstr ""
 
-#: index.php:266
+#: index.php:263
 msgid "Logout"
 msgstr ""
 
-#: index.php:272
+#: index.php:269
 msgid "Updates are available from Git."
 msgstr ""
 
-#: prefs.php:33 prefs.php:138 include/functions.php:1230
+#: prefs.php:33 prefs.php:138 include/functions.php:1175
 #: classes/pref/prefs.php:425
 msgid "Preferences"
 msgstr ""
@@ -327,8 +315,8 @@ msgstr ""
 msgid "Exit preferences"
 msgstr ""
 
-#: prefs.php:141 classes/pref/feeds.php:114 classes/pref/feeds.php:1138
-#: classes/pref/feeds.php:1192
+#: prefs.php:141 classes/pref/feeds.php:114 classes/pref/feeds.php:1137
+#: classes/pref/feeds.php:1191
 msgid "Feeds"
 msgstr ""
 
@@ -336,7 +324,7 @@ msgstr ""
 msgid "Filters"
 msgstr ""
 
-#: prefs.php:147 classes/pref/labels.php:94 classes/feeds.php:1710
+#: prefs.php:147 classes/feeds.php:1696 classes/pref/labels.php:94
 msgid "Labels"
 msgstr ""
 
@@ -348,71 +336,71 @@ msgstr ""
 msgid "System"
 msgstr ""
 
-#: register.php:186 include/login_form.php:162
+#: register.php:185 include/login_form.php:162
 msgid "Create new account"
 msgstr ""
 
-#: register.php:192
+#: register.php:191
 msgid "New user registrations are administratively disabled."
 msgstr ""
 
-#: register.php:196 register.php:241 register.php:254 register.php:269
-#: register.php:288 register.php:336 register.php:346 register.php:358
-#: classes/handler/public.php:623 classes/handler/public.php:697
-#: classes/handler/public.php:798 classes/handler/public.php:877
-#: classes/handler/public.php:891 classes/handler/public.php:898
-#: classes/handler/public.php:923
+#: register.php:195 register.php:240 register.php:253 register.php:268
+#: register.php:287 register.php:334 register.php:344 register.php:356
+#: classes/handler/public.php:647 classes/handler/public.php:721
+#: 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 ""
 
-#: register.php:217
+#: register.php:216
 msgid ""
 "Your temporary password will be sent to the specified email. Accounts, which "
 "were not logged in once, are erased automatically 24 hours after temporary "
 "password is sent."
 msgstr ""
 
-#: register.php:223
+#: register.php:222
 msgid "Desired login:"
 msgstr ""
 
-#: register.php:226
+#: register.php:225
 msgid "Check availability"
 msgstr ""
 
-#: register.php:228 classes/handler/public.php:713
+#: register.php:227 classes/handler/public.php:737
 msgid "Email:"
 msgstr ""
 
-#: register.php:231 classes/handler/public.php:718
+#: register.php:230 classes/handler/public.php:742
 msgid "How much is two plus two:"
 msgstr ""
 
-#: register.php:234
+#: register.php:233
 msgid "Submit registration"
 msgstr ""
 
-#: register.php:252
+#: register.php:251
 msgid "Your registration information is incomplete."
 msgstr ""
 
-#: register.php:267
+#: register.php:266
 msgid "Sorry, this username is already taken."
 msgstr ""
 
-#: register.php:286
+#: register.php:285
 msgid "Registration failed."
 msgstr ""
 
-#: register.php:333
+#: register.php:331
 msgid "Account created successfully."
 msgstr ""
 
-#: register.php:355
+#: register.php:353
 msgid "New user registrations are currently closed."
 msgstr ""
 
-#: update.php:66
+#: update.php:67
 msgid "Tiny Tiny RSS data update script."
 msgstr ""
 
@@ -421,8 +409,8 @@ msgstr ""
 msgid "All feeds"
 msgstr ""
 
-#: include/controls.php:138 include/controls.php:230 classes/opml.php:512
-#: classes/digest.php:120 classes/pref/feeds.php:233 classes/feeds.php:1722
+#: include/controls.php:138 include/controls.php:230 classes/digest.php:124
+#: classes/feeds.php:1708 classes/pref/feeds.php:233 classes/opml.php:512
 msgid "Uncategorized"
 msgstr ""
 
@@ -437,269 +425,269 @@ msgstr[1] ""
 msgid "No feeds found."
 msgstr ""
 
-#: include/functions.php:983
+#: include/functions.php:928
 #, php-format
 msgid "%d min"
 msgstr ""
 
-#: include/functions.php:1177
+#: include/functions.php:1122
 msgid "Navigation"
 msgstr ""
 
-#: include/functions.php:1178
+#: include/functions.php:1123
 msgid "Open next feed"
 msgstr ""
 
-#: include/functions.php:1179
+#: include/functions.php:1124
 msgid "Open previous feed"
 msgstr ""
 
-#: include/functions.php:1180
+#: include/functions.php:1125
 msgid "Open next article"
 msgstr ""
 
-#: include/functions.php:1181
+#: include/functions.php:1126
 msgid "Open previous article"
 msgstr ""
 
-#: include/functions.php:1182
+#: include/functions.php:1127
 msgid "Open next article (don't scroll long articles)"
 msgstr ""
 
-#: include/functions.php:1183
+#: include/functions.php:1128
 msgid "Open previous article (don't scroll long articles)"
 msgstr ""
 
-#: include/functions.php:1184
+#: include/functions.php:1129
 msgid "Move to next article (don't expand or mark read)"
 msgstr ""
 
-#: include/functions.php:1185
+#: include/functions.php:1130
 msgid "Move to previous article (don't expand or mark read)"
 msgstr ""
 
-#: include/functions.php:1186
+#: include/functions.php:1131
 msgid "Show search dialog"
 msgstr ""
 
-#: include/functions.php:1187
+#: include/functions.php:1132
 msgid "Article"
 msgstr ""
 
-#: include/functions.php:1188 js/viewfeed.js:1695
+#: include/functions.php:1133 js/viewfeed.js:1341
 msgid "Toggle starred"
 msgstr ""
 
-#: include/functions.php:1189 js/viewfeed.js:1707
+#: include/functions.php:1134 js/viewfeed.js:1353
 msgid "Toggle published"
 msgstr ""
 
-#: include/functions.php:1190 js/viewfeed.js:1682
+#: include/functions.php:1135 js/viewfeed.js:1328
 msgid "Toggle unread"
 msgstr ""
 
-#: include/functions.php:1191
+#: include/functions.php:1136
 msgid "Edit tags"
 msgstr ""
 
-#: include/functions.php:1192
+#: include/functions.php:1137
 msgid "Open in new window"
 msgstr ""
 
-#: include/functions.php:1193 js/viewfeed.js:1728
+#: include/functions.php:1138 js/viewfeed.js:1374
 msgid "Mark below as read"
 msgstr ""
 
-#: include/functions.php:1194 js/viewfeed.js:1721
+#: include/functions.php:1139 js/viewfeed.js:1367
 msgid "Mark above as read"
 msgstr ""
 
-#: include/functions.php:1195
+#: include/functions.php:1140
 msgid "Scroll down"
 msgstr ""
 
-#: include/functions.php:1196
+#: include/functions.php:1141
 msgid "Scroll up"
 msgstr ""
 
-#: include/functions.php:1197
+#: include/functions.php:1142
 msgid "Select article under cursor"
 msgstr ""
 
-#: include/functions.php:1198
+#: include/functions.php:1143
 msgid "Email article"
 msgstr ""
 
-#: include/functions.php:1199
+#: include/functions.php:1144
 msgid "Close/collapse article"
 msgstr ""
 
-#: include/functions.php:1200
+#: include/functions.php:1145
 msgid "Toggle article expansion (combined mode)"
 msgstr ""
 
-#: include/functions.php:1202 plugins/embed_original/init.php:33
+#: include/functions.php:1147 plugins/embed_original/init.php:33
 msgid "Toggle embed original"
 msgstr ""
 
-#: include/functions.php:1203
+#: include/functions.php:1148
 msgid "Article selection"
 msgstr ""
 
-#: include/functions.php:1204
+#: include/functions.php:1149
 msgid "Select all articles"
 msgstr ""
 
-#: include/functions.php:1205
+#: include/functions.php:1150
 msgid "Select unread"
 msgstr ""
 
-#: include/functions.php:1206
+#: include/functions.php:1151
 msgid "Select starred"
 msgstr ""
 
-#: include/functions.php:1207
+#: include/functions.php:1152
 msgid "Select published"
 msgstr ""
 
-#: include/functions.php:1208
+#: include/functions.php:1153
 msgid "Invert selection"
 msgstr ""
 
-#: include/functions.php:1209
+#: include/functions.php:1154
 msgid "Deselect everything"
 msgstr ""
 
-#: include/functions.php:1210 classes/pref/feeds.php:522
-#: classes/pref/feeds.php:794
+#: include/functions.php:1155 classes/pref/feeds.php:521
+#: classes/pref/feeds.php:793
 msgid "Feed"
 msgstr ""
 
-#: include/functions.php:1211
+#: include/functions.php:1156
 msgid "Refresh current feed"
 msgstr ""
 
-#: include/functions.php:1212
+#: include/functions.php:1157
 msgid "Un/hide read feeds"
 msgstr ""
 
-#: include/functions.php:1213 classes/pref/feeds.php:1195
+#: include/functions.php:1158 classes/pref/feeds.php:1194
 msgid "Subscribe to feed"
 msgstr ""
 
-#: include/functions.php:1214 js/FeedTree.js:48 js/PrefFeedTree.js:55
-#: js/viewfeed.js:1846
+#: include/functions.php:1159 js/FeedTree.js:49 js/PrefFeedTree.js:56
+#: js/viewfeed.js:1492
 msgid "Edit feed"
 msgstr ""
 
-#: include/functions.php:1216
+#: include/functions.php:1161
 msgid "Reverse headlines"
 msgstr ""
 
-#: include/functions.php:1217
+#: include/functions.php:1162
 msgid "Toggle headline grouping"
 msgstr ""
 
-#: include/functions.php:1218
+#: include/functions.php:1163
 msgid "Debug feed update"
 msgstr ""
 
-#: include/functions.php:1219
+#: include/functions.php:1164
 msgid "Debug viewfeed()"
 msgstr ""
 
-#: include/functions.php:1220 js/FeedTree.js:97
+#: include/functions.php:1165 js/FeedTree.js:98
 msgid "Mark all feeds as read"
 msgstr ""
 
-#: include/functions.php:1221
+#: include/functions.php:1166
 msgid "Un/collapse current category"
 msgstr ""
 
-#: include/functions.php:1222
-msgid "Toggle combined mode"
-msgstr ""
-
-#: include/functions.php:1223
+#: include/functions.php:1167
 msgid "Toggle auto expand in combined mode"
 msgstr ""
 
-#: include/functions.php:1224
+#: include/functions.php:1168
+msgid "Toggle combined mode"
+msgstr ""
+
+#: include/functions.php:1169
 msgid "Go to"
 msgstr ""
 
-#: include/functions.php:1225 classes/feeds.php:1583
+#: include/functions.php:1170 classes/feeds.php:1569
 msgid "All articles"
 msgstr ""
 
-#: include/functions.php:1226
+#: include/functions.php:1171
 msgid "Fresh"
 msgstr ""
 
-#: include/functions.php:1229 js/tt-rss.js:491 js/tt-rss.js:660
+#: include/functions.php:1174 js/tt-rss.js:439 js/tt-rss.js:599
 msgid "Tag cloud"
 msgstr ""
 
-#: include/functions.php:1231
+#: include/functions.php:1176
 msgid "Other"
 msgstr ""
 
-#: include/functions.php:1232 classes/pref/labels.php:279
+#: include/functions.php:1177 classes/pref/labels.php:279
 msgid "Create label"
 msgstr ""
 
-#: include/functions.php:1233 classes/pref/filters.php:801
+#: include/functions.php:1178 classes/pref/filters.php:801
 msgid "Create filter"
 msgstr ""
 
-#: include/functions.php:1234
+#: include/functions.php:1179
 msgid "Un/collapse sidebar"
 msgstr ""
 
-#: include/functions.php:1235
+#: include/functions.php:1180
 msgid "Show help dialog"
 msgstr ""
 
-#: include/functions.php:2582
+#: include/functions.php:2529
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: include/functions.php:2583
+#: include/functions.php:2530
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: include/functions.php:2584
+#: include/functions.php:2531
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: include/functions.php:2585
+#: include/functions.php:2532
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: include/functions.php:2586
+#: include/functions.php:2533
 msgid "No file was uploaded"
 msgstr ""
 
-#: include/functions.php:2587
+#: include/functions.php:2534
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: include/functions.php:2588
+#: include/functions.php:2535
 msgid "Failed to write file to disk."
 msgstr ""
 
-#: include/functions.php:2589
+#: include/functions.php:2536
 msgid "A PHP extension stopped the file upload."
 msgstr ""
 
-#: include/login_form.php:107 classes/handler/public.php:446
-#: classes/handler/public.php:708
+#: include/login_form.php:107 classes/handler/public.php:466
+#: classes/handler/public.php:732
 msgid "Login:"
 msgstr ""
 
-#: include/login_form.php:117 classes/handler/public.php:449
+#: include/login_form.php:117 classes/handler/public.php:469
 msgid "Password:"
 msgstr ""
 
@@ -711,8 +699,8 @@ msgstr ""
 msgid "Profile:"
 msgstr ""
 
-#: include/login_form.php:133 classes/handler/public.php:252
-#: classes/pref/prefs.php:1037 classes/rpc.php:69
+#: include/login_form.php:133 classes/pref/prefs.php:1037 classes/rpc.php:69
+#: classes/handler/public.php:272
 msgid "Default profile"
 msgstr ""
 
@@ -728,170 +716,26 @@ msgstr ""
 msgid "Remember me"
 msgstr ""
 
-#: include/login_form.php:159 classes/handler/public.php:454
+#: include/login_form.php:159 classes/handler/public.php:474
 msgid "Log in"
 msgstr ""
 
-#: include/sessions.php:46
+#: include/sessions.php:45
 msgid "Session failed to validate (schema version changed)"
 msgstr ""
 
-#: include/sessions.php:62
+#: include/sessions.php:53
+msgid "Session failed to validate (UA changed)."
+msgstr ""
+
+#: include/sessions.php:67
 msgid "Session failed to validate (password changed)"
 msgstr ""
 
-#: include/sessions.php:69
+#: include/sessions.php:74
 msgid "Session failed to validate (user not found)"
 msgstr ""
 
-#: classes/article.php:26
-msgid "Article not found."
-msgstr ""
-
-#: classes/article.php:211
-msgid "Tags for this article (separated by commas):"
-msgstr ""
-
-#: classes/article.php:236 classes/pref/labels.php:82
-#: classes/pref/users.php:103 classes/pref/feeds.php:774
-#: classes/pref/feeds.php:914 classes/pref/filters.php:525
-#: classes/pref/prefs.php:982 plugins/nsfw/init.php:85 plugins/note/init.php:58
-#: plugins/af_readability/init.php:80 plugins/af_redditimgur/init.php:66
-#: plugins/af_psql_trgm/init.php:188 plugins/mail/init.php:65
-#: plugins/af_zz_imgproxy/init.php:238
-msgid "Save"
-msgstr ""
-
-#: classes/article.php:238 classes/handler/public.php:423
-#: classes/handler/public.php:457 classes/pref/labels.php:84
-#: classes/pref/users.php:105 classes/pref/feeds.php:775
-#: classes/pref/feeds.php:917 classes/pref/feeds.php:1672
-#: classes/pref/filters.php:528 classes/pref/filters.php:945
-#: classes/pref/filters.php:1022 classes/pref/filters.php:1115
-#: classes/pref/prefs.php:984 classes/feeds.php:1037 classes/feeds.php:1089
-#: classes/feeds.php:1128 plugins/note/init.php:60 plugins/mail/init.php:179
-msgid "Cancel"
-msgstr ""
-
-#: classes/article.php:337 classes/article.php:720 classes/article.php:875
-msgid "no tags"
-msgstr ""
-
-#: classes/article.php:448
-msgid "unknown type"
-msgstr ""
-
-#: classes/article.php:525
-msgid "Attachments"
-msgstr ""
-
-#: classes/article.php:626 classes/feeds.php:661
-msgid "comment"
-msgid_plural "comments"
-msgstr[0] ""
-msgstr[1] ""
-
-#: classes/article.php:630 classes/feeds.php:665
-msgid "comments"
-msgstr ""
-
-#: classes/article.php:689
-msgid " - "
-msgstr ""
-
-#: classes/article.php:730 classes/feeds.php:647
-msgid "Edit tags for this article"
-msgstr ""
-
-#: classes/article.php:763 classes/feeds.php:602
-msgid "Originally from:"
-msgstr ""
-
-#: classes/article.php:774 classes/pref/feeds.php:539 classes/feeds.php:613
-msgid "Feed URL"
-msgstr ""
-
-#: classes/article.php:811 classes/backend.php:103 classes/dlg.php:33
-#: classes/dlg.php:56 classes/dlg.php:89 classes/dlg.php:154
-#: classes/dlg.php:181 classes/dlg.php:197 classes/pref/feeds.php:1466
-#: classes/pref/feeds.php:1533 classes/pref/filters.php:208
-#: classes/pref/prefs.php:1099 plugins/af_psql_trgm/init.php:109
-#: plugins/import_export/init.php:446 plugins/import_export/init.php:490
-#: plugins/share/init.php:128
-msgid "Close this window"
-msgstr ""
-
-#: classes/article.php:913
-msgid "(edit note)"
-msgstr ""
-
-#: classes/opml.php:31 classes/opml.php:36
-msgid "OPML Utility"
-msgstr ""
-
-#: classes/opml.php:40
-msgid "Importing OPML..."
-msgstr ""
-
-#: classes/opml.php:45
-msgid "Return to preferences"
-msgstr ""
-
-#: classes/opml.php:301
-#, php-format
-msgid "Adding feed: %s"
-msgstr ""
-
-#: classes/opml.php:312
-#, php-format
-msgid "Duplicate feed: %s"
-msgstr ""
-
-#: classes/opml.php:326
-#, php-format
-msgid "Adding label %s"
-msgstr ""
-
-#: classes/opml.php:329
-#, php-format
-msgid "Duplicate label: %s"
-msgstr ""
-
-#: classes/opml.php:341
-#, php-format
-msgid "Setting preference key %s to %s"
-msgstr ""
-
-#: classes/opml.php:377
-msgid "Adding filter..."
-msgstr ""
-
-#: classes/opml.php:512
-#, php-format
-msgid "Processing category: %s"
-msgstr ""
-
-#: classes/opml.php:558
-#, php-format
-msgid "Upload failed with error code %d"
-msgstr ""
-
-#: classes/opml.php:570 plugins/import_export/init.php:471
-msgid "Unable to move uploaded file."
-msgstr ""
-
-#: classes/opml.php:574 plugins/import_export/init.php:475
-msgid "Error: please upload OPML file."
-msgstr ""
-
-#: classes/opml.php:585
-msgid "Error: unable to find moved OPML file."
-msgstr ""
-
-#: classes/opml.php:594
-msgid "Error while parsing document."
-msgstr ""
-
 #: classes/backend.php:31
 msgid "Other interface tips are available in the Tiny Tiny RSS wiki."
 msgstr ""
@@ -912,165 +756,288 @@ msgstr ""
 msgid "Help topic not found."
 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."
+#: classes/backend.php:103 classes/pref/filters.php:208
+#: classes/pref/feeds.php:1465 classes/pref/feeds.php:1532
+#: classes/pref/prefs.php:1099 classes/dlg.php:33 classes/dlg.php:56
+#: classes/dlg.php:89 classes/dlg.php:154 classes/dlg.php:181
+#: classes/dlg.php:197 classes/article.php:810
+#: plugins/af_psql_trgm/init.php:109 plugins/import_export/init.php:446
+#: plugins/import_export/init.php:490 plugins/share/init.php:128
+msgid "Close this window"
 msgstr ""
 
-#: classes/dlg.php:44
-msgid "Your Public OPML URL is:"
+#: classes/feeds.php:53
+msgid "View as RSS feed"
 msgstr ""
 
-#: classes/dlg.php:53 classes/dlg.php:178 plugins/share/init.php:125
-msgid "Generate new URL"
+#: classes/feeds.php:54 classes/feeds.php:140 classes/pref/feeds.php:1326
+msgid "View as RSS"
 msgstr ""
 
-#: classes/dlg.php:67
-msgid ""
-"Update daemon is enabled in configuration, but daemon process is not "
-"running, which prevents all feeds from updating. Please start the daemon "
-"process or contact instance owner."
-msgstr ""
-
-#: classes/dlg.php:71 classes/dlg.php:80
-msgid "Last update:"
-msgstr ""
-
-#: classes/dlg.php:76
-msgid ""
-"Update daemon is taking too long to perform a feed update. This could "
-"indicate a problem like crash or a hang. Please check the daemon process or "
-"contact instance owner."
-msgstr ""
-
-#: classes/dlg.php:169
-msgid "You can view this feed as RSS using the following URL:"
-msgstr ""
-
-#: classes/dlg.php:190
-msgid ""
-"You are using default tt-rss password. Please change it in the Preferences "
-"(Personal data / Authentication)."
-msgstr ""
-
-#: classes/dlg.php:194
-msgid "Open Preferences"
-msgstr ""
-
-#: classes/handler/public.php:387 plugins/bookmarklets/init.php:40
-msgid "Share with Tiny Tiny RSS"
-msgstr ""
-
-#: classes/handler/public.php:395
-msgid "Title:"
-msgstr ""
-
-#: classes/handler/public.php:397 classes/pref/feeds.php:537
-msgid "URL:"
-msgstr ""
-
-#: classes/handler/public.php:399
-msgid "Content:"
-msgstr ""
-
-#: classes/handler/public.php:401
-msgid "Labels:"
-msgstr ""
-
-#: classes/handler/public.php:420
-msgid "Shared article will appear in the Published feed."
-msgstr ""
-
-#: classes/handler/public.php:422
-msgid "Share"
-msgstr ""
-
-#: classes/handler/public.php:444
-msgid "Not logged in"
-msgstr ""
-
-#: classes/handler/public.php:504
-msgid "Incorrect username or password"
-msgstr ""
-
-#: classes/handler/public.php:557
+#: classes/feeds.php:62
 #, php-format
-msgid "Already subscribed to <b>%s</b>."
+msgid "Last updated: %s"
 msgstr ""
 
-#: classes/handler/public.php:560
+#: classes/feeds.php:100
+msgid "Select..."
+msgstr ""
+
+#: classes/feeds.php:102 classes/pref/labels.php:273
+#: classes/pref/filters.php:391 classes/pref/filters.php:449
+#: classes/pref/filters.php:795 classes/pref/filters.php:878
+#: classes/pref/filters.php:905 classes/pref/feeds.php:1185
+#: classes/pref/feeds.php:1416 classes/pref/feeds.php:1481
+#: classes/pref/users.php:358 classes/pref/prefs.php:996
+msgid "All"
+msgstr ""
+
+#: classes/feeds.php:104
+msgid "Invert"
+msgstr ""
+
+#: classes/feeds.php:105 classes/pref/labels.php:275
+#: classes/pref/filters.php:393 classes/pref/filters.php:451
+#: classes/pref/filters.php:797 classes/pref/filters.php:880
+#: classes/pref/filters.php:907 classes/pref/feeds.php:1187
+#: classes/pref/feeds.php:1418 classes/pref/feeds.php:1483
+#: classes/pref/users.php:360 classes/pref/prefs.php:998
+msgid "None"
+msgstr ""
+
+#: classes/feeds.php:107
+msgid "Selection toggle:"
+msgstr ""
+
+#: classes/feeds.php:113
+msgid "Selection:"
+msgstr ""
+
+#: classes/feeds.php:116
+msgid "Set score"
+msgstr ""
+
+#: classes/feeds.php:119
+msgid "Archive"
+msgstr ""
+
+#: classes/feeds.php:121
+msgid "Move back"
+msgstr ""
+
+#: classes/feeds.php:122 classes/pref/filters.php:400
+#: classes/pref/filters.php:458 classes/pref/filters.php:887
+#: classes/pref/filters.php:914
+msgid "Delete"
+msgstr ""
+
+#: classes/feeds.php:127 classes/feeds.php:132 plugins/mailto/init.php:25
+#: plugins/mail/init.php:76
+msgid "Forward by email"
+msgstr ""
+
+#: classes/feeds.php:136
+msgid "Feed:"
+msgstr ""
+
+#: classes/feeds.php:193 classes/feeds.php:802
+msgid "Feed not found."
+msgstr ""
+
+#: classes/feeds.php:255
+msgid "Never"
+msgstr ""
+
+#: classes/feeds.php:341
 #, php-format
-msgid "Subscribed to <b>%s</b>."
+msgid "Imported at %s"
 msgstr ""
 
-#: classes/handler/public.php:563
-#, php-format
-msgid "Could not subscribe to <b>%s</b>."
+#: classes/feeds.php:391 classes/feeds.php:484
+msgid "mark feed as read"
 msgstr ""
 
-#: classes/handler/public.php:566
-#, php-format
-msgid "No feeds found in <b>%s</b>."
+#: classes/feeds.php:540
+msgid "Collapse article"
 msgstr ""
 
-#: classes/handler/public.php:569
-msgid "Multiple feed URLs found."
+#: classes/feeds.php:592 classes/article.php:762
+msgid "Originally from:"
 msgstr ""
 
-#: classes/handler/public.php:573
-#, php-format
-msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
+#: classes/feeds.php:603 classes/pref/feeds.php:538 classes/article.php:773
+msgid "Feed URL"
 msgstr ""
 
-#: classes/handler/public.php:591
-msgid "Subscribe to selected feed"
+#: classes/feeds.php:630 classes/article.php:729
+msgid "Edit tags for this article"
 msgstr ""
 
-#: classes/handler/public.php:618
-msgid "Edit subscription options"
+#: classes/feeds.php:644 classes/article.php:625
+msgid "comment"
+msgid_plural "comments"
+msgstr[0] ""
+msgstr[1] ""
+
+#: classes/feeds.php:648 classes/article.php:629
+msgid "comments"
 msgstr ""
 
-#: classes/handler/public.php:656
-msgid "Password recovery"
+#: classes/feeds.php:686
+msgid "No unread articles found to display."
 msgstr ""
 
-#: classes/handler/public.php:701
+#: classes/feeds.php:689
+msgid "No updated articles found to display."
+msgstr ""
+
+#: classes/feeds.php:692
+msgid "No starred articles found to display."
+msgstr ""
+
+#: classes/feeds.php:696
 msgid ""
-"You will need to provide valid account name and email. A password reset link "
-"will be sent to your email address."
+"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/handler/public.php:723 classes/pref/users.php:372
-msgid "Reset password"
+#: classes/feeds.php:698
+msgid "No articles found to display."
 msgstr ""
 
-#: classes/handler/public.php:733
-msgid "Some of the required form parameters are missing or incorrect."
+#: classes/feeds.php:714 classes/feeds.php:905
+#, php-format
+msgid "Feeds last updated at %s"
 msgstr ""
 
-#: classes/handler/public.php:737 classes/handler/public.php:806
-msgid "Go back"
+#: classes/feeds.php:726 classes/feeds.php:917
+msgid "Some feeds have update errors (click for details)"
 msgstr ""
 
-#: classes/handler/public.php:775
-msgid "[tt-rss] Password reset request"
+#: classes/feeds.php:894
+msgid "No feed selected."
 msgstr ""
 
-#: classes/handler/public.php:802
-msgid "Sorry, login and email combination not found."
+#: classes/feeds.php:958 classes/feeds.php:966
+msgid "Feed or site URL"
 msgstr ""
 
-#: classes/handler/public.php:824
-msgid "Your access level is insufficient to run this script."
+#: classes/feeds.php:972 classes/pref/feeds.php:559 classes/pref/feeds.php:800
+#: classes/pref/feeds.php:1632
+msgid "Place in category:"
 msgstr ""
 
-#: classes/handler/public.php:850
-msgid "Database Updater"
+#: classes/feeds.php:980
+msgid "Available feeds"
 msgstr ""
 
-#: classes/handler/public.php:915
-msgid "Perform updates"
+#: classes/feeds.php:992 classes/pref/feeds.php:621 classes/pref/feeds.php:848
+#: classes/pref/users.php:61
+msgid "Authentication"
+msgstr ""
+
+#: classes/feeds.php:996 classes/pref/feeds.php:625 classes/pref/feeds.php:852
+#: classes/pref/feeds.php:1646 classes/pref/users.php:403
+msgid "Login"
+msgstr ""
+
+#: classes/feeds.php:1000 classes/pref/feeds.php:631 classes/pref/feeds.php:860
+#: classes/pref/feeds.php:1649 classes/pref/prefs.php:243
+msgid "Password"
+msgstr ""
+
+#: classes/feeds.php:1011 classes/pref/feeds.php:645
+msgid "This feed requires authentication."
+msgstr ""
+
+#: classes/feeds.php:1014 classes/feeds.php:1070 classes/pref/feeds.php:1668
+msgid "Subscribe"
+msgstr ""
+
+#: classes/feeds.php:1017
+msgid "More feeds"
+msgstr ""
+
+#: classes/feeds.php:1020 classes/feeds.php:1072 classes/feeds.php:1111
+#: classes/pref/labels.php:84 classes/pref/filters.php:528
+#: classes/pref/filters.php:945 classes/pref/filters.php:1022
+#: classes/pref/filters.php:1115 classes/pref/feeds.php:774
+#: classes/pref/feeds.php:916 classes/pref/feeds.php:1669
+#: classes/pref/users.php:105 classes/pref/prefs.php:984
+#: classes/article.php:238 classes/handler/public.php:443
+#: classes/handler/public.php:477 plugins/mail/init.php:179
+#: plugins/note/init.php:60
+msgid "Cancel"
+msgstr ""
+
+#: classes/feeds.php:1042 classes/feeds.php:1110 classes/pref/filters.php:788
+#: classes/pref/feeds.php:1178 classes/pref/users.php:345 js/tt-rss.js:152
+msgid "Search"
+msgstr ""
+
+#: classes/feeds.php:1046
+msgid "Popular feeds"
+msgstr ""
+
+#: classes/feeds.php:1047
+msgid "Feed archive"
+msgstr ""
+
+#: classes/feeds.php:1050
+msgid "limit:"
+msgstr ""
+
+#: classes/feeds.php:1071 classes/pref/labels.php:282
+#: classes/pref/filters.php:518 classes/pref/filters.php:814
+#: classes/pref/feeds.php:751 classes/pref/users.php:369
+msgid "Remove"
+msgstr ""
+
+#: classes/feeds.php:1084
+msgid "Look for"
+msgstr ""
+
+#: classes/feeds.php:1092
+#, php-format
+msgid "in %s"
+msgstr ""
+
+#: classes/feeds.php:1097
+msgid "Used for word stemming"
+msgstr ""
+
+#: classes/feeds.php:1106
+msgid "Search syntax"
+msgstr ""
+
+#: classes/feeds.php:1563
+msgid "Starred articles"
+msgstr ""
+
+#: classes/feeds.php:1565
+msgid "Published articles"
+msgstr ""
+
+#: classes/feeds.php:1567
+msgid "Fresh articles"
+msgstr ""
+
+#: classes/feeds.php:1571
+msgid "Archived articles"
+msgstr ""
+
+#: classes/feeds.php:1573
+msgid "Recently read"
+msgstr ""
+
+#: classes/feeds.php:1694
+msgid "Special"
+msgstr ""
+
+#: classes/feeds.php:1951
+#, php-format
+msgid "Search results: %s"
 msgstr ""
 
 #: classes/pref/labels.php:25 classes/pref/filters.php:377
@@ -1090,165 +1057,162 @@ msgstr ""
 msgid "Background:"
 msgstr ""
 
+#: classes/pref/labels.php:82 classes/pref/filters.php:525
+#: classes/pref/feeds.php:773 classes/pref/feeds.php:913
+#: classes/pref/users.php:103 classes/pref/prefs.php:982
+#: classes/article.php:236 plugins/af_zz_imgproxy/init.php:238
+#: plugins/af_redditimgur/init.php:66 plugins/af_psql_trgm/init.php:188
+#: plugins/af_readability/init.php:80 plugins/nsfw/init.php:85
+#: plugins/mail/init.php:65 plugins/note/init.php:58
+msgid "Save"
+msgstr ""
+
 #: classes/pref/labels.php:244
 #, php-format
 msgid "Created label <b>%s</b>"
 msgstr ""
 
-#: classes/pref/labels.php:270 classes/pref/users.php:356
-#: classes/pref/feeds.php:1183 classes/pref/feeds.php:1414
-#: classes/pref/feeds.php:1479 classes/pref/filters.php:388
+#: classes/pref/labels.php:270 classes/pref/filters.php:388
 #: classes/pref/filters.php:446 classes/pref/filters.php:792
 #: classes/pref/filters.php:875 classes/pref/filters.php:902
+#: classes/pref/feeds.php:1182 classes/pref/feeds.php:1413
+#: classes/pref/feeds.php:1478 classes/pref/users.php:355
 #: classes/pref/prefs.php:993
 msgid "Select"
 msgstr ""
 
-#: classes/pref/labels.php:273 classes/pref/users.php:359
-#: classes/pref/feeds.php:1186 classes/pref/feeds.php:1417
-#: classes/pref/feeds.php:1482 classes/pref/filters.php:391
-#: classes/pref/filters.php:449 classes/pref/filters.php:795
-#: classes/pref/filters.php:878 classes/pref/filters.php:905
-#: classes/pref/prefs.php:996 classes/feeds.php:102
-msgid "All"
-msgstr ""
-
-#: classes/pref/labels.php:275 classes/pref/users.php:361
-#: classes/pref/feeds.php:1188 classes/pref/feeds.php:1419
-#: classes/pref/feeds.php:1484 classes/pref/filters.php:393
-#: classes/pref/filters.php:451 classes/pref/filters.php:797
-#: classes/pref/filters.php:880 classes/pref/filters.php:907
-#: classes/pref/prefs.php:998 classes/feeds.php:105
-msgid "None"
-msgstr ""
-
-#: classes/pref/labels.php:282 classes/pref/users.php:370
-#: classes/pref/feeds.php:752 classes/pref/filters.php:518
-#: classes/pref/filters.php:814 classes/feeds.php:1088
-msgid "Remove"
-msgstr ""
-
 #: classes/pref/labels.php:285
 msgid "Clear colors"
 msgstr ""
 
-#: classes/pref/users.php:6 classes/pref/system.php:8
-msgid "Your access level is insufficient to open this tab."
+#: classes/pref/filters.php:155
+msgid "Preview article"
 msgstr ""
 
-#: classes/pref/users.php:26
-msgid "Edit user"
+#: classes/pref/filters.php:267 classes/pref/filters.php:573
+msgid "(inverse)"
 msgstr ""
 
-#: classes/pref/users.php:61 classes/pref/feeds.php:622
-#: classes/pref/feeds.php:849 classes/feeds.php:1009
-msgid "Authentication"
-msgstr ""
-
-#: classes/pref/users.php:64
-msgid "Access level: "
-msgstr ""
-
-#: classes/pref/users.php:82 classes/pref/feeds.php:648
-#: classes/pref/feeds.php:867
-msgid "Options"
-msgstr ""
-
-#: classes/pref/users.php:96 js/prefs.js:479
-msgid "User details"
-msgstr ""
-
-#: classes/pref/users.php:136 classes/pref/users.php:407
-msgid "Registered"
-msgstr ""
-
-#: classes/pref/users.php:137
-msgid "Last logged in"
-msgstr ""
-
-#: classes/pref/users.php:145
-msgid "Subscribed feeds count"
-msgstr ""
-
-#: classes/pref/users.php:146
-msgid "Stored articles"
-msgstr ""
-
-#: classes/pref/users.php:150 classes/pref/users.php:406
-msgid "Subscribed feeds"
-msgstr ""
-
-#: classes/pref/users.php:176
-msgid "User not found"
-msgstr ""
-
-#: classes/pref/users.php:246
+#: classes/pref/filters.php:263 classes/pref/filters.php:572
 #, php-format
-msgid "Added user <b>%s</b> with password <b>%s</b>"
+msgid "%s on %s in %s %s"
 msgstr ""
 
-#: classes/pref/users.php:253
-#, php-format
-msgid "Could not create user <b>%s</b>"
+#: classes/pref/filters.php:383 classes/pref/filters.php:870
+#: classes/pref/filters.php:977
+msgid "Match"
 msgstr ""
 
-#: classes/pref/users.php:257
-#, php-format
-msgid "User <b>%s</b> already exists."
+#: classes/pref/filters.php:397 classes/pref/filters.php:455
+#: classes/pref/filters.php:884 classes/pref/filters.php:911
+msgid "Add"
 msgstr ""
 
-#: classes/pref/users.php:285
-#, php-format
-msgid "Changed password of user <b>%s</b> to <b>%s</b>"
+#: classes/pref/filters.php:441 classes/pref/filters.php:897
+msgid "Apply actions"
 msgstr ""
 
-#: classes/pref/users.php:287
-#, php-format
-msgid "Sending new password of user <b>%s</b> to <b>%s</b>"
+#: classes/pref/filters.php:492 classes/pref/filters.php:926
+msgid "Enabled"
 msgstr ""
 
-#: classes/pref/users.php:311
-msgid "[tt-rss] Password change notification"
+#: classes/pref/filters.php:501 classes/pref/filters.php:929
+msgid "Match any rule"
 msgstr ""
 
-#: classes/pref/users.php:346 classes/pref/feeds.php:1179
-#: classes/pref/filters.php:788 classes/feeds.php:1059 classes/feeds.php:1127
-#: js/tt-rss.js:165
-msgid "Search"
+#: classes/pref/filters.php:510 classes/pref/filters.php:932
+msgid "Inverse matching"
 msgstr ""
 
-#: classes/pref/users.php:364
-msgid "Create user"
+#: classes/pref/filters.php:522 classes/pref/filters.php:939
+msgid "Test"
 msgstr ""
 
-#: classes/pref/users.php:368 classes/pref/filters.php:807
+#: classes/pref/filters.php:804
+msgid "Combine"
+msgstr ""
+
+#: classes/pref/filters.php:807 classes/pref/users.php:367
 msgid "Edit"
 msgstr ""
 
-#: classes/pref/users.php:404 classes/pref/feeds.php:626
-#: classes/pref/feeds.php:853 classes/pref/feeds.php:1649
-#: classes/feeds.php:1013
-msgid "Login"
+#: classes/pref/filters.php:810 classes/pref/feeds.php:1198
+#: classes/pref/feeds.php:1212
+msgid "Reset sort order"
 msgstr ""
 
-#: classes/pref/users.php:405
-msgid "Access Level"
+#: classes/pref/filters.php:942
+msgid "Create"
 msgstr ""
 
-#: classes/pref/users.php:408
-msgid "Last login"
+#: classes/pref/filters.php:987
+msgid "Regular expression, without outer delimiters (i.e. slashes)"
 msgstr ""
 
-#: classes/pref/users.php:427
-msgid "Click to edit"
+#: classes/pref/filters.php:993
+msgid "Inverse regular expression matching"
 msgstr ""
 
-#: classes/pref/users.php:447
-msgid "No users defined."
+#: classes/pref/filters.php:995
+msgid "on field"
 msgstr ""
 
-#: classes/pref/users.php:449
-msgid "No matching users found."
+#: classes/pref/filters.php:1001 js/PrefFilterTree.js:44
+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:764
+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:786
+msgid "Add action"
+msgstr ""
+
+#: classes/pref/filters.php:1139
+msgid "[No caption]"
+msgstr ""
+
+#: classes/pref/filters.php:1141
+#, php-format
+msgid "%s (%d rule)"
+msgid_plural "%s (%d rules)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: classes/pref/filters.php:1155
+msgid "matches any rule"
+msgstr ""
+
+#: classes/pref/filters.php:1158
+#, php-format
+msgid "%s (+%d action)"
+msgid_plural "%s (+%d actions)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: classes/pref/system.php:8 classes/pref/users.php:6
+msgid "Your access level is insufficient to open this tab."
 msgstr ""
 
 #: classes/pref/system.php:29
@@ -1292,347 +1256,298 @@ msgid_plural "(%d feeds)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: classes/pref/feeds.php:514 classes/pref/prefs.php:18
+#: classes/pref/feeds.php:513 classes/pref/prefs.php:18
 msgid "General"
 msgstr ""
 
-#: classes/pref/feeds.php:528
+#: classes/pref/feeds.php:527
 msgid "Feed Title"
 msgstr ""
 
-#: classes/pref/feeds.php:560 classes/pref/feeds.php:801
-#: classes/pref/feeds.php:1635 classes/feeds.php:989
-msgid "Place in category:"
+#: classes/pref/feeds.php:536 classes/handler/public.php:417
+msgid "URL:"
 msgstr ""
 
-#: classes/pref/feeds.php:572
+#: classes/pref/feeds.php:571
 msgid "Site URL:"
 msgstr ""
 
-#: classes/pref/feeds.php:574
+#: classes/pref/feeds.php:573
 msgid "Site URL"
 msgstr ""
 
-#: classes/pref/feeds.php:585 classes/pref/feeds.php:815
+#: classes/pref/feeds.php:584 classes/pref/feeds.php:814
 msgid "Language:"
 msgstr ""
 
-#: classes/pref/feeds.php:592 classes/pref/feeds.php:824
+#: classes/pref/feeds.php:591 classes/pref/feeds.php:823
 msgid "Update"
 msgstr ""
 
-#: classes/pref/feeds.php:607 classes/pref/feeds.php:840
+#: classes/pref/feeds.php:606 classes/pref/feeds.php:839
 msgid "Article purging:"
 msgstr ""
 
-#: classes/pref/feeds.php:632 classes/pref/feeds.php:861
-#: classes/pref/feeds.php:1652 classes/pref/prefs.php:243
-#: classes/feeds.php:1017
-msgid "Password"
-msgstr ""
-
-#: classes/pref/feeds.php:636
+#: classes/pref/feeds.php:635
 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:646 classes/feeds.php:1028
-msgid "This feed requires authentication."
+#: classes/pref/feeds.php:647 classes/pref/feeds.php:866
+#: classes/pref/users.php:82
+msgid "Options"
 msgstr ""
 
-#: classes/pref/feeds.php:662 classes/pref/feeds.php:871
+#: classes/pref/feeds.php:661 classes/pref/feeds.php:870
 msgid "Hide from Popular feeds"
 msgstr ""
 
-#: classes/pref/feeds.php:674 classes/pref/feeds.php:877
+#: classes/pref/feeds.php:673 classes/pref/feeds.php:876
 msgid "Include in e-mail digest"
 msgstr ""
 
-#: classes/pref/feeds.php:687 classes/pref/feeds.php:883
+#: classes/pref/feeds.php:686 classes/pref/feeds.php:882
 msgid "Always display image attachments"
 msgstr ""
 
-#: classes/pref/feeds.php:700 classes/pref/feeds.php:891
+#: classes/pref/feeds.php:699 classes/pref/feeds.php:890
 msgid "Do not embed media"
 msgstr ""
 
-#: classes/pref/feeds.php:713 classes/pref/feeds.php:899
+#: classes/pref/feeds.php:712 classes/pref/feeds.php:898
 msgid "Cache media"
 msgstr ""
 
-#: classes/pref/feeds.php:725 classes/pref/feeds.php:905
+#: classes/pref/feeds.php:724 classes/pref/feeds.php:904
 msgid "Mark updated articles as unread"
 msgstr ""
 
-#: classes/pref/feeds.php:729
+#: classes/pref/feeds.php:728
 msgid "Icon"
 msgstr ""
 
-#: classes/pref/feeds.php:743 classes/pref/feeds.php:1284
+#: classes/pref/feeds.php:742 classes/pref/feeds.php:1283
 #: plugins/import_export/init.php:71
 msgid "Choose file..."
 msgstr ""
 
-#: classes/pref/feeds.php:750
+#: classes/pref/feeds.php:749
 msgid "Replace"
 msgstr ""
 
-#: classes/pref/feeds.php:757 classes/pref/prefs.php:679
+#: classes/pref/feeds.php:756 classes/pref/prefs.php:679
 msgid "Plugins"
 msgstr ""
 
-#: classes/pref/feeds.php:1154
+#: classes/pref/feeds.php:1153
 msgid "Feeds with errors"
 msgstr ""
 
-#: classes/pref/feeds.php:1161
+#: classes/pref/feeds.php:1160
 msgid "Inactive feeds"
 msgstr ""
 
-#: classes/pref/feeds.php:1197
+#: classes/pref/feeds.php:1196
 msgid "Edit selected feeds"
 msgstr ""
 
-#: classes/pref/feeds.php:1199 classes/pref/feeds.php:1213
-#: classes/pref/filters.php:810
-msgid "Reset sort order"
-msgstr ""
-
-#: classes/pref/feeds.php:1201 js/prefs.js:1462
+#: classes/pref/feeds.php:1200 js/prefs.js:1171
 msgid "Batch subscribe"
 msgstr ""
 
-#: classes/pref/feeds.php:1208
+#: classes/pref/feeds.php:1207
 msgid "Categories"
 msgstr ""
 
-#: classes/pref/feeds.php:1211
+#: classes/pref/feeds.php:1210
 msgid "Add category"
 msgstr ""
 
-#: classes/pref/feeds.php:1215
+#: classes/pref/feeds.php:1214
 msgid "Remove selected"
 msgstr ""
 
-#: classes/pref/feeds.php:1272
+#: classes/pref/feeds.php:1271
 msgid "OPML"
 msgstr ""
 
-#: classes/pref/feeds.php:1274
+#: classes/pref/feeds.php:1273
 msgid ""
 "Using OPML you can export and import your feeds, filters, labels and Tiny "
 "Tiny RSS settings."
 msgstr ""
 
-#: classes/pref/feeds.php:1275
+#: classes/pref/feeds.php:1274
 msgid "Only main settings profile can be migrated using OPML."
 msgstr ""
 
-#: classes/pref/feeds.php:1290
+#: classes/pref/feeds.php:1289
 msgid "Import my OPML"
 msgstr ""
 
-#: classes/pref/feeds.php:1296
+#: classes/pref/feeds.php:1295
 msgid "Filename:"
 msgstr ""
 
-#: classes/pref/feeds.php:1298
+#: classes/pref/feeds.php:1297
 msgid "Include settings"
 msgstr ""
 
-#: classes/pref/feeds.php:1302
+#: classes/pref/feeds.php:1301
 msgid "Export OPML"
 msgstr ""
 
-#: classes/pref/feeds.php:1306
+#: classes/pref/feeds.php:1305
 msgid ""
 "Your OPML can be published publicly and can be subscribed by anyone who "
 "knows the URL below."
 msgstr ""
 
-#: classes/pref/feeds.php:1310
+#: classes/pref/feeds.php:1309
 msgid "Public OPML URL"
 msgstr ""
 
-#: classes/pref/feeds.php:1311
+#: classes/pref/feeds.php:1310
 msgid "Display published OPML URL"
 msgstr ""
 
-#: classes/pref/feeds.php:1318
+#: classes/pref/feeds.php:1317
 msgid "Published & shared articles / Generated feeds"
 msgstr ""
 
-#: classes/pref/feeds.php:1320
+#: classes/pref/feeds.php:1319
 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:1327 classes/feeds.php:54 classes/feeds.php:140
-msgid "View as RSS"
-msgstr ""
-
-#: classes/pref/feeds.php:1328
+#: classes/pref/feeds.php:1327
 msgid "Display URL"
 msgstr ""
 
-#: classes/pref/feeds.php:1331
+#: classes/pref/feeds.php:1330
 msgid "Clear all generated URLs"
 msgstr ""
 
-#: classes/pref/feeds.php:1410
+#: classes/pref/feeds.php:1409
 msgid ""
 "These feeds have not been updated with new content for 3 months (oldest "
 "first):"
 msgstr ""
 
-#: classes/pref/feeds.php:1444 classes/pref/feeds.php:1509
+#: classes/pref/feeds.php:1443 classes/pref/feeds.php:1508
 msgid "Click to edit feed"
 msgstr ""
 
-#: classes/pref/feeds.php:1462 classes/pref/feeds.php:1529
+#: classes/pref/feeds.php:1461 classes/pref/feeds.php:1528
 msgid "Unsubscribe from selected feeds"
 msgstr ""
 
-#: classes/pref/feeds.php:1632
+#: classes/pref/feeds.php:1629
 msgid "Add one valid RSS feed per line (no feed detection is done)"
 msgstr ""
 
-#: classes/pref/feeds.php:1641
+#: classes/pref/feeds.php:1638
 msgid "Feeds to subscribe, One per line"
 msgstr ""
 
-#: classes/pref/feeds.php:1664
+#: classes/pref/feeds.php:1661
 msgid "Feeds require authentication."
 msgstr ""
 
-#: classes/pref/feeds.php:1671 classes/feeds.php:1031 classes/feeds.php:1087
-msgid "Subscribe"
+#: classes/pref/users.php:26
+msgid "Edit user"
 msgstr ""
 
-#: classes/pref/filters.php:155
-msgid "Preview article"
+#: classes/pref/users.php:64
+msgid "Access level: "
 msgstr ""
 
-#: classes/pref/filters.php:267 classes/pref/filters.php:573
-msgid "(inverse)"
+#: classes/pref/users.php:96 js/prefs.js:403
+msgid "User details"
 msgstr ""
 
-#: classes/pref/filters.php:263 classes/pref/filters.php:572
+#: classes/pref/users.php:136 classes/pref/users.php:406
+msgid "Registered"
+msgstr ""
+
+#: classes/pref/users.php:137
+msgid "Last logged in"
+msgstr ""
+
+#: classes/pref/users.php:145
+msgid "Subscribed feeds count"
+msgstr ""
+
+#: classes/pref/users.php:146
+msgid "Stored articles"
+msgstr ""
+
+#: classes/pref/users.php:150 classes/pref/users.php:405
+msgid "Subscribed feeds"
+msgstr ""
+
+#: classes/pref/users.php:176
+msgid "User not found"
+msgstr ""
+
+#: classes/pref/users.php:246
 #, php-format
-msgid "%s on %s in %s %s"
+msgid "Added user <b>%s</b> with password <b>%s</b>"
 msgstr ""
 
-#: classes/pref/filters.php:383 classes/pref/filters.php:870
-#: classes/pref/filters.php:977
-msgid "Match"
-msgstr ""
-
-#: classes/pref/filters.php:397 classes/pref/filters.php:455
-#: classes/pref/filters.php:884 classes/pref/filters.php:911
-msgid "Add"
-msgstr ""
-
-#: classes/pref/filters.php:400 classes/pref/filters.php:458
-#: classes/pref/filters.php:887 classes/pref/filters.php:914
-#: classes/feeds.php:122
-msgid "Delete"
-msgstr ""
-
-#: classes/pref/filters.php:441 classes/pref/filters.php:897
-msgid "Apply actions"
-msgstr ""
-
-#: classes/pref/filters.php:492 classes/pref/filters.php:926
-msgid "Enabled"
-msgstr ""
-
-#: classes/pref/filters.php:501 classes/pref/filters.php:929
-msgid "Match any rule"
-msgstr ""
-
-#: classes/pref/filters.php:510 classes/pref/filters.php:932
-msgid "Inverse matching"
-msgstr ""
-
-#: classes/pref/filters.php:522 classes/pref/filters.php:939
-msgid "Test"
-msgstr ""
-
-#: classes/pref/filters.php:804
-msgid "Combine"
-msgstr ""
-
-#: classes/pref/filters.php:942
-msgid "Create"
-msgstr ""
-
-#: classes/pref/filters.php:987
-msgid "Regular expression, without outer delimiters (i.e. slashes)"
-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:43
-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:797
-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:819
-msgid "Add action"
-msgstr ""
-
-#: classes/pref/filters.php:1139
-msgid "[No caption]"
-msgstr ""
-
-#: classes/pref/filters.php:1141
+#: classes/pref/users.php:253
 #, php-format
-msgid "%s (%d rule)"
-msgid_plural "%s (%d rules)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: classes/pref/filters.php:1155
-msgid "matches any rule"
+msgid "Could not create user <b>%s</b>"
 msgstr ""
 
-#: classes/pref/filters.php:1158
+#: classes/pref/users.php:257
 #, php-format
-msgid "%s (+%d action)"
-msgid_plural "%s (+%d actions)"
-msgstr[0] ""
-msgstr[1] ""
+msgid "User <b>%s</b> already exists."
+msgstr ""
+
+#: classes/pref/users.php:285
+#, php-format
+msgid "Changed password of user <b>%s</b> to <b>%s</b>"
+msgstr ""
+
+#: classes/pref/users.php:287
+#, php-format
+msgid "Sending new password of user <b>%s</b> to <b>%s</b>"
+msgstr ""
+
+#: classes/pref/users.php:310
+msgid "[tt-rss] Password change notification"
+msgstr ""
+
+#: classes/pref/users.php:363
+msgid "Create user"
+msgstr ""
+
+#: classes/pref/users.php:371 classes/handler/public.php:747
+msgid "Reset password"
+msgstr ""
+
+#: classes/pref/users.php:404
+msgid "Access Level"
+msgstr ""
+
+#: classes/pref/users.php:407
+msgid "Last login"
+msgstr ""
+
+#: classes/pref/users.php:426
+msgid "Click to edit"
+msgstr ""
+
+#: classes/pref/users.php:446
+msgid "No users defined."
+msgstr ""
+
+#: classes/pref/users.php:448
+msgid "No matching users found."
+msgstr ""
 
 #: classes/pref/prefs.php:19
 msgid "Interface"
@@ -1819,7 +1734,7 @@ msgstr ""
 msgid "Strip all but most common HTML tags when reading articles."
 msgstr ""
 
-#: classes/pref/prefs.php:53 js/prefs.js:1424
+#: classes/pref/prefs.php:53 js/prefs.js:1136
 msgid "Customize stylesheet"
 msgstr ""
 
@@ -2062,241 +1977,295 @@ msgstr ""
 msgid "Activate profile"
 msgstr ""
 
-#: classes/feeds.php:53
-msgid "View as RSS feed"
-msgstr ""
-
-#: classes/feeds.php:62
-#, php-format
-msgid "Last updated: %s"
-msgstr ""
-
-#: classes/feeds.php:100
-msgid "Select..."
-msgstr ""
-
-#: classes/feeds.php:104
-msgid "Invert"
-msgstr ""
-
-#: classes/feeds.php:107
-msgid "Selection toggle:"
-msgstr ""
-
-#: classes/feeds.php:113
-msgid "Selection:"
-msgstr ""
-
-#: classes/feeds.php:116
-msgid "Set score"
-msgstr ""
-
-#: classes/feeds.php:119
-msgid "Archive"
-msgstr ""
-
-#: classes/feeds.php:121
-msgid "Move back"
-msgstr ""
-
-#: classes/feeds.php:127 classes/feeds.php:132 plugins/mail/init.php:76
-#: plugins/mailto/init.php:25
-msgid "Forward by email"
-msgstr ""
-
-#: classes/feeds.php:136
-msgid "Feed:"
-msgstr ""
-
-#: classes/feeds.php:193 classes/feeds.php:819
-msgid "Feed not found."
-msgstr ""
-
-#: classes/feeds.php:255
-msgid "Never"
-msgstr ""
-
-#: classes/feeds.php:342
-#, php-format
-msgid "Imported at %s"
-msgstr ""
-
-#: classes/feeds.php:394 classes/feeds.php:487
-msgid "mark feed as read"
-msgstr ""
-
-#: classes/feeds.php:542
-msgid "Collapse article"
-msgstr ""
-
-#: classes/feeds.php:703
-msgid "No unread articles found to display."
-msgstr ""
-
-#: classes/feeds.php:706
-msgid "No updated articles found to display."
-msgstr ""
-
-#: classes/feeds.php:709
-msgid "No starred articles found to display."
-msgstr ""
-
-#: classes/feeds.php:713
+#: classes/dlg.php:17
 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."
+"If you have imported labels and/or filters, you might need to reload "
+"preferences to see your new data."
 msgstr ""
 
-#: classes/feeds.php:715
-msgid "No articles found to display."
+#: classes/dlg.php:44
+msgid "Your Public OPML URL is:"
 msgstr ""
 
-#: classes/feeds.php:731 classes/feeds.php:922
+#: classes/dlg.php:53 classes/dlg.php:178 plugins/share/init.php:125
+msgid "Generate new URL"
+msgstr ""
+
+#: classes/dlg.php:67
+msgid ""
+"Update daemon is enabled in configuration, but daemon process is not "
+"running, which prevents all feeds from updating. Please start the daemon "
+"process or contact instance owner."
+msgstr ""
+
+#: classes/dlg.php:71 classes/dlg.php:80
+msgid "Last update:"
+msgstr ""
+
+#: classes/dlg.php:76
+msgid ""
+"Update daemon is taking too long to perform a feed update. This could "
+"indicate a problem like crash or a hang. Please check the daemon process or "
+"contact instance owner."
+msgstr ""
+
+#: classes/dlg.php:169
+msgid "You can view this feed as RSS using the following URL:"
+msgstr ""
+
+#: classes/dlg.php:190
+msgid ""
+"You are using default tt-rss password. Please change it in the Preferences "
+"(Personal data / Authentication)."
+msgstr ""
+
+#: classes/dlg.php:194
+msgid "Open Preferences"
+msgstr ""
+
+#: classes/opml.php:31 classes/opml.php:36
+msgid "OPML Utility"
+msgstr ""
+
+#: classes/opml.php:40
+msgid "Importing OPML..."
+msgstr ""
+
+#: classes/opml.php:45
+msgid "Return to preferences"
+msgstr ""
+
+#: classes/opml.php:301
 #, php-format
-msgid "Feeds last updated at %s"
+msgid "Adding feed: %s"
 msgstr ""
 
-#: classes/feeds.php:743 classes/feeds.php:934
-msgid "Some feeds have update errors (click for details)"
-msgstr ""
-
-#: classes/feeds.php:911
-msgid "No feed selected."
-msgstr ""
-
-#: classes/feeds.php:975 classes/feeds.php:983
-msgid "Feed or site URL"
-msgstr ""
-
-#: classes/feeds.php:997
-msgid "Available feeds"
-msgstr ""
-
-#: classes/feeds.php:1034
-msgid "More feeds"
-msgstr ""
-
-#: classes/feeds.php:1063
-msgid "Popular feeds"
-msgstr ""
-
-#: classes/feeds.php:1064
-msgid "Feed archive"
-msgstr ""
-
-#: classes/feeds.php:1067
-msgid "limit:"
-msgstr ""
-
-#: classes/feeds.php:1101
-msgid "Look for"
-msgstr ""
-
-#: classes/feeds.php:1109
+#: classes/opml.php:312
 #, php-format
-msgid "in %s"
+msgid "Duplicate feed: %s"
 msgstr ""
 
-#: classes/feeds.php:1114
-msgid "Used for word stemming"
-msgstr ""
-
-#: classes/feeds.php:1123
-msgid "Search syntax"
-msgstr ""
-
-#: classes/feeds.php:1577
-msgid "Starred articles"
-msgstr ""
-
-#: classes/feeds.php:1579
-msgid "Published articles"
-msgstr ""
-
-#: classes/feeds.php:1581
-msgid "Fresh articles"
-msgstr ""
-
-#: classes/feeds.php:1585
-msgid "Archived articles"
-msgstr ""
-
-#: classes/feeds.php:1587
-msgid "Recently read"
-msgstr ""
-
-#: classes/feeds.php:1708
-msgid "Special"
-msgstr ""
-
-#: classes/feeds.php:1965
+#: classes/opml.php:326
 #, php-format
-msgid "Search results: %s"
+msgid "Adding label %s"
 msgstr ""
 
-#: plugins/nsfw/init.php:30 plugins/nsfw/init.php:42
-msgid "Not work safe (click to toggle)"
+#: classes/opml.php:329
+#, php-format
+msgid "Duplicate label: %s"
 msgstr ""
 
-#: plugins/nsfw/init.php:52
-msgid "NSFW Plugin"
+#: classes/opml.php:341
+#, php-format
+msgid "Setting preference key %s to %s"
 msgstr ""
 
-#: plugins/nsfw/init.php:79
-msgid "Tags to consider NSFW (comma-separated)"
+#: classes/opml.php:377
+msgid "Adding filter..."
 msgstr ""
 
-#: plugins/nsfw/init.php:100
-msgid "Configuration saved."
+#: classes/opml.php:512
+#, php-format
+msgid "Processing category: %s"
 msgstr ""
 
-#: plugins/note/init.php:28 plugins/note/note.js:11
-msgid "Edit article note"
+#: classes/opml.php:558
+#, php-format
+msgid "Upload failed with error code %d"
+msgstr ""
+
+#: classes/opml.php:570 plugins/import_export/init.php:471
+msgid "Unable to move uploaded file."
+msgstr ""
+
+#: classes/opml.php:574 plugins/import_export/init.php:475
+msgid "Error: please upload OPML file."
+msgstr ""
+
+#: classes/opml.php:585
+msgid "Error: unable to find moved OPML file."
+msgstr ""
+
+#: classes/opml.php:594
+msgid "Error while parsing document."
+msgstr ""
+
+#: classes/article.php:26
+msgid "Article not found."
+msgstr ""
+
+#: classes/article.php:211
+msgid "Tags for this article (separated by commas):"
+msgstr ""
+
+#: classes/article.php:337 classes/article.php:719 classes/article.php:874
+msgid "no tags"
+msgstr ""
+
+#: classes/article.php:447
+msgid "unknown type"
+msgstr ""
+
+#: classes/article.php:524
+msgid "Attachments"
+msgstr ""
+
+#: classes/article.php:688
+msgid " - "
+msgstr ""
+
+#: classes/article.php:912
+msgid "(edit note)"
+msgstr ""
+
+#: classes/handler/public.php:407 plugins/bookmarklets/init.php:40
+msgid "Share with Tiny Tiny RSS"
+msgstr ""
+
+#: classes/handler/public.php:415
+msgid "Title:"
+msgstr ""
+
+#: classes/handler/public.php:419
+msgid "Content:"
+msgstr ""
+
+#: classes/handler/public.php:421
+msgid "Labels:"
+msgstr ""
+
+#: classes/handler/public.php:440
+msgid "Shared article will appear in the Published feed."
+msgstr ""
+
+#: classes/handler/public.php:442
+msgid "Share"
+msgstr ""
+
+#: classes/handler/public.php:464
+msgid "Not logged in"
+msgstr ""
+
+#: classes/handler/public.php:527
+msgid "Incorrect username or password"
+msgstr ""
+
+#: classes/handler/public.php:581
+#, php-format
+msgid "Already subscribed to <b>%s</b>."
+msgstr ""
+
+#: classes/handler/public.php:584
+#, php-format
+msgid "Subscribed to <b>%s</b>."
+msgstr ""
+
+#: classes/handler/public.php:587
+#, php-format
+msgid "Could not subscribe to <b>%s</b>."
+msgstr ""
+
+#: classes/handler/public.php:590
+#, php-format
+msgid "No feeds found in <b>%s</b>."
+msgstr ""
+
+#: classes/handler/public.php:593
+msgid "Multiple feed URLs found."
+msgstr ""
+
+#: classes/handler/public.php:597
+#, php-format
+msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
+msgstr ""
+
+#: classes/handler/public.php:615
+msgid "Subscribe to selected feed"
+msgstr ""
+
+#: classes/handler/public.php:642
+msgid "Edit subscription options"
+msgstr ""
+
+#: classes/handler/public.php:680
+msgid "Password recovery"
+msgstr ""
+
+#: classes/handler/public.php:725
+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:757
+msgid "Some of the required form parameters are missing or incorrect."
+msgstr ""
+
+#: classes/handler/public.php:761 classes/handler/public.php:830
+msgid "Go back"
+msgstr ""
+
+#: classes/handler/public.php:799
+msgid "[tt-rss] Password reset request"
+msgstr ""
+
+#: classes/handler/public.php:826
+msgid "Sorry, login and email combination not found."
+msgstr ""
+
+#: classes/handler/public.php:848
+msgid "Your access level is insufficient to run this script."
+msgstr ""
+
+#: classes/handler/public.php:874
+msgid "Database Updater"
+msgstr ""
+
+#: classes/handler/public.php:939
+msgid "Perform updates"
+msgstr ""
+
+#: plugins/af_zz_imgproxy/init.php:208
+msgid "Image proxy settings (af_zz_imgproxy)"
+msgstr ""
+
+#: plugins/af_zz_imgproxy/init.php:232
+msgid "Enable proxy for all remote images."
+msgstr ""
+
+#: plugins/af_zz_imgproxy/init.php:236
+msgid "Don't cache files locally."
+msgstr ""
+
+#: plugins/af_zz_imgproxy/init.php:252 plugins/af_redditimgur/init.php:79
+msgid "Configuration saved"
 msgstr ""
 
 #: plugins/vf_shared/init.php:17 plugins/vf_shared/init.php:73
 msgid "Shared articles"
 msgstr ""
 
-#: plugins/auth_internal/init.php:67
-msgid "Please enter your one time password:"
+#: plugins/bookmarklets/init.php:20
+msgid "Bookmarklets"
 msgstr ""
 
-#: plugins/auth_internal/init.php:208
-msgid "Password has been changed."
+#: 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/auth_internal/init.php:210
-msgid "Old password is incorrect."
+#: plugins/bookmarklets/init.php:26
+#, php-format
+msgid "Subscribe to %s in Tiny Tiny RSS?"
 msgstr ""
 
-#: plugins/af_readability/init.php:25
-msgid "Data saved."
+#: plugins/bookmarklets/init.php:31
+msgid "Subscribe in Tiny Tiny RSS"
 msgstr ""
 
-#: plugins/af_readability/init.php:41
-msgid "Inline content"
-msgstr ""
-
-#: plugins/af_readability/init.php:47
-msgid "Readability settings (af_readability)"
-msgstr ""
-
-#: plugins/af_readability/init.php:78
-msgid "Use Readability for pages shared via bookmarklet."
-msgstr ""
-
-#: plugins/af_readability/init.php:90 plugins/af_psql_trgm/init.php:198
-msgid "Currently enabled for (click to edit):"
-msgstr ""
-
-#: plugins/af_readability/init.php:107
-msgid "Readability"
-msgstr ""
-
-#: plugins/af_readability/init.php:118
-msgid "Inline article content"
+#: plugins/bookmarklets/init.php:34
+msgid "Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS"
 msgstr ""
 
 #: plugins/af_redditimgur/init.php:30
@@ -2311,8 +2280,24 @@ msgstr ""
 msgid "Enable additional duplicate checking"
 msgstr ""
 
-#: plugins/af_redditimgur/init.php:79 plugins/af_zz_imgproxy/init.php:252
-msgid "Configuration saved"
+#: plugins/af_comics/init.php:49
+msgid "Feeds supported by af_comics"
+msgstr ""
+
+#: plugins/af_comics/init.php:51
+msgid "The following comics are currently supported:"
+msgstr ""
+
+#: plugins/af_comics/init.php:69
+msgid ""
+"To subscribe to GoComics use the comic's regular web page as the feed URL (e."
+"g. for the <em>Garfield</em> comic use <code>http://www.gocomics.com/"
+"garfield</code>)."
+msgstr ""
+
+#: plugins/af_comics/init.php:71
+msgid ""
+"Drop any updated filters into <code>filters.local</code> in plugin directory."
 msgstr ""
 
 #: plugins/af_psql_trgm/init.php:29
@@ -2351,28 +2336,78 @@ msgstr ""
 msgid "Enable for all feeds:"
 msgstr ""
 
+#: plugins/af_psql_trgm/init.php:198 plugins/af_readability/init.php:90
+msgid "Currently enabled for (click to edit):"
+msgstr ""
+
 #: plugins/af_psql_trgm/init.php:216
 msgid "Similarity (pg_trgm)"
 msgstr ""
 
-#: plugins/af_comics/init.php:49
-msgid "Feeds supported by af_comics"
+#: plugins/af_readability/init.php:25
+msgid "Data saved."
 msgstr ""
 
-#: plugins/af_comics/init.php:51
-msgid "The following comics are currently supported:"
+#: plugins/af_readability/init.php:41
+msgid "Inline content"
 msgstr ""
 
-#: plugins/af_comics/init.php:69
+#: plugins/af_readability/init.php:47
+msgid "Readability settings (af_readability)"
+msgstr ""
+
+#: plugins/af_readability/init.php:78
+msgid "Use Readability for pages shared via bookmarklet."
+msgstr ""
+
+#: plugins/af_readability/init.php:107
+msgid "Readability"
+msgstr ""
+
+#: plugins/af_readability/init.php:118
+msgid "Inline article content"
+msgstr ""
+
+#: plugins/mailto/init.php:50 plugins/mailto/init.php:58
+#: plugins/mail/init.php:118 plugins/mail/init.php:124
+msgid "[Forwarded]"
+msgstr ""
+
+#: plugins/mailto/init.php:50 plugins/mail/init.php:118
+msgid "Multiple articles"
+msgstr ""
+
+#: plugins/mailto/init.php:74
+msgid "Clicking the following link to invoke your mail client:"
+msgstr ""
+
+#: plugins/mailto/init.php:78
+msgid "Forward selected article(s) by email."
+msgstr ""
+
+#: plugins/mailto/init.php:81
 msgid ""
-"To subscribe to GoComics use the comic's regular web page as the feed URL (e."
-"g. for the <em>Garfield</em> comic use <code>http://www.gocomics.com/"
-"garfield</code>)."
+"You should be able to edit the message before sending in your mail client."
 msgstr ""
 
-#: plugins/af_comics/init.php:71
-msgid ""
-"Drop any updated filters into <code>filters.local</code> in plugin directory."
+#: plugins/mailto/init.php:86
+msgid "Close this dialog"
+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/import_export/init.php:53
@@ -2443,99 +2478,6 @@ msgstr ""
 msgid "No file uploaded."
 msgstr ""
 
-#: plugins/mail/init.php:29
-msgid "Mail addresses saved."
-msgstr ""
-
-#: plugins/mail/init.php:35
-msgid "Mail plugin"
-msgstr ""
-
-#: plugins/mail/init.php:37
-msgid "You can set predefined email addressed here (comma-separated list):"
-msgstr ""
-
-#: plugins/mail/init.php:118 plugins/mail/init.php:124
-#: plugins/mailto/init.php:50 plugins/mailto/init.php:58
-msgid "[Forwarded]"
-msgstr ""
-
-#: plugins/mail/init.php:118 plugins/mailto/init.php:50
-msgid "Multiple articles"
-msgstr ""
-
-#: plugins/mail/init.php:146
-msgid "To:"
-msgstr ""
-
-#: plugins/mail/init.php:161
-msgid "Subject:"
-msgstr ""
-
-#: plugins/mail/init.php:178
-msgid "Send e-mail"
-msgstr ""
-
-#: plugins/close_button/init.php:25
-msgid "Close article"
-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 ""
-
-#: plugins/bookmarklets/init.php:31
-msgid "Subscribe in Tiny Tiny RSS"
-msgstr ""
-
-#: plugins/bookmarklets/init.php:34
-msgid "Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS"
-msgstr ""
-
-#: plugins/toggle_sidebar/init.php:23
-msgid "Collapse feedlist"
-msgstr ""
-
-#: plugins/af_zz_imgproxy/init.php:208
-msgid "Image proxy settings (af_zz_imgproxy)"
-msgstr ""
-
-#: plugins/af_zz_imgproxy/init.php:232
-msgid "Enable proxy for all remote images."
-msgstr ""
-
-#: plugins/af_zz_imgproxy/init.php:236
-msgid "Don't cache files locally."
-msgstr ""
-
-#: plugins/mailto/init.php:74
-msgid "Clicking the following link to invoke your mail client:"
-msgstr ""
-
-#: plugins/mailto/init.php:78
-msgid "Forward selected article(s) by email."
-msgstr ""
-
-#: plugins/mailto/init.php:81
-msgid ""
-"You should be able to edit the message before sending in your mail client."
-msgstr ""
-
-#: plugins/mailto/init.php:86
-msgid "Close this dialog"
-msgstr ""
-
 #: plugins/share/init.php:41
 msgid "You can disable all articles shared by unique URLs here."
 msgstr ""
@@ -2556,420 +2498,565 @@ msgstr ""
 msgid "Unshare article"
 msgstr ""
 
-#: js/FeedTree.js:75
+#: plugins/toggle_sidebar/init.php:23
+msgid "Collapse feedlist"
+msgstr ""
+
+#: plugins/close_button/init.php:25
+msgid "Close article"
+msgstr ""
+
+#: plugins/mail/init.php:29
+msgid "Mail addresses saved."
+msgstr ""
+
+#: plugins/mail/init.php:35
+msgid "Mail plugin"
+msgstr ""
+
+#: plugins/mail/init.php:37
+msgid "You can set predefined email addressed here (comma-separated list):"
+msgstr ""
+
+#: plugins/mail/init.php:146
+msgid "To:"
+msgstr ""
+
+#: plugins/mail/init.php:161
+msgid "Subject:"
+msgstr ""
+
+#: plugins/mail/init.php:178
+msgid "Send e-mail"
+msgstr ""
+
+#: plugins/note/init.php:28 plugins/note/note.js:11
+msgid "Edit article note"
+msgstr ""
+
+#: plugins/auth_internal/init.php:67
+msgid "Please enter your one time password:"
+msgstr ""
+
+#: plugins/auth_internal/init.php:208
+msgid "Password has been changed."
+msgstr ""
+
+#: plugins/auth_internal/init.php:210
+msgid "Old password is incorrect."
+msgstr ""
+
+#: js/FeedTree.js:76
 msgid "(Un)collapse"
 msgstr ""
 
-#: js/PrefFeedTree.js:35
+#: js/PrefFeedTree.js:36
 msgid "Edit category"
 msgstr ""
 
-#: js/PrefFeedTree.js:42
+#: js/PrefFeedTree.js:43
 msgid "Remove category"
 msgstr ""
 
-#: js/PrefFilterTree.js:46
+#: js/PrefFilterTree.js:47
 msgid "Inverse"
 msgstr ""
 
-#: js/feedlist.js:511
+#: js/feedlist.js:461
 msgid "Mark %w in %s older than 1 day as read?"
 msgstr ""
 
-#: js/feedlist.js:514
+#: js/feedlist.js:464
 msgid "Mark %w in %s older than 1 week as read?"
 msgstr ""
 
-#: js/feedlist.js:517
+#: js/feedlist.js:467
 msgid "Mark %w in %s older than 2 weeks as read?"
 msgstr ""
 
-#: js/feedlist.js:520
+#: js/feedlist.js:470
 msgid "Mark %w in %s as read?"
 msgstr ""
 
-#: js/feedlist.js:523
+#: js/feedlist.js:473
 msgid "search results"
 msgstr ""
 
-#: js/feedlist.js:523
+#: js/feedlist.js:473
 msgid "all articles"
 msgstr ""
 
-#: js/functions.js:74
+#: js/functions.js:100
 msgid "Close"
 msgstr ""
 
-#: js/functions.js:141
+#: js/functions.js:167
 msgid "Click to close"
 msgstr ""
 
-#: js/functions.js:448
+#: js/functions.js:456
 msgid "Error explained"
 msgstr ""
 
-#: js/functions.js:592
+#: js/functions.js:490
+msgid "Upload complete."
+msgstr ""
+
+#: js/functions.js:508
+msgid "Remove stored feed icon?"
+msgstr ""
+
+#: js/functions.js:510
+msgid "Removing feed icon..."
+msgstr ""
+
+#: js/functions.js:515
+msgid "Feed icon removed."
+msgstr ""
+
+#: js/functions.js:532
+msgid "Please select an image file to upload."
+msgstr ""
+
+#: js/functions.js:533
+msgid "Upload new icon for this feed?"
+msgstr ""
+
+#: js/functions.js:534
+msgid "Uploading, please wait..."
+msgstr ""
+
+#: js/functions.js:542
+msgid "Please enter label caption:"
+msgstr ""
+
+#: js/functions.js:575
 msgid "Subscribe to Feed"
 msgstr ""
 
-#: js/functions.js:621
+#: js/functions.js:602
 msgid ""
 "Failed to parse output. This can indicate server timeout and/or network "
 "issues. Backend output was logged to browser console."
 msgstr ""
 
-#: js/functions.js:636
+#: js/functions.js:617
 #, perl-format
 msgid "Subscribed to %s"
 msgstr ""
 
-#: js/functions.js:641
+#: js/functions.js:622
 msgid "Specified URL seems to be invalid."
 msgstr ""
 
-#: js/functions.js:644
+#: js/functions.js:625
 msgid "Specified URL doesn't seem to contain any feeds."
 msgstr ""
 
-#: js/functions.js:656
+#: js/functions.js:637
 msgid "Expand to select feed"
 msgstr ""
 
-#: js/functions.js:668
+#: js/functions.js:649
 #, perl-format
 msgid "Couldn't download the specified URL: %s"
 msgstr ""
 
-#: js/functions.js:672
+#: js/functions.js:653
 #, perl-format
 msgid "XML validation failed: %s"
 msgstr ""
 
-#: js/functions.js:676
+#: js/functions.js:657
 msgid "You are already subscribed to this feed."
 msgstr ""
 
-#: js/functions.js:1136
+#: js/functions.js:1098
 msgid "Generate new syndication address for this feed?"
 msgstr ""
 
-#: js/functions.js:1140 js/prefs.js:1095
+#: js/functions.js:1100 js/prefs.js:870
 msgid "Trying to change address..."
 msgstr ""
 
-#: js/functions.js:1245 js/tt-rss.js:446 js/tt-rss.js:673
+#: js/functions.js:1199 js/tt-rss.js:399 js/tt-rss.js:612
 msgid "You can't edit this kind of feed."
 msgstr ""
 
-#: js/functions.js:1260
+#: js/functions.js:1213
 msgid "Edit Feed"
 msgstr ""
 
-#: js/functions.js:1266 js/prefs.js:100 js/prefs.js:209 js/prefs.js:647
+#: js/functions.js:1217 js/prefs.js:176 js/prefs.js:523 js/prefs.js:1139
+#: js/prefs.js:78
 msgid "Saving data..."
 msgstr ""
 
-#: js/functions.js:1293
+#: js/functions.js:1243
 msgid "More Feeds"
 msgstr ""
 
-#: js/functions.js:1355 js/functions.js:1464 js/prefs.js:398 js/prefs.js:540
-#: js/prefs.js:558 js/prefs.js:1077
+#: js/functions.js:1297 js/functions.js:1383 js/prefs.js:332 js/prefs.js:455
+#: js/prefs.js:473 js/prefs.js:855
 msgid "No feeds are selected."
 msgstr ""
 
-#: js/functions.js:1398
+#: js/functions.js:1329
 msgid ""
 "Remove selected feeds from the archive? Feeds with stored articles will not "
 "be removed."
 msgstr ""
 
-#: js/functions.js:1435
+#: js/functions.js:1360
 msgid "Feeds with update errors"
 msgstr ""
 
-#: js/functions.js:1446 js/prefs.js:1058
+#: js/functions.js:1369 js/prefs.js:841
 msgid "Remove selected feeds?"
 msgstr ""
 
-#: js/functions.js:1449 js/prefs.js:1061
+#: js/functions.js:1370 js/prefs.js:842
 msgid "Removing selected feeds..."
 msgstr ""
 
-#: js/prefs.js:60
-msgid "Please enter login:"
-msgstr ""
-
-#: js/prefs.js:67
-msgid "Can't create user: no login specified."
-msgstr ""
-
-#: js/prefs.js:71
-msgid "Adding user..."
-msgstr ""
-
-#: js/prefs.js:96
-msgid "User Editor"
-msgstr ""
-
-#: js/prefs.js:131
-msgid "Edit Filter"
-msgstr ""
-
-#: js/prefs.js:170
+#: js/prefs.js:143
 msgid "Remove filter?"
 msgstr ""
 
-#: js/prefs.js:175
+#: js/prefs.js:148
 msgid "Removing filter..."
 msgstr ""
 
-#: js/prefs.js:292
+#: js/prefs.js:251
 msgid "Remove selected labels?"
 msgstr ""
 
-#: js/prefs.js:295
+#: js/prefs.js:252
 msgid "Removing selected labels..."
 msgstr ""
 
-#: js/prefs.js:308 js/prefs.js:1144
+#: js/prefs.js:262 js/prefs.js:909
 msgid "No labels are selected."
 msgstr ""
 
-#: js/prefs.js:320
+#: js/prefs.js:274
 msgid ""
 "Remove selected users? Neither default admin nor your account will be "
 "removed."
 msgstr ""
 
-#: js/prefs.js:323
+#: js/prefs.js:275
 msgid "Removing selected users..."
 msgstr ""
 
-#: js/prefs.js:338 js/prefs.js:408 js/prefs.js:427 js/prefs.js:461
+#: js/prefs.js:286 js/prefs.js:342 js/prefs.js:361 js/prefs.js:387
 msgid "No users are selected."
 msgstr ""
 
-#: js/prefs.js:350
+#: js/prefs.js:297
 msgid "Remove selected filters?"
 msgstr ""
 
-#: js/prefs.js:353
+#: js/prefs.js:298
 msgid "Removing selected filters..."
 msgstr ""
 
-#: js/prefs.js:366 js/prefs.js:495 js/prefs.js:514
+#: js/prefs.js:308 js/prefs.js:419 js/prefs.js:438
 msgid "No filters are selected."
 msgstr ""
 
-#: js/prefs.js:378
+#: js/prefs.js:319
 msgid "Unsubscribe from selected feeds?"
 msgstr ""
 
-#: js/prefs.js:382
+#: js/prefs.js:321
 msgid "Unsubscribing from selected feeds..."
 msgstr ""
 
-#: js/prefs.js:413 js/prefs.js:432 js/prefs.js:466
+#: js/prefs.js:347 js/prefs.js:366 js/prefs.js:392
 msgid "Please select only one user."
 msgstr ""
 
-#: js/prefs.js:436
+#: js/prefs.js:370
 msgid "Reset password of selected user?"
 msgstr ""
 
-#: js/prefs.js:439
+#: js/prefs.js:371
 msgid "Resetting password for selected user..."
 msgstr ""
 
-#: js/prefs.js:500
+#: js/prefs.js:424
 msgid "Please select only one filter."
 msgstr ""
 
-#: js/prefs.js:518
+#: js/prefs.js:442
 msgid "Combine selected filters?"
 msgstr ""
 
-#: js/prefs.js:521
+#: js/prefs.js:443
 msgid "Joining filters..."
 msgstr ""
 
-#: js/prefs.js:580
+#: js/prefs.js:487
 msgid "Edit Multiple Feeds"
 msgstr ""
 
-#: js/prefs.js:604
+#: js/prefs.js:511
 msgid "Save changes to selected feeds?"
 msgstr ""
 
-#: js/prefs.js:681
+#: js/prefs.js:552
 msgid "OPML Import"
 msgstr ""
 
-#: js/prefs.js:700
+#: js/prefs.js:571
 msgid "Please choose an OPML file first."
 msgstr ""
 
-#: js/prefs.js:703 plugins/import_export/import_export.js:115
+#: js/prefs.js:574 plugins/import_export/import_export.js:115
 msgid "Importing, please wait..."
 msgstr ""
 
-#: js/prefs.js:869
+#: js/prefs.js:737
 msgid "Reset to defaults?"
 msgstr ""
 
-#: js/prefs.js:1468
-msgid "Subscribing to feeds..."
+#: js/prefs.js:777
+#, perl-format
+msgid ""
+"Remove category %s? Any nested feeds would be placed into Uncategorized."
 msgstr ""
 
-#: js/prefs.js:1487
-msgid "Clear stored data for this plugin?"
+#: js/prefs.js:778
+msgid "Removing category..."
 msgstr ""
 
-#: js/prefs.js:1501
-msgid "Clear all messages in the error log?"
+#: js/prefs.js:794
+msgid "Remove selected categories?"
 msgstr ""
 
-#: js/tt-rss.js:118
+#: js/prefs.js:795
+msgid "Removing selected categories..."
+msgstr ""
+
+#: js/prefs.js:805
+msgid "No categories are selected."
+msgstr ""
+
+#: js/prefs.js:812
+msgid "Category title:"
+msgstr ""
+
+#: js/prefs.js:815
+msgid "Creating category..."
+msgstr ""
+
+#: js/prefs.js:832
+msgid "Feeds without recent updates"
+msgstr ""
+
+#: js/prefs.js:869
+msgid "Replace current OPML publishing address with a new one?"
+msgstr ""
+
+#: js/prefs.js:898
+msgid "Reset selected labels to default colors?"
+msgstr ""
+
+#: js/prefs.js:926
+msgid "Settings Profiles"
+msgstr ""
+
+#: js/prefs.js:935
+msgid ""
+"Remove selected profiles? Active and default profiles will not be removed."
+msgstr ""
+
+#: js/prefs.js:936
+msgid "Removing selected profiles..."
+msgstr ""
+
+#: js/prefs.js:948
+msgid "No profiles are selected."
+msgstr ""
+
+#: js/prefs.js:955 js/prefs.js:997
+msgid "Activate selected profile?"
+msgstr ""
+
+#: js/prefs.js:964 js/prefs.js:1008
+msgid "Please choose a profile to activate."
+msgstr ""
+
+#: js/prefs.js:969
+msgid "Creating profile..."
+msgstr ""
+
+#: js/prefs.js:1016
+msgid "This will invalidate all previously generated feed URLs. Continue?"
+msgstr ""
+
+#: js/prefs.js:1017 plugins/share/share_prefs.js:3
+msgid "Clearing URLs..."
+msgstr ""
+
+#: js/prefs.js:1020
+msgid "Generated URLs cleared."
+msgstr ""
+
+#: js/prefs.js:1053
+msgid "Rename category to:"
+msgstr ""
+
+#: js/prefs.js:1074
+msgid "Label Editor"
+msgstr ""
+
+#: js/tt-rss.js:111
 msgid "Mark all articles as read?"
 msgstr ""
 
-#: js/tt-rss.js:124
+#: js/tt-rss.js:115
 msgid "Marking all feeds as read..."
 msgstr ""
 
-#: js/tt-rss.js:398
+#: js/tt-rss.js:351
 msgid "Please enable mail plugin first."
 msgstr ""
 
-#: js/tt-rss.js:527
+#: js/tt-rss.js:477
 msgid "Please enable embed_original plugin first."
 msgstr ""
 
-#: js/tt-rss.js:540 js/tt-rss.js:723
+#: js/tt-rss.js:490 js/tt-rss.js:653
 msgid "Widescreen is not available in combined mode."
 msgstr ""
 
-#: js/tt-rss.js:821
-msgid "You can't rescore this kind of feed."
-msgstr ""
-
-#: js/tt-rss.js:826 js/tt-rss.js:686
-msgid "Please select some feed first."
-msgstr ""
-
-#: js/tt-rss.js:831
-#, perl-format
-msgid "Rescore articles in %s?"
-msgstr ""
-
-#: js/tt-rss.js:834
-msgid "Rescoring articles..."
-msgstr ""
-
-#: js/viewfeed.js:917 js/viewfeed.js:955 js/viewfeed.js:1003
-#: js/viewfeed.js:1924 plugins/mail/mail.js:7 plugins/mailto/init.js:7
-#: js/viewfeed.js:675 js/viewfeed.js:697 js/viewfeed.js:718 js/viewfeed.js:777
-#: js/viewfeed.js:805
+#: js/viewfeed.js:444 js/viewfeed.js:461 js/viewfeed.js:484 js/viewfeed.js:521
+#: js/viewfeed.js:542 js/viewfeed.js:651 js/viewfeed.js:685 js/viewfeed.js:727
+#: js/viewfeed.js:1564 plugins/mailto/init.js:7 plugins/mail/mail.js:7
 msgid "No articles are selected."
 msgstr ""
 
-#: js/viewfeed.js:925
+#: js/viewfeed.js:659
 #, perl-format
 msgid "Delete %d selected article in %s?"
 msgid_plural "Delete %d selected articles in %s?"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/viewfeed.js:927
+#: js/viewfeed.js:661
 #, perl-format
 msgid "Delete %d selected article?"
 msgid_plural "Delete %d selected articles?"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/viewfeed.js:964
+#: js/viewfeed.js:694
 #, perl-format
 msgid "Archive %d selected article in %s?"
 msgid_plural "Archive %d selected articles in %s?"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/viewfeed.js:967
+#: js/viewfeed.js:697
 #, perl-format
 msgid "Move %d archived article back?"
 msgid_plural "Move %d archived articles back?"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/viewfeed.js:969
+#: js/viewfeed.js:698
 msgid ""
 "Please note that unstarred articles might get purged on next feed update."
 msgstr ""
 
-#: js/viewfeed.js:1009
+#: js/viewfeed.js:733
 #, 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:1029
+#: js/viewfeed.js:753
 msgid "Edit article Tags"
 msgstr ""
 
-#: js/viewfeed.js:1035
+#: js/viewfeed.js:757
 msgid "Saving article tags..."
 msgstr ""
 
-#: js/viewfeed.js:1666
+#: js/viewfeed.js:1015
+msgid "No article is selected."
+msgstr ""
+
+#: js/viewfeed.js:1050
+msgid "No articles found to mark"
+msgstr ""
+
+#: js/viewfeed.js:1052
+#, perl-format
+msgid "Mark %d article as read?"
+msgid_plural "Mark %d articles as read?"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/viewfeed.js:1312
 msgid "Open original article"
 msgstr ""
 
-#: js/viewfeed.js:1673
+#: js/viewfeed.js:1319
 msgid "Display article URL"
 msgstr ""
 
-#: js/viewfeed.js:1780
+#: js/viewfeed.js:1426
 msgid "Assign label"
 msgstr ""
 
-#: js/viewfeed.js:1785
+#: js/viewfeed.js:1431
 msgid "Remove label"
 msgstr ""
 
-#: js/viewfeed.js:1817
+#: js/viewfeed.js:1463
 msgid "Select articles in group"
 msgstr ""
 
-#: js/viewfeed.js:1827
+#: js/viewfeed.js:1473
 msgid "Mark group as read"
 msgstr ""
 
-#: js/viewfeed.js:1839
+#: js/viewfeed.js:1485
 msgid "Mark feed as read"
 msgstr ""
 
-#: js/viewfeed.js:1892
+#: js/viewfeed.js:1538
 msgid "Please enter new score for selected articles:"
 msgstr ""
 
-#: js/viewfeed.js:1955
+#: js/viewfeed.js:1571
 msgid "Please enter new score for this article:"
 msgstr ""
 
-#: js/viewfeed.js:1986
+#: js/viewfeed.js:1591
 msgid "Article URL:"
 msgstr ""
 
-#: 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 ""
 
+#: plugins/mailto/init.js:21 plugins/mail/mail.js:21
+msgid "Forward article by email"
+msgstr ""
+
+#: plugins/shorten_expanded/init.js:43
+msgid "Click to expand article"
+msgstr ""
+
 #: plugins/import_export/import_export.js:13
 msgid "Export Data"
 msgstr ""
@@ -2993,248 +3080,140 @@ msgstr ""
 msgid "Please choose the file first."
 msgstr ""
 
-#: plugins/mail/mail.js:21 plugins/mailto/init.js:21
-msgid "Forward article by email"
+#: plugins/share/share_prefs.js:2
+msgid "This will invalidate all previously shared article URLs. Continue?"
 msgstr ""
 
-#: plugins/mail/mail.js:36
-msgid "Error sending email:"
-msgstr ""
-
-#: plugins/mail/mail.js:38
-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:45
-msgid "Click to expand article"
+#: plugins/share/share_prefs.js:8
+msgid "Shared URLs cleared."
 msgstr ""
 
 #: plugins/share/share.js:10
 msgid "Share article by URL"
 msgstr ""
 
-#: plugins/share/share.js:14
+#: plugins/share/share.js:13
 msgid "Generate new share URL for this article?"
 msgstr ""
 
-#: plugins/share/share.js:18
+#: plugins/share/share.js:15
 msgid "Trying to change URL..."
 msgstr ""
 
-#: plugins/share/share.js:55
+#: plugins/share/share.js:48
 msgid "Remove sharing for this article?"
 msgstr ""
 
-#: plugins/share/share.js:59
+#: plugins/share/share.js:50
 msgid "Trying to unshare..."
 msgstr ""
 
-#: plugins/share/share_prefs.js:3
-msgid "This will invalidate all previously shared article URLs. Continue?"
+#: plugins/mail/mail.js:30
+msgid "Error sending email:"
 msgstr ""
 
-#: plugins/share/share_prefs.js:6 js/prefs.js:1277
-msgid "Clearing URLs..."
+#: plugins/mail/mail.js:32
+msgid "Your message has been sent."
 msgstr ""
 
-#: plugins/share/share_prefs.js:13
-msgid "Shared URLs cleared."
+#: plugins/note/note.js:15
+msgid "Saving article note..."
 msgstr ""
 
-#: js/feedlist.js:204
+#: js/feedlist.js:168
 msgid "Your password is at default value"
 msgstr ""
 
-#: js/feedlist.js:453
+#: js/feedlist.js:413
 msgid "Mark all articles in %s as read?"
 msgstr ""
 
-#: js/functions.js:494
-msgid "Upload complete."
-msgstr ""
-
-#: js/functions.js:511
-msgid "Remove stored feed icon?"
-msgstr ""
-
-#: js/functions.js:516
-msgid "Removing feed icon..."
-msgstr ""
-
-#: js/functions.js:521
-msgid "Feed icon removed."
-msgstr ""
-
-#: js/functions.js:537
-msgid "Please select an image file to upload."
-msgstr ""
-
-#: js/functions.js:539
-msgid "Upload new icon for this feed?"
-msgstr ""
-
-#: js/functions.js:540
-msgid "Uploading, please wait..."
-msgstr ""
-
-#: js/functions.js:550
-msgid "Please enter label caption:"
-msgstr ""
-
-#: js/functions.js:555
-msgid "Can't create label: missing caption."
-msgstr ""
-
-#: js/functions.js:797
+#: js/functions.js:764
 msgid "Edit rule"
 msgstr ""
 
-#: js/functions.js:819
+#: js/functions.js:786
 msgid "Edit action"
 msgstr ""
 
-#: js/functions.js:860
+#: js/functions.js:825
 msgid "Looking for articles (%d processed, %f found)..."
 msgstr ""
 
-#: js/functions.js:890
+#: js/functions.js:855
 msgid "Found %d articles matching this filter:"
 msgstr ""
 
-#: js/functions.js:942
+#: js/functions.js:907
 msgid "Create Filter"
 msgstr ""
 
-#: js/functions.js:1060 js/tt-rss.js:692
+#: js/functions.js:1016 js/tt-rss.js:631
 msgid "Unsubscribe from %s?"
 msgstr ""
 
-#: js/functions.js:1063
+#: js/functions.js:1019
 msgid "Removing feed..."
 msgstr ""
 
-#: js/functions.js:1489
+#: js/functions.js:1410
 msgid "Help"
 msgstr ""
 
-#: js/prefs.js:973
-msgid ""
-"Remove category %s? Any nested feeds would be placed into Uncategorized."
+#: js/prefs.js:44
+msgid "Please enter login:"
 msgstr ""
 
-#: js/prefs.js:979
-msgid "Removing category..."
+#: js/prefs.js:51
+msgid "Can't create user: no login specified."
 msgstr ""
 
-#: js/prefs.js:997
-msgid "Remove selected categories?"
+#: js/prefs.js:55
+msgid "Adding user..."
 msgstr ""
 
-#: js/prefs.js:1000
-msgid "Removing selected categories..."
+#: js/prefs.js:74
+msgid "User Editor"
 msgstr ""
 
-#: js/prefs.js:1013
-msgid "No categories are selected."
+#: js/prefs.js:104
+msgid "Edit Filter"
 msgstr ""
 
-#: js/prefs.js:1020
-msgid "Category title:"
+#: js/prefs.js:1175
+msgid "Subscribing to feeds..."
 msgstr ""
 
-#: js/prefs.js:1024
-msgid "Creating category..."
+#: js/prefs.js:1191
+msgid "Clear stored data for this plugin?"
 msgstr ""
 
-#: js/prefs.js:1047
-msgid "Feeds without recent updates"
+#: js/prefs.js:1203
+msgid "Clear all messages in the error log?"
 msgstr ""
 
-#: js/prefs.js:1091
-msgid "Replace current OPML publishing address with a new one?"
-msgstr ""
-
-#: js/prefs.js:1129
-msgid "Reset selected labels to default colors?"
-msgstr ""
-
-#: js/prefs.js:1161
-msgid "Settings Profiles"
-msgstr ""
-
-#: js/prefs.js:1170
-msgid ""
-"Remove selected profiles? Active and default profiles will not be removed."
-msgstr ""
-
-#: js/prefs.js:1173
-msgid "Removing selected profiles..."
-msgstr ""
-
-#: js/prefs.js:1189
-msgid "No profiles are selected."
-msgstr ""
-
-#: js/prefs.js:1197 js/prefs.js:1250
-msgid "Activate selected profile?"
-msgstr ""
-
-#: js/prefs.js:1214 js/prefs.js:1266
-msgid "Please choose a profile to activate."
-msgstr ""
-
-#: js/prefs.js:1219
-msgid "Creating profile..."
-msgstr ""
-
-#: js/prefs.js:1274
-msgid "This will invalidate all previously generated feed URLs. Continue?"
-msgstr ""
-
-#: js/prefs.js:1284
-msgid "Generated URLs cleared."
-msgstr ""
-
-#: js/prefs.js:1356
-msgid "Label Editor"
-msgstr ""
-
-#: js/tt-rss.js:681
+#: js/tt-rss.js:620
 msgid "You can't unsubscribe from the category."
 msgstr ""
 
-#: js/viewfeed.js:127 js/viewfeed.js:177 js/viewfeed.js:194
+#: js/tt-rss.js:625
+msgid "Please select some feed first."
+msgstr ""
+
+#: js/viewfeed.js:89 js/viewfeed.js:135 js/viewfeed.js:152
 msgid "Click to open next unread feed."
 msgstr ""
 
-#: js/viewfeed.js:131
+#: js/viewfeed.js:93
 msgid "Cancel search"
 msgstr ""
 
-#: js/viewfeed.js:191
+#: js/viewfeed.js:149
 msgid "New articles found, reload feed to continue."
 msgstr ""
 
-#: js/viewfeed.js:620
+#: js/viewfeed.js:405
 msgid "%d article selected"
 msgid_plural "%d articles selected"
 msgstr[0] ""
 msgstr[1] ""
-
-#: js/viewfeed.js:1284
-msgid "No article is selected."
-msgstr ""
-
-#: js/viewfeed.js:1319
-msgid "No articles found to mark"
-msgstr ""
-
-#: js/viewfeed.js:1321
-msgid "Mark %d article as read?"
-msgid_plural "Mark %d articles as read?"
-msgstr[0] ""
-msgstr[1] ""