diff --git a/db/08to09.sql b/db/08to09.sql
index d5f30a26b9..c6c5d7af61 100644
--- a/db/08to09.sql
+++ b/db/08to09.sql
@@ -140,4 +140,8 @@ create table oauth_application_user (
     constraint primary key (profile_id, application_id)
 ) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
 
+alter table file_to_post
+    add index post_id_idx (post_id);
 
+alter table group_inbox
+    add index group_inbox_notice_id_idx (notice_id);
diff --git a/db/statusnet.sql b/db/statusnet.sql
index 4158f0167d..3f95948e1e 100644
--- a/db/statusnet.sql
+++ b/db/statusnet.sql
@@ -458,7 +458,8 @@ create table group_inbox (
     created datetime not null comment 'date the notice was created',
 
     constraint primary key (group_id, notice_id),
-    index group_inbox_created_idx (created)
+    index group_inbox_created_idx (created),
+    index group_inbox_notice_id_idx (notice_id)
 
 ) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
 
@@ -523,7 +524,8 @@ create table file_to_post (
     post_id integer comment 'id of the notice it belongs to' references notice (id),
     modified timestamp comment 'date this record was modified',
 
-    constraint primary key (file_id, post_id)
+    constraint primary key (file_id, post_id),
+    index post_id_idx (post_id)
 
 ) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
 
diff --git a/locale/statusnet.po b/locale/statusnet.po
index cd556bd649..1546fbd830 100644
--- a/locale/statusnet.po
+++ b/locale/statusnet.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-01 15:47+0000\n"
+"POT-Creation-Date: 2010-03-01 14:58-0800\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"
@@ -479,6 +479,7 @@ msgstr ""
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
 #: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/plugindisable.php:69 actions/pluginenable.php:69
 #: actions/profilesettings.php:194 actions/recoverpassword.php:337
 #: actions/register.php:165 actions/remotesubscribe.php:77
 #: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
@@ -537,7 +538,7 @@ msgid ""
 "give access to your %4$s account to third parties you trust."
 msgstr ""
 
-#: actions/apioauthauthorize.php:310 lib/action.php:441
+#: actions/apioauthauthorize.php:310
 msgid "Account"
 msgstr ""
 
@@ -939,7 +940,8 @@ msgstr ""
 #: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
 #: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
-#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
+#: actions/nudge.php:63 actions/plugindisable.php:51
+#: actions/pluginenable.php:51 actions/subedit.php:31 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
 #: lib/adminpanelaction.php:72 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
@@ -1629,7 +1631,7 @@ msgstr ""
 msgid "A list of the users in this group."
 msgstr ""
 
-#: actions/groupmembers.php:182 lib/action.php:448 lib/groupnav.php:107
+#: actions/groupmembers.php:182 lib/groupnav.php:107
 msgid "Admin"
 msgstr ""
 
@@ -1964,8 +1966,7 @@ msgstr ""
 msgid "Error setting user. You are probably not authorized."
 msgstr ""
 
-#: actions/login.php:188 actions/login.php:241 lib/action.php:466
-#: lib/logingroupnav.php:79
+#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
 msgid "Login"
 msgstr ""
 
@@ -2518,6 +2519,22 @@ msgstr ""
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr ""
 
+#: actions/plugindisable.php:76
+msgid "Plugin inactive or missing."
+msgstr ""
+
+#: actions/plugindisable.php:90
+msgid "Disabled"
+msgstr ""
+
+#: actions/pluginenable.php:76
+msgid "Plugin already active."
+msgstr ""
+
+#: actions/pluginenable.php:92
+msgid "Enabled"
+msgstr ""
+
 #: actions/postnotice.php:84
 msgid "Invalid notice content"
 msgstr ""
@@ -2882,8 +2899,7 @@ msgstr ""
 msgid "Registration successful"
 msgstr ""
 
-#: actions/register.php:114 actions/register.php:503 lib/action.php:463
-#: lib/logingroupnav.php:85
+#: actions/register.php:114 actions/register.php:503 lib/logingroupnav.php:85
 msgid "Register"
 msgstr ""
 
@@ -3901,8 +3917,8 @@ msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
 msgstr ""
 
-#: actions/useradminpanel.php:58 lib/adminpanelaction.php:332
-#: lib/personalgroupnav.php:115
+#: actions/useradminpanel.php:58
+msgctxt "User admin panel title"
 msgid "User"
 msgstr ""
 
@@ -4323,67 +4339,112 @@ msgid "Primary site navigation"
 msgstr ""
 
 #: lib/action.php:439
-msgid "Home"
+msgctxt ""
+"Main menu option when logged in for access to personal profile and friends "
+"timeline"
+msgid "Personal"
 msgstr ""
 
 #: lib/action.php:439
+msgctxt "Tooltip for main menu option \"Personal\""
 msgid "Personal profile and friends timeline"
 msgstr ""
 
 #: lib/action.php:441
+msgctxt "Main menu option when logged in for access to user settings"
+msgid "Account"
+msgstr ""
+
+#: lib/action.php:441
+msgctxt "Tooltip for main menu option \"Account\""
 msgid "Change your email, avatar, password, profile"
 msgstr ""
 
 #: lib/action.php:444
+msgctxt ""
+"Main menu option when logged in and connection are possible for access to "
+"options to connect to other services"
 msgid "Connect"
 msgstr ""
 
 #: lib/action.php:444
+msgctxt "Tooltip for main menu option \"Services\""
 msgid "Connect to services"
 msgstr ""
 
 #: lib/action.php:448
+msgctxt ""
+"Main menu option when logged in and site admin for access to site "
+"configuration"
+msgid "Admin"
+msgstr ""
+
+#: lib/action.php:448
+msgctxt "Tooltip for menu option \"Admin\""
 msgid "Change site configuration"
 msgstr ""
 
-#: lib/action.php:452 lib/subgroupnav.php:105
+#: lib/action.php:452
+msgctxt ""
+"Main menu option when logged in and invitation are allowed for inviting new "
+"users"
 msgid "Invite"
 msgstr ""
 
-#: lib/action.php:453 lib/subgroupnav.php:106
+#: lib/action.php:453
 #, php-format
+msgctxt "Tooltip for main menu option \"Invite\""
 msgid "Invite friends and colleagues to join you on %s"
 msgstr ""
 
 #: lib/action.php:458
+msgctxt "Main menu option when logged in to log out the current user"
 msgid "Logout"
 msgstr ""
 
 #: lib/action.php:458
+msgctxt "Tooltip for main menu option \"Logout\""
 msgid "Logout from the site"
 msgstr ""
 
 #: lib/action.php:463
+msgctxt "Main menu option when not logged in to register a new account"
+msgid "Register"
+msgstr ""
+
+#: lib/action.php:463
+msgctxt "Tooltip for main menu option \"Register\""
 msgid "Create an account"
 msgstr ""
 
 #: lib/action.php:466
+msgctxt "Main menu option when not logged in to log in"
+msgid "Login"
+msgstr ""
+
+#: lib/action.php:466
+msgctxt "Tooltip for main menu option \"Login\""
 msgid "Login to the site"
 msgstr ""
 
-#: lib/action.php:469 lib/action.php:732
+#: lib/action.php:469
+msgctxt "Main menu option for help on the StatusNet site"
 msgid "Help"
 msgstr ""
 
 #: lib/action.php:469
+msgctxt "Tooltip for main menu option \"Help\""
 msgid "Help me!"
 msgstr ""
 
-#: lib/action.php:472 lib/searchaction.php:127
+#: lib/action.php:472
+msgctxt ""
+"Main menu option when logged in or when the StatusNet instance is not private"
 msgid "Search"
 msgstr ""
 
 #: lib/action.php:472
+msgctxt "Tooltip for main menu option \"Search\""
 msgid "Search for people or text"
 msgstr ""
 
@@ -4403,6 +4464,10 @@ msgstr ""
 msgid "Secondary site navigation"
 msgstr ""
 
+#: lib/action.php:732
+msgid "Help"
+msgstr ""
+
 #: lib/action.php:734
 msgid "About"
 msgstr ""
@@ -4533,6 +4598,10 @@ msgstr ""
 msgid "Design configuration"
 msgstr ""
 
+#: lib/adminpanelaction.php:332 lib/personalgroupnav.php:115
+msgid "User"
+msgstr ""
+
 #: lib/adminpanelaction.php:333
 msgid "User configuration"
 msgstr ""
@@ -4643,11 +4712,11 @@ msgstr ""
 msgid "Tags for this attachment"
 msgstr ""
 
-#: lib/authenticationplugin.php:218 lib/authenticationplugin.php:223
+#: lib/authenticationplugin.php:220 lib/authenticationplugin.php:225
 msgid "Password changing failed"
 msgstr ""
 
-#: lib/authenticationplugin.php:233
+#: lib/authenticationplugin.php:235
 msgid "Password changing is not allowed"
 msgstr ""
 
@@ -5660,6 +5729,10 @@ msgstr ""
 msgid "Keyword(s)"
 msgstr ""
 
+#: lib/searchaction.php:127
+msgid "Search"
+msgstr ""
+
 #: lib/searchaction.php:162
 msgid "Search help"
 msgstr ""
@@ -5711,6 +5784,15 @@ msgstr ""
 msgid "Groups %s is a member of"
 msgstr ""
 
+#: lib/subgroupnav.php:105
+msgid "Invite"
+msgstr ""
+
+#: lib/subgroupnav.php:106
+#, php-format
+msgid "Invite friends and colleagues to join you on %s"
+msgstr ""
+
 #: lib/subscriberspeopleselftagcloudsection.php:48
 #: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
diff --git a/plugins/Facebook/locale/Facebook.po b/plugins/Facebook/locale/Facebook.po
index 5b313c8c53..4bc00248c9 100644
--- a/plugins/Facebook/locale/Facebook.po
+++ b/plugins/Facebook/locale/Facebook.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-07 20:38-0800\n"
+"POT-Creation-Date: 2010-03-01 14:58-0800\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"
@@ -59,63 +59,31 @@ msgstr ""
 msgid "Lost or forgotten password?"
 msgstr ""
 
-#: facebookaction.php:386 facebookhome.php:248
+#: facebookaction.php:330 facebookhome.php:248
 msgid "Pagination"
 msgstr ""
 
-#: facebookaction.php:395 facebookhome.php:257
+#: facebookaction.php:339 facebookhome.php:257
 msgid "After"
 msgstr ""
 
-#: facebookaction.php:403 facebookhome.php:265
+#: facebookaction.php:347 facebookhome.php:265
 msgid "Before"
 msgstr ""
 
-#: facebookaction.php:421
+#: facebookaction.php:365
 msgid "No notice content!"
 msgstr ""
 
-#: facebookaction.php:427
+#: facebookaction.php:371
 #, php-format
 msgid "That's too long. Max notice size is %d chars."
 msgstr ""
 
-#: facebookaction.php:523
+#: facebookaction.php:430
 msgid "Notices"
 msgstr ""
 
-#: facebookutil.php:280
-#, php-format
-msgid "Your %1$s Facebook application access has been disabled."
-msgstr ""
-
-#: facebookutil.php:283
-#, php-format
-msgid ""
-"Hi, %1$s. We're sorry to inform you that we are unable to update your "
-"Facebook status from %2$s, and have disabled the Facebook application for "
-"your account. This may be because you have removed the Facebook "
-"application's authorization, or have deleted your Facebook account.  You can "
-"re-enable the Facebook application and automatic status updating by re-"
-"installing the %2$s Facebook application.\n"
-"\n"
-"Regards,\n"
-"\n"
-"%2$s"
-msgstr ""
-
-#: FBConnectLogin.php:33
-msgid "Already logged in."
-msgstr ""
-
-#: FBConnectLogin.php:41
-msgid "Login with your Facebook Account"
-msgstr ""
-
-#: FBConnectLogin.php:55
-msgid "Facebook Login"
-msgstr ""
-
 #: facebookhome.php:111
 msgid "Server error - couldn't get user!"
 msgstr ""
@@ -149,6 +117,56 @@ msgstr ""
 msgid "Skip"
 msgstr ""
 
+#: facebookinvite.php:72
+#, php-format
+msgid "Thanks for inviting your friends to use %s"
+msgstr ""
+
+#: facebookinvite.php:74
+msgid "Invitations have been sent to the following users:"
+msgstr ""
+
+#: facebookinvite.php:94
+#, php-format
+msgid "You have been invited to %s"
+msgstr ""
+
+#: facebookinvite.php:103
+#, php-format
+msgid "Invite your friends to use %s"
+msgstr ""
+
+#: facebookinvite.php:125
+#, php-format
+msgid "Friends already using %s:"
+msgstr ""
+
+#: facebookinvite.php:143
+msgid "Send invitations"
+msgstr ""
+
+#: FacebookPlugin.php:413 FacebookPlugin.php:433
+msgid "Facebook"
+msgstr ""
+
+#: FacebookPlugin.php:414
+msgid "Login or register using Facebook"
+msgstr ""
+
+#: FacebookPlugin.php:434 FBConnectSettings.php:56
+msgid "Facebook Connect Settings"
+msgstr ""
+
+#: FacebookPlugin.php:533
+msgid ""
+"The Facebook plugin allows you to integrate your StatusNet instance with <a "
+"href=\"http://facebook.com/\">Facebook</a> and Facebook Connect."
+msgstr ""
+
+#: facebookremove.php:58
+msgid "Couldn't remove Facebook user."
+msgstr ""
+
 #: facebooksettings.php:74
 msgid "There was a problem saving your sync preferences!"
 msgstr ""
@@ -193,89 +211,19 @@ msgstr ""
 msgid "Sync preferences"
 msgstr ""
 
-#: facebookinvite.php:72
+#: facebookutil.php:285
 #, php-format
-msgid "Thanks for inviting your friends to use %s"
-msgstr ""
-
-#: facebookinvite.php:74
-msgid "Invitations have been sent to the following users:"
-msgstr ""
-
-#: facebookinvite.php:94
-#, php-format
-msgid "You have been invited to %s"
-msgstr ""
-
-#: facebookinvite.php:103
-#, php-format
-msgid "Invite your friends to use %s"
-msgstr ""
-
-#: facebookinvite.php:125
-#, php-format
-msgid "Friends already using %s:"
-msgstr ""
-
-#: facebookinvite.php:143
-msgid "Send invitations"
-msgstr ""
-
-#: facebookremove.php:58
-msgid "Couldn't remove Facebook user."
-msgstr ""
-
-#: FBConnectSettings.php:56 FacebookPlugin.php:430
-msgid "Facebook Connect Settings"
-msgstr ""
-
-#: FBConnectSettings.php:67
-msgid "Manage how your account connects to Facebook"
-msgstr ""
-
-#: FBConnectSettings.php:92
-msgid "There is no Facebook user connected to this account."
-msgstr ""
-
-#: FBConnectSettings.php:100
-msgid "Connected Facebook user"
-msgstr ""
-
-#: FBConnectSettings.php:119
-msgid "Disconnect my account from Facebook"
-msgstr ""
-
-#: FBConnectSettings.php:124
 msgid ""
-"Disconnecting your Faceboook would make it impossible to log in! Please "
-msgstr ""
-
-#: FBConnectSettings.php:128
-msgid "set a password"
-msgstr ""
-
-#: FBConnectSettings.php:130
-msgid " first."
-msgstr ""
-
-#: FBConnectSettings.php:142
-msgid "Disconnect"
-msgstr ""
-
-#: FBConnectSettings.php:164 FBConnectAuth.php:90
-msgid "There was a problem with your session token. Try again, please."
-msgstr ""
-
-#: FBConnectSettings.php:178
-msgid "Couldn't delete link to Facebook."
-msgstr ""
-
-#: FBConnectSettings.php:194
-msgid "You have disconnected from Facebook."
-msgstr ""
-
-#: FBConnectSettings.php:197
-msgid "Not sure what you're trying to do."
+"Hi, %1$s. We're sorry to inform you that we are unable to update your "
+"Facebook status from %2$s, and have disabled the Facebook application for "
+"your account. This may be because you have removed the Facebook "
+"application's authorization, or have deleted your Facebook account.  You can "
+"re-enable the Facebook application and automatic status updating by re-"
+"installing the %2$s Facebook application.\n"
+"\n"
+"Regards,\n"
+"\n"
+"%2$s"
 msgstr ""
 
 #: FBConnectAuth.php:51
@@ -286,6 +234,10 @@ msgstr ""
 msgid "There is already a local user linked with this Facebook."
 msgstr ""
 
+#: FBConnectAuth.php:90 FBConnectSettings.php:164
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+
 #: FBConnectAuth.php:95
 msgid "You can't register if you don't agree to the license."
 msgstr ""
@@ -385,10 +337,59 @@ msgstr ""
 msgid "Invalid username or password."
 msgstr ""
 
-#: FacebookPlugin.php:409 FacebookPlugin.php:429
-msgid "Facebook"
+#: FBConnectLogin.php:33
+msgid "Already logged in."
 msgstr ""
 
-#: FacebookPlugin.php:410
-msgid "Login or register using Facebook"
+#: FBConnectLogin.php:41
+msgid "Login with your Facebook Account"
+msgstr ""
+
+#: FBConnectLogin.php:55
+msgid "Facebook Login"
+msgstr ""
+
+#: FBConnectSettings.php:67
+msgid "Manage how your account connects to Facebook"
+msgstr ""
+
+#: FBConnectSettings.php:92
+msgid "There is no Facebook user connected to this account."
+msgstr ""
+
+#: FBConnectSettings.php:100
+msgid "Connected Facebook user"
+msgstr ""
+
+#: FBConnectSettings.php:119
+msgid "Disconnect my account from Facebook"
+msgstr ""
+
+#: FBConnectSettings.php:124
+msgid ""
+"Disconnecting your Faceboook would make it impossible to log in! Please "
+msgstr ""
+
+#: FBConnectSettings.php:128
+msgid "set a password"
+msgstr ""
+
+#: FBConnectSettings.php:130
+msgid " first."
+msgstr ""
+
+#: FBConnectSettings.php:142
+msgid "Disconnect"
+msgstr ""
+
+#: FBConnectSettings.php:178
+msgid "Couldn't delete link to Facebook."
+msgstr ""
+
+#: FBConnectSettings.php:194
+msgid "You have disconnected from Facebook."
+msgstr ""
+
+#: FBConnectSettings.php:197
+msgid "Not sure what you're trying to do."
 msgstr ""
diff --git a/plugins/Gravatar/locale/Gravatar.po b/plugins/Gravatar/locale/Gravatar.po
index 1df62b6661..d7275b9290 100644
--- a/plugins/Gravatar/locale/Gravatar.po
+++ b/plugins/Gravatar/locale/Gravatar.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-11 16:27-0800\n"
+"POT-Creation-Date: 2010-03-01 14:58-0800\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"
@@ -59,3 +59,9 @@ msgstr ""
 #: GravatarPlugin.php:177
 msgid "Gravatar removed."
 msgstr ""
+
+#: GravatarPlugin.php:196
+msgid ""
+"The Gravatar plugin allows users to use their <a href=\"http://www.gravatar."
+"com/\">Gravatar</a> with StatusNet."
+msgstr ""
diff --git a/plugins/Mapstraction/locale/Mapstraction.po b/plugins/Mapstraction/locale/Mapstraction.po
index c1c50bf506..1dd5dbbcc9 100644
--- a/plugins/Mapstraction/locale/Mapstraction.po
+++ b/plugins/Mapstraction/locale/Mapstraction.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-07 20:38-0800\n"
+"POT-Creation-Date: 2010-03-01 14:58-0800\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"
@@ -34,15 +34,21 @@ msgstr ""
 msgid "User has no profile."
 msgstr ""
 
+#: MapstractionPlugin.php:182
+msgid "Map"
+msgstr ""
+
+#: MapstractionPlugin.php:193
+msgid "Full size"
+msgstr ""
+
+#: MapstractionPlugin.php:205
+msgid ""
+"Show maps of users' and friends' notices with <a href=\"http://www."
+"mapstraction.com/\">Mapstraction</a> JavaScript library."
+msgstr ""
+
 #: usermap.php:71
 #, php-format
 msgid "%s map, page %d"
 msgstr ""
-
-#: MapstractionPlugin.php:180
-msgid "Map"
-msgstr ""
-
-#: MapstractionPlugin.php:191
-msgid "Full size"
-msgstr ""
diff --git a/plugins/OStatus/actions/ostatussub.php b/plugins/OStatus/actions/ostatussub.php
index aae22f868a..f45e6a8d1a 100644
--- a/plugins/OStatus/actions/ostatussub.php
+++ b/plugins/OStatus/actions/ostatussub.php
@@ -332,6 +332,7 @@ class OStatusSubAction extends Action
         if ($this->oprofile->isGroup()) {
             $group = $this->oprofile->localGroup();
             if ($user->isMember($group)) {
+                // TRANS: OStatus remote group subscription dialog error.
                 $this->showForm(_m('Already a member!'));
                 return;
             }
@@ -341,18 +342,22 @@ class OStatusSubAction extends Action
                     Event::handle('EndJoinGroup', array($group, $user));
                     $this->successGroup();
                 } else {
+                    // TRANS: OStatus remote group subscription dialog error.
                     $this->showForm(_m('Remote group join failed!'));
                 }
             } else {
+                // TRANS: OStatus remote group subscription dialog error.
                 $this->showForm(_m('Remote group join aborted!'));
             }
         } else {
             $local = $this->oprofile->localProfile();
             if ($user->isSubscribed($local)) {
+                // TRANS: OStatus remote subscription dialog error.
                 $this->showForm(_m('Already subscribed!'));
             } elseif ($this->oprofile->subscribeLocalToRemote($user)) {
                 $this->successUser();
             } else {
+                // TRANS: OStatus remote subscription dialog error.
                 $this->showForm(_m('Remote subscription failed!'));
             }
         }
@@ -450,6 +455,7 @@ class OStatusSubAction extends Action
 
     function title()
     {
+        // TRANS: Page title for OStatus remote subscription form
         return _m('Authorize subscription');
     }
 
diff --git a/plugins/OStatus/locale/OStatus.po b/plugins/OStatus/locale/OStatus.po
index dedc018e3f..7e33a0eed6 100644
--- a/plugins/OStatus/locale/OStatus.po
+++ b/plugins/OStatus/locale/OStatus.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-07 20:38-0800\n"
+"POT-Creation-Date: 2010-03-01 14:58-0800\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,89 +16,297 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: tests/gettext-speedtest.php:57 FeedSubPlugin.php:76
-msgid "Feeds"
+#: actions/groupsalmon.php:51
+msgid "Can't accept remote posts for a remote group."
 msgstr ""
 
-#: FeedSubPlugin.php:77
-msgid "Feed subscription options"
+#: actions/groupsalmon.php:123
+msgid "Can't read profile to set up group membership."
 msgstr ""
 
-#: feedmunger.php:215
+#: actions/groupsalmon.php:126 actions/groupsalmon.php:169
+msgid "Groups can't join groups."
+msgstr ""
+
+#: actions/groupsalmon.php:153
 #, php-format
-msgid "New post: \"%1$s\" %2$s"
+msgid "Could not join remote user %1$s to group %2$s."
 msgstr ""
 
-#: actions/feedsubsettings.php:41
-msgid "Feed subscriptions"
+#: actions/groupsalmon.php:166
+msgid "Can't read profile to cancel group membership."
 msgstr ""
 
-#: actions/feedsubsettings.php:52
-msgid ""
-"You can subscribe to feeds from other sites; updates will appear in your "
-"personal timeline."
+#: actions/groupsalmon.php:182
+#, php-format
+msgid "Could not remove remote user %1$s from group %2$s."
 msgstr ""
 
-#: actions/feedsubsettings.php:96
+#: actions/ostatusinit.php:40
+msgid "You can use the local subscription!"
+msgstr ""
+
+#: actions/ostatusinit.php:61
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+
+#: actions/ostatusinit.php:79 actions/ostatussub.php:439
+msgid "Subscribe to user"
+msgstr ""
+
+#: actions/ostatusinit.php:97
+#, php-format
+msgid "Subscribe to %s"
+msgstr ""
+
+#: actions/ostatusinit.php:102
+msgid "User nickname"
+msgstr ""
+
+#: actions/ostatusinit.php:103
+msgid "Nickname of the user you want to follow"
+msgstr ""
+
+#: actions/ostatusinit.php:106
+msgid "Profile Account"
+msgstr ""
+
+#: actions/ostatusinit.php:107
+msgid "Your account id (i.e. user@identi.ca)"
+msgstr ""
+
+#: actions/ostatusinit.php:110 actions/ostatussub.php:115
+#: OStatusPlugin.php:205
 msgid "Subscribe"
 msgstr ""
 
-#: actions/feedsubsettings.php:98
+#: actions/ostatusinit.php:128
+msgid "Must provide a remote profile."
+msgstr ""
+
+#: actions/ostatusinit.php:138
+msgid "Couldn't look up OStatus account profile."
+msgstr ""
+
+#: actions/ostatusinit.php:153
+msgid "Couldn't confirm remote profile address."
+msgstr ""
+
+#: actions/ostatusinit.php:171
+msgid "OStatus Connect"
+msgstr ""
+
+#: actions/ostatussub.php:68
+msgid "Address or profile URL"
+msgstr ""
+
+#: actions/ostatussub.php:70
+msgid "Enter the profile URL of a PubSubHubbub-enabled feed"
+msgstr ""
+
+#: actions/ostatussub.php:74
 msgid "Continue"
 msgstr ""
 
-#: actions/feedsubsettings.php:151
-msgid "Empty feed URL!"
+#: actions/ostatussub.php:112 OStatusPlugin.php:503
+msgid "Join"
 msgstr ""
 
-#: actions/feedsubsettings.php:161
+#: actions/ostatussub.php:113
+msgid "Join this group"
+msgstr ""
+
+#: actions/ostatussub.php:116
+msgid "Subscribe to this user"
+msgstr ""
+
+#: actions/ostatussub.php:137
+msgid "You are already subscribed to this user."
+msgstr ""
+
+#: actions/ostatussub.php:165
+msgid "You are already a member of this group."
+msgstr ""
+
+#: actions/ostatussub.php:286
+msgid "Empty remote profile URL!"
+msgstr ""
+
+#: actions/ostatussub.php:297
+msgid "Invalid address format."
+msgstr ""
+
+#: actions/ostatussub.php:302
 msgid "Invalid URL or could not reach server."
 msgstr ""
 
-#: actions/feedsubsettings.php:164
+#: actions/ostatussub.php:304
 msgid "Cannot read feed; server returned error."
 msgstr ""
 
-#: actions/feedsubsettings.php:167
+#: actions/ostatussub.php:306
 msgid "Cannot read feed; server returned an empty page."
 msgstr ""
 
-#: actions/feedsubsettings.php:170
+#: actions/ostatussub.php:308
 msgid "Bad HTML, could not find feed link."
 msgstr ""
 
-#: actions/feedsubsettings.php:173
+#: actions/ostatussub.php:310
 msgid "Could not find a feed linked from this URL."
 msgstr ""
 
-#: actions/feedsubsettings.php:176
+#: actions/ostatussub.php:312
 msgid "Not a recognized feed type."
 msgstr ""
 
-#: actions/feedsubsettings.php:180
-msgid "Bad feed URL."
+#: actions/ostatussub.php:315
+#, php-format
+msgid "Bad feed URL: %s %s"
 msgstr ""
 
-#: actions/feedsubsettings.php:188
-msgid "Feed is not PuSH-enabled; cannot subscribe."
+#. TRANS: OStatus remote group subscription dialog error.
+#: actions/ostatussub.php:336
+msgid "Already a member!"
 msgstr ""
 
-#: actions/feedsubsettings.php:208
-msgid "Feed subscription failed! Bad response from hub."
+#. TRANS: OStatus remote group subscription dialog error.
+#: actions/ostatussub.php:346
+msgid "Remote group join failed!"
 msgstr ""
 
-#: actions/feedsubsettings.php:218
+#. TRANS: OStatus remote group subscription dialog error.
+#: actions/ostatussub.php:350
+msgid "Remote group join aborted!"
+msgstr ""
+
+#. TRANS: OStatus remote subscription dialog error.
+#: actions/ostatussub.php:356
 msgid "Already subscribed!"
 msgstr ""
 
-#: actions/feedsubsettings.php:220
-msgid "Feed subscribed!"
+#. TRANS: OStatus remote subscription dialog error.
+#: actions/ostatussub.php:361
+msgid "Remote subscription failed!"
 msgstr ""
 
-#: actions/feedsubsettings.php:222
-msgid "Feed subscription failed!"
+#. TRANS: Page title for OStatus remote subscription form
+#: actions/ostatussub.php:459
+msgid "Authorize subscription"
 msgstr ""
 
-#: actions/feedsubsettings.php:231
-msgid "Previewing feed:"
+#: actions/ostatussub.php:470
+msgid ""
+"You can subscribe to users from other supported sites. Paste their address "
+"or profile URI below:"
+msgstr ""
+
+#: classes/Ostatus_profile.php:789
+#, php-format
+msgid "Tried to update avatar for unsaved remote profile %s"
+msgstr ""
+
+#: classes/Ostatus_profile.php:797
+#, php-format
+msgid "Unable to fetch avatar from %s"
+msgstr ""
+
+#: lib/salmonaction.php:41
+msgid "This method requires a POST."
+msgstr ""
+
+#: lib/salmonaction.php:45
+msgid "Salmon requires application/magic-envelope+xml"
+msgstr ""
+
+#: lib/salmonaction.php:55
+msgid "Salmon signature verification failed."
+msgstr ""
+
+#: lib/salmonaction.php:67
+msgid "Salmon post must be an Atom entry."
+msgstr ""
+
+#: lib/salmonaction.php:115
+msgid "Unrecognized activity type."
+msgstr ""
+
+#: lib/salmonaction.php:123
+msgid "This target doesn't understand posts."
+msgstr ""
+
+#: lib/salmonaction.php:128
+msgid "This target doesn't understand follows."
+msgstr ""
+
+#: lib/salmonaction.php:133
+msgid "This target doesn't understand unfollows."
+msgstr ""
+
+#: lib/salmonaction.php:138
+msgid "This target doesn't understand favorites."
+msgstr ""
+
+#: lib/salmonaction.php:143
+msgid "This target doesn't understand unfavorites."
+msgstr ""
+
+#: lib/salmonaction.php:148
+msgid "This target doesn't understand share events."
+msgstr ""
+
+#: lib/salmonaction.php:153
+msgid "This target doesn't understand joins."
+msgstr ""
+
+#: lib/salmonaction.php:158
+msgid "This target doesn't understand leave events."
+msgstr ""
+
+#: OStatusPlugin.php:319
+#, php-format
+msgid "Sent from %s via OStatus"
+msgstr ""
+
+#: OStatusPlugin.php:371
+msgid "Could not set up remote subscription."
+msgstr ""
+
+#: OStatusPlugin.php:487
+msgid "Could not set up remote group membership."
+msgstr ""
+
+#: OStatusPlugin.php:504
+#, php-format
+msgid "%s has joined group %s."
+msgstr ""
+
+#: OStatusPlugin.php:512
+msgid "Failed joining remote group."
+msgstr ""
+
+#: OStatusPlugin.php:553
+msgid "Leave"
+msgstr ""
+
+#: OStatusPlugin.php:554
+#, php-format
+msgid "%s has left group %s."
+msgstr ""
+
+#: OStatusPlugin.php:685
+msgid "Subscribe to remote user"
+msgstr ""
+
+#: OStatusPlugin.php:726
+msgid "Profile update"
+msgstr ""
+
+#: OStatusPlugin.php:727
+#, php-format
+msgid "%s has updated their profile page."
+msgstr ""
+
+#: tests/gettext-speedtest.php:57
+msgid "Feeds"
 msgstr ""
diff --git a/plugins/OpenID/locale/OpenID.po b/plugins/OpenID/locale/OpenID.po
index 34738bc750..7ed8798355 100644
--- a/plugins/OpenID/locale/OpenID.po
+++ b/plugins/OpenID/locale/OpenID.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-07 20:38-0800\n"
+"POT-Creation-Date: 2010-03-01 14:58-0800\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,140 +16,6 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: openidlogin.php:30 finishopenidlogin.php:34
-msgid "Already logged in."
-msgstr ""
-
-#: openidlogin.php:37 openidsettings.php:194 finishopenidlogin.php:38
-msgid "There was a problem with your session token. Try again, please."
-msgstr ""
-
-#: openidlogin.php:66
-#, php-format
-msgid ""
-"For security reasons, please re-login with your [OpenID](%%doc.openid%%) "
-"before changing your settings."
-msgstr ""
-
-#: openidlogin.php:70
-#, php-format
-msgid "Login with an [OpenID](%%doc.openid%%) account."
-msgstr ""
-
-#: openidlogin.php:95 finishaddopenid.php:170
-msgid "OpenID Login"
-msgstr ""
-
-#: openidlogin.php:112
-msgid "OpenID login"
-msgstr ""
-
-#: openidlogin.php:117 openidsettings.php:107
-msgid "OpenID URL"
-msgstr ""
-
-#: openidlogin.php:119
-msgid "Your OpenID URL"
-msgstr ""
-
-#: openidlogin.php:122
-msgid "Remember me"
-msgstr ""
-
-#: openidlogin.php:123
-msgid "Automatically login in the future; not for shared computers!"
-msgstr ""
-
-#: openidlogin.php:127
-msgid "Login"
-msgstr ""
-
-#: openidserver.php:106
-#, php-format
-msgid "You are not authorized to use the identity %s"
-msgstr ""
-
-#: openidserver.php:126
-msgid "Just an OpenID provider. Nothing to see here, move along..."
-msgstr ""
-
-#: OpenIDPlugin.php:123 OpenIDPlugin.php:135
-msgid "OpenID"
-msgstr ""
-
-#: OpenIDPlugin.php:124
-msgid "Login or register with OpenID"
-msgstr ""
-
-#: OpenIDPlugin.php:136
-msgid "Add or remove OpenIDs"
-msgstr ""
-
-#: openid.php:141
-msgid "Cannot instantiate OpenID consumer object."
-msgstr ""
-
-#: openid.php:151
-msgid "Not a valid OpenID."
-msgstr ""
-
-#: openid.php:153
-#, php-format
-msgid "OpenID failure: %s"
-msgstr ""
-
-#: openid.php:180
-#, php-format
-msgid "Could not redirect to server: %s"
-msgstr ""
-
-#: openid.php:198
-#, php-format
-msgid "Could not create OpenID form: %s"
-msgstr ""
-
-#: openid.php:214
-msgid ""
-"This form should automatically submit itself. If not, click the submit "
-"button to go to your OpenID provider."
-msgstr ""
-
-#: openid.php:246
-msgid "Error saving the profile."
-msgstr ""
-
-#: openid.php:257
-msgid "Error saving the user."
-msgstr ""
-
-#: openid.php:277
-msgid "OpenID Auto-Submit"
-msgstr ""
-
-#: openidtrust.php:51
-msgid "OpenID Identity Verification"
-msgstr ""
-
-#: openidtrust.php:69
-msgid ""
-"This page should only be reached during OpenID processing, not directly."
-msgstr ""
-
-#: openidtrust.php:118
-#, php-format
-msgid ""
-"%s  has asked to verify your identity. Click Continue to verify your "
-"identity and login without creating a new password."
-msgstr ""
-
-#: openidtrust.php:136
-msgid "Continue"
-msgstr ""
-
-#: openidtrust.php:137
-msgid "Cancel"
-msgstr ""
-
 #: finishaddopenid.php:67
 msgid "Not logged in."
 msgstr ""
@@ -179,71 +45,26 @@ msgstr ""
 msgid "Error updating profile"
 msgstr ""
 
-#: openidsettings.php:59
-msgid "OpenID settings"
+#: finishaddopenid.php:170 openidlogin.php:95
+msgid "OpenID Login"
 msgstr ""
 
-#: openidsettings.php:70
-#, php-format
-msgid ""
-"[OpenID](%%doc.openid%%) lets you log into many sites with the same user "
-"account. Manage your associated OpenIDs from here."
+#: finishopenidlogin.php:34 openidlogin.php:30
+msgid "Already logged in."
 msgstr ""
 
-#: openidsettings.php:99
-msgid "Add OpenID"
-msgstr ""
-
-#: openidsettings.php:102
-msgid ""
-"If you want to add an OpenID to your account, enter it in the box below and "
-"click \"Add\"."
-msgstr ""
-
-#: openidsettings.php:117
-msgid "Add"
-msgstr ""
-
-#: openidsettings.php:129
-msgid "Remove OpenID"
-msgstr ""
-
-#: openidsettings.php:134
-msgid ""
-"Removing your only OpenID would make it impossible to log in! If you need to "
-"remove it, add another OpenID first."
-msgstr ""
-
-#: openidsettings.php:149
-msgid ""
-"You can remove an OpenID from your account by clicking the button marked "
-"\"Remove\"."
-msgstr ""
-
-#: openidsettings.php:172
-msgid "Remove"
-msgstr ""
-
-#: openidsettings.php:208 finishopenidlogin.php:52
-msgid "Something weird happened."
-msgstr ""
-
-#: openidsettings.php:228
-msgid "No such OpenID."
-msgstr ""
-
-#: openidsettings.php:233
-msgid "That OpenID does not belong to you."
-msgstr ""
-
-#: openidsettings.php:237
-msgid "OpenID removed."
+#: finishopenidlogin.php:38 openidlogin.php:37 openidsettings.php:194
+msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
 #: finishopenidlogin.php:43
 msgid "You can't register if you don't agree to the license."
 msgstr ""
 
+#: finishopenidlogin.php:52 openidsettings.php:208
+msgid "Something weird happened."
+msgstr ""
+
 #: finishopenidlogin.php:66
 #, php-format
 msgid ""
@@ -342,3 +163,186 @@ msgstr ""
 #: finishopenidlogin.php:345
 msgid "Error connecting user to OpenID."
 msgstr ""
+
+#: openid.php:141
+msgid "Cannot instantiate OpenID consumer object."
+msgstr ""
+
+#: openid.php:151
+msgid "Not a valid OpenID."
+msgstr ""
+
+#: openid.php:153
+#, php-format
+msgid "OpenID failure: %s"
+msgstr ""
+
+#: openid.php:180
+#, php-format
+msgid "Could not redirect to server: %s"
+msgstr ""
+
+#: openid.php:198
+#, php-format
+msgid "Could not create OpenID form: %s"
+msgstr ""
+
+#: openid.php:214
+msgid ""
+"This form should automatically submit itself. If not, click the submit "
+"button to go to your OpenID provider."
+msgstr ""
+
+#: openid.php:246
+msgid "Error saving the profile."
+msgstr ""
+
+#: openid.php:257
+msgid "Error saving the user."
+msgstr ""
+
+#: openid.php:277
+msgid "OpenID Auto-Submit"
+msgstr ""
+
+#: openidlogin.php:66
+#, php-format
+msgid ""
+"For security reasons, please re-login with your [OpenID](%%doc.openid%%) "
+"before changing your settings."
+msgstr ""
+
+#: openidlogin.php:70
+#, php-format
+msgid "Login with an [OpenID](%%doc.openid%%) account."
+msgstr ""
+
+#: openidlogin.php:112
+msgid "OpenID login"
+msgstr ""
+
+#: openidlogin.php:117 openidsettings.php:107
+msgid "OpenID URL"
+msgstr ""
+
+#: openidlogin.php:119
+msgid "Your OpenID URL"
+msgstr ""
+
+#: openidlogin.php:122
+msgid "Remember me"
+msgstr ""
+
+#: openidlogin.php:123
+msgid "Automatically login in the future; not for shared computers!"
+msgstr ""
+
+#: openidlogin.php:127
+msgid "Login"
+msgstr ""
+
+#: OpenIDPlugin.php:123 OpenIDPlugin.php:135
+msgid "OpenID"
+msgstr ""
+
+#: OpenIDPlugin.php:124
+msgid "Login or register with OpenID"
+msgstr ""
+
+#: OpenIDPlugin.php:136
+msgid "Add or remove OpenIDs"
+msgstr ""
+
+#: OpenIDPlugin.php:324
+msgid "Use <a href=\"http://openid.net/\">OpenID</a> to login to the site."
+msgstr ""
+
+#: openidserver.php:106
+#, php-format
+msgid "You are not authorized to use the identity %s."
+msgstr ""
+
+#: openidserver.php:126
+msgid "Just an OpenID provider. Nothing to see here, move along..."
+msgstr ""
+
+#: openidsettings.php:59
+msgid "OpenID settings"
+msgstr ""
+
+#: openidsettings.php:70
+#, php-format
+msgid ""
+"[OpenID](%%doc.openid%%) lets you log into many sites with the same user "
+"account. Manage your associated OpenIDs from here."
+msgstr ""
+
+#: openidsettings.php:99
+msgid "Add OpenID"
+msgstr ""
+
+#: openidsettings.php:102
+msgid ""
+"If you want to add an OpenID to your account, enter it in the box below and "
+"click \"Add\"."
+msgstr ""
+
+#: openidsettings.php:117
+msgid "Add"
+msgstr ""
+
+#: openidsettings.php:129
+msgid "Remove OpenID"
+msgstr ""
+
+#: openidsettings.php:134
+msgid ""
+"Removing your only OpenID would make it impossible to log in! If you need to "
+"remove it, add another OpenID first."
+msgstr ""
+
+#: openidsettings.php:149
+msgid ""
+"You can remove an OpenID from your account by clicking the button marked "
+"\"Remove\"."
+msgstr ""
+
+#: openidsettings.php:172
+msgid "Remove"
+msgstr ""
+
+#: openidsettings.php:228
+msgid "No such OpenID."
+msgstr ""
+
+#: openidsettings.php:233
+msgid "That OpenID does not belong to you."
+msgstr ""
+
+#: openidsettings.php:237
+msgid "OpenID removed."
+msgstr ""
+
+#: openidtrust.php:51
+msgid "OpenID Identity Verification"
+msgstr ""
+
+#: openidtrust.php:69
+msgid ""
+"This page should only be reached during OpenID processing, not directly."
+msgstr ""
+
+#: openidtrust.php:118
+#, php-format
+msgid ""
+"%s  has asked to verify your identity. Click Continue to verify your "
+"identity and login without creating a new password."
+msgstr ""
+
+#: openidtrust.php:136
+msgid "Continue"
+msgstr ""
+
+#: openidtrust.php:137
+msgid "Cancel"
+msgstr ""
diff --git a/plugins/PoweredByStatusNet/locale/PoweredByStatusNet.po b/plugins/PoweredByStatusNet/locale/PoweredByStatusNet.po
index bd39124efe..8f8434a85d 100644
--- a/plugins/PoweredByStatusNet/locale/PoweredByStatusNet.po
+++ b/plugins/PoweredByStatusNet/locale/PoweredByStatusNet.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-22 15:03-0800\n"
+"POT-Creation-Date: 2010-03-01 14:58-0800\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,16 +16,16 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: PoweredByStatusNetPlugin.php:49
+#: PoweredByStatusNetPlugin.php:50
 #, php-format
 msgid "powered by %s"
 msgstr ""
 
-#: PoweredByStatusNetPlugin.php:51
+#: PoweredByStatusNetPlugin.php:52
 msgid "StatusNet"
 msgstr ""
 
-#: PoweredByStatusNetPlugin.php:64
+#: PoweredByStatusNetPlugin.php:65
 msgid ""
 "Outputs powered by <a href=\"http://status.net/\">StatusNet</a> after site "
 "name."
diff --git a/plugins/Sample/locale/Sample.po b/plugins/Sample/locale/Sample.po
index e0d2aa853c..a52c4ec01c 100644
--- a/plugins/Sample/locale/Sample.po
+++ b/plugins/Sample/locale/Sample.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-24 16:33-0800\n"
+"POT-Creation-Date: 2010-03-01 14:58-0800\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"
diff --git a/plugins/TwitterBridge/locale/TwitterBridge.po b/plugins/TwitterBridge/locale/TwitterBridge.po
index 14c30f1c9c..eff1255799 100644
--- a/plugins/TwitterBridge/locale/TwitterBridge.po
+++ b/plugins/TwitterBridge/locale/TwitterBridge.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-07 20:38-0800\n"
+"POT-Creation-Date: 2010-03-01 14:58-0800\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,23 +16,48 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: twitterauthorization.php:81
-msgid "Not logged in."
+#: twitter.php:320
+msgid "Your Twitter bridge has been disabled."
 msgstr ""
 
-#: twitterauthorization.php:131 twitterauthorization.php:150
-#: twitterauthorization.php:170 twitterauthorization.php:217
+#: twitter.php:324
+#, php-format
+msgid ""
+"Hi, %1$s. We're sorry to inform you that your link to Twitter has been "
+"disabled. We no longer seem to have permission to update your Twitter "
+"status. (Did you revoke %3$s's access?)\n"
+"\n"
+"You can re-enable your Twitter bridge by visiting your Twitter settings "
+"page:\n"
+"\n"
+"\t%2$s\n"
+"\n"
+"Regards,\n"
+"%3$s\n"
+msgstr ""
+
+#: twitterauthorization.php:181 twitterauthorization.php:229
 msgid "Couldn't link your Twitter account."
 msgstr ""
 
-#: TwitterBridgePlugin.php:89
+#: twitterauthorization.php:201
+msgid "Couldn't link your Twitter account: oauth_token mismatch."
+msgstr ""
+
+#: TwitterBridgePlugin.php:114
 msgid "Twitter"
 msgstr ""
 
-#: TwitterBridgePlugin.php:90
+#: TwitterBridgePlugin.php:115
 msgid "Twitter integration options"
 msgstr ""
 
+#: TwitterBridgePlugin.php:207
+msgid ""
+"The Twitter \"bridge\" plugin allows you to integrate your StatusNet "
+"instance with <a href=\"http://twitter.com/\">Twitter</a>."
+msgstr ""
+
 #: twittersettings.php:59
 msgid "Twitter settings"
 msgstr ""
@@ -51,78 +76,81 @@ msgstr ""
 msgid "Connected Twitter account"
 msgstr ""
 
-#: twittersettings.php:125
-msgid "Remove"
+#: twittersettings.php:128
+msgid "Disconnect my account from Twitter"
 msgstr ""
 
-#: twittersettings.php:131
-msgid "Preferences"
+#: twittersettings.php:133
+msgid "Disconnecting your Twitter could make it impossible to log in! Please "
 msgstr ""
 
-#: twittersettings.php:135
-msgid "Automatically send my notices to Twitter."
+#: twittersettings.php:137
+msgid "set a password"
 msgstr ""
 
-#: twittersettings.php:142
-msgid "Send local \"@\" replies to Twitter."
+#: twittersettings.php:139
+msgid " first."
 msgstr ""
 
-#: twittersettings.php:149
-msgid "Subscribe to my Twitter friends here."
+#: twittersettings.php:143
+#, php-format
+msgid ""
+"Keep your %1$s account but disconnect from Twitter. You can use your %1$s "
+"password to log in."
+msgstr ""
+
+#: twittersettings.php:151
+msgid "Disconnect"
 msgstr ""
 
 #: twittersettings.php:158
-msgid "Import my Friends Timeline."
+msgid "Preferences"
 msgstr ""
 
-#: twittersettings.php:174
-msgid "Save"
+#: twittersettings.php:162
+msgid "Automatically send my notices to Twitter."
+msgstr ""
+
+#: twittersettings.php:169
+msgid "Send local \"@\" replies to Twitter."
 msgstr ""
 
 #: twittersettings.php:176
-msgid "Add"
+msgid "Subscribe to my Twitter friends here."
+msgstr ""
+
+#: twittersettings.php:185
+msgid "Import my Friends Timeline."
 msgstr ""
 
 #: twittersettings.php:201
+msgid "Save"
+msgstr ""
+
+#: twittersettings.php:203
+msgid "Add"
+msgstr ""
+
+#: twittersettings.php:228
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
-#: twittersettings.php:211
+#: twittersettings.php:238
 msgid "Unexpected form submission."
 msgstr ""
 
-#: twittersettings.php:230
+#: twittersettings.php:257
 msgid "Couldn't remove Twitter user."
 msgstr ""
 
-#: twittersettings.php:234
-msgid "Twitter account removed."
+#: twittersettings.php:261
+msgid "Twitter account disconnected."
 msgstr ""
 
-#: twittersettings.php:255 twittersettings.php:265
+#: twittersettings.php:282 twittersettings.php:292
 msgid "Couldn't save Twitter preferences."
 msgstr ""
 
-#: twittersettings.php:269
+#: twittersettings.php:296
 msgid "Twitter preferences saved."
 msgstr ""
-
-#: twitter.php:333
-msgid "Your Twitter bridge has been disabled."
-msgstr ""
-
-#: twitter.php:337
-#, php-format
-msgid ""
-"Hi, %1$s. We're sorry to inform you that your link to Twitter has been "
-"disabled. We no longer seem to have permission to update your Twitter "
-"status. (Did you revoke %3$s's access?)\n"
-"\n"
-"You can re-enable your Twitter bridge by visiting your Twitter settings "
-"page:\n"
-"\n"
-"\t%2$s\n"
-"\n"
-"Regards,\n"
-"%3$s\n"
-msgstr ""
diff --git a/scripts/update_po_templates.php b/scripts/update_po_templates.php
index 63bd72c472..0bfa62a22e 100755
--- a/scripts/update_po_templates.php
+++ b/scripts/update_po_templates.php
@@ -36,12 +36,13 @@ xgettext \
     --default-domain=$domain \
     --output=locale/$domain.po \
     --language=PHP \
-    --keyword="pgettext:1c,2" \
-    --keyword="npgettext:1c,2,3" \
+    --add-comments=TRANS \
     --keyword="_m:1,1t" \
     --keyword="_m:1c,2,2t" \
     --keyword="_m:1,2,3t" \
     --keyword="_m:1c,2,3,4t" \
+    --keyword="pgettext:1c,2" \
+    --keyword="npgettext:1c,2,3" \
     actions/*.php \
     classes/*.php \
     lib/*.php \
@@ -65,6 +66,7 @@ xgettext \
     --default-domain=$domain \
     --output=locale/$domain.po \
     --language=PHP \
+    --add-comments=TRANS \
     --keyword='' \
     --keyword="_m:1,1t" \
     --keyword="_m:1c,2,2t" \