Merge branch '0.9.x' into twitstream

12 files changed, 697 insertions, 226 deletions

diff --git a/plugins/Blacklist/BlacklistPlugin.php b/plugins/Blacklist/BlacklistPlugin.php
index 10f89ef72..15545f03c 100644
--- a/plugins/Blacklist/BlacklistPlugin.php
+++ b/plugins/Blacklist/BlacklistPlugin.php
@@ -145,7 +145,8 @@ class BlacklistPlugin extends Plugin
 
         if (!empty($homepage)) {
             if (!$this->_checkUrl($homepage)) {
-                $msg = sprintf(_m("You may not register with homepage '%s'."),
+                // TRANS: Validation failure for URL. %s is the URL.
+                $msg = sprintf(_m("You may not register with homepage \"%s\"."),
                                $homepage);
                 throw new ClientException($msg);
             }
@@ -155,7 +156,8 @@ class BlacklistPlugin extends Plugin
 
         if (!empty($nickname)) {
             if (!$this->_checkNickname($nickname)) {
-                $msg = sprintf(_m("You may not register with nickname '%s'."),
+                // TRANS: Validation failure for nickname. %s is the nickname.
+                $msg = sprintf(_m("You may not register with nickname \"%s\"."),
                                $nickname);
                 throw new ClientException($msg);
             }
@@ -179,7 +181,8 @@ class BlacklistPlugin extends Plugin
 
         if (!empty($homepage)) {
             if (!$this->_checkUrl($homepage)) {
-                $msg = sprintf(_m("You may not use homepage '%s'."),
+                // TRANS: Validation failure for URL. %s is the URL.
+                $msg = sprintf(_m("You may not use homepage \"%s\"."),
                                $homepage);
                 throw new ClientException($msg);
             }
@@ -189,7 +192,8 @@ class BlacklistPlugin extends Plugin
 
         if (!empty($nickname)) {
             if (!$this->_checkNickname($nickname)) {
-                $msg = sprintf(_m("You may not use nickname '%s'."),
+                // TRANS: Validation failure for nickname. %s is the nickname.
+                $msg = sprintf(_m("You may not use nickname \"%s\"."),
                                $nickname);
                 throw new ClientException($msg);
             }
@@ -231,6 +235,7 @@ class BlacklistPlugin extends Plugin
         $url = htmlspecialchars_decode($url);
 
         if (!$this->_checkUrl($url)) {
+            // TRANS: Validation failure for URL. %s is the URL.
             $msg = sprintf(_m("You may not use URL \"%s\" in notices."),
                            $url);
             throw new ClientException($msg);
@@ -372,8 +377,10 @@ class BlacklistPlugin extends Plugin
             $action_name = $nav->action->trimmed('action');
 
             $nav->out->menuItem(common_local_url('blacklistadminpanel'),
-                                _m('Blacklist'),
-                                _m('Blacklist configuration'),
+                                // TRANS: Menu item in admin panel.
+                                _m('MENU','Blacklist'),
+                                // TRANS: Tooltip for menu item in admin panel.
+                                _m('TOOLTIP','Blacklist configuration'),
                                 $action_name == 'blacklistadminpanel',
                                 'nav_blacklist_admin_panel');
         }
@@ -399,6 +406,7 @@ class BlacklistPlugin extends Plugin
         $action->elementStart('li');
         $this->checkboxAndText($action,
                                'blacklistnickname',
+                               // TRANS: Checkbox with text label in the delete user form.
                                _m('Add this nickname pattern to blacklist'),
                                'blacklistnicknamepattern',
                                $this->patternizeNickname($user->nickname));
@@ -408,6 +416,7 @@ class BlacklistPlugin extends Plugin
             $action->elementStart('li');
             $this->checkboxAndText($action,
                                    'blacklisthomepage',
+                                   // TRANS: Checkbox with text label in the delete user form.
                                    _m('Add this homepage pattern to blacklist'),
                                    'blacklisthomepagepattern',
                                    $this->patternizeHomepage($profile->homepage));
@@ -463,4 +472,82 @@ class BlacklistPlugin extends Plugin
         $hostname = parse_url($homepage, PHP_URL_HOST);
         return $hostname;
     }
+
+    function onStartHandleFeedEntry($activity)
+    {
+        return $this->_checkActivity($activity);
+    }
+
+    function onStartHandleSalmon($activity)
+    {
+        return $this->_checkActivity($activity);
+    }
+
+    function _checkActivity($activity)
+    {
+        $actor = $activity->actor;
+
+        if (empty($actor)) {
+            return true;
+        }
+
+        $homepage = strtolower($actor->link);
+
+        if (!empty($homepage)) {
+            if (!$this->_checkUrl($homepage)) {
+                // TRANS: Exception thrown trying to post a notice while having set a blocked homepage URL. %s is the blocked URL.
+                $msg = sprintf(_m("Users from \"%s\" blocked."),
+                               $homepage);
+                throw new ClientException($msg);
+            }
+        }
+
+        $nickname = strtolower($actor->poco->preferredUsername);
+
+        if (!empty($nickname)) {
+            if (!$this->_checkNickname($nickname)) {
+                // TRANS: Exception thrown trying to post a notice while having a blocked nickname. %s is the blocked nickname.
+                $msg = sprintf(_m("Posts from nickname \"%s\" disallowed."),
+                               $nickname);
+                throw new ClientException($msg);
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Check URLs and homepages for blacklisted users.
+     */
+    function onStartSubscribe($subscriber, $other)
+    {
+        foreach (array($other->profileurl, $other->homepage) as $url) {
+
+            if (empty($url)) {
+                continue;
+            }
+
+            $url = strtolower($url);
+
+            if (!$this->_checkUrl($url)) {
+                // TRANS: Client exception thrown trying to subscribe to a person with a blocked homepage or site URL. %s is the blocked URL.
+                $msg = sprintf(_m("Users from \"%s\" blocked."),
+                               $url);
+                throw new ClientException($msg);
+            }
+        }
+
+        $nickname = $other->nickname;
+
+        if (!empty($nickname)) {
+            if (!$this->_checkNickname($nickname)) {
+                // TRANS: Client exception thrown trying to subscribe to a person with a blocked nickname. %s is the blocked nickname.
+                $msg = sprintf(_m("Can't subscribe to nickname \"%s\"."),
+                               $nickname);
+                throw new ClientException($msg);
+            }
+        }
+
+        return true;
+    }
 }
diff --git a/plugins/Blacklist/locale/Blacklist.pot b/plugins/Blacklist/locale/Blacklist.pot
index a58f7b4d7..2dbbd25f7 100644
--- a/plugins/Blacklist/locale/Blacklist.pot
+++ b/plugins/Blacklist/locale/Blacklist.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-09 14:04+0000\n"
+"POT-Creation-Date: 2010-10-27 23:43+0000\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"
@@ -16,51 +16,85 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: BlacklistPlugin.php:148
+#. TRANS: Validation failure for URL. %s is the URL.
+#: BlacklistPlugin.php:149
 #, php-format
-msgid "You may not register with homepage '%s'."
+msgid "You may not register with homepage \"%s\"."
 msgstr ""
 
-#: BlacklistPlugin.php:158
+#. TRANS: Validation failure for nickname. %s is the nickname.
+#: BlacklistPlugin.php:160
 #, php-format
-msgid "You may not register with nickname '%s'."
+msgid "You may not register with nickname \"%s\"."
 msgstr ""
 
-#: BlacklistPlugin.php:182
+#. TRANS: Validation failure for URL. %s is the URL.
+#: BlacklistPlugin.php:185
 #, php-format
-msgid "You may not use homepage '%s'."
+msgid "You may not use homepage \"%s\"."
 msgstr ""
 
-#: BlacklistPlugin.php:192
+#. TRANS: Validation failure for nickname. %s is the nickname.
+#: BlacklistPlugin.php:196
 #, php-format
-msgid "You may not use nickname '%s'."
+msgid "You may not use nickname \"%s\"."
 msgstr ""
 
-#: BlacklistPlugin.php:234
+#. TRANS: Validation failure for URL. %s is the URL.
+#: BlacklistPlugin.php:239
 #, php-format
 msgid "You may not use URL \"%s\" in notices."
 msgstr ""
 
-#: BlacklistPlugin.php:338
+#: BlacklistPlugin.php:343
 msgid "Keeps a blacklist of forbidden nickname and URL patterns."
 msgstr ""
 
-#: BlacklistPlugin.php:375 blacklistadminpanel.php:52
+#. TRANS: Menu item in admin panel.
+#: BlacklistPlugin.php:381
+msgctxt "MENU"
 msgid "Blacklist"
 msgstr ""
 
-#: BlacklistPlugin.php:376
+#. TRANS: Tooltip for menu item in admin panel.
+#: BlacklistPlugin.php:383
+msgctxt "TOOLTIP"
 msgid "Blacklist configuration"
 msgstr ""
 
-#: BlacklistPlugin.php:402
+#. TRANS: Checkbox with text label in the delete user form.
+#: BlacklistPlugin.php:410
 msgid "Add this nickname pattern to blacklist"
 msgstr ""
 
-#: BlacklistPlugin.php:411
+#. TRANS: Checkbox with text label in the delete user form.
+#: BlacklistPlugin.php:420
 msgid "Add this homepage pattern to blacklist"
 msgstr ""
 
+#. TRANS: Exception thrown trying to post a notice while having set a blocked homepage URL. %s is the blocked URL.
+#. TRANS: Client exception thrown trying to subscribe to a person with a blocked homepage or site URL. %s is the blocked URL.
+#: BlacklistPlugin.php:499 BlacklistPlugin.php:534
+#, php-format
+msgid "Users from \"%s\" blocked."
+msgstr ""
+
+#. TRANS: Exception thrown trying to post a notice while having a blocked nickname. %s is the blocked nickname.
+#: BlacklistPlugin.php:510
+#, php-format
+msgid "Posts from nickname \"%s\" disallowed."
+msgstr ""
+
+#. TRANS: Client exception thrown trying to subscribe to a person with a blocked nickname. %s is the blocked nickname.
+#: BlacklistPlugin.php:545
+#, php-format
+msgid "Can't subscribe to nickname \"%s\"."
+msgstr ""
+
+#: blacklistadminpanel.php:52
+msgid "Blacklist"
+msgstr ""
+
 #: blacklistadminpanel.php:62
 msgid "Blacklisted URLs and nicknames"
 msgstr ""
diff --git a/plugins/Blacklist/locale/br/LC_MESSAGES/Blacklist.po b/plugins/Blacklist/locale/br/LC_MESSAGES/Blacklist.po
index 40ba32609..5e6bf3afa 100644
--- a/plugins/Blacklist/locale/br/LC_MESSAGES/Blacklist.po
+++ b/plugins/Blacklist/locale/br/LC_MESSAGES/Blacklist.po
@@ -9,63 +9,97 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Blacklist\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-03 19:53+0000\n"
-"PO-Revision-Date: 2010-10-03 19:56:26+0000\n"
+"POT-Creation-Date: 2010-10-27 23:43+0000\n"
+"PO-Revision-Date: 2010-10-27 23:46:17+0000\n"
 "Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-09-27 23:18:14+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r74231); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-10-18 20:29:05+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r75590); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-blacklist\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: BlacklistPlugin.php:148
-#, php-format
-msgid "You may not register with homepage '%s'."
+#. TRANS: Validation failure for URL. %s is the URL.
+#: BlacklistPlugin.php:149
+#, fuzzy, php-format
+msgid "You may not register with homepage \"%s\"."
 msgstr "Ne c'hellit ket en em enskrivañ gant ar bajenn degemer \"%s\"."
 
-#: BlacklistPlugin.php:158
-#, php-format
-msgid "You may not register with nickname '%s'."
+#. TRANS: Validation failure for nickname. %s is the nickname.
+#: BlacklistPlugin.php:160
+#, fuzzy, php-format
+msgid "You may not register with nickname \"%s\"."
 msgstr "Ne c'hellit ket en em enskrivañ gant al lesanv \"%s\"."
 
-#: BlacklistPlugin.php:182
-#, php-format
-msgid "You may not use homepage '%s'."
+#. TRANS: Validation failure for URL. %s is the URL.
+#: BlacklistPlugin.php:185
+#, fuzzy, php-format
+msgid "You may not use homepage \"%s\"."
 msgstr "Ne c'hellit ket implij ar bajenn degemer \"%s\"."
 
-#: BlacklistPlugin.php:192
-#, php-format
-msgid "You may not use nickname '%s'."
+#. TRANS: Validation failure for nickname. %s is the nickname.
+#: BlacklistPlugin.php:196
+#, fuzzy, php-format
+msgid "You may not use nickname \"%s\"."
 msgstr "Ne c'hellit ket implij al lesanv \"%s\"."
 
-#: BlacklistPlugin.php:234
+#. TRANS: Validation failure for URL. %s is the URL.
+#: BlacklistPlugin.php:239
 #, php-format
 msgid "You may not use URL \"%s\" in notices."
 msgstr "Ne c'hellit ket implij an URL \"%s\" en alioù."
 
-#: BlacklistPlugin.php:338
+#: BlacklistPlugin.php:343
 msgid "Keeps a blacklist of forbidden nickname and URL patterns."
 msgstr ""
 
-#: BlacklistPlugin.php:375 blacklistadminpanel.php:52
+#. TRANS: Menu item in admin panel.
+#: BlacklistPlugin.php:381
+msgctxt "MENU"
 msgid "Blacklist"
 msgstr ""
 
-#: BlacklistPlugin.php:376
+#. TRANS: Tooltip for menu item in admin panel.
+#: BlacklistPlugin.php:383
+msgctxt "TOOLTIP"
 msgid "Blacklist configuration"
 msgstr ""
 
-#: BlacklistPlugin.php:402
+#. TRANS: Checkbox with text label in the delete user form.
+#: BlacklistPlugin.php:410
 msgid "Add this nickname pattern to blacklist"
 msgstr ""
 
-#: BlacklistPlugin.php:411
+#. TRANS: Checkbox with text label in the delete user form.
+#: BlacklistPlugin.php:420
 msgid "Add this homepage pattern to blacklist"
 msgstr ""
 
+#. TRANS: Exception thrown trying to post a notice while having set a blocked homepage URL. %s is the blocked URL.
+#. TRANS: Client exception thrown trying to subscribe to a person with a blocked homepage or site URL. %s is the blocked URL.
+#: BlacklistPlugin.php:499 BlacklistPlugin.php:534
+#, php-format
+msgid "Users from \"%s\" blocked."
+msgstr ""
+
+#. TRANS: Exception thrown trying to post a notice while having a blocked nickname. %s is the blocked nickname.
+#: BlacklistPlugin.php:510
+#, php-format
+msgid "Posts from nickname \"%s\" disallowed."
+msgstr ""
+
+#. TRANS: Client exception thrown trying to subscribe to a person with a blocked nickname. %s is the blocked nickname.
+#: BlacklistPlugin.php:545
+#, fuzzy, php-format
+msgid "Can't subscribe to nickname \"%s\"."
+msgstr "Ne c'hellit ket implij al lesanv \"%s\"."
+
+#: blacklistadminpanel.php:52
+msgid "Blacklist"
+msgstr ""
+
 #: blacklistadminpanel.php:62
 msgid "Blacklisted URLs and nicknames"
 msgstr ""
diff --git a/plugins/Blacklist/locale/de/LC_MESSAGES/Blacklist.po b/plugins/Blacklist/locale/de/LC_MESSAGES/Blacklist.po
index cbc54fa4e..35efa11df 100644
--- a/plugins/Blacklist/locale/de/LC_MESSAGES/Blacklist.po
+++ b/plugins/Blacklist/locale/de/LC_MESSAGES/Blacklist.po
@@ -9,63 +9,99 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Blacklist\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-18 18:35+0000\n"
-"PO-Revision-Date: 2010-10-18 18:42:35+0000\n"
+"POT-Creation-Date: 2010-10-27 23:43+0000\n"
+"PO-Revision-Date: 2010-10-27 23:46:17+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-10-09 14:33:25+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r74952); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-10-18 20:29:05+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r75590); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-blacklist\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: BlacklistPlugin.php:148
-#, php-format
-msgid "You may not register with homepage '%s'."
+#. TRANS: Validation failure for URL. %s is the URL.
+#: BlacklistPlugin.php:149
+#, fuzzy, php-format
+msgid "You may not register with homepage \"%s\"."
 msgstr "Du darfst dich nicht mit der Homepage „%s“ anmelden."
 
-#: BlacklistPlugin.php:158
-#, php-format
-msgid "You may not register with nickname '%s'."
+#. TRANS: Validation failure for nickname. %s is the nickname.
+#: BlacklistPlugin.php:160
+#, fuzzy, php-format
+msgid "You may not register with nickname \"%s\"."
 msgstr "Du darfst dich nicht mit den Benutzernamen „%s“ anmelden."
 
-#: BlacklistPlugin.php:182
-#, php-format
-msgid "You may not use homepage '%s'."
+#. TRANS: Validation failure for URL. %s is the URL.
+#: BlacklistPlugin.php:185
+#, fuzzy, php-format
+msgid "You may not use homepage \"%s\"."
 msgstr "Du darfst nicht die Homepage „%s“ benutzen."
 
-#: BlacklistPlugin.php:192
-#, php-format
-msgid "You may not use nickname '%s'."
+#. TRANS: Validation failure for nickname. %s is the nickname.
+#: BlacklistPlugin.php:196
+#, fuzzy, php-format
+msgid "You may not use nickname \"%s\"."
 msgstr "Du darfst nicht den Benutzernamen „%s“ benutzen."
 
-#: BlacklistPlugin.php:234
+#. TRANS: Validation failure for URL. %s is the URL.
+#: BlacklistPlugin.php:239
 #, php-format
 msgid "You may not use URL \"%s\" in notices."
 msgstr "Du darfst nicht die URL „%s“ in Nachrichten verwenden."
 
-#: BlacklistPlugin.php:338
+#: BlacklistPlugin.php:343
 msgid "Keeps a blacklist of forbidden nickname and URL patterns."
 msgstr "Hält eine schwarze Liste der verbotenen Benutzernamen und URL-Muster."
 
-#: BlacklistPlugin.php:375 blacklistadminpanel.php:52
+#. TRANS: Menu item in admin panel.
+#: BlacklistPlugin.php:381
+#, fuzzy
+msgctxt "MENU"
 msgid "Blacklist"
 msgstr "Schwarze Liste"
 
-#: BlacklistPlugin.php:376
+#. TRANS: Tooltip for menu item in admin panel.
+#: BlacklistPlugin.php:383
+#, fuzzy
+msgctxt "TOOLTIP"
 msgid "Blacklist configuration"
 msgstr "Konfiguration der schwarzen Liste"
 
-#: BlacklistPlugin.php:402
+#. TRANS: Checkbox with text label in the delete user form.
+#: BlacklistPlugin.php:410
 msgid "Add this nickname pattern to blacklist"
 msgstr "Dieses Benutzernamen-Muster zur schwarzen Liste hinzufügen"
 
-#: BlacklistPlugin.php:411
+#. TRANS: Checkbox with text label in the delete user form.
+#: BlacklistPlugin.php:420
 msgid "Add this homepage pattern to blacklist"
 msgstr "Dieses Homepage-Muster zur schwarzen Liste hinzufügen"
 
+#. TRANS: Exception thrown trying to post a notice while having set a blocked homepage URL. %s is the blocked URL.
+#. TRANS: Client exception thrown trying to subscribe to a person with a blocked homepage or site URL. %s is the blocked URL.
+#: BlacklistPlugin.php:499 BlacklistPlugin.php:534
+#, php-format
+msgid "Users from \"%s\" blocked."
+msgstr ""
+
+#. TRANS: Exception thrown trying to post a notice while having a blocked nickname. %s is the blocked nickname.
+#: BlacklistPlugin.php:510
+#, php-format
+msgid "Posts from nickname \"%s\" disallowed."
+msgstr ""
+
+#. TRANS: Client exception thrown trying to subscribe to a person with a blocked nickname. %s is the blocked nickname.
+#: BlacklistPlugin.php:545
+#, fuzzy, php-format
+msgid "Can't subscribe to nickname \"%s\"."
+msgstr "Du darfst nicht den Benutzernamen „%s“ benutzen."
+
+#: blacklistadminpanel.php:52
+msgid "Blacklist"
+msgstr "Schwarze Liste"
+
 #: blacklistadminpanel.php:62
 msgid "Blacklisted URLs and nicknames"
 msgstr "URLs und Benutzernamen auf der schwarzen Liste"
diff --git a/plugins/Blacklist/locale/es/LC_MESSAGES/Blacklist.po b/plugins/Blacklist/locale/es/LC_MESSAGES/Blacklist.po
index 09799df24..4422c017f 100644
--- a/plugins/Blacklist/locale/es/LC_MESSAGES/Blacklist.po
+++ b/plugins/Blacklist/locale/es/LC_MESSAGES/Blacklist.po
@@ -10,64 +10,100 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Blacklist\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-03 19:53+0000\n"
-"PO-Revision-Date: 2010-10-03 19:56:26+0000\n"
+"POT-Creation-Date: 2010-10-27 23:43+0000\n"
+"PO-Revision-Date: 2010-10-27 23:46:17+0000\n"
 "Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-09-27 23:18:14+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r74231); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-10-18 20:29:05+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r75590); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-blacklist\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: BlacklistPlugin.php:148
-#, php-format
-msgid "You may not register with homepage '%s'."
+#. TRANS: Validation failure for URL. %s is the URL.
+#: BlacklistPlugin.php:149
+#, fuzzy, php-format
+msgid "You may not register with homepage \"%s\"."
 msgstr "No puedes registrarte con la página principal '%s'."
 
-#: BlacklistPlugin.php:158
-#, php-format
-msgid "You may not register with nickname '%s'."
+#. TRANS: Validation failure for nickname. %s is the nickname.
+#: BlacklistPlugin.php:160
+#, fuzzy, php-format
+msgid "You may not register with nickname \"%s\"."
 msgstr "No puedes registrarte con el nombre de usuario '%s'."
 
-#: BlacklistPlugin.php:182
-#, php-format
-msgid "You may not use homepage '%s'."
+#. TRANS: Validation failure for URL. %s is the URL.
+#: BlacklistPlugin.php:185
+#, fuzzy, php-format
+msgid "You may not use homepage \"%s\"."
 msgstr "No puedes utilizar la página de inicio '%s'."
 
-#: BlacklistPlugin.php:192
-#, php-format
-msgid "You may not use nickname '%s'."
+#. TRANS: Validation failure for nickname. %s is the nickname.
+#: BlacklistPlugin.php:196
+#, fuzzy, php-format
+msgid "You may not use nickname \"%s\"."
 msgstr "No puedes utilizar el nombre de usuario '%s'."
 
-#: BlacklistPlugin.php:234
+#. TRANS: Validation failure for URL. %s is the URL.
+#: BlacklistPlugin.php:239
 #, php-format
 msgid "You may not use URL \"%s\" in notices."
 msgstr "No puedes utilizar el URL \"%s\" en los mensajes."
 
-#: BlacklistPlugin.php:338
+#: BlacklistPlugin.php:343
 msgid "Keeps a blacklist of forbidden nickname and URL patterns."
 msgstr ""
 "Mantiene una lista negra de patrones de nombres de usuario y URL prohibidos."
 
-#: BlacklistPlugin.php:375 blacklistadminpanel.php:52
+#. TRANS: Menu item in admin panel.
+#: BlacklistPlugin.php:381
+#, fuzzy
+msgctxt "MENU"
 msgid "Blacklist"
 msgstr "Lista negra"
 
-#: BlacklistPlugin.php:376
+#. TRANS: Tooltip for menu item in admin panel.
+#: BlacklistPlugin.php:383
+#, fuzzy
+msgctxt "TOOLTIP"
 msgid "Blacklist configuration"
 msgstr "Configuración de lista negra"
 
-#: BlacklistPlugin.php:402
+#. TRANS: Checkbox with text label in the delete user form.
+#: BlacklistPlugin.php:410
 msgid "Add this nickname pattern to blacklist"
 msgstr "Añadir este patrón de nombre de usuario a la lista negra"
 
-#: BlacklistPlugin.php:411
+#. TRANS: Checkbox with text label in the delete user form.
+#: BlacklistPlugin.php:420
 msgid "Add this homepage pattern to blacklist"
 msgstr "Añadir este patrón de página principal a la lista negra"
 
+#. TRANS: Exception thrown trying to post a notice while having set a blocked homepage URL. %s is the blocked URL.
+#. TRANS: Client exception thrown trying to subscribe to a person with a blocked homepage or site URL. %s is the blocked URL.
+#: BlacklistPlugin.php:499 BlacklistPlugin.php:534
+#, php-format
+msgid "Users from \"%s\" blocked."
+msgstr ""
+
+#. TRANS: Exception thrown trying to post a notice while having a blocked nickname. %s is the blocked nickname.
+#: BlacklistPlugin.php:510
+#, php-format
+msgid "Posts from nickname \"%s\" disallowed."
+msgstr ""
+
+#. TRANS: Client exception thrown trying to subscribe to a person with a blocked nickname. %s is the blocked nickname.
+#: BlacklistPlugin.php:545
+#, fuzzy, php-format
+msgid "Can't subscribe to nickname \"%s\"."
+msgstr "No puedes utilizar el nombre de usuario '%s'."
+
+#: blacklistadminpanel.php:52
+msgid "Blacklist"
+msgstr "Lista negra"
+
 #: blacklistadminpanel.php:62
 msgid "Blacklisted URLs and nicknames"
 msgstr "URL y nombres de usuario incluidos en la lista negra"
diff --git a/plugins/Blacklist/locale/fr/LC_MESSAGES/Blacklist.po b/plugins/Blacklist/locale/fr/LC_MESSAGES/Blacklist.po
index f6a1d195c..23502a737 100644
--- a/plugins/Blacklist/locale/fr/LC_MESSAGES/Blacklist.po
+++ b/plugins/Blacklist/locale/fr/LC_MESSAGES/Blacklist.po
@@ -10,63 +10,99 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Blacklist\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-03 19:53+0000\n"
-"PO-Revision-Date: 2010-10-03 19:56:26+0000\n"
+"POT-Creation-Date: 2010-10-27 23:43+0000\n"
+"PO-Revision-Date: 2010-10-27 23:46:17+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-09-27 23:18:14+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r74231); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-10-18 20:29:05+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r75590); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-blacklist\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: BlacklistPlugin.php:148
-#, php-format
-msgid "You may not register with homepage '%s'."
+#. TRANS: Validation failure for URL. %s is the URL.
+#: BlacklistPlugin.php:149
+#, fuzzy, php-format
+msgid "You may not register with homepage \"%s\"."
 msgstr "Vous ne pouvez pas vous inscrire avec la page d’accueil « %s »."
 
-#: BlacklistPlugin.php:158
-#, php-format
-msgid "You may not register with nickname '%s'."
+#. TRANS: Validation failure for nickname. %s is the nickname.
+#: BlacklistPlugin.php:160
+#, fuzzy, php-format
+msgid "You may not register with nickname \"%s\"."
 msgstr "Vous ne pouvez pas vous inscrire avec le pseudonyme « %s »."
 
-#: BlacklistPlugin.php:182
-#, php-format
-msgid "You may not use homepage '%s'."
+#. TRANS: Validation failure for URL. %s is the URL.
+#: BlacklistPlugin.php:185
+#, fuzzy, php-format
+msgid "You may not use homepage \"%s\"."
 msgstr "Vous ne pouvez pas utiliser la page d’accueil « %s »."
 
-#: BlacklistPlugin.php:192
-#, php-format
-msgid "You may not use nickname '%s'."
+#. TRANS: Validation failure for nickname. %s is the nickname.
+#: BlacklistPlugin.php:196
+#, fuzzy, php-format
+msgid "You may not use nickname \"%s\"."
 msgstr "Vous ne pouvez pas utiliser le pseudonyme « %s »."
 
-#: BlacklistPlugin.php:234
+#. TRANS: Validation failure for URL. %s is the URL.
+#: BlacklistPlugin.php:239
 #, php-format
 msgid "You may not use URL \"%s\" in notices."
 msgstr "Vous ne pouvez pas utiliser l’URL « %s » dans les avis."
 
-#: BlacklistPlugin.php:338
+#: BlacklistPlugin.php:343
 msgid "Keeps a blacklist of forbidden nickname and URL patterns."
 msgstr "Maintient une liste noire des pseudonymes et motifs d’URL interdits."
 
-#: BlacklistPlugin.php:375 blacklistadminpanel.php:52
+#. TRANS: Menu item in admin panel.
+#: BlacklistPlugin.php:381
+#, fuzzy
+msgctxt "MENU"
 msgid "Blacklist"
 msgstr "Liste noire"
 
-#: BlacklistPlugin.php:376
+#. TRANS: Tooltip for menu item in admin panel.
+#: BlacklistPlugin.php:383
+#, fuzzy
+msgctxt "TOOLTIP"
 msgid "Blacklist configuration"
 msgstr "Configuration de la liste noire"
 
-#: BlacklistPlugin.php:402
+#. TRANS: Checkbox with text label in the delete user form.
+#: BlacklistPlugin.php:410
 msgid "Add this nickname pattern to blacklist"
 msgstr "Ajouter ce motif de pseudonymes à la liste noire"
 
-#: BlacklistPlugin.php:411
+#. TRANS: Checkbox with text label in the delete user form.
+#: BlacklistPlugin.php:420
 msgid "Add this homepage pattern to blacklist"
 msgstr "Ajouter ce motif de pages d’accueil à la liste noire"
 
+#. TRANS: Exception thrown trying to post a notice while having set a blocked homepage URL. %s is the blocked URL.
+#. TRANS: Client exception thrown trying to subscribe to a person with a blocked homepage or site URL. %s is the blocked URL.
+#: BlacklistPlugin.php:499 BlacklistPlugin.php:534
+#, php-format
+msgid "Users from \"%s\" blocked."
+msgstr ""
+
+#. TRANS: Exception thrown trying to post a notice while having a blocked nickname. %s is the blocked nickname.
+#: BlacklistPlugin.php:510
+#, php-format
+msgid "Posts from nickname \"%s\" disallowed."
+msgstr ""
+
+#. TRANS: Client exception thrown trying to subscribe to a person with a blocked nickname. %s is the blocked nickname.
+#: BlacklistPlugin.php:545
+#, fuzzy, php-format
+msgid "Can't subscribe to nickname \"%s\"."
+msgstr "Vous ne pouvez pas utiliser le pseudonyme « %s »."
+
+#: blacklistadminpanel.php:52
+msgid "Blacklist"
+msgstr "Liste noire"
+
 #: blacklistadminpanel.php:62
 msgid "Blacklisted URLs and nicknames"
 msgstr "Liste noire d’URL et de pseudonymes"
diff --git a/plugins/Blacklist/locale/gl/LC_MESSAGES/Blacklist.po b/plugins/Blacklist/locale/gl/LC_MESSAGES/Blacklist.po
index daf89cc50..7c3f489ab 100644
--- a/plugins/Blacklist/locale/gl/LC_MESSAGES/Blacklist.po
+++ b/plugins/Blacklist/locale/gl/LC_MESSAGES/Blacklist.po
@@ -9,63 +9,99 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Blacklist\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-03 19:53+0000\n"
-"PO-Revision-Date: 2010-10-03 19:56:26+0000\n"
+"POT-Creation-Date: 2010-10-27 23:43+0000\n"
+"PO-Revision-Date: 2010-10-27 23:46:17+0000\n"
 "Language-Team: Galician <http://translatewiki.net/wiki/Portal:gl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-09-27 23:18:14+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r74231); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-10-18 20:29:05+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r75590); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: gl\n"
 "X-Message-Group: #out-statusnet-plugin-blacklist\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: BlacklistPlugin.php:148
+#. TRANS: Validation failure for URL. %s is the URL.
+#: BlacklistPlugin.php:149
 #, php-format
-msgid "You may not register with homepage '%s'."
+msgid "You may not register with homepage \"%s\"."
 msgstr ""
 
-#: BlacklistPlugin.php:158
+#. TRANS: Validation failure for nickname. %s is the nickname.
+#: BlacklistPlugin.php:160
 #, php-format
-msgid "You may not register with nickname '%s'."
+msgid "You may not register with nickname \"%s\"."
 msgstr ""
 
-#: BlacklistPlugin.php:182
+#. TRANS: Validation failure for URL. %s is the URL.
+#: BlacklistPlugin.php:185
 #, php-format
-msgid "You may not use homepage '%s'."
+msgid "You may not use homepage \"%s\"."
 msgstr ""
 
-#: BlacklistPlugin.php:192
+#. TRANS: Validation failure for nickname. %s is the nickname.
+#: BlacklistPlugin.php:196
 #, php-format
-msgid "You may not use nickname '%s'."
+msgid "You may not use nickname \"%s\"."
 msgstr ""
 
-#: BlacklistPlugin.php:234
+#. TRANS: Validation failure for URL. %s is the URL.
+#: BlacklistPlugin.php:239
 #, php-format
 msgid "You may not use URL \"%s\" in notices."
 msgstr ""
 
-#: BlacklistPlugin.php:338
+#: BlacklistPlugin.php:343
 msgid "Keeps a blacklist of forbidden nickname and URL patterns."
 msgstr ""
 
-#: BlacklistPlugin.php:375 blacklistadminpanel.php:52
+#. TRANS: Menu item in admin panel.
+#: BlacklistPlugin.php:381
+#, fuzzy
+msgctxt "MENU"
 msgid "Blacklist"
 msgstr "Lista negra"
 
-#: BlacklistPlugin.php:376
+#. TRANS: Tooltip for menu item in admin panel.
+#: BlacklistPlugin.php:383
+#, fuzzy
+msgctxt "TOOLTIP"
 msgid "Blacklist configuration"
 msgstr "Configuración da lista negra"
 
-#: BlacklistPlugin.php:402
+#. TRANS: Checkbox with text label in the delete user form.
+#: BlacklistPlugin.php:410
 msgid "Add this nickname pattern to blacklist"
 msgstr ""
 
-#: BlacklistPlugin.php:411
+#. TRANS: Checkbox with text label in the delete user form.
+#: BlacklistPlugin.php:420
 msgid "Add this homepage pattern to blacklist"
 msgstr ""
 
+#. TRANS: Exception thrown trying to post a notice while having set a blocked homepage URL. %s is the blocked URL.
+#. TRANS: Client exception thrown trying to subscribe to a person with a blocked homepage or site URL. %s is the blocked URL.
+#: BlacklistPlugin.php:499 BlacklistPlugin.php:534
+#, php-format
+msgid "Users from \"%s\" blocked."
+msgstr ""
+
+#. TRANS: Exception thrown trying to post a notice while having a blocked nickname. %s is the blocked nickname.
+#: BlacklistPlugin.php:510
+#, php-format
+msgid "Posts from nickname \"%s\" disallowed."
+msgstr ""
+
+#. TRANS: Client exception thrown trying to subscribe to a person with a blocked nickname. %s is the blocked nickname.
+#: BlacklistPlugin.php:545
+#, php-format
+msgid "Can't subscribe to nickname \"%s\"."
+msgstr ""
+
+#: blacklistadminpanel.php:52
+msgid "Blacklist"
+msgstr "Lista negra"
+
 #: blacklistadminpanel.php:62
 msgid "Blacklisted URLs and nicknames"
 msgstr ""
diff --git a/plugins/Blacklist/locale/ia/LC_MESSAGES/Blacklist.po b/plugins/Blacklist/locale/ia/LC_MESSAGES/Blacklist.po
index 82b37a1a2..9e4758476 100644
--- a/plugins/Blacklist/locale/ia/LC_MESSAGES/Blacklist.po
+++ b/plugins/Blacklist/locale/ia/LC_MESSAGES/Blacklist.po
@@ -9,64 +9,98 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Blacklist\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-03 19:53+0000\n"
-"PO-Revision-Date: 2010-10-03 19:56:26+0000\n"
+"POT-Creation-Date: 2010-10-27 23:43+0000\n"
+"PO-Revision-Date: 2010-10-28 23:09:57+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-09-27 23:18:14+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r74231); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-10-28 00:09:54+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r75629); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-blacklist\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: BlacklistPlugin.php:148
+#. TRANS: Validation failure for URL. %s is the URL.
+#: BlacklistPlugin.php:149
 #, php-format
-msgid "You may not register with homepage '%s'."
-msgstr "Tu non pote registrar te con le pagina personal '%s'."
+msgid "You may not register with homepage \"%s\"."
+msgstr "Tu non pote registrar te con le pagina personal \"%s\"."
 
-#: BlacklistPlugin.php:158
+#. TRANS: Validation failure for nickname. %s is the nickname.
+#: BlacklistPlugin.php:160
 #, php-format
-msgid "You may not register with nickname '%s'."
-msgstr "Tu non pote registrar te con le pseudonymo '%s'."
+msgid "You may not register with nickname \"%s\"."
+msgstr "Tu non pote registrar te con le pseudonymo \"%s\"."
 
-#: BlacklistPlugin.php:182
+#. TRANS: Validation failure for URL. %s is the URL.
+#: BlacklistPlugin.php:185
 #, php-format
-msgid "You may not use homepage '%s'."
-msgstr "Tu non pote usar le pagina personal '%s'."
+msgid "You may not use homepage \"%s\"."
+msgstr "Tu non pote usar le pagina personal \"%s\"."
 
-#: BlacklistPlugin.php:192
+#. TRANS: Validation failure for nickname. %s is the nickname.
+#: BlacklistPlugin.php:196
 #, php-format
-msgid "You may not use nickname '%s'."
-msgstr "Tu non pote usar le pseudonymo '%s'."
+msgid "You may not use nickname \"%s\"."
+msgstr "Tu non pote usar le pseudonymo \"%s\"."
 
-#: BlacklistPlugin.php:234
+#. TRANS: Validation failure for URL. %s is the URL.
+#: BlacklistPlugin.php:239
 #, php-format
 msgid "You may not use URL \"%s\" in notices."
 msgstr "Tu non pote usar le URL \"%s\" in notas."
 
-#: BlacklistPlugin.php:338
+#: BlacklistPlugin.php:343
 msgid "Keeps a blacklist of forbidden nickname and URL patterns."
 msgstr ""
 "Tene un lista nigre de pseudonymos e patronos de adresse URL prohibite."
 
-#: BlacklistPlugin.php:375 blacklistadminpanel.php:52
+#. TRANS: Menu item in admin panel.
+#: BlacklistPlugin.php:381
+msgctxt "MENU"
 msgid "Blacklist"
 msgstr "Lista nigre"
 
-#: BlacklistPlugin.php:376
+#. TRANS: Tooltip for menu item in admin panel.
+#: BlacklistPlugin.php:383
+msgctxt "TOOLTIP"
 msgid "Blacklist configuration"
 msgstr "Configuration del lista nigre"
 
-#: BlacklistPlugin.php:402
+#. TRANS: Checkbox with text label in the delete user form.
+#: BlacklistPlugin.php:410
 msgid "Add this nickname pattern to blacklist"
 msgstr "Adder iste patrono de pseudonymo al lista nigre"
 
-#: BlacklistPlugin.php:411
+#. TRANS: Checkbox with text label in the delete user form.
+#: BlacklistPlugin.php:420
 msgid "Add this homepage pattern to blacklist"
 msgstr "Adder iste patrono de pagina personal al lista nigre"
 
+#. TRANS: Exception thrown trying to post a notice while having set a blocked homepage URL. %s is the blocked URL.
+#. TRANS: Client exception thrown trying to subscribe to a person with a blocked homepage or site URL. %s is the blocked URL.
+#: BlacklistPlugin.php:499 BlacklistPlugin.php:534
+#, php-format
+msgid "Users from \"%s\" blocked."
+msgstr "Usatores de \"%s\" blocate."
+
+#. TRANS: Exception thrown trying to post a notice while having a blocked nickname. %s is the blocked nickname.
+#: BlacklistPlugin.php:510
+#, php-format
+msgid "Posts from nickname \"%s\" disallowed."
+msgstr "Notas del pseudonymo \"%s\" non permittite."
+
+#. TRANS: Client exception thrown trying to subscribe to a person with a blocked nickname. %s is the blocked nickname.
+#: BlacklistPlugin.php:545
+#, php-format
+msgid "Can't subscribe to nickname \"%s\"."
+msgstr "Non pote subscriber al pseudonymo \"%s\"."
+
+#: blacklistadminpanel.php:52
+msgid "Blacklist"
+msgstr "Lista nigre"
+
 #: blacklistadminpanel.php:62
 msgid "Blacklisted URLs and nicknames"
 msgstr "URLs e pseudonymos in lista nigre"
diff --git a/plugins/Blacklist/locale/mk/LC_MESSAGES/Blacklist.po b/plugins/Blacklist/locale/mk/LC_MESSAGES/Blacklist.po
index a1866c1dc..bb0f2213a 100644
--- a/plugins/Blacklist/locale/mk/LC_MESSAGES/Blacklist.po
+++ b/plugins/Blacklist/locale/mk/LC_MESSAGES/Blacklist.po
@@ -9,63 +9,97 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Blacklist\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-03 19:53+0000\n"
-"PO-Revision-Date: 2010-10-03 19:56:26+0000\n"
+"POT-Creation-Date: 2010-10-27 23:43+0000\n"
+"PO-Revision-Date: 2010-10-28 23:09:57+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-09-27 23:18:14+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r74231); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-10-28 00:09:54+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r75629); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-blacklist\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
-#: BlacklistPlugin.php:148
+#. TRANS: Validation failure for URL. %s is the URL.
+#: BlacklistPlugin.php:149
 #, php-format
-msgid "You may not register with homepage '%s'."
+msgid "You may not register with homepage \"%s\"."
 msgstr "Не можете да се регистрирате со домашната страница „%s“."
 
-#: BlacklistPlugin.php:158
+#. TRANS: Validation failure for nickname. %s is the nickname.
+#: BlacklistPlugin.php:160
 #, php-format
-msgid "You may not register with nickname '%s'."
+msgid "You may not register with nickname \"%s\"."
 msgstr "Не можете да се регистрирате со прекарот „%s“."
 
-#: BlacklistPlugin.php:182
+#. TRANS: Validation failure for URL. %s is the URL.
+#: BlacklistPlugin.php:185
 #, php-format
-msgid "You may not use homepage '%s'."
+msgid "You may not use homepage \"%s\"."
 msgstr "Не можете да ја користите домашната страница „%s“."
 
-#: BlacklistPlugin.php:192
+#. TRANS: Validation failure for nickname. %s is the nickname.
+#: BlacklistPlugin.php:196
 #, php-format
-msgid "You may not use nickname '%s'."
+msgid "You may not use nickname \"%s\"."
 msgstr "Не можете да го користите прекарот „%s“."
 
-#: BlacklistPlugin.php:234
+#. TRANS: Validation failure for URL. %s is the URL.
+#: BlacklistPlugin.php:239
 #, php-format
 msgid "You may not use URL \"%s\" in notices."
 msgstr "Не можете да ја користите URL-адресата „%s“ во забелешки."
 
-#: BlacklistPlugin.php:338
+#: BlacklistPlugin.php:343
 msgid "Keeps a blacklist of forbidden nickname and URL patterns."
 msgstr "Води црн список на забранети видови на прекари и URL-адреси."
 
-#: BlacklistPlugin.php:375 blacklistadminpanel.php:52
+#. TRANS: Menu item in admin panel.
+#: BlacklistPlugin.php:381
+msgctxt "MENU"
 msgid "Blacklist"
 msgstr "Црн список"
 
-#: BlacklistPlugin.php:376
+#. TRANS: Tooltip for menu item in admin panel.
+#: BlacklistPlugin.php:383
+msgctxt "TOOLTIP"
 msgid "Blacklist configuration"
-msgstr "Поставки на црниот список"
+msgstr "Поставки за црниот список"
 
-#: BlacklistPlugin.php:402
+#. TRANS: Checkbox with text label in the delete user form.
+#: BlacklistPlugin.php:410
 msgid "Add this nickname pattern to blacklist"
 msgstr "Додај го овој вид прекар во црниот список"
 
-#: BlacklistPlugin.php:411
+#. TRANS: Checkbox with text label in the delete user form.
+#: BlacklistPlugin.php:420
 msgid "Add this homepage pattern to blacklist"
 msgstr "Додај го овој вид домашна страница  во црниот список"
 
+#. TRANS: Exception thrown trying to post a notice while having set a blocked homepage URL. %s is the blocked URL.
+#. TRANS: Client exception thrown trying to subscribe to a person with a blocked homepage or site URL. %s is the blocked URL.
+#: BlacklistPlugin.php:499 BlacklistPlugin.php:534
+#, php-format
+msgid "Users from \"%s\" blocked."
+msgstr "Корисниците од „%s“ се блокирани."
+
+#. TRANS: Exception thrown trying to post a notice while having a blocked nickname. %s is the blocked nickname.
+#: BlacklistPlugin.php:510
+#, php-format
+msgid "Posts from nickname \"%s\" disallowed."
+msgstr "Објавите од прекарот „%s“ не се дозволени."
+
+#. TRANS: Client exception thrown trying to subscribe to a person with a blocked nickname. %s is the blocked nickname.
+#: BlacklistPlugin.php:545
+#, php-format
+msgid "Can't subscribe to nickname \"%s\"."
+msgstr "Не можете да се претплатите на прекарот „%s“."
+
+#: blacklistadminpanel.php:52
+msgid "Blacklist"
+msgstr "Црн список"
+
 #: blacklistadminpanel.php:62
 msgid "Blacklisted URLs and nicknames"
 msgstr "URL-адреси и прекари на црниот список"
diff --git a/plugins/Blacklist/locale/nl/LC_MESSAGES/Blacklist.po b/plugins/Blacklist/locale/nl/LC_MESSAGES/Blacklist.po
index 21e731cee..4f389e657 100644
--- a/plugins/Blacklist/locale/nl/LC_MESSAGES/Blacklist.po
+++ b/plugins/Blacklist/locale/nl/LC_MESSAGES/Blacklist.po
@@ -9,63 +9,97 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Blacklist\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-03 19:53+0000\n"
-"PO-Revision-Date: 2010-10-03 19:56:26+0000\n"
+"POT-Creation-Date: 2010-10-27 23:43+0000\n"
+"PO-Revision-Date: 2010-10-28 23:09:57+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-09-27 23:18:14+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r74231); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-10-28 00:09:54+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r75629); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-blacklist\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: BlacklistPlugin.php:148
+#. TRANS: Validation failure for URL. %s is the URL.
+#: BlacklistPlugin.php:149
 #, php-format
-msgid "You may not register with homepage '%s'."
+msgid "You may not register with homepage \"%s\"."
 msgstr "U kunt niet registreren met \"%s\" als homepage."
 
-#: BlacklistPlugin.php:158
+#. TRANS: Validation failure for nickname. %s is the nickname.
+#: BlacklistPlugin.php:160
 #, php-format
-msgid "You may not register with nickname '%s'."
+msgid "You may not register with nickname \"%s\"."
 msgstr "U kunt niet registreren met \"%s\" als gebruikersnaam."
 
-#: BlacklistPlugin.php:182
+#. TRANS: Validation failure for URL. %s is the URL.
+#: BlacklistPlugin.php:185
 #, php-format
-msgid "You may not use homepage '%s'."
+msgid "You may not use homepage \"%s\"."
 msgstr "U mag \"%s\" niet als homepage instellen."
 
-#: BlacklistPlugin.php:192
+#. TRANS: Validation failure for nickname. %s is the nickname.
+#: BlacklistPlugin.php:196
 #, php-format
-msgid "You may not use nickname '%s'."
+msgid "You may not use nickname \"%s\"."
 msgstr "U mag \"%s\" niet als gebruikersnaam gebruiken."
 
-#: BlacklistPlugin.php:234
+#. TRANS: Validation failure for URL. %s is the URL.
+#: BlacklistPlugin.php:239
 #, php-format
 msgid "You may not use URL \"%s\" in notices."
 msgstr "U mag de URL \"%s\" niet gebruiken in mededelingen."
 
-#: BlacklistPlugin.php:338
+#: BlacklistPlugin.php:343
 msgid "Keeps a blacklist of forbidden nickname and URL patterns."
 msgstr "Houdt een lijst bij van verboden gebruikersnamen en URL-patronen."
 
-#: BlacklistPlugin.php:375 blacklistadminpanel.php:52
+#. TRANS: Menu item in admin panel.
+#: BlacklistPlugin.php:381
+msgctxt "MENU"
 msgid "Blacklist"
 msgstr "Zwarte lijst"
 
-#: BlacklistPlugin.php:376
+#. TRANS: Tooltip for menu item in admin panel.
+#: BlacklistPlugin.php:383
+msgctxt "TOOLTIP"
 msgid "Blacklist configuration"
 msgstr "Instellingen voor zwarte lijst"
 
-#: BlacklistPlugin.php:402
+#. TRANS: Checkbox with text label in the delete user form.
+#: BlacklistPlugin.php:410
 msgid "Add this nickname pattern to blacklist"
 msgstr "Dit gebruikersnaampatroon aan de zwarte lijst toevoegen"
 
-#: BlacklistPlugin.php:411
+#. TRANS: Checkbox with text label in the delete user form.
+#: BlacklistPlugin.php:420
 msgid "Add this homepage pattern to blacklist"
 msgstr "Dit homepagepatroon aan de zwarte lijst toevoegen"
 
+#. TRANS: Exception thrown trying to post a notice while having set a blocked homepage URL. %s is the blocked URL.
+#. TRANS: Client exception thrown trying to subscribe to a person with a blocked homepage or site URL. %s is the blocked URL.
+#: BlacklistPlugin.php:499 BlacklistPlugin.php:534
+#, php-format
+msgid "Users from \"%s\" blocked."
+msgstr "Gebruikers van \"%s\" zijn geblokkeerd."
+
+#. TRANS: Exception thrown trying to post a notice while having a blocked nickname. %s is the blocked nickname.
+#: BlacklistPlugin.php:510
+#, php-format
+msgid "Posts from nickname \"%s\" disallowed."
+msgstr "Gebruiker \"%s\" mag geen berichten plaatsen."
+
+#. TRANS: Client exception thrown trying to subscribe to a person with a blocked nickname. %s is the blocked nickname.
+#: BlacklistPlugin.php:545
+#, php-format
+msgid "Can't subscribe to nickname \"%s\"."
+msgstr "U kunt niet abonneren op de gebruiker \"%s\"."
+
+#: blacklistadminpanel.php:52
+msgid "Blacklist"
+msgstr "Zwarte lijst"
+
 #: blacklistadminpanel.php:62
 msgid "Blacklisted URLs and nicknames"
 msgstr "URL's en gebruikersnamen die op de zwarte lijst staan"
diff --git a/plugins/Blacklist/locale/uk/LC_MESSAGES/Blacklist.po b/plugins/Blacklist/locale/uk/LC_MESSAGES/Blacklist.po
index 8fb53e846..1f733396d 100644
--- a/plugins/Blacklist/locale/uk/LC_MESSAGES/Blacklist.po
+++ b/plugins/Blacklist/locale/uk/LC_MESSAGES/Blacklist.po
@@ -9,64 +9,98 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Blacklist\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-03 19:53+0000\n"
-"PO-Revision-Date: 2010-10-03 19:56:26+0000\n"
+"POT-Creation-Date: 2010-10-27 23:43+0000\n"
+"PO-Revision-Date: 2010-10-28 23:09:57+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-09-27 23:18:14+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r74231); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-10-28 00:09:54+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r75629); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-blacklist\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: BlacklistPlugin.php:148
+#. TRANS: Validation failure for URL. %s is the URL.
+#: BlacklistPlugin.php:149
 #, php-format
-msgid "You may not register with homepage '%s'."
+msgid "You may not register with homepage \"%s\"."
 msgstr "Ви не можете зареєструватися, вказавши «%s» як веб-адресу."
 
-#: BlacklistPlugin.php:158
+#. TRANS: Validation failure for nickname. %s is the nickname.
+#: BlacklistPlugin.php:160
 #, php-format
-msgid "You may not register with nickname '%s'."
+msgid "You may not register with nickname \"%s\"."
 msgstr "Ви не можете зареєструватися, використавши нікнейм «%s»."
 
-#: BlacklistPlugin.php:182
+#. TRANS: Validation failure for URL. %s is the URL.
+#: BlacklistPlugin.php:185
 #, php-format
-msgid "You may not use homepage '%s'."
+msgid "You may not use homepage \"%s\"."
 msgstr "Ви не можете використовувати веб-адресу «%s»."
 
-#: BlacklistPlugin.php:192
+#. TRANS: Validation failure for nickname. %s is the nickname.
+#: BlacklistPlugin.php:196
 #, php-format
-msgid "You may not use nickname '%s'."
+msgid "You may not use nickname \"%s\"."
 msgstr "Ви не можете використовувати нікнейм «%s»."
 
-#: BlacklistPlugin.php:234
+#. TRANS: Validation failure for URL. %s is the URL.
+#: BlacklistPlugin.php:239
 #, php-format
 msgid "You may not use URL \"%s\" in notices."
 msgstr "Ви не можете використовувати URL-адресу «%s» в своїх повідомленнях."
 
-#: BlacklistPlugin.php:338
+#: BlacklistPlugin.php:343
 msgid "Keeps a blacklist of forbidden nickname and URL patterns."
 msgstr "Зберігає чорний список заборонених нікнеймів та URL-шаблонів."
 
-#: BlacklistPlugin.php:375 blacklistadminpanel.php:52
+#. TRANS: Menu item in admin panel.
+#: BlacklistPlugin.php:381
+msgctxt "MENU"
 msgid "Blacklist"
 msgstr "Чорний список"
 
-#: BlacklistPlugin.php:376
+#. TRANS: Tooltip for menu item in admin panel.
+#: BlacklistPlugin.php:383
+msgctxt "TOOLTIP"
 msgid "Blacklist configuration"
 msgstr "Конфігурація чорного списку"
 
-#: BlacklistPlugin.php:402
+#. TRANS: Checkbox with text label in the delete user form.
+#: BlacklistPlugin.php:410
 msgid "Add this nickname pattern to blacklist"
 msgstr "Додати цей нікнейм до чорного списку"
 
-#: BlacklistPlugin.php:411
+#. TRANS: Checkbox with text label in the delete user form.
+#: BlacklistPlugin.php:420
 msgid "Add this homepage pattern to blacklist"
 msgstr "Додати цей шаблон веб-адреси до чорного списку"
 
+#. TRANS: Exception thrown trying to post a notice while having set a blocked homepage URL. %s is the blocked URL.
+#. TRANS: Client exception thrown trying to subscribe to a person with a blocked homepage or site URL. %s is the blocked URL.
+#: BlacklistPlugin.php:499 BlacklistPlugin.php:534
+#, php-format
+msgid "Users from \"%s\" blocked."
+msgstr "Користувачів з «%s» заблоковано."
+
+#. TRANS: Exception thrown trying to post a notice while having a blocked nickname. %s is the blocked nickname.
+#: BlacklistPlugin.php:510
+#, php-format
+msgid "Posts from nickname \"%s\" disallowed."
+msgstr "Дописи від користувача «%s» заборонені."
+
+#. TRANS: Client exception thrown trying to subscribe to a person with a blocked nickname. %s is the blocked nickname.
+#: BlacklistPlugin.php:545
+#, php-format
+msgid "Can't subscribe to nickname \"%s\"."
+msgstr "Не можу підписатися до користувача «%s»."
+
+#: blacklistadminpanel.php:52
+msgid "Blacklist"
+msgstr "Чорний список"
+
 #: blacklistadminpanel.php:62
 msgid "Blacklisted URLs and nicknames"
 msgstr "URL-адреси і нікнеми, що містяться в чорному списку"
diff --git a/plugins/Blacklist/locale/zh_CN/LC_MESSAGES/Blacklist.po b/plugins/Blacklist/locale/zh_CN/LC_MESSAGES/Blacklist.po
index 58661e647..a195cf379 100644
--- a/plugins/Blacklist/locale/zh_CN/LC_MESSAGES/Blacklist.po
+++ b/plugins/Blacklist/locale/zh_CN/LC_MESSAGES/Blacklist.po
@@ -9,64 +9,100 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Blacklist\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-03 19:53+0000\n"
-"PO-Revision-Date: 2010-10-03 19:56:26+0000\n"
+"POT-Creation-Date: 2010-10-27 23:43+0000\n"
+"PO-Revision-Date: 2010-10-27 23:46:17+0000\n"
 "Language-Team: Simplified Chinese <http://translatewiki.net/wiki/Portal:zh-"
 "hans>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-09-27 23:18:14+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r74231); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-10-18 20:29:05+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r75590); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-blacklist\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: BlacklistPlugin.php:148
-#, php-format
-msgid "You may not register with homepage '%s'."
+#. TRANS: Validation failure for URL. %s is the URL.
+#: BlacklistPlugin.php:149
+#, fuzzy, php-format
+msgid "You may not register with homepage \"%s\"."
 msgstr "你不能使用主页 '%s' 注册。"
 
-#: BlacklistPlugin.php:158
-#, php-format
-msgid "You may not register with nickname '%s'."
+#. TRANS: Validation failure for nickname. %s is the nickname.
+#: BlacklistPlugin.php:160
+#, fuzzy, php-format
+msgid "You may not register with nickname \"%s\"."
 msgstr "你不能使用昵称 '%s' 注册。"
 
-#: BlacklistPlugin.php:182
-#, php-format
-msgid "You may not use homepage '%s'."
+#. TRANS: Validation failure for URL. %s is the URL.
+#: BlacklistPlugin.php:185
+#, fuzzy, php-format
+msgid "You may not use homepage \"%s\"."
 msgstr "你不能使用主页 '%s'。"
 
-#: BlacklistPlugin.php:192
-#, php-format
-msgid "You may not use nickname '%s'."
+#. TRANS: Validation failure for nickname. %s is the nickname.
+#: BlacklistPlugin.php:196
+#, fuzzy, php-format
+msgid "You may not use nickname \"%s\"."
 msgstr "你不能使用昵称 '%s'。"
 
-#: BlacklistPlugin.php:234
+#. TRANS: Validation failure for URL. %s is the URL.
+#: BlacklistPlugin.php:239
 #, php-format
 msgid "You may not use URL \"%s\" in notices."
 msgstr "你不能在提醒中使用URL '%s'。"
 
-#: BlacklistPlugin.php:338
+#: BlacklistPlugin.php:343
 msgid "Keeps a blacklist of forbidden nickname and URL patterns."
 msgstr "为被禁止的昵称和URL模板创建黑名单。"
 
-#: BlacklistPlugin.php:375 blacklistadminpanel.php:52
+#. TRANS: Menu item in admin panel.
+#: BlacklistPlugin.php:381
+#, fuzzy
+msgctxt "MENU"
 msgid "Blacklist"
 msgstr "黑名单"
 
-#: BlacklistPlugin.php:376
+#. TRANS: Tooltip for menu item in admin panel.
+#: BlacklistPlugin.php:383
+#, fuzzy
+msgctxt "TOOLTIP"
 msgid "Blacklist configuration"
 msgstr "黑名单配置"
 
-#: BlacklistPlugin.php:402
+#. TRANS: Checkbox with text label in the delete user form.
+#: BlacklistPlugin.php:410
 msgid "Add this nickname pattern to blacklist"
 msgstr "向黑名单添加此昵称规则"
 
-#: BlacklistPlugin.php:411
+#. TRANS: Checkbox with text label in the delete user form.
+#: BlacklistPlugin.php:420
 msgid "Add this homepage pattern to blacklist"
 msgstr "向黑名单添加此主页规则"
 
+#. TRANS: Exception thrown trying to post a notice while having set a blocked homepage URL. %s is the blocked URL.
+#. TRANS: Client exception thrown trying to subscribe to a person with a blocked homepage or site URL. %s is the blocked URL.
+#: BlacklistPlugin.php:499 BlacklistPlugin.php:534
+#, php-format
+msgid "Users from \"%s\" blocked."
+msgstr ""
+
+#. TRANS: Exception thrown trying to post a notice while having a blocked nickname. %s is the blocked nickname.
+#: BlacklistPlugin.php:510
+#, php-format
+msgid "Posts from nickname \"%s\" disallowed."
+msgstr ""
+
+#. TRANS: Client exception thrown trying to subscribe to a person with a blocked nickname. %s is the blocked nickname.
+#: BlacklistPlugin.php:545
+#, fuzzy, php-format
+msgid "Can't subscribe to nickname \"%s\"."
+msgstr "你不能使用昵称 '%s'。"
+
+#: blacklistadminpanel.php:52
+msgid "Blacklist"
+msgstr "黑名单"
+
 #: blacklistadminpanel.php:62
 msgid "Blacklisted URLs and nicknames"
 msgstr "黑名单中的URL和昵称"