diff --git a/messages.pot b/messages.pot
index 29a0ac157..ce67234d1 100644
--- a/messages.pot
+++ b/messages.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-26 12:57+0300\n"
+"POT-Creation-Date: 2021-02-26 13:06+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"
@@ -96,14 +96,20 @@ msgstr ""
 
 #: index.php:123 index.php:138 index.php:262 prefs.php:107
 #: classes/pref/prefs.php:968 classes/pref/prefs.php:982
-#: classes/pref/system.php:173 js/CommonDialogs.js:442 js/Headlines.js:344
-#: js/CommonFilters.js:273 plugins/af_psql_trgm/init.js:7
-#: plugins/note/note.js:28 plugins/mail/mail.js:35 plugins/mailto/init.js:18
-#: plugins/share/share.js:56
+#: classes/pref/system.php:173 js/Feeds.js:395 js/Feeds.js:465
+#: js/PrefFeedTree.js:165 js/PrefFeedTree.js:172 js/PrefFeedTree.js:296
+#: js/PrefFeedTree.js:373 js/CommonDialogs.js:289 js/CommonDialogs.js:442
+#: js/CommonDialogs.js:592 js/PrefHelpers.js:27 js/PrefHelpers.js:39
+#: js/PrefHelpers.js:88 js/PrefHelpers.js:200 js/PrefHelpers.js:283
+#: js/PrefHelpers.js:351 js/Headlines.js:344 js/PrefFilterTree.js:100
+#: js/PrefUsers.js:107 js/CommonFilters.js:273 js/CommonFilters.js:401
+#: plugins/af_psql_trgm/init.js:7 plugins/note/note.js:28
+#: plugins/mail/mail.js:35 plugins/af_readability/init.js:19
+#: plugins/mailto/init.js:18 plugins/share/share.js:56
 msgid "Loading, please wait..."
 msgstr ""
 
-#: index.php:152 prefs.php:117
+#: index.php:152 prefs.php:117 js/App.js:450
 msgid "Communication problem with server."
 msgstr ""
 
@@ -210,6 +216,7 @@ msgid "Edit this feed..."
 msgstr ""
 
 #: index.php:236 classes/pref/feeds.php:945 js/PrefFeedTree.js:99
+#: js/CommonDialogs.js:579
 msgid "Unsubscribe"
 msgstr ""
 
@@ -322,7 +329,7 @@ msgstr ""
 msgid "Article"
 msgstr ""
 
-#: classes/rpc.php:558 js/Headlines.js:626 js/Headlines.js:1342
+#: classes/rpc.php:558 js/Headlines.js:1342 js/Headlines.js:626
 msgid "Toggle starred"
 msgstr ""
 
@@ -547,7 +554,7 @@ msgstr ""
 
 #: classes/handler/public.php:499 classes/pref/feeds.php:645
 #: plugins/bookmarklets/init.php:300 include/login_form.php:105
-#: js/CommonDialogs.js:539
+#: js/CommonDialogs.js:539 js/PrefUsers.js:61
 msgid "Login:"
 msgstr ""
 
@@ -622,8 +629,8 @@ msgstr ""
 
 #: classes/pref/labels.php:182 classes/pref/prefs.php:1255
 #: classes/pref/filters.php:649 classes/pref/users.php:223
-#: classes/pref/feeds.php:924 js/CommonDialogs.js:236 js/PrefHelpers.js:144
-#: js/CommonFilters.js:436
+#: classes/pref/feeds.php:924 js/CommonFilters.js:436 js/CommonFilters.js:469
+#: js/CommonDialogs.js:236 js/PrefHelpers.js:144
 msgid "Select"
 msgstr ""
 
@@ -838,7 +845,7 @@ msgstr ""
 msgid "Full name:"
 msgstr ""
 
-#: classes/pref/prefs.php:296
+#: classes/pref/prefs.php:296 js/PrefUsers.js:93
 msgid "E-mail:"
 msgstr ""
 
@@ -854,7 +861,7 @@ msgstr ""
 msgid "Old password:"
 msgstr ""
 
-#: classes/pref/prefs.php:363
+#: classes/pref/prefs.php:363 js/PrefUsers.js:83
 msgid "New password:"
 msgstr ""
 
@@ -954,6 +961,7 @@ msgstr ""
 #: classes/pref/prefs.php:718 classes/pref/prefs.php:821
 #: classes/pref/prefs.php:877 classes/pref/prefs.php:929
 #: classes/pref/prefs.php:945 plugins/bookmarklets/init.php:362
+#: js/CommonDialogs.js:635
 msgid "More info..."
 msgstr ""
 
@@ -1024,14 +1032,16 @@ msgid "Incorrect password"
 msgstr ""
 
 #: classes/pref/prefs.php:1258 classes/pref/filters.php:652
-#: classes/pref/users.php:226 classes/pref/feeds.php:927 js/PrefFeedTree.js:506
-#: js/Headlines.js:620 js/CommonFilters.js:472
+#: classes/pref/users.php:226 classes/pref/feeds.php:927
+#: js/CommonFilters.js:440 js/CommonFilters.js:472 js/PrefFeedTree.js:506
+#: js/Headlines.js:620
 msgid "All"
 msgstr ""
 
 #: classes/pref/prefs.php:1260 classes/pref/filters.php:654
 #: classes/pref/users.php:228 classes/pref/feeds.php:929
-#: js/CommonDialogs.js:241 js/PrefHelpers.js:149 js/CommonFilters.js:442
+#: js/CommonFilters.js:442 js/CommonFilters.js:474 js/CommonDialogs.js:241
+#: js/PrefHelpers.js:149
 msgid "None"
 msgstr ""
 
@@ -1126,7 +1136,7 @@ msgid "%s on %s in %s %s"
 msgstr ""
 
 #: classes/pref/filters.php:645 classes/pref/users.php:218
-#: classes/pref/feeds.php:920 js/Feeds.js:615 js/Feeds.js:620
+#: classes/pref/feeds.php:920 js/Feeds.js:620 js/Feeds.js:615
 msgid "Search"
 msgstr ""
 
@@ -1275,7 +1285,7 @@ msgstr ""
 msgid "Place in category:"
 msgstr ""
 
-#: classes/pref/feeds.php:617 js/CommonDialogs.js:512
+#: classes/pref/feeds.php:617 js/Feeds.js:602 js/CommonDialogs.js:512
 msgid "Language:"
 msgstr ""
 
@@ -1288,7 +1298,7 @@ msgid "Article purging:"
 msgstr ""
 
 #: classes/pref/feeds.php:642 plugins/auth_internal/init.php:68
-#: js/PrefUsers.js:71
+#: js/PrefFeedTree.js:434 js/PrefUsers.js:71
 msgid "Authentication"
 msgstr ""
 
@@ -1305,15 +1315,17 @@ msgstr ""
 #: plugins/note/init.php:51 plugins/af_proxy_http/init.php:239
 #: plugins/mail/init.php:67 plugins/af_readability/init.php:89
 #: plugins/nsfw/init.php:75 plugins/af_redditimgur/init.php:79
-#: js/PrefLabelTree.js:171 js/PrefUsers.js:113 js/CommonFilters.js:516
+#: js/CommonDialogs.js:580 js/CommonFilters.js:516 js/PrefLabelTree.js:171
+#: js/PrefUsers.js:113
 msgid "Save"
 msgstr ""
 
 #: classes/pref/feeds.php:675 plugins/note/init.php:52
-#: plugins/mail/init.php:186 plugins/bookmarklets/init.php:282 js/Feeds.js:616
+#: plugins/mail/init.php:186 plugins/bookmarklets/init.php:282
+#: js/CommonDialogs.js:581 js/CommonFilters.js:233 js/CommonFilters.js:317
+#: js/CommonFilters.js:517 js/CommonFilters.js:521 js/Feeds.js:616
 #: js/PrefFeedTree.js:454 js/PrefHelpers.js:189 js/PrefHelpers.js:263
-#: js/Article.js:341 js/CommonFilters.js:233 js/CommonFilters.js:517
-#: js/CommonFilters.js:521
+#: js/Article.js:341
 msgid "Cancel"
 msgstr ""
 
@@ -1978,16 +1990,14 @@ msgid ""
 "(Personal data / Authentication)."
 msgstr ""
 
-#: js/Feeds.js:277
-msgid ""
-"Tiny Tiny RSS is running in safe mode. All themes and plugins are disabled. "
-"You will need to log out and back in to disable it."
-msgstr ""
-
 #: js/Feeds.js:416
 msgid "Mark all articles as read?"
 msgstr ""
 
+#: js/Feeds.js:420
+msgid "Marking all feeds as read..."
+msgstr ""
+
 #: js/Feeds.js:437
 msgid "Mark %w in %s older than 1 day as read?"
 msgstr ""
@@ -2017,10 +2027,6 @@ msgstr ""
 msgid "Mark all articles in %s as read?"
 msgstr ""
 
-#: js/Feeds.js:604
-msgid "Used for word stemming"
-msgstr ""
-
 #: js/Feeds.js:611
 msgid "Search syntax"
 msgstr ""
@@ -2041,6 +2047,10 @@ msgstr ""
 msgid "Colors"
 msgstr ""
 
+#: js/PrefLabelTree.js:145
+msgid "Foreground:"
+msgstr ""
+
 #: js/PrefLabelTree.js:146
 msgid "Background:"
 msgstr ""
@@ -2057,10 +2067,22 @@ msgstr ""
 msgid "Remove selected labels?"
 msgstr ""
 
+#: js/PrefLabelTree.js:211
+msgid "Removing selected labels..."
+msgstr ""
+
 #: js/App.js:401
 msgid "Keyboard shortcuts"
 msgstr ""
 
+#: js/App.js:462
+msgid "Update daemon is not running."
+msgstr ""
+
+#: js/App.js:475
+msgid "Update daemon is not updating feeds."
+msgstr ""
+
 #: js/App.js:559
 #, javascript-format
 msgid "Fatal error: %s"
@@ -2074,10 +2096,6 @@ msgstr ""
 msgid "Unhandled exception"
 msgstr ""
 
-#: js/App.js:597
-msgid "Additional information"
-msgstr ""
-
 #: js/App.js:1019
 msgid "Please enable mail or mailto plugin first."
 msgstr ""
@@ -2121,12 +2139,20 @@ msgid ""
 "Remove category %s? Any nested feeds would be placed into Uncategorized."
 msgstr ""
 
+#: js/PrefFeedTree.js:180
+msgid "Removing category..."
+msgstr ""
+
 #: js/PrefFeedTree.js:192
 msgid "Unsubscribe from selected feeds?"
 msgstr ""
 
+#: js/PrefFeedTree.js:194
+msgid "Unsubscribing from selected feeds..."
+msgstr ""
+
 #: js/PrefFeedTree.js:207 js/PrefFeedTree.js:276 js/PrefFeedTree.js:292
-#: js/CommonDialogs.js:230
+#: js/PrefFeedTree.js:497 js/CommonDialogs.js:230
 msgid "No feeds selected."
 msgstr ""
 
@@ -2134,6 +2160,10 @@ msgstr ""
 msgid "Remove selected categories?"
 msgstr ""
 
+#: js/PrefFeedTree.js:243
+msgid "Removing selected categories..."
+msgstr ""
+
 #: js/PrefFeedTree.js:255
 msgid "No categories selected."
 msgstr ""
@@ -2146,14 +2176,19 @@ msgstr ""
 msgid "Save changes to selected feeds?"
 msgstr ""
 
-#: js/PrefFeedTree.js:369
-msgid "Rename category to:"
+#: js/PrefFeedTree.js:344 js/CommonDialogs.js:426 js/PrefUsers.js:39
+#: js/CommonFilters.js:391
+msgid "Saving data..."
 msgstr ""
 
 #: js/PrefFeedTree.js:381
 msgid "Category title:"
 msgstr ""
 
+#: js/PrefFeedTree.js:384
+msgid "Creating category..."
+msgstr ""
+
 #: js/PrefFeedTree.js:399
 msgid "Subscribing to feeds..."
 msgstr ""
@@ -2162,24 +2197,30 @@ msgstr ""
 msgid "One valid feed per line (no detection is done)"
 msgstr ""
 
-#: js/PrefFeedTree.js:520
-msgid "Click to edit feed"
+#: js/PrefFeedTree.js:470
+msgid "Feeds without recent updates"
 msgstr ""
 
-#: js/PrefFeedTree.js:534
-msgid "Unsubscribe from selected feeds"
+#: js/PrefFeedTree.js:478 js/CommonDialogs.js:209
+msgid "Remove selected feeds?"
 msgstr ""
 
-#: js/CommonDialogs.js:19
-msgid "Subscribe to Feed"
+#: js/PrefFeedTree.js:479 js/CommonDialogs.js:210
+msgid "Removing selected feeds..."
 msgstr ""
 
-#: js/CommonDialogs.js:53
-msgid "Available feeds"
+#: js/PrefFeedTree.js:520
+msgid "Click to edit feed"
 msgstr ""
 
-#: js/CommonDialogs.js:86
-msgid "This feed requires authentication."
+#: js/CommonDialogs.js:19
+msgid "Subscribe to Feed"
+msgstr ""
+
+#: js/CommonDialogs.js:30
+msgid ""
+"Provided URL is a HTML page referencing multiple feeds, please select "
+"required feed from the dropdown menu below."
 msgstr ""
 
 #: js/CommonDialogs.js:122
@@ -2223,14 +2264,14 @@ msgstr ""
 msgid "Feeds with update errors"
 msgstr ""
 
-#: js/CommonDialogs.js:209
-msgid "Remove selected feeds?"
-msgstr ""
-
 #: js/CommonDialogs.js:283
 msgid "Please enter label caption:"
 msgstr ""
 
+#: js/CommonDialogs.js:305
+msgid "Removing feed..."
+msgstr ""
+
 #: js/CommonDialogs.js:336
 msgid "Edit Feed"
 msgstr ""
@@ -2239,12 +2280,52 @@ msgstr ""
 msgid "Please select an image file."
 msgstr ""
 
+#: js/CommonDialogs.js:369
+msgid "Upload failed: icon is too big."
+msgstr ""
+
+#: js/CommonDialogs.js:372
+msgid "Upload failed."
+msgstr ""
+
+#: js/CommonDialogs.js:376
+msgid "Upload complete."
+msgstr ""
+
 #: js/CommonDialogs.js:400
 msgid "Remove stored feed icon?"
 msgstr ""
 
-#: js/CommonDialogs.js:502
-msgid "Site URL:"
+#: js/CommonDialogs.js:401
+msgid "Removing feed icon..."
+msgstr ""
+
+#: js/CommonDialogs.js:406
+msgid "Feed icon removed."
+msgstr ""
+
+#: js/CommonDialogs.js:568
+msgid "Upload new icon..."
+msgstr ""
+
+#: js/CommonDialogs.js:597
+msgid "Show as feed"
+msgstr ""
+
+#: js/CommonDialogs.js:599
+msgid "Generate new syndication address for this feed?"
+msgstr ""
+
+#: js/CommonDialogs.js:601 js/PrefHelpers.js:359
+msgid "Trying to change address..."
+msgstr ""
+
+#: js/CommonDialogs.js:619 js/PrefHelpers.js:373
+msgid "Could not change feed URL."
+msgstr ""
+
+#: js/CommonDialogs.js:626
+msgid "%s can be accessed via the following secret URL:"
 msgstr ""
 
 #: js/PrefHelpers.js:20
@@ -2255,6 +2336,14 @@ msgstr ""
 msgid "This will invalidate all previously generated feed URLs. Continue?"
 msgstr ""
 
+#: js/PrefHelpers.js:46 plugins/share/share_prefs.js:6
+msgid "Clearing URLs..."
+msgstr ""
+
+#: js/PrefHelpers.js:49
+msgid "Generated URLs cleared."
+msgstr ""
+
 #: js/PrefHelpers.js:86
 msgid "Clear event log?"
 msgstr ""
@@ -2268,20 +2357,20 @@ msgid ""
 "Remove selected profiles? Active and default profiles will not be removed."
 msgstr ""
 
-#: js/PrefHelpers.js:123
-msgid "No profiles selected."
+#: js/PrefHelpers.js:109
+msgid "Removing selected profiles..."
 msgstr ""
 
-#: js/PrefHelpers.js:178
-msgid "(active)"
+#: js/PrefHelpers.js:123
+msgid "No profiles selected."
 msgstr ""
 
-#: js/PrefHelpers.js:186
-msgid "Remove selected profiles"
+#: js/PrefHelpers.js:128
+msgid "Creating profile..."
 msgstr ""
 
-#: js/PrefHelpers.js:188
-msgid "Activate profile"
+#: js/PrefHelpers.js:178
+msgid "(active)"
 msgstr ""
 
 #: js/PrefHelpers.js:199
@@ -2302,8 +2391,10 @@ msgid ""
 "with custom CSS declarations here."
 msgstr ""
 
-#: js/PrefHelpers.js:257
-msgid "Apply"
+#: js/PrefHelpers.js:248
+msgid ""
+"User CSS has been applied, you might need to reload the page to see all "
+"changes."
 msgstr ""
 
 #: js/PrefHelpers.js:274
@@ -2318,6 +2409,10 @@ msgstr ""
 msgid "Please choose an OPML file first."
 msgstr ""
 
+#: js/PrefHelpers.js:305
+msgid "Importing, please wait..."
+msgstr ""
+
 #: js/PrefHelpers.js:314
 msgid "OPML Import"
 msgstr ""
@@ -2344,19 +2439,11 @@ msgstr ""
 msgid "Cancel search"
 msgstr ""
 
-#: js/Headlines.js:622
-msgid "Invert"
-msgstr ""
-
-#: js/Headlines.js:630
-msgid "Set score"
-msgstr ""
-
-#: js/Headlines.js:635
-msgid "Delete permanently"
+#: js/Headlines.js:618
+msgid "Select..."
 msgstr ""
 
-#: js/Headlines.js:776 js/Headlines.js:793
+#: js/Headlines.js:725 js/Headlines.js:776 js/Headlines.js:793
 msgid "Click to open next unread feed."
 msgstr ""
 
@@ -2364,12 +2451,6 @@ msgstr ""
 msgid "New articles found, reload feed to continue."
 msgstr ""
 
-#: js/Headlines.js:809
-msgid ""
-"Could not update headlines (invalid object received - see error console for "
-"details)"
-msgstr ""
-
 #: js/Headlines.js:843 js/Headlines.js:869 js/Headlines.js:881
 #: js/Headlines.js:1024 js/Headlines.js:1041 js/Headlines.js:1058
 #: js/Headlines.js:1195 js/Article.js:62 plugins/mail/mail.js:9
@@ -2464,10 +2545,18 @@ msgstr ""
 msgid "Combine selected filters?"
 msgstr ""
 
+#: js/PrefFilterTree.js:115
+msgid "Joining filters..."
+msgstr ""
+
 #: js/PrefFilterTree.js:126
 msgid "Remove selected filters?"
 msgstr ""
 
+#: js/PrefFilterTree.js:127
+msgid "Removing selected filters..."
+msgstr ""
+
 #: js/Article.js:36
 msgid "Please enter new score for selected articles:"
 msgstr ""
@@ -2484,8 +2573,8 @@ msgstr ""
 msgid "No URL could be displayed for this article."
 msgstr ""
 
-#: js/Article.js:192
-msgid "Attachments"
+#: js/Article.js:144
+msgid "no tags"
 msgstr ""
 
 #: js/Article.js:231
@@ -2498,6 +2587,18 @@ msgid_plural "comments"
 msgstr[0] ""
 msgstr[1] ""
 
+#: js/Article.js:320
+msgid "Edit article Tags"
+msgstr ""
+
+#: js/Article.js:327
+msgid "Tags for this article (separated by commas):"
+msgstr ""
+
+#: js/Article.js:347
+msgid "Saving article tags..."
+msgstr ""
+
 #: js/FeedTree.js:102
 msgid "Debug feed"
 msgstr ""
@@ -2510,6 +2611,10 @@ msgstr ""
 msgid "Please enter username:"
 msgstr ""
 
+#: js/PrefUsers.js:20
+msgid "Adding user..."
+msgstr ""
+
 #: js/PrefUsers.js:36
 msgid "User Editor"
 msgstr ""
@@ -2526,12 +2631,20 @@ msgstr ""
 msgid "Reset password of selected user?"
 msgstr ""
 
+#: js/PrefUsers.js:140
+msgid "Resetting password for selected user..."
+msgstr ""
+
 #: js/PrefUsers.js:155
 msgid ""
 "Remove selected users? Neither default admin nor your account will be "
 "removed."
 msgstr ""
 
+#: js/PrefUsers.js:156
+msgid "Removing selected users..."
+msgstr ""
+
 #: js/CommonFilters.js:14
 msgid "Edit Filter"
 msgstr ""
@@ -2545,15 +2658,35 @@ msgstr ""
 msgid "Looking for articles (%d processed, %f found)..."
 msgstr ""
 
-#: js/CommonFilters.js:67
-msgid "No recent articles matching this filter have been found."
-msgstr ""
-
 #: js/CommonFilters.js:70
 #, javascript-format
 msgid "Found %d articles matching this filter:"
 msgstr ""
 
+#: js/CommonFilters.js:79
+msgid "Error while trying to get filter test results."
+msgstr ""
+
+#: js/CommonFilters.js:170
+msgid "Edit rule"
+msgstr ""
+
+#: js/CommonFilters.js:170
+msgid "Add rule"
+msgstr ""
+
+#: js/CommonFilters.js:214
+msgid "Inverse regular expression matching"
+msgstr ""
+
+#: js/CommonFilters.js:218
+msgid "on"
+msgstr ""
+
+#: js/CommonFilters.js:230
+msgid "More info"
+msgstr ""
+
 #: js/CommonFilters.js:232
 msgid "Save rule"
 msgstr ""
@@ -2566,14 +2699,26 @@ msgstr ""
 msgid "Add action"
 msgstr ""
 
-#: js/CommonFilters.js:449
-msgid "Delete"
+#: js/CommonFilters.js:316
+msgid "Save action"
+msgstr ""
+
+#: js/CommonFilters.js:356
+msgid "Remove filter?"
 msgstr ""
 
-#: js/CommonFilters.js:478
+#: js/CommonFilters.js:361
+msgid "Removing filter..."
+msgstr ""
+
+#: js/CommonFilters.js:446 js/CommonFilters.js:478
 msgid "Add"
 msgstr ""
 
+#: js/CommonFilters.js:449 js/CommonFilters.js:481
+msgid "Delete"
+msgstr ""
+
 #: js/CommonFilters.js:515 js/CommonFilters.js:519
 msgid "Test"
 msgstr ""
@@ -2586,18 +2731,26 @@ msgstr ""
 msgid "Related articles"
 msgstr ""
 
+#: plugins/note/note.js:9
+msgid "Saving article note..."
+msgstr ""
+
 #: plugins/mail/mail.js:17
 msgid "Forward article by email"
 msgstr ""
 
-#: plugins/mail/mail.js:25
-msgid "Error sending email:"
+#: plugins/af_readability/init.js:31
+msgid "Unable to fetch full text for this article"
 msgstr ""
 
 #: plugins/mailto/init.js:17
 msgid "Forward article by email (mailto:)"
 msgstr ""
 
+#: plugins/shorten_expanded/init.js:41
+msgid "Click to expand article"
+msgstr ""
+
 #: plugins/share/share.js:7
 msgid "Share article by URL"
 msgstr ""
@@ -2606,6 +2759,14 @@ msgstr ""
 msgid "Generate new share URL for this article?"
 msgstr ""
 
+#: plugins/share/share.js:11
+msgid "Trying to change URL..."
+msgstr ""
+
+#: plugins/share/share.js:34
+msgid "Could not change URL."
+msgstr ""
+
 #: plugins/share/share.js:42
 msgid "Remove sharing for this article?"
 msgstr ""
@@ -2613,3 +2774,79 @@ msgstr ""
 #: plugins/share/share_prefs.js:5
 msgid "This will invalidate all previously shared article URLs. Continue?"
 msgstr ""
+
+#: js/Feeds.js:277
+msgid ""
+"Tiny Tiny RSS is running in safe mode. All themes and plugins are disabled. "
+"You will need to log out and back in to disable it."
+msgstr ""
+
+#: js/Feeds.js:604
+msgid "Used for word stemming"
+msgstr ""
+
+#: js/App.js:597
+msgid "Additional information"
+msgstr ""
+
+#: js/PrefFeedTree.js:369
+msgid "Rename category to:"
+msgstr ""
+
+#: js/PrefFeedTree.js:534
+msgid "Unsubscribe from selected feeds"
+msgstr ""
+
+#: js/CommonDialogs.js:53
+msgid "Available feeds"
+msgstr ""
+
+#: js/CommonDialogs.js:86
+msgid "This feed requires authentication."
+msgstr ""
+
+#: js/CommonDialogs.js:502
+msgid "Site URL:"
+msgstr ""
+
+#: js/PrefHelpers.js:186
+msgid "Remove selected profiles"
+msgstr ""
+
+#: js/PrefHelpers.js:188
+msgid "Activate profile"
+msgstr ""
+
+#: js/PrefHelpers.js:257
+msgid "Apply"
+msgstr ""
+
+#: js/Headlines.js:622
+msgid "Invert"
+msgstr ""
+
+#: js/Headlines.js:630
+msgid "Set score"
+msgstr ""
+
+#: js/Headlines.js:635
+msgid "Delete permanently"
+msgstr ""
+
+#: js/Headlines.js:809
+msgid ""
+"Could not update headlines (invalid object received - see error console for "
+"details)"
+msgstr ""
+
+#: js/Article.js:192
+msgid "Attachments"
+msgstr ""
+
+#: js/CommonFilters.js:67
+msgid "No recent articles matching this filter have been found."
+msgstr ""
+
+#: plugins/mail/mail.js:25
+msgid "Error sending email:"
+msgstr ""
diff --git a/utils/rebase-translations.sh b/utils/rebase-translations.sh
index 8eb04818f..564267ab8 100755
--- a/utils/rebase-translations.sh
+++ b/utils/rebase-translations.sh
@@ -4,6 +4,9 @@ TEMPLATE=messages.pot
 xgettext -kT_sprintf -kT_nsprintf:1,2 -k_ngettext:1,2 -kT_ngettext:1,2 -k__ \
 	-L PHP -o $TEMPLATE *.php `find classes plugins include -iname '*.php'`
 
+xgettext --from-code utf-8 -k__ -kNotify.info -kNotify.error -kNotify.progress \
+	-kngettext:1,2 -L Java -j -o $TEMPLATE `find js plugins -iname '*.js'`
+
 xgettext --from-code utf-8 -k__ -kNotify.info -kNotify.error -kNotify.progress \
 	-kngettext:1,2 -L JavaScript -j -o $TEMPLATE `find js plugins -iname '*.js'`