Type-hint is array here.

[quix0rs-gnu-social.git] / locale / statusnet.pot

diff --git a/locale/statusnet.pot b/locale/statusnet.pot
index 6cb2d29b6697c4adfdecc92b6cb6a750d5f62845..d670abee6ae62d40d379ac0a8e04412c0e982c55 100644 (file)
--- a/locale/statusnet.pot
+++ b/locale/statusnet.pot
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2012-06-04 14:59+0000\n"
+"POT-Creation-Date: 2015-02-27 16:31+0100\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"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

+"Language: \n"

 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"


@@ -33,74 +34,91 @@ msgid "An error occurred."
 msgstr ""
 
 #. TRANS: Error message displayed when there is no StatusNet configuration file.
 msgstr ""
 
 #. TRANS: Error message displayed when there is no StatusNet configuration file.

-#: index.php:270
+#: index.php:229

 #, php-format
 msgid ""
 "No configuration file found. Try running the installation program first."
 msgstr ""
 
 #. TRANS: Error message displayed when trying to access a non-existing page.
 #, php-format
 msgid ""
 "No configuration file found. Try running the installation program first."
 msgstr ""
 
 #. TRANS: Error message displayed when trying to access a non-existing page.

-#: index.php:301
+#: index.php:260

 msgid "Unknown page"
 msgstr ""
 
 #. TRANS: Error message displayed when trying to perform an undefined action.
 #. TRANS: Title for password recovery page when an unknown action has been specified.
 msgid "Unknown page"
 msgstr ""
 
 #. TRANS: Error message displayed when trying to perform an undefined action.
 #. TRANS: Title for password recovery page when an unknown action has been specified.

-#: index.php:356 actions/recoverpassword.php:232
+#: index.php:312 actions/recoverpassword.php:221

 msgid "Unknown action"
 msgstr ""
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 msgid "Unknown action"
 msgstr ""
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.

-#: actions/accessadminpanel.php:53
+#: actions/accessadminpanel.php:51

 msgid "Access"
 msgstr ""
 
 #. TRANS: Page notice.
 msgid "Access"
 msgstr ""
 
 #. TRANS: Page notice.

-#: actions/accessadminpanel.php:64
+#: actions/accessadminpanel.php:62

 msgid "Site access settings"
 msgstr ""
 
 #. TRANS: Form legend for registration form.
 msgid "Site access settings"
 msgstr ""
 
 #. TRANS: Form legend for registration form.

-#: actions/accessadminpanel.php:151
+#: actions/accessadminpanel.php:150

 msgid "Registration"
 msgstr ""
 
 msgid "Registration"
 msgstr ""
 

-#. TRANS: Checkbox instructions for admin setting "Private".
-#: actions/accessadminpanel.php:155
-msgid "Prohibit anonymous users (not logged in) from viewing site?"
-msgstr ""
-
-#. TRANS: Checkbox label for prohibiting anonymous users from viewing site.
-#. TRANS: Checkbox label to show private tags.
-#. TRANS: Checkbox field label on group edit form to mark a group private.
-#: actions/accessadminpanel.php:157 actions/peopletagsbyuser.php:190
-#: lib/groupeditform.php:206
-msgctxt "LABEL"
-msgid "Private"
-msgstr ""
-

 #. TRANS: Checkbox instructions for admin setting "Invite only".
 #. TRANS: Checkbox instructions for admin setting "Invite only".

-#: actions/accessadminpanel.php:164
+#: actions/accessadminpanel.php:155

 msgid "Make registration invitation only."
 msgstr ""
 
 #. TRANS: Checkbox label for configuring site as invite only.
 msgid "Make registration invitation only."
 msgstr ""
 
 #. TRANS: Checkbox label for configuring site as invite only.

-#: actions/accessadminpanel.php:166
+#: actions/accessadminpanel.php:157

 msgid "Invite only"
 msgstr ""
 
 #. TRANS: Checkbox instructions for admin setting "Closed" (no new registrations).
 msgid "Invite only"
 msgstr ""
 
 #. TRANS: Checkbox instructions for admin setting "Closed" (no new registrations).

-#: actions/accessadminpanel.php:173
+#: actions/accessadminpanel.php:164

 msgid "Disable new registrations."
 msgstr ""
 
 #. TRANS: Checkbox label for disabling new user registrations.
 msgid "Disable new registrations."
 msgstr ""
 
 #. TRANS: Checkbox label for disabling new user registrations.

-#: actions/accessadminpanel.php:175
+#: actions/accessadminpanel.php:166

 msgid "Closed"
 msgstr ""
 
 msgid "Closed"
 msgstr ""
 

-#. TRANS: Button title to save access settings in site admin panel.
+#. TRANS: Form legend for registration form.
+#: actions/accessadminpanel.php:178
+msgid "Feed access"
+msgstr ""
+
+#. TRANS: Checkbox instructions for admin setting "Private".
+#: actions/accessadminpanel.php:182
+msgid "Prohibit anonymous users (not logged in) from viewing site?"
+msgstr ""
+
+#. TRANS: Checkbox label for prohibiting anonymous users from viewing site.
+#. TRANS: Checkbox label to show private tags.
+#. TRANS: Checkbox field label on group edit form to mark a group private.
+#: actions/accessadminpanel.php:184 actions/peopletagsbyuser.php:186
+#: lib/groupeditform.php:210
+msgctxt "LABEL"
+msgid "Private"
+msgstr ""
+
+#. TRANS: Description of the full network notice stream views..

 #: actions/accessadminpanel.php:191
 #: actions/accessadminpanel.php:191

+msgid ""
+"The full network view includes (public) remote notices which may be "
+"unrelated to local conversations."
+msgstr ""
+
+#. TRANS: Checkbox label for hiding remote network posts if they have not been interacted with locally.
+#: actions/accessadminpanel.php:193
+msgid "Restrict full network view to accounts"
+msgstr ""
+
+#. TRANS: Button title to save access settings in site admin panel.
+#: actions/accessadminpanel.php:210

 msgid "Save access settings."
 msgstr ""
 
 msgid "Save access settings."
 msgstr ""
 


@@ -114,23 +132,21 @@ msgstr ""
 #. TRANS: Button text for saving site settings.
 #. TRANS: Button text for saving site notice in admin panel.
 #. TRANS: Button label to save SMS preferences.
 #. TRANS: Button text for saving site settings.
 #. TRANS: Button text for saving site notice in admin panel.
 #. TRANS: Button label to save SMS preferences.

-#. TRANS: Button text to save snapshot settings.

 #. TRANS: Save button for settings for a profile in a subscriptions list.
 #. TRANS: Save button for settings for a profile in a subscriptions list.

-#. TRANS: Button text to save lists.

 #. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Text for save button on group edit form.
 #. TRANS: Button text to save tags for a profile.
 #. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Text for save button on group edit form.
 #. TRANS: Button text to save tags for a profile.

-#: actions/accessadminpanel.php:193 actions/emailsettings.php:251
-#: actions/imsettings.php:201 actions/licenseadminpanel.php:335
+#. TRANS: Button text to save lists.
+#: actions/accessadminpanel.php:212 actions/emailsettings.php:244
+#: actions/imsettings.php:201 actions/licenseadminpanel.php:331

 #: actions/pathsadminpanel.php:454 actions/profilesettings.php:215
 #: actions/pathsadminpanel.php:454 actions/profilesettings.php:215

-#: actions/sessionsadminpanel.php:202 actions/siteadminpanel.php:373
+#: actions/sessionsadminpanel.php:202 actions/siteadminpanel.php:372

 #: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:204
 #: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:204

-#: actions/snapshotadminpanel.php:252 actions/subscriptions.php:249
-#: actions/tagprofile.php:169 actions/urlsettings.php:152
+#: actions/subscriptions.php:223 actions/urlsettings.php:152

 #: actions/useradminpanel.php:300 lib/applicationeditform.php:355
 #: actions/useradminpanel.php:300 lib/applicationeditform.php:355

-#: lib/groupeditform.php:225 lib/peopletags.php:146
+#: lib/groupeditform.php:229 lib/peopletags.php:146 lib/tagprofileform.php:143

 msgctxt "BUTTON"
 msgid "Save"
 msgstr ""
 msgctxt "BUTTON"
 msgid "Save"
 msgstr ""


@@ -145,75 +161,68 @@ msgstr ""
 #. TRANS: Client error displayed when the session token does not match or is not given.
 #. TRANS: Client error displayed when the session token is not okay.
 #. TRANS: Client error displayed when the session token does not match or is not given.
 #. TRANS: Client error displayed when the session token does not match or is not given.
 #. TRANS: Client error displayed when the session token is not okay.
 #. TRANS: Client error displayed when the session token does not match or is not given.

-#: actions/addpeopletag.php:78 actions/apioauthauthorize.php:147
-#: actions/avatarsettings.php:283 actions/cancelsubscription.php:75
-#: actions/deletenotice.php:178 actions/disfavor.php:75
-#: actions/emailsettings.php:293 actions/favor.php:76 actions/geocode.php:56
-#: actions/groupblock.php:66 actions/grouplogo.php:321
-#: actions/groupunblock.php:66 actions/imsettings.php:244
-#: actions/invite.php:67 actions/makeadmin.php:68 actions/newmessage.php:141
-#: actions/newnotice.php:105 actions/nudge.php:82
-#: actions/oauthappssettings.php:162 actions/oauthconnectionssettings.php:136
-#: actions/passwordsettings.php:147 actions/peopletagautocomplete.php:67
-#: actions/pluginenable.php:88 actions/profilecompletion.php:81
-#: actions/profilesettings.php:235 actions/recoverpassword.php:304
-#: actions/register.php:164 actions/removepeopletag.php:79
-#: actions/repeat.php:80 actions/smssettings.php:250 actions/subedit.php:41
-#: actions/subscribe.php:87 actions/subscribepeopletag.php:76
-#: actions/tagprofile.php:186 actions/unsubscribe.php:70
-#: actions/unsubscribepeopletag.php:77 actions/urlsettings.php:171
+#: actions/addpeopletag.php:78 actions/apioauthauthorize.php:144
+#: actions/avatarsettings.php:282 actions/deletenotice.php:178
+#: actions/emailsettings.php:286 actions/geocode.php:56
+#: actions/groupblock.php:65 actions/grouplogo.php:315
+#: actions/groupunblock.php:65 actions/imsettings.php:244
+#: actions/invite.php:67 actions/makeadmin.php:67 actions/nudge.php:80
+#: actions/oauthappssettings.php:163 actions/oauthconnectionssettings.php:135
+#: actions/passwordsettings.php:147 actions/peopletagautocomplete.php:66
+#: actions/pluginenable.php:87 actions/profilecompletion.php:81
+#: actions/profilesettings.php:235 actions/recoverpassword.php:293
+#: actions/register.php:162 actions/removepeopletag.php:79
+#: actions/smssettings.php:250 actions/subedit.php:40 actions/subscribe.php:85
+#: actions/subscribepeopletag.php:74 actions/unsubscribe.php:66
+#: actions/unsubscribepeopletag.php:75 actions/urlsettings.php:171

 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
 #. TRANS: Error message displayed when trying to perform an action that requires a logged in user.
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
 #. TRANS: Error message displayed when trying to perform an action that requires a logged in user.

-#: actions/addpeopletag.php:89 actions/cancelsubscription.php:57
-#: actions/deletenotice.php:52 actions/disfavor.php:61
-#: actions/editpeopletag.php:69 actions/favor.php:62 actions/groupblock.php:60
-#: actions/groupunblock.php:60 actions/logout.php:69 actions/makeadmin.php:62
-#: actions/newmessage.php:89 actions/newnotice.php:87 actions/nudge.php:64
-#: actions/peopletagautocomplete.php:57 actions/peopletagsbyuser.php:126
-#: actions/pluginenable.php:99 actions/profilecompletion.php:92
-#: actions/removepeopletag.php:90 actions/subedit.php:33
-#: actions/subscribe.php:98 actions/unsubscribe.php:52
+#: actions/addpeopletag.php:88 actions/deletenotice.php:52
+#: actions/editpeopletag.php:69 actions/groupblock.php:60
+#: actions/groupunblock.php:60 actions/makeadmin.php:62 actions/nudge.php:64
+#: actions/peopletagautocomplete.php:57 actions/peopletagsbyuser.php:123
+#: actions/pluginenable.php:97 actions/profilecompletion.php:91
+#: actions/removepeopletag.php:89 actions/subedit.php:33
+#: actions/subscribe.php:95 actions/unsubscribe.php:52 lib/action.php:1508

 #: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:73
 msgid "Not logged in."
 msgstr ""
 
 #. TRANS: Client error displayed trying to perform an action related to a non-existing profile.
 #: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:73
 msgid "Not logged in."
 msgstr ""
 
 #. TRANS: Client error displayed trying to perform an action related to a non-existing profile.

-#. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.

 #. TRANS: Client exception.
 #. TRANS: Client error displayed when referring to a non-existing profile.
 #. TRANS: Client error displayed trying to subscribe to a non-existing profile.
 #. TRANS: Client error displayed trying to perform an action related to a non-existing profile.
 #. TRANS: Client exception.
 #. TRANS: Client error displayed when referring to a non-existing profile.
 #. TRANS: Client error displayed trying to subscribe to a non-existing profile.
 #. TRANS: Client error displayed trying to perform an action related to a non-existing profile.

-#: actions/addpeopletag.php:101 actions/atompubfavoritefeed.php:69
-#: actions/atompubmembershipfeed.php:71 actions/atompubshowfavorite.php:75
-#: actions/atompubshowmembership.php:72 actions/removepeopletag.php:102
-#: actions/subscribe.php:110 lib/command.php:435 lib/command.php:494
+#: actions/addpeopletag.php:99 actions/atompubmembershipfeed.php:54
+#: actions/atompubshowmembership.php:55 actions/removepeopletag.php:100
+#: actions/subscribe.php:106 lib/command.php:386 lib/command.php:445

 msgid "No such profile."
 msgstr ""
 
 #. TRANS: Client error displayed trying to reference a non-existing list.
 #. TRANS: Client error displayed when referring to a non-existing list.
 #. TRANS: Client error displayed trying to reference a non-existing list.
 msgid "No such profile."
 msgstr ""
 
 #. TRANS: Client error displayed trying to reference a non-existing list.
 #. TRANS: Client error displayed when referring to a non-existing list.
 #. TRANS: Client error displayed trying to reference a non-existing list.

-#: actions/addpeopletag.php:110 actions/editpeopletag.php:113
-#: actions/peopletagged.php:101 actions/peopletagsubscribers.php:101
-#: actions/profilecompletion.php:101 actions/profiletagbyid.php:67
-#: actions/removepeopletag.php:111 actions/showprofiletag.php:90
-#: actions/subscribepeopletag.php:95 actions/unsubscribepeopletag.php:96
+#: actions/addpeopletag.php:107 actions/editpeopletag.php:110
+#: actions/peopletagged.php:98 actions/peopletagsubscribers.php:98
+#: actions/profilecompletion.php:99 actions/profiletagbyid.php:66
+#: actions/removepeopletag.php:108 actions/showprofiletag.php:87
+#: actions/subscribepeopletag.php:91 actions/unsubscribepeopletag.php:92

 msgid "No such list."
 msgstr ""
 
 #. TRANS: Client error displayed when an unknown error occurs when adding a user to a list.
 #. TRANS: %s is a username.
 msgid "No such list."
 msgstr ""
 
 #. TRANS: Client error displayed when an unknown error occurs when adding a user to a list.
 #. TRANS: %s is a username.

-#: actions/addpeopletag.php:138
+#: actions/addpeopletag.php:134

 #, php-format
 msgid "There was an unexpected error while listing %s."
 msgstr ""
 
 #. TRANS: Client error displayed when an unknown error occurs when adding a user to a list.
 #. TRANS: %s is a profile URL.
 #, php-format
 msgid "There was an unexpected error while listing %s."
 msgstr ""
 
 #. TRANS: Client error displayed when an unknown error occurs when adding a user to a list.
 #. TRANS: %s is a profile URL.

-#: actions/addpeopletag.php:143
+#: actions/addpeopletag.php:139

 #, php-format
 msgid ""
 "There was a problem listing %s. The remote server is probably not responding "
 #, php-format
 msgid ""
 "There was a problem listing %s. The remote server is probably not responding "


@@ -221,103 +230,27 @@ msgid ""
 msgstr ""
 
 #. TRANS: Title after adding a user to a list.
 msgstr ""
 
 #. TRANS: Title after adding a user to a list.

-#: actions/addpeopletag.php:153
+#: actions/addpeopletag.php:148

 msgctxt "TITLE"
 msgid "Listed"
 msgstr ""
 
 msgctxt "TITLE"
 msgid "Listed"
 msgstr ""
 

-#. TRANS: Server error when page not found (404).
-#. TRANS: Server error when page not found (404)
-#. TRANS: Server error when page not found (404).
-#: actions/all.php:72 actions/public.php:110 actions/replies.php:96
-#: actions/showfavorites.php:140 actions/showprofiletag.php:104
-#: actions/tag.php:54
+#. TRANS: Client error when page not found (404).
+#. TRANS: Client error when page not found (404)
+#. TRANS: Client error when page not found (404).
+#: actions/all.php:61 actions/public.php:88 actions/replies.php:94
+#: actions/showprofiletag.php:100 actions/tag.php:53

 msgid "No such page."
 msgstr ""
 
 msgid "No such page."
 msgstr ""
 

-#. TRANS: Client error when user not found for an action.
-#. TRANS: Client error when user not found for an rss related action.
-#. TRANS: Client error displayed when no existing user is provided for a user's delivery device setting.
-#. TRANS: Client error displayed if a user could not be found.
-#. TRANS: Client error displayed updating profile image without having a user object.
-#. TRANS: Client error displayed when making an Atom API request for an unknown user.
-#. TRANS: Client error displayed when trying to block a non-existing user or a user from another site.
-#. TRANS: Client error when user not found for an API action to remove a block for a user.
-#. TRANS: Client error given when a user was not found (404).
-#. TRANS: Client error when user not found for an API direct message action.
-#. TRANS: Client error given when a user was not found (404).
-#. TRANS: Client error displayed when checking group membership for a non-existing user.
-#. TRANS: Client error displayed when trying to have a non-existing user join a group.
-#. TRANS: Client error displayed when trying to have a non-existing user leave a group.
-#. TRANS: Client error displayed when user not found for an action.
-#. TRANS: Client error displayed when not providing a user or an invalid user.
-#. TRANS: Client error displayed when referring to a non-existing user.
-#. TRANS: Client error displayed trying to perform an action related to a non-existing user.
-#. TRANS: Client error displayed when updating a status for a non-existing user.
-#. TRANS: Client error displayed when requesting a list of followers for a non-existing user.
-#. TRANS: Client error displayed when requesting most recent favourite notices by a user for a non-existing user.
-#. TRANS: Client error displayed when requesting dents of a user and friends for a user that does not exist.
-#. TRANS: Client error displayed when requesting most recent dents by user and friends for a non-existing user.
-#. TRANS: Client error displayed when requesting most recent mentions for a non-existing user.
-#. TRANS: Client error displayed requesting most recent notices for a non-existing user.
-#. TRANS: Client error displayed trying to get an avatar for a non-existing user.
-#. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
-#. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a user nickname.
-#. TRANS: Client error displayed when requesting Friends of a Friend feed for an object that is not a user.
-#. TRANS: Client error displayed trying to make a micro summary without providing a valid user.
-#. TRANS: Client error displayed trying to send a direct message to a non-existing user.
-#. TRANS: Client error displayed trying to use "one time password login" without using an existing user.
-#. TRANS: Client error displayed when referring to non-existing user.
-#. TRANS: Client error displayed trying to perform an action related to a non-existing user.
-#. TRANS: Client error displayed when trying to reply to a non-exsting user.
-#. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
-#. TRANS: Client error.
-#. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
-#. TRANS: Client error displayed trying to perform an action related to a non-existing user.
-#. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
-#. TRANS: Client error displayed requesting groups for a non-existing user.
-#. TRANS: Client error displayed when user not found for an action.
-#. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
-#. TRANS: Client error displayed when trying to perform a gallery action with an unknown user.
-#. TRANS: Client error displayed when trying to access a mailbox without providing a user.
-#. TRANS: Client error displayed when calling a profile action without specifying a user.
-#: actions/all.php:84 actions/allrss.php:69
-#: actions/apiaccountupdatedeliverydevice.php:110
-#: actions/apiaccountupdateprofile.php:103
-#: actions/apiaccountupdateprofileimage.php:104 actions/apiatomservice.php:59
-#: actions/apiblockcreate.php:96 actions/apiblockdestroy.php:94
-#: actions/apidirectmessage.php:75 actions/apidirectmessagenew.php:72
-#: actions/apigroupcreate.php:111 actions/apigroupismember.php:89
-#: actions/apigroupjoin.php:98 actions/apigroupleave.php:98
-#: actions/apigrouplist.php:71 actions/apigroupprofileupdate.php:107
-#: actions/apilistmember.php:76 actions/apilistmemberships.php:71
-#: actions/apilists.php:78 actions/apilistsubscriber.php:53
-#: actions/apilistsubscriptions.php:77 actions/apistatusesupdate.php:230
-#: actions/apisubscriptions.php:85 actions/apitimelinefavorites.php:70
-#: actions/apitimelinefriends.php:173 actions/apitimelinehome.php:78
-#: actions/apitimelinementions.php:77 actions/apitimelineuser.php:79
-#: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
-#: actions/foaf.php:42 actions/foaf.php:61 actions/microsummary.php:63
-#: actions/newmessage.php:119 actions/otp.php:78 actions/peopletagged.php:92
-#: actions/peopletagsbyuser.php:102 actions/peopletagsforuser.php:84
-#: actions/peopletagsubscribers.php:92 actions/peopletagsubscriptions.php:86
-#: actions/replies.php:72 actions/repliesrss.php:38 actions/rsd.php:114
-#: actions/showfavorites.php:106 actions/showprofiletag.php:77
-#: actions/showprofiletag.php:116 actions/userbyid.php:75
-#: actions/usergroups.php:95 actions/userrss.php:39 actions/userxrd.php:61
-#: lib/command.php:624 lib/galleryaction.php:61 lib/mailbox.php:79
-#: lib/profileaction.php:77
-msgid "No such user."
-msgstr ""
-

 #. TRANS: Title of a user's own start page.
 #. TRANS: Title of a user's own start page.

-#: actions/all.php:96
+#: actions/all.php:71

 msgid "Home timeline"
 msgstr ""
 
 #. TRANS: Title of another user's start page.
 #. TRANS: %s is the other user's name.
 msgid "Home timeline"
 msgstr ""
 
 #. TRANS: Title of another user's start page.
 #. TRANS: %s is the other user's name.

-#: actions/all.php:101
+#: actions/all.php:75

 #, php-format
 msgid "%s's home timeline"
 msgstr ""
 #, php-format
 msgid "%s's home timeline"
 msgstr ""


@@ -325,13 +258,13 @@ msgstr ""
 #. TRANS: %s is user nickname.
 #. TRANS: Feed title.
 #. TRANS: %s is tagger's nickname.
 #. TRANS: %s is user nickname.
 #. TRANS: Feed title.
 #. TRANS: %s is tagger's nickname.

-#: actions/all.php:116 actions/showprofiletag.php:186
+#: actions/all.php:90 actions/showprofiletag.php:181

 #, php-format
 msgid "Feed for friends of %s (Activity Streams JSON)"
 msgstr ""
 
 #. TRANS: %s is user nickname.
 #, php-format
 msgid "Feed for friends of %s (Activity Streams JSON)"
 msgstr ""
 
 #. TRANS: %s is user nickname.

-#: actions/all.php:124
+#: actions/all.php:98

 #, php-format
 msgid "Feed for friends of %s (RSS 1.0)"
 msgstr ""
 #, php-format
 msgid "Feed for friends of %s (RSS 1.0)"
 msgstr ""


@@ -339,19 +272,19 @@ msgstr ""
 #. TRANS: %s is user nickname.
 #. TRANS: Feed title.
 #. TRANS: %s is tagger's nickname.
 #. TRANS: %s is user nickname.
 #. TRANS: Feed title.
 #. TRANS: %s is tagger's nickname.

-#: actions/all.php:133 actions/showprofiletag.php:197
+#: actions/all.php:107 actions/showprofiletag.php:192

 #, php-format
 msgid "Feed for friends of %s (RSS 2.0)"
 msgstr ""
 
 #. TRANS: %s is user nickname.
 #, php-format
 msgid "Feed for friends of %s (RSS 2.0)"
 msgstr ""
 
 #. TRANS: %s is user nickname.

-#: actions/all.php:142
+#: actions/all.php:116

 #, php-format
 msgid "Feed for friends of %s (Atom)"
 msgstr ""
 
 #. TRANS: Empty list message. %s is a user nickname.
 #, php-format
 msgid "Feed for friends of %s (Atom)"
 msgstr ""
 
 #. TRANS: Empty list message. %s is a user nickname.

-#: actions/all.php:149
+#: actions/all.php:123

 #, php-format
 msgid ""
 "This is the timeline for %s and friends but no one has posted anything yet."
 #, php-format
 msgid ""
 "This is the timeline for %s and friends but no one has posted anything yet."


@@ -359,7 +292,7 @@ msgstr ""
 
 #. TRANS: Encouragement displayed on logged in user's empty timeline.
 #. TRANS: This message contains Markdown links. Keep "](" together.
 
 #. TRANS: Encouragement displayed on logged in user's empty timeline.
 #. TRANS: This message contains Markdown links. Keep "](" together.

-#: actions/all.php:156
+#: actions/all.php:129

 #, php-format
 msgid ""
 "Try subscribing to more people, [join a group](%%action.groups%%) or post "
 #, php-format
 msgid ""
 "Try subscribing to more people, [join a group](%%action.groups%%) or post "


@@ -368,7 +301,7 @@ msgstr ""
 
 #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@".
 #. TRANS: This message contains Markdown links. Keep "](" together.
 
 #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@".
 #. TRANS: This message contains Markdown links. Keep "](" together.

-#: actions/all.php:160
+#: actions/all.php:133

 #, php-format
 msgid ""
 "You can try to [nudge %1$s](../%2$s) from their profile or [post something "
 #, php-format
 msgid ""
 "You can try to [nudge %1$s](../%2$s) from their profile or [post something "


@@ -381,7 +314,7 @@ msgstr ""
 #. TRANS: %1$s is a user nickname. This message contains a Markdown link in the form [link text](link).
 #. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
 #. TRANS: %1$s is a user nickname. This message contains a Markdown link in the form [link text](link).
 #. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
 #. TRANS: This message contains a Markdown link. Keep "](" together.

-#: actions/all.php:165 actions/replies.php:226 actions/showstream.php:241
+#: actions/all.php:138 actions/replies.php:224 actions/showstream.php:226

 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "


@@ -390,11 +323,69 @@ msgstr ""
 
 #. TRANS: Button text for inviting more users to the StatusNet instance.
 #. TRANS: Less business/enterprise-oriented language for public sites.
 
 #. TRANS: Button text for inviting more users to the StatusNet instance.
 #. TRANS: Less business/enterprise-oriented language for public sites.

-#: actions/all.php:216 actions/public.php:255
+#: actions/all.php:189 actions/networkpublic.php:48 actions/public.php:224

 msgctxt "BUTTON"
 msgid "Send invite"
 msgstr ""
 
 msgctxt "BUTTON"
 msgid "Send invite"
 msgstr ""
 

+#. TRANS: Client error when user not found for an rss related action.
+#. TRANS: Client error displayed when no existing user is provided for a user's delivery device setting.
+#. TRANS: Client error displayed if a user could not be found.
+#. TRANS: Client error displayed updating profile image without having a user object.
+#. TRANS: Client error displayed when making an Atom API request for an unknown user.
+#. TRANS: Client error displayed when trying to block a non-existing user or a user from another site.
+#. TRANS: Client error when user not found for an API action to remove a block for a user.
+#. TRANS: Client error given when a user was not found (404).
+#. TRANS: Client error displayed when checking group membership for a non-existing user.
+#. TRANS: Client error displayed when trying to have a non-existing user join a group.
+#. TRANS: Client error displayed when trying to have a non-existing user leave a group.
+#. TRANS: Client error displayed when user not found for an action.
+#. TRANS: Client error displayed when not providing a user or an invalid user.
+#. TRANS: Client error displayed when referring to a non-existing user.
+#. TRANS: Client error displayed trying to perform an action related to a non-existing user.
+#. TRANS: Client error displayed when updating a status for a non-existing user.
+#. TRANS: Client error displayed when requesting a list of followers for a non-existing user.
+#. TRANS: Client error displayed when requesting dents of a user and friends for a user that does not exist.
+#. TRANS: Client error displayed when requesting most recent dents by user and friends for a non-existing user.
+#. TRANS: Client error displayed when requesting most recent mentions for a non-existing user.
+#. TRANS: Client error displayed requesting most recent notices for a non-existing user.
+#. TRANS: Client error displayed trying to get an avatar for a non-existing user.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a user nickname.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for an object that is not a user.
+#. TRANS: Client error displayed trying to make a micro summary without providing a valid user.
+#. TRANS: Client error displayed trying to use "one time password login" without using an existing user.
+#. TRANS: Client error displayed when referring to non-existing user.
+#. TRANS: Client error displayed trying to perform an action related to a non-existing user.
+#. TRANS: Client error displayed when trying to reply to a non-exsting user.
+#. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
+#. TRANS: Client error.
+#. TRANS: Client error displayed trying to perform an action related to a non-existing user.
+#. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
+#. TRANS: Client error displayed when user not found for an action.
+#. TRANS: Client error displayed when calling a profile action without specifying a user.
+#: actions/allrss.php:69 actions/apiaccountupdatedeliverydevice.php:99
+#: actions/apiaccountupdateprofile.php:87
+#: actions/apiaccountupdateprofileimage.php:76 actions/apiatomservice.php:61
+#: actions/apiblockcreate.php:85 actions/apiblockdestroy.php:81
+#: actions/apigroupcreate.php:97 actions/apigroupismember.php:85
+#: actions/apigroupjoin.php:85 actions/apigroupleave.php:85
+#: actions/apigrouplist.php:70 actions/apigroupprofileupdate.php:90
+#: actions/apilistmember.php:73 actions/apilistmemberships.php:69
+#: actions/apilists.php:76 actions/apilistsubscriber.php:50
+#: actions/apilistsubscriptions.php:57 actions/apistatusesupdate.php:211
+#: actions/apisubscriptions.php:83 actions/apitimelinefriends.php:171
+#: actions/apitimelinehome.php:76 actions/apitimelinementions.php:75
+#: actions/apitimelineuser.php:79 actions/avatarbynickname.php:66
+#: actions/foaf.php:42 actions/foaf.php:59 actions/microsummary.php:63
+#: actions/otp.php:76 actions/peopletagged.php:90
+#: actions/peopletagsbyuser.php:101 actions/peopletagsforuser.php:83
+#: actions/peopletagsubscribers.php:90 actions/peopletagsubscriptions.php:85
+#: actions/replies.php:72 actions/repliesrss.php:38 actions/rsd.php:111
+#: actions/showprofiletag.php:75 actions/showprofiletag.php:112
+#: actions/userbyid.php:75 actions/userrss.php:39 lib/profileaction.php:77
+msgid "No such user."
+msgstr ""
+

 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title of API timeline for a user and friends.
 #. TRANS: %s is a username.
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title of API timeline for a user and friends.
 #. TRANS: %s is a username.


@@ -403,17 +394,17 @@ msgstr ""
 #. TRANS: %s is a username.
 #. TRANS: Menu item title in personal group navigation menu.
 #. TRANS: %s is a username.
 #. TRANS: %s is a username.
 #. TRANS: Menu item title in personal group navigation menu.
 #. TRANS: %s is a username.

-#: actions/allrss.php:110 actions/apitimelinefriends.php:209
-#: actions/apitimelinehome.php:113 lib/adminpanelnav.php:74
-#: lib/personalgroupnav.php:77
+#: actions/allrss.php:109 actions/apitimelinefriends.php:202
+#: actions/apitimelinehome.php:106 lib/adminpanelnav.php:74
+#: lib/personalgroupnav.php:80

 #, php-format
 msgid "%s and friends"
 msgstr ""
 
 #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
 #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name.
 #, php-format
 msgid "%s and friends"
 msgstr ""
 
 #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
 #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name.

-#: actions/allrss.php:115 actions/apitimelinefriends.php:215
-#: actions/apitimelinehome.php:119
+#: actions/allrss.php:114 actions/apitimelinefriends.php:208
+#: actions/apitimelinehome.php:112

 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr ""
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr ""


@@ -421,103 +412,190 @@ msgstr ""
 #. TRANS: Client error displayed when coming across a non-supported API method.
 #. TRANS: Client error displayed when trying to handle an unknown API method.
 #. TRANS: Client error displayed when coming across a non-supported API method.
 #. TRANS: Client error displayed when coming across a non-supported API method.
 #. TRANS: Client error displayed when trying to handle an unknown API method.
 #. TRANS: Client error displayed when coming across a non-supported API method.

-#: actions/apiaccountratelimitstatus.php:70
-#: actions/apiaccountupdatedeliverydevice.php:92
-#: actions/apiaccountupdateprofile.php:94
-#: actions/apiaccountverifycredentials.php:68 actions/apiconversation.php:156
-#: actions/apidirectmessage.php:157 actions/apifavoritecreate.php:98
-#: actions/apifavoritedestroy.php:98 actions/apifriendshipscreate.php:99
-#: actions/apifriendshipsdestroy.php:99 actions/apifriendshipsshow.php:124
-#: actions/apigroupcreate.php:138 actions/apigroupismember.php:115
-#: actions/apigroupjoin.php:148 actions/apigroupleave.php:138
-#: actions/apigrouplist.php:135 actions/apigrouplistall.php:120
-#: actions/apigroupmembership.php:105 actions/apigroupprofileupdate.php:98
-#: actions/apigroupprofileupdate.php:216 actions/apigroupshow.php:114
-#: actions/apihelptest.php:84 actions/apilist.php:117 actions/apilist.php:177
-#: actions/apilist.php:214 actions/apilistmember.php:117
-#: actions/apilistmembers.php:87 actions/apilistmembers.php:160
-#: actions/apilistmemberships.php:103 actions/apilists.php:120
-#: actions/apilists.php:172 actions/apilistsubscriber.php:88
-#: actions/apilistsubscribers.php:66 actions/apilistsubscribers.php:113
-#: actions/apilistsubscriptions.php:91 actions/apistatusesdestroy.php:101
-#: actions/apistatusesretweets.php:110 actions/apistatusesshow.php:105
-#: actions/apistatusnetconfig.php:139 actions/apistatusnetversion.php:91
-#: actions/apisubscriptions.php:109 actions/apitimelinefavorites.php:182
-#: actions/apitimelinefriends.php:277 actions/apitimelinegroup.php:146
-#: actions/apitimelinehome.php:181 actions/apitimelinelist.php:182
-#: actions/apitimelinementions.php:182 actions/apitimelinepublic.php:247
-#: actions/apitimelineretweetedtome.php:150
-#: actions/apitimelineretweetsofme.php:157 actions/apitimelinetag.php:165
-#: actions/apitimelineuser.php:217 actions/apiusershow.php:100
-#: lib/apilistusers.php:149
+#: actions/apiaccountratelimitstatus.php:68
+#: actions/apiaccountupdatedeliverydevice.php:83
+#: actions/apiaccountupdateprofile.php:82
+#: actions/apiaccountverifycredentials.php:57 actions/apiconversation.php:152
+#: actions/apifriendshipscreate.php:85 actions/apifriendshipsdestroy.php:97
+#: actions/apifriendshipsshow.php:122 actions/apignusocialconfig.php:117
+#: actions/apignusocialversion.php:65 actions/apigroupadmins.php:104
+#: actions/apigroupcreate.php:122 actions/apigroupismember.php:108
+#: actions/apigroupjoin.php:121 actions/apigroupleave.php:120
+#: actions/apigrouplist.php:129 actions/apigrouplistall.php:118
+#: actions/apigroupmembership.php:99 actions/apigroupprofileupdate.php:85
+#: actions/apigroupprofileupdate.php:179 actions/apigroupshow.php:106
+#: actions/apihelptest.php:82 actions/apilist.php:113 actions/apilist.php:160
+#: actions/apilist.php:188 actions/apilistmember.php:108
+#: actions/apilistmembers.php:71 actions/apilistmembers.php:116
+#: actions/apilistmemberships.php:98 actions/apilists.php:118
+#: actions/apilists.php:169 actions/apilistsubscriber.php:80
+#: actions/apilistsubscribers.php:60 actions/apilistsubscribers.php:91
+#: actions/apilistsubscriptions.php:85 actions/apistatusesdestroy.php:99
+#: actions/apistatusesretweets.php:107 actions/apistatusesshow.php:108
+#: actions/apisubscriptions.php:104 actions/apitimelinefriends.php:264
+#: actions/apitimelinegroup.php:140 actions/apitimelinehome.php:168
+#: actions/apitimelinelist.php:176 actions/apitimelinementions.php:172
+#: actions/apitimelinepublic.php:249 actions/apitimelineretweetedtome.php:148
+#: actions/apitimelineretweetsofme.php:154 actions/apitimelinetag.php:163
+#: actions/apitimelineuser.php:232 actions/apiusershow.php:96
+#: lib/apilistusers.php:146

 msgid "API method not found."
 msgstr ""
 
 msgid "API method not found."
 msgstr ""
 

-#. TRANS: Client error message. POST is a HTTP command. It should not be translated.
-#. TRANS: Client error. POST is a HTTP command. It should not be translated.
-#. TRANS: Client error message. POST is a HTTP command. It should not be translated.
-#. TRANS: Client error. POST is a HTTP command. It should not be translated.
-#: actions/apiaccountupdatedeliverydevice.php:83
-#: actions/apiaccountupdateprofile.php:85
-#: actions/apiaccountupdateprofileimage.php:80 actions/apiblockcreate.php:87
-#: actions/apiblockdestroy.php:85 actions/apidirectmessagenew.php:107
-#: actions/apifavoritecreate.php:88 actions/apifavoritedestroy.php:88
-#: actions/apifriendshipscreate.php:89 actions/apifriendshipsdestroy.php:89
-#: actions/apigroupcreate.php:102 actions/apigroupjoin.php:89
-#: actions/apigroupleave.php:89 actions/apigroupprofileupdate.php:89
-#: actions/apimediaupload.php:66 actions/apistatusesretweet.php:63
-#: actions/apistatusesupdate.php:194
-msgid "This method requires a POST."
+#. TRANS: Client error displayed when trying to register to an invite-only site without an invitation.
+#: actions/apiaccountregister.php:101 actions/register.php:81
+#: actions/register.php:187 actions/register.php:386
+msgid "Sorry, only invited people can register."
+msgstr ""
+
+#. TRANS: Client error displayed when trying to register to an invite-only site without a valid invitation.
+#: actions/apiaccountregister.php:108 actions/register.php:88
+msgid "Sorry, invalid invitation code."
+msgstr ""
+
+#. TRANS: Form validation error displayed when trying to register without a valid e-mail address.
+#. TRANS: Message given saving e-mail address that not valid.
+#. TRANS: Form validation error displayed when trying to register without a valid e-mail address.
+#. TRANS: Client error displayed trying to save site settings without a valid contact address.
+#: actions/apiaccountregister.php:127 actions/emailsettings.php:384
+#: actions/register.php:205 actions/siteadminpanel.php:154
+msgid "Not a valid email address."
+msgstr ""
+
+#. TRANS: Form validation error displayed when trying to register with an already registered e-mail address.
+#: actions/apiaccountregister.php:130 actions/register.php:208
+msgid "Email address already exists."
+msgstr ""
+
+#. TRANS: Form validation error displayed when trying to register with an invalid homepage URL.
+#. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when homepage URL does not validate.
+#. TRANS: Validation error shown when providing an invalid homepage URL in the "Edit application" form.
+#. TRANS: Group edit form validation error.
+#. TRANS: Validation error shown when providing an invalid homepage URL in the "New application" form.
+#. TRANS: Group create form validation error.
+#. TRANS: Validation error in form for profile settings.
+#. TRANS: Form validation error displayed when trying to register with an invalid homepage URL.
+#: actions/apiaccountregister.php:134 actions/apigroupcreate.php:137
+#: actions/apigroupprofileupdate.php:190 actions/editapplication.php:229
+#: actions/editgroup.php:203 actions/newapplication.php:139
+#: actions/newgroup.php:107 actions/profilesettings.php:274
+#: actions/register.php:212
+msgid "Homepage is not a valid URL."
+msgstr ""
+
+#. TRANS: Form validation error displayed when trying to register with a too long full name.
+#. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when full name does not validate.
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#. TRANS: Validation error in form for profile settings.
+#. TRANS: Form validation error displayed when trying to register with a too long full name.
+#: actions/apiaccountregister.php:137 actions/apigroupcreate.php:142
+#: actions/apigroupprofileupdate.php:200 actions/editgroup.php:207
+#: actions/newgroup.php:110 actions/profilesettings.php:278
+#: actions/register.php:215
+msgid "Full name is too long (maximum 255 characters)."
+msgstr ""
+
+#. TRANS: Form validation error on registration page when providing too long a bio text.
+#. TRANS: %d is the maximum number of characters for bio; used for plural.
+#. TRANS: Validation error in form for profile settings.
+#. TRANS: Plural form is used based on the maximum number of allowed
+#. TRANS: characters for the biography (%d).
+#. TRANS: Form validation error on registration page when providing too long a bio text.
+#. TRANS: %d is the maximum number of characters for bio; used for plural.
+#: actions/apiaccountregister.php:141 actions/profilesettings.php:284
+#: actions/register.php:219
+#, php-format
+msgid "Bio is too long (maximum %d character)."
+msgid_plural "Bio is too long (maximum %d characters)."
+msgstr[0] ""
+msgstr[1] ""
+
+#. TRANS: Form validation error displayed when trying to register with a too long location.
+#. TRANS: Client error shown when providing too long a location during group creation.
+#. TRANS: API validation exception thrown when location does not validate.
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#. TRANS: Validation error in form for profile settings.
+#. TRANS: Form validation error displayed when trying to register with a too long location.
+#: actions/apiaccountregister.php:147 actions/apigroupcreate.php:154
+#: actions/apigroupprofileupdate.php:222 actions/editgroup.php:219
+#: actions/newgroup.php:120 actions/profilesettings.php:291
+#: actions/register.php:225
+msgid "Location is too long (maximum 255 characters)."
+msgstr ""
+
+#. TRANS: Form validation error displayed when trying to register with too short a password.
+#. TRANS: Form validation error on page where to change password.
+#. TRANS: Form validation error displayed when trying to register with too short a password.
+#: actions/apiaccountregister.php:150 actions/passwordsettings.php:164
+#: actions/register.php:228
+msgid "Password must be 6 or more characters."
+msgstr ""
+
+#. TRANS: Form validation error displayed when trying to register with non-matching passwords.
+#. TRANS: Form validation error on password change when password confirmation does not match.
+#. TRANS: Form validation error displayed when trying to register with non-matching passwords.
+#: actions/apiaccountregister.php:153 actions/passwordsettings.php:168
+#: actions/register.php:231
+msgid "Passwords do not match."
+msgstr ""
+
+#. TRANS: Form validation error displayed when trying to register with an invalid username or password.
+#: actions/apiaccountregister.php:169 actions/apiaccountregister.php:180
+#: actions/register.php:242 actions/register.php:265
+msgid "Invalid username or password."
+msgstr ""
+
+#: actions/apiaccountupdatebackgroundcolor.php:72
+#: actions/apiaccountupdatelinkcolor.php:73
+msgid "Not a valid hex color."
+msgstr ""
+
+#: actions/apiaccountupdatebackgroundcolor.php:79
+#: actions/apiaccountupdatelinkcolor.php:80
+msgid "Error updating user."

 msgstr ""
 
 #. TRANS: Client error displayed when no valid device parameter is provided for a user's delivery device setting.
 msgstr ""
 
 #. TRANS: Client error displayed when no valid device parameter is provided for a user's delivery device setting.

-#: actions/apiaccountupdatedeliverydevice.php:103
+#: actions/apiaccountupdatedeliverydevice.php:93

 msgid ""
 "You must specify a parameter named 'device' with a value of one of: sms, im, "
 "none."
 msgstr ""
 
 #. TRANS: Server error displayed when a user's delivery device cannot be updated.
 msgid ""
 "You must specify a parameter named 'device' with a value of one of: sms, im, "
 "none."
 msgstr ""
 
 #. TRANS: Server error displayed when a user's delivery device cannot be updated.

-#. TRANS: Server error displayed when confirming an e-mail address or IM address fails.

 #. TRANS: Server error thrown on database error updating e-mail preferences.
 #. TRANS: Server error thrown on database error updating e-mail preferences.

-#. TRANS: Server error thrown on database error removing a registered e-mail address.
-#. TRANS: Server error thrown when user profile settings could not be updated.

 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error updating SMS preferences.

-#. TRANS: Server error thrown on database error removing a registered SMS phone number.

 #. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
 #. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.

-#: actions/apiaccountupdatedeliverydevice.php:136
-#: actions/confirmaddress.php:122 actions/emailsettings.php:353
-#: actions/emailsettings.php:504 actions/profilesettings.php:348
-#: actions/smssettings.php:301 actions/smssettings.php:454
+#: actions/apiaccountupdatedeliverydevice.php:124
+#: actions/emailsettings.php:344 actions/smssettings.php:301

 #: actions/urlsettings.php:213
 msgid "Could not update user."
 msgstr ""
 
 #. TRANS: Error message displayed when referring to a user without a profile.
 #: actions/urlsettings.php:213
 msgid "Could not update user."
 msgstr ""
 
 #. TRANS: Error message displayed when referring to a user without a profile.

-#: actions/apiaccountupdateprofile.php:111
-#: actions/apiaccountupdateprofileimage.php:131
-#: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
-#: actions/avatarbynickname.php:85 actions/avatarsettings.php:108
-#: actions/avatarsettings.php:194 actions/foaf.php:69
-#: actions/grouplogo.php:184 actions/peopletagsbyuser.php:110
-#: actions/peopletagsforuser.php:92 actions/peopletagsubscriptions.php:94
-#: actions/replies.php:80 actions/usergroups.php:103 actions/userrss.php:108
-#: lib/galleryaction.php:69 lib/profileaction.php:85
+#: actions/apiaccountupdateprofile.php:94 actions/avatarbynickname.php:71
+#: actions/avatarsettings.php:108 actions/avatarsettings.php:196
+#: actions/foaf.php:66 actions/grouplogo.php:179
+#: actions/peopletagsbyuser.php:108 actions/peopletagsforuser.php:90
+#: actions/peopletagsubscriptions.php:92 actions/replies.php:79

 msgid "User has no profile."
 msgstr ""
 
 #. TRANS: Server error displayed if a user profile could not be saved.
 #. TRANS: Server error thrown when user profile settings could not be saved.
 msgid "User has no profile."
 msgstr ""
 
 #. TRANS: Server error displayed if a user profile could not be saved.
 #. TRANS: Server error thrown when user profile settings could not be saved.

-#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:448
+#: actions/apiaccountupdateprofile.php:129 actions/profilesettings.php:424

 msgid "Could not save profile."
 msgstr ""
 
 #. TRANS: Client error displayed when the number of bytes in a POST request exceeds a limit.
 #. TRANS: %s is the number of bytes of the CONTENT_LENGTH.
 msgid "Could not save profile."
 msgstr ""
 
 #. TRANS: Client error displayed when the number of bytes in a POST request exceeds a limit.
 #. TRANS: %s is the number of bytes of the CONTENT_LENGTH.

-#: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
-#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:271
-#: actions/editapplication.php:121 actions/newapplication.php:102
-#: actions/newnotice.php:94
+#: actions/apiaccountupdateprofileimage.php:68 actions/apimediaupload.php:69
+#: actions/apistatusesupdate.php:197 actions/avatarsettings.php:270
+#: actions/editapplication.php:119

 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "


@@ -529,7 +607,7 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Title for Atom feed.
 msgstr[1] ""
 
 #. TRANS: Title for Atom feed.

-#: actions/apiatomservice.php:85
+#: actions/apiatomservice.php:86

 msgctxt "ATOM"
 msgid "Main"
 msgstr ""
 msgctxt "ATOM"
 msgid "Main"
 msgstr ""


@@ -538,9 +616,9 @@ msgstr ""
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title in atom group notice feed. %s is a group name.
 #. TRANS: Title in atom user notice feed. %s is a user name.
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title in atom group notice feed. %s is a group name.
 #. TRANS: Title in atom user notice feed. %s is a user name.

-#: actions/apiatomservice.php:93 actions/grouprss.php:138
+#: actions/apiatomservice.php:94 actions/grouprss.php:134

 #: actions/userrss.php:93 lib/atomgroupnoticefeed.php:63
 #: actions/userrss.php:93 lib/atomgroupnoticefeed.php:63

-#: lib/atomusernoticefeed.php:88
+#: lib/atomusernoticefeed.php:73

 #, php-format
 msgid "%s timeline"
 msgstr ""
 #, php-format
 msgid "%s timeline"
 msgstr ""


@@ -550,236 +628,138 @@ msgstr ""
 #. TRANS: %s is a user nickname.
 #. TRANS: Header for subscriptions overview for a user (first page).
 #. TRANS: %s is a user nickname.
 #. TRANS: %s is a user nickname.
 #. TRANS: Header for subscriptions overview for a user (first page).
 #. TRANS: %s is a user nickname.

-#: actions/apiatomservice.php:104 actions/atompubsubscriptionfeed.php:148
+#: actions/apiatomservice.php:105 actions/atompubsubscriptionfeed.php:115

 #: actions/subscriptions.php:51
 #, php-format
 msgid "%s subscriptions"
 msgstr ""
 
 #. TRANS: Title for Atom feed with a user's favorite notices. %s is a user nickname.
 #: actions/subscriptions.php:51
 #, php-format
 msgid "%s subscriptions"
 msgstr ""
 
 #. TRANS: Title for Atom feed with a user's favorite notices. %s is a user nickname.

-#. TRANS: Title for Atom favorites feed.
-#. TRANS: %s is a user nickname.
-#: actions/apiatomservice.php:115 actions/atompubfavoritefeed.php:142
+#: actions/apiatomservice.php:116

 #, php-format
 msgid "%s favorites"
 msgstr ""
 
 #. TRANS: Title for Atom feed with a user's memberships. %s is a user nickname.
 #, php-format
 msgid "%s favorites"
 msgstr ""
 
 #. TRANS: Title for Atom feed with a user's memberships. %s is a user nickname.

-#: actions/apiatomservice.php:126
+#: actions/apiatomservice.php:127

 #, php-format
 msgid "%s memberships"
 msgstr ""
 
 #. TRANS: Client error displayed when users try to block themselves.
 #, php-format
 msgid "%s memberships"
 msgstr ""
 
 #. TRANS: Client error displayed when users try to block themselves.

-#: actions/apiblockcreate.php:105
+#: actions/apiblockcreate.php:92

 msgid "You cannot block yourself!"
 msgstr ""
 
 #. TRANS: Server error displayed when blocking a user has failed.
 msgid "You cannot block yourself!"
 msgstr ""
 
 #. TRANS: Server error displayed when blocking a user has failed.

-#: actions/apiblockcreate.php:127
+#: actions/apiblockcreate.php:110

 msgid "Block user failed."
 msgstr ""
 
 #. TRANS: Server error displayed when unblocking a user has failed.
 msgid "Block user failed."
 msgstr ""
 
 #. TRANS: Server error displayed when unblocking a user has failed.

-#: actions/apiblockdestroy.php:113
+#: actions/apiblockdestroy.php:99

 msgid "Unblock user failed."
 msgstr ""
 
 msgid "Unblock user failed."
 msgstr ""
 

-#. TRANS: Client exception thrown when no conversation ID is given.
-#: actions/apiconversation.php:69
-msgid "No conversation ID."
-msgstr ""
-
-#. TRANS: Client exception thrown when referring to a non-existing conversation ID (%d).
-#: actions/apiconversation.php:76
-#, php-format
-msgid "No conversation with ID %d."
+#: actions/apicheckhub.php:57
+msgid "No URL."

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Title for conversion timeline.
-#: actions/apiconversation.php:105
-msgctxt "TITLE"
-msgid "Conversation"
-msgstr ""
-
-#. TRANS: Title. %s is a user nickname.
-#: actions/apidirectmessage.php:88
-#, php-format
-msgid "Direct messages from %s"
+#: actions/apicheckhub.php:61 lib/invalidurlexception.php:50
+msgid "Invalid URL."

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Subtitle. %s is a user nickname.
-#: actions/apidirectmessage.php:93
-#, php-format
-msgid "All the direct messages sent from %s"
+#: actions/apicheckhub.php:86
+msgid "No feed found"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Title. %s is a user nickname.
-#: actions/apidirectmessage.php:102
-#, php-format
-msgid "Direct messages to %s"
+#: actions/apicheckhub.php:88
+msgid "No hub found"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Subtitle. %s is a user nickname.
-#: actions/apidirectmessage.php:107
-#, php-format
-msgid "All the direct messages sent to %s"
+#: actions/apichecknickname.php:42
+msgid "This site is private."

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Client error displayed when no message text was submitted (406).
-#: actions/apidirectmessagenew.php:117
-msgid "No message text!"
+#. TRANS: Client exception thrown when no conversation ID is given.
+#: actions/apiconversation.php:67
+msgid "No conversation ID."

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Client error displayed when message content is too long.
-#. TRANS: %d is the maximum number of characters for a message.
-#. TRANS: Form validation error displayed when message content is too long.
-#. TRANS: %d is the maximum number of characters for a message.
-#: actions/apidirectmessagenew.php:127 actions/newmessage.php:159
+#. TRANS: Client exception thrown when referring to a non-existing conversation ID (%d).
+#: actions/apiconversation.php:74

 #, php-format
 #, php-format

-msgid "That's too long. Maximum message size is %d character."
-msgid_plural "That's too long. Maximum message size is %d characters."
-msgstr[0] ""
-msgstr[1] ""
-
-#. TRANS: Client error displayed if a recipient user could not be found (403).
-#: actions/apidirectmessagenew.php:139
-msgid "Recipient user not found."
-msgstr ""
-
-#. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
-#: actions/apidirectmessagenew.php:144
-msgid "Cannot send direct messages to users who aren't your friend."
-msgstr ""
-
-#. TRANS: Client error displayed trying to direct message self (403).
-#. TRANS: Client error displayed trying to send a direct message to self.
-#. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/apidirectmessagenew.php:154 actions/newmessage.php:178
-#: lib/command.php:632
-msgid ""
-"Do not send a message to yourself; just say it to yourself quietly instead."
-msgstr ""
-
-#. TRANS: Client error displayed when requesting a status with a non-existing ID.
-#. TRANS: Client error displayed when trying to remove a favourite with an invalid ID.
-#. TRANS: Client error displayed trying to delete a status with an invalid ID.
-#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:108
-#: actions/apistatusesdestroy.php:121
-msgid "No status found with that ID."
-msgstr ""
-
-#. TRANS: Client error displayed when trying to mark a notice favourite that already is a favourite.
-#: actions/apifavoritecreate.php:120
-msgid "This status is already a favorite."
-msgstr ""
-
-#. TRANS: Client error displayed when marking a notice as favourite fails.
-#. TRANS: Server error displayed when trying to mark a notice as favorite fails in the database.
-#. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:132 actions/favor.php:87 lib/command.php:306
-msgid "Could not create favorite."
+msgid "No conversation with ID %d."

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Client error displayed when trying to remove a favourite that was not a favourite.
-#: actions/apifavoritedestroy.php:122
-msgid "That status is not a favorite."
+#. TRANS: Title for conversion timeline.
+#: actions/apiconversation.php:101
+msgctxt "TITLE"
+msgid "Conversation"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Client error displayed when removing a favourite has failed.
-#. TRANS: Server error displayed when removing a favorite from the database fails.
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:90
-msgid "Could not delete favorite."
+#. TRANS: Client error displayed when requesting profile information for a non-existing profile.
+#: actions/apiexternalprofileshow.php:60
+msgid "Profile not found."

 msgstr ""
 
 #. TRANS: Client error displayed when trying follow who's profile could not be found.
 msgstr ""
 
 #. TRANS: Client error displayed when trying follow who's profile could not be found.

-#: actions/apifriendshipscreate.php:109
+#: actions/apifriendshipscreate.php:90

 msgid "Could not follow user: profile not found."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to follow a user that's already being followed.
 #. TRANS: %s is the nickname of the user that is already being followed.
 msgid "Could not follow user: profile not found."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to follow a user that's already being followed.
 #. TRANS: %s is the nickname of the user that is already being followed.

-#: actions/apifriendshipscreate.php:120
+#: actions/apifriendshipscreate.php:97

 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr ""
 
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr ""
 

+#. TRANS: Client error. POST is a HTTP command. It should not be translated.
+#: actions/apifriendshipsdestroy.php:87 lib/action.php:144
+msgid "This method requires a POST."
+msgstr ""
+

 #. TRANS: Client error displayed when trying to unfollow a user that cannot be found.
 #. TRANS: Client error displayed when trying to unfollow a user that cannot be found.

-#: actions/apifriendshipsdestroy.php:109
+#: actions/apifriendshipsdestroy.php:107

 msgid "Could not unfollow user: User not found."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to unfollow self.
 msgid "Could not unfollow user: User not found."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to unfollow self.

-#: actions/apifriendshipsdestroy.php:121
+#: actions/apifriendshipsdestroy.php:119

 msgid "You cannot unfollow yourself."
 msgstr ""
 
 #. TRANS: Client error displayed when supplying invalid parameters to an API call checking if a friendship exists.
 msgid "You cannot unfollow yourself."
 msgstr ""
 
 #. TRANS: Client error displayed when supplying invalid parameters to an API call checking if a friendship exists.

-#: actions/apifriendshipsexists.php:88
+#: actions/apifriendshipsexists.php:86

 msgid "Two valid IDs or nick names must be supplied."
 msgstr ""
 
 #. TRANS: Client error displayed when a source user could not be determined showing friendship.
 msgid "Two valid IDs or nick names must be supplied."
 msgstr ""
 
 #. TRANS: Client error displayed when a source user could not be determined showing friendship.

-#: actions/apifriendshipsshow.php:131
+#: actions/apifriendshipsshow.php:128

 msgid "Could not determine source user."
 msgstr ""
 
 #. TRANS: Client error displayed when a target user could not be determined showing friendship.
 msgid "Could not determine source user."
 msgstr ""
 
 #. TRANS: Client error displayed when a target user could not be determined showing friendship.

-#: actions/apifriendshipsshow.php:140
+#: actions/apifriendshipsshow.php:136

 msgid "Could not find target user."
 msgstr ""
 
 msgid "Could not find target user."
 msgstr ""
 

-#. TRANS: Client error trying to create a group with a nickname this is already in use.
-#. TRANS: API validation exception thrown when nickname is already used.
-#. TRANS: Group edit form validation error.
-#. TRANS: Group create form validation error.
-#. TRANS: Validation error in form for profile settings.
-#. TRANS: Form validation error displayed when trying to register with an existing nickname.
-#: actions/apigroupcreate.php:156 actions/apigroupprofileupdate.php:257
-#: actions/editgroup.php:194 actions/newgroup.php:138
-#: actions/profilesettings.php:293 actions/register.php:210
-msgid "Nickname already in use. Try another one."
-msgstr ""
-
-#. TRANS: Client error in form for group creation.
-#. TRANS: API validation exception thrown when nickname does not validate.
-#. TRANS: Group edit form validation error.
-#. TRANS: Group create form validation error.
-#. TRANS: Validation error in form for profile settings.
-#. TRANS: Form validation error displayed when trying to register with an invalid nickname.
-#: actions/apigroupcreate.php:164 actions/apigroupprofileupdate.php:262
-#: actions/editgroup.php:198 actions/newgroup.php:142
-#: actions/profilesettings.php:263 actions/register.php:213
-msgid "Not a valid nickname."
-msgstr ""
-
-#. TRANS: Client error in form for group creation.
-#. TRANS: API validation exception thrown when homepage URL does not validate.
-#. TRANS: Validation error shown when providing an invalid homepage URL in the "Edit application" form.
-#. TRANS: Group edit form validation error.
-#. TRANS: Validation error shown when providing an invalid homepage URL in the "New application" form.
-#. TRANS: Group create form validation error.
-#. TRANS: Validation error in form for profile settings.
-#. TRANS: Form validation error displayed when trying to register with an invalid homepage URL.
-#: actions/apigroupcreate.php:181 actions/apigroupprofileupdate.php:281
-#: actions/editapplication.php:236 actions/editgroup.php:205
-#: actions/newapplication.php:222 actions/newgroup.php:149
-#: actions/profilesettings.php:268 actions/register.php:222
-msgid "Homepage is not a valid URL."
-msgstr ""
-
-#. TRANS: Client error in form for group creation.
-#. TRANS: API validation exception thrown when full name does not validate.
-#. TRANS: Group edit form validation error.
-#. TRANS: Group create form validation error.
-#. TRANS: Validation error in form for profile settings.
-#. TRANS: Form validation error displayed when trying to register with a too long full name.
-#: actions/apigroupcreate.php:191 actions/apigroupprofileupdate.php:291
-#: actions/editgroup.php:209 actions/newgroup.php:153
-#: actions/profilesettings.php:272 actions/register.php:226
-msgid "Full name is too long (maximum 255 characters)."
-msgstr ""
-
+#. TRANS: Client error displayed trying to show group membership on a non-existing group.
+#. TRANS: Client error displayed when checking group membership for a non-existing group.
+#. TRANS: Client error displayed when trying to join a group that does not exist.
+#. TRANS: Client error displayed when trying to leave a group that does not exist.
+#. TRANS: Client error displayed trying to show group membership on a non-existing group.
+#. TRANS: Client error displayed when not providing a group or an invalid group.
+#. TRANS: Client error displayed when trying to show a group that could not be found.
+#. TRANS: Client error displayed requesting most recent notices to a group for a non-existing group.
+#: actions/apigroupadmins.php:71 actions/apigroupismember.php:90
+#: actions/apigroupjoin.php:90 actions/apigroupleave.php:90
+#: actions/apigroupmembership.php:69 actions/apigroupprofileupdate.php:95
+#: actions/apigroupshow.php:78 actions/apitimelinegroup.php:85
+msgid "Group not found."
+msgstr ""
+

 #. TRANS: Client error shown when providing too long a description during group creation.
 #. TRANS: %d is the maximum number of allowed characters.
 #. TRANS: API validation exception thrown when description does not validate.
 #. TRANS: Client error shown when providing too long a description during group creation.
 #. TRANS: %d is the maximum number of allowed characters.
 #. TRANS: API validation exception thrown when description does not validate.


@@ -793,28 +773,16 @@ msgstr ""
 #. TRANS: %d is the maximum number of characters for the description.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed characters.
 #. TRANS: %d is the maximum number of characters for the description.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed characters.

-#: actions/apigroupcreate.php:201 actions/apigroupprofileupdate.php:301
-#: actions/editapplication.php:203 actions/editgroup.php:214
-#: actions/editpeopletag.php:269 actions/newapplication.php:183
-#: actions/newgroup.php:158
+#: actions/apigroupcreate.php:147 actions/apigroupprofileupdate.php:210
+#: actions/editapplication.php:200 actions/editgroup.php:212
+#: actions/editpeopletag.php:263 actions/newapplication.php:118
+#: actions/newgroup.php:114

 #, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
 msgstr[0] ""
 msgstr[1] ""
 
 #, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
 msgstr[0] ""
 msgstr[1] ""
 

-#. TRANS: Client error shown when providing too long a location during group creation.
-#. TRANS: API validation exception thrown when location does not validate.
-#. TRANS: Group edit form validation error.
-#. TRANS: Group create form validation error.
-#. TRANS: Validation error in form for profile settings.
-#. TRANS: Form validation error displayed when trying to register with a too long location.
-#: actions/apigroupcreate.php:215 actions/apigroupprofileupdate.php:313
-#: actions/editgroup.php:221 actions/newgroup.php:165
-#: actions/profilesettings.php:285 actions/register.php:238
-msgid "Location is too long (maximum 255 characters)."
-msgstr ""
-

 #. TRANS: Client error shown when providing too many aliases during group creation.
 #. TRANS: %d is the maximum number of allowed aliases.
 #. TRANS: API validation exception thrown when aliases do not validate.
 #. TRANS: Client error shown when providing too many aliases during group creation.
 #. TRANS: %d is the maximum number of allowed aliases.
 #. TRANS: API validation exception thrown when aliases do not validate.


@@ -823,66 +791,25 @@ msgstr ""
 #. TRANS: %d is the maximum number of allowed aliases.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
 #. TRANS: %d is the maximum number of allowed aliases.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.

-#: actions/apigroupcreate.php:236 actions/apigroupprofileupdate.php:332
-#: actions/editgroup.php:234 actions/newgroup.php:178
+#: actions/apigroupcreate.php:170 actions/apigroupprofileupdate.php:239
+#: actions/editgroup.php:233 actions/newgroup.php:132

 #, php-format
 msgid "Too many aliases! Maximum %d allowed."
 msgid_plural "Too many aliases! Maximum %d allowed."
 msgstr[0] ""
 msgstr[1] ""
 
 #, php-format
 msgid "Too many aliases! Maximum %d allowed."
 msgid_plural "Too many aliases! Maximum %d allowed."
 msgstr[0] ""
 msgstr[1] ""
 

-#. TRANS: Client error shown when providing an invalid alias during group creation.
-#. TRANS: %s is the invalid alias.
-#. TRANS: API validation exception thrown when aliases does not validate.
-#. TRANS: %s is the invalid alias.
-#: actions/apigroupcreate.php:253 actions/apigroupprofileupdate.php:350
-#, php-format
-msgid "Invalid alias: \"%s\"."
-msgstr ""
-
-#. TRANS: Client error displayed when trying to use an alias during group creation that is already in use.
-#. TRANS: %s is the alias that is already in use.
-#. TRANS: API validation exception thrown when aliases is already used.
-#. TRANS: %s is the already used alias.
-#. TRANS: Group edit form validation error.
-#. TRANS: Group create form validation error. %s is the already used alias.
-#: actions/apigroupcreate.php:264 actions/apigroupprofileupdate.php:361
-#: actions/editgroup.php:249 actions/newgroup.php:194
-#, php-format
-msgid "Alias \"%s\" already in use. Try another one."
-msgstr ""
-
-#. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
-#. TRANS: Group edit form validation error.
-#: actions/apigroupcreate.php:278 actions/editgroup.php:256
-msgid "Alias can't be the same as nickname."
-msgstr ""
-
-#. TRANS: Client error displayed when checking group membership for a non-existing group.
-#. TRANS: Client error displayed when trying to join a group that does not exist.
-#. TRANS: Client error displayed when trying to leave a group that does not exist.
-#. TRANS: Client error displayed trying to show group membership on a non-existing group.
-#. TRANS: Client error displayed when not providing a group or an invalid group.
-#. TRANS: Client error displayed when trying to show a group that could not be found.
-#. TRANS: Client error displayed requesting most recent notices to a group for a non-existing group.
-#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
-#: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
-#: actions/apigroupprofileupdate.php:113 actions/apigroupshow.php:81
-#: actions/apitimelinegroup.php:89
-msgid "Group not found."
-msgstr ""
-

 #. TRANS: Server error displayed when trying to join a group the user is already a member of.
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
 #. TRANS: Server error displayed when trying to join a group the user is already a member of.
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown a user tries to join a group they already are a member of.

-#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:345
+#: actions/apigroupjoin.php:95 actions/joingroup.php:94 lib/command.php:296

 msgid "You are already a member of that group."
 msgstr ""
 
 #. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
 #. TRANS: Client error displayed when trying to join a group while being blocked form joining it.
 #. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
 msgid "You are already a member of that group."
 msgstr ""
 
 #. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
 #. TRANS: Client error displayed when trying to join a group while being blocked form joining it.
 #. TRANS: Error text shown when a user tries to join a group they are blocked from joining.

-#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:350
+#: actions/apigroupjoin.php:100 actions/joingroup.php:99 lib/command.php:301

 msgid "You have been blocked from that group by the admin."
 msgstr ""
 
 msgid "You have been blocked from that group by the admin."
 msgstr ""
 


@@ -890,13 +817,13 @@ msgstr ""
 #. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
 #. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.

-#: actions/apigroupjoin.php:133 actions/joingroup.php:140 lib/command.php:359
+#: actions/apigroupjoin.php:108 actions/joingroup.php:125 lib/command.php:310

 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr ""
 
 #. TRANS: Server error displayed when trying to leave a group the user is not a member of.
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr ""
 
 #. TRANS: Server error displayed when trying to leave a group the user is not a member of.

-#: actions/apigroupleave.php:115
+#: actions/apigroupleave.php:100

 msgid "You are not a member of this group."
 msgstr ""
 
 msgid "You are not a member of this group."
 msgstr ""
 


@@ -904,20 +831,20 @@ msgstr ""
 #. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
 #. TRANS: Message given having failed to remove a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
 #. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
 #. TRANS: Message given having failed to remove a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.

-#: actions/apigroupleave.php:124 actions/leavegroup.php:131
-#: lib/command.php:404
+#: actions/apigroupleave.php:108 actions/leavegroup.php:117
+#: lib/command.php:355

 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 msgstr ""
 
 #. TRANS: Used as title in check for group membership. %s is a user name.
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 msgstr ""
 
 #. TRANS: Used as title in check for group membership. %s is a user name.

-#: actions/apigrouplist.php:95
+#: actions/apigrouplist.php:91

 #, php-format
 msgid "%s's groups"
 msgstr ""
 
 #. TRANS: Used as subtitle in check for group membership. %1$s is the site name, %2$s is a user name.
 #, php-format
 msgid "%s's groups"
 msgstr ""
 
 #. TRANS: Used as subtitle in check for group membership. %1$s is the site name, %2$s is a user name.

-#: actions/apigrouplist.php:105
+#: actions/apigrouplist.php:101

 #, php-format
 msgid "%1$s groups %2$s is a member of."
 msgstr ""
 #, php-format
 msgid "%1$s groups %2$s is a member of."
 msgstr ""


@@ -925,13 +852,13 @@ msgstr ""
 #. TRANS: Message is used as a title when listing the lastest 20 groups. %s is a site name.
 #. TRANS: Page title for first page of groups for a user.
 #. TRANS: %s is a nickname.
 #. TRANS: Message is used as a title when listing the lastest 20 groups. %s is a site name.
 #. TRANS: Page title for first page of groups for a user.
 #. TRANS: %s is a nickname.

-#: actions/apigrouplistall.php:88 actions/usergroups.php:63
+#: actions/apigrouplistall.php:86 actions/usergroups.php:55

 #, php-format
 msgid "%s groups"
 msgstr ""
 
 #. TRANS: Message is used as a subtitle when listing the latest 20 groups. %s is a site name.
 #, php-format
 msgid "%s groups"
 msgstr ""
 
 #. TRANS: Message is used as a subtitle when listing the latest 20 groups. %s is a site name.

-#: actions/apigrouplistall.php:93
+#: actions/apigrouplistall.php:91

 #, php-format
 msgid "groups on %s"
 msgstr ""
 #, php-format
 msgid "groups on %s"
 msgstr ""


@@ -939,48 +866,36 @@ msgstr ""
 #. TRANS: Client error displayed when trying to edit a group without being an admin.
 #. TRANS: Client error displayed trying to edit a group while not being a group admin.
 #. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
 #. TRANS: Client error displayed when trying to edit a group without being an admin.
 #. TRANS: Client error displayed trying to edit a group while not being a group admin.
 #. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.

-#: actions/apigroupprofileupdate.php:119 actions/editgroup.php:110
-#: actions/editgroup.php:170 actions/grouplogo.php:111
+#: actions/apigroupprofileupdate.php:100 actions/editgroup.php:106
+#: actions/editgroup.php:163 actions/grouplogo.php:107

 msgid "You must be an admin to edit the group."
 msgstr ""
 
 #. TRANS: Server error displayed when group update fails.
 #. TRANS: Server error displayed when editing a group fails.
 msgid "You must be an admin to edit the group."
 msgstr ""
 
 #. TRANS: Server error displayed when group update fails.
 #. TRANS: Server error displayed when editing a group fails.

-#: actions/apigroupprofileupdate.php:173 actions/editgroup.php:279
+#: actions/apigroupprofileupdate.php:148 actions/editgroup.php:262

 msgid "Could not update group."
 msgstr ""
 
 #. TRANS: Server error displayed when adding group aliases fails.
 #. TRANS: Server error displayed when group aliases could not be added.
 #. TRANS: Server exception thrown when creating group aliases failed.
 msgid "Could not update group."
 msgstr ""
 
 #. TRANS: Server error displayed when adding group aliases fails.
 #. TRANS: Server error displayed when group aliases could not be added.
 #. TRANS: Server exception thrown when creating group aliases failed.

-#: actions/apigroupprofileupdate.php:196 actions/editgroup.php:286
-#: classes/User_group.php:624
+#: actions/apigroupprofileupdate.php:165 actions/editgroup.php:269
+#: classes/User_group.php:666

 msgid "Could not create aliases."
 msgstr ""
 
 msgid "Could not create aliases."
 msgstr ""
 

-#. TRANS: API validation exception thrown when nickname does not validate.
-#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: actions/apigroupprofileupdate.php:252 lib/nickname.php:165
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr ""
-
-#. TRANS: API validation exception thrown when alias is the same as nickname.
-#. TRANS: Group create form validation error.
-#: actions/apigroupprofileupdate.php:370 actions/newgroup.php:201
-msgid "Alias cannot be the same as nickname."
-msgstr ""
-

 #. TRANS: Client error displayed when referring to a non-existing list.
 #. TRANS: Client error displayed trying to perform an action related to a non-existing list.
 #. TRANS: Client error displayed when referring to a non-existing list.
 #. TRANS: Client error displayed when referring to a non-existing list.
 #. TRANS: Client error displayed trying to perform an action related to a non-existing list.
 #. TRANS: Client error displayed when referring to a non-existing list.

-#: actions/apilist.php:81 actions/apilistmember.php:70
-#: actions/apilistsubscriber.php:47 actions/apitimelinelist.php:95
-#: lib/apilistusers.php:67
+#: actions/apilist.php:79 actions/apilistmember.php:68
+#: actions/apilistsubscriber.php:45 actions/apitimelinelist.php:92
+#: lib/apilistusers.php:65

 msgid "List not found."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to update another user's list.
 msgid "List not found."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to update another user's list.

-#: actions/apilist.php:145
+#: actions/apilist.php:136

 msgid "You cannot update lists that do not belong to you."
 msgstr ""
 
 msgid "You cannot update lists that do not belong to you."
 msgstr ""
 


@@ -988,89 +903,84 @@ msgstr ""
 #. TRANS: Client error displayed when an unknown error occurs viewing list members.
 #. TRANS: Client error displayed when an unknown error occurs in the list subscribers action.
 #. TRANS: Client error displayed when an unknown error occurs unsubscribing from a list.
 #. TRANS: Client error displayed when an unknown error occurs viewing list members.
 #. TRANS: Client error displayed when an unknown error occurs in the list subscribers action.
 #. TRANS: Client error displayed when an unknown error occurs unsubscribing from a list.

-#: actions/apilist.php:161 actions/apilistmembers.php:70
-#: actions/apilistmembers.php:143 actions/apilistsubscribers.php:49
-#: actions/apilistsubscribers.php:96
+#: actions/apilist.php:148 actions/apilistmembers.php:59
+#: actions/apilistmembers.php:104 actions/apilistsubscribers.php:48
+#: actions/apilistsubscribers.php:79

 msgid "An error occured."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to delete another user's list.
 msgid "An error occured."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to delete another user's list.

-#: actions/apilist.php:195
+#: actions/apilist.php:173

 msgid "You cannot delete lists that do not belong to you."
 msgstr ""
 
 #. TRANS: Client error displayed when referring to a non-list member.
 msgid "You cannot delete lists that do not belong to you."
 msgstr ""
 
 #. TRANS: Client error displayed when referring to a non-list member.

-#: actions/apilistmember.php:99
+#: actions/apilistmember.php:94

 msgid "The specified user is not a member of this list."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to add members to a list without having the right to do so.
 msgid "The specified user is not a member of this list."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to add members to a list without having the right to do so.

-#: actions/apilistmembers.php:47
+#: actions/apilistmembers.php:46

 msgid "You are not allowed to add members to this list."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to modify list members without specifying them.
 msgid "You are not allowed to add members to this list."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to modify list members without specifying them.

-#: actions/apilistmembers.php:57 actions/apilistmembers.php:116
+#: actions/apilistmembers.php:51 actions/apilistmembers.php:89

 msgid "You must specify a member."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to remove members from a list without having the right to do so.
 msgid "You must specify a member."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to remove members from a list without having the right to do so.

-#: actions/apilistmembers.php:106
+#: actions/apilistmembers.php:84

 msgid "You are not allowed to remove members from this list."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to remove a list member that is not part of a list.
 msgid "You are not allowed to remove members from this list."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to remove a list member that is not part of a list.

-#: actions/apilistmembers.php:131
+#: actions/apilistmembers.php:99

 msgid "The user you are trying to remove from the list is not a member."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to create a list without a name.
 msgid "The user you are trying to remove from the list is not a member."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to create a list without a name.

-#: actions/apilists.php:139
+#: actions/apilists.php:137

 msgid "A list must have a name."
 msgstr ""
 
 #. TRANS: Client error displayed when a membership check for a user is nagative.
 msgid "A list must have a name."
 msgstr ""
 
 #. TRANS: Client error displayed when a membership check for a user is nagative.

-#: actions/apilistsubscriber.php:70
+#: actions/apilistsubscriber.php:65

 msgid "The specified user is not a subscriber of this list."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to unsubscribe from a non-subscribed list.
 msgid "The specified user is not a subscriber of this list."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to unsubscribe from a non-subscribed list.

-#: actions/apilistsubscribers.php:84
+#: actions/apilistsubscribers.php:72

 msgid "You are not subscribed to this list."
 msgstr ""
 
 msgid "You are not subscribed to this list."
 msgstr ""
 

-#. TRANS: Client error displayed when uploading a media file has failed.
-#: actions/apimediaupload.php:101
-msgid "Upload failed."
-msgstr ""
-

 #. TRANS: Client error given from the OAuth API when the request token or verifier is invalid.
 #. TRANS: Client error given from the OAuth API when the request token or verifier is invalid.

-#: actions/apioauthaccesstoken.php:102
+#: actions/apioauthaccesstoken.php:97

 msgid "Invalid request token or verifier."
 msgstr ""
 
 #. TRANS: Client error given when no oauth_token was passed to the OAuth API.
 msgid "Invalid request token or verifier."
 msgstr ""
 
 #. TRANS: Client error given when no oauth_token was passed to the OAuth API.

-#: actions/apioauthauthorize.php:107
+#: actions/apioauthauthorize.php:104

 msgid "No oauth_token parameter provided."
 msgstr ""
 
 #. TRANS: Client error given when an invalid request token was passed to the OAuth API.
 msgid "No oauth_token parameter provided."
 msgstr ""
 
 #. TRANS: Client error given when an invalid request token was passed to the OAuth API.

-#: actions/apioauthauthorize.php:115 actions/apioauthauthorize.php:129
+#: actions/apioauthauthorize.php:112 actions/apioauthauthorize.php:126

 msgid "Invalid request token."
 msgstr ""
 
 #. TRANS: Client error given when an invalid request token was passed to the OAuth API.
 msgid "Invalid request token."
 msgstr ""
 
 #. TRANS: Client error given when an invalid request token was passed to the OAuth API.

-#: actions/apioauthauthorize.php:121
+#: actions/apioauthauthorize.php:118

 msgid "Request token already authorized."
 msgstr ""
 
 #. TRANS: Form validation error given when an invalid username and/or password was passed to the OAuth API.
 msgid "Request token already authorized."
 msgstr ""
 
 #. TRANS: Form validation error given when an invalid username and/or password was passed to the OAuth API.

-#: actions/apioauthauthorize.php:168
+#: actions/apioauthauthorize.php:165

 msgid "Invalid nickname / password!"
 msgstr ""
 
 #. TRANS: Server error displayed when a database action fails.
 msgid "Invalid nickname / password!"
 msgstr ""
 
 #. TRANS: Server error displayed when a database action fails.

-#: actions/apioauthauthorize.php:211
+#: actions/apioauthauthorize.php:208

 msgid "Database error inserting oauth_token_association."
 msgstr ""
 
 msgid "Database error inserting oauth_token_association."
 msgstr ""
 


@@ -1084,27 +994,27 @@ msgstr ""
 #. TRANS: Client error when submitting a form with unexpected information.
 #. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
 #. TRANS: Message given submitting a form with an unknown action in SMS settings.
 #. TRANS: Client error when submitting a form with unexpected information.
 #. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
 #. TRANS: Message given submitting a form with an unknown action in SMS settings.

-#: actions/apioauthauthorize.php:288 actions/avatarsettings.php:297
-#: actions/editapplication.php:145 actions/emailsettings.php:312
-#: actions/grouplogo.php:332 actions/imsettings.php:259
-#: actions/newapplication.php:125 actions/oauthconnectionssettings.php:145
-#: actions/recoverpassword.php:46 actions/smssettings.php:271
+#: actions/apioauthauthorize.php:285 actions/avatarsettings.php:296
+#: actions/editapplication.php:142 actions/emailsettings.php:305
+#: actions/grouplogo.php:326 actions/imsettings.php:259
+#: actions/newapplication.php:65 actions/oauthconnectionssettings.php:144
+#: actions/recoverpassword.php:45 actions/smssettings.php:271

 msgid "Unexpected form submission."
 msgstr ""
 
 #. TRANS: Title for a page where a user can confirm/deny account access by an external application.
 msgid "Unexpected form submission."
 msgstr ""
 
 #. TRANS: Title for a page where a user can confirm/deny account access by an external application.

-#: actions/apioauthauthorize.php:357
+#: actions/apioauthauthorize.php:354

 msgid "An application would like to connect to your account"
 msgstr ""
 
 #. TRANS: Fieldset legend.
 msgid "An application would like to connect to your account"
 msgstr ""
 
 #. TRANS: Fieldset legend.

-#: actions/apioauthauthorize.php:374
+#: actions/apioauthauthorize.php:371

 msgid "Allow or deny access"
 msgstr ""
 
 #. TRANS: User notification of external application requesting account access.
 #. TRANS: %3$s is the access type requested (read-write or read-only), %4$s is the StatusNet sitename.
 msgid "Allow or deny access"
 msgstr ""
 
 #. TRANS: User notification of external application requesting account access.
 #. TRANS: %3$s is the access type requested (read-write or read-only), %4$s is the StatusNet sitename.

-#: actions/apioauthauthorize.php:395
+#: actions/apioauthauthorize.php:392

 #, php-format
 msgid ""
 "An application would like the ability to <strong>%3$s</strong> your %4$s "
 #, php-format
 msgid ""
 "An application would like the ability to <strong>%3$s</strong> your %4$s "


@@ -1115,7 +1025,7 @@ msgstr ""
 #. TRANS: User notification of external application requesting account access.
 #. TRANS: %1$s is the application name requesting access, %2$s is the organisation behind the application,
 #. TRANS: %3$s is the access type requested, %4$s is the StatusNet sitename.
 #. TRANS: User notification of external application requesting account access.
 #. TRANS: %1$s is the application name requesting access, %2$s is the organisation behind the application,
 #. TRANS: %3$s is the access type requested, %4$s is the StatusNet sitename.

-#: actions/apioauthauthorize.php:403
+#: actions/apioauthauthorize.php:400

 #, php-format
 msgid ""
 "The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
 #, php-format
 msgid ""
 "The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "


@@ -1124,7 +1034,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: Fieldset legend.
 msgstr ""
 
 #. TRANS: Fieldset legend.

-#: actions/apioauthauthorize.php:425
+#: actions/apioauthauthorize.php:422

 msgctxt "LEGEND"
 msgid "Account"
 msgstr ""
 msgctxt "LEGEND"
 msgid "Account"
 msgstr ""


@@ -1134,8 +1044,8 @@ msgstr ""
 #. TRANS: Field label on account registration page.
 #. TRANS: Field label on group edit form.
 #. TRANS: Dropdown option for searching in profiles.
 #. TRANS: Field label on account registration page.
 #. TRANS: Field label on group edit form.
 #. TRANS: Dropdown option for searching in profiles.

-#: actions/apioauthauthorize.php:429 actions/profilesettings.php:104
-#: actions/register.php:438 lib/groupeditform.php:147
+#: actions/apioauthauthorize.php:426 actions/profilesettings.php:102
+#: actions/register.php:406 lib/groupeditform.php:147

 #: lib/togglepeopletag.php:107
 msgid "Nickname"
 msgstr ""
 #: lib/togglepeopletag.php:107
 msgid "Nickname"
 msgstr ""


@@ -1143,8 +1053,8 @@ msgstr ""
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label on login page.
 #. TRANS: Field label on account registration page.
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label on login page.
 #. TRANS: Field label on account registration page.

-#: actions/apioauthauthorize.php:433 actions/login.php:235
-#: actions/register.php:444
+#: actions/apioauthauthorize.php:430 actions/login.php:181
+#: actions/register.php:412

 msgid "Password"
 msgstr ""
 
 msgid "Password"
 msgstr ""
 


@@ -1154,7 +1064,7 @@ msgstr ""
 #. TRANS: Button label to cancel an IM address confirmation procedure.
 #. TRANS: Button label to cancel a SMS address confirmation procedure.
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button label to cancel an IM address confirmation procedure.
 #. TRANS: Button label to cancel a SMS address confirmation procedure.
 #. TRANS: Button label in the "Edit application" form.

-#: actions/apioauthauthorize.php:448 actions/emailsettings.php:125
+#: actions/apioauthauthorize.php:445 actions/emailsettings.php:125

 #: actions/imsettings.php:136 actions/smssettings.php:132
 #: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 #: actions/imsettings.php:136 actions/smssettings.php:132
 #: lib/applicationeditform.php:351
 msgctxt "BUTTON"


@@ -1162,35 +1072,35 @@ msgid "Cancel"
 msgstr ""
 
 #. TRANS: Button text that when clicked will allow access to an account by an external application.
 msgstr ""
 
 #. TRANS: Button text that when clicked will allow access to an account by an external application.

-#: actions/apioauthauthorize.php:455
+#: actions/apioauthauthorize.php:452

 msgctxt "BUTTON"
 msgid "Allow"
 msgstr ""
 
 #. TRANS: Form instructions.
 msgctxt "BUTTON"
 msgid "Allow"
 msgstr ""
 
 #. TRANS: Form instructions.

-#: actions/apioauthauthorize.php:472
+#: actions/apioauthauthorize.php:469

 msgid "Authorize access to your account information."
 msgstr ""
 
 #. TRANS: Header for user notification after revoking OAuth access to an application.
 msgid "Authorize access to your account information."
 msgstr ""
 
 #. TRANS: Header for user notification after revoking OAuth access to an application.

-#: actions/apioauthauthorize.php:564
+#: actions/apioauthauthorize.php:561

 msgid "Authorization canceled."
 msgstr ""
 
 #. TRANS: User notification after revoking OAuth access to an application.
 #. TRANS: %s is an OAuth token.
 msgid "Authorization canceled."
 msgstr ""
 
 #. TRANS: User notification after revoking OAuth access to an application.
 #. TRANS: %s is an OAuth token.

-#: actions/apioauthauthorize.php:568
+#: actions/apioauthauthorize.php:565

 #, php-format
 msgid "The request token %s has been revoked."
 msgstr ""
 
 #. TRANS: Title of the page notifying the user that an anonymous client application was successfully authorized to access the user's account with OAuth.
 #, php-format
 msgid "The request token %s has been revoked."
 msgstr ""
 
 #. TRANS: Title of the page notifying the user that an anonymous client application was successfully authorized to access the user's account with OAuth.

-#: actions/apioauthauthorize.php:591
+#: actions/apioauthauthorize.php:588

 msgid "You have successfully authorized the application"
 msgstr ""
 
 #. TRANS: Message notifying the user that an anonymous client application was successfully authorized to access the user's account with OAuth.
 msgid "You have successfully authorized the application"
 msgstr ""
 
 #. TRANS: Message notifying the user that an anonymous client application was successfully authorized to access the user's account with OAuth.

-#: actions/apioauthauthorize.php:595
+#: actions/apioauthauthorize.php:592

 msgid ""
 "Please return to the application and enter the following security code to "
 "complete the process."
 msgid ""
 "Please return to the application and enter the following security code to "
 "complete the process."


@@ -1198,14 +1108,14 @@ msgstr ""
 
 #. TRANS: Title of the page notifying the user that the client application was successfully authorized to access the user's account with OAuth.
 #. TRANS: %s is the authorised application name.
 
 #. TRANS: Title of the page notifying the user that the client application was successfully authorized to access the user's account with OAuth.
 #. TRANS: %s is the authorised application name.

-#: actions/apioauthauthorize.php:602
+#: actions/apioauthauthorize.php:599

 #, php-format
 msgid "You have successfully authorized %s"
 msgstr ""
 
 #. TRANS: Message notifying the user that the client application was successfully authorized to access the user's account with OAuth.
 #. TRANS: %s is the authorised application name.
 #, php-format
 msgid "You have successfully authorized %s"
 msgstr ""
 
 #. TRANS: Message notifying the user that the client application was successfully authorized to access the user's account with OAuth.
 #. TRANS: %s is the authorised application name.

-#: actions/apioauthauthorize.php:609
+#: actions/apioauthauthorize.php:606

 #, php-format
 msgid ""
 "Please return to %s and enter the following security code to complete the "
 #, php-format
 msgid ""
 "Please return to %s and enter the following security code to complete the "


@@ -1214,59 +1124,67 @@ msgstr ""
 
 #. TRANS: Client error displayed trying to delete a status not using POST or DELETE.
 #. TRANS: POST and DELETE should not be translated.
 
 #. TRANS: Client error displayed trying to delete a status not using POST or DELETE.
 #. TRANS: POST and DELETE should not be translated.

-#: actions/apistatusesdestroy.php:111
+#: actions/apistatusesdestroy.php:109

 msgid "This method requires a POST or DELETE."
 msgstr ""
 
 msgid "This method requires a POST or DELETE."
 msgstr ""
 

+#. TRANS: Client error displayed trying to delete a status with an invalid ID.
+#: actions/apistatusesdestroy.php:119
+msgid "No status found with that ID."
+msgstr ""
+

 #. TRANS: Client error displayed trying to delete a status of another user.
 #. TRANS: Client error displayed trying to delete a status of another user.

-#: actions/apistatusesdestroy.php:136
+#: actions/apistatusesdestroy.php:134

 msgid "You may not delete another user's status."
 msgstr ""
 
 #. TRANS: Client error displayed trying to repeat a non-existing notice through the API.
 #. TRANS: Client error displayed trying to display redents of a non-exiting notice.
 msgid "You may not delete another user's status."
 msgstr ""
 
 #. TRANS: Client error displayed trying to repeat a non-existing notice through the API.
 #. TRANS: Client error displayed trying to display redents of a non-exiting notice.

-#. TRANS: Client exception thrown when referencing a non-existing notice.
+#. TRANS: Client error displayed trying to show a non-existing notice.

 #. TRANS: Error message displayed trying to delete a non-existing notice.
 #. TRANS: Client error displayed trying to show a non-existing notice.
 #. TRANS: Error message displayed trying to delete a non-existing notice.
 #. TRANS: Client error displayed trying to show a non-existing notice.

-#: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/atompubshowfavorite.php:82 actions/deletenotice.php:61
-#: actions/shownotice.php:130
+#: actions/apistatusesretweet.php:64 actions/apistatusesretweets.php:67
+#: actions/apistatusesshow.php:85 actions/deletenotice.php:61
+#: actions/shownotice.php:129

 msgid "No such notice."
 msgstr ""
 
 msgid "No such notice."
 msgstr ""
 

+#. TRANS: Client error displayed trying to show a deleted notice.
+#: actions/apistatusesshow.php:82 actions/shownotice.php:126
+msgid "Notice deleted."
+msgstr ""
+
+#. TRANS: Client exception thrown when trying a view a notice the user has no access to.
+#: actions/apistatusesshow.php:89 actions/shownotice.php:80
+msgid "Access restricted."
+msgstr ""
+

 #. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
 #. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
 #. TRANS: Client exception thrown when using an unsupported HTTP method.

-#. TRANS: Client exception thrown using an unsupported HTTP method.
-#. TRANS: Client exception thrown when using an unsupported HTTP method.
-#. TRANS: Client error shown when using a non-supported HTTP method.
-#. TRANS: Client exception thrown when using an unsupported HTTP method.
-#: actions/apistatusesshow.php:118 actions/atompubfavoritefeed.php:103
-#: actions/atompubmembershipfeed.php:105 actions/atompubshowfavorite.php:117
-#: actions/atompubshowmembership.php:116
-#: actions/atompubshowsubscription.php:122
-#: actions/atompubsubscriptionfeed.php:109
+#: actions/apistatusesshow.php:120 lib/atompubaction.php:55
+#: lib/atompubaction.php:68 lib/atompubaction.php:73 lib/atompubaction.php:78

 msgid "HTTP method not supported."
 msgstr ""
 
 #. TRANS: Exception thrown requesting an unsupported notice output format.
 #. TRANS: %s is the requested output format.
 msgid "HTTP method not supported."
 msgstr ""
 
 #. TRANS: Exception thrown requesting an unsupported notice output format.
 #. TRANS: %s is the requested output format.

-#: actions/apistatusesshow.php:144
+#: actions/apistatusesshow.php:145

 #, php-format
 msgid "Unsupported format: %s."
 msgstr ""
 
 #. TRANS: Client error displayed requesting a deleted status.
 #, php-format
 msgid "Unsupported format: %s."
 msgstr ""
 
 #. TRANS: Client error displayed requesting a deleted status.

-#: actions/apistatusesshow.php:155
+#: actions/apistatusesshow.php:156

 msgid "Status deleted."
 msgstr ""
 
 #. TRANS: Client error displayed requesting a status with an invalid ID.
 msgid "Status deleted."
 msgstr ""
 
 #. TRANS: Client error displayed requesting a status with an invalid ID.

-#: actions/apistatusesshow.php:162
+#: actions/apistatusesshow.php:163

 msgid "No status with that ID found."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to delete a notice not using the Atom format.
 msgid "No status with that ID found."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to delete a notice not using the Atom format.

-#: actions/apistatusesshow.php:227
+#: actions/apistatusesshow.php:228

 msgid "Can only delete using the Atom format."
 msgstr ""
 
 msgid "Can only delete using the Atom format."
 msgstr ""
 


@@ -1277,31 +1195,18 @@ msgid "Cannot delete this notice."
 msgstr ""
 
 #. TRANS: Confirmation of notice deletion in API. %d is the ID (number) of the deleted notice.
 msgstr ""
 
 #. TRANS: Confirmation of notice deletion in API. %d is the ID (number) of the deleted notice.

-#: actions/apistatusesshow.php:249
+#: actions/apistatusesshow.php:248

 #, php-format
 msgid "Deleted notice %d"
 msgstr ""
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
 #, php-format
 msgid "Deleted notice %d"
 msgstr ""
 
 #. TRANS: Client error displayed when the parameter "status" is missing.

-#: actions/apistatusesupdate.php:221
+#: actions/apistatusesupdate.php:206

 msgid "Client must provide a 'status' parameter with a value."
 msgstr ""
 
 msgid "Client must provide a 'status' parameter with a value."
 msgstr ""
 

-#. TRANS: Client error displayed exceeding the maximum notice length.
-#. TRANS: %d is the maximum length for a notice.
-#. TRANS: Client error displayed when the parameter "status" is missing.
-#. TRANS: %d is the maximum number of character for a notice.
-#. TRANS: Error message in incoming mail handler used when an incoming e-mail contains too many characters.
-#: actions/apistatusesupdate.php:244 actions/newnotice.php:161
-#: lib/mailhandler.php:65
-#, php-format
-msgid "That's too long. Maximum notice size is %d character."
-msgid_plural "That's too long. Maximum notice size is %d characters."
-msgstr[0] ""
-msgstr[1] ""
-

 #. TRANS: Client error displayed when replying to a non-existing notice.
 #. TRANS: Client error displayed when replying to a non-existing notice.

-#: actions/apistatusesupdate.php:284
+#: actions/apistatusesupdate.php:243

 msgid "Parent notice not found."
 msgstr ""
 
 msgid "Parent notice not found."
 msgstr ""
 


@@ -1309,7 +1214,7 @@ msgstr ""
 #. TRANS: %d is the maximum lenth for a notice.
 #. TRANS: Client error displayed exceeding the maximum notice length.
 #. TRANS: %d is the maximum length for a notice.
 #. TRANS: %d is the maximum lenth for a notice.
 #. TRANS: Client error displayed exceeding the maximum notice length.
 #. TRANS: %d is the maximum length for a notice.

-#: actions/apistatusesupdate.php:308 actions/newnotice.php:186
+#: actions/apistatusesupdate.php:265 actions/newnotice.php:149

 #, php-format
 msgid "Maximum notice size is %d character, including attachment URL."
 msgid_plural "Maximum notice size is %d characters, including attachment URL."
 #, php-format
 msgid "Maximum notice size is %d character, including attachment URL."
 msgid_plural "Maximum notice size is %d characters, including attachment URL."


@@ -1318,35 +1223,20 @@ msgstr[1] ""
 
 #. TRANS: Client error displayed when requesting profiles of followers in an unsupported format.
 #. TRANS: Client error displayed when requesting IDs of followers in an unsupported format.
 
 #. TRANS: Client error displayed when requesting profiles of followers in an unsupported format.
 #. TRANS: Client error displayed when requesting IDs of followers in an unsupported format.

-#: actions/apisubscriptions.php:228 actions/apisubscriptions.php:258
+#: actions/apisubscriptions.php:220 actions/apisubscriptions.php:250

 msgid "Unsupported format."
 msgstr ""
 
 msgid "Unsupported format."
 msgstr ""
 

-#. TRANS: Title for timeline of most recent favourite notices by a user.
-#. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname.
-#: actions/apitimelinefavorites.php:108
-#, php-format
-msgid "%1$s / Favorites from %2$s"
-msgstr ""
-
-#. TRANS: Subtitle for timeline of most recent favourite notices by a user.
-#. TRANS: %1$s is the StatusNet sitename, %2$s is a user's full name,
-#. TRANS: %3$s is a user nickname.
-#: actions/apitimelinefavorites.php:120
-#, php-format
-msgid "%1$s updates favorited by %2$s / %3$s."
-msgstr ""
-

 #. TRANS: Server error displayed whe trying to get a timeline fails.
 #. TRANS: %s is the error message.
 #. TRANS: Server error displayed whe trying to get a timeline fails.
 #. TRANS: %s is the error message.

-#: actions/apitimelinelist.php:155
+#: actions/apitimelinelist.php:151

 #, php-format
 msgid "Could not generate feed for list - %s"
 msgstr ""
 
 #. TRANS: Title for timeline of most recent mentions of a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname.
 #, php-format
 msgid "Could not generate feed for list - %s"
 msgstr ""
 
 #. TRANS: Title for timeline of most recent mentions of a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname.

-#: actions/apitimelinementions.php:115
+#: actions/apitimelinementions.php:107

 #, php-format
 msgid "%1$s / Updates mentioning %2$s"
 msgstr ""
 #, php-format
 msgid "%1$s / Updates mentioning %2$s"
 msgstr ""


@@ -1354,52 +1244,61 @@ msgstr ""
 #. TRANS: Subtitle for timeline of most recent mentions of a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname,
 #. TRANS: %3$s is a user's full name.
 #. TRANS: Subtitle for timeline of most recent mentions of a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname,
 #. TRANS: %3$s is a user's full name.

-#: actions/apitimelinementions.php:131
+#: actions/apitimelinementions.php:122
+#, php-format
+msgid "%1$s updates that reply to updates from %3$s / %2$s."
+msgstr ""
+
+#: actions/apitimelinenetworkpublic.php:9

 #, php-format
 #, php-format

-msgid "%1$s updates that reply to updates from %2$s / %3$s."
+msgid "%s network public timeline"
+msgstr ""
+
+#: actions/apitimelinenetworkpublic.php:15 actions/networkpublic.php:10
+msgid "Network wide public feed is not permitted without authorization"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Title for site timeline. %s is the StatusNet sitename.
+#. TRANS: Title for site timeline. %s is the GNU social sitename.

 #. TRANS: Public RSS feed title. %s is the StatusNet site name.
 #. TRANS: Public RSS feed title. %s is the StatusNet site name.

-#: actions/apitimelinepublic.php:193 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:182 actions/publicrss.php:103

 #, php-format
 msgid "%s public timeline"
 msgstr ""
 
 #, php-format
 msgid "%s public timeline"
 msgstr ""
 

-#. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
-#: actions/apitimelinepublic.php:199
+#. TRANS: Subtitle for site timeline. %s is the GNU social sitename.
+#: actions/apitimelinepublic.php:201

 #, php-format
 msgid "%s updates from everyone!"
 msgstr ""
 
 #. TRANS: Server error displayed calling unimplemented API method for 'retweeted by me'.
 #, php-format
 msgid "%s updates from everyone!"
 msgstr ""
 
 #. TRANS: Server error displayed calling unimplemented API method for 'retweeted by me'.

-#: actions/apitimelineretweetedbyme.php:71
+#: actions/apitimelineretweetedbyme.php:68

 msgid "Unimplemented."
 msgstr ""
 
 #. TRANS: Title for Atom feed "repeated to me". %s is the user nickname.
 msgid "Unimplemented."
 msgstr ""
 
 #. TRANS: Title for Atom feed "repeated to me". %s is the user nickname.

-#: actions/apitimelineretweetedtome.php:96
+#: actions/apitimelineretweetedtome.php:94

 #, php-format
 msgid "Repeated to %s"
 msgstr ""
 
 #. TRANS: Subtitle for API action that shows most recent notices that are repeats in user's inbox.
 #. TRANS: %1$s is the sitename, %2$s is a user nickname, %3$s is a user profile name.
 #, php-format
 msgid "Repeated to %s"
 msgstr ""
 
 #. TRANS: Subtitle for API action that shows most recent notices that are repeats in user's inbox.
 #. TRANS: %1$s is the sitename, %2$s is a user nickname, %3$s is a user profile name.

-#: actions/apitimelineretweetedtome.php:101
+#: actions/apitimelineretweetedtome.php:99

 #, php-format
 msgid "%1$s notices that were to repeated to %2$s / %3$s."
 msgstr ""
 
 #. TRANS: Title of list of repeated notices of the logged in user.
 #. TRANS: %s is the nickname of the logged in user.
 #, php-format
 msgid "%1$s notices that were to repeated to %2$s / %3$s."
 msgstr ""
 
 #. TRANS: Title of list of repeated notices of the logged in user.
 #. TRANS: %s is the nickname of the logged in user.

-#: actions/apitimelineretweetsofme.php:98
+#: actions/apitimelineretweetsofme.php:95

 #, php-format
 msgid "Repeats of %s"
 msgstr ""
 
 #. TRANS: Subtitle of API time with retweets of me.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is the user nickname, %3$s is the user profile name.
 #, php-format
 msgid "Repeats of %s"
 msgstr ""
 
 #. TRANS: Subtitle of API time with retweets of me.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is the user nickname, %3$s is the user profile name.

-#: actions/apitimelineretweetsofme.php:106
+#: actions/apitimelineretweetsofme.php:103

 #, php-format
 msgid "%1$s notices that %2$s / %3$s has repeated."
 msgstr ""
 #, php-format
 msgid "%1$s notices that %2$s / %3$s has repeated."
 msgstr ""


@@ -1408,7 +1307,7 @@ msgstr ""
 #. TRANS: %s is the tag.
 #. TRANS: Title for first page of notices with tags.
 #. TRANS: %s is the tag.
 #. TRANS: %s is the tag.
 #. TRANS: Title for first page of notices with tags.
 #. TRANS: %s is the tag.

-#: actions/apitimelinetag.php:101 actions/tag.php:65
+#: actions/apitimelinetag.php:99 actions/tag.php:64

 #, php-format
 msgid "Notices tagged with %s"
 msgstr ""
 #, php-format
 msgid "Notices tagged with %s"
 msgstr ""


@@ -1417,77 +1316,76 @@ msgstr ""
 #. TRANS: %1$s is the tag, $2$s is the StatusNet sitename.
 #. TRANS: Tag feed description.
 #. TRANS: %1$s is the tag name, %2$s is the StatusNet sitename.
 #. TRANS: %1$s is the tag, $2$s is the StatusNet sitename.
 #. TRANS: Tag feed description.
 #. TRANS: %1$s is the tag name, %2$s is the StatusNet sitename.

-#: actions/apitimelinetag.php:105 actions/tagrss.php:67
+#: actions/apitimelinetag.php:103 actions/tagrss.php:66

 #, php-format
 msgid "Updates tagged with %1$s on %2$s!"
 msgstr ""
 
 #. TRANS: Client error displayed trying to add a notice to another user's timeline.
 #, php-format
 msgid "Updates tagged with %1$s on %2$s!"
 msgstr ""
 
 #. TRANS: Client error displayed trying to add a notice to another user's timeline.

-#: actions/apitimelineuser.php:308
+#: actions/apitimelineuser.php:323

 msgid "Only the user can add to their own timeline."
 msgstr ""
 
 #. TRANS: Client error displayed when using another format than AtomPub.
 msgid "Only the user can add to their own timeline."
 msgstr ""
 
 #. TRANS: Client error displayed when using another format than AtomPub.

-#: actions/apitimelineuser.php:315
+#: actions/apitimelineuser.php:329

 msgid "Only accept AtomPub for Atom feeds."
 msgstr ""
 
 #. TRANS: Client error displayed attempting to post an empty API notice.
 msgid "Only accept AtomPub for Atom feeds."
 msgstr ""
 
 #. TRANS: Client error displayed attempting to post an empty API notice.

-#: actions/apitimelineuser.php:322
+#: actions/apitimelineuser.php:335

 msgid "Atom post must not be empty."
 msgstr ""
 
 #. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
 msgid "Atom post must not be empty."
 msgstr ""
 
 #. TRANS: Client error displayed attempting to post an API that is not well-formed XML.

-#: actions/apitimelineuser.php:331
+#: actions/apitimelineuser.php:344

 msgid "Atom post must be well-formed XML."
 msgstr ""
 
 #. TRANS: Client error displayed when not using an Atom entry.
 msgid "Atom post must be well-formed XML."
 msgstr ""
 
 #. TRANS: Client error displayed when not using an Atom entry.

-#: actions/apitimelineuser.php:337 actions/atompubfavoritefeed.php:228
-#: actions/atompubmembershipfeed.php:230
-#: actions/atompubsubscriptionfeed.php:236
+#: actions/apitimelineuser.php:350 actions/atompubmembershipfeed.php:191
+#: actions/atompubsubscriptionfeed.php:203

 msgid "Atom post must be an Atom entry."
 msgstr ""
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
 msgid "Atom post must be an Atom entry."
 msgstr ""
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.

-#: actions/apitimelineuser.php:348
+#: actions/apitimelineuser.php:360

 msgid "Can only handle POST activities."
 msgstr ""
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
 msgid "Can only handle POST activities."
 msgstr ""
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.

-#: actions/apitimelineuser.php:359
+#: actions/apitimelineuser.php:370

 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).

-#: actions/apitimelineuser.php:393
+#: actions/apitimelineuser.php:403

 #, php-format
 msgid "No content for notice %d."
 msgstr ""
 
 #. TRANS: Client error displayed when using another format than AtomPub.
 #. TRANS: %s is the notice URI.
 #, php-format
 msgid "No content for notice %d."
 msgstr ""
 
 #. TRANS: Client error displayed when using another format than AtomPub.
 #. TRANS: %s is the notice URI.

-#: actions/apitimelineuser.php:422
+#: actions/apitimelineuser.php:430

 #, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr ""
 
 #. TRANS: Server error for unfinished API method showTrends.
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr ""
 
 #. TRANS: Server error for unfinished API method showTrends.

-#: actions/apitrends.php:85
+#: actions/apitrends.php:83

 msgid "API method under construction."
 msgstr ""
 
 #. TRANS: Client error displayed when requesting user information for a non-existing user.
 msgid "API method under construction."
 msgstr ""
 
 #. TRANS: Client error displayed when requesting user information for a non-existing user.

-#: actions/apiuserprofileimage.php:80 actions/apiusershow.php:94
+#: actions/apiuserprofileimage.php:60 actions/apiusershow.php:76

 msgid "User not found."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to leave a group while not logged in.
 #: actions/approvegroup.php:59 actions/cancelgroup.php:59
 msgid "User not found."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to leave a group while not logged in.
 #: actions/approvegroup.php:59 actions/cancelgroup.php:59

-#: actions/leavegroup.php:59
+#: actions/leavegroup.php:57

 msgid "You must be logged in to leave a group."
 msgstr ""
 
 msgid "You must be logged in to leave a group."
 msgstr ""
 


@@ -1521,19 +1419,19 @@ msgstr ""
 #. TRANS: Error text shown when trying to leave a group that does not exist.
 #. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
 #. TRANS: Client error displayed if no local group with a given name was found requesting group page.
 #. TRANS: Error text shown when trying to leave a group that does not exist.
 #. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
 #. TRANS: Client error displayed if no local group with a given name was found requesting group page.

-#: actions/approvegroup.php:82 actions/approvegroup.php:95
-#: actions/atompubshowmembership.php:81 actions/blockedfromgroup.php:81
-#: actions/blockedfromgroup.php:89 actions/cancelgroup.php:81
-#: actions/cancelgroup.php:94 actions/deletegroup.php:87
-#: actions/deletegroup.php:100 actions/editgroup.php:102
-#: actions/foafgroup.php:46 actions/foafgroup.php:65 actions/foafgroup.php:73
-#: actions/groupblock.php:90 actions/groupbyid.php:83
-#: actions/grouplogo.php:103 actions/groupqueue.php:85
-#: actions/groupqueue.php:93 actions/grouprss.php:97 actions/grouprss.php:105
-#: actions/groupunblock.php:90 actions/joingroup.php:82
-#: actions/joingroup.php:95 actions/leavegroup.php:82
-#: actions/leavegroup.php:95 actions/makeadmin.php:92 lib/command.php:168
-#: lib/command.php:389 lib/groupaction.php:87 lib/groupaction.php:96
+#: actions/approvegroup.php:80 actions/approvegroup.php:91
+#: actions/atompubshowmembership.php:62 actions/blockedfromgroup.php:79
+#: actions/blockedfromgroup.php:86 actions/cancelgroup.php:79
+#: actions/cancelgroup.php:90 actions/deletegroup.php:85
+#: actions/deletegroup.php:96 actions/editgroup.php:99
+#: actions/foafgroup.php:46 actions/foafgroup.php:64 actions/foafgroup.php:71
+#: actions/groupblock.php:85 actions/groupbyid.php:82
+#: actions/grouplogo.php:100 actions/groupqueue.php:83
+#: actions/groupqueue.php:90 actions/grouprss.php:95 actions/grouprss.php:102
+#: actions/groupunblock.php:85 actions/joingroup.php:78
+#: actions/joingroup.php:89 actions/leavegroup.php:78
+#: actions/leavegroup.php:89 actions/makeadmin.php:87 lib/command.php:170
+#: lib/command.php:340 lib/groupaction.php:84 lib/groupaction.php:92

 msgid "No such group."
 msgstr ""
 
 msgid "No such group."
 msgstr ""
 


@@ -1541,29 +1439,29 @@ msgstr ""
 #. TRANS: Client error when trying to delete a group without providing a nickname or ID for the group.
 #. TRANS: Client error displayed when trying to join a group without providing a group name or group ID.
 #. TRANS: Client error displayed when trying to leave a group without providing a group name or group ID.
 #. TRANS: Client error when trying to delete a group without providing a nickname or ID for the group.
 #. TRANS: Client error displayed when trying to join a group without providing a group name or group ID.
 #. TRANS: Client error displayed when trying to leave a group without providing a group name or group ID.

-#: actions/approvegroup.php:89 actions/cancelgroup.php:88
-#: actions/deletegroup.php:94 actions/joingroup.php:89
-#: actions/leavegroup.php:89
+#: actions/approvegroup.php:86 actions/cancelgroup.php:85
+#: actions/deletegroup.php:91 actions/joingroup.php:84
+#: actions/leavegroup.php:84

 msgid "No nickname or ID."
 msgstr ""
 
 #. TRANS: Client error displayed trying to approve group membership while not logged in.
 #. TRANS: Client error displayed when trying to leave a group while not logged in.
 msgid "No nickname or ID."
 msgstr ""
 
 #. TRANS: Client error displayed trying to approve group membership while not logged in.
 #. TRANS: Client error displayed when trying to leave a group while not logged in.

-#: actions/approvegroup.php:102 actions/approvesub.php:60
-#: actions/cancelgroup.php:101
+#: actions/approvegroup.php:97 actions/approvesub.php:60
+#: actions/cancelgroup.php:96

 msgid "Must be logged in."
 msgstr ""
 
 #. TRANS: Client error displayed trying to approve group membership while not a group administrator.
 #. TRANS: Client error displayed when trying to approve or cancel a group join request without
 #. TRANS: being a group administrator.
 msgid "Must be logged in."
 msgstr ""
 
 #. TRANS: Client error displayed trying to approve group membership while not a group administrator.
 #. TRANS: Client error displayed when trying to approve or cancel a group join request without
 #. TRANS: being a group administrator.

-#: actions/approvegroup.php:110 actions/cancelgroup.php:110
+#: actions/approvegroup.php:104 actions/cancelgroup.php:104

 msgid "Only group admin can approve or cancel join requests."
 msgstr ""
 
 #. TRANS: Client error displayed trying to approve group membership without specifying a profile to approve.
 #. TRANS: Client error displayed trying to approve subscriptionswithout specifying a profile to approve.
 msgid "Only group admin can approve or cancel join requests."
 msgstr ""
 
 #. TRANS: Client error displayed trying to approve group membership without specifying a profile to approve.
 #. TRANS: Client error displayed trying to approve subscriptionswithout specifying a profile to approve.

-#: actions/approvegroup.php:115 actions/approvesub.php:67
+#: actions/approvegroup.php:108 actions/approvesub.php:66

 msgid "Must specify a profile."
 msgstr ""
 
 msgid "Must specify a profile."
 msgstr ""
 


@@ -1571,227 +1469,193 @@ msgstr ""
 #. TRANS: %s is a nickname.
 #. TRANS: Client error displayed when trying to approve a non-existing group join request.
 #. TRANS: %s is a user nickname.
 #. TRANS: %s is a nickname.
 #. TRANS: Client error displayed when trying to approve a non-existing group join request.
 #. TRANS: %s is a user nickname.

-#: actions/approvegroup.php:125 actions/cancelgroup.php:123
-#: actions/cancelsubscription.php:102
+#: actions/approvegroup.php:117 actions/cancelgroup.php:116

 #, php-format
 msgid "%s is not in the moderation queue for this group."
 msgstr ""
 
 #. TRANS: Client error displayed trying to approve/deny group membership.
 #. TRANS: Client error displayed trying to approve/deny subscription.
 #, php-format
 msgid "%s is not in the moderation queue for this group."
 msgstr ""
 
 #. TRANS: Client error displayed trying to approve/deny group membership.
 #. TRANS: Client error displayed trying to approve/deny subscription.

-#: actions/approvegroup.php:132 actions/approvesub.php:84
+#: actions/approvegroup.php:124 actions/approvesub.php:82

 msgid "Internal error: received neither cancel nor abort."
 msgstr ""
 
 #. TRANS: Client error displayed trying to approve/deny group membership.
 #. TRANS: Client error displayed trying to approve/deny  subscription
 msgid "Internal error: received neither cancel nor abort."
 msgstr ""
 
 #. TRANS: Client error displayed trying to approve/deny group membership.
 #. TRANS: Client error displayed trying to approve/deny  subscription

-#: actions/approvegroup.php:136 actions/approvesub.php:88
+#: actions/approvegroup.php:128 actions/approvesub.php:86

 msgid "Internal error: received both cancel and abort."
 msgstr ""
 
 #. TRANS: Server error displayed when cancelling a queued group join request fails.
 #. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
 msgid "Internal error: received both cancel and abort."
 msgstr ""
 
 #. TRANS: Server error displayed when cancelling a queued group join request fails.
 #. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.

-#: actions/approvegroup.php:164 actions/cancelgroup.php:147
+#: actions/approvegroup.php:156 actions/cancelgroup.php:140

 #, php-format
 msgid "Could not cancel request for user %1$s to join group %2$s."
 msgstr ""
 
 #. TRANS: Title for leave group page after group join request is approved/disapproved.
 #. TRANS: %1$s is the user nickname, %2$s is the group nickname.
 #, php-format
 msgid "Could not cancel request for user %1$s to join group %2$s."
 msgstr ""
 
 #. TRANS: Title for leave group page after group join request is approved/disapproved.
 #. TRANS: %1$s is the user nickname, %2$s is the group nickname.

-#: actions/approvegroup.php:174
+#: actions/approvegroup.php:166

 #, php-format
 msgctxt "TITLE"
 msgid "%1$s's request for %2$s"
 msgstr ""
 
 #. TRANS: Message on page for group admin after approving a join request.
 #, php-format
 msgctxt "TITLE"
 msgid "%1$s's request for %2$s"
 msgstr ""
 
 #. TRANS: Message on page for group admin after approving a join request.

-#: actions/approvegroup.php:181
+#: actions/approvegroup.php:173

 msgid "Join request approved."
 msgstr ""
 
 #. TRANS: Message on page for group admin after rejecting a join request.
 msgid "Join request approved."
 msgstr ""
 
 #. TRANS: Message on page for group admin after rejecting a join request.

-#: actions/approvegroup.php:184
+#: actions/approvegroup.php:176

 msgid "Join request canceled."
 msgstr ""
 
 #. TRANS: Client error displayed trying to approve subscription for a non-existing request.
 #. TRANS: %s is a user nickname.
 msgid "Join request canceled."
 msgstr ""
 
 #. TRANS: Client error displayed trying to approve subscription for a non-existing request.
 #. TRANS: %s is a user nickname.

-#: actions/approvesub.php:77
+#: actions/approvesub.php:75

 #, php-format
 msgid "%s is not in the moderation queue for your subscriptions."
 msgstr ""
 
 #. TRANS: Server error displayed when cancelling a queued subscription request fails.
 #. TRANS: %1$s is the leaving user's nickname, $2$s is the nickname for which the leave failed.
 #, php-format
 msgid "%s is not in the moderation queue for your subscriptions."
 msgstr ""
 
 #. TRANS: Server error displayed when cancelling a queued subscription request fails.
 #. TRANS: %1$s is the leaving user's nickname, $2$s is the nickname for which the leave failed.

-#: actions/approvesub.php:117
+#: actions/approvesub.php:115

 #, php-format
 msgid "Could not cancel or approve request for user %1$s to join group %2$s."
 msgstr ""
 
 #. TRANS: Title for subscription approval ajax return
 #. TRANS: %1$s is the approved user's nickname
 #, php-format
 msgid "Could not cancel or approve request for user %1$s to join group %2$s."
 msgstr ""
 
 #. TRANS: Title for subscription approval ajax return
 #. TRANS: %1$s is the approved user's nickname

-#: actions/approvesub.php:127
+#: actions/approvesub.php:125

 #, php-format
 msgctxt "TITLE"
 msgid "%1$s's request"
 msgstr ""
 
 #. TRANS: Message on page for user after approving a subscription request.
 #, php-format
 msgctxt "TITLE"
 msgid "%1$s's request"
 msgstr ""
 
 #. TRANS: Message on page for user after approving a subscription request.

-#: actions/approvesub.php:133
+#: actions/approvesub.php:131

 msgid "Subscription approved."
 msgstr ""
 
 #. TRANS: Message on page for user after rejecting a subscription request.
 msgid "Subscription approved."
 msgstr ""
 
 #. TRANS: Message on page for user after rejecting a subscription request.

-#: actions/approvesub.php:136
+#: actions/approvesub.php:134

 msgid "Subscription canceled."
 msgstr ""
 
 msgid "Subscription canceled."
 msgstr ""
 

-#. TRANS: Subtitle for Atom favorites feed.
-#. TRANS: %1$s is a user nickname, %2$s is the StatusNet sitename.
-#: actions/atompubfavoritefeed.php:147
-#, php-format
-msgid "Notices %1$s has favorited on %2$s"
-msgstr ""
-
-#. TRANS: Client exception thrown when trying to set a favorite for another user.
-#. TRANS: Client exception thrown when trying to subscribe another user.
-#: actions/atompubfavoritefeed.php:217 actions/atompubsubscriptionfeed.php:225
-msgid "Cannot add someone else's subscription."
-msgstr ""
-
-#. TRANS: Client exception thrown when trying use an incorrect activity verb for the Atom pub method.
-#: actions/atompubfavoritefeed.php:240
-msgid "Can only handle favorite activities."
-msgstr ""
-
-#. TRANS: Client exception thrown when trying favorite an object that is not a notice.
-#: actions/atompubfavoritefeed.php:250 actions/atompubmembershipfeed.php:249
-msgid "Can only fave notices."
-msgstr ""
-
-#. TRANS: Client exception thrown when trying favorite a notice without content.
-#: actions/atompubfavoritefeed.php:259
-msgid "Unknown notice."
-msgstr ""
-
-#. TRANS: Client exception thrown when trying favorite an already favorited notice.
-#: actions/atompubfavoritefeed.php:267
-msgid "Already a favorite."
-msgstr ""
-

 #. TRANS: Title for group membership feed.
 #. TRANS: %s is a username.
 #. TRANS: Title for group membership feed.
 #. TRANS: %s is a username.

-#: actions/atompubmembershipfeed.php:144
+#: actions/atompubmembershipfeed.php:105

 #, php-format
 msgid "Group memberships of %s"
 msgstr ""
 
 #. TRANS: Subtitle for group membership feed.
 #. TRANS: %1$s is a username, %2$s is the StatusNet sitename.
 #, php-format
 msgid "Group memberships of %s"
 msgstr ""
 
 #. TRANS: Subtitle for group membership feed.
 #. TRANS: %1$s is a username, %2$s is the StatusNet sitename.

-#: actions/atompubmembershipfeed.php:149
+#: actions/atompubmembershipfeed.php:110

 #, php-format
 msgid "Groups %1$s is a member of on %2$s"
 msgstr ""
 
 #. TRANS: Client exception thrown when trying subscribe someone else to a group.
 #, php-format
 msgid "Groups %1$s is a member of on %2$s"
 msgstr ""
 
 #. TRANS: Client exception thrown when trying subscribe someone else to a group.

-#: actions/atompubmembershipfeed.php:219
+#: actions/atompubmembershipfeed.php:180

 msgid "Cannot add someone else's membership."
 msgstr ""
 
 #. TRANS: Client error displayed when not using the join verb.
 msgid "Cannot add someone else's membership."
 msgstr ""
 
 #. TRANS: Client error displayed when not using the join verb.

-#: actions/atompubmembershipfeed.php:241
+#: actions/atompubmembershipfeed.php:202

 msgid "Can only handle join activities."
 msgstr ""
 
 msgid "Can only handle join activities."
 msgstr ""
 

+#. TRANS: Client exception thrown when trying to join something which is not a group
+#: actions/atompubmembershipfeed.php:209
+msgid "Can only join groups."
+msgstr ""
+

 #. TRANS: Client exception thrown when trying to subscribe to a non-existing group.
 #. TRANS: Client exception thrown when trying to subscribe to a non-existing group.

-#: actions/atompubmembershipfeed.php:258
+#: actions/atompubmembershipfeed.php:217

 msgid "Unknown group."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to subscribe to an already subscribed group.
 msgid "Unknown group."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to subscribe to an already subscribed group.

-#: actions/atompubmembershipfeed.php:266
+#: actions/atompubmembershipfeed.php:225

 msgid "Already a member."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to subscribe to group while blocked from that group.
 msgid "Already a member."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to subscribe to group while blocked from that group.

-#: actions/atompubmembershipfeed.php:274
+#: actions/atompubmembershipfeed.php:233

 msgid "Blocked by admin."
 msgstr ""
 
 msgid "Blocked by admin."
 msgstr ""
 

-#. TRANS: Client exception thrown when referencing a non-existing favorite.
-#: actions/atompubshowfavorite.php:90
-msgid "No such favorite."
-msgstr ""
-
-#. TRANS: Client exception thrown when trying to remove a favorite notice of another user.
-#: actions/atompubshowfavorite.php:151
-msgid "Cannot delete someone else's favorite."
-msgstr ""
-

 #. TRANS: Client exception thrown when trying to show membership of a non-subscribed group
 #. TRANS: Client exception thrown when trying to show membership of a non-subscribed group

-#: actions/atompubshowmembership.php:91
+#: actions/atompubshowmembership.php:72

 msgid "Not a member."
 msgstr ""
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
 msgid "Not a member."
 msgstr ""
 
 #. TRANS: Client exception thrown when deleting someone else's membership.

-#: actions/atompubshowmembership.php:150
+#: actions/atompubshowmembership.php:114

 msgid "Cannot delete someone else's membership."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to display a subscription for a non-existing profile ID.
 #. TRANS: %d is the non-existing profile ID number.
 msgid "Cannot delete someone else's membership."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to display a subscription for a non-existing profile ID.
 #. TRANS: %d is the non-existing profile ID number.

-#: actions/atompubshowsubscription.php:72
-#: actions/atompubshowsubscription.php:83
-#: actions/atompubsubscriptionfeed.php:74
+#: actions/atompubshowsubscription.php:58
+#: actions/atompubshowsubscription.php:69
+#: actions/atompubsubscriptionfeed.php:59

 #, php-format
 msgid "No such profile id: %d."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to display a subscription for a non-subscribed profile ID.
 #. TRANS: %1$d is the non-existing subscriber ID number, $2$d is the ID of the profile that was not subscribed to.
 #, php-format
 msgid "No such profile id: %d."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to display a subscription for a non-subscribed profile ID.
 #. TRANS: %1$d is the non-existing subscriber ID number, $2$d is the ID of the profile that was not subscribed to.

-#: actions/atompubshowsubscription.php:94
+#: actions/atompubshowsubscription.php:78

 #, php-format
 msgid "Profile %1$d not subscribed to profile %2$d."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to delete a subscription of another user.
 #, php-format
 msgid "Profile %1$d not subscribed to profile %2$d."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to delete a subscription of another user.

-#: actions/atompubshowsubscription.php:157
+#: actions/atompubshowsubscription.php:122

 msgid "Cannot delete someone else's subscription."
 msgstr ""
 
 #. TRANS: Subtitle for Atom subscription feed.
 #. TRANS: %1$s is a user nickname, %s$s is the StatusNet sitename.
 msgid "Cannot delete someone else's subscription."
 msgstr ""
 
 #. TRANS: Subtitle for Atom subscription feed.
 #. TRANS: %1$s is a user nickname, %s$s is the StatusNet sitename.

-#: actions/atompubsubscriptionfeed.php:153
+#: actions/atompubsubscriptionfeed.php:120

 #, php-format
 msgid "People %1$s has subscribed to on %2$s"
 msgstr ""
 
 #, php-format
 msgid "People %1$s has subscribed to on %2$s"
 msgstr ""
 

+#. TRANS: Client exception thrown when trying to subscribe another user.
+#: actions/atompubsubscriptionfeed.php:192
+msgid "Cannot add someone else's subscription."
+msgstr ""
+

 #. TRANS: Client error displayed when not using the follow verb.
 #. TRANS: Client error displayed when not using the follow verb.

-#: actions/atompubsubscriptionfeed.php:248
+#: actions/atompubsubscriptionfeed.php:214

 msgid "Can only handle Follow activities."
 msgstr ""
 
 #. TRANS: Client exception thrown when subscribing to an object that is not a person.
 msgid "Can only handle Follow activities."
 msgstr ""
 
 #. TRANS: Client exception thrown when subscribing to an object that is not a person.

-#: actions/atompubsubscriptionfeed.php:256
+#: actions/atompubsubscriptionfeed.php:221

 msgid "Can only follow people."
 msgstr ""
 
 #. TRANS: Client exception thrown when subscribing to a non-existing profile.
 #. TRANS: %s is the unknown profile ID.
 msgid "Can only follow people."
 msgstr ""
 
 #. TRANS: Client exception thrown when subscribing to a non-existing profile.
 #. TRANS: %s is the unknown profile ID.

-#: actions/atompubsubscriptionfeed.php:267
+#: actions/atompubsubscriptionfeed.php:230

 #, php-format
 msgid "Unknown profile %s."
 msgstr ""
 
 #. TRANS: Client error displayed trying to subscribe to an already subscribed profile.
 #. TRANS: %s is the profile the user already has a subscription on.
 #, php-format
 msgid "Unknown profile %s."
 msgstr ""
 
 #. TRANS: Client error displayed trying to subscribe to an already subscribed profile.
 #. TRANS: %s is the profile the user already has a subscription on.

-#: actions/atompubsubscriptionfeed.php:275
+#: actions/atompubsubscriptionfeed.php:237

 #, php-format
 msgid "Already subscribed to %s."
 msgstr ""
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.
 #, php-format
 msgid "Already subscribed to %s."
 msgstr ""
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.

-#: actions/attachment.php:73
+#: actions/attachment.php:69

 msgid "No such attachment."
 msgstr ""
 
 msgid "No such attachment."
 msgstr ""
 


@@ -1802,22 +1666,12 @@ msgstr ""
 #. TRANS: Client error displayed when trying to view group members without providing a group nickname.
 #. TRANS: Client error displayed when requesting a group RSS feed without providing a group nickname.
 #. TRANS: Client error displayed if no nickname argument was given requesting a group page.
 #. TRANS: Client error displayed when trying to view group members without providing a group nickname.
 #. TRANS: Client error displayed when requesting a group RSS feed without providing a group nickname.
 #. TRANS: Client error displayed if no nickname argument was given requesting a group page.

-#: actions/avatarbynickname.php:60 actions/blockedfromgroup.php:73
-#: actions/editgroup.php:85 actions/grouplogo.php:86 actions/groupqueue.php:77
-#: actions/grouprss.php:89 lib/groupaction.php:69
+#: actions/avatarbynickname.php:59 actions/blockedfromgroup.php:72
+#: actions/editgroup.php:83 actions/grouplogo.php:84 actions/groupqueue.php:76
+#: actions/grouprss.php:88 lib/groupaction.php:68

 msgid "No nickname."
 msgstr ""
 
 msgid "No nickname."
 msgstr ""
 

-#. TRANS: Client error displayed trying to get an avatar without providing an avatar size.
-#: actions/avatarbynickname.php:66
-msgid "No size."
-msgstr ""
-
-#. TRANS: Client error displayed trying to get an avatar providing an invalid avatar size.
-#: actions/avatarbynickname.php:72
-msgid "Invalid size."
-msgstr ""
-

 #. TRANS: Title for avatar upload page.
 #: actions/avatarsettings.php:66
 msgid "Avatar"
 #. TRANS: Title for avatar upload page.
 #: actions/avatarsettings.php:66
 msgid "Avatar"


@@ -1833,8 +1687,8 @@ msgstr ""
 #. TRANS: Avatar upload page form legend.
 #. TRANS: Avatar upload page crop form legend.
 #. TRANS: Legend for group logo settings fieldset.
 #. TRANS: Avatar upload page form legend.
 #. TRANS: Avatar upload page crop form legend.
 #. TRANS: Legend for group logo settings fieldset.

-#: actions/avatarsettings.php:122 actions/avatarsettings.php:207
-#: actions/grouplogo.php:261
+#: actions/avatarsettings.php:119 actions/avatarsettings.php:206
+#: actions/grouplogo.php:255

 msgid "Avatar settings"
 msgstr ""
 
 msgid "Avatar settings"
 msgstr ""
 


@@ -1842,8 +1696,8 @@ msgstr ""
 #. TRANS: Header on avatar upload crop form for thumbnail of originally uploaded avatar (h2).
 #. TRANS: Uploaded original file in group logo form.
 #. TRANS: Header for originally uploaded file before a crop on the group logo page.
 #. TRANS: Header on avatar upload crop form for thumbnail of originally uploaded avatar (h2).
 #. TRANS: Uploaded original file in group logo form.
 #. TRANS: Header for originally uploaded file before a crop on the group logo page.

-#: actions/avatarsettings.php:131 actions/avatarsettings.php:216
-#: actions/grouplogo.php:207 actions/grouplogo.php:270
+#: actions/avatarsettings.php:130 actions/avatarsettings.php:215
+#: actions/grouplogo.php:201 actions/grouplogo.php:264

 msgid "Original"
 msgstr ""
 
 msgid "Original"
 msgstr ""
 


@@ -1851,8 +1705,8 @@ msgstr ""
 #. TRANS: Header on avatar upload crop form for thumbnail of to be used rendition of uploaded avatar (h2).
 #. TRANS: Header for preview of to be displayed group logo.
 #. TRANS: Header for the cropped group logo on the group logo page.
 #. TRANS: Header on avatar upload crop form for thumbnail of to be used rendition of uploaded avatar (h2).
 #. TRANS: Header for preview of to be displayed group logo.
 #. TRANS: Header for the cropped group logo on the group logo page.

-#: actions/avatarsettings.php:147 actions/avatarsettings.php:229
-#: actions/grouplogo.php:219 actions/grouplogo.php:283
+#: actions/avatarsettings.php:147 actions/avatarsettings.php:228
+#: actions/grouplogo.php:213 actions/grouplogo.php:277

 msgid "Preview"
 msgstr ""
 
 msgid "Preview"
 msgstr ""
 


@@ -1862,7 +1716,7 @@ msgstr ""
 #. TRANS: Button text for deleting a group.
 #. TRANS: Button text to delete a list.
 #: actions/avatarsettings.php:156 actions/deleteaccount.php:319
 #. TRANS: Button text for deleting a group.
 #. TRANS: Button text to delete a list.
 #: actions/avatarsettings.php:156 actions/deleteaccount.php:319

-#: actions/showapplication.php:243 lib/deletegroupform.php:115
+#: actions/showapplication.php:239 lib/deletegroupform.php:115

 #: lib/peopletageditform.php:171
 msgctxt "BUTTON"
 msgid "Delete"
 #: lib/peopletageditform.php:171
 msgctxt "BUTTON"
 msgid "Delete"


@@ -1870,51 +1724,51 @@ msgstr ""
 
 #. TRANS: Button on avatar upload page to upload an avatar.
 #. TRANS: Submit button to confirm upload of a user backup file for account restore.
 
 #. TRANS: Button on avatar upload page to upload an avatar.
 #. TRANS: Submit button to confirm upload of a user backup file for account restore.

-#: actions/avatarsettings.php:175 actions/restoreaccount.php:369
+#: actions/avatarsettings.php:177 actions/restoreaccount.php:369

 msgctxt "BUTTON"
 msgid "Upload"
 msgstr ""
 
 #. TRANS: Button on avatar upload crop form to confirm a selected crop as avatar.
 msgctxt "BUTTON"
 msgid "Upload"
 msgstr ""
 
 #. TRANS: Button on avatar upload crop form to confirm a selected crop as avatar.

-#: actions/avatarsettings.php:245
+#: actions/avatarsettings.php:244

 msgctxt "BUTTON"
 msgid "Crop"
 msgstr ""
 
 #. TRANS: Validation error on avatar upload form when no file was uploaded.
 msgctxt "BUTTON"
 msgid "Crop"
 msgstr ""
 
 #. TRANS: Validation error on avatar upload form when no file was uploaded.

-#: actions/avatarsettings.php:321
+#: actions/avatarsettings.php:320

 msgid "No file uploaded."
 msgstr ""
 
 #. TRANS: Avatar upload form instruction after uploading a file.
 msgid "No file uploaded."
 msgstr ""
 
 #. TRANS: Avatar upload form instruction after uploading a file.

-#: actions/avatarsettings.php:348
+#: actions/avatarsettings.php:347

 msgid "Pick a square area of the image to be your avatar."
 msgstr ""
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
 #. TRANS: Server error displayed trying to crop an uploaded group logo that is no longer present.
 msgid "Pick a square area of the image to be your avatar."
 msgstr ""
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
 #. TRANS: Server error displayed trying to crop an uploaded group logo that is no longer present.

-#: actions/avatarsettings.php:363 actions/grouplogo.php:391
+#: actions/avatarsettings.php:362 actions/grouplogo.php:385

 msgid "Lost our file data."
 msgstr ""
 
 #. TRANS: Success message for having updated a user avatar.
 msgid "Lost our file data."
 msgstr ""
 
 #. TRANS: Success message for having updated a user avatar.

-#: actions/avatarsettings.php:387
+#: actions/avatarsettings.php:385

 msgid "Avatar updated."
 msgstr ""
 
 #. TRANS: Error displayed on the avatar upload page if the avatar could not be updated for an unknown reason.
 msgid "Avatar updated."
 msgstr ""
 
 #. TRANS: Error displayed on the avatar upload page if the avatar could not be updated for an unknown reason.

-#: actions/avatarsettings.php:391
+#: actions/avatarsettings.php:388

 msgid "Failed updating avatar."
 msgstr ""
 
 #. TRANS: Success message for deleting a user avatar.
 msgid "Failed updating avatar."
 msgstr ""
 
 #. TRANS: Success message for deleting a user avatar.

-#: actions/avatarsettings.php:415
+#: actions/avatarsettings.php:405

 msgid "Avatar deleted."
 msgstr ""
 
 #. TRANS: Title for backup account page.
 #. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
 msgid "Avatar deleted."
 msgstr ""
 
 #. TRANS: Title for backup account page.
 #. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.

-#: actions/backupaccount.php:61 actions/profilesettings.php:497
+#: actions/backupaccount.php:61 actions/profilesettings.php:459

 msgid "Backup account"
 msgstr ""
 
 msgid "Backup account"
 msgstr ""
 


@@ -1957,12 +1811,12 @@ msgstr ""
 #. TRANS: Title for block user page.
 #. TRANS: Legend for block user form.
 #. TRANS: Fieldset legend for block user from group form.
 #. TRANS: Title for block user page.
 #. TRANS: Legend for block user form.
 #. TRANS: Fieldset legend for block user from group form.

-#: actions/block.php:106 actions/block.php:136 actions/groupblock.php:166
+#: actions/block.php:103 actions/block.php:133 actions/groupblock.php:157

 msgid "Block user"
 msgstr ""
 
 #. TRANS: Explanation of consequences when blocking a user on the block user page.
 msgid "Block user"
 msgstr ""
 
 #. TRANS: Explanation of consequences when blocking a user on the block user page.

-#: actions/block.php:139
+#: actions/block.php:136

 msgid ""
 "Are you sure you want to block this user? Afterwards, they will be "
 "unsubscribed from you, unable to subscribe to you in the future, and you "
 msgid ""
 "Are you sure you want to block this user? Afterwards, they will be "
 "unsubscribed from you, unable to subscribe to you in the future, and you "


@@ -1975,16 +1829,16 @@ msgstr ""
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.

-#: actions/block.php:154 actions/deleteapplication.php:158
-#: actions/deletegroup.php:220 actions/deletenotice.php:155
-#: actions/deleteuser.php:154 actions/editpeopletag.php:178
-#: actions/groupblock.php:188
+#: actions/block.php:151 actions/deleteapplication.php:154
+#: actions/deletegroup.php:215 actions/deletenotice.php:155
+#: actions/deleteuser.php:154 actions/editpeopletag.php:172
+#: actions/groupblock.php:179

 msgctxt "BUTTON"
 msgid "No"
 msgstr ""
 
 #. TRANS: Submit button title for 'No' when blocking a user.
 msgctxt "BUTTON"
 msgid "No"
 msgstr ""
 
 #. TRANS: Submit button title for 'No' when blocking a user.

-#: actions/block.php:158
+#: actions/block.php:155

 msgid "Do not block this user."
 msgstr ""
 
 msgid "Do not block this user."
 msgstr ""
 


@@ -1995,183 +1849,148 @@ msgstr ""
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
 #. TRANS: Button text to repeat a notice on notice repeat form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
 #. TRANS: Button text to repeat a notice on notice repeat form.

-#: actions/block.php:161 actions/deleteapplication.php:165
-#: actions/deletegroup.php:227 actions/deletenotice.php:162
-#: actions/deleteuser.php:161 actions/editpeopletag.php:182
-#: actions/groupblock.php:195 lib/repeatform.php:126
+#: actions/block.php:158 actions/deleteapplication.php:161
+#: actions/deletegroup.php:222 actions/deletenotice.php:162
+#: actions/deleteuser.php:161 actions/editpeopletag.php:176
+#: actions/groupblock.php:186 lib/repeatform.php:115

 msgctxt "BUTTON"
 msgid "Yes"
 msgstr ""
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr ""
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.

-#: actions/block.php:165
+#: actions/block.php:162

 msgid "Block this user."
 msgstr ""
 
 #. TRANS: Server error displayed when blocking a user fails.
 msgid "Block this user."
 msgstr ""
 
 #. TRANS: Server error displayed when blocking a user fails.

-#: actions/block.php:189
+#: actions/block.php:186

 msgid "Failed to save block information."
 msgstr ""
 
 #. TRANS: Title for first page with list of users blocked from a group.
 #. TRANS: %s is a group nickname.
 msgid "Failed to save block information."
 msgstr ""
 
 #. TRANS: Title for first page with list of users blocked from a group.
 #. TRANS: %s is a group nickname.

-#: actions/blockedfromgroup.php:101
+#: actions/blockedfromgroup.php:97

 #, php-format
 msgid "%s blocked profiles"
 msgstr ""
 
 #. TRANS: Title for any but the first page with list of users blocked from a group.
 #. TRANS: %1$s is a group nickname, %2$d is a page number.
 #, php-format
 msgid "%s blocked profiles"
 msgstr ""
 
 #. TRANS: Title for any but the first page with list of users blocked from a group.
 #. TRANS: %1$s is a group nickname, %2$d is a page number.

-#: actions/blockedfromgroup.php:106
+#: actions/blockedfromgroup.php:102

 #, php-format
 msgid "%1$s blocked profiles, page %2$d"
 msgstr ""
 
 #. TRANS: Instructions for list of users blocked from a group.
 #, php-format
 msgid "%1$s blocked profiles, page %2$d"
 msgstr ""
 
 #. TRANS: Instructions for list of users blocked from a group.

-#: actions/blockedfromgroup.php:122
+#: actions/blockedfromgroup.php:118

 msgid "A list of the users blocked from joining this group."
 msgstr ""
 
 #. TRANS: Form legend for unblocking a user from a group.
 msgid "A list of the users blocked from joining this group."
 msgstr ""
 
 #. TRANS: Form legend for unblocking a user from a group.

-#: actions/blockedfromgroup.php:285
+#: actions/blockedfromgroup.php:281

 msgid "Unblock user from group"
 msgstr ""
 
 #. TRANS: Button text for unblocking a user from a group.
 msgid "Unblock user from group"
 msgstr ""
 
 #. TRANS: Button text for unblocking a user from a group.

-#: actions/blockedfromgroup.php:317
+#: actions/blockedfromgroup.php:313

 msgctxt "BUTTON"
 msgid "Unblock"
 msgstr ""
 
 #. TRANS: Tooltip for button for unblocking a user from a group.
 #. TRANS: Description of the form to unblock a user.
 msgctxt "BUTTON"
 msgid "Unblock"
 msgstr ""
 
 #. TRANS: Tooltip for button for unblocking a user from a group.
 #. TRANS: Description of the form to unblock a user.

-#: actions/blockedfromgroup.php:321 lib/unblockform.php:78
+#: actions/blockedfromgroup.php:317 lib/unblockform.php:78

 msgid "Unblock this user"
 msgstr ""
 
 msgid "Unblock this user"
 msgstr ""
 

-#. TRANS: Title for mini-posting window loaded from bookmarklet.
-#. TRANS: %s is the StatusNet site name.
-#: actions/bookmarklet.php:51
-#, php-format
-msgid "Post to %s"
-msgstr ""
-

 #. TRANS: Title for leave group page after leaving.
 #. TRANS: %s$s is the leaving user's name, %2$s is the group name.
 #. TRANS: Title for leave group page after leaving.
 #. TRANS: Title for leave group page after leaving.
 #. TRANS: %s$s is the leaving user's name, %2$s is the group name.
 #. TRANS: Title for leave group page after leaving.

-#: actions/cancelgroup.php:157 actions/leavegroup.php:140
+#: actions/cancelgroup.php:150 actions/leavegroup.php:126

 #, php-format
 msgctxt "TITLE"
 msgid "%1$s left group %2$s"
 msgstr ""
 
 #, php-format
 msgctxt "TITLE"
 msgid "%1$s left group %2$s"
 msgstr ""
 

-#. TRANS: Client error displayed when trying to leave a group without specifying an ID.
-#. TRANS: Client error displayed when trying to unsubscribe without providing a profile ID.
-#: actions/cancelsubscription.php:84 actions/unsubscribe.php:79
-msgid "No profile ID in request."
-msgstr ""
-
-#. TRANS: Client error displayed when trying to leave a non-existing group.
-#. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing profile.
-#. TRANS: Client error displayed when trying to unblock a user from a group without providing an existing profile.
-#. TRANS: Client error displayed when specifying an invalid profile ID on the Make Admin page.
-#. TRANS: Client error displayed trying a change a subscription for a non-existant profile ID.
-#. TRANS: Client error displayed when referring to non-existing profile ID.
-#. TRANS: Client error displayed when trying to unsubscribe while providing a non-existing profile ID.
-#. TRANS: Client error displayed when trying to change user options without specifying an existing user to work on.
-#: actions/cancelsubscription.php:92 actions/groupblock.php:78
-#: actions/groupunblock.php:78 actions/makeadmin.php:80 actions/subedit.php:58
-#: actions/tagprofile.php:48 actions/unsubscribe.php:87
-#: lib/profileformaction.php:87
-msgid "No profile with that ID."
-msgstr ""
-

 #. TRANS: Title after unsubscribing from a group.
 #. TRANS: Title after unsubscribing from a group.

-#: actions/cancelsubscription.php:111
+#: actions/cancelsubscription.php:77

 msgctxt "TITLE"
 msgid "Unsubscribed"
 msgstr ""
 
 #. TRANS: Client error displayed when not providing a confirmation code in the contact address confirmation action.
 msgctxt "TITLE"
 msgid "Unsubscribed"
 msgstr ""
 
 #. TRANS: Client error displayed when not providing a confirmation code in the contact address confirmation action.

-#: actions/confirmaddress.php:74
+#: actions/confirmaddress.php:73

 msgid "No confirmation code."
 msgstr ""
 
 #. TRANS: Client error displayed when providing a non-existing confirmation code in the contact address confirmation action.
 msgid "No confirmation code."
 msgstr ""
 
 #. TRANS: Client error displayed when providing a non-existing confirmation code in the contact address confirmation action.

-#: actions/confirmaddress.php:80
+#: actions/confirmaddress.php:78

 msgid "Confirmation code not found."
 msgstr ""
 
 #. TRANS: Client error displayed when not providing a confirmation code for another user in the contact address confirmation action.
 msgid "Confirmation code not found."
 msgstr ""
 
 #. TRANS: Client error displayed when not providing a confirmation code for another user in the contact address confirmation action.

-#: actions/confirmaddress.php:86
+#: actions/confirmaddress.php:83

 msgid "That confirmation code is not for you!"
 msgstr ""
 
 #. TRANS: Server error for an unknown address type, which can be 'email', 'sms', or the name of an IM network (such as 'xmpp' or 'aim')
 msgid "That confirmation code is not for you!"
 msgstr ""
 
 #. TRANS: Server error for an unknown address type, which can be 'email', 'sms', or the name of an IM network (such as 'xmpp' or 'aim')

-#: actions/confirmaddress.php:94
+#: actions/confirmaddress.php:90

 #, php-format
 msgid "Unrecognized address type %s"
 msgstr ""
 
 #. TRANS: Client error for an already confirmed email/jabber/sms address.
 #. TRANS: Client error for an already confirmed IM address.
 #, php-format
 msgid "Unrecognized address type %s"
 msgstr ""
 
 #. TRANS: Client error for an already confirmed email/jabber/sms address.
 #. TRANS: Client error for an already confirmed IM address.

-#: actions/confirmaddress.php:103 actions/confirmaddress.php:138
+#: actions/confirmaddress.php:98 actions/confirmaddress.php:126

 msgid "That address has already been confirmed."
 msgstr ""
 
 #. TRANS: Server error displayed when updating IM preferences fails.
 #. TRANS: Server error thrown on database error removing a registered IM address.
 msgid "That address has already been confirmed."
 msgstr ""
 
 #. TRANS: Server error displayed when updating IM preferences fails.
 #. TRANS: Server error thrown on database error removing a registered IM address.

-#: actions/confirmaddress.php:147 actions/imsettings.php:447
+#: actions/confirmaddress.php:134 actions/imsettings.php:444

 msgid "Could not update user IM preferences."
 msgstr ""
 
 #. TRANS: Server error displayed when adding IM preferences fails.
 msgid "Could not update user IM preferences."
 msgstr ""
 
 #. TRANS: Server error displayed when adding IM preferences fails.

-#: actions/confirmaddress.php:160
+#: actions/confirmaddress.php:146

 msgid "Could not insert user IM preferences."
 msgstr ""
 
 #. TRANS: Server error displayed when an address confirmation code deletion from the
 #. TRANS: database fails in the contact address confirmation action.
 msgid "Could not insert user IM preferences."
 msgstr ""
 
 #. TRANS: Server error displayed when an address confirmation code deletion from the
 #. TRANS: database fails in the contact address confirmation action.

-#: actions/confirmaddress.php:173
+#: actions/confirmaddress.php:158

 msgid "Could not delete address confirmation."
 msgstr ""
 
 #. TRANS: Title for the contact address confirmation action.
 msgid "Could not delete address confirmation."
 msgstr ""
 
 #. TRANS: Title for the contact address confirmation action.

-#: actions/confirmaddress.php:189
+#: actions/confirmaddress.php:173

 msgid "Confirm address"
 msgstr ""
 
 #. TRANS: Success message for the contact address confirmation action.
 #. TRANS: %s can be 'email', 'jabber', or 'sms'.
 msgid "Confirm address"
 msgstr ""
 
 #. TRANS: Success message for the contact address confirmation action.
 #. TRANS: %s can be 'email', 'jabber', or 'sms'.

-#: actions/confirmaddress.php:204
+#: actions/confirmaddress.php:188

 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr ""
 
 #. TRANS: Title for page with a conversion (multiple notices in context).
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr ""
 
 #. TRANS: Title for page with a conversion (multiple notices in context).

-#: actions/conversation.php:113
+#: actions/conversation.php:80

 msgid "Conversation"
 msgstr ""
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
 msgid "Conversation"
 msgstr ""
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.

-#: actions/conversation.php:152 actions/conversation.php:168
+#: actions/conversation.php:115 actions/conversation.php:131

 msgid "Conversation feed (Activity Streams JSON)"
 msgstr ""
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
 msgid "Conversation feed (Activity Streams JSON)"
 msgstr ""
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.

-#: actions/conversation.php:160
+#: actions/conversation.php:123

 msgid "Conversation feed (RSS 2.0)"
 msgstr ""
 
 msgid "Conversation feed (RSS 2.0)"
 msgstr ""
 

-#. TRANS: Title for conversation page.
-#. TRANS: Title for page that shows a notice.
-#: actions/conversationreplies.php:81 actions/shownotice.php:258
-msgctxt "TITLE"
-msgid "Notice"
-msgstr ""
-

 #. TRANS: Client exception displayed trying to delete a user account while not logged in.
 #: actions/deleteaccount.php:71
 msgid "Only logged-in users can delete their account."
 #. TRANS: Client exception displayed trying to delete a user account while not logged in.
 #: actions/deleteaccount.php:71
 msgid "Only logged-in users can delete their account."


@@ -2201,7 +2020,7 @@ msgstr ""
 
 #. TRANS: Page title for page on which a user account can be deleted.
 #. TRANS: Option in profile settings to delete the account of the currently logged in user.
 
 #. TRANS: Page title for page on which a user account can be deleted.
 #. TRANS: Option in profile settings to delete the account of the currently logged in user.

-#: actions/deleteaccount.php:228 actions/profilesettings.php:505
+#: actions/deleteaccount.php:228 actions/profilesettings.php:467

 msgid "Delete account"
 msgstr ""
 
 msgid "Delete account"
 msgstr ""
 


@@ -2223,7 +2042,7 @@ msgstr ""
 
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
 
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.

-#: actions/deleteaccount.php:300 actions/recoverpassword.php:262
+#: actions/deleteaccount.php:300 actions/recoverpassword.php:251

 msgid "Confirm"
 msgstr ""
 
 msgid "Confirm"
 msgstr ""
 


@@ -2245,34 +2064,33 @@ msgid "You must be logged in to delete an application."
 msgstr ""
 
 #. TRANS: Client error displayed trying to delete an application that does not exist.
 msgstr ""
 
 #. TRANS: Client error displayed trying to delete an application that does not exist.

-#: actions/deleteapplication.php:71
+#: actions/deleteapplication.php:70

 msgid "Application not found."
 msgstr ""
 
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
 #. TRANS: Client error displayed trying to display an OAuth application for which the logged in user is not the owner.
 msgid "Application not found."
 msgstr ""
 
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
 #. TRANS: Client error displayed trying to display an OAuth application for which the logged in user is not the owner.

-#: actions/deleteapplication.php:79 actions/editapplication.php:78
-#: actions/showapplication.php:93
+#: actions/deleteapplication.php:77 actions/editapplication.php:77
+#: actions/showapplication.php:91

 msgid "You are not the owner of this application."
 msgstr ""
 
 #. TRANS: Client error displayed when the session token does not match or is not given.
 #. TRANS: Client error text when there is a problem with the session token.
 msgid "You are not the owner of this application."
 msgstr ""
 
 #. TRANS: Client error displayed when the session token does not match or is not given.
 #. TRANS: Client error text when there is a problem with the session token.

-#: actions/deleteapplication.php:103 actions/editapplication.php:132
-#: actions/newapplication.php:113 actions/showapplication.php:117
-#: lib/action.php:1473
+#: actions/deleteapplication.php:100 actions/editapplication.php:130
+#: actions/showapplication.php:114 lib/action.php:1659

 msgid "There was a problem with your session token."
 msgstr ""
 
 #. TRANS: Title for delete application page.
 #. TRANS: Fieldset legend on delete application page.
 msgid "There was a problem with your session token."
 msgstr ""
 
 #. TRANS: Title for delete application page.
 #. TRANS: Fieldset legend on delete application page.

-#: actions/deleteapplication.php:125 actions/deleteapplication.php:150
+#: actions/deleteapplication.php:121 actions/deleteapplication.php:146

 msgid "Delete application"
 msgstr ""
 
 #. TRANS: Confirmation text on delete application page.
 msgid "Delete application"
 msgstr ""
 
 #. TRANS: Confirmation text on delete application page.

-#: actions/deleteapplication.php:153
+#: actions/deleteapplication.php:149

 msgid ""
 "Are you sure you want to delete this application? This will clear all data "
 "about the application from the database, including all existing user "
 msgid ""
 "Are you sure you want to delete this application? This will clear all data "
 "about the application from the database, including all existing user "


@@ -2280,12 +2098,12 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting an application.
 msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting an application.

-#: actions/deleteapplication.php:162
+#: actions/deleteapplication.php:158

 msgid "Do not delete this application."
 msgstr ""
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
 msgid "Do not delete this application."
 msgstr ""
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.

-#: actions/deleteapplication.php:168
+#: actions/deleteapplication.php:164

 msgid "Delete this application."
 msgstr ""
 
 msgid "Delete this application."
 msgstr ""
 


@@ -2295,32 +2113,32 @@ msgid "You must be logged in to delete a group."
 msgstr ""
 
 #. TRANS: Client error when trying to delete a group without having the rights to delete it.
 msgstr ""
 
 #. TRANS: Client error when trying to delete a group without having the rights to delete it.

-#: actions/deletegroup.php:107
+#: actions/deletegroup.php:102

 msgid "You are not allowed to delete this group."
 msgstr ""
 
 #. TRANS: Server error displayed if a group could not be deleted.
 #. TRANS: %s is the name of the group that could not be deleted.
 msgid "You are not allowed to delete this group."
 msgstr ""
 
 #. TRANS: Server error displayed if a group could not be deleted.
 #. TRANS: %s is the name of the group that could not be deleted.

-#: actions/deletegroup.php:150
+#: actions/deletegroup.php:144

 #, php-format
 msgid "Could not delete group %s."
 msgstr ""
 
 #. TRANS: Message given after deleting a group.
 #. TRANS: %s is the deleted group's name.
 #, php-format
 msgid "Could not delete group %s."
 msgstr ""
 
 #. TRANS: Message given after deleting a group.
 #. TRANS: %s is the deleted group's name.

-#: actions/deletegroup.php:159
+#: actions/deletegroup.php:153

 #, php-format
 msgid "Deleted group %s"
 msgstr ""
 
 #. TRANS: Title of delete group page.
 #. TRANS: Form legend for deleting a group.
 #, php-format
 msgid "Deleted group %s"
 msgstr ""
 
 #. TRANS: Title of delete group page.
 #. TRANS: Form legend for deleting a group.

-#: actions/deletegroup.php:176 actions/deletegroup.php:202
+#: actions/deletegroup.php:169 actions/deletegroup.php:197

 msgid "Delete group"
 msgstr ""
 
 #. TRANS: Warning in form for deleleting a group.
 msgid "Delete group"
 msgstr ""
 
 #. TRANS: Warning in form for deleleting a group.

-#: actions/deletegroup.php:206
+#: actions/deletegroup.php:201

 msgid ""
 "Are you sure you want to delete this group? This will clear all data about "
 "the group from the database, without a backup. Public posts to this group "
 msgid ""
 "Are you sure you want to delete this group? This will clear all data about "
 "the group from the database, without a backup. Public posts to this group "


@@ -2328,12 +2146,12 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting a group.
 msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting a group.

-#: actions/deletegroup.php:224
+#: actions/deletegroup.php:219

 msgid "Do not delete this group."
 msgstr ""
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
 msgid "Do not delete this group."
 msgstr ""
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.

-#: actions/deletegroup.php:231
+#: actions/deletegroup.php:226

 msgid "Delete this group."
 msgstr ""
 
 msgid "Delete this group."
 msgstr ""
 


@@ -2371,7 +2189,7 @@ msgid "You cannot delete users."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to delete a non-local user.
 msgstr ""
 
 #. TRANS: Client error displayed when trying to delete a non-local user.

-#: actions/deleteuser.php:74
+#: actions/deleteuser.php:73

 msgid "You can only delete local users."
 msgstr ""
 
 msgid "You can only delete local users."
 msgstr ""
 


@@ -2403,16 +2221,6 @@ msgstr ""
 msgid "Delete this user."
 msgstr ""
 
 msgid "Delete this user."
 msgstr ""
 

-#. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
-#: actions/disfavor.php:83
-msgid "This notice is not a favorite!"
-msgstr ""
-
-#. TRANS: Title for page on which favorites can be added.
-#: actions/disfavor.php:98
-msgid "Add to favorites"
-msgstr ""
-

 #. TRANS: Client exception thrown when requesting a document from the documentation that does not exist.
 #. TRANS: %s is the non-existing document.
 #: actions/doc.php:157
 #. TRANS: Client exception thrown when requesting a document from the documentation that does not exist.
 #. TRANS: %s is the non-existing document.
 #: actions/doc.php:157


@@ -2424,7 +2232,7 @@ msgstr ""
 #. TRANS: Menu item in default local navigation panel.
 #. TRANS: Menu item in personal group navigation menu.
 #: actions/doc.php:178 lib/adminpanelnav.php:71 lib/defaultlocalnav.php:60
 #. TRANS: Menu item in default local navigation panel.
 #. TRANS: Menu item in personal group navigation menu.
 #: actions/doc.php:178 lib/adminpanelnav.php:71 lib/defaultlocalnav.php:60

-#: lib/homestubnav.php:55 lib/personalgroupnav.php:74 lib/settingsnav.php:63
+#: lib/homestubnav.php:55 lib/personalgroupnav.php:77 lib/settingsnav.php:63

 msgctxt "MENU"
 msgid "Home"
 msgstr ""
 msgctxt "MENU"
 msgid "Home"
 msgstr ""


@@ -2487,8 +2295,8 @@ msgstr ""
 #. TRANS: Menu item in default local navigation panel.
 #. TRANS: Menu item in search group navigation panel.
 #. TRANS: Menu item in local navigation menu.
 #. TRANS: Menu item in default local navigation panel.
 #. TRANS: Menu item in search group navigation panel.
 #. TRANS: Menu item in local navigation menu.

-#: actions/doc.php:220 lib/defaultlocalnav.php:71 lib/publicgroupnav.php:73
-#: lib/searchgroupnav.php:82 lib/subgroupnav.php:124
+#: actions/doc.php:220 lib/defaultlocalnav.php:71 lib/publicgroupnav.php:69
+#: lib/searchgroupnav.php:82 lib/subgroupnav.php:125

 msgctxt "MENU"
 msgid "Groups"
 msgstr ""
 msgctxt "MENU"
 msgid "Groups"
 msgstr ""


@@ -2519,81 +2327,81 @@ msgstr ""
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.
 #. TRANS: Client error displayed trying to display a non-existing OAuth application.
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.
 #. TRANS: Client error displayed trying to display a non-existing OAuth application.

-#: actions/editapplication.php:83 actions/showapplication.php:85
+#: actions/editapplication.php:82 actions/showapplication.php:84

 msgid "No such application."
 msgstr ""
 
 #. TRANS: Instructions for "Edit application" form.
 msgid "No such application."
 msgstr ""
 
 #. TRANS: Instructions for "Edit application" form.

-#: actions/editapplication.php:168
+#: actions/editapplication.php:165

 msgid "Use this form to edit your application."
 msgstr ""
 
 #. TRANS: Validation error shown when not providing a name in the "Edit application" form.
 #. TRANS: Validation error shown when not providing a name in the "New application" form.
 msgid "Use this form to edit your application."
 msgstr ""
 
 #. TRANS: Validation error shown when not providing a name in the "Edit application" form.
 #. TRANS: Validation error shown when not providing a name in the "New application" form.

-#: actions/editapplication.php:185 actions/newapplication.php:165
+#: actions/editapplication.php:182 actions/newapplication.php:104

 msgid "Name is required."
 msgstr ""
 
 #. TRANS: Validation error shown when providing too long a name in the "Edit application" form.
 #. TRANS: Validation error shown when providing too long a name in the "New application" form.
 msgid "Name is required."
 msgstr ""
 
 #. TRANS: Validation error shown when providing too long a name in the "Edit application" form.
 #. TRANS: Validation error shown when providing too long a name in the "New application" form.

-#: actions/editapplication.php:189 actions/newapplication.php:173
+#: actions/editapplication.php:186 actions/newapplication.php:110

 msgid "Name is too long (maximum 255 characters)."
 msgstr ""
 
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "Edit application" form.
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "New application" form.
 msgid "Name is too long (maximum 255 characters)."
 msgstr ""
 
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "Edit application" form.
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "New application" form.

-#: actions/editapplication.php:193 actions/newapplication.php:169
+#: actions/editapplication.php:190 actions/newapplication.php:107

 msgid "Name already in use. Try another one."
 msgstr ""
 
 #. TRANS: Validation error shown when not providing a description in the "Edit application" form.
 #. TRANS: Validation error shown when not providing a description in the "New application" form.
 msgid "Name already in use. Try another one."
 msgstr ""
 
 #. TRANS: Validation error shown when not providing a description in the "Edit application" form.
 #. TRANS: Validation error shown when not providing a description in the "New application" form.

-#: actions/editapplication.php:197 actions/newapplication.php:177
+#: actions/editapplication.php:194 actions/newapplication.php:113

 msgid "Description is required."
 msgstr ""
 
 #. TRANS: Validation error shown when providing too long a source URL in the "Edit application" form.
 msgid "Description is required."
 msgstr ""
 
 #. TRANS: Validation error shown when providing too long a source URL in the "Edit application" form.

-#: actions/editapplication.php:210
+#: actions/editapplication.php:207

 msgid "Source URL is too long."
 msgstr ""
 
 #. TRANS: Validation error shown when providing an invalid source URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing an invalid source URL in the "New application" form.
 msgid "Source URL is too long."
 msgstr ""
 
 #. TRANS: Validation error shown when providing an invalid source URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing an invalid source URL in the "New application" form.

-#: actions/editapplication.php:217 actions/newapplication.php:200
+#: actions/editapplication.php:212 actions/newapplication.php:127

 msgid "Source URL is not valid."
 msgstr ""
 
 #. TRANS: Validation error shown when not providing an organisation in the "Edit application" form.
 #. TRANS: Validation error shown when not providing an organisation in the "New application" form.
 msgid "Source URL is not valid."
 msgstr ""
 
 #. TRANS: Validation error shown when not providing an organisation in the "Edit application" form.
 #. TRANS: Validation error shown when not providing an organisation in the "New application" form.

-#: actions/editapplication.php:221 actions/newapplication.php:204
+#: actions/editapplication.php:216 actions/newapplication.php:130

 msgid "Organization is required."
 msgstr ""
 
 #. TRANS: Validation error shown when providing too long an arganisation name in the "Edit application" form.
 msgid "Organization is required."
 msgstr ""
 
 #. TRANS: Validation error shown when providing too long an arganisation name in the "Edit application" form.

-#: actions/editapplication.php:225 actions/newapplication.php:208
+#: actions/editapplication.php:220 actions/newapplication.php:133

 msgid "Organization is too long (maximum 255 characters)."
 msgstr ""
 
 #. TRANS: Form validation error show when an organisation name has not been provided in the edit application form.
 #. TRANS: Form validation error show when an organisation name has not been provided in the new application form.
 msgid "Organization is too long (maximum 255 characters)."
 msgstr ""
 
 #. TRANS: Form validation error show when an organisation name has not been provided in the edit application form.
 #. TRANS: Form validation error show when an organisation name has not been provided in the new application form.

-#: actions/editapplication.php:229 actions/newapplication.php:212
+#: actions/editapplication.php:224 actions/newapplication.php:136

 msgid "Organization homepage is required."
 msgstr ""
 
 #. TRANS: Validation error shown when providing too long a callback URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing too long a callback URL in the "New application" form.
 msgid "Organization homepage is required."
 msgstr ""
 
 #. TRANS: Validation error shown when providing too long a callback URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing too long a callback URL in the "New application" form.

-#: actions/editapplication.php:240 actions/newapplication.php:226
+#: actions/editapplication.php:233 actions/newapplication.php:142

 msgid "Callback is too long."
 msgstr ""
 
 #. TRANS: Validation error shown when providing an invalid callback URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing an invalid callback URL in the "New application" form.
 msgid "Callback is too long."
 msgstr ""
 
 #. TRANS: Validation error shown when providing an invalid callback URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing an invalid callback URL in the "New application" form.

-#: actions/editapplication.php:248 actions/newapplication.php:236
+#: actions/editapplication.php:238 actions/newapplication.php:145

 msgid "Callback URL is not valid."
 msgstr ""
 
 #. TRANS: Server error occuring when an application could not be updated from the "Edit application" form.
 msgid "Callback URL is not valid."
 msgstr ""
 
 #. TRANS: Server error occuring when an application could not be updated from the "Edit application" form.

-#: actions/editapplication.php:285
+#: actions/editapplication.php:275

 msgid "Could not update application."
 msgstr ""
 
 msgid "Could not update application."
 msgstr ""
 


@@ -2605,27 +2413,18 @@ msgstr ""
 
 #. TRANS: Client error displayed trying to edit a group while not logged in.
 #. TRANS: Client error displayed when trying to create a group while not logged in.
 
 #. TRANS: Client error displayed trying to edit a group while not logged in.
 #. TRANS: Client error displayed when trying to create a group while not logged in.

-#. TRANS: Client error displayed trying to create a group while not logged in.
-#: actions/editgroup.php:68 actions/grouplogo.php:69 actions/newgroup.php:65
+#: actions/editgroup.php:68 actions/grouplogo.php:69

 msgid "You must be logged in to create a group."
 msgstr ""
 
 #. TRANS: Form instructions for group edit form.
 msgid "You must be logged in to create a group."
 msgstr ""
 
 #. TRANS: Form instructions for group edit form.

-#: actions/editgroup.php:155
+#: actions/editgroup.php:148

 msgid "Use this form to edit the group."
 msgstr ""
 
 msgid "Use this form to edit the group."
 msgstr ""
 

-#. TRANS: Group edit form validation error.
-#. TRANS: Group create form validation error.
-#. TRANS: %s is the invalid alias.
-#: actions/editgroup.php:244 actions/newgroup.php:189
-#, php-format
-msgid "Invalid alias: \"%s\""
-msgstr ""
-

 #. TRANS: Group edit form success message.
 #. TRANS: Edit list form success message.
 #. TRANS: Group edit form success message.
 #. TRANS: Edit list form success message.

-#: actions/editgroup.php:306 actions/editpeopletag.php:326
+#: actions/editgroup.php:281 actions/editpeopletag.php:319

 msgid "Options saved."
 msgstr ""
 
 msgid "Options saved."
 msgstr ""
 


@@ -2646,58 +2445,58 @@ msgid "Edit list %s"
 msgstr ""
 
 #. TRANS: Error message displayed when trying to perform an action that requires a tagging user or ID.
 msgstr ""
 
 #. TRANS: Error message displayed when trying to perform an action that requires a tagging user or ID.

-#: actions/editpeopletag.php:103
+#: actions/editpeopletag.php:101

 msgid "No tagger or ID."
 msgstr ""
 
 #. TRANS: Client error displayed when referring to non-local user.
 msgid "No tagger or ID."
 msgstr ""
 
 #. TRANS: Client error displayed when referring to non-local user.

-#: actions/editpeopletag.php:120
+#: actions/editpeopletag.php:116

 msgid "Not a local user."
 msgstr ""
 
 #. TRANS: Client error displayed when reting to edit a tag that was not self-created.
 msgid "Not a local user."
 msgstr ""
 
 #. TRANS: Client error displayed when reting to edit a tag that was not self-created.

-#: actions/editpeopletag.php:126
+#: actions/editpeopletag.php:121

 msgid "You must be the creator of the tag to edit it."
 msgstr ""
 
 #. TRANS: Form instruction for edit list form.
 msgid "You must be the creator of the tag to edit it."
 msgstr ""
 
 #. TRANS: Form instruction for edit list form.

-#: actions/editpeopletag.php:223
+#: actions/editpeopletag.php:217

 msgid "Use this form to edit the list."
 msgstr ""
 
 #. TRANS: Form validation error displayed if the form data for deleting a tag was incorrect.
 msgid "Use this form to edit the list."
 msgstr ""
 
 #. TRANS: Form validation error displayed if the form data for deleting a tag was incorrect.

-#: actions/editpeopletag.php:244
+#: actions/editpeopletag.php:238

 msgid "Delete aborted."
 msgstr ""
 
 #. TRANS: Text in confirmation dialog for deleting a tag.
 msgid "Delete aborted."
 msgstr ""
 
 #. TRANS: Text in confirmation dialog for deleting a tag.

-#: actions/editpeopletag.php:252
+#: actions/editpeopletag.php:246

 msgid ""
 "Deleting this tag will permanantly remove all its subscription and "
 "membership records. Do you still want to continue?"
 msgstr ""
 
 #. TRANS: Form validation error displayed if a given tag is invalid.
 msgid ""
 "Deleting this tag will permanantly remove all its subscription and "
 "membership records. Do you still want to continue?"
 msgstr ""
 
 #. TRANS: Form validation error displayed if a given tag is invalid.

-#: actions/editpeopletag.php:258
+#: actions/editpeopletag.php:252

 msgid "Invalid tag."
 msgstr ""
 
 #. TRANS: Form validation error displayed if a given tag is already present.
 #. TRANS: %s is the already present tag.
 msgid "Invalid tag."
 msgstr ""
 
 #. TRANS: Form validation error displayed if a given tag is already present.
 #. TRANS: %s is the already present tag.

-#: actions/editpeopletag.php:263
+#: actions/editpeopletag.php:257

 #, php-format
 msgid "You already have a tag named %s."
 msgstr ""
 
 #. TRANS: Text in confirmation dialog for setting a tag from public to private.
 #, php-format
 msgid "You already have a tag named %s."
 msgstr ""
 
 #. TRANS: Text in confirmation dialog for setting a tag from public to private.

-#: actions/editpeopletag.php:280
+#: actions/editpeopletag.php:274

 msgid ""
 "Setting a public tag as private will permanently remove all the existing "
 "subscriptions to it. Do you still want to continue?"
 msgstr ""
 
 #. TRANS: Server error displayed when updating a list fails.
 msgid ""
 "Setting a public tag as private will permanently remove all the existing "
 "subscriptions to it. Do you still want to continue?"
 msgstr ""
 
 #. TRANS: Server error displayed when updating a list fails.

-#: actions/editpeopletag.php:301
+#: actions/editpeopletag.php:303

 msgid "Could not update list."
 msgstr ""
 
 msgid "Could not update list."
 msgstr ""
 


@@ -2812,72 +2611,59 @@ msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
 #: actions/emailsettings.php:219
 
 #. TRANS: Checkbox label in e-mail preferences form.
 #: actions/emailsettings.php:219

-msgid "Send me email when someone adds my notice as a favorite."
-msgstr ""
-
-#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:226

 msgid "Send me email when someone sends me a private message."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
 msgid "Send me email when someone sends me a private message."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.

-#: actions/emailsettings.php:232
+#: actions/emailsettings.php:225

 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.

-#: actions/emailsettings.php:238
+#: actions/emailsettings.php:231

 msgid "Allow friends to nudge me and send me an email."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
 msgid "Allow friends to nudge me and send me an email."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.

-#: actions/emailsettings.php:244
+#: actions/emailsettings.php:237

 msgid "Publish a MicroID for my email address."
 msgstr ""
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
 msgid "Publish a MicroID for my email address."
 msgstr ""
 
 #. TRANS: Confirmation message for successful e-mail preferences save.

-#: actions/emailsettings.php:362
+#: actions/emailsettings.php:352

 msgid "Email preferences saved."
 msgstr ""
 
 #. TRANS: Message given saving e-mail address without having provided one.
 msgid "Email preferences saved."
 msgstr ""
 
 #. TRANS: Message given saving e-mail address without having provided one.

-#: actions/emailsettings.php:381
+#: actions/emailsettings.php:371

 msgid "No email address."
 msgstr ""
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
 msgid "No email address."
 msgstr ""
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.

-#: actions/emailsettings.php:389
+#: actions/emailsettings.php:379

 msgid "Cannot normalize that email address."
 msgstr ""
 
 msgid "Cannot normalize that email address."
 msgstr ""
 

-#. TRANS: Message given saving e-mail address that not valid.
-#. TRANS: Form validation error displayed when trying to register without a valid e-mail address.
-#. TRANS: Client error displayed trying to save site settings without a valid contact address.
-#: actions/emailsettings.php:394 actions/register.php:207
-#: actions/siteadminpanel.php:154
-msgid "Not a valid email address."
-msgstr ""
-

 #. TRANS: Message given saving e-mail address that is already set.
 #. TRANS: Message given saving e-mail address that is already set.

-#: actions/emailsettings.php:398
+#: actions/emailsettings.php:388

 msgid "That is already your email address."
 msgstr ""
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
 msgid "That is already your email address."
 msgstr ""
 
 #. TRANS: Message given saving e-mail address that is already set for another user.

-#: actions/emailsettings.php:402
+#: actions/emailsettings.php:392

 msgid "That email address already belongs to another user."
 msgstr ""
 
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
 #. TRANS: Server error thrown on database error adding Instant Messaging confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
 msgid "That email address already belongs to another user."
 msgstr ""
 
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
 #. TRANS: Server error thrown on database error adding Instant Messaging confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.

-#: actions/emailsettings.php:421 actions/imsettings.php:366
-#: actions/smssettings.php:365
+#: actions/emailsettings.php:411 actions/imsettings.php:365
+#: actions/smssettings.php:364

 msgid "Could not insert confirmation code."
 msgstr ""
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
 msgid "Could not insert confirmation code."
 msgstr ""
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.

-#: actions/emailsettings.php:431
+#: actions/emailsettings.php:420

 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."


@@ -2886,137 +2672,59 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling Instant Messaging address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling Instant Messaging address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.

-#: actions/emailsettings.php:451 actions/imsettings.php:395
-#: actions/smssettings.php:399
+#: actions/emailsettings.php:440 actions/imsettings.php:393
+#: actions/smssettings.php:397

 msgid "No pending confirmation to cancel."
 msgstr ""
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
 msgid "No pending confirmation to cancel."
 msgstr ""
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.

-#: actions/emailsettings.php:456
+#: actions/emailsettings.php:445

 msgid "That is the wrong email address."
 msgstr ""
 
 #. TRANS: Server error thrown on database error canceling e-mail address confirmation.
 msgid "That is the wrong email address."
 msgstr ""
 
 #. TRANS: Server error thrown on database error canceling e-mail address confirmation.

-#: actions/emailsettings.php:465
+#: actions/emailsettings.php:454

 msgid "Could not delete email confirmation."
 msgstr ""
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
 msgid "Could not delete email confirmation."
 msgstr ""
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.

-#: actions/emailsettings.php:470
+#: actions/emailsettings.php:458

 msgid "Email confirmation cancelled."
 msgstr ""
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
 msgid "Email confirmation cancelled."
 msgstr ""
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.

-#: actions/emailsettings.php:489
+#: actions/emailsettings.php:477

 msgid "That is not your email address."
 msgstr ""
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
 msgid "That is not your email address."
 msgstr ""
 
 #. TRANS: Message given after successfully removing a registered e-mail address.

-#: actions/emailsettings.php:510
+#: actions/emailsettings.php:489

 msgid "The email address was removed."
 msgstr ""
 
 #. TRANS: Form validation error displayed when trying to remove an incoming e-mail address while no address has been set.
 msgid "The email address was removed."
 msgstr ""
 
 #. TRANS: Form validation error displayed when trying to remove an incoming e-mail address while no address has been set.

-#: actions/emailsettings.php:524 actions/smssettings.php:555
+#: actions/emailsettings.php:503 actions/smssettings.php:544

 msgid "No incoming email address."
 msgstr ""
 
 msgid "No incoming email address."
 msgstr ""
 

-#. TRANS: Server error thrown on database error removing incoming e-mail address.
-#. TRANS: Server error thrown on database error adding incoming e-mail address.
-#. TRANS: Server error displayed when the user could not be updated in SMS settings.
-#: actions/emailsettings.php:536 actions/emailsettings.php:560
-#: actions/smssettings.php:566 actions/smssettings.php:591
-msgid "Could not update user record."
-msgstr ""
-

 #. TRANS: Message given after successfully removing an incoming e-mail address.
 #. TRANS: Confirmation text after updating SMS settings.
 #. TRANS: Message given after successfully removing an incoming e-mail address.
 #. TRANS: Confirmation text after updating SMS settings.

-#: actions/emailsettings.php:540 actions/smssettings.php:570
+#: actions/emailsettings.php:516 actions/smssettings.php:556

 msgid "Incoming email address removed."
 msgstr ""
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
 #. TRANS: Confirmation text after updating SMS settings.
 msgid "Incoming email address removed."
 msgstr ""
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
 #. TRANS: Confirmation text after updating SMS settings.

-#: actions/emailsettings.php:564 actions/smssettings.php:595
+#: actions/emailsettings.php:537 actions/smssettings.php:578

 msgid "New incoming email address added."
 msgstr ""
 
 msgid "New incoming email address added."
 msgstr ""
 

-#. TRANS: Client error displayed when trying to mark a notice as favorite that already is a favorite.
-#: actions/favor.php:81
-msgid "This notice is already a favorite!"
-msgstr ""
-
-#. TRANS: Page title for page on which favorite notices can be unfavourited.
-#: actions/favor.php:96
-msgid "Disfavor favorite."
-msgstr ""
-
-#. TRANS: Page title for first page of favorited notices.
-#. TRANS: Title for favourited notices section.
-#. TRANS: Menu item title in search group navigation panel.
-#: actions/favorited.php:65 lib/popularnoticesection.php:65
-#: lib/publicgroupnav.php:95
-msgid "Popular notices"
-msgstr ""
-
-#. TRANS: Page title for all but first page of favorited notices.
-#. TRANS: %d is the page number being displayed.
-#: actions/favorited.php:69
-#, php-format
-msgid "Popular notices, page %d"
-msgstr ""
-
-#. TRANS: Description on page displaying favorited notices.
-#: actions/favorited.php:81
-msgid "The most popular notices on the site right now."
-msgstr ""
-
-#. TRANS: Text displayed instead of a list when a site does not yet have any favourited notices.
-#: actions/favorited.php:149
-msgid "Favorite notices appear on this page but no one has favorited one yet."
-msgstr ""
-
-#. TRANS: Additional text displayed instead of a list when a site does not yet have any favourited notices for logged in users.
-#: actions/favorited.php:153
-msgid ""
-"Be the first to add a notice to your favorites by clicking the fave button "
-"next to any notice you like."
-msgstr ""
-
-#. TRANS: Additional text displayed instead of a list when a site does not yet have any favourited notices for not logged in users.
-#. TRANS: %%action.register%% is a registration link. "[link text](link)" is Mark Down. Do not change the formatting.
-#: actions/favorited.php:158
-#, php-format
-msgid ""
-"Why not [register an account](%%action.register%%) and be the first to add a "
-"notice to your favorites!"
-msgstr ""
-
-#. TRANS: Title of RSS feed with favourite notices of a user.
-#. TRANS: %s is a user's nickname.
-#. TRANS: Title for first page of favourite notices of a user.
-#. TRANS: %s is the user for whom the favourite notices are displayed.
-#. TRANS: Menu item title in personal group navigation menu.
-#. TRANS: %s is a username.
-#: actions/favoritesrss.php:111 actions/showfavorites.php:76
-#: lib/personalgroupnav.php:102
-#, php-format
-msgid "%s's favorite notices"
-msgstr ""
-
-#. TRANS: Desciption of RSS feed with favourite notices of a user.
-#. TRANS: %1$s is a user's nickname, %2$s is the name of the StatusNet site.
-#: actions/favoritesrss.php:117
-#, php-format
-msgid "Updates favored by %1$s on %2$s!"
-msgstr ""
-

 #. TRANS: Page title for first page of featured users.
 #. TRANS: Title for featured users section.
 #. TRANS: Menu item title in search group navigation panel.
 #: actions/featured.php:69 lib/featureduserssection.php:96
 #. TRANS: Page title for first page of featured users.
 #. TRANS: Title for featured users section.
 #. TRANS: Menu item title in search group navigation panel.
 #: actions/featured.php:69 lib/featureduserssection.php:96

-#: lib/publicgroupnav.php:88
+#: lib/publicgroupnav.php:84

 msgid "Featured users"
 msgstr ""
 
 msgid "Featured users"
 msgstr ""
 


@@ -3033,34 +2741,13 @@ msgstr ""
 msgid "A selection of some great users on %s."
 msgstr ""
 
 msgid "A selection of some great users on %s."
 msgstr ""
 

-#. TRANS: Client error displayed when no notice ID was given trying do display a file.
-#: actions/file.php:36
-msgid "No notice ID."
-msgstr ""
-
-#. TRANS: Client error displayed when an invalid notice ID was given trying do display a file.
-#: actions/file.php:41
-msgid "No notice."
-msgstr ""
-
-#. TRANS: Client error displayed when trying do display a file for a notice without a file attachement.
-#: actions/file.php:46
-msgid "No attachments."
-msgstr ""
-
-#. TRANS: Client error displayed when trying do display a file for a notice with file attachements
-#. TRANS: that could not be found.
-#: actions/file.php:58
-msgid "No uploaded attachments."
-msgstr ""
-

 #. TRANS: Client error displayed when requesting a non-existent file.
 #. TRANS: Client error displayed when requesting a non-existent file.

-#: actions/getfile.php:77
+#: actions/getfile.php:73

 msgid "No such file."
 msgstr ""
 
 #. TRANS: Client error displayed when requesting a file without having read access to it.
 msgid "No such file."
 msgstr ""
 
 #. TRANS: Client error displayed when requesting a file without having read access to it.

-#: actions/getfile.php:82
+#: actions/getfile.php:77

 msgid "Cannot read file."
 msgstr ""
 
 msgid "Cannot read file."
 msgstr ""
 


@@ -3072,17 +2759,17 @@ msgstr ""
 
 #. TRANS: Client error displayed when trying to assign an reserved role to a user.
 #. TRANS: Client error displayed when trying to revoke a reserved role.
 
 #. TRANS: Client error displayed when trying to assign an reserved role to a user.
 #. TRANS: Client error displayed when trying to revoke a reserved role.

-#: actions/grantrole.php:66 actions/revokerole.php:66
+#: actions/grantrole.php:65 actions/revokerole.php:65

 msgid "This role is reserved and cannot be set."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to assign a role to a user while not being allowed to set roles.
 msgid "This role is reserved and cannot be set."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to assign a role to a user while not being allowed to set roles.

-#: actions/grantrole.php:76
+#: actions/grantrole.php:74

 msgid "You cannot grant user roles on this site."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to assign a role to a user that already has that role.
 msgid "You cannot grant user roles on this site."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to assign a role to a user that already has that role.

-#: actions/grantrole.php:84
+#: actions/grantrole.php:81

 msgid "User already has this role."
 msgstr ""
 
 msgid "User already has this role."
 msgstr ""
 


@@ -3091,44 +2778,57 @@ msgstr ""
 #. TRANS: Client error displayed when not providing a profile ID on the Make Admin page.
 #. TRANS: Client error displayed trying a change a subscription without providing a profile.
 #. TRANS: Client error displayed when trying to change user options without specifying a user to work on.
 #. TRANS: Client error displayed when not providing a profile ID on the Make Admin page.
 #. TRANS: Client error displayed trying a change a subscription without providing a profile.
 #. TRANS: Client error displayed when trying to change user options without specifying a user to work on.

-#: actions/groupblock.php:72 actions/groupunblock.php:72
-#: actions/makeadmin.php:74 actions/subedit.php:50
+#: actions/groupblock.php:70 actions/groupunblock.php:70
+#: actions/makeadmin.php:72 actions/subedit.php:48

 #: lib/profileformaction.php:79
 msgid "No profile specified."
 msgstr ""
 
 #: lib/profileformaction.php:79
 msgid "No profile specified."
 msgstr ""
 

+#. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing profile.
+#. TRANS: Client error displayed when trying to unblock a user from a group without providing an existing profile.
+#. TRANS: Client error displayed when specifying an invalid profile ID on the Make Admin page.
+#. TRANS: Client error displayed trying a change a subscription for a non-existant profile ID.
+#. TRANS: Client error displayed when referring to non-existing profile ID.
+#. TRANS: Client error displayed when trying to unsubscribe while providing a non-existing profile ID.
+#. TRANS: Client error displayed when trying to change user options without specifying an existing user to work on.
+#: actions/groupblock.php:75 actions/groupunblock.php:75
+#: actions/makeadmin.php:77 actions/subedit.php:55 actions/tagprofile.php:44
+#: actions/unsubscribe.php:81 lib/profileformaction.php:86
+msgid "No profile with that ID."
+msgstr ""
+

 #. TRANS: Client error displayed trying to block a user from a group while not specifying a group to block a profile from.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a group.
 #. TRANS: Client error displayed when not providing a group ID on the Make Admin page.
 #. TRANS: Client error displayed trying to block a user from a group while not specifying a group to block a profile from.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a group.
 #. TRANS: Client error displayed when not providing a group ID on the Make Admin page.

-#: actions/groupblock.php:84 actions/groupunblock.php:84
-#: actions/makeadmin.php:86
+#: actions/groupblock.php:80 actions/groupunblock.php:80
+#: actions/makeadmin.php:82

 msgid "No group specified."
 msgstr ""
 
 #. TRANS: Client error displayed trying to block a user from a group while not being an admin user.
 msgid "No group specified."
 msgstr ""
 
 #. TRANS: Client error displayed trying to block a user from a group while not being an admin user.

-#: actions/groupblock.php:96
+#: actions/groupblock.php:90

 msgid "Only an admin can block group members."
 msgstr ""
 
 #. TRANS: Client error displayed trying to block a user from a group while user is already blocked from the given group.
 msgid "Only an admin can block group members."
 msgstr ""
 
 #. TRANS: Client error displayed trying to block a user from a group while user is already blocked from the given group.

-#: actions/groupblock.php:101
+#: actions/groupblock.php:94

 msgid "User is already blocked from group."
 msgstr ""
 
 #. TRANS: Client error displayed trying to block a user from a group while user is not a member of given group.
 msgid "User is already blocked from group."
 msgstr ""
 
 #. TRANS: Client error displayed trying to block a user from a group while user is not a member of given group.

-#: actions/groupblock.php:107
+#: actions/groupblock.php:99

 msgid "User is not a member of group."
 msgstr ""
 
 #. TRANS: Title for block user from group page.
 #. TRANS: Form legend for form to block user from a group.
 msgid "User is not a member of group."
 msgstr ""
 
 #. TRANS: Title for block user from group page.
 #. TRANS: Form legend for form to block user from a group.

-#: actions/groupblock.php:142 lib/groupblockform.php:91
+#: actions/groupblock.php:133 lib/groupblockform.php:91

 msgid "Block user from group"
 msgstr ""
 
 #. TRANS: Explanatory text for block user from group form before setting the block.
 #. TRANS: %1$s is that to be blocked user, %2$s is the group the user will be blocked from.
 msgid "Block user from group"
 msgstr ""
 
 #. TRANS: Explanatory text for block user from group form before setting the block.
 #. TRANS: %1$s is that to be blocked user, %2$s is the group the user will be blocked from.

-#: actions/groupblock.php:170
+#: actions/groupblock.php:161

 #, php-format
 msgid ""
 "Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They "
 #, php-format
 msgid ""
 "Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They "


@@ -3137,17 +2837,17 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
 msgstr ""
 
 #. TRANS: Submit button title for 'No' when blocking a user from a group.

-#: actions/groupblock.php:192
+#: actions/groupblock.php:183

 msgid "Do not block this user from this group."
 msgstr ""
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
 msgid "Do not block this user from this group."
 msgstr ""
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.

-#: actions/groupblock.php:199
+#: actions/groupblock.php:190

 msgid "Block this user from this group."
 msgstr ""
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
 msgid "Block this user from this group."
 msgstr ""
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.

-#: actions/groupblock.php:216
+#: actions/groupblock.php:207

 msgid "Database error blocking user from group."
 msgstr ""
 
 msgid "Database error blocking user from group."
 msgstr ""
 


@@ -3161,40 +2861,40 @@ msgstr ""
 
 #. TRANS: Title for group logo settings page.
 #. TRANS: Group logo form legend.
 
 #. TRANS: Title for group logo settings page.
 #. TRANS: Group logo form legend.

-#: actions/grouplogo.php:144 actions/grouplogo.php:199
+#: actions/grouplogo.php:139 actions/grouplogo.php:193

 msgid "Group logo"
 msgstr ""
 
 #. TRANS: Instructions for group logo page.
 #. TRANS: %s is the maximum file size for that site.
 msgid "Group logo"
 msgstr ""
 
 #. TRANS: Instructions for group logo page.
 #. TRANS: %s is the maximum file size for that site.

-#: actions/grouplogo.php:156
+#: actions/grouplogo.php:151

 #, php-format
 msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
 msgstr ""
 
 #. TRANS: Submit button for uploading a group logo.
 #, php-format
 msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
 msgstr ""
 
 #. TRANS: Submit button for uploading a group logo.

-#: actions/grouplogo.php:243
+#: actions/grouplogo.php:237

 msgid "Upload"
 msgstr ""
 
 #. TRANS: Button text for cropping an uploaded group logo.
 msgid "Upload"
 msgstr ""
 
 #. TRANS: Button text for cropping an uploaded group logo.

-#: actions/grouplogo.php:299
+#: actions/grouplogo.php:293

 msgid "Crop"
 msgstr ""
 
 #. TRANS: Form instructions on the group logo page.
 msgid "Crop"
 msgstr ""
 
 #. TRANS: Form instructions on the group logo page.

-#: actions/grouplogo.php:376
+#: actions/grouplogo.php:370

 msgid "Pick a square area of the image to be the logo."
 msgstr ""
 
 #. TRANS: Form success message after updating a group logo.
 msgid "Pick a square area of the image to be the logo."
 msgstr ""
 
 #. TRANS: Form success message after updating a group logo.

-#: actions/grouplogo.php:411
+#: actions/grouplogo.php:404

 msgid "Logo updated."
 msgstr ""
 
 #. TRANS: Form failure message after failing to update a group logo.
 msgid "Logo updated."
 msgstr ""
 
 #. TRANS: Form failure message after failing to update a group logo.

-#: actions/grouplogo.php:414
+#: actions/grouplogo.php:407

 msgid "Failed updating logo."
 msgstr ""
 
 msgid "Failed updating logo."
 msgstr ""
 


@@ -3218,31 +2918,31 @@ msgid "A list of the users in this group."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to approve group applicants without being a group administrator.
 msgstr ""
 
 #. TRANS: Client error displayed when trying to approve group applicants without being a group administrator.

-#: actions/groupqueue.php:100
+#: actions/groupqueue.php:96

 msgid "Only the group admin may approve users."
 msgstr ""
 
 #. TRANS: Title of the first page showing pending group members still awaiting approval to join the group.
 #. TRANS: %s is the name of the group.
 msgid "Only the group admin may approve users."
 msgstr ""
 
 #. TRANS: Title of the first page showing pending group members still awaiting approval to join the group.
 #. TRANS: %s is the name of the group.

-#: actions/groupqueue.php:111
+#: actions/groupqueue.php:106

 #, php-format
 msgid "%s group members awaiting approval"
 msgstr ""
 
 #. TRANS: Title of all but the first page showing pending group members still awaiting approval to join the group.
 #. TRANS: %1$s is the name of the group, %2$d is the page number of the members list.
 #, php-format
 msgid "%s group members awaiting approval"
 msgstr ""
 
 #. TRANS: Title of all but the first page showing pending group members still awaiting approval to join the group.
 #. TRANS: %1$s is the name of the group, %2$d is the page number of the members list.

-#: actions/groupqueue.php:116
+#: actions/groupqueue.php:111

 #, php-format
 msgid "%1$s group members awaiting approval, page %2$d"
 msgstr ""
 
 #. TRANS: Page notice for group members page.
 #, php-format
 msgid "%1$s group members awaiting approval, page %2$d"
 msgstr ""
 
 #. TRANS: Page notice for group members page.

-#: actions/groupqueue.php:132
+#: actions/groupqueue.php:127

 msgid "A list of users awaiting approval to join this group."
 msgstr ""
 
 #. TRANS: Message is used as link description. %1$s is a group name, %2$s is a site name.
 msgid "A list of users awaiting approval to join this group."
 msgstr ""
 
 #. TRANS: Message is used as link description. %1$s is a group name, %2$s is a site name.

-#: actions/grouprss.php:141
+#: actions/grouprss.php:137

 #, php-format
 msgid "Updates from members of %1$s on %2$s!"
 msgstr ""
 #, php-format
 msgid "Updates from members of %1$s on %2$s!"
 msgstr ""


@@ -3270,14 +2970,14 @@ msgid ""
 "%%%%site.name%%%% groups let you find and talk with people of similar "
 "interests. After you join a group you can send messages to all other members "
 "using the syntax \"!groupname\". Don't see a group you like? Try [searching "
 "%%%%site.name%%%% groups let you find and talk with people of similar "
 "interests. After you join a group you can send messages to all other members "
 "using the syntax \"!groupname\". Don't see a group you like? Try [searching "

-"for one](%%%%action.groupsearch%%%%) or [start your own](%%%%action.newgroup%"
-"%%%)!"
+"for one](%%%%action.groupsearch%%%%) or [start your own](%%%%action.newgroup"
+"%%%%)!"

 msgstr ""
 
 #. TRANS: Link to create a new group on the group list page.
 #. TRANS: Link text on group page to create a new group.
 #. TRANS: Form legend for group edit form.
 msgstr ""
 
 #. TRANS: Link to create a new group on the group list page.
 #. TRANS: Link text on group page to create a new group.
 #. TRANS: Form legend for group edit form.

-#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:116
+#: actions/groups.php:107 actions/usergroups.php:71 lib/groupeditform.php:116

 msgid "Create a new group"
 msgstr ""
 
 msgid "Create a new group"
 msgstr ""
 


@@ -3299,7 +2999,7 @@ msgstr ""
 #. TRANS: Message on the "People search" page where a query has no results.
 #. TRANS: Output when there are no results for a search.
 #: actions/groupsearch.php:82 actions/noticesearch.php:155
 #. TRANS: Message on the "People search" page where a query has no results.
 #. TRANS: Output when there are no results for a search.
 #: actions/groupsearch.php:82 actions/noticesearch.php:155

-#: actions/peoplesearch.php:87 actions/profilecompletion.php:150
+#: actions/peoplesearch.php:87 actions/profilecompletion.php:146

 msgid "No results."
 msgstr ""
 
 msgid "No results."
 msgstr ""
 


@@ -3308,8 +3008,8 @@ msgstr ""
 #: actions/groupsearch.php:87
 #, php-format
 msgid ""
 #: actions/groupsearch.php:87
 #, php-format
 msgid ""

-"If you cannot find the group you're looking for, you can [create it](%%"
-"action.newgroup%%) yourself."
+"If you cannot find the group you're looking for, you can [create it]"
+"(%%action.newgroup%%) yourself."

 msgstr ""
 
 #. TRANS: Additional text on page where groups can be searched if no results were found for a query for a not logged in user.
 msgstr ""
 
 #. TRANS: Additional text on page where groups can be searched if no results were found for a query for a not logged in user.


@@ -3317,23 +3017,23 @@ msgstr ""
 #: actions/groupsearch.php:92
 #, php-format
 msgid ""
 #: actions/groupsearch.php:92
 #, php-format
 msgid ""

-"Why not [register an account](%%action.register%%) and [create the group](%%"
-"action.newgroup%%) yourself!"
+"Why not [register an account](%%action.register%%) and [create the group]"
+"(%%action.newgroup%%) yourself!"

 msgstr ""
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without being an administrator for the group.
 msgstr ""
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without being an administrator for the group.

-#: actions/groupunblock.php:96
+#: actions/groupunblock.php:90

 msgid "Only an admin can unblock group members."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to unblock a non-blocked user from a group.
 msgid "Only an admin can unblock group members."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to unblock a non-blocked user from a group.

-#: actions/groupunblock.php:101
+#: actions/groupunblock.php:94

 msgid "User is not blocked from group."
 msgstr ""
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
 #. TRANS: Server error displayed when removing a user block.
 msgid "User is not blocked from group."
 msgstr ""
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
 #. TRANS: Server error displayed when removing a user block.

-#: actions/groupunblock.php:133 actions/unblock.php:86
+#: actions/groupunblock.php:125 actions/unblock.php:85

 msgid "Error removing the block."
 msgstr ""
 
 msgid "Error removing the block."
 msgstr ""
 


@@ -3415,85 +3115,66 @@ msgstr ""
 
 #. TRANS: Confirmation message for successful IM preferences save.
 #. TRANS: Confirmation message after saving preferences.
 
 #. TRANS: Confirmation message for successful IM preferences save.
 #. TRANS: Confirmation message after saving preferences.

-#: actions/imsettings.php:301 actions/urlsettings.php:247
+#: actions/imsettings.php:300 actions/urlsettings.php:246

 msgid "Preferences saved."
 msgstr ""
 
 #. TRANS: Message given saving IM address without having provided one.
 msgid "Preferences saved."
 msgstr ""
 
 #. TRANS: Message given saving IM address without having provided one.

-#: actions/imsettings.php:323
+#: actions/imsettings.php:322

 msgid "No screenname."
 msgstr ""
 
 #. TRANS: Form validation error when no transport is available setting an IM address.
 msgid "No screenname."
 msgstr ""
 
 #. TRANS: Form validation error when no transport is available setting an IM address.

-#: actions/imsettings.php:329
+#: actions/imsettings.php:328

 msgid "No transport."
 msgstr ""
 
 #. TRANS: Message given saving IM address that cannot be normalised.
 msgid "No transport."
 msgstr ""
 
 #. TRANS: Message given saving IM address that cannot be normalised.

-#: actions/imsettings.php:337
+#: actions/imsettings.php:336

 msgid "Cannot normalize that screenname."
 msgstr ""
 
 #. TRANS: Message given saving IM address that not valid.
 msgid "Cannot normalize that screenname."
 msgstr ""
 
 #. TRANS: Message given saving IM address that not valid.

-#: actions/imsettings.php:344
+#: actions/imsettings.php:343

 msgid "Not a valid screenname."
 msgstr ""
 
 #. TRANS: Message given saving IM address that is already set for another user.
 msgid "Not a valid screenname."
 msgstr ""
 
 #. TRANS: Message given saving IM address that is already set for another user.

-#: actions/imsettings.php:348
+#: actions/imsettings.php:347

 msgid "Screenname already belongs to another user."
 msgstr ""
 
 #. TRANS: Message given saving valid IM address that is to be confirmed.
 msgid "Screenname already belongs to another user."
 msgstr ""
 
 #. TRANS: Message given saving valid IM address that is to be confirmed.

-#: actions/imsettings.php:373
+#: actions/imsettings.php:371

 msgid "A confirmation code was sent to the IM address you added."
 msgstr ""
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
 msgid "A confirmation code was sent to the IM address you added."
 msgstr ""
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.

-#: actions/imsettings.php:400
+#: actions/imsettings.php:398

 msgid "That is the wrong IM address."
 msgstr ""
 
 #. TRANS: Server error thrown on database error canceling IM address confirmation.
 msgid "That is the wrong IM address."
 msgstr ""
 
 #. TRANS: Server error thrown on database error canceling IM address confirmation.

-#: actions/imsettings.php:409
+#: actions/imsettings.php:407

 msgid "Could not delete confirmation."
 msgstr ""
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
 msgid "Could not delete confirmation."
 msgstr ""
 
 #. TRANS: Message given after successfully canceling IM address confirmation.

-#: actions/imsettings.php:414
+#: actions/imsettings.php:411

 msgid "IM confirmation cancelled."
 msgstr ""
 
 #. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
 msgid "IM confirmation cancelled."
 msgstr ""
 
 #. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.

-#: actions/imsettings.php:438
+#: actions/imsettings.php:435

 msgid "That is not your screenname."
 msgstr ""
 
 #. TRANS: Message given after successfully removing a registered Instant Messaging address.
 msgid "That is not your screenname."
 msgstr ""
 
 #. TRANS: Message given after successfully removing a registered Instant Messaging address.

-#: actions/imsettings.php:454
+#: actions/imsettings.php:450

 msgid "The IM address was removed."
 msgstr ""
 
 msgid "The IM address was removed."
 msgstr ""
 

-#. TRANS: Title for all but the first page of the inbox page.
-#. TRANS: %1$s is the user's nickname, %2$s is the page number.
-#: actions/inbox.php:59
-#, php-format
-msgid "Inbox for %1$s - page %2$d"
-msgstr ""
-
-#. TRANS: Title for the first page of the inbox page.
-#. TRANS: %s is the user's nickname.
-#: actions/inbox.php:64
-#, php-format
-msgid "Inbox for %s"
-msgstr ""
-
-#. TRANS: Instructions for user inbox page.
-#: actions/inbox.php:106
-msgid "This is your inbox, which lists your incoming private messages."
-msgstr ""
-

 #. TRANS: Client error displayed when trying to sent invites while they have been disabled.
 #: actions/invite.php:46
 msgid "Invites have been disabled."
 #. TRANS: Client error displayed when trying to sent invites while they have been disabled.
 #: actions/invite.php:46
 msgid "Invites have been disabled."


@@ -3514,12 +3195,12 @@ msgid "Invalid email address: %s."
 msgstr ""
 
 #. TRANS: Page title when invitations have been sent.
 msgstr ""
 
 #. TRANS: Page title when invitations have been sent.

-#: actions/invite.php:145
+#: actions/invite.php:152

 msgid "Invitations sent"
 msgstr ""
 
 #. TRANS: Page title when inviting potential users.
 msgid "Invitations sent"
 msgstr ""
 
 #. TRANS: Page title when inviting potential users.

-#: actions/invite.php:148
+#: actions/invite.php:155

 msgid "Invite new users"
 msgstr ""
 
 msgid "Invite new users"
 msgstr ""
 


@@ -3527,7 +3208,7 @@ msgstr ""
 #. TRANS: is already subscribed to one or more users with the given e-mail address(es).
 #. TRANS: Plural form is based on the number of reported already subscribed e-mail addresses.
 #. TRANS: Followed by a bullet list.
 #. TRANS: is already subscribed to one or more users with the given e-mail address(es).
 #. TRANS: Plural form is based on the number of reported already subscribed e-mail addresses.
 #. TRANS: Followed by a bullet list.

-#: actions/invite.php:169
+#: actions/invite.php:176

 msgid "You are already subscribed to this user:"
 msgid_plural "You are already subscribed to these users:"
 msgstr[0] ""
 msgid "You are already subscribed to this user:"
 msgid_plural "You are already subscribed to these users:"
 msgstr[0] ""


@@ -3535,7 +3216,7 @@ msgstr[1] ""
 
 #. TRANS: Used as list item for already subscribed users (%1$s is nickname, %2$s is e-mail address).
 #. TRANS: Used as list item for already registered people (%1$s is nickname, %2$s is e-mail address).
 
 #. TRANS: Used as list item for already subscribed users (%1$s is nickname, %2$s is e-mail address).
 #. TRANS: Used as list item for already registered people (%1$s is nickname, %2$s is e-mail address).

-#: actions/invite.php:175 actions/invite.php:189
+#: actions/invite.php:182 actions/invite.php:196

 #, php-format
 msgctxt "INVITE"
 msgid "%1$s (%2$s)"
 #, php-format
 msgctxt "INVITE"
 msgid "%1$s (%2$s)"


@@ -3544,7 +3225,7 @@ msgstr ""
 #. TRANS: Message displayed inviting users to use a StatusNet site while the invited user
 #. TRANS: already uses a this StatusNet site. Plural form is based on the number of
 #. TRANS: reported already present people. Followed by a bullet list.
 #. TRANS: Message displayed inviting users to use a StatusNet site while the invited user
 #. TRANS: already uses a this StatusNet site. Plural form is based on the number of
 #. TRANS: reported already present people. Followed by a bullet list.

-#: actions/invite.php:183
+#: actions/invite.php:190

 msgid "This person is already a user and you were automatically subscribed:"
 msgid_plural ""
 "These people are already users and you were automatically subscribed to them:"
 msgid "This person is already a user and you were automatically subscribed:"
 msgid_plural ""
 "These people are already users and you were automatically subscribed to them:"


@@ -3554,7 +3235,7 @@ msgstr[1] ""
 #. TRANS: Message displayed inviting users to use a StatusNet site. Plural form is
 #. TRANS: based on the number of invitations sent. Followed by a bullet list of
 #. TRANS: e-mail addresses to which invitations were sent.
 #. TRANS: Message displayed inviting users to use a StatusNet site. Plural form is
 #. TRANS: based on the number of invitations sent. Followed by a bullet list of
 #. TRANS: e-mail addresses to which invitations were sent.

-#: actions/invite.php:197
+#: actions/invite.php:204

 msgid "Invitation sent to the following person:"
 msgid_plural "Invitations sent to the following people:"
 msgstr[0] ""
 msgid "Invitation sent to the following person:"
 msgid_plural "Invitations sent to the following people:"
 msgstr[0] ""


@@ -3562,14 +3243,14 @@ msgstr[1] ""
 
 #. TRANS: Generic message displayed after sending out one or more invitations to
 #. TRANS: people to join a StatusNet site.
 
 #. TRANS: Generic message displayed after sending out one or more invitations to
 #. TRANS: people to join a StatusNet site.

-#: actions/invite.php:207
+#: actions/invite.php:214

 msgid ""
 "You will be notified when your invitees accept the invitation and register "
 "on the site. Thanks for growing the community!"
 msgstr ""
 
 #. TRANS: Form instructions.
 msgid ""
 "You will be notified when your invitees accept the invitation and register "
 "on the site. Thanks for growing the community!"
 msgstr ""
 
 #. TRANS: Form instructions.

-#: actions/invite.php:222
+#: actions/invite.php:229

 msgid ""
 "Use this form to invite your friends and colleagues to use this service."
 msgstr ""
 msgid ""
 "Use this form to invite your friends and colleagues to use this service."
 msgstr ""


@@ -3577,31 +3258,31 @@ msgstr ""
 #. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral
 #. TRANS: singular 3rd-person pronoun in English. %1$s is the inviting user, $2$s is
 #. TRANS: the StatusNet sitename.
 #. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral
 #. TRANS: singular 3rd-person pronoun in English. %1$s is the inviting user, $2$s is
 #. TRANS: the StatusNet sitename.

-#: actions/invite.php:275
+#: actions/invite.php:282

 #, php-format
 msgid "%1$s has invited you to join them on %2$s"
 msgstr ""
 
 #. TRANS: Client error displayed when trying to join a group while not logged in.
 #, php-format
 msgid "%1$s has invited you to join them on %2$s"
 msgstr ""
 
 #. TRANS: Client error displayed when trying to join a group while not logged in.

-#: actions/joingroup.php:59
+#: actions/joingroup.php:57

 msgid "You must be logged in to join a group."
 msgstr ""
 
 #. TRANS: Title for join group page after joining.
 msgid "You must be logged in to join a group."
 msgstr ""
 
 #. TRANS: Title for join group page after joining.

-#: actions/joingroup.php:149
+#: actions/joingroup.php:134

 #, php-format
 msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
 msgstr ""
 
 #. TRANS: Exception thrown when there is an unknown error joining a group.
 #, php-format
 msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
 msgstr ""
 
 #. TRANS: Exception thrown when there is an unknown error joining a group.

-#: actions/joingroup.php:162
+#: actions/joingroup.php:147

 msgid "Unknown error joining group."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
 msgid "Unknown error joining group."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown when trying to leave an existing group the user is not a member of.

-#: actions/leavegroup.php:103 lib/command.php:395
+#: actions/leavegroup.php:94 lib/command.php:346

 msgid "You are not a member of that group."
 msgstr ""
 
 msgid "You are not a member of that group."
 msgstr ""
 


@@ -3634,309 +3315,314 @@ msgid "Invalid license title. Maximum length is 255 characters."
 msgstr ""
 
 #. TRANS: Client error displayed specifying an invalid license URL in the license admin panel.
 msgstr ""
 
 #. TRANS: Client error displayed specifying an invalid license URL in the license admin panel.

-#: actions/licenseadminpanel.php:167
+#: actions/licenseadminpanel.php:163

 msgid "Invalid license URL."
 msgstr ""
 
 #. TRANS: Client error displayed specifying an invalid license image URL in the license admin panel.
 msgid "Invalid license URL."
 msgstr ""
 
 #. TRANS: Client error displayed specifying an invalid license image URL in the license admin panel.

-#: actions/licenseadminpanel.php:171
+#: actions/licenseadminpanel.php:167

 msgid "Invalid license image URL."
 msgstr ""
 
 #. TRANS: Client error displayed specifying an invalid license URL in the license admin panel.
 msgid "Invalid license image URL."
 msgstr ""
 
 #. TRANS: Client error displayed specifying an invalid license URL in the license admin panel.

-#: actions/licenseadminpanel.php:180
+#: actions/licenseadminpanel.php:176

 msgid "License URL must be blank or a valid URL."
 msgstr ""
 
 #. TRANS: Client error displayed specifying an invalid license image URL in the license admin panel.
 msgid "License URL must be blank or a valid URL."
 msgstr ""
 
 #. TRANS: Client error displayed specifying an invalid license image URL in the license admin panel.

-#: actions/licenseadminpanel.php:189
+#: actions/licenseadminpanel.php:185

 msgid "License image must be blank or valid URL."
 msgstr ""
 
 #. TRANS: Form legend in the license admin panel.
 msgid "License image must be blank or valid URL."
 msgstr ""
 
 #. TRANS: Form legend in the license admin panel.

-#: actions/licenseadminpanel.php:240
+#: actions/licenseadminpanel.php:236

 msgid "License selection"
 msgstr ""
 
 #. TRANS: License option in the license admin panel.
 #. TRANS: Checkbox label to mark a list private.
 msgid "License selection"
 msgstr ""
 
 #. TRANS: License option in the license admin panel.
 #. TRANS: Checkbox label to mark a list private.

-#: actions/licenseadminpanel.php:247 lib/peopletageditform.php:155
+#: actions/licenseadminpanel.php:243 lib/peopletageditform.php:155

 msgid "Private"
 msgstr ""
 
 #. TRANS: License option in the license admin panel.
 msgid "Private"
 msgstr ""
 
 #. TRANS: License option in the license admin panel.

-#: actions/licenseadminpanel.php:249
+#: actions/licenseadminpanel.php:245

 msgid "All Rights Reserved"
 msgstr ""
 
 #. TRANS: License option in the license admin panel.
 msgid "All Rights Reserved"
 msgstr ""
 
 #. TRANS: License option in the license admin panel.

-#: actions/licenseadminpanel.php:251
+#: actions/licenseadminpanel.php:247

 msgid "Creative Commons"
 msgstr ""
 
 #. TRANS: Dropdown field label in the license admin panel.
 msgid "Creative Commons"
 msgstr ""
 
 #. TRANS: Dropdown field label in the license admin panel.

-#: actions/licenseadminpanel.php:257
+#: actions/licenseadminpanel.php:253

 msgid "Type"
 msgstr ""
 
 #. TRANS: Dropdown field instructions in the license admin panel.
 msgid "Type"
 msgstr ""
 
 #. TRANS: Dropdown field instructions in the license admin panel.

-#: actions/licenseadminpanel.php:260
+#: actions/licenseadminpanel.php:256

 msgid "Select a license."
 msgstr ""
 
 #. TRANS: Form legend in the license admin panel.
 msgid "Select a license."
 msgstr ""
 
 #. TRANS: Form legend in the license admin panel.

-#: actions/licenseadminpanel.php:275
+#: actions/licenseadminpanel.php:271

 msgid "License details"
 msgstr ""
 
 #. TRANS: Field label in the license admin panel.
 msgid "License details"
 msgstr ""
 
 #. TRANS: Field label in the license admin panel.

-#: actions/licenseadminpanel.php:282
+#: actions/licenseadminpanel.php:278

 msgid "Owner"
 msgstr ""
 
 #. TRANS: Field title in the license admin panel.
 msgid "Owner"
 msgstr ""
 
 #. TRANS: Field title in the license admin panel.

-#: actions/licenseadminpanel.php:284
+#: actions/licenseadminpanel.php:280

 msgid "Name of the owner of the site's content (if applicable)."
 msgstr ""
 
 #. TRANS: Field label in the license admin panel.
 msgid "Name of the owner of the site's content (if applicable)."
 msgstr ""
 
 #. TRANS: Field label in the license admin panel.

-#: actions/licenseadminpanel.php:293
+#: actions/licenseadminpanel.php:289

 msgid "License Title"
 msgstr ""
 
 #. TRANS: Field title in the license admin panel.
 msgid "License Title"
 msgstr ""
 
 #. TRANS: Field title in the license admin panel.

-#: actions/licenseadminpanel.php:295
+#: actions/licenseadminpanel.php:291

 msgid "The title of the license."
 msgstr ""
 
 #. TRANS: Field label in the license admin panel.
 msgid "The title of the license."
 msgstr ""
 
 #. TRANS: Field label in the license admin panel.

-#: actions/licenseadminpanel.php:304
+#: actions/licenseadminpanel.php:300

 msgid "License URL"
 msgstr ""
 
 #. TRANS: Field title in the license admin panel.
 msgid "License URL"
 msgstr ""
 
 #. TRANS: Field title in the license admin panel.

-#: actions/licenseadminpanel.php:306
+#: actions/licenseadminpanel.php:302

 msgid "URL for more information about the license."
 msgstr ""
 
 #. TRANS: Field label in the license admin panel.
 msgid "URL for more information about the license."
 msgstr ""
 
 #. TRANS: Field label in the license admin panel.

-#: actions/licenseadminpanel.php:314
+#: actions/licenseadminpanel.php:310

 msgid "License Image URL"
 msgstr ""
 
 #. TRANS: Field title in the license admin panel.
 msgid "License Image URL"
 msgstr ""
 
 #. TRANS: Field title in the license admin panel.

-#: actions/licenseadminpanel.php:316
+#: actions/licenseadminpanel.php:312

 msgid "URL for an image to display with the license."
 msgstr ""
 
 #. TRANS: Button title in the license admin panel.
 msgid "URL for an image to display with the license."
 msgstr ""
 
 #. TRANS: Button title in the license admin panel.

-#: actions/licenseadminpanel.php:339
+#: actions/licenseadminpanel.php:335

 msgid "Save license settings."
 msgstr ""
 
 #. TRANS: Form validation error displayed when trying to log in with incorrect credentials.
 msgid "Save license settings."
 msgstr ""
 
 #. TRANS: Form validation error displayed when trying to log in with incorrect credentials.

-#: actions/login.php:127
+#: actions/login.php:95

 msgid "Incorrect username or password."
 msgstr ""
 
 #. TRANS: Server error displayed when during login a server error occurs.
 #. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
 msgid "Incorrect username or password."
 msgstr ""
 
 #. TRANS: Server error displayed when during login a server error occurs.
 #. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".

-#: actions/login.php:134 actions/otp.php:127
+#: actions/login.php:101 actions/otp.php:120

 msgid "Error setting user. You are probably not authorized."
 msgstr ""
 
 #. TRANS: Page title for login page.
 msgid "Error setting user. You are probably not authorized."
 msgstr ""
 
 #. TRANS: Page title for login page.

-#: actions/login.php:189
+#: actions/login.php:155

 msgid "Login"
 msgstr ""
 
 #. TRANS: Form legend on login page.
 msgid "Login"
 msgstr ""
 
 #. TRANS: Form legend on login page.

-#: actions/login.php:227
+#: actions/login.php:173

 msgid "Login to site"
 msgstr ""
 
 #. TRANS: Field label on login page.
 msgid "Login to site"
 msgstr ""
 
 #. TRANS: Field label on login page.

-#: actions/login.php:231
+#: actions/login.php:177

 msgid "Username or email address"
 msgstr ""
 
 #. TRANS: Checkbox label label on login page.
 #. TRANS: Checkbox label on account registration page.
 msgid "Username or email address"
 msgstr ""
 
 #. TRANS: Checkbox label label on login page.
 #. TRANS: Checkbox label on account registration page.

-#: actions/login.php:239 actions/register.php:514
+#: actions/login.php:185 actions/register.php:482

 msgid "Remember me"
 msgstr ""
 
 #. TRANS: Checkbox title on login page.
 #. TRANS: Checkbox title on account registration page.
 msgid "Remember me"
 msgstr ""
 
 #. TRANS: Checkbox title on login page.
 #. TRANS: Checkbox title on account registration page.

-#: actions/login.php:241 actions/register.php:517
+#: actions/login.php:187 actions/register.php:485

 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 
 #. TRANS: Button text for log in on login page.
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 
 #. TRANS: Button text for log in on login page.

-#: actions/login.php:246
+#: actions/login.php:192

 msgctxt "BUTTON"
 msgid "Login"
 msgstr ""
 
 #. TRANS: Link text for link to "reset password" on login page.
 msgctxt "BUTTON"
 msgid "Login"
 msgstr ""
 
 #. TRANS: Link text for link to "reset password" on login page.

-#: actions/login.php:252
+#: actions/login.php:199

 msgid "Lost or forgotten password?"
 msgstr ""
 
 #. TRANS: Form instructions on login page before being able to change user settings.
 msgid "Lost or forgotten password?"
 msgstr ""
 
 #. TRANS: Form instructions on login page before being able to change user settings.

-#: actions/login.php:271
+#: actions/login.php:218

 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
 msgstr ""
 
 #. TRANS: Form instructions on login page.
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
 msgstr ""
 
 #. TRANS: Form instructions on login page.

-#: actions/login.php:276
+#: actions/login.php:223

 msgid "Login with your username and password."
 msgstr ""
 
 #. TRANS: Form instructions on login page. This message contains Markdown links in the form [Link text](Link).
 #. TRANS: %%action.register%% is a link to the registration page.
 msgid "Login with your username and password."
 msgstr ""
 
 #. TRANS: Form instructions on login page. This message contains Markdown links in the form [Link text](Link).
 #. TRANS: %%action.register%% is a link to the registration page.

-#: actions/login.php:281
+#: actions/login.php:228

 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
 msgstr ""
 
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
 msgstr ""
 

+#. TRANS: Error message displayed when trying to logout even though you are not logged in.
+#: actions/logout.php:59
+msgid "Cannot log you out if you are not logged in."
+msgstr ""
+

 #. TRANS: Client error displayed when trying to make another user admin on the Make Admin page while not an admin.
 #. TRANS: Client error displayed when trying to make another user admin on the Make Admin page while not an admin.

-#: actions/makeadmin.php:99
+#: actions/makeadmin.php:93

 msgid "Only an admin can make another user an admin."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to make another user admin on the Make Admin page who already is admin.
 #. TRANS: %1$s is the user that is already admin, %2$s is the group user is already admin for.
 msgid "Only an admin can make another user an admin."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to make another user admin on the Make Admin page who already is admin.
 #. TRANS: %1$s is the user that is already admin, %2$s is the group user is already admin for.

-#: actions/makeadmin.php:105
+#: actions/makeadmin.php:98

 #, php-format
 msgid "%1$s is already an admin for group \"%2$s\"."
 msgstr ""
 
 #, php-format
 msgid "%1$s is already an admin for group \"%2$s\"."
 msgstr ""
 

-#. TRANS: Server error displayed when trying to make another user admin on the Make Admin page fails
-#. TRANS: because the group membership record could not be gotten.
-#. TRANS: %1$s is the to be admin user, %2$s is the group user should be admin for.
-#: actions/makeadmin.php:145
-#, php-format
-msgid "Can't get membership record for %1$s in group %2$s."
+#. TRANS: Server error displayed when trying to make another user admin on the Make Admin page fails
+#. TRANS: because the group membership record could not be gotten.
+#. TRANS: %1$s is the to be admin user, %2$s is the group user should be admin for.
+#: actions/makeadmin.php:137
+#, php-format
+msgid "Can't get membership record for %1$s in group %2$s."
+msgstr ""
+
+#. TRANS: Server error displayed when trying to make another user admin on the Make Admin page fails
+#. TRANS: because the group adminship record coud not be saved properly.
+#. TRANS: %1$s is the to be admin user, %2$s is the group user is already admin for.
+#: actions/makeadmin.php:153
+#, php-format
+msgid "Can't make %1$s an admin for group %2$s."
+msgstr ""
+
+#. TRANS: Client error displayed trying to make a micro summary without providing a status.
+#: actions/microsummary.php:70
+msgid "No current status."
+msgstr ""
+
+#. TRANS: Title for all public timeline pages but the first.
+#. TRANS: %d is the page number.
+#: actions/networkpublic.php:24
+#, php-format
+msgid "Network public timeline, page %d"
+msgstr ""
+
+#. TRANS: Title for the first public timeline page.
+#: actions/networkpublic.php:27
+msgid "Network public timeline"
+msgstr ""
+
+#. TRANS: Link description for the _global_ network public timeline feed.
+#: actions/networkpublic.php:65
+msgid "Network Public Timeline Feed (Activity Streams JSON)"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Server error displayed when trying to make another user admin on the Make Admin page fails
-#. TRANS: because the group adminship record coud not be saved properly.
-#. TRANS: %1$s is the to be admin user, %2$s is the group user is already admin for.
-#: actions/makeadmin.php:161
-#, php-format
-msgid "Can't make %1$s an admin for group %2$s."
+#. TRANS: Link description for the _global_ network public timeline feed.
+#: actions/networkpublic.php:68
+msgid "Network Public Timeline Feed (RSS 1.0)"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Client error displayed trying to make a micro summary without providing a status.
-#: actions/microsummary.php:71
-msgid "No current status."
+#. TRANS: Link description for the _global_ network public timeline feed.
+#: actions/networkpublic.php:73
+msgid "Network Public Timeline Feed (RSS 2.0)"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: This is the title of the form for adding a new application.
-#: actions/newapplication.php:52
-msgid "New application"
+#. TRANS: Link description for the _global_ network public timeline feed.
+#: actions/networkpublic.php:78
+msgid "Network Public Timeline Feed (Atom)"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Client error displayed trying to add a new application while not logged in.
-#: actions/newapplication.php:64
-msgid "You must be logged in to register an application."
+#. TRANS: This is the title of the form for adding a new application.
+#: actions/newapplication.php:51
+msgid "New application"

 msgstr ""
 
 #. TRANS: Form instructions for registering a new application.
 msgstr ""
 
 #. TRANS: Form instructions for registering a new application.

-#: actions/newapplication.php:148
+#: actions/newapplication.php:87

 msgid "Use this form to register a new application."
 msgstr ""
 
 #. TRANS: Validation error shown when not providing a source URL in the "New application" form.
 msgid "Use this form to register a new application."
 msgstr ""
 
 #. TRANS: Validation error shown when not providing a source URL in the "New application" form.

-#: actions/newapplication.php:190
+#: actions/newapplication.php:124

 msgid "Source URL is required."
 msgstr ""
 
 #. TRANS: Server error displayed when an application could not be registered in the database through the "New application" form.
 msgid "Source URL is required."
 msgstr ""
 
 #. TRANS: Server error displayed when an application could not be registered in the database through the "New application" form.

-#: actions/newapplication.php:280 actions/newapplication.php:290
+#: actions/newapplication.php:185 actions/newapplication.php:195

 msgid "Could not create application."
 msgstr ""
 
 #. TRANS: Form validation error messages displayed when uploading an invalid application logo.
 msgid "Could not create application."
 msgstr ""
 
 #. TRANS: Form validation error messages displayed when uploading an invalid application logo.

-#: actions/newapplication.php:299
+#: actions/newapplication.php:204

 msgid "Invalid image."
 msgstr ""
 
 #. TRANS: Title for form to create a group.
 msgid "Invalid image."
 msgstr ""
 
 #. TRANS: Title for form to create a group.

-#: actions/newgroup.php:53
+#: actions/newgroup.php:58

 msgid "New group"
 msgstr ""
 
 #. TRANS: Client exception thrown when a user tries to create a group while banned.
 msgid "New group"
 msgstr ""
 
 #. TRANS: Client exception thrown when a user tries to create a group while banned.

-#: actions/newgroup.php:73 classes/User_group.php:545
+#: actions/newgroup.php:71 classes/User_group.php:568

 msgid "You are not allowed to create groups on this site."
 msgstr ""
 
 #. TRANS: Form instructions for group create form.
 msgid "You are not allowed to create groups on this site."
 msgstr ""
 
 #. TRANS: Form instructions for group create form.

-#: actions/newgroup.php:117
+#: actions/newgroup.php:87

 msgid "Use this form to create a new group."
 msgstr ""
 
 msgid "Use this form to create a new group."
 msgstr ""
 

-#. TRANS: Page title for new direct message page.
-#. TRANS: Page title on page for sending a direct message.
-#: actions/newmessage.php:72 actions/newmessage.php:250
-msgid "New message"
+#. TRANS: Page title after sending a notice.
+#: actions/newnotice.php:63
+msgid "Notice posted"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Client error displayed trying to send a direct message to a user while sender and
-#. TRANS: receiver are not subscribed to each other.
-#: actions/newmessage.php:126 actions/newmessage.php:174
-msgid "You cannot send a message to this user."
+#. TRANS: Page title for sending a new notice.
+#: actions/newnotice.php:66
+msgctxt "TITLE"
+msgid "New notice"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Form validator error displayed trying to send a direct message without content.

 #. TRANS: Client error displayed trying to send a notice without content.
 #. TRANS: Client error displayed trying to send a notice without content.

-#. TRANS: Command exception text shown when trying to send a direct message to another user without content.

 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.

-#: actions/newmessage.php:151 actions/newnotice.php:140 lib/command.php:605
-#: lib/command.php:694
+#: actions/newnotice.php:105 lib/command.php:572

 msgid "No content!"
 msgstr ""
 
 msgid "No content!"
 msgstr ""
 

-#. TRANS: Form validation error displayed trying to send a direct message without specifying a recipient.
-#: actions/newmessage.php:169
-msgid "No recipient specified."
-msgstr ""
-
-#. TRANS: Page title after sending a direct message.
-#: actions/newmessage.php:196
-msgid "Message sent"
-msgstr ""
-
-#. TRANS: Confirmation text after sending a direct message.
-#. TRANS: %s is the direct message recipient.
-#. TRANS: Message given have sent a direct message to another user.
-#. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:202 lib/command.php:640
+#. TRANS: Client error displayed when the parameter "status" is missing.
+#. TRANS: %d is the maximum number of character for a notice.
+#. TRANS: Error message in incoming mail handler used when an incoming e-mail contains too many characters.
+#: actions/newnotice.php:125 lib/mailhandler.php:64

 #, php-format
 #, php-format

-msgid "Direct message to %s sent."
-msgstr ""
-
-#. TRANS: Page title after an AJAX error occurred on the "send direct message" page.
-#. TRANS: Page title after an AJAX error occurs on the send notice page.
-#: actions/newmessage.php:228 actions/newnotice.php:271 lib/error.php:117
-msgid "Ajax Error"
-msgstr ""
-
-#. TRANS: Page title for sending a new notice.
-#. TRANS: Title for form to send a new notice.
-#: actions/newnotice.php:67 actions/newnotice.php:293
-msgctxt "TITLE"
-msgid "New notice"
-msgstr ""
+msgid "That's too long. Maximum notice size is %d character."
+msgid_plural "That's too long. Maximum notice size is %d characters."
+msgstr[0] ""
+msgstr[1] ""

 
 

-#. TRANS: Page title after sending a notice.
-#: actions/newnotice.php:237
-msgid "Notice posted"
+#: actions/newnotice.php:203
+msgid "Saved the notice!"

 msgstr ""
 
 #. TRANS: Instructions for Notice search page.
 msgstr ""
 
 #. TRANS: Instructions for Notice search page.


@@ -3992,68 +3678,68 @@ msgid "Updates matching search term \"%1$s\" on %2$s."
 msgstr ""
 
 #. TRANS: Client error displayed trying to nudge a user that cannot be nudged.
 msgstr ""
 
 #. TRANS: Client error displayed trying to nudge a user that cannot be nudged.

-#: actions/nudge.php:88
+#: actions/nudge.php:85

 msgid ""
 "This user doesn't allow nudges or hasn't confirmed or set their email "
 "address yet."
 msgstr ""
 
 #. TRANS: Page title after sending a nudge.
 msgid ""
 "This user doesn't allow nudges or hasn't confirmed or set their email "
 "address yet."
 msgstr ""
 
 #. TRANS: Page title after sending a nudge.

-#: actions/nudge.php:98
+#: actions/nudge.php:94

 msgid "Nudge sent"
 msgstr ""
 
 #. TRANS: Confirmation text after sending a nudge.
 msgid "Nudge sent"
 msgstr ""
 
 #. TRANS: Confirmation text after sending a nudge.

-#: actions/nudge.php:102
+#: actions/nudge.php:98

 msgid "Nudge sent!"
 msgstr ""
 
 #. TRANS: Message displayed to an anonymous user trying to view OAuth application list.
 msgid "Nudge sent!"
 msgstr ""
 
 #. TRANS: Message displayed to an anonymous user trying to view OAuth application list.

-#: actions/oauthappssettings.php:57
+#: actions/oauthappssettings.php:59

 msgid "You must be logged in to list your applications."
 msgstr ""
 
 #. TRANS: Page title for OAuth applications
 msgid "You must be logged in to list your applications."
 msgstr ""
 
 #. TRANS: Page title for OAuth applications

-#: actions/oauthappssettings.php:73
+#: actions/oauthappssettings.php:74

 msgid "OAuth applications"
 msgstr ""
 
 #. TRANS: Page instructions for OAuth applications
 msgid "OAuth applications"
 msgstr ""
 
 #. TRANS: Page instructions for OAuth applications

-#: actions/oauthappssettings.php:85
+#: actions/oauthappssettings.php:86

 msgid "Applications you have registered"
 msgstr ""
 
 #. TRANS: Empty list message on page with OAuth applications.
 msgid "Applications you have registered"
 msgstr ""
 
 #. TRANS: Empty list message on page with OAuth applications.

-#: actions/oauthappssettings.php:138
+#: actions/oauthappssettings.php:139

 #, php-format
 msgid "You have not registered any applications yet."
 msgstr ""
 
 #. TRANS: Title for OAuth connection settings.
 #, php-format
 msgid "You have not registered any applications yet."
 msgstr ""
 
 #. TRANS: Title for OAuth connection settings.

-#: actions/oauthconnectionssettings.php:69
+#: actions/oauthconnectionssettings.php:68

 msgid "Connected applications"
 msgstr ""
 
 #. TRANS: Instructions for OAuth connection settings.
 msgid "Connected applications"
 msgstr ""
 
 #. TRANS: Instructions for OAuth connection settings.

-#: actions/oauthconnectionssettings.php:80
+#: actions/oauthconnectionssettings.php:79

 msgid "The following connections exist for your account."
 msgstr ""
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
 msgid "The following connections exist for your account."
 msgstr ""
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.

-#: actions/oauthconnectionssettings.php:166
+#: actions/oauthconnectionssettings.php:164

 msgid "You are not a user of that application."
 msgstr ""
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
 msgid "You are not a user of that application."
 msgstr ""
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.

-#: actions/oauthconnectionssettings.php:181
+#: actions/oauthconnectionssettings.php:178

 #, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr ""
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
 #, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr ""
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.

-#: actions/oauthconnectionssettings.php:200
+#: actions/oauthconnectionssettings.php:196

 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "


@@ -4061,81 +3747,20 @@ msgid ""
 msgstr ""
 
 #. TRANS: Empty list message when no applications have been authorised yet.
 msgstr ""
 
 #. TRANS: Empty list message when no applications have been authorised yet.

-#: actions/oauthconnectionssettings.php:211
+#: actions/oauthconnectionssettings.php:207

 msgid "You have not authorized any applications to use your account."
 msgstr ""
 
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.
 msgid "You have not authorized any applications to use your account."
 msgstr ""
 
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.

-#: actions/oauthconnectionssettings.php:231
+#: actions/oauthconnectionssettings.php:227

 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
 "this instance of StatusNet."
 msgstr ""
 
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
 "this instance of StatusNet."
 msgstr ""
 

-#. TRANS: Server error displayed in oEmbed action when path not found.
-#. TRANS: %s is a path.
-#: actions/oembed.php:66
-#, php-format
-msgid "\"%s\" not found."
-msgstr ""
-
-#. TRANS: Server error displayed in oEmbed action when notice not found.
-#. TRANS: %s is a notice.
-#: actions/oembed.php:80
-#, php-format
-msgid "Notice %s not found."
-msgstr ""
-
-#. TRANS: Server error displayed in oEmbed action when notice has not profile.
-#. TRANS: Server error displayed trying to show a notice without a connected profile.
-#: actions/oembed.php:85 actions/shownotice.php:99
-msgid "Notice has no profile."
-msgstr ""
-
-#. TRANS: oEmbed title. %1$s is the author name, %2$s is the creation date.
-#. TRANS: Title of the page that shows a notice.
-#. TRANS: %1$s is a user name, %2$s is the notice creation date/time.
-#: actions/oembed.php:89 actions/shownotice.php:196
-#, php-format
-msgid "%1$s's status on %2$s"
-msgstr ""
-
-#. TRANS: Server error displayed in oEmbed action when attachment not found.
-#. TRANS: %d is an attachment ID.
-#: actions/oembed.php:103
-#, php-format
-msgid "Attachment %s not found."
-msgstr ""
-
-#. TRANS: Server error displayed in oEmbed request when a path is not supported.
-#. TRANS: %s is a path.
-#: actions/oembed.php:146
-#, php-format
-msgid "\"%s\" not supported for oembed requests."
-msgstr ""
-
-#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
-#: actions/oembed.php:178
-#, php-format
-msgid "Content type %s not supported."
-msgstr ""
-
-#. TRANS: Error message displaying attachments. %s is the site's base URL.
-#: actions/oembed.php:182
-#, php-format
-msgid "Only %s URLs over plain HTTP please."
-msgstr ""
-
-#. TRANS: Server error displayed in oEmbed action when request specifies an unsupported data format.
-#. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:204 actions/oembed.php:224 lib/apiaction.php:1293
-#: lib/apiaction.php:1320 lib/apiaction.php:1455
-msgid "Not a supported data format."
-msgstr ""
-

 #. TRANS: Page title for profile settings.
 #: actions/oldschoolsettings.php:58
 msgid "Old school UI settings"
 #. TRANS: Page title for profile settings.
 #: actions/oldschoolsettings.php:58
 msgid "Old school UI settings"


@@ -4148,25 +3773,21 @@ msgstr ""
 
 #. TRANS: Confirmation shown when user profile settings are saved.
 #. TRANS: Message after successful saving of administrative settings.
 
 #. TRANS: Confirmation shown when user profile settings are saved.
 #. TRANS: Message after successful saving of administrative settings.

-#: actions/oldschoolsettings.php:124 actions/profilesettings.php:466
-#: lib/adminpanelaction.php:138
+#: actions/oldschoolsettings.php:123 actions/profilesettings.php:439
+#: lib/adminpanelaction.php:135

 msgid "Settings saved."
 msgstr ""
 
 msgid "Settings saved."
 msgstr ""
 

-#: actions/oldschoolsettings.php:161
+#: actions/oldschoolsettings.php:160

 msgid "Only stream mode (no conversations) in timelines"
 msgstr ""
 
 msgid "Only stream mode (no conversations) in timelines"
 msgstr ""
 

-#: actions/oldschoolsettings.php:165
-msgid "Show conversation page as hierarchical trees"
-msgstr ""
-
-#: actions/oldschoolsettings.php:169
+#: actions/oldschoolsettings.php:164

 msgid "Show nicknames (not full names) in timelines"
 msgstr ""
 
 #. TRANS: Button text to save a list.
 msgid "Show nicknames (not full names) in timelines"
 msgstr ""
 
 #. TRANS: Button text to save a list.

-#: actions/oldschoolsettings.php:187 lib/peopletageditform.php:168
+#: actions/oldschoolsettings.php:182 lib/peopletageditform.php:168

 msgid "Save"
 msgstr ""
 
 msgid "Save"
 msgstr ""
 


@@ -4182,53 +3803,35 @@ msgstr ""
 
 #. TRANS: Client error displayed trying to use "one time password login" when already logged in.
 #. TRANS: Client error displayed when trying to register while already logged in.
 
 #. TRANS: Client error displayed trying to use "one time password login" when already logged in.
 #. TRANS: Client error displayed when trying to register while already logged in.

-#: actions/otp.php:62 actions/register.php:136
+#: actions/otp.php:62 actions/register.php:134

 msgid "Already logged in."
 msgstr ""
 
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
 msgid "Already logged in."
 msgstr ""
 
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a user.

-#: actions/otp.php:70
+#: actions/otp.php:69

 msgid "No user ID specified."
 msgstr ""
 
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
 msgid "No user ID specified."
 msgstr ""
 
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.

-#: actions/otp.php:86
+#: actions/otp.php:83

 msgid "No login token specified."
 msgstr ""
 
 #. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
 msgid "No login token specified."
 msgstr ""
 
 #. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.

-#: actions/otp.php:94
+#: actions/otp.php:90

 msgid "No login token requested."
 msgstr ""
 
 #. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
 msgid "No login token requested."
 msgstr ""
 
 #. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.

-#: actions/otp.php:100
+#: actions/otp.php:95

 msgid "Invalid login token specified."
 msgstr ""
 
 #. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
 msgid "Invalid login token specified."
 msgstr ""
 
 #. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.

-#: actions/otp.php:110
+#: actions/otp.php:104

 msgid "Login token expired."
 msgstr ""
 
 msgid "Login token expired."
 msgstr ""
 

-#. TRANS: Title for outbox for any but the fist page.
-#. TRANS: %1$s is the user nickname, %2$d is the page number.
-#: actions/outbox.php:57
-#, php-format
-msgid "Outbox for %1$s - page %2$d"
-msgstr ""
-
-#. TRANS: Title for first page of outbox.
-#: actions/outbox.php:61
-#, php-format
-msgid "Outbox for %s"
-msgstr ""
-
-#. TRANS: Instructions for outbox.
-#: actions/outbox.php:103
-msgid "This is your outbox, which lists private messages you have sent."
-msgstr ""
-

 #. TRANS: Title for page where to change password.
 #: actions/passwordsettings.php:59
 msgctxt "TITLE"
 #. TRANS: Title for page where to change password.
 #: actions/passwordsettings.php:59
 msgctxt "TITLE"


@@ -4242,7 +3845,7 @@ msgstr ""
 
 #. TRANS: Fieldset legend on page where to change password.
 #. TRANS: Fieldset legend for password reset form.
 
 #. TRANS: Fieldset legend on page where to change password.
 #. TRANS: Fieldset legend for password reset form.

-#: actions/passwordsettings.php:99 actions/recoverpassword.php:251
+#: actions/passwordsettings.php:99 actions/recoverpassword.php:240

 msgid "Password change"
 msgstr ""
 
 msgid "Password change"
 msgstr ""
 


@@ -4253,13 +3856,13 @@ msgstr ""
 
 #. TRANS: Field label on page where to change password.
 #. TRANS: Field label for password reset form.
 
 #. TRANS: Field label on page where to change password.
 #. TRANS: Field label for password reset form.

-#: actions/passwordsettings.php:113 actions/recoverpassword.php:256
+#: actions/passwordsettings.php:113 actions/recoverpassword.php:245

 msgid "New password"
 msgstr ""
 
 #. TRANS: Field title on page where to change password.
 #. TRANS: Field title on account registration page.
 msgid "New password"
 msgstr ""
 
 #. TRANS: Field title on page where to change password.
 #. TRANS: Field title on account registration page.

-#: actions/passwordsettings.php:115 actions/register.php:446
+#: actions/passwordsettings.php:115 actions/register.php:414

 msgid "6 or more characters."
 msgstr ""
 
 msgid "6 or more characters."
 msgstr ""
 


@@ -4272,8 +3875,8 @@ msgstr ""
 #. TRANS: Field title on page where to change password.
 #. TRANS: Title for field label for password reset form where the password has to be typed again.
 #. TRANS: Field title on account registration page.
 #. TRANS: Field title on page where to change password.
 #. TRANS: Title for field label for password reset form where the password has to be typed again.
 #. TRANS: Field title on account registration page.

-#: actions/passwordsettings.php:121 actions/recoverpassword.php:264
-#: actions/register.php:452
+#: actions/passwordsettings.php:121 actions/recoverpassword.php:253
+#: actions/register.php:420

 msgid "Same as password above."
 msgstr ""
 
 msgid "Same as password above."
 msgstr ""
 


@@ -4283,18 +3886,6 @@ msgctxt "BUTTON"
 msgid "Change"
 msgstr ""
 
 msgid "Change"
 msgstr ""
 

-#. TRANS: Form validation error on page where to change password.
-#. TRANS: Form validation error displayed when trying to register with too short a password.
-#: actions/passwordsettings.php:164 actions/register.php:242
-msgid "Password must be 6 or more characters."
-msgstr ""
-
-#. TRANS: Form validation error on password change when password confirmation does not match.
-#. TRANS: Form validation error displayed when trying to register with non-matching passwords.
-#: actions/passwordsettings.php:168 actions/register.php:246
-msgid "Passwords do not match."
-msgstr ""
-

 #. TRANS: Form validation error on page where to change password.
 #: actions/passwordsettings.php:177
 msgid "Incorrect old password."
 #. TRANS: Form validation error on page where to change password.
 #: actions/passwordsettings.php:177
 msgid "Incorrect old password."


@@ -4308,12 +3899,12 @@ msgstr ""
 #. TRANS: Server error displayed on page where to change password when password change
 #. TRANS: could not be made because of a server error.
 #. TRANS: Reset password form validation error message.
 #. TRANS: Server error displayed on page where to change password when password change
 #. TRANS: could not be made because of a server error.
 #. TRANS: Reset password form validation error message.

-#: actions/passwordsettings.php:201 actions/recoverpassword.php:339
+#: actions/passwordsettings.php:201 actions/recoverpassword.php:327

 msgid "Cannot save new password."
 msgstr ""
 
 #. TRANS: Form validation notice on page where to change password.
 msgid "Cannot save new password."
 msgstr ""
 
 #. TRANS: Form validation notice on page where to change password.

-#: actions/passwordsettings.php:208
+#: actions/passwordsettings.php:207

 msgid "Password saved."
 msgstr ""
 
 msgid "Password saved."
 msgstr ""
 


@@ -4484,7 +4075,7 @@ msgid "Directory where avatars are located."
 msgstr ""
 
 #. TRANS: Fieldset legens in Paths admin panel.
 msgstr ""
 
 #. TRANS: Fieldset legens in Paths admin panel.

-#: actions/pathsadminpanel.php:361
+#: actions/pathsadminpanel.php:361 lib/inlineattachmentlist.php:38

 msgid "Attachments"
 msgstr ""
 
 msgid "Attachments"
 msgstr ""
 


@@ -4520,8 +4111,7 @@ msgid "SSL"
 msgstr ""
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
 msgstr ""
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").

-#. TRANS: Option in dropdown for snapshot method in admin panel for snapshots.
-#: actions/pathsadminpanel.php:419 actions/snapshotadminpanel.php:203
+#: actions/pathsadminpanel.php:419

 msgid "Never"
 msgstr ""
 
 msgid "Never"
 msgstr ""
 


@@ -4585,7 +4175,7 @@ msgstr ""
 
 #. TRANS: Message for anonymous users on list page.
 #. TRANS: This message contains Markdown links in the form [description](link).
 
 #. TRANS: Message for anonymous users on list page.
 #. TRANS: This message contains Markdown links in the form [description](link).

-#: actions/peopletag.php:105
+#: actions/peopletag.php:104

 #, php-format
 msgid ""
 "Lists are how you sort similar people on %%site.name%%, a [micro-blogging]"
 #, php-format
 msgid ""
 "Lists are how you sort similar people on %%site.name%%, a [micro-blogging]"


@@ -4595,28 +4185,28 @@ msgid ""
 msgstr ""
 
 #. TRANS: Client error displayed when a tagger is expected but not provided.
 msgstr ""
 
 #. TRANS: Client error displayed when a tagger is expected but not provided.

-#: actions/peopletagged.php:84 actions/peopletagsubscribers.php:84
-#: actions/showprofiletag.php:69
+#: actions/peopletagged.php:83 actions/peopletagsubscribers.php:83
+#: actions/showprofiletag.php:68

 msgid "No tagger."
 msgstr ""
 
 #. TRANS: Title for list of people listed by the user.
 #. TRANS: %1$s is a list, %2$s is a username.
 msgid "No tagger."
 msgstr ""
 
 #. TRANS: Title for list of people listed by the user.
 #. TRANS: %1$s is a list, %2$s is a username.

-#: actions/peopletagged.php:113
+#: actions/peopletagged.php:109

 #, php-format
 msgid "People listed in %1$s by %2$s"
 msgstr ""
 
 #. TRANS: Title for list of people listed by the user.
 #. TRANS: %1$s is a list, %2$s is a username, %2$s is a page number.
 #, php-format
 msgid "People listed in %1$s by %2$s"
 msgstr ""
 
 #. TRANS: Title for list of people listed by the user.
 #. TRANS: %1$s is a list, %2$s is a username, %2$s is a page number.

-#: actions/peopletagged.php:118
+#: actions/peopletagged.php:114

 #, php-format
 msgid "People listed in %1$s by %2$s, page %3$d"
 msgstr ""
 
 #. TRANS: Addition in tag membership list for creator of a tag.
 #. TRANS: Addition in tag subscribers list for creator of a tag.
 #, php-format
 msgid "People listed in %1$s by %2$s, page %3$d"
 msgstr ""
 
 #. TRANS: Addition in tag membership list for creator of a tag.
 #. TRANS: Addition in tag subscribers list for creator of a tag.

-#: actions/peopletagged.php:197 actions/peopletagsubscribers.php:197
+#: actions/peopletagged.php:193 actions/peopletagsubscribers.php:193

 msgid "Creator"
 msgstr ""
 
 msgid "Creator"
 msgstr ""
 


@@ -4650,46 +4240,46 @@ msgid "Lists by %1$s, page %2$d"
 msgstr ""
 
 #. TRANS: Client error displayed when trying view another user's private lists.
 msgstr ""
 
 #. TRANS: Client error displayed when trying view another user's private lists.

-#: actions/peopletagsbyuser.php:133
+#: actions/peopletagsbyuser.php:130

 msgid "You cannot view others' private lists"
 msgstr ""
 
 #. TRANS: Mode selector label.
 msgid "You cannot view others' private lists"
 msgstr ""
 
 #. TRANS: Mode selector label.

-#: actions/peopletagsbyuser.php:159
+#: actions/peopletagsbyuser.php:155

 msgid "Mode"
 msgstr ""
 
 #. TRANS: Link text to show lists for user %s.
 msgid "Mode"
 msgstr ""
 
 #. TRANS: Link text to show lists for user %s.

-#: actions/peopletagsbyuser.php:169
+#: actions/peopletagsbyuser.php:165

 #, php-format
 msgid "Lists for %s"
 msgstr ""
 
 #. TRANS: Fieldset legend.
 #. TRANS: Fieldset legend on gallery action page.
 #, php-format
 msgid "Lists for %s"
 msgstr ""
 
 #. TRANS: Fieldset legend.
 #. TRANS: Fieldset legend on gallery action page.

-#: actions/peopletagsbyuser.php:181 lib/galleryaction.php:138
+#: actions/peopletagsbyuser.php:177 lib/galleryaction.php:81

 msgid "Select tag to filter"
 msgstr ""
 
 #. TRANS: Checkbox title.
 msgid "Select tag to filter"
 msgstr ""
 
 #. TRANS: Checkbox title.

-#: actions/peopletagsbyuser.php:192
+#: actions/peopletagsbyuser.php:188

 msgid "Show private tags."
 msgstr ""
 
 #. TRANS: Checkbox label to show public tags.
 msgid "Show private tags."
 msgstr ""
 
 #. TRANS: Checkbox label to show public tags.

-#: actions/peopletagsbyuser.php:194
+#: actions/peopletagsbyuser.php:190

 msgctxt "LABEL"
 msgid "Public"
 msgstr ""
 
 #. TRANS: Checkbox title.
 msgctxt "LABEL"
 msgid "Public"
 msgstr ""
 
 #. TRANS: Checkbox title.

-#: actions/peopletagsbyuser.php:196
+#: actions/peopletagsbyuser.php:192

 msgid "Show public tags."
 msgstr ""
 
 #. TRANS: Submit button text for tag filter form.
 #. TRANS: Submit button text on gallery action page.
 msgid "Show public tags."
 msgstr ""
 
 #. TRANS: Submit button text for tag filter form.
 #. TRANS: Submit button text on gallery action page.

-#: actions/peopletagsbyuser.php:199 lib/galleryaction.php:145
+#: actions/peopletagsbyuser.php:195 lib/galleryaction.php:88

 msgctxt "BUTTON"
 msgid "Go"
 msgstr ""
 msgctxt "BUTTON"
 msgid "Go"
 msgstr ""


@@ -4697,11 +4287,11 @@ msgstr ""
 #. TRANS: Message displayed for anonymous users on page that displays lists by a user.
 #. TRANS: This message contains Markdown links in the form [description](links).
 #. TRANS: %s is a tagger nickname.
 #. TRANS: Message displayed for anonymous users on page that displays lists by a user.
 #. TRANS: This message contains Markdown links in the form [description](links).
 #. TRANS: %s is a tagger nickname.

-#: actions/peopletagsbyuser.php:215
+#: actions/peopletagsbyuser.php:211

 #, php-format
 msgid ""
 #, php-format
 msgid ""

-"These are lists created by **%s**. Lists are how you sort similar people on %"
-"%%%site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"These are lists created by **%s**. Lists are how you sort similar people on "
+"%%%%site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"

 "blogging) service based on the Free Software [StatusNet](http://status.net/) "
 "tool. You can easily keep track of what they are doing by subscribing to the "
 "list's timeline."
 "blogging) service based on the Free Software [StatusNet](http://status.net/) "
 "tool. You can easily keep track of what they are doing by subscribing to the "
 "list's timeline."


@@ -4710,7 +4300,7 @@ msgstr ""
 #. TRANS: Message displayed on page that displays lists by a user when there are none.
 #. TRANS: This message contains Markdown links in the form [description](links).
 #. TRANS: %s is a tagger nickname.
 #. TRANS: Message displayed on page that displays lists by a user when there are none.
 #. TRANS: This message contains Markdown links in the form [description](links).
 #. TRANS: %s is a tagger nickname.

-#: actions/peopletagsbyuser.php:278
+#: actions/peopletagsbyuser.php:274

 #, php-format
 msgid "%s has not created any [lists](%%%%doc.lists%%%%) yet."
 msgstr ""
 #, php-format
 msgid "%s has not created any [lists](%%%%doc.lists%%%%) yet."
 msgstr ""


@@ -4730,11 +4320,11 @@ msgstr ""
 #. TRANS: Message displayed for anonymous users on page that displays lists for a user.
 #. TRANS: This message contains Markdown links in the form [description](links).
 #. TRANS: %s is a tagger nickname.
 #. TRANS: Message displayed for anonymous users on page that displays lists for a user.
 #. TRANS: This message contains Markdown links in the form [description](links).
 #. TRANS: %s is a tagger nickname.

-#: actions/peopletagsforuser.php:113
+#: actions/peopletagsforuser.php:110

 #, php-format
 msgid ""
 #, php-format
 msgid ""

-"These are lists for **%s**. lists are how you sort similar people on %%%%"
-"site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"These are lists for **%s**. lists are how you sort similar people on %%"
+"%%site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"

 "blogging) service based on the Free Software [StatusNet](http://status.net/) "
 "tool. You can easily keep track of what they are doing by subscribing to the "
 "list's timeline."
 "blogging) service based on the Free Software [StatusNet](http://status.net/) "
 "tool. You can easily keep track of what they are doing by subscribing to the "
 "list's timeline."


@@ -4743,21 +4333,21 @@ msgstr ""
 #. TRANS: Message displayed on page that displays lists a user was added to when there are none.
 #. TRANS: This message contains Markdown links in the form [description](links).
 #. TRANS: %s is a user nickname.
 #. TRANS: Message displayed on page that displays lists a user was added to when there are none.
 #. TRANS: This message contains Markdown links in the form [description](links).
 #. TRANS: %s is a user nickname.

-#: actions/peopletagsforuser.php:149
+#: actions/peopletagsforuser.php:146

 #, php-format
 msgid "%s has not been [listed](%%%%doc.lists%%%%) by anyone yet."
 msgstr ""
 
 #. TRANS: Page title for list of list subscribers.
 #. TRANS: %1$s is a list, %2$s is a user nickname.
 #, php-format
 msgid "%s has not been [listed](%%%%doc.lists%%%%) by anyone yet."
 msgstr ""
 
 #. TRANS: Page title for list of list subscribers.
 #. TRANS: %1$s is a list, %2$s is a user nickname.

-#: actions/peopletagsubscribers.php:113
+#: actions/peopletagsubscribers.php:109

 #, php-format
 msgid "Subscribers to list %1$s by %2$s"
 msgstr ""
 
 #. TRANS: Page title for list of list subscribers.
 #. TRANS: %1$s is a list, %2$s is a user nickname, %3$d is a page number.
 #, php-format
 msgid "Subscribers to list %1$s by %2$s"
 msgstr ""
 
 #. TRANS: Page title for list of list subscribers.
 #. TRANS: %1$s is a list, %2$s is a user nickname, %3$d is a page number.

-#: actions/peopletagsubscribers.php:118
+#: actions/peopletagsubscribers.php:114

 #, php-format
 msgid "Subscribers to list %1$s by %2$s, page %3$d"
 msgstr ""
 #, php-format
 msgid "Subscribers to list %1$s by %2$s, page %3$d"
 msgstr ""


@@ -4779,7 +4369,7 @@ msgstr ""
 #. TRANS: Message displayed for anonymous users on page that displays lists subscribed to by a user.
 #. TRANS: This message contains Markdown links in the form [description](links).
 #. TRANS: %s is a profile nickname.
 #. TRANS: Message displayed for anonymous users on page that displays lists subscribed to by a user.
 #. TRANS: This message contains Markdown links in the form [description](links).
 #. TRANS: %s is a profile nickname.

-#: actions/peopletagsubscriptions.php:115
+#: actions/peopletagsubscriptions.php:112

 #, php-format
 msgid ""
 "These are lists subscribed to by **%s**. Lists are how you sort similar "
 #, php-format
 msgid ""
 "These are lists subscribed to by **%s**. Lists are how you sort similar "


@@ -4800,23 +4390,23 @@ msgstr ""
 #. TRANS: Client error displayed trying to perform any request method other than POST.
 #. TRANS: Do not translate POST.
 #. TRANS: Client error displayed when trying to use another method than POST.
 #. TRANS: Client error displayed trying to perform any request method other than POST.
 #. TRANS: Do not translate POST.
 #. TRANS: Client error displayed when trying to use another method than POST.

-#: actions/pluginenable.php:78 actions/subscribe.php:77
-#: actions/subscribepeopletag.php:66 actions/unsubscribepeopletag.php:67
+#: actions/pluginenable.php:78 actions/subscribe.php:76
+#: actions/subscribepeopletag.php:65 actions/unsubscribepeopletag.php:66

 msgid "This action only accepts POST requests."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to enable or disable a plugin without access rights.
 msgid "This action only accepts POST requests."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to enable or disable a plugin without access rights.

-#: actions/pluginenable.php:105
+#: actions/pluginenable.php:102

 msgid "You cannot administer plugins."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to enable or disable a non-existing plugin.
 msgid "You cannot administer plugins."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to enable or disable a non-existing plugin.

-#: actions/pluginenable.php:113
+#: actions/pluginenable.php:109

 msgid "No such plugin."
 msgstr ""
 
 #. TRANS: Page title for AJAX form return when enabling a plugin.
 msgid "No such plugin."
 msgstr ""
 
 #. TRANS: Page title for AJAX form return when enabling a plugin.

-#: actions/pluginenable.php:162
+#: actions/pluginenable.php:157

 msgctxt "plugin"
 msgid "Enabled"
 msgstr ""
 msgctxt "plugin"
 msgid "Enabled"
 msgstr ""


@@ -4848,42 +4438,42 @@ msgstr ""
 
 #. TRANS: Client error displayed when trying to add an unindentified field to profile.
 #. TRANS: %s is a field name.
 
 #. TRANS: Client error displayed when trying to add an unindentified field to profile.
 #. TRANS: %s is a field name.

-#: actions/profilecompletion.php:109
+#: actions/profilecompletion.php:106

 #, php-format
 msgid "Unidentified field %s."
 msgstr ""
 
 #. TRANS: Page title.
 #, php-format
 msgid "Unidentified field %s."
 msgstr ""
 
 #. TRANS: Page title.

-#: actions/profilecompletion.php:134
+#: actions/profilecompletion.php:130

 msgctxt "TITLE"
 msgid "Search results"
 msgstr ""
 
 #. TRANS: Error message in case a search is shorter than three characters.
 msgctxt "TITLE"
 msgid "Search results"
 msgstr ""
 
 #. TRANS: Error message in case a search is shorter than three characters.

-#: actions/profilecompletion.php:164
+#: actions/profilecompletion.php:160

 msgid "The search string must be at least 3 characters long."
 msgstr ""
 
 #. TRANS: Page title for profile settings.
 msgid "The search string must be at least 3 characters long."
 msgstr ""
 
 #. TRANS: Page title for profile settings.

-#: actions/profilesettings.php:57
+#: actions/profilesettings.php:55

 msgid "Profile settings"
 msgstr ""
 
 #. TRANS: Usage instructions for profile settings.
 msgid "Profile settings"
 msgstr ""
 
 #. TRANS: Usage instructions for profile settings.

-#: actions/profilesettings.php:68
+#: actions/profilesettings.php:66

 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
 
 #. TRANS: Profile settings form legend.
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
 
 #. TRANS: Profile settings form legend.

-#: actions/profilesettings.php:96
+#: actions/profilesettings.php:94

 msgid "Profile information"
 msgstr ""
 
 #. TRANS: Tooltip for field label in form for profile settings.
 #. TRANS: Field title on account registration page.
 #. TRANS: Field title on group edit form.
 msgid "Profile information"
 msgstr ""
 
 #. TRANS: Tooltip for field label in form for profile settings.
 #. TRANS: Field title on account registration page.
 #. TRANS: Field title on group edit form.

-#: actions/profilesettings.php:107 actions/register.php:440
+#: actions/profilesettings.php:105 actions/register.php:408

 #: lib/groupeditform.php:150
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr ""
 #: lib/groupeditform.php:150
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr ""


@@ -4891,8 +4481,8 @@ msgstr ""
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Field label on account registration page.
 #. TRANS: Field label on group edit form.
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Field label on account registration page.
 #. TRANS: Field label on group edit form.

-#: actions/profilesettings.php:111 actions/register.php:471
-#: lib/groupeditform.php:154
+#: actions/profilesettings.php:111 actions/register.php:439
+#: lib/groupeditform.php:158

 msgid "Full name"
 msgstr ""
 
 msgid "Full name"
 msgstr ""
 


@@ -4900,14 +4490,14 @@ msgstr ""
 #. TRANS: Field label on account registration page.
 #. TRANS: Form input field label.
 #. TRANS: Field label on group edit form; points to "more info" for a group.
 #. TRANS: Field label on account registration page.
 #. TRANS: Form input field label.
 #. TRANS: Field label on group edit form; points to "more info" for a group.

-#: actions/profilesettings.php:116 actions/register.php:478
-#: lib/applicationeditform.php:236 lib/groupeditform.php:159
+#: actions/profilesettings.php:116 actions/register.php:446
+#: lib/applicationeditform.php:236 lib/groupeditform.php:163

 msgid "Homepage"
 msgstr ""
 
 #. TRANS: Tooltip for field label in form for profile settings.
 #. TRANS: Field title on account registration page.
 msgid "Homepage"
 msgstr ""
 
 #. TRANS: Tooltip for field label in form for profile settings.
 #. TRANS: Field title on account registration page.

-#: actions/profilesettings.php:119 actions/register.php:481
+#: actions/profilesettings.php:119 actions/register.php:449

 msgid "URL of your homepage, blog, or profile on another site."
 msgstr ""
 
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr ""
 


@@ -4917,7 +4507,7 @@ msgstr ""
 #. TRANS: Text area title in form for account registration. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
 #. TRANS: Text area title in form for account registration. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).

-#: actions/profilesettings.php:127 actions/register.php:490
+#: actions/profilesettings.php:127 actions/register.php:458

 #, php-format
 msgid "Describe yourself and your interests in %d character."
 msgid_plural "Describe yourself and your interests in %d characters."
 #, php-format
 msgid "Describe yourself and your interests in %d character."
 msgid_plural "Describe yourself and your interests in %d characters."


@@ -4926,14 +4516,14 @@ msgstr[1] ""
 
 #. TRANS: Tooltip for field label in form for profile settings.
 #. TRANS: Text area title on account registration page.
 
 #. TRANS: Tooltip for field label in form for profile settings.
 #. TRANS: Text area title on account registration page.

-#: actions/profilesettings.php:133 actions/register.php:496
+#: actions/profilesettings.php:133 actions/register.php:464

 msgid "Describe yourself and your interests."
 msgstr ""
 
 #. TRANS: Text area label in form for profile settings where users can provide
 #. TRANS: their biography.
 #. TRANS: Text area label on account registration page.
 msgid "Describe yourself and your interests."
 msgstr ""
 
 #. TRANS: Text area label in form for profile settings where users can provide
 #. TRANS: their biography.
 #. TRANS: Text area label on account registration page.

-#: actions/profilesettings.php:137 actions/register.php:499
+#: actions/profilesettings.php:137 actions/register.php:467

 msgid "Bio"
 msgstr ""
 
 msgid "Bio"
 msgstr ""
 


@@ -4941,14 +4531,14 @@ msgstr ""
 #. TRANS: Field label on account registration page.
 #. TRANS: Field label on group edit form.
 #. TRANS: Dropdown option for searching in profiles.
 #. TRANS: Field label on account registration page.
 #. TRANS: Field label on group edit form.
 #. TRANS: Dropdown option for searching in profiles.

-#: actions/profilesettings.php:143 actions/register.php:505
-#: lib/groupeditform.php:184 lib/togglepeopletag.php:113
+#: actions/profilesettings.php:143 actions/register.php:473
+#: lib/groupeditform.php:188 lib/togglepeopletag.php:113

 msgid "Location"
 msgstr ""
 
 #. TRANS: Tooltip for field label in form for profile settings.
 #. TRANS: Field title on account registration page.
 msgid "Location"
 msgstr ""
 
 #. TRANS: Tooltip for field label in form for profile settings.
 #. TRANS: Field title on account registration page.

-#: actions/profilesettings.php:146 actions/register.php:508
+#: actions/profilesettings.php:146 actions/register.php:476

 msgid "Where you are, like \"City, State (or Region), Country\"."
 msgstr ""
 
 msgid "Where you are, like \"City, State (or Region), Country\"."
 msgstr ""
 


@@ -4960,7 +4550,7 @@ msgstr ""
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Title for group tag cloud section.
 #. TRANS: %s is a group name.
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Title for group tag cloud section.
 #. TRANS: %s is a group name.

-#: actions/profilesettings.php:159 lib/galleryaction.php:118
+#: actions/profilesettings.php:159 lib/galleryaction.php:61

 #: lib/grouptagcloudsection.php:57
 msgid "Tags"
 msgstr ""
 #: lib/grouptagcloudsection.php:57
 msgid "Tags"
 msgstr ""


@@ -5023,26 +4613,14 @@ msgstr ""
 msgid "Make updates visible only to my followers"
 msgstr ""
 
 msgid "Make updates visible only to my followers"
 msgstr ""
 

-#. TRANS: Validation error in form for profile settings.
-#. TRANS: Plural form is used based on the maximum number of allowed
-#. TRANS: characters for the biography (%d).
-#. TRANS: Form validation error on registration page when providing too long a bio text.
-#. TRANS: %d is the maximum number of characters for bio; used for plural.
-#: actions/profilesettings.php:278 actions/register.php:231
-#, php-format
-msgid "Bio is too long (maximum %d character)."
-msgid_plural "Bio is too long (maximum %d characters)."
-msgstr[0] ""
-msgstr[1] ""
-

 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Client error displayed trying to save site settings without a timezone.
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Client error displayed trying to save site settings without a timezone.

-#: actions/profilesettings.php:289 actions/siteadminpanel.php:175
+#: actions/profilesettings.php:295 actions/siteadminpanel.php:175

 msgid "Timezone not selected."
 msgstr ""
 
 #. TRANS: Validation error in form for profile settings.
 msgid "Timezone not selected."
 msgstr ""
 
 #. TRANS: Validation error in form for profile settings.

-#: actions/profilesettings.php:297
+#: actions/profilesettings.php:299

 msgid "Language is too long (maximum 50 characters)."
 msgstr ""
 
 msgid "Language is too long (maximum 50 characters)."
 msgstr ""
 


@@ -5052,81 +4630,81 @@ msgstr ""
 #. TRANS: %s is the invalid tag.
 #. TRANS: Error displayed if a given tag is invalid.
 #. TRANS: %s is the invalid tag.
 #. TRANS: %s is the invalid tag.
 #. TRANS: Error displayed if a given tag is invalid.
 #. TRANS: %s is the invalid tag.

-#: actions/profilesettings.php:314 actions/tagprofile.php:205
-#: lib/command.php:455
+#: actions/profilesettings.php:316 actions/tagprofile.php:147
+#: lib/command.php:406

 #, php-format
 msgid "Invalid tag: \"%s\"."
 msgstr ""
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
 #. TRANS: automatically subscribe to any subscriber.
 #, php-format
 msgid "Invalid tag: \"%s\"."
 msgstr ""
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
 #. TRANS: automatically subscribe to any subscriber.

-#: actions/profilesettings.php:377
+#: actions/profilesettings.php:349

 msgid "Could not update user for autosubscribe or subscribe_policy."
 msgstr ""
 
 #. TRANS: Server error thrown when user profile location preference settings could not be updated.
 msgid "Could not update user for autosubscribe or subscribe_policy."
 msgstr ""
 
 #. TRANS: Server error thrown when user profile location preference settings could not be updated.

-#: actions/profilesettings.php:435
+#: actions/profilesettings.php:412

 msgid "Could not save location prefs."
 msgstr ""
 
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
 msgid "Could not save location prefs."
 msgstr ""
 
 #. TRANS: Server error thrown when user profile settings tags could not be saved.

-#: actions/profilesettings.php:457
+#: actions/profilesettings.php:432

 msgid "Could not save tags."
 msgstr ""
 
 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
 msgid "Could not save tags."
 msgstr ""
 
 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.

-#: actions/profilesettings.php:513 actions/restoreaccount.php:60
+#: actions/profilesettings.php:475 actions/restoreaccount.php:60

 msgid "Restore account"
 msgstr ""
 
 #. TRANS: Client error displayed when requesting a public timeline page beyond the page limit.
 #. TRANS: %s is the page limit.
 msgid "Restore account"
 msgstr ""
 
 #. TRANS: Client error displayed when requesting a public timeline page beyond the page limit.
 #. TRANS: %s is the page limit.

-#: actions/public.php:84
+#: actions/public.php:71

 #, php-format
 msgid "Beyond the page limit (%s)."
 msgstr ""
 
 #. TRANS: Server error displayed when a public timeline cannot be retrieved.
 #, php-format
 msgid "Beyond the page limit (%s)."
 msgstr ""
 
 #. TRANS: Server error displayed when a public timeline cannot be retrieved.

-#: actions/public.php:104
+#: actions/public.php:83

 msgid "Could not retrieve public timeline."
 msgstr ""
 
 #. TRANS: Title for all public timeline pages but the first.
 #. TRANS: %d is the page number.
 msgid "Could not retrieve public timeline."
 msgstr ""
 
 #. TRANS: Title for all public timeline pages but the first.
 #. TRANS: %d is the page number.

-#: actions/public.php:142
+#: actions/public.php:113

 #, php-format
 msgid "Public timeline, page %d"
 msgstr ""
 
 #. TRANS: Title for the first public timeline page.
 #. TRANS: Menu item title in search group navigation panel.
 #, php-format
 msgid "Public timeline, page %d"
 msgstr ""
 
 #. TRANS: Title for the first public timeline page.
 #. TRANS: Menu item title in search group navigation panel.

-#: actions/public.php:145 lib/publicgroupnav.php:69
+#: actions/public.php:116 lib/publicgroupnav.php:65

 msgid "Public timeline"
 msgstr ""
 
 #. TRANS: Link description for public timeline feed.
 msgid "Public timeline"
 msgstr ""
 
 #. TRANS: Link description for public timeline feed.

-#: actions/public.php:180
+#: actions/public.php:151

 msgid "Public Timeline Feed (Activity Streams JSON)"
 msgstr ""
 
 #. TRANS: Link description for public timeline feed.
 msgid "Public Timeline Feed (Activity Streams JSON)"
 msgstr ""
 
 #. TRANS: Link description for public timeline feed.

-#: actions/public.php:183
+#: actions/public.php:154

 msgid "Public Timeline Feed (RSS 1.0)"
 msgstr ""
 
 #. TRANS: Link description for public timeline feed.
 msgid "Public Timeline Feed (RSS 1.0)"
 msgstr ""
 
 #. TRANS: Link description for public timeline feed.

-#: actions/public.php:188
+#: actions/public.php:159

 msgid "Public Timeline Feed (RSS 2.0)"
 msgstr ""
 
 #. TRANS: Link description for public timeline feed.
 msgid "Public Timeline Feed (RSS 2.0)"
 msgstr ""
 
 #. TRANS: Link description for public timeline feed.

-#: actions/public.php:193
+#: actions/public.php:164

 msgid "Public Timeline Feed (Atom)"
 msgstr ""
 
 #. TRANS: Text displayed for public feed when there are no public notices.
 msgid "Public Timeline Feed (Atom)"
 msgstr ""
 
 #. TRANS: Text displayed for public feed when there are no public notices.

-#: actions/public.php:199
+#: actions/public.php:170

 #, php-format
 msgid ""
 "This is the public timeline for %%site.name%% but no one has posted anything "
 #, php-format
 msgid ""
 "This is the public timeline for %%site.name%% but no one has posted anything "


@@ -5134,12 +4712,12 @@ msgid ""
 msgstr ""
 
 #. TRANS: Additional text displayed for public feed when there are no public notices for a logged in user.
 msgstr ""
 
 #. TRANS: Additional text displayed for public feed when there are no public notices for a logged in user.

-#: actions/public.php:203
+#: actions/public.php:174

 msgid "Be the first to post!"
 msgstr ""
 
 #. TRANS: Additional text displayed for public feed when there are no public notices for a not logged in user.
 msgid "Be the first to post!"
 msgstr ""
 
 #. TRANS: Additional text displayed for public feed when there are no public notices for a not logged in user.

-#: actions/public.php:208
+#: actions/public.php:179

 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post!"
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post!"


@@ -5147,7 +4725,7 @@ msgstr ""
 
 #. TRANS: Message for not logged in users at an invite-only site trying to view the public feed of notices.
 #. TRANS: This message contains Markdown links. Please mind the formatting.
 
 #. TRANS: Message for not logged in users at an invite-only site trying to view the public feed of notices.
 #. TRANS: This message contains Markdown links. Please mind the formatting.

-#: actions/public.php:280
+#: actions/public.php:247

 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"


@@ -5158,7 +4736,7 @@ msgstr ""
 
 #. TRANS: Message for not logged in users at a closed site trying to view the public feed of notices.
 #. TRANS: This message contains Markdown links. Please mind the formatting.
 
 #. TRANS: Message for not logged in users at a closed site trying to view the public feed of notices.
 #. TRANS: This message contains Markdown links. Please mind the formatting.

-#: actions/public.php:287
+#: actions/public.php:254

 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"


@@ -5216,140 +4794,135 @@ msgid "You are already logged in!"
 msgstr ""
 
 #. TRANS: Client error displayed when password recovery code is not correct.
 msgstr ""
 
 #. TRANS: Client error displayed when password recovery code is not correct.

-#: actions/recoverpassword.php:64
+#: actions/recoverpassword.php:63

 msgid "No such recovery code."
 msgstr ""
 
 #. TRANS: Client error displayed when no proper password recovery code was submitted.
 msgid "No such recovery code."
 msgstr ""
 
 #. TRANS: Client error displayed when no proper password recovery code was submitted.

-#: actions/recoverpassword.php:69
+#: actions/recoverpassword.php:67

 msgid "Not a recovery code."
 msgstr ""
 
 #. TRANS: Server error displayed trying to recover password without providing a user.
 msgid "Not a recovery code."
 msgstr ""
 
 #. TRANS: Server error displayed trying to recover password without providing a user.

-#: actions/recoverpassword.php:77
+#: actions/recoverpassword.php:74

 msgid "Recovery code for unknown user."
 msgstr ""
 
 #. TRANS: Server error displayed removing a password recovery code from the database.
 msgid "Recovery code for unknown user."
 msgstr ""
 
 #. TRANS: Server error displayed removing a password recovery code from the database.

-#: actions/recoverpassword.php:91
+#: actions/recoverpassword.php:87

 msgid "Error with confirmation code."
 msgstr ""
 
 #. TRANS: Client error displayed trying to recover password with too old a recovery code.
 msgid "Error with confirmation code."
 msgstr ""
 
 #. TRANS: Client error displayed trying to recover password with too old a recovery code.

-#: actions/recoverpassword.php:103
+#: actions/recoverpassword.php:98

 msgid "This confirmation code is too old. Please start again."
 msgstr ""
 
 msgid "This confirmation code is too old. Please start again."
 msgstr ""
 

-#. TRANS: Server error displayed when updating a user's e-mail address in the database fails while recovering a password.
-#: actions/recoverpassword.php:118
-msgid "Could not update user with confirmed email address."
-msgstr ""
-

 #. TRANS: Page notice for password recovery page.
 #. TRANS: Page notice for password recovery page.

-#: actions/recoverpassword.php:160
+#: actions/recoverpassword.php:149

 msgid ""
 "If you have forgotten or lost your password, you can get a new one sent to "
 "the email address you have stored in your account."
 msgstr ""
 
 #. TRANS: Page notice for password change page.
 msgid ""
 "If you have forgotten or lost your password, you can get a new one sent to "
 "the email address you have stored in your account."
 msgstr ""
 
 #. TRANS: Page notice for password change page.

-#: actions/recoverpassword.php:167
+#: actions/recoverpassword.php:156

 msgid "You have been identified. Enter a new password below."
 msgstr ""
 
 #. TRANS: Fieldset legend for password recovery page.
 msgid "You have been identified. Enter a new password below."
 msgstr ""
 
 #. TRANS: Fieldset legend for password recovery page.

-#: actions/recoverpassword.php:198
+#: actions/recoverpassword.php:187

 msgid "Password recovery"
 msgstr ""
 
 #. TRANS: Field label on password recovery page.
 msgid "Password recovery"
 msgstr ""
 
 #. TRANS: Field label on password recovery page.

-#: actions/recoverpassword.php:202
+#: actions/recoverpassword.php:191

 msgid "Nickname or email address"
 msgstr ""
 
 #. TRANS: Title for field label on password recovery page.
 msgid "Nickname or email address"
 msgstr ""
 
 #. TRANS: Title for field label on password recovery page.

-#: actions/recoverpassword.php:205
+#: actions/recoverpassword.php:194

 msgid "Your nickname on this server, or your registered email address."
 msgstr ""
 
 #. TRANS: Field label on password recovery page.
 msgid "Your nickname on this server, or your registered email address."
 msgstr ""
 
 #. TRANS: Field label on password recovery page.

-#: actions/recoverpassword.php:212
+#: actions/recoverpassword.php:201

 msgid "Recover"
 msgstr ""
 
 #. TRANS: Button text on password recovery page.
 msgid "Recover"
 msgstr ""
 
 #. TRANS: Button text on password recovery page.

-#: actions/recoverpassword.php:214
+#: actions/recoverpassword.php:203

 msgctxt "BUTTON"
 msgid "Recover"
 msgstr ""
 
 #. TRANS: Title for password recovery page in password reset mode.
 msgctxt "BUTTON"
 msgid "Recover"
 msgstr ""
 
 #. TRANS: Title for password recovery page in password reset mode.

-#: actions/recoverpassword.php:223
+#: actions/recoverpassword.php:212

 msgid "Reset password"
 msgstr ""
 
 #. TRANS: Title for password recovery page in password recover mode.
 msgid "Reset password"
 msgstr ""
 
 #. TRANS: Title for password recovery page in password recover mode.

-#: actions/recoverpassword.php:225
+#: actions/recoverpassword.php:214

 msgid "Recover password"
 msgstr ""
 
 #. TRANS: Title for password recovery page in email sent mode.
 #. TRANS: Subject for password recovery e-mail.
 msgid "Recover password"
 msgstr ""
 
 #. TRANS: Title for password recovery page in email sent mode.
 #. TRANS: Subject for password recovery e-mail.

-#: actions/recoverpassword.php:227 classes/User.php:1146
+#: actions/recoverpassword.php:216 classes/User.php:940

 msgid "Password recovery requested"
 msgstr ""
 
 #. TRANS: Title for password recovery page in password saved mode.
 msgid "Password recovery requested"
 msgstr ""
 
 #. TRANS: Title for password recovery page in password saved mode.

-#: actions/recoverpassword.php:229
+#: actions/recoverpassword.php:218

 msgid "Password saved"
 msgstr ""
 
 #. TRANS: Title for field label for password reset form.
 msgid "Password saved"
 msgstr ""
 
 #. TRANS: Title for field label for password reset form.

-#: actions/recoverpassword.php:258
+#: actions/recoverpassword.php:247

 msgid "6 or more characters, and do not forget it!"
 msgstr ""
 
 #. TRANS: Button text for password reset form.
 msgid "6 or more characters, and do not forget it!"
 msgstr ""
 
 #. TRANS: Button text for password reset form.

-#: actions/recoverpassword.php:268
+#: actions/recoverpassword.php:257

 msgctxt "BUTTON"
 msgid "Reset"
 msgstr ""
 
 #. TRANS: Form instructions for password recovery form.
 msgctxt "BUTTON"
 msgid "Reset"
 msgstr ""
 
 #. TRANS: Form instructions for password recovery form.

-#: actions/recoverpassword.php:279
+#: actions/recoverpassword.php:268

 msgid "Enter a nickname or email address."
 msgstr ""
 
 #. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
 msgid "Enter a nickname or email address."
 msgstr ""
 
 #. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.

-#: actions/recoverpassword.php:287
+#: actions/recoverpassword.php:276

 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to reset as password without providing a user.
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to reset as password without providing a user.

-#: actions/recoverpassword.php:312
+#: actions/recoverpassword.php:301

 msgid "Unexpected password reset."
 msgstr ""
 
 #. TRANS: Reset password form validation error message.
 msgid "Unexpected password reset."
 msgstr ""
 
 #. TRANS: Reset password form validation error message.

-#: actions/recoverpassword.php:321
+#: actions/recoverpassword.php:309

 msgid "Password must be 6 characters or more."
 msgstr ""
 
 #. TRANS: Reset password form validation error message.
 msgid "Password must be 6 characters or more."
 msgstr ""
 
 #. TRANS: Reset password form validation error message.

-#: actions/recoverpassword.php:326
+#: actions/recoverpassword.php:314

 msgid "Password and confirmation do not match."
 msgstr ""
 
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
 #. TRANS: Server error displayed when saving fails during user registration.
 msgid "Password and confirmation do not match."
 msgstr ""
 
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
 #. TRANS: Server error displayed when saving fails during user registration.

-#: actions/recoverpassword.php:347 actions/register.php:263
+#: actions/recoverpassword.php:334 actions/register.php:248

 msgid "Error setting user."
 msgstr ""
 
 #. TRANS: Success message for user after password reset.
 msgid "Error setting user."
 msgstr ""
 
 #. TRANS: Success message for user after password reset.

-#: actions/recoverpassword.php:355
+#: actions/recoverpassword.php:341

 msgid "New password successfully saved. You are now logged in."
 msgstr ""
 
 msgid "New password successfully saved. You are now logged in."
 msgstr ""
 


@@ -5365,85 +4938,65 @@ msgstr ""
 msgid "No such file \"%d\"."
 msgstr ""
 
 msgid "No such file \"%d\"."
 msgstr ""
 

-#. TRANS: Client error displayed when trying to register to an invite-only site without an invitation.
-#: actions/register.php:81 actions/register.php:189 actions/register.php:417
-msgid "Sorry, only invited people can register."
-msgstr ""
-
-#. TRANS: Client error displayed when trying to register to an invite-only site without a valid invitation.
-#: actions/register.php:89
-msgid "Sorry, invalid invitation code."
-msgstr ""
-

 #. TRANS: Title for registration page after a succesful registration.
 #. TRANS: Title for registration page after a succesful registration.

-#: actions/register.php:109
+#: actions/register.php:107

 msgid "Registration successful"
 msgstr ""
 
 #. TRANS: Title for registration page.
 msgid "Registration successful"
 msgstr ""
 
 #. TRANS: Title for registration page.

-#: actions/register.php:112
+#: actions/register.php:110

 msgctxt "TITLE"
 msgid "Register"
 msgstr ""
 
 #. TRANS: Client error displayed when trying to register to a closed site.
 msgctxt "TITLE"
 msgid "Register"
 msgstr ""
 
 #. TRANS: Client error displayed when trying to register to a closed site.

-#: actions/register.php:133
+#: actions/register.php:131

 msgid "Registration not allowed."
 msgstr ""
 
 #. TRANS: Form validation error displayed when trying to register without agreeing to the site license.
 msgid "Registration not allowed."
 msgstr ""
 
 #. TRANS: Form validation error displayed when trying to register without agreeing to the site license.

-#: actions/register.php:203
+#: actions/register.php:201

 msgid "You cannot register if you do not agree to the license."
 msgstr ""
 
 msgid "You cannot register if you do not agree to the license."
 msgstr ""
 

-#. TRANS: Form validation error displayed when trying to register with an already registered e-mail address.
-#: actions/register.php:216
-msgid "Email address already exists."
-msgstr ""
-
-#. TRANS: Form validation error displayed when trying to register with an invalid username or password.
-#: actions/register.php:257 actions/register.php:281
-msgid "Invalid username or password."
-msgstr ""
-

 #. TRANS: Page notice on registration page.
 #. TRANS: Page notice on registration page.

-#: actions/register.php:357
+#: actions/register.php:326

 msgid ""
 "With this form you can create a new account. You can then post notices and "
 "link up to friends and colleagues."
 msgstr ""
 
 #. TRANS: Field label on account registration page. In this field the password has to be entered a second time.
 msgid ""
 "With this form you can create a new account. You can then post notices and "
 "link up to friends and colleagues."
 msgstr ""
 
 #. TRANS: Field label on account registration page. In this field the password has to be entered a second time.

-#: actions/register.php:450
+#: actions/register.php:418

 msgctxt "PASSWORD"
 msgid "Confirm"
 msgstr ""
 
 #. TRANS: Field label on account registration page.
 msgctxt "PASSWORD"
 msgid "Confirm"
 msgstr ""
 
 #. TRANS: Field label on account registration page.

-#: actions/register.php:457 actions/register.php:463
+#: actions/register.php:425 actions/register.php:431

 msgctxt "LABEL"
 msgid "Email"
 msgstr ""
 
 #. TRANS: Field title on account registration page.
 msgctxt "LABEL"
 msgid "Email"
 msgstr ""
 
 #. TRANS: Field title on account registration page.

-#: actions/register.php:459 actions/register.php:465
+#: actions/register.php:427 actions/register.php:433

 msgid "Used only for updates, announcements, and password recovery."
 msgstr ""
 
 #. TRANS: Field title on account registration page.
 msgid "Used only for updates, announcements, and password recovery."
 msgstr ""
 
 #. TRANS: Field title on account registration page.

-#: actions/register.php:474
+#: actions/register.php:442

 msgid "Longer name, preferably your \"real\" name."
 msgstr ""
 
 #. TRANS: Button text to register a user on account registration page.
 msgid "Longer name, preferably your \"real\" name."
 msgstr ""
 
 #. TRANS: Button text to register a user on account registration page.

-#: actions/register.php:537
+#: actions/register.php:505

 msgctxt "BUTTON"
 msgid "Register"
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for private sites.
 #. TRANS: %1$s is the StatusNet sitename.
 msgctxt "BUTTON"
 msgid "Register"
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for private sites.
 #. TRANS: %1$s is the StatusNet sitename.

-#: actions/register.php:550
+#: actions/register.php:518

 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."


@@ -5451,23 +5004,23 @@ msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with a specified copyright owner.
 #. TRANS: %1$s is the license owner.
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with a specified copyright owner.
 #. TRANS: %1$s is the license owner.

-#: actions/register.php:561
+#: actions/register.php:529

 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.

-#: actions/register.php:565
+#: actions/register.php:533

 msgid "My text and files remain under my own copyright."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
 msgid "My text and files remain under my own copyright."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.

-#: actions/register.php:568
+#: actions/register.php:536

 msgid "All rights reserved."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
 msgid "All rights reserved."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.

-#: actions/register.php:573
+#: actions/register.php:541

 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "


@@ -5478,7 +5031,7 @@ msgstr ""
 #. TRANS: %1$s is the registered nickname, %2$s is the profile URL.
 #. TRANS: This message contains Markdown links in the form [link text](link)
 #. TRANS: and variables in the form %%%%variable%%%%. Please mind the syntax.
 #. TRANS: %1$s is the registered nickname, %2$s is the profile URL.
 #. TRANS: This message contains Markdown links in the form [link text](link)
 #. TRANS: and variables in the form %%%%variable%%%%. Please mind the syntax.

-#: actions/register.php:619
+#: actions/register.php:587

 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "


@@ -5498,7 +5051,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: Instruction text on how to deal with the e-mail address confirmation e-mail.
 msgstr ""
 
 #. TRANS: Instruction text on how to deal with the e-mail address confirmation e-mail.

-#: actions/register.php:644
+#: actions/register.php:612

 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"


@@ -5506,14 +5059,14 @@ msgstr ""
 
 #. TRANS: Client error displayed when an unknown error occurs while delisting a user.
 #. TRANS: %s is a username.
 
 #. TRANS: Client error displayed when an unknown error occurs while delisting a user.
 #. TRANS: %s is a username.

-#: actions/removepeopletag.php:140
+#: actions/removepeopletag.php:136

 #, php-format
 msgid "There was an unexpected error while delisting %s."
 msgstr ""
 
 #. TRANS: Client error displayed when an unknown error occurs while listing a user.
 #. TRANS: %s is a profile URL.
 #, php-format
 msgid "There was an unexpected error while delisting %s."
 msgstr ""
 
 #. TRANS: Client error displayed when an unknown error occurs while listing a user.
 #. TRANS: %s is a profile URL.

-#: actions/removepeopletag.php:145
+#: actions/removepeopletag.php:141

 #, php-format
 msgid ""
 "There was a problem listing %s. The remote server is probably not responding "
 #, php-format
 msgid ""
 "There was a problem listing %s. The remote server is probably not responding "


@@ -5521,29 +5074,28 @@ msgid ""
 msgstr ""
 
 #. TRANS: Title after removing a user from a list.
 msgstr ""
 
 #. TRANS: Title after removing a user from a list.

-#: actions/removepeopletag.php:155
+#: actions/removepeopletag.php:150

 msgid "Unlisted"
 msgstr ""
 
 msgid "Unlisted"
 msgstr ""
 

-#. TRANS: Client error displayed when trying to repeat a notice while not logged in.
+#. TRANS: Client error displayed when trying to repeat a notice while not providing a notice ID.

 #: actions/repeat.php:56
 #: actions/repeat.php:56

-msgid "Only logged-in users can repeat notices."
+msgid "No notice specified."

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Client error displayed when trying to repeat a notice while not providing a notice ID.

 #. TRANS: Client error displayed when trying to repeat a non-existing notice.
 #. TRANS: Client error displayed when trying to repeat a non-existing notice.

-#: actions/repeat.php:64 actions/repeat.php:72
-msgid "No notice specified."
+#: actions/repeat.php:63
+msgid "Notice not found."

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Title after repeating a notice.
-#. TRANS: Repeat form status in notice list when a notice has been repeated.
-#: actions/repeat.php:102 lib/noticelistitem.php:703
-msgid "Repeated"
+#. TRANS: Error when unable to repeat a notice for unknown reason.
+#: actions/repeat.php:69
+msgid ""
+"Could not repeat notice for unknown reason. Please contact the webmaster!"

 msgstr ""
 
 #. TRANS: Confirmation text after repeating a notice.
 msgstr ""
 
 #. TRANS: Confirmation text after repeating a notice.

-#: actions/repeat.php:108
+#: actions/repeat.php:87

 msgid "Repeated!"
 msgstr ""
 
 msgid "Repeated!"
 msgstr ""
 


@@ -5552,50 +5104,50 @@ msgstr ""
 #. TRANS: RSS reply feed title. %s is a user nickname.
 #. TRANS: Menu item title in personal group navigation menu.
 #. TRANS: %s is a username.
 #. TRANS: RSS reply feed title. %s is a user nickname.
 #. TRANS: Menu item title in personal group navigation menu.
 #. TRANS: %s is a username.

-#: actions/replies.php:129 actions/repliesrss.php:68
-#: lib/personalgroupnav.php:93
+#: actions/replies.php:127 actions/repliesrss.php:67
+#: lib/personalgroupnav.php:96

 #, php-format
 msgid "Replies to %s"
 msgstr ""
 
 #. TRANS: Title for all but the first page of replies for a user.
 #. TRANS: %1$s is a user nickname, %2$d is a page number.
 #, php-format
 msgid "Replies to %s"
 msgstr ""
 
 #. TRANS: Title for all but the first page of replies for a user.
 #. TRANS: %1$s is a user nickname, %2$d is a page number.

-#: actions/replies.php:133
+#: actions/replies.php:131

 #, php-format
 msgid "Replies to %1$s, page %2$d"
 msgstr ""
 
 #. TRANS: Link for feed with replies for a user.
 #. TRANS: %s is a user nickname.
 #, php-format
 msgid "Replies to %1$s, page %2$d"
 msgstr ""
 
 #. TRANS: Link for feed with replies for a user.
 #. TRANS: %s is a user nickname.

-#: actions/replies.php:153
+#: actions/replies.php:151

 #, php-format
 msgid "Replies feed for %s (Activity Streams JSON)"
 msgstr ""
 
 #. TRANS: Link for feed with replies for a user.
 #. TRANS: %s is a user nickname.
 #, php-format
 msgid "Replies feed for %s (Activity Streams JSON)"
 msgstr ""
 
 #. TRANS: Link for feed with replies for a user.
 #. TRANS: %s is a user nickname.

-#: actions/replies.php:160
+#: actions/replies.php:158

 #, php-format
 msgid "Replies feed for %s (RSS 1.0)"
 msgstr ""
 
 #. TRANS: Link for feed with replies for a user.
 #. TRANS: %s is a user nickname.
 #, php-format
 msgid "Replies feed for %s (RSS 1.0)"
 msgstr ""
 
 #. TRANS: Link for feed with replies for a user.
 #. TRANS: %s is a user nickname.

-#: actions/replies.php:169
+#: actions/replies.php:167

 #, php-format
 msgid "Replies feed for %s (RSS 2.0)"
 msgstr ""
 
 #. TRANS: Link for feed with replies for a user.
 #. TRANS: %s is a user nickname.
 #, php-format
 msgid "Replies feed for %s (RSS 2.0)"
 msgstr ""
 
 #. TRANS: Link for feed with replies for a user.
 #. TRANS: %s is a user nickname.

-#: actions/replies.php:178
+#: actions/replies.php:176

 #, php-format
 msgid "Replies feed for %s (Atom)"
 msgstr ""
 
 #. TRANS: Empty list message for page with replies for a user.
 #. TRANS: %1$s and %s$s are the user nickname.
 #, php-format
 msgid "Replies feed for %s (Atom)"
 msgstr ""
 
 #. TRANS: Empty list message for page with replies for a user.
 #. TRANS: %1$s and %s$s are the user nickname.

-#: actions/replies.php:207
+#: actions/replies.php:205

 #, php-format
 msgid ""
 "This is the timeline showing replies to %1$s but %2$s hasn't received a "
 #, php-format
 msgid ""
 "This is the timeline showing replies to %1$s but %2$s hasn't received a "


@@ -5604,7 +5156,7 @@ msgstr ""
 
 #. TRANS: Empty list message for page with replies for a user for the logged in user.
 #. TRANS: This message contains a Markdown link in the form [link text](link).
 
 #. TRANS: Empty list message for page with replies for a user for the logged in user.
 #. TRANS: This message contains a Markdown link in the form [link text](link).

-#: actions/replies.php:216
+#: actions/replies.php:214

 #, php-format
 msgid ""
 "You can engage other users in a conversation, subscribe to more people or "
 #, php-format
 msgid ""
 "You can engage other users in a conversation, subscribe to more people or "


@@ -5613,7 +5165,7 @@ msgstr ""
 
 #. TRANS: Empty list message for page with replies for a user for all logged in users but the user themselves.
 #. TRANS: %1$s, %2$s and %3$s are a user nickname. This message contains a Markdown link in the form [link text](link).
 
 #. TRANS: Empty list message for page with replies for a user for all logged in users but the user themselves.
 #. TRANS: %1$s, %2$s and %3$s are a user nickname. This message contains a Markdown link in the form [link text](link).

-#: actions/replies.php:220
+#: actions/replies.php:218

 #, php-format
 msgid ""
 "You can try to [nudge %1$s](../%2$s) or [post something to them](%%%%action."
 #, php-format
 msgid ""
 "You can try to [nudge %1$s](../%2$s) or [post something to them](%%%%action."


@@ -5622,7 +5174,7 @@ msgstr ""
 
 #. TRANS: RSS reply feed description.
 #. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
 
 #. TRANS: RSS reply feed description.
 #. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.

-#: actions/repliesrss.php:74
+#: actions/repliesrss.php:73

 #, php-format
 msgid "Replies to %1$s on %2$s."
 msgstr ""
 #, php-format
 msgid "Replies to %1$s on %2$s."
 msgstr ""


@@ -5644,41 +5196,41 @@ msgid "No uploaded file."
 msgstr ""
 
 #. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
 msgstr ""
 
 #. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.

-#: actions/restoreaccount.php:129 lib/mediafile.php:194
+#: actions/restoreaccount.php:129 lib/mediafile.php:175

 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
 msgstr ""
 
 #. TRANS: Client exception.
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
 msgstr ""
 
 #. TRANS: Client exception.

-#: actions/restoreaccount.php:135 lib/mediafile.php:200
+#: actions/restoreaccount.php:135 lib/mediafile.php:180

 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form."
 msgstr ""
 
 #. TRANS: Client exception.
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form."
 msgstr ""
 
 #. TRANS: Client exception.

-#: actions/restoreaccount.php:141 lib/mediafile.php:206
+#: actions/restoreaccount.php:141 lib/mediafile.php:185

 msgid "The uploaded file was only partially uploaded."
 msgstr ""
 
 #. TRANS: Client exception thrown when a temporary folder is not present to store a file upload.
 msgid "The uploaded file was only partially uploaded."
 msgstr ""
 
 #. TRANS: Client exception thrown when a temporary folder is not present to store a file upload.

-#: actions/restoreaccount.php:150 lib/mediafile.php:214
+#: actions/restoreaccount.php:150 lib/mediafile.php:192

 msgid "Missing a temporary folder."
 msgstr ""
 
 #. TRANS: Client exception thrown when writing to disk is not possible during a file upload operation.
 msgid "Missing a temporary folder."
 msgstr ""
 
 #. TRANS: Client exception thrown when writing to disk is not possible during a file upload operation.

-#: actions/restoreaccount.php:154 lib/mediafile.php:218
+#: actions/restoreaccount.php:154 lib/mediafile.php:195

 msgid "Failed to write file to disk."
 msgstr ""
 
 #. TRANS: Client exception thrown when a file upload operation has been stopped by an extension.
 msgid "Failed to write file to disk."
 msgstr ""
 
 #. TRANS: Client exception thrown when a file upload operation has been stopped by an extension.

-#: actions/restoreaccount.php:158 lib/mediafile.php:222
+#: actions/restoreaccount.php:158 lib/mediafile.php:198

 msgid "File upload stopped by extension."
 msgstr ""
 
 #. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
 #. TRANS: Exception thrown when uploading an image fails for an unknown reason.
 #. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
 msgid "File upload stopped by extension."
 msgstr ""
 
 #. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
 #. TRANS: Exception thrown when uploading an image fails for an unknown reason.
 #. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.

-#: actions/restoreaccount.php:164 lib/imagefile.php:106 lib/mediafile.php:228
+#: actions/restoreaccount.php:164 lib/imagefile.php:172 lib/mediafile.php:203

 msgid "System error uploading file."
 msgstr ""
 
 msgid "System error uploading file."
 msgstr ""
 


@@ -5713,18 +5265,17 @@ msgid "Upload the file"
 msgstr ""
 
 #. TRANS: Client error displayed when trying to revoke a role without having the right to do that.
 msgstr ""
 
 #. TRANS: Client error displayed when trying to revoke a role without having the right to do that.

-#: actions/revokerole.php:76
+#: actions/revokerole.php:74

 msgid "You cannot revoke user roles on this site."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to revoke a role that is not set.
 msgid "You cannot revoke user roles on this site."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to revoke a role that is not set.

-#: actions/revokerole.php:84
+#: actions/revokerole.php:81

 msgid "User does not have this role."
 msgstr ""
 
 #. TRANS: Engine name for RSD.
 msgid "User does not have this role."
 msgstr ""
 
 #. TRANS: Engine name for RSD.

-#. TRANS: Engine name.
-#: actions/rsd.php:144 actions/version.php:156
+#: actions/rsd.php:140

 msgid "StatusNet"
 msgstr ""
 
 msgid "StatusNet"
 msgstr ""
 


@@ -5735,7 +5286,7 @@ msgid "You cannot sandbox users on this site."
 msgstr ""
 
 #. TRANS: Client error displayed trying to sandbox an already sandboxed user.
 msgstr ""
 
 #. TRANS: Client error displayed trying to sandbox an already sandboxed user.

-#: actions/sandbox.php:72
+#: actions/sandbox.php:71

 msgid "User is already sandboxed."
 msgstr ""
 
 msgid "User is already sandboxed."
 msgstr ""
 


@@ -5804,14 +5355,14 @@ msgid "You must be logged in to view an application."
 msgstr ""
 
 #. TRANS: Header on the OAuth application page.
 msgstr ""
 
 #. TRANS: Header on the OAuth application page.

-#: actions/showapplication.php:156
+#: actions/showapplication.php:152

 msgid "Application profile"
 msgstr ""
 
 #. TRANS: Information output on an OAuth application page.
 #. TRANS: %1$s is the application creator, %2$s is "read-only" or "read-write",
 #. TRANS: %3$d is the number of users using the OAuth application.
 msgid "Application profile"
 msgstr ""
 
 #. TRANS: Information output on an OAuth application page.
 #. TRANS: %1$s is the application creator, %2$s is "read-only" or "read-write",
 #. TRANS: %3$d is the number of users using the OAuth application.

-#: actions/showapplication.php:187
+#: actions/showapplication.php:183

 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d user"
 msgid_plural "Created by %1$s - %2$s access by default - %3$d users"
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d user"
 msgid_plural "Created by %1$s - %2$s access by default - %3$d users"


@@ -5819,132 +5370,64 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Header on the OAuth application page.
 msgstr[1] ""
 
 #. TRANS: Header on the OAuth application page.

-#: actions/showapplication.php:200
+#: actions/showapplication.php:196

 msgid "Application actions"
 msgstr ""
 
 #. TRANS: Link text to edit application on the OAuth application page.
 msgid "Application actions"
 msgstr ""
 
 #. TRANS: Link text to edit application on the OAuth application page.

-#: actions/showapplication.php:207
+#: actions/showapplication.php:203

 msgctxt "EDITAPP"
 msgid "Edit"
 msgstr ""
 
 #. TRANS: Button text on the OAuth application page.
 #. TRANS: Resets the OAuth consumer key and secret.
 msgctxt "EDITAPP"
 msgid "Edit"
 msgstr ""
 
 #. TRANS: Button text on the OAuth application page.
 #. TRANS: Resets the OAuth consumer key and secret.

-#: actions/showapplication.php:226
+#: actions/showapplication.php:222

 msgid "Reset key & secret"
 msgstr ""
 
 #. TRANS: Header on the OAuth application page.
 msgid "Reset key & secret"
 msgstr ""
 
 #. TRANS: Header on the OAuth application page.

-#: actions/showapplication.php:253
+#: actions/showapplication.php:249

 msgid "Application info"
 msgstr ""
 
 #. TRANS: Field label on application page.
 msgid "Application info"
 msgstr ""
 
 #. TRANS: Field label on application page.

-#: actions/showapplication.php:257
+#: actions/showapplication.php:253

 msgid "Consumer key"
 msgstr ""
 
 #. TRANS: Field label on application page.
 msgid "Consumer key"
 msgstr ""
 
 #. TRANS: Field label on application page.

-#: actions/showapplication.php:260
+#: actions/showapplication.php:256

 msgid "Consumer secret"
 msgstr ""
 
 #. TRANS: Field label on application page.
 msgid "Consumer secret"
 msgstr ""
 
 #. TRANS: Field label on application page.

-#: actions/showapplication.php:263
+#: actions/showapplication.php:259

 msgid "Request token URL"
 msgstr ""
 
 #. TRANS: Field label on application page.
 msgid "Request token URL"
 msgstr ""
 
 #. TRANS: Field label on application page.

-#: actions/showapplication.php:266
+#: actions/showapplication.php:262

 msgid "Access token URL"
 msgstr ""
 
 #. TRANS: Field label on application page.
 msgid "Access token URL"
 msgstr ""
 
 #. TRANS: Field label on application page.

-#: actions/showapplication.php:269
+#: actions/showapplication.php:265

 msgid "Authorize URL"
 msgstr ""
 
 #. TRANS: Note on the OAuth application page about signature support.
 msgid "Authorize URL"
 msgstr ""
 
 #. TRANS: Note on the OAuth application page about signature support.

-#: actions/showapplication.php:275
+#: actions/showapplication.php:271

 msgid ""
 "Note: HMAC-SHA1 signatures are supported. The plaintext signature method is "
 "not supported."
 msgstr ""
 
 #. TRANS: Text in confirmation dialog to reset consumer key and secret for an OAuth application.
 msgid ""
 "Note: HMAC-SHA1 signatures are supported. The plaintext signature method is "
 "not supported."
 msgstr ""
 
 #. TRANS: Text in confirmation dialog to reset consumer key and secret for an OAuth application.

-#: actions/showapplication.php:296
+#: actions/showapplication.php:292

 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr ""
 
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr ""
 

-#. TRANS: Title for all but the first page of favourite notices of a user.
-#. TRANS: %1$s is the user for whom the favourite notices are displayed, %2$d is the page number.
-#: actions/showfavorites.php:80
-#, php-format
-msgid "%1$s's favorite notices, page %2$d"
-msgstr ""
-
-#. TRANS: Server error displayed when favourite notices could not be retrieved from the database.
-#: actions/showfavorites.php:134
-msgid "Could not retrieve favorite notices."
-msgstr ""
-
-#. TRANS: Feed link text. %s is a username.
-#: actions/showfavorites.php:174
-#, php-format
-msgid "Feed for favorites of %s (Activity Streams JSON)"
-msgstr ""
-
-#. TRANS: Feed link text. %s is a username.
-#: actions/showfavorites.php:180
-#, php-format
-msgid "Feed for favorites of %s (RSS 1.0)"
-msgstr ""
-
-#. TRANS: Feed link text. %s is a username.
-#: actions/showfavorites.php:188
-#, php-format
-msgid "Feed for favorites of %s (RSS 2.0)"
-msgstr ""
-
-#. TRANS: Feed link text. %s is a username.
-#: actions/showfavorites.php:196
-#, php-format
-msgid "Feed for favorites of %s (Atom)"
-msgstr ""
-
-#. TRANS: Text displayed instead of favourite notices for the current logged in user that has no favourites.
-#: actions/showfavorites.php:206
-msgid ""
-"You haven't chosen any favorite notices yet. Click the fave button on "
-"notices you like to bookmark them for later or shed a spotlight on them."
-msgstr ""
-
-#. TRANS: Text displayed instead of favourite notices for a user that has no favourites while logged in.
-#. TRANS: %s is a username.
-#: actions/showfavorites.php:210
-#, php-format
-msgid ""
-"%s hasn't added any favorite notices yet. Post something interesting they "
-"would add to their favorites :)"
-msgstr ""
-
-#. TRANS: Text displayed instead of favourite notices for a user that has no favourites while not logged in.
-#. TRANS: %s is a username, %%%%action.register%%%% is a link to the user registration page.
-#. TRANS: (link text)[link] is a Mark Down link.
-#: actions/showfavorites.php:217
-#, php-format
-msgid ""
-"%s hasn't added any favorite notices yet. Why not [register an account](%%%%"
-"action.register%%%%) and then post something interesting they would add to "
-"their favorites :)"
-msgstr ""
-
-#. TRANS: Page notice for show favourites page.
-#: actions/showfavorites.php:248
-msgid "This is a way to share what you like."
-msgstr ""
-

 #. TRANS: Page title for first group page. %s is a group name.
 #: actions/showgroup.php:75
 #, php-format
 #. TRANS: Page title for first group page. %s is a group name.
 #: actions/showgroup.php:75
 #, php-format


@@ -5959,31 +5442,31 @@ msgid "%1$s group, page %2$d"
 msgstr ""
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 msgstr ""
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.

-#: actions/showgroup.php:181
+#: actions/showgroup.php:182

 #, php-format
 msgid "Notice feed for %s group (Activity Streams JSON)"
 msgstr ""
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "Notice feed for %s group (Activity Streams JSON)"
 msgstr ""
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.

-#: actions/showgroup.php:187
+#: actions/showgroup.php:188

 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
 msgstr ""
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
 msgstr ""
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.

-#: actions/showgroup.php:194
+#: actions/showgroup.php:195

 #, php-format
 msgid "Notice feed for %s group (RSS 2.0)"
 msgstr ""
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "Notice feed for %s group (RSS 2.0)"
 msgstr ""
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.

-#: actions/showgroup.php:201
+#: actions/showgroup.php:202

 #, php-format
 msgid "Notice feed for %s group (Atom)"
 msgstr ""
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "Notice feed for %s group (Atom)"
 msgstr ""
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.

-#: actions/showgroup.php:207
+#: actions/showgroup.php:208

 #, php-format
 msgid "FOAF for %s group"
 msgstr ""
 #, php-format
 msgid "FOAF for %s group"
 msgstr ""


@@ -5992,7 +5475,7 @@ msgstr ""
 #. TRANS: %s is the group name, %%%%site.name%%%% is the site name,
 #. TRANS: %%%%action.register%%%% is the URL for registration, %%%%doc.help%%%% is a URL to help.
 #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
 #. TRANS: %s is the group name, %%%%site.name%%%% is the site name,
 #. TRANS: %%%%action.register%%%% is the URL for registration, %%%%doc.help%%%% is a URL to help.
 #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).

-#: actions/showgroup.php:218
+#: actions/showgroup.php:219

 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."


@@ -6005,7 +5488,7 @@ msgstr ""
 #. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept no new registrations.
 #. TRANS: %s is the group name, %%%%site.name%%%% is the site name,
 #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
 #. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept no new registrations.
 #. TRANS: %s is the group name, %%%%site.name%%%% is the site name,
 #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).

-#: actions/showgroup.php:227
+#: actions/showgroup.php:228

 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."


@@ -6014,92 +5497,63 @@ msgid ""
 "their life and interests."
 msgstr ""
 
 "their life and interests."
 msgstr ""
 

-#. TRANS: Client error displayed requesting a single message that does not exist.
-#: actions/showmessage.php:76
-msgid "No such message."
-msgstr ""
-
-#. TRANS: Client error displayed requesting a single direct message the requesting user was not a party in.
-#: actions/showmessage.php:86
-msgid "Only the sender and recipient may read this message."
-msgstr ""
-
-#. TRANS: Page title for single direct message display when viewing user is the sender.
-#. TRANS: %1$s is the addressed user's nickname, $2$s is a timestamp.
-#: actions/showmessage.php:105
-#, php-format
-msgid "Message to %1$s on %2$s"
-msgstr ""
-
-#. TRANS: Page title for single message display.
-#. TRANS: %1$s is the sending user's nickname, $2$s is a timestamp.
-#: actions/showmessage.php:113
-#, php-format
-msgid "Message from %1$s on %2$s"
-msgstr ""
-
-#. TRANS: Client exception thrown when trying a view a notice the user has no access to.
-#: actions/shownotice.php:92
-msgid "Not available."
-msgstr ""
-
-#. TRANS: Client error displayed trying to show a deleted notice.
-#: actions/shownotice.php:127
-msgid "Notice deleted."
+#. TRANS: Server error displayed trying to show a notice without a connected profile.
+#: actions/shownotice.php:87
+msgid "Notice has no profile."

 msgstr ""
 
 #. TRANS: Title for private list timeline.
 #. TRANS: %1$s is a list, %2$s is a page number.
 msgstr ""
 
 #. TRANS: Title for private list timeline.
 #. TRANS: %1$s is a list, %2$s is a page number.

-#: actions/showprofiletag.php:129
+#: actions/showprofiletag.php:124

 #, php-format
 msgid "Private timeline for %1$s list by you, page %2$d"
 msgstr ""
 
 #. TRANS: Title for public list timeline where the viewer is the tagger.
 #. TRANS: %1$s is a list, %2$s is a page number.
 #, php-format
 msgid "Private timeline for %1$s list by you, page %2$d"
 msgstr ""
 
 #. TRANS: Title for public list timeline where the viewer is the tagger.
 #. TRANS: %1$s is a list, %2$s is a page number.

-#: actions/showprofiletag.php:137
+#: actions/showprofiletag.php:132

 #, php-format
 msgid "Timeline for %1$s list by you, page %2$d"
 msgstr ""
 
 #. TRANS: Title for private list timeline.
 #. TRANS: %1$s is a list, %2$s is the tagger's nickname, %3$d is a page number.
 #, php-format
 msgid "Timeline for %1$s list by you, page %2$d"
 msgstr ""
 
 #. TRANS: Title for private list timeline.
 #. TRANS: %1$s is a list, %2$s is the tagger's nickname, %3$d is a page number.

-#: actions/showprofiletag.php:143
+#: actions/showprofiletag.php:138

 #, php-format
 msgid "Timeline for %1$s list by %2$s, page %3$d"
 msgstr ""
 
 #. TRANS: Title for private list timeline.
 #. TRANS: %s is a list.
 #, php-format
 msgid "Timeline for %1$s list by %2$s, page %3$d"
 msgstr ""
 
 #. TRANS: Title for private list timeline.
 #. TRANS: %s is a list.

-#: actions/showprofiletag.php:152
+#: actions/showprofiletag.php:147

 #, php-format
 msgid "Private timeline of %s list by you"
 msgstr ""
 
 #. TRANS: Title for public list timeline where the viewer is the tagger.
 #. TRANS: %s is a list.
 #, php-format
 msgid "Private timeline of %s list by you"
 msgstr ""
 
 #. TRANS: Title for public list timeline where the viewer is the tagger.
 #. TRANS: %s is a list.

-#: actions/showprofiletag.php:160
+#: actions/showprofiletag.php:155

 #, php-format
 msgid "Timeline for %s list by you"
 msgstr ""
 
 #. TRANS: Title for private list timeline.
 #. TRANS: %1$s is a list, %2$s is the tagger's nickname.
 #, php-format
 msgid "Timeline for %s list by you"
 msgstr ""
 
 #. TRANS: Title for private list timeline.
 #. TRANS: %1$s is a list, %2$s is the tagger's nickname.

-#: actions/showprofiletag.php:166
+#: actions/showprofiletag.php:161

 #, php-format
 msgid "Timeline for %1$s list by %2$s"
 msgstr ""
 
 #. TRANS: Feed title.
 #. TRANS: %1$s is a list, %2$s is tagger's nickname.
 #, php-format
 msgid "Timeline for %1$s list by %2$s"
 msgstr ""
 
 #. TRANS: Feed title.
 #. TRANS: %1$s is a list, %2$s is tagger's nickname.

-#: actions/showprofiletag.php:208
+#: actions/showprofiletag.php:203

 #, php-format
 msgid "Feed for %1$s list by %2$s (Atom)"
 msgstr ""
 
 #. TRANS: Empty list message for list timeline.
 #. TRANS: %1$s is a list, %2$s is a tagger's nickname.
 #, php-format
 msgid "Feed for %1$s list by %2$s (Atom)"
 msgstr ""
 
 #. TRANS: Empty list message for list timeline.
 #. TRANS: %1$s is a list, %2$s is a tagger's nickname.

-#: actions/showprofiletag.php:225
+#: actions/showprofiletag.php:220

 #, php-format
 msgid ""
 "This is the timeline for %1$s list by %2$s but no one has posted anything "
 #, php-format
 msgid ""
 "This is the timeline for %1$s list by %2$s but no one has posted anything "


@@ -6107,13 +5561,13 @@ msgid ""
 msgstr ""
 
 #. TRANS: Additional empty list message for list timeline for currently logged in user tagged tags.
 msgstr ""
 
 #. TRANS: Additional empty list message for list timeline for currently logged in user tagged tags.

-#: actions/showprofiletag.php:233
+#: actions/showprofiletag.php:228

 msgid "Try tagging more people."
 msgstr ""
 
 #. TRANS: Additional empty list message for list timeline.
 #. TRANS: This message contains Markdown links in the form [description](link).
 msgid "Try tagging more people."
 msgstr ""
 
 #. TRANS: Additional empty list message for list timeline.
 #. TRANS: This message contains Markdown links in the form [description](link).

-#: actions/showprofiletag.php:238
+#: actions/showprofiletag.php:233

 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and start following "
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and start following "


@@ -6122,7 +5576,7 @@ msgstr ""
 
 #. TRANS: Header on show list page.
 #. TRANS: Link description for link to list of users tagged with a tag (so part of a list).
 
 #. TRANS: Header on show list page.
 #. TRANS: Link description for link to list of users tagged with a tag (so part of a list).

-#: actions/showprofiletag.php:306 lib/peopletaglist.php:173
+#: actions/showprofiletag.php:301 lib/peopletaglist.php:173

 msgid "Listed"
 msgstr ""
 
 msgid "Listed"
 msgstr ""
 


@@ -6130,100 +5584,100 @@ msgstr ""
 #. TRANS: Content of "People following tag x" if there are no subscribed users.
 #. TRANS: Description for mini list of group members on a group page when the group has no members.
 #. TRANS: Empty list message for tags.
 #. TRANS: Content of "People following tag x" if there are no subscribed users.
 #. TRANS: Description for mini list of group members on a group page when the group has no members.
 #. TRANS: Empty list message for tags.

-#. TRANS: Text for user subscription statistics if the user has no subscriptions.
+#. TRANS: Text for user subscription statistics if the user has no subscription

 #. TRANS: Text for user subscriber statistics if user has no subscribers.
 #. TRANS: Text for user user group membership statistics if user is not a member of any group.
 #. TRANS: Default content for section/sidebar widget.
 #. TRANS: Text for user subscriber statistics if user has no subscribers.
 #. TRANS: Text for user user group membership statistics if user is not a member of any group.
 #. TRANS: Default content for section/sidebar widget.

-#: actions/showprofiletag.php:315 actions/showprofiletag.php:353
-#: lib/groupaction.php:163 lib/groupaction.php:256 lib/peopletags.php:166
-#: lib/profileaction.php:147 lib/profileaction.php:179
-#: lib/profileaction.php:277 lib/section.php:117
+#: actions/showprofiletag.php:310 actions/showprofiletag.php:348
+#: lib/groupaction.php:158 lib/groupaction.php:247 lib/peopletags.php:166
+#: lib/profileaction.php:159 lib/profileaction.php:187
+#: lib/profileaction.php:284 lib/section.php:110

 msgid "(None)"
 msgstr ""
 
 #. TRANS: Link for more "People in list x by a user"
 #. TRANS: if there are more than the mini list's maximum.
 msgid "(None)"
 msgstr ""
 
 #. TRANS: Link for more "People in list x by a user"
 #. TRANS: if there are more than the mini list's maximum.

-#: actions/showprofiletag.php:327
+#: actions/showprofiletag.php:322

 msgid "Show all"
 msgstr ""
 
 #. TRANS: Header for tag subscribers.
 #. TRANS: Link description for link to list of users subscribed to a tag.
 msgid "Show all"
 msgstr ""
 
 #. TRANS: Header for tag subscribers.
 #. TRANS: Link description for link to list of users subscribed to a tag.

-#: actions/showprofiletag.php:344 lib/peopletaglist.php:183
+#: actions/showprofiletag.php:339 lib/peopletaglist.php:183

 msgid "Subscribers"
 msgstr ""
 
 #. TRANS: Page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$s is the hash tag.
 msgid "Subscribers"
 msgstr ""
 
 #. TRANS: Page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$s is the hash tag.

-#: actions/showstream.php:89
+#: actions/showstream.php:83

 #, php-format
 msgid "Notices by %1$s tagged %2$s"
 msgstr ""
 
 #. TRANS: Page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
 #, php-format
 msgid "Notices by %1$s tagged %2$s"
 msgstr ""
 
 #. TRANS: Page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.

-#: actions/showstream.php:93
+#: actions/showstream.php:87

 #, php-format
 msgid "Notices by %1$s tagged %2$s, page %3$d"
 msgstr ""
 
 #. TRANS: Extended page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$d is the page number.
 #, php-format
 msgid "Notices by %1$s tagged %2$s, page %3$d"
 msgstr ""
 
 #. TRANS: Extended page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$d is the page number.

-#: actions/showstream.php:101
+#: actions/showstream.php:95

 #, php-format
 msgid "Notices by %1$s, page %2$d"
 msgstr ""
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %1$s is a user nickname, %2$s is a hashtag.
 #, php-format
 msgid "Notices by %1$s, page %2$d"
 msgstr ""
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %1$s is a user nickname, %2$s is a hashtag.

-#: actions/showstream.php:142
+#: actions/showstream.php:127

 #, php-format
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr ""
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
 #, php-format
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr ""
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.

-#: actions/showstream.php:153
+#: actions/showstream.php:138

 #, php-format
 msgid "Notice feed for %s (Activity Streams JSON)"
 msgstr ""
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
 #, php-format
 msgid "Notice feed for %s (Activity Streams JSON)"
 msgstr ""
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.

-#: actions/showstream.php:160
+#: actions/showstream.php:145

 #, php-format
 msgid "Notice feed for %s (RSS 1.0)"
 msgstr ""
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
 #, php-format
 msgid "Notice feed for %s (RSS 1.0)"
 msgstr ""
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.

-#: actions/showstream.php:169
+#: actions/showstream.php:154

 #, php-format
 msgid "Notice feed for %s (RSS 2.0)"
 msgstr ""
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
 #, php-format
 msgid "Notice feed for %s (RSS 2.0)"
 msgstr ""
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.

-#: actions/showstream.php:178
+#: actions/showstream.php:163

 #, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr ""
 
 #. TRANS: Title for link to notice feed. FOAF stands for Friend of a Friend.
 #. TRANS: More information at http://www.foaf-project.org. %s is a user nickname.
 #, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr ""
 
 #. TRANS: Title for link to notice feed. FOAF stands for Friend of a Friend.
 #. TRANS: More information at http://www.foaf-project.org. %s is a user nickname.

-#: actions/showstream.php:185
+#: actions/showstream.php:170

 #, php-format
 msgid "FOAF for %s"
 msgstr ""
 
 #. TRANS: First sentence of empty list message for a timeline. $1%s is a user nickname.
 #, php-format
 msgid "FOAF for %s"
 msgstr ""
 
 #. TRANS: First sentence of empty list message for a timeline. $1%s is a user nickname.

-#: actions/showstream.php:225
+#: actions/showstream.php:210

 #, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr ""
 
 #. TRANS: Second sentence of empty list message for a stream for the user themselves.
 #, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr ""
 
 #. TRANS: Second sentence of empty list message for a stream for the user themselves.

-#: actions/showstream.php:231
+#: actions/showstream.php:216

 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"


@@ -6231,16 +5685,16 @@ msgstr ""
 
 #. TRANS: Second sentence of empty  list message for a non-self timeline. %1$s is a user nickname, %2$s is a part of a URL.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
 
 #. TRANS: Second sentence of empty  list message for a non-self timeline. %1$s is a user nickname, %2$s is a part of a URL.
 #. TRANS: This message contains a Markdown link. Keep "](" together.

-#: actions/showstream.php:235
+#: actions/showstream.php:220

 #, php-format
 msgid ""
 #, php-format
 msgid ""

-"You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
-"%?status_textarea=%2$s)."
+"You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%"
+"%%?status_textarea=%2$s)."

 msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a timeline if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
 msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a timeline if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.

-#: actions/showstream.php:274
+#: actions/showstream.php:259

 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."


@@ -6251,7 +5705,7 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a timeline if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
 
 #. TRANS: Announcement for anonymous users showing a timeline if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.

-#: actions/showstream.php:281
+#: actions/showstream.php:266

 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."


@@ -6260,7 +5714,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
 msgstr ""
 
 #. TRANS: Link to the author of a repeated notice. %s is a linked nickname.

-#: actions/showstream.php:359
+#: actions/showstream.php:344

 #, php-format
 msgid "Repeat of %s"
 msgstr ""
 #, php-format
 msgid "Repeat of %s"
 msgstr ""


@@ -6272,7 +5726,7 @@ msgid "You cannot silence users on this site."
 msgstr ""
 
 #. TRANS: Client error displayed trying to silence an already silenced user.
 msgstr ""
 
 #. TRANS: Client error displayed trying to silence an already silenced user.

-#: actions/silence.php:72
+#: actions/silence.php:71

 msgid "User is already silenced."
 msgstr ""
 
 msgid "User is already silenced."
 msgstr ""
 


@@ -6309,138 +5763,138 @@ msgstr ""
 
 #. TRANS: Client error displayed trying to save site settings with an invalid language code.
 #. TRANS: %s is the invalid language code.
 
 #. TRANS: Client error displayed trying to save site settings with an invalid language code.
 #. TRANS: %s is the invalid language code.

-#: actions/siteadminpanel.php:185
+#: actions/siteadminpanel.php:184

 #, php-format
 msgid "Unknown language \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed trying to save site settings with a text limit below 0.
 #, php-format
 msgid "Unknown language \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed trying to save site settings with a text limit below 0.

-#: actions/siteadminpanel.php:192
+#: actions/siteadminpanel.php:191

 msgid "Minimum text limit is 0 (unlimited)."
 msgstr ""
 
 #. TRANS: Client error displayed trying to save site settings with a text limit below 1.
 msgid "Minimum text limit is 0 (unlimited)."
 msgstr ""
 
 #. TRANS: Client error displayed trying to save site settings with a text limit below 1.

-#: actions/siteadminpanel.php:199
+#: actions/siteadminpanel.php:198

 msgid "Dupe limit must be one or more seconds."
 msgstr ""
 
 #. TRANS: Fieldset legend on site settings panel.
 msgid "Dupe limit must be one or more seconds."
 msgstr ""
 
 #. TRANS: Fieldset legend on site settings panel.

-#: actions/siteadminpanel.php:246
+#: actions/siteadminpanel.php:245

 msgctxt "LEGEND"
 msgid "General"
 msgstr ""
 
 #. TRANS: Field label on site settings panel.
 msgctxt "LEGEND"
 msgid "General"
 msgstr ""
 
 #. TRANS: Field label on site settings panel.

-#: actions/siteadminpanel.php:250
+#: actions/siteadminpanel.php:249

 msgctxt "LABEL"
 msgid "Site name"
 msgstr ""
 
 #. TRANS: Field title on site settings panel.
 msgctxt "LABEL"
 msgid "Site name"
 msgstr ""
 
 #. TRANS: Field title on site settings panel.

-#: actions/siteadminpanel.php:252
+#: actions/siteadminpanel.php:251

 msgid "The name of your site, like \"Yourcompany Microblog\"."
 msgstr ""
 
 #. TRANS: Field label on site settings panel.
 msgid "The name of your site, like \"Yourcompany Microblog\"."
 msgstr ""
 
 #. TRANS: Field label on site settings panel.

-#: actions/siteadminpanel.php:257
+#: actions/siteadminpanel.php:256

 msgid "Brought by"
 msgstr ""
 
 #. TRANS: Field title on site settings panel.
 msgid "Brought by"
 msgstr ""
 
 #. TRANS: Field title on site settings panel.

-#: actions/siteadminpanel.php:259
+#: actions/siteadminpanel.php:258

 msgid "Text used for credits link in footer of each page."
 msgstr ""
 
 #. TRANS: Field label on site settings panel.
 msgid "Text used for credits link in footer of each page."
 msgstr ""
 
 #. TRANS: Field label on site settings panel.

-#: actions/siteadminpanel.php:264
+#: actions/siteadminpanel.php:263

 msgid "Brought by URL"
 msgstr ""
 
 #. TRANS: Field title on site settings panel.
 msgid "Brought by URL"
 msgstr ""
 
 #. TRANS: Field title on site settings panel.

-#: actions/siteadminpanel.php:266
+#: actions/siteadminpanel.php:265

 msgid "URL used for credits link in footer of each page."
 msgstr ""
 
 #. TRANS: Field label on site settings panel.
 msgid "URL used for credits link in footer of each page."
 msgstr ""
 
 #. TRANS: Field label on site settings panel.

-#: actions/siteadminpanel.php:270
+#: actions/siteadminpanel.php:269

 msgid "Email"
 msgstr ""
 
 #. TRANS: Field title on site settings panel.
 msgid "Email"
 msgstr ""
 
 #. TRANS: Field title on site settings panel.

-#: actions/siteadminpanel.php:272
+#: actions/siteadminpanel.php:271

 msgid "Contact email address for your site."
 msgstr ""
 
 #. TRANS: Fieldset legend on site settings panel.
 msgid "Contact email address for your site."
 msgstr ""
 
 #. TRANS: Fieldset legend on site settings panel.

-#: actions/siteadminpanel.php:281
+#: actions/siteadminpanel.php:280

 msgctxt "LEGEND"
 msgid "Local"
 msgstr ""
 
 #. TRANS: Dropdown label on site settings panel.
 msgctxt "LEGEND"
 msgid "Local"
 msgstr ""
 
 #. TRANS: Dropdown label on site settings panel.

-#: actions/siteadminpanel.php:293
+#: actions/siteadminpanel.php:292

 msgid "Default timezone"
 msgstr ""
 
 #. TRANS: Dropdown title on site settings panel.
 msgid "Default timezone"
 msgstr ""
 
 #. TRANS: Dropdown title on site settings panel.

-#: actions/siteadminpanel.php:295
+#: actions/siteadminpanel.php:294

 msgid "Default timezone for the site; usually UTC."
 msgstr ""
 
 #. TRANS: Dropdown label on site settings panel.
 msgid "Default timezone for the site; usually UTC."
 msgstr ""
 
 #. TRANS: Dropdown label on site settings panel.

-#: actions/siteadminpanel.php:302
+#: actions/siteadminpanel.php:301

 msgid "Default language"
 msgstr ""
 
 #. TRANS: Dropdown title on site settings panel.
 msgid "Default language"
 msgstr ""
 
 #. TRANS: Dropdown title on site settings panel.

-#: actions/siteadminpanel.php:305
+#: actions/siteadminpanel.php:304

 msgid ""
 "The site language when autodetection from browser settings is not available."
 msgstr ""
 
 #. TRANS: Fieldset legend on site settings panel.
 msgid ""
 "The site language when autodetection from browser settings is not available."
 msgstr ""
 
 #. TRANS: Fieldset legend on site settings panel.

-#: actions/siteadminpanel.php:314
+#: actions/siteadminpanel.php:313

 msgctxt "LEGEND"
 msgid "Limits"
 msgstr ""
 
 #. TRANS: Field label on site settings panel.
 msgctxt "LEGEND"
 msgid "Limits"
 msgstr ""
 
 #. TRANS: Field label on site settings panel.

-#: actions/siteadminpanel.php:319
+#: actions/siteadminpanel.php:318

 msgid "Text limit"
 msgstr ""
 
 #. TRANS: Field title on site settings panel.
 msgid "Text limit"
 msgstr ""
 
 #. TRANS: Field title on site settings panel.

-#: actions/siteadminpanel.php:321
+#: actions/siteadminpanel.php:320

 msgid "Maximum number of characters for notices."
 msgstr ""
 
 #. TRANS: Field label on site settings panel.
 msgid "Maximum number of characters for notices."
 msgstr ""
 
 #. TRANS: Field label on site settings panel.

-#: actions/siteadminpanel.php:327
+#: actions/siteadminpanel.php:326

 msgid "Dupe limit"
 msgstr ""
 
 #. TRANS: Field title on site settings panel.
 msgid "Dupe limit"
 msgstr ""
 
 #. TRANS: Field title on site settings panel.

-#: actions/siteadminpanel.php:329
+#: actions/siteadminpanel.php:328

 msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr ""
 
 #. TRANS: Fieldset legend for form to change logo.
 msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr ""
 
 #. TRANS: Fieldset legend for form to change logo.

-#: actions/siteadminpanel.php:339
+#: actions/siteadminpanel.php:338

 msgid "Logo"
 msgstr ""
 
 #. TRANS: Field label for StatusNet site logo.
 msgid "Logo"
 msgstr ""
 
 #. TRANS: Field label for StatusNet site logo.

-#: actions/siteadminpanel.php:346
+#: actions/siteadminpanel.php:345

 msgid "Site logo"
 msgstr ""
 
 #. TRANS: Field label for SSL StatusNet site logo.
 msgid "Site logo"
 msgstr ""
 
 #. TRANS: Field label for SSL StatusNet site logo.

-#: actions/siteadminpanel.php:354
+#: actions/siteadminpanel.php:353

 msgid "SSL logo"
 msgstr ""
 
 #. TRANS: Button title for saving site settings.
 msgid "SSL logo"
 msgstr ""
 
 #. TRANS: Button title for saving site settings.

-#: actions/siteadminpanel.php:377
+#: actions/siteadminpanel.php:376

 msgid "Save the site settings."
 msgstr ""
 
 msgid "Save the site settings."
 msgstr ""
 


@@ -6550,76 +6004,76 @@ msgid ""
 msgstr ""
 
 #. TRANS: Confirmation message for successful SMS preferences save.
 msgstr ""
 
 #. TRANS: Confirmation message for successful SMS preferences save.

-#: actions/smssettings.php:308
+#: actions/smssettings.php:307

 msgid "SMS preferences saved."
 msgstr ""
 
 #. TRANS: Message given saving SMS phone number without having provided one.
 msgid "SMS preferences saved."
 msgstr ""
 
 #. TRANS: Message given saving SMS phone number without having provided one.

-#: actions/smssettings.php:330
+#: actions/smssettings.php:329

 msgid "No phone number."
 msgstr ""
 
 #. TRANS: Message given saving SMS phone number without having selected a carrier.
 msgid "No phone number."
 msgstr ""
 
 #. TRANS: Message given saving SMS phone number without having selected a carrier.

-#: actions/smssettings.php:336
+#: actions/smssettings.php:335

 msgid "No carrier selected."
 msgstr ""
 
 #. TRANS: Message given saving SMS phone number that is already set.
 msgid "No carrier selected."
 msgstr ""
 
 #. TRANS: Message given saving SMS phone number that is already set.

-#: actions/smssettings.php:344
+#: actions/smssettings.php:343

 msgid "That is already your phone number."
 msgstr ""
 
 #. TRANS: Message given saving SMS phone number that is already set for another user.
 msgid "That is already your phone number."
 msgstr ""
 
 #. TRANS: Message given saving SMS phone number that is already set for another user.

-#: actions/smssettings.php:348
+#: actions/smssettings.php:347

 msgid "That phone number already belongs to another user."
 msgstr ""
 
 #. TRANS: Message given saving valid SMS phone number that is to be confirmed.
 msgid "That phone number already belongs to another user."
 msgstr ""
 
 #. TRANS: Message given saving valid SMS phone number that is to be confirmed.

-#: actions/smssettings.php:376
+#: actions/smssettings.php:374

 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
 msgstr ""
 
 #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
 msgstr ""
 
 #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.

-#: actions/smssettings.php:404
+#: actions/smssettings.php:402

 msgid "That is the wrong confirmation number."
 msgstr ""
 
 #. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
 msgid "That is the wrong confirmation number."
 msgstr ""
 
 #. TRANS: Server error thrown on database error canceling SMS phone number confirmation.

-#: actions/smssettings.php:413
+#: actions/smssettings.php:411

 msgid "Could not delete SMS confirmation."
 msgstr ""
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
 msgid "Could not delete SMS confirmation."
 msgstr ""
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.

-#: actions/smssettings.php:418
+#: actions/smssettings.php:415

 msgid "SMS confirmation cancelled."
 msgstr ""
 
 #. TRANS: Message given trying to remove an SMS phone number that is not
 #. TRANS: registered for the active user.
 msgid "SMS confirmation cancelled."
 msgstr ""
 
 #. TRANS: Message given trying to remove an SMS phone number that is not
 #. TRANS: registered for the active user.

-#: actions/smssettings.php:438
+#: actions/smssettings.php:435

 msgid "That is not your phone number."
 msgstr ""
 
 #. TRANS: Message given after successfully removing a registered SMS phone number.
 msgid "That is not your phone number."
 msgstr ""
 
 #. TRANS: Message given after successfully removing a registered SMS phone number.

-#: actions/smssettings.php:460
+#: actions/smssettings.php:449

 msgid "The SMS phone number was removed."
 msgstr ""
 
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
 msgid "The SMS phone number was removed."
 msgstr ""
 
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.

-#: actions/smssettings.php:499
+#: actions/smssettings.php:488

 msgid "Mobile carrier"
 msgstr ""
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
 msgid "Mobile carrier"
 msgstr ""
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.

-#: actions/smssettings.php:504
+#: actions/smssettings.php:493

 msgid "Select a carrier"
 msgstr ""
 
 #. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
 #. TRANS: %s is an administrative contact's e-mail address.
 msgid "Select a carrier"
 msgstr ""
 
 #. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
 #. TRANS: %s is an administrative contact's e-mail address.

-#: actions/smssettings.php:513
+#: actions/smssettings.php:502

 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "


@@ -6627,124 +6081,47 @@ msgid ""
 msgstr ""
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
 msgstr ""
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.

-#: actions/smssettings.php:535
+#: actions/smssettings.php:524

 msgid "No code entered."
 msgstr ""
 
 msgid "No code entered."
 msgstr ""
 

-#. TRANS: Title for admin panel to configure snapshots.
-#: actions/snapshotadminpanel.php:53
-msgctxt "TITLE"
-msgid "Snapshots"
-msgstr ""
-
-#. TRANS: Instructions for admin panel to configure snapshots.
-#: actions/snapshotadminpanel.php:64
-msgid "Manage snapshot configuration"
-msgstr ""
-
-#. TRANS: Client error displayed on admin panel for snapshots when providing an invalid run value.
-#: actions/snapshotadminpanel.php:125
-msgid "Invalid snapshot run value."
-msgstr ""
-
-#. TRANS: Client error displayed on admin panel for snapshots when providing an invalid value for frequency.
-#: actions/snapshotadminpanel.php:132
-msgid "Snapshot frequency must be a number."
-msgstr ""
-
-#. TRANS: Client error displayed on admin panel for snapshots when providing an invalid report URL.
-#: actions/snapshotadminpanel.php:144
-msgid "Invalid snapshot report URL."
-msgstr ""
-
-#. TRANS: Fieldset legend on admin panel for snapshots.
-#: actions/snapshotadminpanel.php:194
-msgctxt "LEGEND"
-msgid "Snapshots"
-msgstr ""
-
-#. TRANS: Option in dropdown for snapshot method in admin panel for snapshots.
-#: actions/snapshotadminpanel.php:199
-msgid "Randomly during web hit"
-msgstr ""
-
-#. TRANS: Option in dropdown for snapshot method in admin panel for snapshots.
-#: actions/snapshotadminpanel.php:201
-msgid "In a scheduled job"
-msgstr ""
-
-#. TRANS: Dropdown label for snapshot method in admin panel for snapshots.
-#: actions/snapshotadminpanel.php:208
-msgid "Data snapshots"
-msgstr ""
-
-#. TRANS: Dropdown title for snapshot method in admin panel for snapshots.
-#: actions/snapshotadminpanel.php:211
-msgid "When to send statistical data to status.net servers."
-msgstr ""
-
-#. TRANS: Input field label for snapshot frequency in admin panel for snapshots.
-#: actions/snapshotadminpanel.php:221
-msgid "Frequency"
-msgstr ""
-
-#. TRANS: Input field title for snapshot frequency in admin panel for snapshots.
-#: actions/snapshotadminpanel.php:223
-msgid "Snapshots will be sent once every N web hits."
-msgstr ""
-
-#. TRANS: Input field label for snapshot report URL in admin panel for snapshots.
-#: actions/snapshotadminpanel.php:232
-msgid "Report URL"
-msgstr ""
-
-#. TRANS: Input field title for snapshot report URL in admin panel for snapshots.
-#: actions/snapshotadminpanel.php:234
-msgid "Snapshots will be sent to this URL."
-msgstr ""
-
-#. TRANS: Button title to save snapshot settings.
-#: actions/snapshotadminpanel.php:256
-msgid "Save snapshot settings."
-msgstr ""
-

 #. TRANS: Client error displayed trying a change a subscription for a non-subscribed profile.
 #. TRANS: Client error displayed trying a change a subscription for a non-subscribed profile.

-#: actions/subedit.php:76
+#: actions/subedit.php:72

 msgid "You are not subscribed to that profile."
 msgstr ""
 
 #. TRANS: Server error displayed when updating a subscription fails with a database error.
 #. TRANS: Exception thrown when a subscription could not be stored on the server.
 msgid "You are not subscribed to that profile."
 msgstr ""
 
 #. TRANS: Server error displayed when updating a subscription fails with a database error.
 #. TRANS: Exception thrown when a subscription could not be stored on the server.

-#: actions/subedit.php:90 classes/Subscription.php:177
+#: actions/subedit.php:85 classes/Subscription.php:157

 msgid "Could not save subscription."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to approve group applicants without being a group administrator.
 msgid "Could not save subscription."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to approve group applicants without being a group administrator.

-#: actions/subqueue.php:62
+#: actions/subqueue.php:55

 msgid "You may only approve your own pending subscriptions."
 msgstr ""
 
 #. TRANS: Title of the first page showing pending subscribers still awaiting approval.
 #. TRANS: %s is the name of the user.
 msgid "You may only approve your own pending subscriptions."
 msgstr ""
 
 #. TRANS: Title of the first page showing pending subscribers still awaiting approval.
 #. TRANS: %s is the name of the user.

-#: actions/subqueue.php:73
+#: actions/subqueue.php:65

 #, php-format
 msgid "%s subscribers awaiting approval"
 msgstr ""
 
 #. TRANS: Title of all but the first page showing pending subscribersmembers still awaiting approval.
 #. TRANS: %1$s is the name of the user, %2$d is the page number of the members list.
 #, php-format
 msgid "%s subscribers awaiting approval"
 msgstr ""
 
 #. TRANS: Title of all but the first page showing pending subscribersmembers still awaiting approval.
 #. TRANS: %1$s is the name of the user, %2$d is the page number of the members list.

-#: actions/subqueue.php:78
+#: actions/subqueue.php:70

 #, php-format
 msgid "%1$s subscribers awaiting approval, page %2$d"
 msgstr ""
 
 #. TRANS: Page notice for group members page.
 #, php-format
 msgid "%1$s subscribers awaiting approval, page %2$d"
 msgstr ""
 
 #. TRANS: Page notice for group members page.

-#: actions/subqueue.php:88
+#: actions/subqueue.php:80

 msgid "A list of users awaiting approval to subscribe to you."
 msgstr ""
 
 #. TRANS: Page title when subscription succeeded.
 msgid "A list of users awaiting approval to subscribe to you."
 msgstr ""
 
 #. TRANS: Page title when subscription succeeded.

-#: actions/subscribe.php:137
+#: actions/subscribe.php:132

 msgid "Subscribed"
 msgstr ""
 
 msgid "Subscribed"
 msgstr ""
 


@@ -6754,20 +6131,20 @@ msgid "You must be logged in to unsubscribe from a list."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to perform an action without providing an ID.
 msgstr ""
 
 #. TRANS: Client error displayed when trying to perform an action without providing an ID.

-#: actions/subscribepeopletag.php:89 actions/unsubscribepeopletag.php:90
+#: actions/subscribepeopletag.php:86 actions/unsubscribepeopletag.php:87

 msgid "No ID given."
 msgstr ""
 
 #. TRANS: Server error displayed subscribing to a list fails.
 #. TRANS: %1$s is a user nickname, %2$s is a list, %3$s is the error message (no period).
 msgid "No ID given."
 msgstr ""
 
 #. TRANS: Server error displayed subscribing to a list fails.
 #. TRANS: %1$s is a user nickname, %2$s is a list, %3$s is the error message (no period).

-#: actions/subscribepeopletag.php:125
+#: actions/subscribepeopletag.php:120

 #, php-format
 msgid "Could not subscribe user %1$s to list %2$s: %3$s"
 msgstr ""
 
 #. TRANS: Title of form to subscribe to a list.
 #. TRANS: %1%s is a user nickname, %2$s is a list, %3$s is a tagger nickname.
 #, php-format
 msgid "Could not subscribe user %1$s to list %2$s: %3$s"
 msgstr ""
 
 #. TRANS: Title of form to subscribe to a list.
 #. TRANS: %1%s is a user nickname, %2$s is a list, %3$s is a tagger nickname.

-#: actions/subscribepeopletag.php:134
+#: actions/subscribepeopletag.php:129

 #, php-format
 msgid "%1$s subscribed to list %2$s by %3$s"
 msgstr ""
 #, php-format
 msgid "%1$s subscribed to list %2$s by %3$s"
 msgstr ""


@@ -6788,19 +6165,19 @@ msgstr ""
 
 #. TRANS: Page notice for page with an overview of all subscribers
 #. TRANS: of the logged in user's own profile.
 
 #. TRANS: Page notice for page with an overview of all subscribers
 #. TRANS: of the logged in user's own profile.

-#: actions/subscribers.php:68
+#: actions/subscribers.php:67

 msgid "These are the people who listen to your notices."
 msgstr ""
 
 #. TRANS: Page notice for page with an overview of all subscribers of a user other
 #. TRANS: than the logged in user. %s is the user nickname.
 msgid "These are the people who listen to your notices."
 msgstr ""
 
 #. TRANS: Page notice for page with an overview of all subscribers of a user other
 #. TRANS: than the logged in user. %s is the user nickname.

-#: actions/subscribers.php:74
+#: actions/subscribers.php:73

 #, php-format
 msgid "These are the people who listen to %s's notices."
 msgstr ""
 
 #. TRANS: Subscriber list text when the logged in user has no subscribers.
 #, php-format
 msgid "These are the people who listen to %s's notices."
 msgstr ""
 
 #. TRANS: Subscriber list text when the logged in user has no subscribers.

-#: actions/subscribers.php:114
+#: actions/subscribers.php:111

 msgid ""
 "You have no subscribers. Try subscribing to people you know and they might "
 "return the favor."
 msgid ""
 "You have no subscribers. Try subscribing to people you know and they might "
 "return the favor."


@@ -6808,7 +6185,7 @@ msgstr ""
 
 #. TRANS: Subscriber list text when looking at the subscribers for a of a user other
 #. TRANS: than the logged in user that has no subscribers. %s is the user nickname.
 
 #. TRANS: Subscriber list text when looking at the subscribers for a of a user other
 #. TRANS: than the logged in user that has no subscribers. %s is the user nickname.

-#: actions/subscribers.php:118
+#: actions/subscribers.php:115

 #, php-format
 msgid "%s has no subscribers. Want to be the first?"
 msgstr ""
 #, php-format
 msgid "%s has no subscribers. Want to be the first?"
 msgstr ""


@@ -6818,11 +6195,11 @@ msgstr ""
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.

-#: actions/subscribers.php:127
+#: actions/subscribers.php:122

 #, php-format
 msgid ""
 #, php-format
 msgid ""

-"%s has no subscribers. Why not [register an account](%%%%action.register%%%"
-"%) and be the first?"
+"%s has no subscribers. Why not [register an account](%%%%action.register%%"
+"%%) and be the first?"

 msgstr ""
 
 #. TRANS: Header for subscriptions overview for a user (not first page).
 msgstr ""
 
 #. TRANS: Header for subscriptions overview for a user (not first page).


@@ -6834,13 +6211,13 @@ msgstr ""
 
 #. TRANS: Page notice for page with an overview of all subscriptions
 #. TRANS: of the logged in user's own profile.
 
 #. TRANS: Page notice for page with an overview of all subscriptions
 #. TRANS: of the logged in user's own profile.

-#: actions/subscriptions.php:68
+#: actions/subscriptions.php:67

 msgid "These are the people whose notices you listen to."
 msgstr ""
 
 #. TRANS: Page notice for page with an overview of all subscriptions of a user other
 #. TRANS: than the logged in user. %s is the user nickname.
 msgid "These are the people whose notices you listen to."
 msgstr ""
 
 #. TRANS: Page notice for page with an overview of all subscriptions of a user other
 #. TRANS: than the logged in user. %s is the user nickname.

-#: actions/subscriptions.php:74
+#: actions/subscriptions.php:73

 #, php-format
 msgid "These are the people whose notices %s listens to."
 msgstr ""
 #, php-format
 msgid "These are the people whose notices %s listens to."
 msgstr ""


@@ -6849,7 +6226,7 @@ msgstr ""
 #. TRANS: This message contains Markdown URLs. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
 #. TRANS: This message contains Markdown URLs. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.

-#: actions/subscriptions.php:133
+#: actions/subscriptions.php:130

 #, php-format
 msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
 #, php-format
 msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "


@@ -6858,63 +6235,61 @@ msgid ""
 "featured%%)."
 msgstr ""
 
 "featured%%)."
 msgstr ""
 

-#. TRANS: Subscription list text when looking at the subscriptions for a of a user other
-#. TRANS: than the logged in user that has no subscriptions. %s is the user nickname.

 #. TRANS: Subscription list text when looking at the subscriptions for a of a user that has none
 #. TRANS: as an anonymous user. %s is the user nickname.
 #. TRANS: Subscription list text when looking at the subscriptions for a of a user that has none
 #. TRANS: as an anonymous user. %s is the user nickname.

-#: actions/subscriptions.php:139 actions/subscriptions.php:145
+#: actions/subscriptions.php:136

 #, php-format
 msgid "%s is not listening to anyone."
 msgstr ""
 
 #. TRANS: Atom feed title. %s is a profile nickname.
 #, php-format
 msgid "%s is not listening to anyone."
 msgstr ""
 
 #. TRANS: Atom feed title. %s is a profile nickname.

-#: actions/subscriptions.php:164
+#: actions/subscriptions.php:155

 #, php-format
 msgid "Subscription feed for %s (Atom)"
 msgstr ""
 
 #. TRANS: Checkbox label for enabling IM messages for a profile in a subscriptions list.
 #, php-format
 msgid "Subscription feed for %s (Atom)"
 msgstr ""
 
 #. TRANS: Checkbox label for enabling IM messages for a profile in a subscriptions list.

-#: actions/subscriptions.php:229
+#: actions/subscriptions.php:203

 msgctxt "LABEL"
 msgid "IM"
 msgstr ""
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
 msgctxt "LABEL"
 msgid "IM"
 msgstr ""
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.

-#: actions/subscriptions.php:244
+#: actions/subscriptions.php:218

 msgid "SMS"
 msgstr ""
 
 #. TRANS: Title for all but the first page of notices with tags.
 #. TRANS: %1$s is the tag, %2$d is the page number.
 msgid "SMS"
 msgstr ""
 
 #. TRANS: Title for all but the first page of notices with tags.
 #. TRANS: %1$s is the tag, %2$d is the page number.

-#: actions/tag.php:69
+#: actions/tag.php:68

 #, php-format
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr ""
 
 #. TRANS: Link label for feed on "notices with tag" page.
 #. TRANS: %s is the tag the feed is for.
 #, php-format
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr ""
 
 #. TRANS: Link label for feed on "notices with tag" page.
 #. TRANS: %s is the tag the feed is for.

-#: actions/tag.php:90
+#: actions/tag.php:82

 #, php-format
 msgid "Notice feed for tag %s (Activity Streams JSON)"
 msgstr ""
 
 #. TRANS: Link label for feed on "notices with tag" page.
 #. TRANS: %s is the tag the feed is for.
 #, php-format
 msgid "Notice feed for tag %s (Activity Streams JSON)"
 msgstr ""
 
 #. TRANS: Link label for feed on "notices with tag" page.
 #. TRANS: %s is the tag the feed is for.

-#: actions/tag.php:97
+#: actions/tag.php:89

 #, php-format
 msgid "Notice feed for tag %s (RSS 1.0)"
 msgstr ""
 
 #. TRANS: Link label for feed on "notices with tag" page.
 #. TRANS: %s is the tag the feed is for.
 #, php-format
 msgid "Notice feed for tag %s (RSS 1.0)"
 msgstr ""
 
 #. TRANS: Link label for feed on "notices with tag" page.
 #. TRANS: %s is the tag the feed is for.

-#: actions/tag.php:105
+#: actions/tag.php:97

 #, php-format
 msgid "Notice feed for tag %s (RSS 2.0)"
 msgstr ""
 
 #. TRANS: Link label for feed on "notices with tag" page.
 #. TRANS: %s is the tag the feed is for.
 #, php-format
 msgid "Notice feed for tag %s (RSS 2.0)"
 msgstr ""
 
 #. TRANS: Link label for feed on "notices with tag" page.
 #. TRANS: %s is the tag the feed is for.

-#: actions/tag.php:113
+#: actions/tag.php:105

 #, php-format
 msgid "Notice feed for tag %s (Atom)"
 msgstr ""
 #, php-format
 msgid "Notice feed for tag %s (Atom)"
 msgstr ""


@@ -6922,66 +6297,43 @@ msgstr ""
 #. TRANS: Client error displayed when trying to tag a user that cannot be tagged.
 #. TRANS: Client exception thrown trying to set a tag for a user that cannot be tagged.
 #. TRANS: Error displayed when trying to tag a user that cannot be tagged.
 #. TRANS: Client error displayed when trying to tag a user that cannot be tagged.
 #. TRANS: Client exception thrown trying to set a tag for a user that cannot be tagged.
 #. TRANS: Error displayed when trying to tag a user that cannot be tagged.

-#: actions/tagprofile.php:56 classes/Profile_tag.php:171 lib/command.php:440
-#: lib/command.php:499
+#: actions/tagprofile.php:50 classes/Profile_tag.php:163 lib/command.php:391
+#: lib/command.php:450

 msgid "You cannot tag this user."
 msgstr ""
 
 #. TRANS: Title for list form when not on a profile page.
 msgid "You cannot tag this user."
 msgstr ""
 
 #. TRANS: Title for list form when not on a profile page.

-#: actions/tagprofile.php:78
+#: actions/tagprofile.php:68

 msgid "List a profile"
 msgstr ""
 
 #. TRANS: Title for list form when on a profile page.
 #. TRANS: %s is a profile nickname.
 msgid "List a profile"
 msgstr ""
 
 #. TRANS: Title for list form when on a profile page.
 #. TRANS: %s is a profile nickname.

-#: actions/tagprofile.php:82
+#. TRANS: Form legend for notice form.
+#: actions/tagprofile.php:72 lib/tagprofileform.php:110

 #, php-format
 msgctxt "ADDTOLIST"
 msgid "List %s"
 msgstr ""
 
 #, php-format
 msgctxt "ADDTOLIST"
 msgid "List %s"
 msgstr ""
 

-#. TRANS: Title for list form when an error has occurred.
-#: actions/tagprofile.php:92
-msgctxt "TITLE"
-msgid "Error"
-msgstr ""
-

 #. TRANS: Header in list form.
 #. TRANS: Header in list form.

-#: actions/tagprofile.php:108
+#: actions/tagprofile.php:79

 msgid "User profile"
 msgstr ""
 
 msgid "User profile"
 msgstr ""
 

-#. TRANS: Fieldset legend for list form.
-#: actions/tagprofile.php:151
-msgid "List user"
-msgstr ""
-
-#. TRANS: Field label on list form.
-#: actions/tagprofile.php:162
-msgctxt "LABEL"
-msgid "Lists"
-msgstr ""
-
-#. TRANS: Field title on list form.
-#: actions/tagprofile.php:165
-msgid ""
-"Lists for this user (letters, numbers, -, ., and _), comma- or space- "
-"separated."
-msgstr ""
-

 #. TRANS: Title for personal tag cloud section.
 #. TRANS: Title for personal tag cloud section.

-#: actions/tagprofile.php:228 lib/personaltagcloudsection.php:56
+#: actions/tagprofile.php:168 lib/personaltagcloudsection.php:56

 msgctxt "TITLE"
 msgid "Tags"
 msgstr ""
 
 #. TRANS: Success message if lists are saved.
 msgctxt "TITLE"
 msgid "Tags"
 msgstr ""
 
 #. TRANS: Success message if lists are saved.

-#: actions/tagprofile.php:244
+#: actions/tagprofile.php:184

 msgid "Lists saved."
 msgstr ""
 
 #. TRANS: Page notice.
 msgid "Lists saved."
 msgstr ""
 
 #. TRANS: Page notice.

-#: actions/tagprofile.php:260
+#: actions/tagprofile.php:200

 msgid "Use this form to add your subscribers or subscriptions to lists."
 msgstr ""
 
 msgid "Use this form to add your subscribers or subscriptions to lists."
 msgstr ""
 


@@ -6996,23 +6348,28 @@ msgid "You haven't blocked that user."
 msgstr ""
 
 #. TRANS: Client error on page to unsilence a user when the to be unsandboxed user has not been sandboxed.
 msgstr ""
 
 #. TRANS: Client error on page to unsilence a user when the to be unsandboxed user has not been sandboxed.

-#: actions/unsandbox.php:72
+#: actions/unsandbox.php:71

 msgid "User is not sandboxed."
 msgstr ""
 
 #. TRANS: Client error on page to unsilence a user when the to be unsilenced user has not been silenced.
 msgid "User is not sandboxed."
 msgstr ""
 
 #. TRANS: Client error on page to unsilence a user when the to be unsilenced user has not been silenced.

-#: actions/unsilence.php:72
+#: actions/unsilence.php:71

 msgid "User is not silenced."
 msgstr ""
 
 msgid "User is not silenced."
 msgstr ""
 

+#. TRANS: Client error displayed when trying to unsubscribe without providing a profile ID.
+#: actions/unsubscribe.php:74
+msgid "No profile ID in request."
+msgstr ""
+

 #. TRANS: Page title for page to unsubscribe.
 #. TRANS: Page title for page to unsubscribe.

-#: actions/unsubscribe.php:102
+#: actions/unsubscribe.php:94

 msgid "Unsubscribed"
 msgstr ""
 
 #. TRANS: Page title for form that allows unsubscribing from a list.
 #. TRANS: %1$s is a nickname, %2$s is a list, %3$s is a tagger nickname.
 msgid "Unsubscribed"
 msgstr ""
 
 #. TRANS: Page title for form that allows unsubscribing from a list.
 #. TRANS: %1$s is a nickname, %2$s is a list, %3$s is a tagger nickname.

-#: actions/unsubscribepeopletag.php:127
+#: actions/unsubscribepeopletag.php:122

 #, php-format
 msgid "%1$s unsubscribed from list %2$s by %3$s"
 msgstr ""
 #, php-format
 msgid "%1$s unsubscribed from list %2$s by %3$s"
 msgstr ""


@@ -7061,7 +6418,9 @@ msgstr ""
 
 #. TRANS: Field title in URL settings in profile.
 #: actions/urlsettings.php:139
 
 #. TRANS: Field title in URL settings in profile.
 #: actions/urlsettings.php:139

-msgid "URLs longer than this will be shortened, 0 means always shorten."
+msgid ""
+"URLs longer than this will be shortened, -1 means never shorten because a "
+"URL is long."

 msgstr ""
 
 #. TRANS: Field label in URL settings in profile.
 msgstr ""
 
 #. TRANS: Field label in URL settings in profile.


@@ -7072,7 +6431,8 @@ msgstr ""
 #. TRANS: Field title in URL settings in profile.
 #: actions/urlsettings.php:148
 msgid ""
 #. TRANS: Field title in URL settings in profile.
 #: actions/urlsettings.php:148
 msgid ""

-"URLs in notices longer than this will be shortened, 0 means always shorten."
+"URLs in notices longer than this will always be shortened, -1 means only "
+"shorten if the full post exceeds maximum length."

 msgstr ""
 
 #. TRANS: Form validation error for form "Other settings" in user profile.
 msgstr ""
 
 #. TRANS: Form validation error for form "Other settings" in user profile.


@@ -7091,7 +6451,7 @@ msgid "Invalid number for maximum notice length."
 msgstr ""
 
 #. TRANS: Server exception thrown in profile URL settings when preferences could not be saved.
 msgstr ""
 
 #. TRANS: Server exception thrown in profile URL settings when preferences could not be saved.

-#: actions/urlsettings.php:241
+#: actions/urlsettings.php:240

 msgid "Error saving user URL shortening preferences."
 msgstr ""
 
 msgid "Error saving user URL shortening preferences."
 msgstr ""
 


@@ -7186,26 +6546,26 @@ msgstr ""
 
 #. TRANS: Page title for all but the first page of groups for a user.
 #. TRANS: %1$s is a nickname, %2$d is a page number.
 
 #. TRANS: Page title for all but the first page of groups for a user.
 #. TRANS: %1$s is a nickname, %2$d is a page number.

-#: actions/usergroups.php:67
+#: actions/usergroups.php:59

 #, php-format
 msgid "%1$s groups, page %2$d"
 msgstr ""
 
 #. TRANS: Link text on group page to search for groups.
 #, php-format
 msgid "%1$s groups, page %2$d"
 msgstr ""
 
 #. TRANS: Link text on group page to search for groups.

-#: actions/usergroups.php:131
+#: actions/usergroups.php:78

 msgid "Search for more groups"
 msgstr ""
 
 #. TRANS: Text on group page for a user that is not a member of any group.
 #. TRANS: %s is a user nickname.
 msgid "Search for more groups"
 msgstr ""
 
 #. TRANS: Text on group page for a user that is not a member of any group.
 #. TRANS: %s is a user nickname.

-#: actions/usergroups.php:160
+#: actions/usergroups.php:105

 #, php-format
 msgid "%s is not a member of any group."
 msgstr ""
 
 #. TRANS: Text on group page for a user that is not a member of any group. This message contains
 #. TRANS: a Markdown link in the form [link text](link) and a variable that should not be changed.
 #, php-format
 msgid "%s is not a member of any group."
 msgstr ""
 
 #. TRANS: Text on group page for a user that is not a member of any group. This message contains
 #. TRANS: a Markdown link in the form [link text](link) and a variable that should not be changed.

-#: actions/usergroups.php:167
+#: actions/usergroups.php:112

 #, php-format
 msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
 msgstr ""
 #, php-format
 msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
 msgstr ""


@@ -7216,47 +6576,48 @@ msgstr ""
 #. TRANS: Message is used as a subtitle in atom user notice feed.
 #. TRANS: %1$s is a user name, %2$s is a site name.
 #: actions/userrss.php:96 lib/atomgroupnoticefeed.php:70
 #. TRANS: Message is used as a subtitle in atom user notice feed.
 #. TRANS: %1$s is a user name, %2$s is a site name.
 #: actions/userrss.php:96 lib/atomgroupnoticefeed.php:70

-#: lib/atomusernoticefeed.php:95
+#: lib/atomusernoticefeed.php:80

 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr ""
 
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr ""
 

-#. TRANS: Title for version page. %s is the StatusNet version.
-#: actions/version.php:73
+#. TRANS: Title for version page. %1$s is the engine name, %2$s is the engine version.
+#: actions/version.php:71

 #, php-format
 #, php-format

-msgid "StatusNet %s"
+msgid "%1$s %2$s"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Content part of StatusNet version page.
-#. TRANS: %1$s is the engine name (StatusNet) and %2$s is the StatusNet version.
-#: actions/version.php:151
+#. TRANS: Content part of engine version page.
+#. TRANS: %1$s is the engine name (GNU social) and %2$s is the GNU social version.
+#: actions/version.php:149

 #, php-format
 msgid ""
 #, php-format
 msgid ""

-"This site is powered by %1$s version %2$s, Copyright 2008-2011 StatusNet, "
+"This site is powered by %1$s version %2$s, Copyright 2008-2013 StatusNet, "

 "Inc. and contributors."
 msgstr ""
 
 "Inc. and contributors."
 msgstr ""
 

-#. TRANS: Header for StatusNet contributors section on the version page.
-#: actions/version.php:161
+#. TRANS: Header for engine software contributors section on the version page.
+#: actions/version.php:159

 msgid "Contributors"
 msgstr ""
 
 msgid "Contributors"
 msgstr ""
 

-#. TRANS: Header for StatusNet license section on the version page.
-#: actions/version.php:167
+#. TRANS: Header for engine software license section on the version page.
+#: actions/version.php:165

 msgid "License"
 msgstr ""
 
 msgid "License"
 msgstr ""
 

-#. TRANS: Content part of StatusNet version page.
-#: actions/version.php:171
+#. TRANS: Content part of engine software version page. %1s is engine name
+#: actions/version.php:169
+#, php-format

 msgid ""
 msgid ""

-"StatusNet is free software: you can redistribute it and/or modify it under "
-"the terms of the GNU Affero General Public License as published by the Free "
+"%1$s is free software: you can redistribute it and/or modify it under the "
+"terms of the GNU Affero General Public License as published by the Free "

 "Software Foundation, either version 3 of the License, or (at your option) "
 "any later version."
 msgstr ""
 
 "Software Foundation, either version 3 of the License, or (at your option) "
 "any later version."
 msgstr ""
 

-#. TRANS: Content part of StatusNet version page.
-#: actions/version.php:178
+#. TRANS: Content part of engine software version page.
+#: actions/version.php:176

 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "


@@ -7264,82 +6625,79 @@ msgid ""
 "for more details."
 msgstr ""
 
 "for more details."
 msgstr ""
 

-#. TRANS: Content part of StatusNet version page.
+#. TRANS: Content part of engine version page.

 #. TRANS: %s is a link to the AGPL license with link description "http://www.gnu.org/licenses/agpl.html".
 #. TRANS: %s is a link to the AGPL license with link description "http://www.gnu.org/licenses/agpl.html".

-#: actions/version.php:186
+#: actions/version.php:184

 #, php-format
 msgid ""
 "You should have received a copy of the GNU Affero General Public License "
 "along with this program.  If not, see %s."
 msgstr ""
 
 #, php-format
 msgid ""
 "You should have received a copy of the GNU Affero General Public License "
 "along with this program.  If not, see %s."
 msgstr ""
 

-#. TRANS: Header for StatusNet plugins section on the version page.
-#: actions/version.php:196
+#. TRANS: Header for engine plugins section on the version page.
+#: actions/version.php:194

 msgid "Plugins"
 msgstr ""
 
 #. TRANS: Column header for plugins table on version page.
 msgid "Plugins"
 msgstr ""
 
 #. TRANS: Column header for plugins table on version page.

-#: actions/version.php:203
+#: actions/version.php:201

 msgctxt "HEADER"
 msgid "Name"
 msgstr ""
 
 #. TRANS: Column header for plugins table on version page.
 msgctxt "HEADER"
 msgid "Name"
 msgstr ""
 
 #. TRANS: Column header for plugins table on version page.

-#: actions/version.php:205
+#: actions/version.php:203

 msgctxt "HEADER"
 msgid "Version"
 msgstr ""
 
 #. TRANS: Column header for plugins table on version page.
 msgctxt "HEADER"
 msgid "Version"
 msgstr ""
 
 #. TRANS: Column header for plugins table on version page.

-#: actions/version.php:207
+#: actions/version.php:205

 msgctxt "HEADER"
 msgid "Author(s)"
 msgstr ""
 
 #. TRANS: Column header for plugins table on version page.
 msgctxt "HEADER"
 msgid "Author(s)"
 msgstr ""
 
 #. TRANS: Column header for plugins table on version page.

-#: actions/version.php:209
+#: actions/version.php:207

 msgctxt "HEADER"
 msgid "Description"
 msgstr ""
 
 msgctxt "HEADER"
 msgid "Description"
 msgstr ""
 

-#. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:140
-msgid "Favor"
+#. TRANS: An error message when avatar size is unreasonable
+#: classes/Avatar.php:242
+msgid "Avatar size too large"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Ntofication given when a user marks a notice as favorite.
-#. TRANS: %1$s is a user nickname or full name, %2$s is a notice URI.
-#: classes/Fave.php:143
-#, php-format
-msgid "%1$s marked notice %2$s as a favorite."
+#. TRANS: An error message when unable to insert avatar data into the db
+#: classes/Avatar.php:260
+msgid "Could not insert new avatar data to database"
+msgstr ""
+
+#: classes/Conversation.php:69
+msgid "Tried to create conversation for not yet inserted notice"
+msgstr ""
+
+#: classes/Conversation.php:83
+msgid "Failed to create conversation for notice"

 msgstr ""
 
 #. TRANS: Server exception thrown when a URL cannot be processed.
 msgstr ""
 
 #. TRANS: Server exception thrown when a URL cannot be processed.

-#: classes/File.php:175
+#: classes/File.php:151

 #, php-format
 msgid "Cannot process URL '%s'"
 msgstr ""
 
 #, php-format
 msgid "Cannot process URL '%s'"
 msgstr ""
 

-#. TRANS: Server exception thrown when... Robin thinks something is impossible!
-#: classes/File.php:207
-msgid "Robin thinks something is impossible."
-msgstr ""
-

 #. TRANS: Message used to be inserted as %2$s in  the text "No file may
 #. TRANS: be larger than %1$d byte and the file you sent was %2$s.".
 #. TRANS: %1$d is the number of bytes of an uploaded file.
 #. TRANS: Message used to be inserted as %2$s in  the text "No file may
 #. TRANS: be larger than %1$d byte and the file you sent was %2$s.".
 #. TRANS: %1$d is the number of bytes of an uploaded file.

-#: classes/File.php:223
+#: classes/File.php:191

 #, php-format
 msgid "%1$d byte"
 msgid_plural "%1$d bytes"
 msgstr[0] ""
 msgstr[1] ""
 
 #, php-format
 msgid "%1$d byte"
 msgid_plural "%1$d bytes"
 msgstr[0] ""
 msgstr[1] ""
 

-#. TRANS: Message given if an upload is larger than the configured maximum.
-#. TRANS: %1$d (used for plural) is the byte limit for uploads,
-#. TRANS: %2$s is the proper form of "n bytes". This is the only ways to have
-#. TRANS: gettext support multiple plurals in the same message, unfortunately...
-#: classes/File.php:230
+#: classes/File.php:199

 #, php-format
 msgid ""
 "No file may be larger than %1$d byte and the file you sent was %2$s. Try to "
 #, php-format
 msgid ""
 "No file may be larger than %1$d byte and the file you sent was %2$s. Try to "


@@ -7350,18 +6708,14 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
 msgstr[0] ""
 msgstr[1] ""
 

-#. TRANS: Message given if an upload would exceed user quota.
-#. TRANS: %d (number) is the user quota in bytes and is used for plural.
-#: classes/File.php:243
+#: classes/File.php:215

 #, php-format
 msgid "A file this large would exceed your user quota of %d byte."
 msgid_plural "A file this large would exceed your user quota of %d bytes."
 msgstr[0] ""
 msgstr[1] ""
 
 #, php-format
 msgid "A file this large would exceed your user quota of %d byte."
 msgid_plural "A file this large would exceed your user quota of %d bytes."
 msgstr[0] ""
 msgstr[1] ""
 

-#. TRANS: Message given id an upload would exceed a user's monthly quota.
-#. TRANS: $d (number) is the monthly user quota in bytes and is used for plural.
-#: classes/File.php:255
+#: classes/File.php:228

 #, php-format
 msgid "A file this large would exceed your monthly quota of %d byte."
 msgid_plural "A file this large would exceed your monthly quota of %d bytes."
 #, php-format
 msgid "A file this large would exceed your monthly quota of %d byte."
 msgid_plural "A file this large would exceed your monthly quota of %d bytes."


@@ -7369,189 +6723,180 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Client exception thrown if a file upload does not have a valid name.
 msgstr[1] ""
 
 #. TRANS: Client exception thrown if a file upload does not have a valid name.

-#: classes/File.php:302 classes/File.php:317
+#: classes/File.php:281 classes/File.php:296

 msgid "Invalid filename."
 msgstr ""
 
 #. TRANS: Exception thrown providing an invalid profile ID.
 #. TRANS: %s is the invalid profile ID.
 msgid "Invalid filename."
 msgstr ""
 
 #. TRANS: Exception thrown providing an invalid profile ID.
 #. TRANS: %s is the invalid profile ID.

-#: classes/Group_join_queue.php:66 classes/Group_member.php:117
+#: classes/Group_join_queue.php:58 classes/Group_member.php:109

 #, php-format
 msgid "Profile ID %s is invalid."
 msgstr ""
 
 #. TRANS: Exception thrown providing an invalid group ID.
 #. TRANS: %s is the invalid group ID.
 #, php-format
 msgid "Profile ID %s is invalid."
 msgstr ""
 
 #. TRANS: Exception thrown providing an invalid group ID.
 #. TRANS: %s is the invalid group ID.

-#: classes/Group_join_queue.php:79 classes/Group_member.php:130
+#: classes/Group_join_queue.php:71 classes/Group_member.php:122

 #, php-format
 msgid "Group ID %s is invalid."
 msgstr ""
 
 #. TRANS: Exception thrown when joining a group fails.
 #, php-format
 msgid "Group ID %s is invalid."
 msgstr ""
 
 #. TRANS: Exception thrown when joining a group fails.

-#: classes/Group_member.php:83
+#: classes/Group_member.php:75

 msgid "Group join failed."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to leave a group the user is not a member of.
 msgid "Group join failed."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to leave a group the user is not a member of.

-#: classes/Group_member.php:96
+#: classes/Group_member.php:88

 msgid "Not part of group."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to leave a group fails.
 msgid "Not part of group."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to leave a group fails.

-#: classes/Group_member.php:104
+#: classes/Group_member.php:96

 msgid "Group leave failed."
 msgstr ""
 
 #. TRANS: Activity title.
 msgid "Group leave failed."
 msgstr ""
 
 #. TRANS: Activity title.

-#: classes/Group_member.php:176
+#: classes/Group_member.php:177

 msgid "Join"
 msgstr ""
 
 #. TRANS: Success message for subscribe to group attempt through OStatus.
 #. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
 msgid "Join"
 msgstr ""
 
 #. TRANS: Success message for subscribe to group attempt through OStatus.
 #. TRANS: %1$s is the member name, %2$s is the subscribed group's name.

-#: classes/Group_member.php:180
+#: classes/Group_member.php:181

 #, php-format
 msgid "%1$s has joined group %2$s."
 msgstr ""
 
 #. TRANS: Server exception thrown when updating a local group fails.
 #, php-format
 msgid "%1$s has joined group %2$s."
 msgstr ""
 
 #. TRANS: Server exception thrown when updating a local group fails.

-#: classes/Local_group.php:58
+#: classes/Local_group.php:69

 msgid "Could not update local group."
 msgstr ""
 
 #. TRANS: Exception thrown when trying creating a login token failed.
 #. TRANS: %s is the user nickname for which token creation failed.
 msgid "Could not update local group."
 msgstr ""
 
 #. TRANS: Exception thrown when trying creating a login token failed.
 #. TRANS: %s is the user nickname for which token creation failed.

-#: classes/Login_token.php:81
+#: classes/Login_token.php:78

 #, php-format
 msgid "Could not create login token for %s"
 msgstr ""
 
 #, php-format
 msgid "Could not create login token for %s"
 msgstr ""
 

-#. TRANS: Exception thrown when a program code class (%s) cannot be instantiated.
-#: classes/Memcached_DataObject.php:146 classes/Memcached_DataObject.php:254
-#: classes/Memcached_DataObject.php:311
-#, php-format
-msgid "Cannot instantiate class %s."
-msgstr ""
-

 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.

-#: classes/Memcached_DataObject.php:846
+#: classes/Memcached_DataObject.php:851

 msgid "No database name or DSN found anywhere."
 msgstr ""
 
 msgid "No database name or DSN found anywhere."
 msgstr ""
 

-#. TRANS: Client exception thrown when a user tries to send a direct message while being banned from sending them.
-#: classes/Message.php:78
-msgid "You are banned from sending direct messages."
-msgstr ""
-
-#. TRANS: Message given when a message could not be stored on the server.
-#: classes/Message.php:102
-msgid "Could not insert message."
-msgstr ""
-
-#. TRANS: Message given when a message could not be updated on the server.
-#: classes/Message.php:113
-msgid "Could not update message with new URI."
-msgstr ""
-
-#. TRANS: Server exception thrown when a user profile for a notice cannot be found.
-#. TRANS: %1$d is a profile ID (number), %2$d is a notice ID (number).
-#: classes/Notice.php:167
+#. TRANS: Title of a notice posted without a title value.
+#. TRANS: %1$s is a user name, %2$s is the notice creation date/time.
+#: classes/Notice.php:265

 #, php-format
 #, php-format

-msgid "No such profile (%1$d) for notice (%2$d)."
+msgid "%1$s's status on %2$s"

 msgstr ""
 
 #. TRANS: Server exception. %s are the error details.
 msgstr ""
 
 #. TRANS: Server exception. %s are the error details.

-#: classes/Notice.php:274
+#: classes/Notice.php:365

 #, php-format
 msgid "Database error inserting hashtag: %s."
 msgstr ""
 
 #, php-format
 msgid "Database error inserting hashtag: %s."
 msgstr ""
 

-#. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:360
-msgid "Problem saving notice. Too long."
-msgstr ""
-

 #. TRANS: Client exception thrown when trying to save a notice for an unknown user.
 #. TRANS: Client exception thrown when trying to save a notice for an unknown user.

-#: classes/Notice.php:365
+#: classes/Notice.php:444

 msgid "Problem saving notice. Unknown user."
 msgstr ""
 
 msgid "Problem saving notice. Unknown user."
 msgstr ""
 

+#. TRANS: Client exception thrown if a notice contains too many characters.
+#: classes/Notice.php:457
+msgid "Problem saving notice. Too long."
+msgstr ""
+

 #. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
 #. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.

-#: classes/Notice.php:371
+#: classes/Notice.php:463 classes/Notice.php:744

 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 
 #. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 
 #. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.

-#: classes/Notice.php:378
+#: classes/Notice.php:470

 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
 msgstr ""
 
 #. TRANS: Client exception thrown when a user tries to post while being banned.
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
 msgstr ""
 
 #. TRANS: Client exception thrown when a user tries to post while being banned.

-#: classes/Notice.php:386
+#: classes/Notice.php:478 classes/Notice.php:739

 msgid "You are banned from posting notices on this site."
 msgstr ""
 
 #. TRANS: Client exception thrown in notice when trying to repeat a missing or deleted notice.
 msgid "You are banned from posting notices on this site."
 msgstr ""
 
 #. TRANS: Client exception thrown in notice when trying to repeat a missing or deleted notice.

-#: classes/Notice.php:433
+#: classes/Notice.php:534

 msgid "Cannot repeat; original notice is missing or deleted."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to repeat an own notice.
 msgid "Cannot repeat; original notice is missing or deleted."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to repeat an own notice.

-#: classes/Notice.php:438
+#: classes/Notice.php:539

 msgid "You cannot repeat your own notice."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to repeat a non-public notice.
 msgid "You cannot repeat your own notice."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to repeat a non-public notice.

-#: classes/Notice.php:444
+#: classes/Notice.php:545

 msgid "Cannot repeat a private notice."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to repeat a notice you cannot access.
 msgid "Cannot repeat a private notice."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to repeat a notice you cannot access.

-#: classes/Notice.php:450
+#: classes/Notice.php:551

 msgid "Cannot repeat a notice you cannot read."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to repeat an already repeated notice.
 msgid "Cannot repeat a notice you cannot read."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to repeat an already repeated notice.

-#: classes/Notice.php:455
+#: classes/Notice.php:556

 msgid "You already repeated that notice."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to reply to a notice a the target has no access to.
 #. TRANS: %1$s is a user nickname, %2$d is a notice ID (number).
 msgid "You already repeated that notice."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to reply to a notice a the target has no access to.
 #. TRANS: %1$s is a user nickname, %2$d is a notice ID (number).

-#: classes/Notice.php:467
+#: classes/Notice.php:578

 #, php-format
 msgid "%1$s has no access to notice %2$d."
 msgstr ""
 
 #, php-format
 msgid "%1$s has no access to notice %2$d."
 msgstr ""
 

-#. TRANS: Server exception thrown when a notice cannot be saved.
-#. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:567 classes/Notice.php:594
-msgid "Problem saving notice."
+#. TRANS: Client error displayed when trying to reply to a notice a the target has no access to.
+#. TRANS: %1$s is a user nickname, %2$d is a notice ID (number).
+#: classes/Notice.php:835
+#, php-format
+msgid "%1$s has no right to reply to notice %2$d."

 msgstr ""
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
 msgstr ""
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().

-#: classes/Notice.php:1143
+#: classes/Notice.php:1489

 msgid "Bad type provided to saveKnownGroups."
 msgstr ""
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
 msgid "Bad type provided to saveKnownGroups."
 msgstr ""
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.

-#: classes/Notice.php:1235
+#: classes/Notice.php:1540

 msgid "Problem saving group inbox."
 msgstr ""
 
 msgid "Problem saving group inbox."
 msgstr ""
 

+#. TRANS: A repeat activity's title. %1$s is repeater's nickname
+#. and %2$s is the repeated user's nickname.
+#: classes/Notice.php:1827
+#, php-format
+msgid "%1$s repeated a notice by %2$s"
+msgstr ""
+

 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.

-#: classes/Notice.php:1864
+#: classes/Notice.php:2149

 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr ""
 
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr ""
 

+#. TRANS: Server exception thrown when a notice cannot be updated.
+#: classes/Notice.php:2435
+msgid "Problem saving notice."
+msgstr ""
+

 #. TRANS: Full name of a profile or group (%1$s) followed by nickname (%2$s) in parentheses.
 #. TRANS: Full name of a profile or group followed by nickname in parens
 #. TRANS: Full name of a profile or group (%1$s) followed by nickname (%2$s) in parentheses.
 #. TRANS: Full name of a profile or group followed by nickname in parens

-#: classes/Profile.php:263 classes/User_group.php:307
+#: classes/Profile.php:219 classes/User_group.php:341

 #, php-format
 msgctxt "FANCYNAME"
 msgid "%1$s (%2$s)"
 #, php-format
 msgctxt "FANCYNAME"
 msgid "%1$s (%2$s)"


@@ -7559,50 +6904,50 @@ msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).

-#: classes/Profile.php:1097
+#: classes/Profile.php:1068

 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).

-#: classes/Profile.php:1106
+#: classes/Profile.php:1077

 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
 
 #. TRANS: Server exception.
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
 
 #. TRANS: Server exception.

-#: classes/Profile_list.php:395
+#: classes/Profile_list.php:379

 msgid "The tag you are trying to rename to already exists."
 msgstr ""
 
 #. TRANS: Server exception saving new tag without having a tagger specified.
 msgid "The tag you are trying to rename to already exists."
 msgstr ""
 
 #. TRANS: Server exception saving new tag without having a tagger specified.

-#: classes/Profile_list.php:630
+#: classes/Profile_list.php:601

 msgid "No tagger specified."
 msgstr ""
 
 #. TRANS: Server exception saving new tag without having a tag specified.
 msgid "No tagger specified."
 msgstr ""
 
 #. TRANS: Server exception saving new tag without having a tag specified.

-#: classes/Profile_list.php:635
+#: classes/Profile_list.php:606

 msgid "No tag specified."
 msgstr ""
 
 #. TRANS: Server exception saving new tag.
 msgid "No tag specified."
 msgstr ""
 
 #. TRANS: Server exception saving new tag.

-#: classes/Profile_list.php:673
+#: classes/Profile_list.php:644

 msgid "Could not create profile tag."
 msgstr ""
 
 #. TRANS: Server exception saving new tag.
 msgid "Could not create profile tag."
 msgstr ""
 
 #. TRANS: Server exception saving new tag.

-#: classes/Profile_list.php:683
+#: classes/Profile_list.php:654

 msgid "Could not set profile tag URI."
 msgstr ""
 
 #. TRANS: Server exception saving new tag.
 msgid "Could not set profile tag URI."
 msgstr ""
 
 #. TRANS: Server exception saving new tag.

-#: classes/Profile_list.php:700
+#: classes/Profile_list.php:671

 msgid "Could not set profile tag mainpage."
 msgstr ""
 
 #. TRANS: Client exception thrown trying to set more tags than allowed.
 msgid "Could not set profile tag mainpage."
 msgstr ""
 
 #. TRANS: Client exception thrown trying to set more tags than allowed.

-#: classes/Profile_tag.php:181
+#: classes/Profile_tag.php:173

 #, php-format
 msgid ""
 "You already have created %d or more tags which is the maximum allowed number "
 #, php-format
 msgid ""
 "You already have created %d or more tags which is the maximum allowed number "


@@ -7610,7 +6955,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to add more people than allowed to a list.
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to add more people than allowed to a list.

-#: classes/Profile_tag.php:195
+#: classes/Profile_tag.php:187

 #, php-format
 msgid ""
 "You already have %1$d or more people in list %2$s, which is the maximum "
 #, php-format
 msgid ""
 "You already have %1$d or more people in list %2$s, which is the maximum "


@@ -7618,125 +6963,136 @@ msgid ""
 msgstr ""
 
 #. TRANS: Exception thrown when inserting a list subscription in the database fails.
 msgstr ""
 
 #. TRANS: Exception thrown when inserting a list subscription in the database fails.

-#: classes/Profile_tag_subscription.php:77
+#: classes/Profile_tag_subscription.php:68

 msgid "Adding list subscription failed."
 msgstr ""
 
 #. TRANS: Exception thrown when deleting a list subscription from the database fails.
 msgid "Adding list subscription failed."
 msgstr ""
 
 #. TRANS: Exception thrown when deleting a list subscription from the database fails.

-#: classes/Profile_tag_subscription.php:104
+#: classes/Profile_tag_subscription.php:95

 msgid "Removing list subscription failed."
 msgstr ""
 
 msgid "Removing list subscription failed."
 msgstr ""
 

-#. TRANS: Exception thrown when a right for a non-existing user profile is checked.
-#: classes/Remote_profile.php:54
-msgid "Missing profile."
-msgstr ""
-

 #. TRANS: Exception thrown when a tag cannot be saved.
 #. TRANS: Exception thrown when a tag cannot be saved.

-#: classes/Status_network.php:348
+#: classes/Status_network.php:342

 msgid "Unable to save tag."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
 msgid "Unable to save tag."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.

-#: classes/Subscription.php:106
+#: classes/Subscription.php:81

 msgid "You have been banned from subscribing."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to subscribe while already subscribed.
 msgid "You have been banned from subscribing."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to subscribe while already subscribed.

-#: classes/Subscription.php:111
+#: classes/Subscription.php:86

 msgid "Already subscribed!"
 msgstr ""
 
 #. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
 msgid "Already subscribed!"
 msgstr ""
 
 #. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.

-#: classes/Subscription.php:116
+#: classes/Subscription.php:91

 msgid "User has blocked you."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to unsibscribe without a subscription.
 msgid "User has blocked you."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to unsibscribe without a subscription.

-#: classes/Subscription.php:212
+#: classes/Subscription.php:192

 msgid "Not subscribed!"
 msgstr ""
 
 #. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
 msgid "Not subscribed!"
 msgstr ""
 
 #. TRANS: Exception thrown when trying to unsubscribe a user from themselves.

-#: classes/Subscription.php:219
+#: classes/Subscription.php:199

 msgid "Could not delete self-subscription."
 msgstr ""
 
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.
 msgid "Could not delete self-subscription."
 msgstr ""
 
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.

-#: classes/Subscription.php:236
+#: classes/Subscription.php:216

 msgid "Could not delete subscription."
 msgstr ""
 
 #. TRANS: Activity title when subscribing to another person.
 msgid "Could not delete subscription."
 msgstr ""
 
 #. TRANS: Activity title when subscribing to another person.

-#: classes/Subscription.php:275
+#: classes/Subscription.php:263

 msgctxt "TITLE"
 msgid "Follow"
 msgstr ""
 
 #. TRANS: Notification given when one person starts following another.
 #. TRANS: %1$s is the subscriber, %2$s is the subscribed.
 msgctxt "TITLE"
 msgid "Follow"
 msgstr ""
 
 #. TRANS: Notification given when one person starts following another.
 #. TRANS: %1$s is the subscriber, %2$s is the subscribed.

-#: classes/Subscription.php:278
+#: classes/Subscription.php:266

 #, php-format
 msgid "%1$s is now following %2$s."
 msgstr ""
 
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
 #, php-format
 msgid "%1$s is now following %2$s."
 msgstr ""
 
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.

-#: classes/User.php:466
+#: classes/User.php:378

 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr ""
 
 #. TRANS: Exception thrown when trying view "repeated to me".
 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr ""
 
 #. TRANS: Exception thrown when trying view "repeated to me".

-#: classes/User.php:865
+#: classes/User.php:694

 msgid "Not implemented since inbox change."
 msgstr ""
 
 msgid "Not implemented since inbox change."
 msgstr ""
 

-#. TRANS: Server exception.
-#: classes/User.php:951
-msgid "No single user defined for single-user mode."
+#: classes/User.php:721
+msgid "No site owner configured."

 msgstr ""
 
 #. TRANS: Server exception.
 msgstr ""
 
 #. TRANS: Server exception.

-#: classes/User.php:955
+#: classes/User.php:738

 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Information on password recovery form if no known username or e-mail address was specified.
 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Information on password recovery form if no known username or e-mail address was specified.

-#: classes/User.php:1089
+#: classes/User.php:883

 msgid "No user with that email address or username."
 msgstr ""
 
 #. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
 msgid "No user with that email address or username."
 msgstr ""
 
 #. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.

-#: classes/User.php:1107
+#: classes/User.php:901

 msgid "No registered email address for that user."
 msgstr ""
 
 #. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
 msgid "No registered email address for that user."
 msgstr ""
 
 #. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.

-#: classes/User.php:1122
+#: classes/User.php:916

 msgid "Error saving address confirmation."
 msgstr ""
 
 msgid "Error saving address confirmation."
 msgstr ""
 

+#: classes/User.php:989
+msgid "Register"
+msgstr ""
+
+#: classes/User.php:991
+#, php-format
+msgid "%1$s joined %2$s."
+msgstr ""
+
+#: classes/User_group.php:623
+msgid "Profile insertion failed"
+msgstr ""
+

 #. TRANS: Server exception thrown when creating a group failed.
 #. TRANS: Server exception thrown when creating a group failed.

-#: classes/User_group.php:606
+#: classes/User_group.php:648

 msgid "Could not create group."
 msgstr ""
 
 #. TRANS: Server exception thrown when updating a group URI failed.
 msgid "Could not create group."
 msgstr ""
 
 #. TRANS: Server exception thrown when updating a group URI failed.

-#: classes/User_group.php:616
+#: classes/User_group.php:658

 msgid "Could not set group URI."
 msgstr ""
 
 #. TRANS: Server exception thrown when setting group membership failed.
 msgid "Could not set group URI."
 msgstr ""
 
 #. TRANS: Server exception thrown when setting group membership failed.

-#: classes/User_group.php:639
+#: classes/User_group.php:681

 msgid "Could not set group membership."
 msgstr ""
 
 #. TRANS: Server exception thrown when saving local group information failed.
 msgid "Could not set group membership."
 msgstr ""
 
 #. TRANS: Server exception thrown when saving local group information failed.

-#: classes/User_group.php:656
+#: classes/User_group.php:698

 msgid "Could not save local group info."
 msgstr ""
 
 msgid "Could not save local group info."
 msgstr ""
 

+#: classes/User_group.php:804
+msgid "Unable to update profile"
+msgstr ""
+

 #. TRANS: Exception thrown when an account could not be located when it should be moved.
 #. TRANS: %s is the remote site.
 #: lib/accountmover.php:65
 #. TRANS: Exception thrown when an account could not be located when it should be moved.
 #. TRANS: %s is the remote site.
 #: lib/accountmover.php:65


@@ -7753,230 +7109,237 @@ msgstr ""
 
 #. TRANS: Exception thrown when an account could not be located when it should be moved.
 #. TRANS: %s is the remote site.
 
 #. TRANS: Exception thrown when an account could not be located when it should be moved.
 #. TRANS: %s is the remote site.

-#: lib/accountmover.php:131
+#: lib/accountmover.php:124

 #, php-format
 msgid "No AtomPub API service for %s."
 msgstr ""
 
 #. TRANS: H2 for user actions in a profile.
 #. TRANS: H2 for entity actions in a profile.
 #, php-format
 msgid "No AtomPub API service for %s."
 msgstr ""
 
 #. TRANS: H2 for user actions in a profile.
 #. TRANS: H2 for entity actions in a profile.

-#: lib/accountprofileblock.php:120 lib/accountprofileblock.php:135
+#: lib/accountprofileblock.php:123 lib/accountprofileblock.php:138

 msgid "User actions"
 msgstr ""
 
 #. TRANS: Text shown in user profile of not yet compeltely deleted users.
 msgid "User actions"
 msgstr ""
 
 #. TRANS: Text shown in user profile of not yet compeltely deleted users.

-#: lib/accountprofileblock.php:124
+#: lib/accountprofileblock.php:127

 msgid "User deletion in progress..."
 msgstr ""
 
 #. TRANS: Link title for link on user profile.
 msgid "User deletion in progress..."
 msgstr ""
 
 #. TRANS: Link title for link on user profile.

-#: lib/accountprofileblock.php:148
+#: lib/accountprofileblock.php:151

 msgid "Edit profile settings."
 msgstr ""
 
 #. TRANS: Link text for link on user profile.
 msgid "Edit profile settings."
 msgstr ""
 
 #. TRANS: Link text for link on user profile.

-#: lib/accountprofileblock.php:150 lib/groupprofileblock.php:122
+#: lib/accountprofileblock.php:153 lib/groupprofileblock.php:132

 msgctxt "BUTTON"
 msgid "Edit"
 msgstr ""
 
 msgctxt "BUTTON"
 msgid "Edit"
 msgstr ""
 

-#. TRANS: Link title for link on user profile.
-#: lib/accountprofileblock.php:177
-msgid "Send a direct message to this user."
-msgstr ""
-
-#. TRANS: Link text for link on user profile.
-#: lib/accountprofileblock.php:179
-msgctxt "BUTTON"
-msgid "Message"
-msgstr ""
-

 #. TRANS: Label text on user profile to select a user role.
 #. TRANS: Label text on user profile to select a user role.

-#: lib/accountprofileblock.php:221
+#: lib/accountprofileblock.php:213

 msgid "Moderate"
 msgstr ""
 
 #. TRANS: Label text on user profile to select a user role.
 msgid "Moderate"
 msgstr ""
 
 #. TRANS: Label text on user profile to select a user role.

-#: lib/accountprofileblock.php:260
+#: lib/accountprofileblock.php:252

 msgid "User role"
 msgstr ""
 
 #. TRANS: Role that can be set for a user profile.
 msgid "User role"
 msgstr ""
 
 #. TRANS: Role that can be set for a user profile.

-#: lib/accountprofileblock.php:263
+#: lib/accountprofileblock.php:255

 msgctxt "role"
 msgid "Administrator"
 msgstr ""
 
 #. TRANS: Role that can be set for a user profile.
 msgctxt "role"
 msgid "Administrator"
 msgstr ""
 
 #. TRANS: Role that can be set for a user profile.

-#: lib/accountprofileblock.php:265
+#: lib/accountprofileblock.php:257

 msgctxt "role"
 msgid "Moderator"
 msgstr ""
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 msgctxt "role"
 msgid "Moderator"
 msgstr ""
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.

-#: lib/action.php:168
+#: lib/action.php:297

 #, php-format
 msgid "%1$s - %2$s"
 msgstr ""
 
 #. TRANS: Page title for a page without a title set.
 #, php-format
 msgid "%1$s - %2$s"
 msgstr ""
 
 #. TRANS: Page title for a page without a title set.

-#: lib/action.php:184
+#: lib/action.php:313

 msgid "Untitled page"
 msgstr ""
 
 #. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
 msgid "Untitled page"
 msgstr ""
 
 #. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.

-#: lib/action.php:363
+#: lib/action.php:461

 msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr ""
 
 #. TRANS: Inline reply form submit button: submits a reply comment.
 msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr ""
 
 #. TRANS: Inline reply form submit button: submits a reply comment.

-#: lib/action.php:366
+#: lib/action.php:464

 msgctxt "BUTTON"
 msgid "Reply"
 msgstr ""
 
 #. TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form.
 #. TRANS: Field label for reply mini form.
 msgctxt "BUTTON"
 msgid "Reply"
 msgstr ""
 
 #. TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form.
 #. TRANS: Field label for reply mini form.

-#: lib/action.php:369 lib/threadednoticelist.php:412
+#: lib/action.php:467 lib/threadednoticelist.php:419

 msgid "Write a reply..."
 msgstr ""
 
 #. TRANS: Tab on the notice form.
 msgid "Write a reply..."
 msgstr ""
 
 #. TRANS: Tab on the notice form.

-#: lib/action.php:627
+#: lib/action.php:724

 msgctxt "TAB"
 msgid "Status"
 msgstr ""
 
 msgctxt "TAB"
 msgid "Status"
 msgstr ""
 

-#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
+#: lib/action.php:729
+msgctxt "TAB"
+msgid "Share your:"
+msgstr ""
+
+#. TRANS: First sentence of the GNU social site license. Used if 'broughtby' is set.

 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby

-#: lib/action.php:1003
+#: lib/action.php:1098

 #, php-format
 msgid ""
 #, php-format
 msgid ""

-"**%%site.name%%** is a microblogging service brought to you by [%%site."
-"broughtby%%](%%site.broughtbyurl%%)."
+"**%%site.name%%** is a social network, courtesy of [%%site.broughtby%%]"
+"(%%site.broughtbyurl%%)."

 msgstr ""
 
 msgstr ""
 

-#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:1006
+#. TRANS: First sentence of the GNU social site license. Used if 'broughtby' is not set.
+#: lib/action.php:1101

 #, php-format
 #, php-format

-msgid "**%%site.name%%** is a microblogging service."
+msgid "**%%site.name%%** is a social network."

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
+#. TRANS: Second sentence of the GNU social site license. Mentions the GNU social source code license.

 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Make sure there is no whitespace between "]" and "(".

-#. TRANS: Text between [] is a link description, text between () is the link itself.
-#. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:1013
+#. TRANS: [%1$s](%2$s) is a link description followed by the link itself
+#. TRANS: %3$s is the version of GNU social that is being used.
+#: lib/action.php:1108

 #, php-format
 msgid ""
 #, php-format
 msgid ""

-"It runs the [StatusNet](http://status.net/) microblogging software, version %"
-"s, available under the [GNU Affero General Public License](http://www.fsf."
-"org/licensing/licenses/agpl-3.0.html)."
+"It runs on [%1$s](%2$s), version %3$s, available under the [GNU Affero "
+"General Public License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."

 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.

-#: lib/action.php:1031
+#: lib/action.php:1126

 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.

-#: lib/action.php:1038
+#: lib/action.php:1133

 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.

-#: lib/action.php:1042
+#: lib/action.php:1137

 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.

-#: lib/action.php:1074
+#: lib/action.php:1169

 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.

-#: lib/action.php:1427
+#: lib/action.php:1613

 msgid "After"
 msgstr ""
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
 msgid "After"
 msgstr ""
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.

-#: lib/action.php:1437
+#: lib/action.php:1623

 msgid "Before"
 msgstr ""
 
 #. TRANS: Client exception thrown when a feed instance is a DOMDocument.
 msgid "Before"
 msgstr ""
 
 #. TRANS: Client exception thrown when a feed instance is a DOMDocument.

-#: lib/activity.php:125
+#: lib/activity.php:126

 msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 

+#. TRANS: Client exception thrown when ...
+#: lib/activityhandlerplugin.php:380
+msgid "Object not posted to this group."
+msgstr ""
+
+#. TRANS: Client exception when ...
+#: lib/activityhandlerplugin.php:398
+msgid "Object not posted to this user."
+msgstr ""
+
+#. TRANS: Server exception thrown when a micro app plugin uses a target that cannot be handled.
+#: lib/activityhandlerplugin.php:402
+msgid "Do not know how to handle this kind of target."
+msgstr ""
+

 #. TRANS: Client exception thrown when using an unknown verb for the activity importer.
 #. TRANS: Client exception thrown when using an unknown verb for the activity importer.

-#: lib/activityimporter.php:81
+#: lib/activityimporter.php:77

 #, php-format
 msgid "Unknown verb: \"%s\"."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to force a subscription for an untrusted user.
 #, php-format
 msgid "Unknown verb: \"%s\"."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to force a subscription for an untrusted user.

-#: lib/activityimporter.php:101
+#: lib/activityimporter.php:97

 msgid "Cannot force subscription for untrusted user."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to force a remote user to subscribe.
 msgid "Cannot force subscription for untrusted user."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to force a remote user to subscribe.

-#: lib/activityimporter.php:111
+#: lib/activityimporter.php:105

 msgid "Cannot force remote user to subscribe."
 msgstr ""
 
 msgid "Cannot force remote user to subscribe."
 msgstr ""
 

-#. TRANS: Client exception thrown when trying to subscribe to an unknown profile.
-#: lib/activityimporter.php:126
+#: lib/activityimporter.php:123

 msgid "Unknown profile."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to import an event not related to the importing user.
 msgid "Unknown profile."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to import an event not related to the importing user.

-#: lib/activityimporter.php:132
+#: lib/activityimporter.php:129

 msgid "This activity seems unrelated to our user."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to join a remote group that is not a group.
 msgid "This activity seems unrelated to our user."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to join a remote group that is not a group.

-#: lib/activityimporter.php:148
+#: lib/activityimporter.php:145

 msgid "Remote profile is not a group!"
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to join a group the importing user is already a member of.
 msgid "Remote profile is not a group!"
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to join a group the importing user is already a member of.

-#: lib/activityimporter.php:157
+#: lib/activityimporter.php:154

 msgid "User is already a member of this group."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to import a notice by another user.
 #. TRANS: %1$s is the source URI of the notice, %2$s is the URI of the author.
 msgid "User is already a member of this group."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to import a notice by another user.
 #. TRANS: %1$s is the source URI of the notice, %2$s is the URI of the author.

-#: lib/activityimporter.php:192
+#: lib/activityimporter.php:189

 #, php-format
 msgid "Already know about notice %1$s and  it has a different author %2$s."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to overwrite the author information for a non-trusted user during import.
 #, php-format
 msgid "Already know about notice %1$s and  it has a different author %2$s."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to overwrite the author information for a non-trusted user during import.

-#: lib/activityimporter.php:198
+#: lib/activityimporter.php:195

 msgid "Not overwriting author info for non-trusted user."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to import a notice without content.
 #. TRANS: %s is the notice URI.
 msgid "Not overwriting author info for non-trusted user."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to import a notice without content.
 #. TRANS: %s is the notice URI.

-#: lib/activityimporter.php:214
+#: lib/activityimporter.php:211

 #, php-format
 msgid "No content for notice %s."
 msgstr ""
 
 #. TRANS: Exception thrown if a non-existing user is provided. %s is a user ID.
 #, php-format
 msgid "No content for notice %s."
 msgstr ""
 
 #. TRANS: Exception thrown if a non-existing user is provided. %s is a user ID.

-#: lib/activitymover.php:85
+#: lib/activitymover.php:92

 #, php-format
 msgid "No such user \"%s\"."
 msgstr ""
 #, php-format
 msgid "No such user \"%s\"."
 msgstr ""


@@ -8009,22 +7372,22 @@ msgid "Can't handle embedded Base64 content yet."
 msgstr ""
 
 #. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.
 msgstr ""
 
 #. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.

-#: lib/adminpanelaction.php:96
+#: lib/adminpanelaction.php:95

 msgid "You cannot make changes to this site."
 msgstr ""
 
 #. TRANS: Client error message throw when a certain panel's settings cannot be changed.
 msgid "You cannot make changes to this site."
 msgstr ""
 
 #. TRANS: Client error message throw when a certain panel's settings cannot be changed.

-#: lib/adminpanelaction.php:108
+#: lib/adminpanelaction.php:106

 msgid "Changes to that panel are not allowed."
 msgstr ""
 
 #. TRANS: Client error message.
 msgid "Changes to that panel are not allowed."
 msgstr ""
 
 #. TRANS: Client error message.

-#: lib/adminpanelaction.php:222
+#: lib/adminpanelaction.php:219

 msgid "showForm() not implemented."
 msgstr ""
 
 #. TRANS: Client error message
 msgid "showForm() not implemented."
 msgstr ""
 
 #. TRANS: Client error message

-#: lib/adminpanelaction.php:250
+#: lib/adminpanelaction.php:246

 msgid "saveSettings() not implemented."
 msgstr ""
 
 msgid "saveSettings() not implemented."
 msgstr ""
 


@@ -8108,68 +7471,109 @@ msgstr ""
 
 #. TRANS: Menu item title in administrator navigation panel.
 #: lib/adminpanelnav.php:139
 
 #. TRANS: Menu item title in administrator navigation panel.
 #: lib/adminpanelnav.php:139

-msgid "Snapshots configuration"
+msgid "Set site license"

 msgstr ""
 
 #. TRANS: Menu item in administrator navigation panel.
 #: lib/adminpanelnav.php:141
 msgctxt "MENU"
 msgstr ""
 
 #. TRANS: Menu item in administrator navigation panel.
 #: lib/adminpanelnav.php:141
 msgctxt "MENU"

-msgid "Snapshots"
+msgid "License"

 msgstr ""
 
 #. TRANS: Menu item title in administrator navigation panel.
 #: lib/adminpanelnav.php:147
 msgstr ""
 
 #. TRANS: Menu item title in administrator navigation panel.
 #: lib/adminpanelnav.php:147

-msgid "Set site license"
+msgid "Plugins configuration"

 msgstr ""
 
 #. TRANS: Menu item in administrator navigation panel.
 #: lib/adminpanelnav.php:149
 msgctxt "MENU"
 msgstr ""
 
 #. TRANS: Menu item in administrator navigation panel.
 #: lib/adminpanelnav.php:149
 msgctxt "MENU"

-msgid "License"
+msgid "Plugins"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Menu item title in administrator navigation panel.
-#: lib/adminpanelnav.php:155
-msgid "Plugins configuration"
+#. TRANS: Exception text when attempting to perform something which seems already done.
+#: lib/alreadyfulfilledexception.php:46
+msgid "Trying to do something that was already done."

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Menu item in administrator navigation panel.
-#: lib/adminpanelnav.php:157
-msgctxt "MENU"
-msgid "Plugins"
+#. TRANS: Client error on an API request with an unsupported data format.
+#: lib/apiaction.php:1245 lib/apiaction.php:1271 lib/apiaction.php:1325
+msgid "Not a supported data format."
+msgstr ""
+
+#. TRANS: Authorization exception thrown when a user without API access tries to access the API.
+#: lib/apiauthaction.php:94 lib/apiauthaction.php:219
+#: lib/apiauthaction.php:308
+msgid "Not allowed to use API."

 msgstr ""
 
 #. TRANS: Client error 401.
 msgstr ""
 
 #. TRANS: Client error 401.

-#: lib/apiauth.php:111
+#: lib/apiauthaction.php:127

 msgid "API resource requires read-write access, but you only have read access."
 msgstr ""
 
 #. TRANS: OAuth exception thrown when no application is found for a given consumer key.
 msgid "API resource requires read-write access, but you only have read access."
 msgstr ""
 
 #. TRANS: OAuth exception thrown when no application is found for a given consumer key.

-#: lib/apiauth.php:177
+#: lib/apiauthaction.php:192

 msgid "No application for that consumer key."
 msgstr ""
 
 msgid "No application for that consumer key."
 msgstr ""
 

-#. TRANS: Authorization exception thrown when a user without API access tries to access the API.
-#: lib/apiauth.php:203 lib/apiauth.php:291
-msgid "Not allowed to use API."
-msgstr ""
-

 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.

-#: lib/apiauth.php:231
+#: lib/apiauthaction.php:250

 msgid "Bad access token."
 msgstr ""
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
 msgid "Bad access token."
 msgstr ""
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).

-#: lib/apiauth.php:236
+#: lib/apiauthaction.php:255

 msgid "No user for that token."
 msgstr ""
 
 msgid "No user for that token."
 msgstr ""
 

-#. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
+#. TRANS: Client error thrown when authentication fails because a user clicked "Cancel".

 #. TRANS: Client error thrown when authentication fails.
 #. TRANS: Client error thrown when authentication fails.

-#: lib/apiauth.php:278 lib/apiauth.php:309
+#: lib/apiauthaction.php:296 lib/apiauthaction.php:330

 msgid "Could not authenticate you."
 msgstr ""
 
 msgid "Could not authenticate you."
 msgstr ""
 

+#. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
+#: lib/apignusocialoauthdatastore.php:48
+msgid "Could not create anonymous consumer."
+msgstr ""
+
+#. TRANS: Server error displayed when trying to create an anynymous OAuth application.
+#: lib/apignusocialoauthdatastore.php:72
+msgid "Could not create anonymous OAuth application."
+msgstr ""
+
+#. TRANS: Exception thrown when no token association could be found.
+#: lib/apignusocialoauthdatastore.php:154
+msgid ""
+"Could not find a profile and application associated with the request token."
+msgstr ""
+
+#. TRANS: Exception thrown when no access token can be issued.
+#: lib/apignusocialoauthdatastore.php:212
+msgid "Could not issue access token."
+msgstr ""
+
+#. TRANS: Exception thrown when a database error occurs.
+#: lib/apignusocialoauthdatastore.php:320
+msgid "Database error inserting OAuth application user."
+msgstr ""
+
+#. TRANS: Exception thrown when a database error occurs.
+#: lib/apignusocialoauthdatastore.php:348
+msgid "Database error updating OAuth application user."
+msgstr ""
+
+#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
+#: lib/apignusocialoauthdatastore.php:374
+msgid "Tried to revoke unknown token."
+msgstr ""
+
+#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
+#: lib/apignusocialoauthdatastore.php:379
+msgid "Failed to delete revoked token."
+msgstr ""
+

 #. TRANS: Form input field label for application icon.
 #: lib/applicationeditform.php:177
 msgid "Icon"
 #. TRANS: Form input field label for application icon.
 #: lib/applicationeditform.php:177
 msgid "Icon"


@@ -8203,7 +7607,7 @@ msgstr ""
 #. TRANS: Text area label on group edit form; contains description of group.
 #. TRANS: Field label for description of list.
 #. TRANS: Dropdown option for searching in profiles.
 #. TRANS: Text area label on group edit form; contains description of group.
 #. TRANS: Field label for description of list.
 #. TRANS: Dropdown option for searching in profiles.

-#: lib/applicationeditform.php:208 lib/groupeditform.php:178
+#: lib/applicationeditform.php:208 lib/groupeditform.php:182

 #: lib/peopletageditform.php:151 lib/togglepeopletag.php:111
 msgid "Description"
 msgstr ""
 #: lib/peopletageditform.php:151 lib/togglepeopletag.php:111
 msgid "Description"
 msgstr ""


@@ -8279,41 +7683,41 @@ msgid "Save application changes."
 msgstr ""
 
 #. TRANS: Name for an anonymous application in application list.
 msgstr ""
 
 #. TRANS: Name for an anonymous application in application list.

-#: lib/applicationlist.php:241
+#: lib/applicationlist.php:197

 msgid "Unknown application"
 msgstr ""
 
 #. TRANS: Message has a leading space and a trailing space. Used in application list.
 #. TRANS: Before this message the application name is put, behind it the organisation that manages it.
 msgid "Unknown application"
 msgstr ""
 
 #. TRANS: Message has a leading space and a trailing space. Used in application list.
 #. TRANS: Before this message the application name is put, behind it the organisation that manages it.

-#: lib/applicationlist.php:250
+#: lib/applicationlist.php:205

 msgid " by "
 msgstr ""
 
 #. TRANS: Application access type
 msgid " by "
 msgstr ""
 
 #. TRANS: Application access type

-#: lib/applicationlist.php:263
+#: lib/applicationlist.php:213

 msgid "read-write"
 msgstr ""
 
 #. TRANS: Application access type
 msgid "read-write"
 msgstr ""
 
 #. TRANS: Application access type

-#: lib/applicationlist.php:265
+#: lib/applicationlist.php:215

 msgid "read-only"
 msgstr ""
 
 #. TRANS: Used in application list. %1$s is a modified date, %2$s is access type ("read-write" or "read-only")
 msgid "read-only"
 msgstr ""
 
 #. TRANS: Used in application list. %1$s is a modified date, %2$s is access type ("read-write" or "read-only")

-#: lib/applicationlist.php:271
+#: lib/applicationlist.php:221

 #, php-format
 msgid "Approved %1$s - \"%2$s\" access."
 msgstr ""
 
 #. TRANS: Access token in the application list.
 #. TRANS: %s are the first 7 characters of the access token.
 #, php-format
 msgid "Approved %1$s - \"%2$s\" access."
 msgstr ""
 
 #. TRANS: Access token in the application list.
 #. TRANS: %s are the first 7 characters of the access token.

-#: lib/applicationlist.php:286
+#: lib/applicationlist.php:236

 #, php-format
 msgid "Access token starting with: %s"
 msgstr ""
 
 #. TRANS: Button label in application list to revoke access to user data.
 #, php-format
 msgid "Access token starting with: %s"
 msgstr ""
 
 #. TRANS: Button label in application list to revoke access to user data.

-#: lib/applicationlist.php:302
+#: lib/applicationlist.php:252

 msgctxt "BUTTON"
 msgid "Revoke"
 msgstr ""
 msgctxt "BUTTON"
 msgid "Revoke"
 msgstr ""


@@ -8337,11 +7741,6 @@ msgstr ""
 msgid "Author element must contain a name element."
 msgstr ""
 
 msgid "Author element must contain a name element."
 msgstr ""
 

-#. TRANS: Server exception thrown when using the method setActivitySubject() in the class Atom10Feed.
-#: lib/atom10feed.php:160
-msgid "Do not use this method!"
-msgstr ""
-

 #. TRANS: Title in atom list notice feed. %1$s is a list name, %2$s is a tagger's nickname.
 #: lib/atomlistnoticefeed.php:65
 #, php-format
 #. TRANS: Title in atom list notice feed. %1$s is a list name, %2$s is a tagger's nickname.
 #: lib/atomlistnoticefeed.php:65
 #, php-format


@@ -8355,6 +7754,10 @@ msgstr ""
 msgid "Updates from %1$s's list %2$s on %3$s!"
 msgstr ""
 
 msgid "Updates from %1$s's list %2$s on %3$s!"
 msgstr ""
 

+#: lib/attachment.php:43
+msgid "Download link"
+msgstr ""
+

 #. TRANS: Title.
 #: lib/attachmentnoticesection.php:68
 msgid "Notices where this attachment appears"
 #. TRANS: Title.
 #: lib/attachmentnoticesection.php:68
 msgid "Notices where this attachment appears"


@@ -8409,7 +7812,7 @@ msgstr ""
 
 #. TRANS: E-mail subject when a command has completed.
 #. TRANS: E-mail subject for reply to an e-mail command.
 
 #. TRANS: E-mail subject when a command has completed.
 #. TRANS: E-mail subject for reply to an e-mail command.

-#: lib/channel.php:177 lib/mailhandler.php:147
+#: lib/channel.php:177 lib/mailhandler.php:146

 msgid "Command complete"
 msgstr ""
 
 msgid "Command complete"
 msgstr ""
 


@@ -8419,43 +7822,43 @@ msgid "Command failed"
 msgstr ""
 
 #. TRANS: Command exception text shown when a notice ID is requested that does not exist.
 msgstr ""
 
 #. TRANS: Command exception text shown when a notice ID is requested that does not exist.

-#: lib/command.php:82 lib/command.php:106
+#: lib/command.php:84 lib/command.php:108

 msgid "Notice with that id does not exist."
 msgstr ""
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
 msgid "Notice with that id does not exist."
 msgstr ""
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.

-#: lib/command.php:99 lib/command.php:743
+#: lib/command.php:101 lib/command.php:621

 msgid "User has no last notice."
 msgstr ""
 
 #. TRANS: Message given requesting a profile for a non-existing user.
 #. TRANS: %s is the nickname of the user for which the profile could not be found.
 msgid "User has no last notice."
 msgstr ""
 
 #. TRANS: Message given requesting a profile for a non-existing user.
 #. TRANS: %s is the nickname of the user for which the profile could not be found.

-#: lib/command.php:128
+#: lib/command.php:130

 #, php-format
 msgid "Could not find a user with nickname %s."
 msgstr ""
 
 #. TRANS: Message given getting a non-existing user.
 #. TRANS: %s is the nickname of the user that could not be found.
 #, php-format
 msgid "Could not find a user with nickname %s."
 msgstr ""
 
 #. TRANS: Message given getting a non-existing user.
 #. TRANS: %s is the nickname of the user that could not be found.

-#: lib/command.php:148
+#: lib/command.php:150

 #, php-format
 msgid "Could not find a local user with nickname %s."
 msgstr ""
 
 #. TRANS: Error text shown when an unimplemented command is given.
 #, php-format
 msgid "Could not find a local user with nickname %s."
 msgstr ""
 
 #. TRANS: Error text shown when an unimplemented command is given.

-#: lib/command.php:183
+#: lib/command.php:185

 msgid "Sorry, this command is not yet implemented."
 msgstr ""
 
 #. TRANS: Command exception text shown when a user tries to nudge themselves.
 msgid "Sorry, this command is not yet implemented."
 msgstr ""
 
 #. TRANS: Command exception text shown when a user tries to nudge themselves.

-#: lib/command.php:229
+#: lib/command.php:231

 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr ""
 
 #. TRANS: Message given having nudged another user.
 #. TRANS: %s is the nickname of the user that was nudged.
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr ""
 
 #. TRANS: Message given having nudged another user.
 #. TRANS: %s is the nickname of the user that was nudged.

-#: lib/command.php:238
+#: lib/command.php:240

 #, php-format
 msgid "Nudge sent to %s."
 msgstr ""
 #, php-format
 msgid "Nudge sent to %s."
 msgstr ""


@@ -8464,7 +7867,7 @@ msgstr ""
 #. TRANS: %1$s is the number of other user the user is subscribed to.
 #. TRANS: %2$s is the number of users that are subscribed to the user.
 #. TRANS: %3$s is the number of notices the user has sent.
 #. TRANS: %1$s is the number of other user the user is subscribed to.
 #. TRANS: %2$s is the number of users that are subscribed to the user.
 #. TRANS: %3$s is the number of notices the user has sent.

-#: lib/command.php:268
+#: lib/command.php:270

 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"


@@ -8472,33 +7875,23 @@ msgid ""
 "Notices: %3$s"
 msgstr ""
 
 "Notices: %3$s"
 msgstr ""
 

-#. TRANS: Error message text shown when a favorite could not be set because it has already been favorited.
-#: lib/command.php:298
-msgid "Could not create favorite: Already favorited."
-msgstr ""
-
-#. TRANS: Text shown when a notice has been marked as favourite successfully.
-#: lib/command.php:324
-msgid "Notice marked as fave."
-msgstr ""
-

 #. TRANS: Message given having added a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
 #. TRANS: Message given having added a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.

-#: lib/command.php:366
+#: lib/command.php:317

 #, php-format
 msgid "%1$s joined group %2$s."
 msgstr ""
 
 #. TRANS: Message given having removed a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
 #, php-format
 msgid "%1$s joined group %2$s."
 msgstr ""
 
 #. TRANS: Message given having removed a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.

-#: lib/command.php:411
+#: lib/command.php:362

 #, php-format
 msgid "%1$s left group %2$s."
 msgstr ""
 
 #. TRANS: Error displayed if tagging a user fails.
 #. TRANS: %1$s is the tagged user, %2$s is the error message (no punctuation).
 #, php-format
 msgid "%1$s left group %2$s."
 msgstr ""
 
 #. TRANS: Error displayed if tagging a user fails.
 #. TRANS: %1$s is the tagged user, %2$s is the error message (no punctuation).

-#: lib/command.php:468
+#: lib/command.php:419

 #, php-format
 msgid "Error tagging %1$s: %2$s"
 msgstr ""
 #, php-format
 msgid "Error tagging %1$s: %2$s"
 msgstr ""


@@ -8506,7 +7899,7 @@ msgstr ""
 #. TRANS: Succes message displayed if tagging a user succeeds.
 #. TRANS: %1$s is the tagged user's nickname, %2$s is a list of tags.
 #. TRANS: Plural is decided based on the number of tags added (not part of message).
 #. TRANS: Succes message displayed if tagging a user succeeds.
 #. TRANS: %1$s is the tagged user's nickname, %2$s is a list of tags.
 #. TRANS: Plural is decided based on the number of tags added (not part of message).

-#: lib/command.php:476
+#: lib/command.php:427

 #, php-format
 msgid "%1$s was tagged %2$s"
 msgid_plural "%1$s was tagged %2$s"
 #, php-format
 msgid "%1$s was tagged %2$s"
 msgid_plural "%1$s was tagged %2$s"


@@ -8515,20 +7908,20 @@ msgstr[1] ""
 
 #. TRANS: Separator for list of tags.
 #. TRANS: Separator in list of user names like "Jim, Bob, Mary".
 
 #. TRANS: Separator for list of tags.
 #. TRANS: Separator in list of user names like "Jim, Bob, Mary".

-#: lib/command.php:481 lib/command.php:534 lib/threadednoticelist.php:472
+#: lib/command.php:432 lib/command.php:485 lib/noticelistactorsitem.php:78

 msgid ", "
 msgstr ""
 
 #. TRANS: Error displayed if a given tag is invalid.
 #. TRANS: %s is the invalid tag.
 msgid ", "
 msgstr ""
 
 #. TRANS: Error displayed if a given tag is invalid.
 #. TRANS: %s is the invalid tag.

-#: lib/command.php:509
+#: lib/command.php:460

 #, php-format
 msgid "Invalid tag: \"%s\""
 msgstr ""
 
 #. TRANS: Error displayed if untagging a user fails.
 #. TRANS: %1$s is the untagged user, %2$s is the error message (no punctuation).
 #, php-format
 msgid "Invalid tag: \"%s\""
 msgstr ""
 
 #. TRANS: Error displayed if untagging a user fails.
 #. TRANS: %1$s is the untagged user, %2$s is the error message (no punctuation).

-#: lib/command.php:521
+#: lib/command.php:472

 #, php-format
 msgid "Error untagging %1$s: %2$s"
 msgstr ""
 #, php-format
 msgid "Error untagging %1$s: %2$s"
 msgstr ""


@@ -8536,7 +7929,7 @@ msgstr ""
 #. TRANS: Succes message displayed if untagging a user succeeds.
 #. TRANS: %1$s is the untagged user's nickname, %2$s is a list of tags.
 #. TRANS: Plural is decided based on the number of tags removed (not part of message).
 #. TRANS: Succes message displayed if untagging a user succeeds.
 #. TRANS: %1$s is the untagged user's nickname, %2$s is a list of tags.
 #. TRANS: Plural is decided based on the number of tags removed (not part of message).

-#: lib/command.php:529
+#: lib/command.php:480

 #, php-format
 msgid "The following tag was removed from user %1$s: %2$s."
 msgid_plural "The following tags were removed from user %1$s: %2$s."
 #, php-format
 msgid "The following tag was removed from user %1$s: %2$s."
 msgid_plural "The following tags were removed from user %1$s: %2$s."


@@ -8545,14 +7938,14 @@ msgstr[1] ""
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.

-#: lib/command.php:553
+#: lib/command.php:504

 #, php-format
 msgctxt "WHOIS"
 msgid "%1$s (%2$s)"
 msgstr ""
 
 #. TRANS: Whois output. %s is the full name of the queried user.
 #, php-format
 msgctxt "WHOIS"
 msgid "%1$s (%2$s)"
 msgstr ""
 
 #. TRANS: Whois output. %s is the full name of the queried user.

-#: lib/command.php:557
+#: lib/command.php:508

 #, php-format
 msgid "Fullname: %s"
 msgstr ""
 #, php-format
 msgid "Fullname: %s"
 msgstr ""


@@ -8560,7 +7953,7 @@ msgstr ""
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in notification e-mail.
 #. TRANS: %s is a location.
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in notification e-mail.
 #. TRANS: %s is a location.

-#: lib/command.php:561 lib/mail.php:345
+#: lib/command.php:512 lib/mail.php:344

 #, php-format
 msgid "Location: %s"
 msgstr ""
 #, php-format
 msgid "Location: %s"
 msgstr ""


@@ -8568,57 +7961,27 @@ msgstr ""
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in notification e-mail.
 #. TRANS: %s is a homepage.
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in notification e-mail.
 #. TRANS: %s is a homepage.

-#: lib/command.php:565 lib/mail.php:350
+#: lib/command.php:516 lib/mail.php:349

 #, php-format
 msgid "Homepage: %s"
 msgstr ""
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
 #, php-format
 msgid "Homepage: %s"
 msgstr ""
 
 #. TRANS: Whois output. %s is the bio information of the queried user.

-#: lib/command.php:569
+#: lib/command.php:520

 #, php-format
 msgid "About: %s"
 msgstr ""
 
 #, php-format
 msgid "About: %s"
 msgstr ""
 

-#. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
-#. TRANS: %s is a remote profile.
-#: lib/command.php:598
-#, php-format
-msgid ""
-"%s is a remote profile; you can only send direct messages to users on the "
-"same server."
-msgstr ""
-
-#. TRANS: Message given if content is too long. %1$sd is used for plural.
-#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#. TRANS: Message given when a status is too long. %1$s is the maximum number of characters,
-#. TRANS: %2$s is the number of characters sent (used for plural).
-#: lib/command.php:615 lib/implugin.php:491
-#, php-format
-msgid "Message too long - maximum is %1$d character, you sent %2$d."
-msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr[0] ""
-msgstr[1] ""
-
-#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: lib/command.php:628
-msgid "You can't send a message to this user."
-msgstr ""
-
-#. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:643
-msgid "Error sending direct message."
-msgstr ""
-

 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.

-#: lib/command.php:667
+#: lib/command.php:545

 #, php-format
 msgid "Notice from %s repeated."
 msgstr ""
 
 #. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
 #, php-format
 msgid "Notice from %s repeated."
 msgstr ""
 
 #. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.

-#: lib/command.php:704
+#: lib/command.php:582

 #, php-format
 msgid "Notice too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
 #, php-format
 msgid "Notice too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."


@@ -8627,100 +7990,95 @@ msgstr[1] ""
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.

-#: lib/command.php:717
+#: lib/command.php:595

 #, php-format
 msgid "Reply to %s sent."
 msgstr ""
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
 #, php-format
 msgid "Reply to %s sent."
 msgstr ""
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.

-#: lib/command.php:720
+#: lib/command.php:598

 msgid "Error saving notice."
 msgstr ""
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
 msgid "Error saving notice."
 msgstr ""
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.

-#: lib/command.php:767
+#: lib/command.php:645

 msgid "Specify the name of the user to subscribe to."
 msgstr ""
 
 msgid "Specify the name of the user to subscribe to."
 msgstr ""
 

-#. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:776
-msgid "Can't subscribe to OMB profiles by command."
-msgstr ""
-

 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.

-#: lib/command.php:784
+#: lib/command.php:655

 #, php-format
 msgid "Subscribed to %s."
 msgstr ""
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
 #, php-format
 msgid "Subscribed to %s."
 msgstr ""
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.

-#: lib/command.php:805 lib/command.php:916
+#: lib/command.php:676 lib/command.php:786

 msgid "Specify the name of the user to unsubscribe from."
 msgstr ""
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
 msgid "Specify the name of the user to unsubscribe from."
 msgstr ""
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.

-#: lib/command.php:816
+#: lib/command.php:686

 #, php-format
 msgid "Unsubscribed from %s."
 msgstr ""
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr ""
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.

-#: lib/command.php:836 lib/command.php:862
+#: lib/command.php:706 lib/command.php:732

 msgid "Command not yet implemented."
 msgstr ""
 
 #. TRANS: Text shown when issuing the command "off" successfully.
 msgid "Command not yet implemented."
 msgstr ""
 
 #. TRANS: Text shown when issuing the command "off" successfully.

-#: lib/command.php:840
+#: lib/command.php:710

 msgid "Notification off."
 msgstr ""
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
 msgid "Notification off."
 msgstr ""
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.

-#: lib/command.php:843
+#: lib/command.php:713

 msgid "Can't turn off notification."
 msgstr ""
 
 #. TRANS: Text shown when issuing the command "on" successfully.
 msgid "Can't turn off notification."
 msgstr ""
 
 #. TRANS: Text shown when issuing the command "on" successfully.

-#: lib/command.php:866
+#: lib/command.php:736

 msgid "Notification on."
 msgstr ""
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
 msgid "Notification on."
 msgstr ""
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.

-#: lib/command.php:869
+#: lib/command.php:739

 msgid "Can't turn on notification."
 msgstr ""
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
 msgid "Can't turn on notification."
 msgstr ""
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.

-#: lib/command.php:883
+#: lib/command.php:753

 msgid "Login command is disabled."
 msgstr ""
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
 msgid "Login command is disabled."
 msgstr ""
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..

-#: lib/command.php:896
+#: lib/command.php:766

 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.

-#: lib/command.php:925
+#: lib/command.php:795

 #, php-format
 msgid "Unsubscribed %s."
 msgstr ""
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
 #, php-format
 msgid "Unsubscribed %s."
 msgstr ""
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.

-#: lib/command.php:943
+#: lib/command.php:813

 msgid "You are not subscribed to anyone."
 msgstr ""
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
 msgid "You are not subscribed to anyone."
 msgstr ""
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.

-#: lib/command.php:948
+#: lib/command.php:818

 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] ""
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] ""


@@ -8728,14 +8086,14 @@ msgstr[1] ""
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.

-#: lib/command.php:970
+#: lib/command.php:840

 msgid "No one is subscribed to you."
 msgstr ""
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
 msgid "No one is subscribed to you."
 msgstr ""
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.

-#: lib/command.php:975
+#: lib/command.php:845

 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] ""
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] ""


@@ -8743,190 +8101,178 @@ msgstr[1] ""
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.

-#: lib/command.php:997
+#: lib/command.php:867

 msgid "You are not a member of any groups."
 msgstr ""
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
 msgid "You are not a member of any groups."
 msgstr ""
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.

-#: lib/command.php:1002
+#: lib/command.php:872

 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Header line of help text for commands.
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Header line of help text for commands.

-#: lib/command.php:1016
+#: lib/command.php:886

 msgctxt "COMMANDHELP"
 msgid "Commands:"
 msgstr ""
 
 #. TRANS: Help message for IM/SMS command "on".
 msgctxt "COMMANDHELP"
 msgid "Commands:"
 msgstr ""
 
 #. TRANS: Help message for IM/SMS command "on".

-#: lib/command.php:1018
+#: lib/command.php:888

 msgctxt "COMMANDHELP"
 msgid "turn on notifications"
 msgstr ""
 
 #. TRANS: Help message for IM/SMS command "off".
 msgctxt "COMMANDHELP"
 msgid "turn on notifications"
 msgstr ""
 
 #. TRANS: Help message for IM/SMS command "off".

-#: lib/command.php:1020
+#: lib/command.php:890

 msgctxt "COMMANDHELP"
 msgid "turn off notifications"
 msgstr ""
 
 #. TRANS: Help message for IM/SMS command "help".
 msgctxt "COMMANDHELP"
 msgid "turn off notifications"
 msgstr ""
 
 #. TRANS: Help message for IM/SMS command "help".

-#: lib/command.php:1022
+#: lib/command.php:892

 msgctxt "COMMANDHELP"
 msgid "show this help"
 msgstr ""
 
 #. TRANS: Help message for IM/SMS command "follow <nickname>".
 msgctxt "COMMANDHELP"
 msgid "show this help"
 msgstr ""
 
 #. TRANS: Help message for IM/SMS command "follow <nickname>".

-#: lib/command.php:1024
+#: lib/command.php:894

 msgctxt "COMMANDHELP"
 msgid "subscribe to user"
 msgstr ""
 
 #. TRANS: Help message for IM/SMS command "groups".
 msgctxt "COMMANDHELP"
 msgid "subscribe to user"
 msgstr ""
 
 #. TRANS: Help message for IM/SMS command "groups".

-#: lib/command.php:1026
+#: lib/command.php:896

 msgctxt "COMMANDHELP"
 msgid "lists the groups you have joined"
 msgstr ""
 
 #. TRANS: Help message for IM/SMS command "tag".
 msgctxt "COMMANDHELP"
 msgid "lists the groups you have joined"
 msgstr ""
 
 #. TRANS: Help message for IM/SMS command "tag".

-#: lib/command.php:1028
+#: lib/command.php:898

 msgctxt "COMMANDHELP"
 msgid "tag a user"
 msgstr ""
 
 #. TRANS: Help message for IM/SMS command "untag".
 msgctxt "COMMANDHELP"
 msgid "tag a user"
 msgstr ""
 
 #. TRANS: Help message for IM/SMS command "untag".

-#: lib/command.php:1030
+#: lib/command.php:900

 msgctxt "COMMANDHELP"
 msgid "untag a user"
 msgstr ""
 
 #. TRANS: Help message for IM/SMS command "subscriptions".
 msgctxt "COMMANDHELP"
 msgid "untag a user"
 msgstr ""
 
 #. TRANS: Help message for IM/SMS command "subscriptions".

-#: lib/command.php:1032
+#: lib/command.php:902

 msgctxt "COMMANDHELP"
 msgid "list the people you follow"
 msgstr ""
 
 #. TRANS: Help message for IM/SMS command "subscribers".
 msgctxt "COMMANDHELP"
 msgid "list the people you follow"
 msgstr ""
 
 #. TRANS: Help message for IM/SMS command "subscribers".

-#: lib/command.php:1034
+#: lib/command.php:904

 msgctxt "COMMANDHELP"
 msgid "list the people that follow you"
 msgstr ""
 
 #. TRANS: Help message for IM/SMS command "leave <nickname>".
 msgctxt "COMMANDHELP"
 msgid "list the people that follow you"
 msgstr ""
 
 #. TRANS: Help message for IM/SMS command "leave <nickname>".

-#: lib/command.php:1036
+#: lib/command.php:906

 msgctxt "COMMANDHELP"
 msgid "unsubscribe from user"
 msgstr ""
 
 #. TRANS: Help message for IM/SMS command "d <nickname> <text>".
 msgctxt "COMMANDHELP"
 msgid "unsubscribe from user"
 msgstr ""
 
 #. TRANS: Help message for IM/SMS command "d <nickname> <text>".

-#: lib/command.php:1038
+#: lib/command.php:908

 msgctxt "COMMANDHELP"
 msgid "direct message to user"
 msgstr ""
 
 #. TRANS: Help message for IM/SMS command "get <nickname>".
 msgctxt "COMMANDHELP"
 msgid "direct message to user"
 msgstr ""
 
 #. TRANS: Help message for IM/SMS command "get <nickname>".

-#: lib/command.php:1040
+#: lib/command.php:910

 msgctxt "COMMANDHELP"
 msgid "get last notice from user"
 msgstr ""
 
 #. TRANS: Help message for IM/SMS command "whois <nickname>".
 msgctxt "COMMANDHELP"
 msgid "get last notice from user"
 msgstr ""
 
 #. TRANS: Help message for IM/SMS command "whois <nickname>".

-#: lib/command.php:1042
+#: lib/command.php:912

 msgctxt "COMMANDHELP"
 msgid "get profile info on user"
 msgstr ""
 
 #. TRANS: Help message for IM/SMS command "lose <nickname>".
 msgctxt "COMMANDHELP"
 msgid "get profile info on user"
 msgstr ""
 
 #. TRANS: Help message for IM/SMS command "lose <nickname>".

-#: lib/command.php:1044
+#: lib/command.php:914

 msgctxt "COMMANDHELP"
 msgid "force user to stop following you"
 msgstr ""
 
 msgctxt "COMMANDHELP"
 msgid "force user to stop following you"
 msgstr ""
 

-#. TRANS: Help message for IM/SMS command "fav <nickname>".
-#: lib/command.php:1046
-msgctxt "COMMANDHELP"
-msgid "add user's last notice as a 'fave'"
-msgstr ""
-
-#. TRANS: Help message for IM/SMS command "fav #<notice_id>".
-#: lib/command.php:1048
-msgctxt "COMMANDHELP"
-msgid "add notice with the given id as a 'fave'"
-msgstr ""
-

 #. TRANS: Help message for IM/SMS command "repeat #<notice_id>".
 #. TRANS: Help message for IM/SMS command "repeat #<notice_id>".

-#: lib/command.php:1050
+#: lib/command.php:916

 msgctxt "COMMANDHELP"
 msgid "repeat a notice with a given id"
 msgstr ""
 
 #. TRANS: Help message for IM/SMS command "repeat <nickname>".
 msgctxt "COMMANDHELP"
 msgid "repeat a notice with a given id"
 msgstr ""
 
 #. TRANS: Help message for IM/SMS command "repeat <nickname>".

-#: lib/command.php:1052
+#: lib/command.php:918

 msgctxt "COMMANDHELP"
 msgid "repeat the last notice from user"
 msgstr ""
 
 #. TRANS: Help message for IM/SMS command "reply #<notice_id>".
 msgctxt "COMMANDHELP"
 msgid "repeat the last notice from user"
 msgstr ""
 
 #. TRANS: Help message for IM/SMS command "reply #<notice_id>".

-#: lib/command.php:1054
+#: lib/command.php:920

 msgctxt "COMMANDHELP"
 msgid "reply to notice with a given id"
 msgstr ""
 
 #. TRANS: Help message for IM/SMS command "reply <nickname>".
 msgctxt "COMMANDHELP"
 msgid "reply to notice with a given id"
 msgstr ""
 
 #. TRANS: Help message for IM/SMS command "reply <nickname>".

-#: lib/command.php:1056
+#: lib/command.php:922

 msgctxt "COMMANDHELP"
 msgid "reply to the last notice from user"
 msgstr ""
 
 #. TRANS: Help message for IM/SMS command "join <group>".
 msgctxt "COMMANDHELP"
 msgid "reply to the last notice from user"
 msgstr ""
 
 #. TRANS: Help message for IM/SMS command "join <group>".

-#: lib/command.php:1058
+#: lib/command.php:924

 msgctxt "COMMANDHELP"
 msgid "join group"
 msgstr ""
 
 #. TRANS: Help message for IM/SMS command "login".
 msgctxt "COMMANDHELP"
 msgid "join group"
 msgstr ""
 
 #. TRANS: Help message for IM/SMS command "login".

-#: lib/command.php:1060
+#: lib/command.php:926

 msgctxt "COMMANDHELP"
 msgid "Get a link to login to the web interface"
 msgstr ""
 
 #. TRANS: Help message for IM/SMS command "drop <group>".
 msgctxt "COMMANDHELP"
 msgid "Get a link to login to the web interface"
 msgstr ""
 
 #. TRANS: Help message for IM/SMS command "drop <group>".

-#: lib/command.php:1062
+#: lib/command.php:928

 msgctxt "COMMANDHELP"
 msgid "leave group"
 msgstr ""
 
 #. TRANS: Help message for IM/SMS command "stats".
 msgctxt "COMMANDHELP"
 msgid "leave group"
 msgstr ""
 
 #. TRANS: Help message for IM/SMS command "stats".

-#: lib/command.php:1064
+#: lib/command.php:930

 msgctxt "COMMANDHELP"
 msgid "get your stats"
 msgstr ""
 
 #. TRANS: Help message for IM/SMS command "stop".
 #. TRANS: Help message for IM/SMS command "quit".
 msgctxt "COMMANDHELP"
 msgid "get your stats"
 msgstr ""
 
 #. TRANS: Help message for IM/SMS command "stop".
 #. TRANS: Help message for IM/SMS command "quit".

-#: lib/command.php:1066 lib/command.php:1068
+#: lib/command.php:932 lib/command.php:934

 msgctxt "COMMANDHELP"
 msgid "same as 'off'"
 msgstr ""
 
 #. TRANS: Help message for IM/SMS command "sub <nickname>".
 msgctxt "COMMANDHELP"
 msgid "same as 'off'"
 msgstr ""
 
 #. TRANS: Help message for IM/SMS command "sub <nickname>".

-#: lib/command.php:1070
+#: lib/command.php:936

 msgctxt "COMMANDHELP"
 msgid "same as 'follow'"
 msgstr ""
 
 #. TRANS: Help message for IM/SMS command "unsub <nickname>".
 msgctxt "COMMANDHELP"
 msgid "same as 'follow'"
 msgstr ""
 
 #. TRANS: Help message for IM/SMS command "unsub <nickname>".

-#: lib/command.php:1072
+#: lib/command.php:938

 msgctxt "COMMANDHELP"
 msgid "same as 'leave'"
 msgstr ""
 
 #. TRANS: Help message for IM/SMS command "last <nickname>".
 msgctxt "COMMANDHELP"
 msgid "same as 'leave'"
 msgstr ""
 
 #. TRANS: Help message for IM/SMS command "last <nickname>".

-#: lib/command.php:1074
+#: lib/command.php:940

 msgctxt "COMMANDHELP"
 msgid "same as 'get'"
 msgstr ""
 msgctxt "COMMANDHELP"
 msgid "same as 'get'"
 msgstr ""


@@ -8940,47 +8286,41 @@ msgstr ""
 #. TRANS: Help message for IM/SMS command "untrack all".
 #. TRANS: Help message for IM/SMS command "tracks".
 #. TRANS: Help message for IM/SMS command "tracking".
 #. TRANS: Help message for IM/SMS command "untrack all".
 #. TRANS: Help message for IM/SMS command "tracks".
 #. TRANS: Help message for IM/SMS command "tracking".

-#: lib/command.php:1076 lib/command.php:1078 lib/command.php:1082
-#: lib/command.php:1084 lib/command.php:1086 lib/command.php:1088
-#: lib/command.php:1090 lib/command.php:1092 lib/command.php:1094
+#: lib/command.php:942 lib/command.php:944 lib/command.php:948
+#: lib/command.php:950 lib/command.php:952 lib/command.php:954
+#: lib/command.php:956 lib/command.php:958 lib/command.php:960

 msgctxt "COMMANDHELP"
 msgid "not yet implemented."
 msgstr ""
 
 #. TRANS: Help message for IM/SMS command "nudge <nickname>".
 msgctxt "COMMANDHELP"
 msgid "not yet implemented."
 msgstr ""
 
 #. TRANS: Help message for IM/SMS command "nudge <nickname>".

-#: lib/command.php:1080
+#: lib/command.php:946

 msgctxt "COMMANDHELP"
 msgid "remind a user to update."
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 msgctxt "COMMANDHELP"
 msgid "remind a user to update."
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.

-#: lib/common.php:36
+#: lib/common.php:32

 msgid "No configuration file found."
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: Is followed by a list of directories (separated by HTML breaks).
 msgid "No configuration file found."
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: Is followed by a list of directories (separated by HTML breaks).

-#: lib/common.php:39
+#: lib/common.php:35

 msgid "I looked for configuration files in the following places:"
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 msgid "I looked for configuration files in the following places:"
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.

-#: lib/common.php:42
+#: lib/common.php:38

 msgid "You may wish to run the installer to fix this."
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: The text is link text that leads to the installer page.
 msgid "You may wish to run the installer to fix this."
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: The text is link text that leads to the installer page.

-#: lib/common.php:46
+#: lib/common.php:42

 msgid "Go to the installer."
 msgstr ""
 
 msgid "Go to the installer."
 msgstr ""
 

-#. TRANS: Header on conversation page. Hidden by default (h2).
-#. TRANS: Label for user statistics.
-#: lib/conversationtree.php:64 lib/profileaction.php:223
-msgid "Notices"
-msgstr ""
-

 #. TRANS: Page title for when a database error occurs.
 #: lib/dberroraction.php:60
 msgid "Database error"
 #. TRANS: Page title for when a database error occurs.
 #: lib/dberroraction.php:60
 msgid "Database error"


@@ -8988,21 +8328,21 @@ msgstr ""
 
 #. TRANS: Menu item in default local navigation panel.
 #. TRANS: Menu item in search group navigation panel.
 
 #. TRANS: Menu item in default local navigation panel.
 #. TRANS: Menu item in search group navigation panel.

-#: lib/defaultlocalnav.php:65 lib/publicgroupnav.php:67
+#: lib/defaultlocalnav.php:65 lib/publicgroupnav.php:63

 msgctxt "MENU"
 msgid "Public"
 msgstr ""
 
 #. TRANS: Menu item in default local navigation panel.
 #. TRANS: Menu item title in local navigation menu.
 msgctxt "MENU"
 msgid "Public"
 msgstr ""
 
 #. TRANS: Menu item in default local navigation panel.
 #. TRANS: Menu item title in local navigation menu.

-#: lib/defaultlocalnav.php:79 lib/subgroupnav.php:135
+#: lib/defaultlocalnav.php:79 lib/subgroupnav.php:136

 msgctxt "MENU"
 msgid "Lists"
 msgstr ""
 
 #. TRANS: Title of form for deleting a user.
 #. TRANS: Link text in notice list item to delete a notice.
 msgctxt "MENU"
 msgid "Lists"
 msgstr ""
 
 #. TRANS: Title of form for deleting a user.
 #. TRANS: Link text in notice list item to delete a notice.

-#: lib/deleteuserform.php:64 lib/noticelistitem.php:680
+#: lib/deleteuserform.php:64 lib/noticelistitem.php:603

 msgid "Delete"
 msgstr ""
 
 msgid "Delete"
 msgstr ""
 


@@ -9011,42 +8351,9 @@ msgstr ""
 msgid "Delete this user"
 msgstr ""
 
 msgid "Delete this user"
 msgstr ""
 

-#. TRANS: Exception. %s is an ID.
-#: lib/discovery.php:153
-#, php-format
-msgid "Unable to find services for %s."
-msgstr ""
-
-#. TRANS: Form legend for removing the favourite status for a favourite notice.
-#: lib/disfavorform.php:108
-msgid "Disfavor this notice"
-msgstr ""
-
-#. TRANS: Button text for removing the favourite status for a favourite notice.
-#: lib/disfavorform.php:136
-msgctxt "BUTTON"
-msgid "Disfavor favorite"
-msgstr ""
-
-#. TRANS: Button title for removing the favourite status for a favourite notice.
-#: lib/disfavorform.php:140
-msgid "Remove this notice from your list of favorite notices."
-msgstr ""
-
-#. TRANS: Form legend for adding the favourite status to a notice.
-#: lib/favorform.php:108
-msgid "Favor this notice"
-msgstr ""
-
-#. TRANS: Button text for adding the favourite status to a notice.
-#: lib/favorform.php:135
-msgctxt "BUTTON"
-msgid "Favor"
-msgstr ""
-
-#. TRANS: Button title for adding the favourite status to a notice.
-#: lib/favorform.php:139
-msgid "Add this notice to your list of favorite notices."
+#. TRANS: Page title after an AJAX error occurs on the send notice page.
+#: lib/error.php:115
+msgid "Ajax Error"

 msgstr ""
 
 #. TRANS: Feed type name.
 msgstr ""
 
 #. TRANS: Feed type name.


@@ -9090,19 +8397,36 @@ msgstr ""
 msgid "Feeds"
 msgstr ""
 
 msgid "Feeds"
 msgstr ""
 

+#: lib/filenotfoundexception.php:39
+msgid "File not found in filesystem."
+msgstr ""
+
+#. TRANS: Client error displayed when the number of bytes in a POST request exceeds a limit.
+#. TRANS: %s is the number of bytes of the CONTENT_LENGTH.
+#: lib/formaction.php:135
+#, php-format
+msgid ""
+"The server was unable to handle that much POST data (%s MiB) due to its "
+"current configuration."
+msgid_plural ""
+"The server was unable to handle that much POST data (%s MiB) due to its "
+"current configuration."
+msgstr[0] ""
+msgstr[1] ""
+

 #. TRANS: List element on gallery action page to show all tags.
 #. TRANS: List element on gallery action page to show all tags.

-#: lib/galleryaction.php:129
+#: lib/galleryaction.php:72

 msgctxt "TAGS"
 msgid "All"
 msgstr ""
 
 #. TRANS: Dropdown field label on gallery action page for a list containing tags.
 msgctxt "TAGS"
 msgid "All"
 msgstr ""
 
 #. TRANS: Dropdown field label on gallery action page for a list containing tags.

-#: lib/galleryaction.php:140
+#: lib/galleryaction.php:83

 msgid "Tag"
 msgstr ""
 
 #. TRANS: Dropdown field title on gallery action page for a list containing tags.
 msgid "Tag"
 msgstr ""
 
 #. TRANS: Dropdown field title on gallery action page for a list containing tags.

-#: lib/galleryaction.php:142
+#: lib/galleryaction.php:85

 msgid "Choose a tag to narrow list."
 msgstr ""
 
 msgid "Choose a tag to narrow list."
 msgstr ""
 


@@ -9113,27 +8437,27 @@ msgid "Grant this user the \"%s\" role"
 msgstr ""
 
 #. TRANS: Header for mini list of group members on a group page (h2).
 msgstr ""
 
 #. TRANS: Header for mini list of group members on a group page (h2).

-#: lib/groupaction.php:151
+#: lib/groupaction.php:146

 msgid "Members"
 msgstr ""
 
 #. TRANS: Link to all group members from mini list of group members if group has more than n members.
 msgid "Members"
 msgstr ""
 
 #. TRANS: Link to all group members from mini list of group members if group has more than n members.

-#: lib/groupaction.php:172 lib/groupaction.php:265
+#: lib/groupaction.php:167 lib/groupaction.php:256

 msgid "All members"
 msgstr ""
 
 #. TRANS: Header for mini list of users with a pending membership request on a group page (h2).
 msgid "All members"
 msgstr ""
 
 #. TRANS: Header for mini list of users with a pending membership request on a group page (h2).

-#: lib/groupaction.php:209
+#: lib/groupaction.php:204

 msgid "Pending"
 msgstr ""
 
 #. TRANS: Header for mini list of users that are blocked in a group page (h2).
 msgid "Pending"
 msgstr ""
 
 #. TRANS: Header for mini list of users that are blocked in a group page (h2).

-#: lib/groupaction.php:244
+#: lib/groupaction.php:235

 msgid "Blocked"
 msgstr ""
 
 #. TRANS: Title for list of group administrators on a group page.
 msgid "Blocked"
 msgstr ""
 
 #. TRANS: Title for list of group administrators on a group page.

-#: lib/groupaction.php:316
+#: lib/groupaction.php:312

 msgctxt "TITLE"
 msgid "Admins"
 msgstr ""
 msgctxt "TITLE"
 msgid "Admins"
 msgstr ""


@@ -9151,18 +8475,18 @@ msgid "Block this user so that they can no longer post messages to it."
 msgstr ""
 
 #. TRANS: Field title on group edit form.
 msgstr ""
 
 #. TRANS: Field title on group edit form.

-#: lib/groupeditform.php:162
+#: lib/groupeditform.php:166

 msgid "URL of the homepage or blog of the group or topic."
 msgstr ""
 
 #. TRANS: Text area title for group description when there is no text limit.
 msgid "URL of the homepage or blog of the group or topic."
 msgstr ""
 
 #. TRANS: Text area title for group description when there is no text limit.

-#: lib/groupeditform.php:168
+#: lib/groupeditform.php:172

 msgid "Describe the group or topic."
 msgstr ""
 
 #. TRANS: Text area title for group description.
 #. TRANS: %d is the number of characters available for the description.
 msgid "Describe the group or topic."
 msgstr ""
 
 #. TRANS: Text area title for group description.
 #. TRANS: %d is the number of characters available for the description.

-#: lib/groupeditform.php:172
+#: lib/groupeditform.php:176

 #, php-format
 msgid "Describe the group or topic in %d character or less."
 msgid_plural "Describe the group or topic in %d characters or less."
 #, php-format
 msgid "Describe the group or topic in %d character or less."
 msgid_plural "Describe the group or topic in %d characters or less."


@@ -9170,19 +8494,19 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Field title on group edit form.
 msgstr[1] ""
 
 #. TRANS: Field title on group edit form.

-#: lib/groupeditform.php:187
+#: lib/groupeditform.php:191

 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr ""
 
 #. TRANS: Field label on group edit form.
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr ""
 
 #. TRANS: Field label on group edit form.

-#: lib/groupeditform.php:193
+#: lib/groupeditform.php:197

 msgid "Aliases"
 msgstr ""
 
 #. TRANS: Input field title for group aliases.
 #. TRANS: %d is the maximum number of group aliases available.
 msgid "Aliases"
 msgstr ""
 
 #. TRANS: Input field title for group aliases.
 #. TRANS: %d is the maximum number of group aliases available.

-#: lib/groupeditform.php:198
+#: lib/groupeditform.php:202

 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "


@@ -9194,7 +8518,7 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Checkbox field title on group edit form to mark a group private.
 msgstr[1] ""
 
 #. TRANS: Checkbox field title on group edit form to mark a group private.

-#: lib/groupeditform.php:210
+#: lib/groupeditform.php:214

 msgid ""
 "New members must be approved by admin and all posts are forced to be private."
 msgstr ""
 msgid ""
 "New members must be approved by admin and all posts are forced to be private."
 msgstr ""


@@ -9205,14 +8529,23 @@ msgctxt "GROUPADMIN"
 msgid "Admin"
 msgstr ""
 
 msgid "Admin"
 msgstr ""
 

+#. TRANS: Exception text shown when no profile can be found for a group.
+#. TRANS: %1$s is a group nickname, $2$d is a group profile_id (number).
+#. TRANS: Exception text shown when no profile can be found for a user.
+#. TRANS: %1$s is a user nickname, $2$d is a user ID (number).
+#: lib/groupnoprofileexception.php:58 lib/usernoprofileexception.php:58
+#, php-format
+msgid "User %1$s (%2$d) has no profile record."
+msgstr ""
+

 #. TRANS: Group actions header (h2). Text hidden by default.
 #. TRANS: Group actions header (h2). Text hidden by default.

-#: lib/groupprofileblock.php:93
+#: lib/groupprofileblock.php:103

 msgid "Group actions"
 msgstr ""
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
 msgid "Group actions"
 msgstr ""
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.

-#: lib/groupprofileblock.php:120
+#: lib/groupprofileblock.php:130

 #, php-format
 msgctxt "TOOLTIP"
 msgid "Edit %s group properties"
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Edit %s group properties"


@@ -9220,14 +8553,14 @@ msgstr ""
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.

-#: lib/groupprofileblock.php:129
+#: lib/groupprofileblock.php:139

 #, php-format
 msgctxt "TOOLTIP"
 msgid "Add or edit %s logo"
 msgstr ""
 
 #. TRANS: Link text for link on user profile.
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Add or edit %s logo"
 msgstr ""
 
 #. TRANS: Link text for link on user profile.

-#: lib/groupprofileblock.php:131
+#: lib/groupprofileblock.php:141

 msgctxt "MENU"
 msgid "Logo"
 msgstr ""
 msgctxt "MENU"
 msgid "Logo"
 msgstr ""


@@ -9264,41 +8597,55 @@ msgstr ""
 msgid "This page is not available in a media type you accept"
 msgstr ""
 
 msgid "This page is not available in a media type you accept"
 msgstr ""
 

+#. TRANS: Exception. %s is a profile URL.
+#: lib/httpclient.php:189
+#, php-format
+msgid "Could not GET URL %s."
+msgstr ""
+

 #. TRANS: Exception thrown when trying to upload an unsupported image file format.
 #. TRANS: Exception thrown when trying to upload an unsupported image file format.

-#: lib/imagefile.php:73
-msgid "Unsupported image file format."
+#: lib/imagefile.php:74
+msgid "Unsupported image format."
+msgstr ""
+
+#: lib/imagefile.php:114
+msgid "File without filename could not get a thumbnail source."
+msgstr ""
+
+#: lib/imagefile.php:121
+msgid "Unsupported media format."

 msgstr ""
 
 #. TRANS: Exception thrown when too large a file is uploaded.
 #. TRANS: %s is the maximum file size, for example "500b", "10kB" or "2MB".
 msgstr ""
 
 #. TRANS: Exception thrown when too large a file is uploaded.
 #. TRANS: %s is the maximum file size, for example "500b", "10kB" or "2MB".

-#: lib/imagefile.php:91
+#: lib/imagefile.php:160

 #, php-format
 msgid "That file is too big. The maximum file size is %s."
 msgstr ""
 
 #. TRANS: Exception thrown when uploading an image and that action could not be completed.
 #, php-format
 msgid "That file is too big. The maximum file size is %s."
 msgstr ""
 
 #. TRANS: Exception thrown when uploading an image and that action could not be completed.

-#: lib/imagefile.php:97
+#: lib/imagefile.php:165

 msgid "Partial upload."
 msgstr ""
 
 #. TRANS: Exception thrown when uploading a file as image that is not an image or is a corrupt file.
 msgid "Partial upload."
 msgstr ""
 
 #. TRANS: Exception thrown when uploading a file as image that is not an image or is a corrupt file.

-#: lib/imagefile.php:115
+#: lib/imagefile.php:180

 msgid "Not an image or corrupt file."
 msgstr ""
 
 #. TRANS: Exception thrown during resize when image has been registered as present, but is no longer there.
 msgid "Not an image or corrupt file."
 msgstr ""
 
 #. TRANS: Exception thrown during resize when image has been registered as present, but is no longer there.

-#: lib/imagefile.php:178
+#: lib/imagefile.php:243

 msgid "Lost our file."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to resize an unknown file type.
 #. TRANS: Exception thrown when trying resize an unknown file type.
 msgid "Lost our file."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to resize an unknown file type.
 #. TRANS: Exception thrown when trying resize an unknown file type.

-#: lib/imagefile.php:216 lib/imagefile.php:257
+#: lib/imagefile.php:308 lib/imagefile.php:352

 msgid "Unknown file type"
 msgstr ""
 
 #. TRANS: Number of megabytes. %d is the number.
 msgid "Unknown file type"
 msgstr ""
 
 #. TRANS: Number of megabytes. %d is the number.

-#: lib/imagefile.php:303
+#: lib/imagefile.php:396

 #, php-format
 msgid "%dMB"
 msgid_plural "%dMB"
 #, php-format
 msgid "%dMB"
 msgid_plural "%dMB"


@@ -9306,7 +8653,7 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Number of kilobytes. %d is the number.
 msgstr[1] ""
 
 #. TRANS: Number of kilobytes. %d is the number.

-#: lib/imagefile.php:307
+#: lib/imagefile.php:400

 #, php-format
 msgid "%dkB"
 msgid_plural "%dkB"
 #, php-format
 msgid "%dkB"
 msgid_plural "%dkB"


@@ -9314,7 +8661,7 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Number of bytes. %d is the number.
 msgstr[1] ""
 
 #. TRANS: Number of bytes. %d is the number.

-#: lib/imagefile.php:310
+#: lib/imagefile.php:403

 #, php-format
 msgid "%dB"
 msgid_plural "%dB"
 #, php-format
 msgid "%dB"
 msgid_plural "%dB"


@@ -9341,18 +8688,27 @@ msgstr ""
 msgid "Unknown inbox source %d."
 msgstr ""
 
 msgid "Unknown inbox source %d."
 msgstr ""
 

+#. TRANS: Message given when a status is too long. %1$s is the maximum number of characters,
+#. TRANS: %2$s is the number of characters sent (used for plural).
+#: lib/implugin.php:500
+#, php-format
+msgid "Message too long - maximum is %1$d character, you sent %2$d."
+msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
+msgstr[0] ""
+msgstr[1] ""
+

 #. TRANS: Server exception thrown trying to initialise an IM plugin without meeting all prerequisites.
 #. TRANS: Server exception thrown trying to initialise an IM plugin without meeting all prerequisites.

-#: lib/implugin.php:633
+#: lib/implugin.php:642

 msgid "Queueing must be enabled to use IM plugins."
 msgstr ""
 
 #. TRANS: Server exception thrown trying to initialise an IM plugin without a transport method.
 msgid "Queueing must be enabled to use IM plugins."
 msgstr ""
 
 #. TRANS: Server exception thrown trying to initialise an IM plugin without a transport method.

-#: lib/implugin.php:638
+#: lib/implugin.php:647

 msgid "Transport cannot be null."
 msgstr ""
 
 #. TRANS: Title for inbox tag cloud section.
 msgid "Transport cannot be null."
 msgstr ""
 
 #. TRANS: Title for inbox tag cloud section.

-#: lib/inboxtagcloudsection.php:56
+#: lib/inboxtagcloudsection.php:58

 msgctxt "TITLE"
 msgid "Trends"
 msgstr ""
 msgctxt "TITLE"
 msgid "Trends"
 msgstr ""


@@ -9390,7 +8746,7 @@ msgstr ""
 
 #. TRANS: Send button for inviting friends
 #. TRANS: Button text for sending notice.
 
 #. TRANS: Send button for inviting friends
 #. TRANS: Button text for sending notice.

-#: lib/inviteform.php:128 lib/noticeform.php:302
+#: lib/inviteform.php:128 lib/noticeform.php:300

 msgctxt "BUTTON"
 msgid "Send"
 msgstr ""
 msgctxt "BUTTON"
 msgid "Send"
 msgstr ""


@@ -9441,14 +8797,14 @@ msgid "Sign up for a new account"
 msgstr ""
 
 #. TRANS: Subject for address confirmation email.
 msgstr ""
 
 #. TRANS: Subject for address confirmation email.

-#: lib/mail.php:179
+#: lib/mail.php:178

 msgid "Email address confirmation"
 msgstr ""
 
 #. TRANS: Body for address confirmation email.
 #. TRANS: %1$s is the addressed user's nickname, %2$s is the StatusNet sitename,
 #. TRANS: %3$s is the URL to confirm at.
 msgid "Email address confirmation"
 msgstr ""
 
 #. TRANS: Body for address confirmation email.
 #. TRANS: %1$s is the addressed user's nickname, %2$s is the StatusNet sitename,
 #. TRANS: %3$s is the URL to confirm at.

-#: lib/mail.php:184
+#: lib/mail.php:183

 #, php-format
 msgid ""
 "Hey, %1$s.\n"
 #, php-format
 msgid ""
 "Hey, %1$s.\n"


@@ -9469,21 +8825,21 @@ msgstr ""
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
 #. TRANS: Main body of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the StatusNet sitename.
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
 #. TRANS: Main body of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the StatusNet sitename.

-#: lib/mail.php:250 lib/mail.php:256
+#: lib/mail.php:249 lib/mail.php:255

 #, php-format
 msgid "%1$s is now following you on %2$s."
 msgstr ""
 
 #. TRANS: Subject of pending new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
 #, php-format
 msgid "%1$s is now following you on %2$s."
 msgstr ""
 
 #. TRANS: Subject of pending new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.

-#: lib/mail.php:290
+#: lib/mail.php:289

 #, php-format
 msgid "%1$s would like to listen to your notices on %2$s."
 msgstr ""
 
 #. TRANS: Main body of pending new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the StatusNet sitename.
 #, php-format
 msgid "%1$s would like to listen to your notices on %2$s."
 msgstr ""
 
 #. TRANS: Main body of pending new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the StatusNet sitename.

-#: lib/mail.php:297
+#: lib/mail.php:296

 #, php-format
 msgid ""
 "%1$s would like to listen to your notices on %2$s. You may approve or reject "
 #, php-format
 msgid ""
 "%1$s would like to listen to your notices on %2$s. You may approve or reject "


@@ -9493,7 +8849,7 @@ msgstr ""
 #. TRANS: Common footer block for StatusNet notification emails.
 #. TRANS: %1$s is the StatusNet sitename,
 #. TRANS: %2$s is a link to the addressed user's e-mail settings.
 #. TRANS: Common footer block for StatusNet notification emails.
 #. TRANS: %1$s is the StatusNet sitename,
 #. TRANS: %2$s is a link to the addressed user's e-mail settings.

-#: lib/mail.php:316
+#: lib/mail.php:315

 #, php-format
 msgid ""
 "Faithfully yours,\n"
 #, php-format
 msgid ""
 "Faithfully yours,\n"


@@ -9505,21 +8861,21 @@ msgstr ""
 
 #. TRANS: Profile info line in notification e-mail.
 #. TRANS: %s is a URL.
 
 #. TRANS: Profile info line in notification e-mail.
 #. TRANS: %s is a URL.

-#: lib/mail.php:341
+#: lib/mail.php:340

 #, php-format
 msgid "Profile: %s"
 msgstr ""
 
 #. TRANS: Profile info line in notification e-mail.
 #. TRANS: %s is biographical information.
 #, php-format
 msgid "Profile: %s"
 msgstr ""
 
 #. TRANS: Profile info line in notification e-mail.
 #. TRANS: %s is biographical information.

-#: lib/mail.php:355
+#: lib/mail.php:354

 #, php-format
 msgid "Bio: %s"
 msgstr ""
 
 #. TRANS: This is a paragraph in a new-subscriber e-mail.
 #. TRANS: %s is a URL where the subscriber can be reported as abusive.
 #, php-format
 msgid "Bio: %s"
 msgstr ""
 
 #. TRANS: This is a paragraph in a new-subscriber e-mail.
 #. TRANS: %s is a URL where the subscriber can be reported as abusive.

-#: lib/mail.php:365
+#: lib/mail.php:364

 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "


@@ -9528,7 +8884,7 @@ msgstr ""
 
 #. TRANS: Subject of notification mail for new posting email address.
 #. TRANS: %s is the StatusNet sitename.
 
 #. TRANS: Subject of notification mail for new posting email address.
 #. TRANS: %s is the StatusNet sitename.

-#: lib/mail.php:393
+#: lib/mail.php:392

 #, php-format
 msgid "New email address for posting to %s"
 msgstr ""
 #, php-format
 msgid "New email address for posting to %s"
 msgstr ""


@@ -9536,7 +8892,7 @@ msgstr ""
 #. TRANS: Body of notification mail for new posting email address.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is the e-mail address to send
 #. TRANS: to to post by e-mail, %3$s is a URL to more instructions.
 #. TRANS: Body of notification mail for new posting email address.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is the e-mail address to send
 #. TRANS: to to post by e-mail, %3$s is a URL to more instructions.

-#: lib/mail.php:399
+#: lib/mail.php:398

 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"


@@ -9548,26 +8904,26 @@ msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.

-#: lib/mail.php:523
+#: lib/mail.php:534

 #, php-format
 msgid "%s status"
 msgstr ""
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
 #, php-format
 msgid "%s status"
 msgstr ""
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.

-#: lib/mail.php:549
+#: lib/mail.php:560

 msgid "SMS confirmation"
 msgstr ""
 
 #. TRANS: Main body heading for SMS-by-email address confirmation message.
 #. TRANS: %s is the addressed user's nickname.
 msgid "SMS confirmation"
 msgstr ""
 
 #. TRANS: Main body heading for SMS-by-email address confirmation message.
 #. TRANS: %s is the addressed user's nickname.

-#: lib/mail.php:553
+#: lib/mail.php:564

 #, php-format
 msgid "%s: confirm you own this phone number with this code:"
 msgstr ""
 
 #. TRANS: Subject for 'nudge' notification email.
 #. TRANS: %s is the nudging user.
 #, php-format
 msgid "%s: confirm you own this phone number with this code:"
 msgstr ""
 
 #. TRANS: Subject for 'nudge' notification email.
 #. TRANS: %s is the nudging user.

-#: lib/mail.php:574
+#: lib/mail.php:585

 #, php-format
 msgid "You have been nudged by %s"
 msgstr ""
 #, php-format
 msgid "You have been nudged by %s"
 msgstr ""


@@ -9575,7 +8931,7 @@ msgstr ""
 #. TRANS: Body for 'nudge' notification email.
 #. TRANS: %1$s is the nuding user's long name, $2$s is the nudging user's nickname,
 #. TRANS: %3$s is a URL to post notices at.
 #. TRANS: Body for 'nudge' notification email.
 #. TRANS: %1$s is the nuding user's long name, $2$s is the nudging user's nickname,
 #. TRANS: %3$s is a URL to post notices at.

-#: lib/mail.php:581
+#: lib/mail.php:592

 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "


@@ -9590,62 +8946,32 @@ msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.

-#: lib/mail.php:626
-#, php-format
-msgid "New private message from %s"
-msgstr ""
-
-#. TRANS: Body for direct-message notification email.
-#. TRANS: %1$s is the sending user's long name, %2$s is the sending user's nickname,
-#. TRANS: %3$s is the message content, %4$s a URL to the message,
-#: lib/mail.php:633
-#, php-format
-msgid ""
-"%1$s (%2$s) sent you a private message:\n"
-"\n"
-"------------------------------------------------------\n"
-"%3$s\n"
-"------------------------------------------------------\n"
-"\n"
-"You can reply to their message here:\n"
-"\n"
-"%4$s\n"
-"\n"
-"Don't reply to this email; it won't get to them."
-msgstr ""
-
-#. TRANS: Subject for favorite notification e-mail.
-#. TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:683
+#: lib/mail.php:637

 #, php-format
 #, php-format

-msgid "%1$s (@%2$s) added your notice as a favorite"
+msgid "New private message from %s"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Body for favorite notification e-mail.
-#. TRANS: %1$s is the adding user's long name, $2$s is the date the notice was created,
-#. TRANS: %3$s is a URL to the faved notice, %4$s is the faved notice text,
-#. TRANS: %5$s is a URL to all faves of the adding user, %6$s is the StatusNet sitename,
-#. TRANS: %7$s is the adding user's nickname.
-#: lib/mail.php:690
+#. TRANS: Body for direct-message notification email.
+#. TRANS: %1$s is the sending user's long name, %2$s is the sending user's nickname,
+#. TRANS: %3$s is the message content, %4$s a URL to the message,
+#: lib/mail.php:644

 #, php-format
 msgid ""
 #, php-format
 msgid ""

-"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
-"\n"
-"The URL of your notice is:\n"
+"%1$s (%2$s) sent you a private message:\n"

 "\n"
 "\n"

+"------------------------------------------------------\n"

 "%3$s\n"
 "%3$s\n"

+"------------------------------------------------------\n"

 "\n"
 "\n"

-"The text of your notice is:\n"
+"You can reply to their message here:\n"

 "\n"
 "%4$s\n"
 "\n"
 "\n"
 "%4$s\n"
 "\n"

-"You can see the list of %1$s's favorites here:\n"
-"\n"
-"%5$s"
+"Don't reply to this email; it won't get to them."

 msgstr ""
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
 msgstr ""
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.

-#: lib/mail.php:747
+#: lib/mail.php:701

 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"


@@ -9655,7 +8981,7 @@ msgstr ""
 
 #. TRANS: E-mail subject for notice notification.
 #. TRANS: %1$s is the sending user's long name, %2$s is the adding user's nickname.
 
 #. TRANS: E-mail subject for notice notification.
 #. TRANS: %1$s is the sending user's long name, %2$s is the adding user's nickname.

-#: lib/mail.php:755
+#: lib/mail.php:709

 #, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
 msgstr ""
 #, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
 msgstr ""


@@ -9665,7 +8991,7 @@ msgstr ""
 #. TRANS: %3$s is a URL to the notice, %4$s is the notice text,
 #. TRANS: %5$s is the text "The full conversation can be read here:" and a URL to the full conversion if it exists (otherwise empty),
 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replies for the addressed user,
 #. TRANS: %3$s is a URL to the notice, %4$s is the notice text,
 #. TRANS: %5$s is the text "The full conversation can be read here:" and a URL to the full conversion if it exists (otherwise empty),
 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replies for the addressed user,

-#: lib/mail.php:762
+#: lib/mail.php:716

 #, php-format
 msgid ""
 "%1$s just sent a notice to your attention (an '@-reply') on %2$s.\n"
 #, php-format
 msgid ""
 "%1$s just sent a notice to your attention (an '@-reply') on %2$s.\n"


@@ -9689,7 +9015,7 @@ msgstr ""
 
 #. TRANS: Subject of group join notification e-mail.
 #. TRANS: %1$s is the joining user's nickname, %2$s is the group name, and %3$s is the StatusNet sitename.
 
 #. TRANS: Subject of group join notification e-mail.
 #. TRANS: %1$s is the joining user's nickname, %2$s is the group name, and %3$s is the StatusNet sitename.

-#: lib/mail.php:833
+#: lib/mail.php:787

 #, php-format
 msgid "%1$s has joined your group %2$s on %3$s"
 msgstr ""
 #, php-format
 msgid "%1$s has joined your group %2$s on %3$s"
 msgstr ""


@@ -9698,14 +9024,14 @@ msgstr ""
 #. TRANS: %1$s is the subscriber's long name, %2$s is the group name, and %3$s is the StatusNet sitename,
 #. TRANS: %4$s is a block of profile info about the subscriber.
 #. TRANS: %5$s is a link to the addressed user's e-mail settings.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the group name, and %3$s is the StatusNet sitename,
 #. TRANS: %4$s is a block of profile info about the subscriber.
 #. TRANS: %5$s is a link to the addressed user's e-mail settings.

-#: lib/mail.php:843
+#: lib/mail.php:797

 #, php-format
 msgid "%1$s has joined your group %2$s on %3$s."
 msgstr ""
 
 #. TRANS: Subject of pending group join request notification e-mail.
 #. TRANS: %1$s is the joining user's nickname, %2$s is the group name, and %3$s is the StatusNet sitename.
 #, php-format
 msgid "%1$s has joined your group %2$s on %3$s."
 msgstr ""
 
 #. TRANS: Subject of pending group join request notification e-mail.
 #. TRANS: %1$s is the joining user's nickname, %2$s is the group name, and %3$s is the StatusNet sitename.

-#: lib/mail.php:880
+#: lib/mail.php:834

 #, php-format
 msgid "%1$s wants to join your group %2$s on %3$s."
 msgstr ""
 #, php-format
 msgid "%1$s wants to join your group %2$s on %3$s."
 msgstr ""


@@ -9713,70 +9039,36 @@ msgstr ""
 #. TRANS: Main body of pending group join request notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the group name, and %3$s is the StatusNet sitename,
 #. TRANS: %4$s is the URL to the moderation queue page.
 #. TRANS: Main body of pending group join request notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the group name, and %3$s is the StatusNet sitename,
 #. TRANS: %4$s is the URL to the moderation queue page.

-#: lib/mail.php:888
+#: lib/mail.php:842

 #, php-format
 msgid ""
 "%1$s would like to join your group %2$s on %3$s. You may approve or reject "
 "their group membership at %4$s"
 msgstr ""
 
 #, php-format
 msgid ""
 "%1$s would like to join your group %2$s on %3$s. You may approve or reject "
 "their group membership at %4$s"
 msgstr ""
 

-#. TRANS: Client error displayed when trying to access a mailbox that is not of the logged in user.
-#: lib/mailbox.php:87
-msgid "Only the user can read their own mailboxes."
-msgstr ""
-
-#. TRANS: Message displayed when there are no private messages in the inbox of a user.
-#: lib/mailbox.php:120
-msgid ""
-"You have no private messages. You can send private message to engage other "
-"users in conversation. People can send you messages for your eyes only."
-msgstr ""
-
-#. TRANS: Menu item in mailbox menu. Leads to incoming private messages.
-#: lib/mailboxmenu.php:59
-msgctxt "MENU"
-msgid "Inbox"
-msgstr ""
-
-#. TRANS: Menu item title in mailbox menu. Leads to incoming private messages.
-#: lib/mailboxmenu.php:61
-msgid "Your incoming messages."
-msgstr ""
-
-#. TRANS: Menu item in mailbox menu. Leads to outgoing private messages.
-#: lib/mailboxmenu.php:66
-msgctxt "MENU"
-msgid "Outbox"
-msgstr ""
-
-#. TRANS: Menu item title in mailbox menu. Leads to outgoing private messages.
-#: lib/mailboxmenu.php:68
-msgid "Your sent messages."
-msgstr ""
-

 #. TRANS: Error message in incoming mail handler used when an incoming e-mail cannot be processed.
 #. TRANS: Error message in incoming mail handler used when an incoming e-mail cannot be processed.

-#: lib/mailhandler.php:38
+#: lib/mailhandler.php:37

 msgid "Could not parse message."
 msgstr ""
 
 #. TRANS: Error message in incoming mail handler used when an incoming e-mail is not from a registered user.
 msgid "Could not parse message."
 msgstr ""
 
 #. TRANS: Error message in incoming mail handler used when an incoming e-mail is not from a registered user.

-#: lib/mailhandler.php:44
+#: lib/mailhandler.php:43

 msgid "Not a registered user."
 msgstr ""
 
 #. TRANS: Error message in incoming mail handler used when an incoming e-mail is not from a user's incoming e-mail address.
 msgid "Not a registered user."
 msgstr ""
 
 #. TRANS: Error message in incoming mail handler used when an incoming e-mail is not from a user's incoming e-mail address.

-#: lib/mailhandler.php:49
+#: lib/mailhandler.php:48

 msgid "Sorry, that is not your incoming email address."
 msgstr ""
 
 #. TRANS: Error message in incoming mail handler used when no incoming e-mail is allowed.
 msgid "Sorry, that is not your incoming email address."
 msgstr ""
 
 #. TRANS: Error message in incoming mail handler used when no incoming e-mail is allowed.

-#: lib/mailhandler.php:54
+#: lib/mailhandler.php:53

 msgid "Sorry, no incoming email allowed."
 msgstr ""
 
 #. TRANS: Error message in incoming mail handler used when an incoming e-mail is of an unsupported type.
 #. TRANS: %s is the unsupported type.
 msgid "Sorry, no incoming email allowed."
 msgstr ""
 
 #. TRANS: Error message in incoming mail handler used when an incoming e-mail is of an unsupported type.
 #. TRANS: %s is the unsupported type.

-#: lib/mailhandler.php:235
+#: lib/mailhandler.php:234

 #, php-format
 msgid "Unsupported message type: %s."
 msgstr ""
 #, php-format
 msgid "Unsupported message type: %s."
 msgstr ""


@@ -9799,31 +9091,20 @@ msgid "Make this user an admin."
 msgstr ""
 
 #. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
 msgstr ""
 
 #. TRANS: Client exception thrown when a database error was thrown during a file upload operation.

-#: lib/mediafile.php:102 lib/mediafile.php:174
+#: lib/mediafile.php:108 lib/mediafile.php:154

 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
 
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
 

-#. TRANS: Client exception thrown when a file upload operation would cause a user to exceed a set quota.
-#: lib/mediafile.php:238 lib/mediafile.php:281
-msgid "File exceeds user's quota."
-msgstr ""
-

 #. TRANS: Client exception thrown when a file upload operation fails because the file could
 #. TRANS: not be moved from the temporary folder to the permanent file location.
 #. TRANS: Client exception thrown when a file upload operation fails because the file could
 #. TRANS: not be moved from the temporary folder to the permanent file location.

-#: lib/mediafile.php:258 lib/mediafile.php:300
+#: lib/mediafile.php:221 lib/mediafile.php:244

 msgid "File could not be moved to destination directory."
 msgstr ""
 
 msgid "File could not be moved to destination directory."
 msgstr ""
 

-#. TRANS: Client exception thrown when a file upload operation has been stopped because the MIME
-#. TRANS: type of the uploaded file could not be determined.
-#: lib/mediafile.php:265 lib/mediafile.php:306
-msgid "Could not determine file's MIME type."
-msgstr ""
-

 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %1$s is the file type that was denied, %2$s is the application part of
 #. TRANS: the MIME type that was denied.
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %1$s is the file type that was denied, %2$s is the application part of
 #. TRANS: the MIME type that was denied.

-#: lib/mediafile.php:396
+#: lib/mediafile.php:301

 #, php-format
 msgid ""
 "\"%1$s\" is not a supported file type on this server. Try using another %2$s "
 #, php-format
 msgid ""
 "\"%1$s\" is not a supported file type on this server. Try using another %2$s "


@@ -9832,184 +9113,147 @@ msgstr ""
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %s is the file type that was denied.
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %s is the file type that was denied.

-#: lib/mediafile.php:401
+#: lib/mediafile.php:306

 #, php-format
 msgid "\"%s\" is not a supported file type on this server."
 msgstr ""
 
 #, php-format
 msgid "\"%s\" is not a supported file type on this server."
 msgstr ""
 

-#. TRANS: Form legend for direct notice.
-#: lib/messageform.php:114
-msgid "Send a direct notice"
-msgstr ""
-
-#. TRANS: Label entry in drop-down selection box in direct-message inbox/outbox.
-#. TRANS: This is the default entry in the drop-down box, doubling as instructions
-#. TRANS: and a brake against accidental submissions with the first user in the list.
-#: lib/messageform.php:132
-msgid "Select recipient:"
-msgstr ""
-
-#. TRANS: Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
-#: lib/messageform.php:145
-msgid "No mutual subscribers."
-msgstr ""
-
-#. TRANS: Dropdown label in direct notice form.
-#: lib/messageform.php:149
-msgid "To"
-msgstr ""
-
-#. TRANS: Button text for sending a direct notice.
-#: lib/messageform.php:179
-msgctxt "Send button for sending notice"
-msgid "Send"
-msgstr ""
-
-#. TRANS: Header in message list.
-#: lib/messagelist.php:77
-msgid "Messages"
-msgstr ""
-
-#. TRANS: Followed by notice source (usually the client used to send the notice).
-#. TRANS: Followed by notice source.
-#: lib/messagelistitem.php:123 lib/noticelistitem.php:526
-msgid "from"
-msgstr ""
-
-#. TRANS: A possible notice source (web interface).
-#: lib/messagelistitem.php:144 lib/noticelistitem.php:521
-msgctxt "SOURCE"
-msgid "web"
+#: lib/methodnotimplementedexception.php:48
+#, php-format
+msgid "Method %s not implemented"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: A possible notice source (XMPP).
-#: lib/messagelistitem.php:146
-msgctxt "SOURCE"
-msgid "xmpp"
+#. TRANS: Link description to show more items in a list.
+#: lib/moremenu.php:98
+msgid "More ▼"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: A possible notice source (e-mail).
-#: lib/messagelistitem.php:148
-msgctxt "SOURCE"
-msgid "mail"
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:244
+msgid "Nickname must have only lowercase letters and numbers and no spaces."

 msgstr ""
 
 msgstr ""
 

-#. TRANS: A possible notice source (OpenMicroBlogging).
-#: lib/messagelistitem.php:150
-msgctxt "SOURCE"
-msgid "omb"
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:257
+msgid "Nickname cannot be empty."

 msgstr ""
 
 msgstr ""
 

-#. TRANS: A possible notice source (Application Programming Interface).
-#: lib/messagelistitem.php:152
-msgctxt "SOURCE"
-msgid "api"
-msgstr ""
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:270
+#, php-format
+msgid "Nickname cannot be more than %d character long."
+msgid_plural "Nickname cannot be more than %d characters long."
+msgstr[0] ""
+msgstr[1] ""

 
 

-#. TRANS: Client exception thrown when no author for an activity was found.
-#: lib/microappplugin.php:358
-msgid "Cannot get author for activity."
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:282
+msgid "Nickname is disallowed through blacklist."

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Client exception thrown when ...
-#: lib/microappplugin.php:396
-msgid "Bookmark not posted to this group."
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:291
+msgid "Nickname is identical to system path names."

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Client exception when ...
-#: lib/microappplugin.php:410
-msgid "Object not posted to this user."
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:313
+msgid "Nickname is already in use on this server."

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Server exception thrown when a micro app plugin uses a target that cannot be handled.
-#: lib/microappplugin.php:414
-msgid "Do not know how to handle this kind of target."
+#. TRANS: Exception text shown when no profile can be found for a user.
+#. TRANS: %u is a profile ID (number).
+#: lib/noprofileexception.php:53
+#, php-format
+msgid "There is no profile with id==%u"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Server exception thrown when a micro app plugin developer has not done his job too well.
-#: lib/microappplugin.php:556
-msgid "You must implement either adaptNoticeListItem() or showNotice()."
+#: lib/noresultexception.php:40
+#, php-format
+msgid "No result found on %s lookup."

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Link description to show more items in a list.
-#: lib/moremenu.php:98
-msgid "More ▼"
+#: lib/nosuchgroupexception.php:65
+msgid "No such group found."

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:178
-msgid "Nickname cannot be empty."
+#: lib/nosuchuserexception.php:65
+msgid "No such user found."

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:191
-#, php-format
-msgid "Nickname cannot be more than %d character long."
-msgid_plural "Nickname cannot be more than %d characters long."
-msgstr[0] ""
-msgstr[1] ""
-

 #. TRANS: Form legend for notice form.
 #. TRANS: Form legend for notice form.

-#: lib/noticeform.php:194
+#: lib/noticeform.php:190

 msgid "Send a notice"
 msgstr ""
 
 #. TRANS: Title for notice label. %s is the user's nickname.
 msgid "Send a notice"
 msgstr ""
 
 #. TRANS: Title for notice label. %s is the user's nickname.

-#: lib/noticeform.php:208
+#: lib/noticeform.php:204

 #, php-format
 msgid "What's up, %s?"
 msgstr ""
 
 #, php-format
 msgid "What's up, %s?"
 msgstr ""
 

+#: lib/noticeform.php:208
+msgid "Share your status..."
+msgstr ""
+

 #. TRANS: Input label in notice form for adding an attachment.
 #. TRANS: Input label in notice form for adding an attachment.

-#: lib/noticeform.php:228
+#: lib/noticeform.php:226

 msgid "Attach"
 msgstr ""
 
 #. TRANS: Title for input field to attach a file to a notice.
 msgid "Attach"
 msgstr ""
 
 #. TRANS: Title for input field to attach a file to a notice.

-#: lib/noticeform.php:233
+#: lib/noticeform.php:231

 msgid "Attach a file."
 msgstr ""
 
 #. TRANS: Field label to add location to a notice.
 msgid "Attach a file."
 msgstr ""
 
 #. TRANS: Field label to add location to a notice.

-#: lib/noticeform.php:271
+#: lib/noticeform.php:269

 msgid "Share my location"
 msgstr ""
 
 #. TRANS: Text to not share location for a notice in notice form.
 msgid "Share my location"
 msgstr ""
 
 #. TRANS: Text to not share location for a notice in notice form.

-#: lib/noticeform.php:276
+#: lib/noticeform.php:274

 msgid "Do not share my location"
 msgstr ""
 
 #. TRANS: Timeout error text for location retrieval in notice form.
 msgid "Do not share my location"
 msgstr ""
 
 #. TRANS: Timeout error text for location retrieval in notice form.

-#: lib/noticeform.php:278
+#: lib/noticeform.php:276

 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
 msgstr ""
 
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
 msgstr ""
 

-#. TRANS: Separator in profile addressees list.
-#: lib/noticelistitem.php:255
-msgctxt "SEPARATOR"
-msgid ", "
+#. TRANS: Reference to the logged in user in favourite list.
+#: lib/noticelistactorsitem.php:43
+msgctxt "FAVELIST"
+msgid "You"
+msgstr ""
+
+#. TRANS: For building a list such as "Jim, Bob, Mary and 5 others like this".
+#. TRANS: %1$s is a list of users, separated by a separator (default: ", "), %2$s is the last user in the list.
+#: lib/noticelistactorsitem.php:81
+#, php-format
+msgctxt "FAVELIST"
+msgid "%1$s and %2$s"

 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of north.
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of north.

-#: lib/noticelistitem.php:449
+#: lib/noticelistitem.php:390

 msgid "N"
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of south.
 msgid "N"
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of south.

-#: lib/noticelistitem.php:451
+#: lib/noticelistitem.php:392

 msgid "S"
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of east.
 msgid "S"
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of east.

-#: lib/noticelistitem.php:453
+#: lib/noticelistitem.php:394

 msgid "E"
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of west.
 msgid "E"
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of west.

-#: lib/noticelistitem.php:455
+#: lib/noticelistitem.php:396

 msgid "W"
 msgstr ""
 
 msgid "W"
 msgstr ""
 


@@ -10018,53 +9262,67 @@ msgstr ""
 #. TRANS: %3$s is lattitude seconds, %4$s is N (north) or S (south) depending on lattitude,
 #. TRANS: %5$s is longitude degrees, %6$s is longitude minutes,
 #. TRANS: %7$s is longitude seconds, %8$s is E (east) or W (west) depending on longitude,
 #. TRANS: %3$s is lattitude seconds, %4$s is N (north) or S (south) depending on lattitude,
 #. TRANS: %5$s is longitude degrees, %6$s is longitude minutes,
 #. TRANS: %7$s is longitude seconds, %8$s is E (east) or W (west) depending on longitude,

-#: lib/noticelistitem.php:462
+#: lib/noticelistitem.php:403

 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr ""
 
 #. TRANS: Followed by geo location.
 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr ""
 
 #. TRANS: Followed by geo location.

-#: lib/noticelistitem.php:472
+#: lib/noticelistitem.php:413

 msgid "at"
 msgstr ""
 
 msgid "at"
 msgstr ""
 

-#. TRANS: Addition in notice list item if notice is part of a conversation.
-#: lib/noticelistitem.php:587
-msgid "in context"
+#. TRANS: A possible notice source (web interface).
+#: lib/noticelistitem.php:465
+msgctxt "SOURCE"
+msgid "web"
+msgstr ""
+
+#. TRANS: Followed by notice source.
+#: lib/noticelistitem.php:470
+msgid "from"
+msgstr ""
+
+#. TRANS: Addition in notice list item for single-notice view.
+#: lib/noticelistitem.php:524
+msgid "permalink"

 msgstr ""
 
 #. TRANS: Addition in notice list item if notice was repeated. Followed by a span with a nickname.
 msgstr ""
 
 #. TRANS: Addition in notice list item if notice was repeated. Followed by a span with a nickname.

-#: lib/noticelistitem.php:622
+#: lib/noticelistitem.php:548

 msgid "Repeated by"
 msgstr ""
 
 msgid "Repeated by"
 msgstr ""
 

-#: lib/noticelistitem.php:623
-msgid " "
-msgstr ""
-

 #. TRANS: Link title in notice list item to reply to a notice.
 #. TRANS: Link title in notice list item to reply to a notice.

-#: lib/noticelistitem.php:650
+#: lib/noticelistitem.php:573

 msgid "Reply to this notice."
 msgstr ""
 
 #. TRANS: Link text in notice list item to reply to a notice.
 msgid "Reply to this notice."
 msgstr ""
 
 #. TRANS: Link text in notice list item to reply to a notice.

-#: lib/noticelistitem.php:652
+#: lib/noticelistitem.php:575

 msgid "Reply"
 msgstr ""
 
 #. TRANS: Link title in notice list item to delete a notice.
 msgid "Reply"
 msgstr ""
 
 #. TRANS: Link title in notice list item to delete a notice.

-#: lib/noticelistitem.php:678
+#: lib/noticelistitem.php:601

 msgid "Delete this notice from the timeline."
 msgstr ""
 
 #. TRANS: Title for repeat form status in notice list when a notice has been repeated.
 msgid "Delete this notice from the timeline."
 msgstr ""
 
 #. TRANS: Title for repeat form status in notice list when a notice has been repeated.

-#: lib/noticelistitem.php:701
+#: lib/noticelistitem.php:624

 msgid "Notice repeated."
 msgstr ""
 
 msgid "Notice repeated."
 msgstr ""
 

-#. TRANS: Field label for notice text.
-#: lib/noticeplaceholderform.php:55
-msgid "Update your status..."
+#. TRANS: Repeat form status in notice list when a notice has been repeated.
+#: lib/noticelistitem.php:626
+msgid "Repeated"
+msgstr ""
+
+#. TRANS: Exception text shown when no uploaded media was provided in POST
+#. TRANS: %s is the HTML input field name.
+#: lib/nouploadedmediaexception.php:26
+#, php-format
+msgid "There is no uploaded media for input field \"%s\"."

 msgstr ""
 
 #. TRANS: Form legend of form to nudge/ping another user.
 msgstr ""
 
 #. TRANS: Form legend of form to nudge/ping another user.


@@ -10083,9 +9341,8 @@ msgstr ""
 msgid "Send a nudge to this user."
 msgstr ""
 
 msgid "Send a nudge to this user."
 msgstr ""
 

-#. TRANS: Server exception thrown in oEmbed action if no API endpoint is available.
-#: lib/oembedhelper.php:135
-msgid "No oEmbed API endpoint available."
+#: lib/passwordhashexception.php:39
+msgid "Password hashing failed."

 msgstr ""
 
 #. TRANS: Field label for list.
 msgstr ""
 
 #. TRANS: Field label for list.


@@ -10150,7 +9407,7 @@ msgstr ""
 
 #. TRANS: Menu item in list navigation panel.
 #. TRANS: Menu item in local navigation menu.
 
 #. TRANS: Menu item in list navigation panel.
 #. TRANS: Menu item in local navigation menu.

-#: lib/peopletaggroupnav.php:135 lib/subgroupnav.php:96
+#: lib/peopletaggroupnav.php:135 lib/subgroupnav.php:97

 msgctxt "MENU"
 msgid "Subscribers"
 msgstr ""
 msgctxt "MENU"
 msgid "Subscribers"
 msgstr ""


@@ -10186,7 +9443,7 @@ msgid "Edit"
 msgstr ""
 
 #. TRANS: Privacy mode text in list list item for private list.
 msgstr ""
 
 #. TRANS: Privacy mode text in list list item for private list.

-#: lib/peopletaglist.php:260
+#: lib/peopletaglist.php:253

 msgctxt "MODE"
 msgid "Private"
 msgstr ""
 msgctxt "MODE"
 msgid "Private"
 msgstr ""


@@ -10262,7 +9519,7 @@ msgstr ""
 
 #. TRANS: List summary. %1$d is the number of users in the list,
 #. TRANS: %2$d is the number of subscribers to the list.
 
 #. TRANS: List summary. %1$d is the number of users in the list,
 #. TRANS: %2$d is the number of subscribers to the list.

-#: lib/peopletagsection.php:125
+#: lib/peopletagsection.php:127

 #, php-format
 msgid "Listed: %1$d Subscribers: %2$d"
 msgstr ""
 #, php-format
 msgid "Listed: %1$d Subscribers: %2$d"
 msgstr ""


@@ -10288,47 +9545,24 @@ msgstr ""
 #. TRANS: Menu item in personal group navigation menu.
 #. TRANS: Menu item in settings navigation panel.
 #. TRANS: Menu item in local navigation menu.
 #. TRANS: Menu item in personal group navigation menu.
 #. TRANS: Menu item in settings navigation panel.
 #. TRANS: Menu item in local navigation menu.

-#: lib/personalgroupnav.php:82 lib/settingsnav.php:74 lib/subgroupnav.php:77
+#: lib/personalgroupnav.php:85 lib/settingsnav.php:74 lib/subgroupnav.php:78

 msgctxt "MENU"
 msgid "Profile"
 msgstr ""
 
 #. TRANS: Menu item title in personal group navigation menu.
 msgctxt "MENU"
 msgid "Profile"
 msgstr ""
 
 #. TRANS: Menu item title in personal group navigation menu.

-#: lib/personalgroupnav.php:84
+#: lib/personalgroupnav.php:87

 msgid "Your profile"
 msgstr ""
 
 #. TRANS: Menu item in personal group navigation menu.
 msgid "Your profile"
 msgstr ""
 
 #. TRANS: Menu item in personal group navigation menu.

-#: lib/personalgroupnav.php:90
+#: lib/personalgroupnav.php:93

 msgctxt "MENU"
 msgid "Replies"
 msgstr ""
 
 msgctxt "MENU"
 msgid "Replies"
 msgstr ""
 

-#. TRANS: Menu item in personal group navigation menu.
-#: lib/personalgroupnav.php:98
-msgctxt "MENU"
-msgid "Favorites"
-msgstr ""
-
-#. TRANS: Replaces %s in '%s\'s favorite notices'. (Yes, we know we need to fix this.)
-#: lib/personalgroupnav.php:104
-msgctxt "FIXME"
-msgid "User"
-msgstr ""
-
-#. TRANS: Menu item in personal group navigation menu.
-#: lib/personalgroupnav.php:115
-msgctxt "MENU"
-msgid "Messages"
-msgstr ""
-
-#. TRANS: Menu item title in personal group navigation menu.
-#: lib/personalgroupnav.php:117
-msgid "Your incoming messages"
-msgstr ""
-

 #. TRANS: Displayed as version information for a plugin if no version information was found.
 #. TRANS: Displayed as version information for a plugin if no version information was found.

-#: lib/plugin.php:126
+#: lib/plugin.php:187

 msgid "Unknown"
 msgstr ""
 
 msgid "Unknown"
 msgstr ""
 


@@ -10389,84 +9623,95 @@ msgstr ""
 msgid "Login to the site."
 msgstr ""
 
 msgid "Login to the site."
 msgstr ""
 

-#: lib/profileaction.php:93
+#. TRANS: Error message displayed when referring to a user without a profile.
+#: lib/profileaction.php:87
+msgid "Profile ID does not exist."
+msgstr ""
+
+#: lib/profileaction.php:100

 msgid "This profile has been silenced by site moderators"
 msgstr ""
 
 #. TRANS: H2 text for user subscription statistics.
 msgid "This profile has been silenced by site moderators"
 msgstr ""
 
 #. TRANS: H2 text for user subscription statistics.

-#: lib/profileaction.php:135
+#: lib/profileaction.php:148

 msgid "Following"
 msgstr ""
 
 #. TRANS: H2 text for user subscriber statistics.
 msgid "Following"
 msgstr ""
 
 #. TRANS: H2 text for user subscriber statistics.

-#: lib/profileaction.php:167
+#: lib/profileaction.php:176

 msgid "Followers"
 msgstr ""
 
 #. TRANS: H2 text for user statistics.
 msgid "Followers"
 msgstr ""
 
 #. TRANS: H2 text for user statistics.

-#: lib/profileaction.php:203
+#: lib/profileaction.php:210

 msgid "Statistics"
 msgstr ""
 
 #. TRANS: Label for user statistics.
 msgid "Statistics"
 msgstr ""
 
 #. TRANS: Label for user statistics.

-#: lib/profileaction.php:211
+#: lib/profileaction.php:218

 msgid "User ID"
 msgstr ""
 
 #. TRANS: Label for user statistics.
 msgid "User ID"
 msgstr ""
 
 #. TRANS: Label for user statistics.

-#: lib/profileaction.php:217
+#: lib/profileaction.php:224

 msgid "Member since"
 msgstr ""
 
 #. TRANS: Label for user statistics.
 msgid "Member since"
 msgstr ""
 
 #. TRANS: Label for user statistics.

-#. TRANS: Average count of posts made per day since account registration.

 #: lib/profileaction.php:230
 #: lib/profileaction.php:230

+msgid "Notices"
+msgstr ""
+
+#. TRANS: Label for user statistics.
+#. TRANS: Average count of posts made per day since account registration.
+#: lib/profileaction.php:237

 msgid "Daily average"
 msgstr ""
 
 #. TRANS: H2 text for user group membership statistics.
 msgid "Daily average"
 msgstr ""
 
 #. TRANS: H2 text for user group membership statistics.

-#: lib/profileaction.php:267
+#: lib/profileaction.php:274

 msgid "Groups"
 msgstr ""
 
 #. TRANS: H2 text for user list membership statistics.
 msgid "Groups"
 msgstr ""
 
 #. TRANS: H2 text for user list membership statistics.

-#: lib/profileaction.php:305
+#: lib/profileaction.php:309

 msgid "Lists"
 msgstr ""
 
 #. TRANS: Server error displayed when using an unimplemented method.
 msgid "Lists"
 msgstr ""
 
 #. TRANS: Server error displayed when using an unimplemented method.

-#: lib/profileformaction.php:123
+#: lib/profileformaction.php:119

 msgid "Unimplemented method."
 msgstr ""
 
 msgid "Unimplemented method."
 msgstr ""
 

+#. TRANS: Exception text shown when no profile can be found for a user.
+#. TRANS: %1$s is a user nickname, $2$d is a user ID (number).
+#: lib/profilenoaccturiexception.php:53
+#, php-format
+msgid "Could not get an acct: URI for profile with id==%u"
+msgstr ""
+

 #. TRANS: Menu item title in search group navigation panel.
 #. TRANS: Menu item title in search group navigation panel.

-#: lib/publicgroupnav.php:75
+#: lib/publicgroupnav.php:71

 msgid "User groups"
 msgstr ""
 
 #. TRANS: Menu item in search group navigation panel.
 msgid "User groups"
 msgstr ""
 
 #. TRANS: Menu item in search group navigation panel.

-#: lib/publicgroupnav.php:79
+#: lib/publicgroupnav.php:75

 msgctxt "MENU"
 msgid "Recent tags"
 msgstr ""
 
 #. TRANS: Menu item title in search group navigation panel.
 msgctxt "MENU"
 msgid "Recent tags"
 msgstr ""
 
 #. TRANS: Menu item title in search group navigation panel.

-#: lib/publicgroupnav.php:81
+#: lib/publicgroupnav.php:77

 msgid "Recent tags"
 msgstr ""
 
 #. TRANS: Menu item in search group navigation panel.
 msgid "Recent tags"
 msgstr ""
 
 #. TRANS: Menu item in search group navigation panel.

-#: lib/publicgroupnav.php:86
+#: lib/publicgroupnav.php:82

 msgctxt "MENU"
 msgid "Featured"
 msgstr ""
 
 msgctxt "MENU"
 msgid "Featured"
 msgstr ""
 

-#. TRANS: Menu item in search group navigation panel.
-#: lib/publicgroupnav.php:93
-msgctxt "MENU"
-msgid "Popular"
-msgstr ""
-

 #. TRANS: Title for inbox tag cloud section.
 #: lib/publictagcloudsection.php:53
 msgctxt "TITLE"
 #. TRANS: Title for inbox tag cloud section.
 #: lib/publictagcloudsection.php:53
 msgctxt "TITLE"


@@ -10479,12 +9724,12 @@ msgid "No return-to arguments."
 msgstr ""
 
 #. TRANS: For legend for notice repeat form.
 msgstr ""
 
 #. TRANS: For legend for notice repeat form.

-#: lib/repeatform.php:102
+#: lib/repeatform.php:91

 msgid "Repeat this notice?"
 msgstr ""
 
 #. TRANS: Button title to repeat a notice on notice repeat form.
 msgid "Repeat this notice?"
 msgstr ""
 
 #. TRANS: Button title to repeat a notice on notice repeat form.

-#: lib/repeatform.php:128
+#: lib/repeatform.php:117

 msgid "Repeat this notice."
 msgstr ""
 
 msgid "Repeat this notice."
 msgstr ""
 


@@ -10495,7 +9740,7 @@ msgid "Revoke the \"%s\" role from this user"
 msgstr ""
 
 #. TRANS: Client error on action trying to visit a non-existing page.
 msgstr ""
 
 #. TRANS: Client error on action trying to visit a non-existing page.

-#: lib/router.php:1140
+#: lib/router.php:1128

 msgid "Page not found."
 msgstr ""
 
 msgid "Page not found."
 msgstr ""
 


@@ -10511,26 +9756,26 @@ msgid "Sandbox this user"
 msgstr ""
 
 #. TRANS: Fieldset legend for the search form.
 msgstr ""
 
 #. TRANS: Fieldset legend for the search form.

-#: lib/searchaction.php:106
+#: lib/searchaction.php:102

 msgid "Search site"
 msgstr ""
 
 #. TRANS: Used as a field label for the field where one or more keywords
 #. TRANS: for searching can be entered.
 msgid "Search site"
 msgstr ""
 
 #. TRANS: Used as a field label for the field where one or more keywords
 #. TRANS: for searching can be entered.

-#: lib/searchaction.php:114
+#: lib/searchaction.php:110

 msgid "Keyword(s)"
 msgstr ""
 
 #. TRANS: Button text for searching site.
 #. TRANS: Button text for search button on search form.
 #. TRANS: Button text to search profiles.
 msgid "Keyword(s)"
 msgstr ""
 
 #. TRANS: Button text for searching site.
 #. TRANS: Button text for search button on search form.
 #. TRANS: Button text to search profiles.

-#: lib/searchaction.php:116 lib/searchform.php:76 lib/togglepeopletag.php:134
+#: lib/searchaction.php:112 lib/searchform.php:76 lib/togglepeopletag.php:134

 msgctxt "BUTTON"
 msgid "Search"
 msgstr ""
 
 #. TRANS: Standard search suggestions shown when a search does not give any results.
 msgctxt "BUTTON"
 msgid "Search"
 msgstr ""
 
 #. TRANS: Standard search suggestions shown when a search does not give any results.

-#: lib/searchaction.php:129
+#: lib/searchaction.php:125

 msgid ""
 "* Make sure all words are spelled correctly.\n"
 "* Try different keywords.\n"
 msgid ""
 "* Make sure all words are spelled correctly.\n"
 "* Try different keywords.\n"


@@ -10539,17 +9784,17 @@ msgid ""
 msgstr ""
 
 #. TRANS: Standard search suggestions shown when a search does not give any results.
 msgstr ""
 
 #. TRANS: Standard search suggestions shown when a search does not give any results.

-#: lib/searchaction.php:140
+#: lib/searchaction.php:136

 #, php-format
 msgid ""
 "You can also try your search on other engines:\n"
 "\n"
 #, php-format
 msgid ""
 "You can also try your search on other engines:\n"
 "\n"

-"* [Twingly](http://www.twingly.com/search?q=%s&content=microblog&site=%%%%"
-"site.server%%%%)\n"
-"* [Tweet scan](http://www.tweetscan.com/indexi.php?s=%s)\n"
-"* [Google](http://www.google.com/search?q=site%%3A%%%%site.server%%%%+%s)\n"
-"* [Yahoo](http://search.yahoo.com/search?p=site%%3A%%%%site.server%%%%+%s)\n"
-"* [Collecta](http://collecta.com/#q=%s)"
+"* [DuckDuckGo](https://duckduckgo.com/?q=site%%3A%%%%site.server%%%%+%s)\n"
+"* [Ixquick](https://ixquick.com/do/search?query=site%%3A%%%%site.server%%%%+"
+"%s)\n"
+"* [Google](https://www.google.com/search?q=site%%3A%%%%site.server%%%%+%s)\n"
+"* [Yahoo!](https://search.yahoo.com/search?p=site%%3A%%%%site.server%%%%+"
+"%s)\n"

 msgstr ""
 
 #. TRANS: Menu item in search group navigation panel.
 msgstr ""
 
 #. TRANS: Menu item in search group navigation panel.


@@ -10604,12 +9849,12 @@ msgid "Version"
 msgstr ""
 
 #. TRANS: Default title for section/sidebar widget.
 msgstr ""
 
 #. TRANS: Default title for section/sidebar widget.

-#: lib/section.php:105
+#: lib/section.php:98

 msgid "Untitled section"
 msgstr ""
 
 #. TRANS: Default "More..." title for section/sidebar widget.
 msgid "Untitled section"
 msgstr ""
 
 #. TRANS: Default "More..." title for section/sidebar widget.

-#: lib/section.php:129
+#: lib/section.php:122

 msgid "More..."
 msgstr ""
 
 msgid "More..."
 msgstr ""
 


@@ -10723,104 +9968,63 @@ msgstr ""
 msgid "Silence this user"
 msgstr ""
 
 msgid "Silence this user"
 msgstr ""
 

-#. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
-#: lib/statusnetoauthstore.php:48
-msgid "Could not create anonymous consumer."
-msgstr ""
-
-#. TRANS: Server error displayed when trying to create an anynymous OAuth application.
-#: lib/statusnetoauthstore.php:72
-msgid "Could not create anonymous OAuth application."
-msgstr ""
-
-#. TRANS: Exception thrown when no token association could be found.
-#: lib/statusnetoauthstore.php:154
-msgid ""
-"Could not find a profile and application associated with the request token."
-msgstr ""
-
-#. TRANS: Exception thrown when no access token can be issued.
-#: lib/statusnetoauthstore.php:212
-msgid "Could not issue access token."
-msgstr ""
-
-#. TRANS: Exception thrown when a database error occurs.
-#: lib/statusnetoauthstore.php:320
-msgid "Database error inserting OAuth application user."
-msgstr ""
-
-#. TRANS: Exception thrown when a database error occurs.
-#: lib/statusnetoauthstore.php:348
-msgid "Database error updating OAuth application user."
-msgstr ""
-
-#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-#: lib/statusnetoauthstore.php:374
-msgid "Tried to revoke unknown token."
-msgstr ""
-
-#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-#: lib/statusnetoauthstore.php:379
-msgid "Failed to delete revoked token."
-msgstr ""
-

 #. TRANS: Menu item in local navigation menu.
 #. TRANS: Menu item in local navigation menu.

-#: lib/subgroupnav.php:85
+#: lib/subgroupnav.php:86

 msgctxt "MENU"
 msgid "Subscriptions"
 msgstr ""
 
 #. TRANS: Menu item title in local navigation menu.
 #. TRANS: %s is a user nickname.
 msgctxt "MENU"
 msgid "Subscriptions"
 msgstr ""
 
 #. TRANS: Menu item title in local navigation menu.
 #. TRANS: %s is a user nickname.

-#: lib/subgroupnav.php:88
+#: lib/subgroupnav.php:89

 #, php-format
 msgid "People %s subscribes to."
 msgstr ""
 
 #. TRANS: Menu item title in local navigation menu.
 #. TRANS: %s is a user nickname.
 #, php-format
 msgid "People %s subscribes to."
 msgstr ""
 
 #. TRANS: Menu item title in local navigation menu.
 #. TRANS: %s is a user nickname.

-#: lib/subgroupnav.php:99
+#: lib/subgroupnav.php:100

 #, php-format
 msgid "People subscribed to %s."
 msgstr ""
 
 #. TRANS: Menu item in local navigation menu.
 #. TRANS: %d is the number of pending subscription requests.
 #, php-format
 msgid "People subscribed to %s."
 msgstr ""
 
 #. TRANS: Menu item in local navigation menu.
 #. TRANS: %d is the number of pending subscription requests.

-#: lib/subgroupnav.php:112
+#: lib/subgroupnav.php:113

 #, php-format
 msgctxt "MENU"
 msgid "Pending (%d)"
 msgstr ""
 
 #. TRANS: Menu item title in local navigation menu.
 #, php-format
 msgctxt "MENU"
 msgid "Pending (%d)"
 msgstr ""
 
 #. TRANS: Menu item title in local navigation menu.

-#: lib/subgroupnav.php:114
+#: lib/subgroupnav.php:115

 #, php-format
 msgid "Approve pending subscription requests."
 msgstr ""
 
 #. TRANS: Menu item title in local navigation menu.
 #. TRANS: %s is a user nickname.
 #, php-format
 msgid "Approve pending subscription requests."
 msgstr ""
 
 #. TRANS: Menu item title in local navigation menu.
 #. TRANS: %s is a user nickname.

-#: lib/subgroupnav.php:127
+#: lib/subgroupnav.php:128

 #, php-format
 msgid "Groups %s is a member of."
 msgstr ""
 
 #. TRANS: Menu item title in local navigation menu.
 #. TRANS: %s is a user nickname.
 #, php-format
 msgid "Groups %s is a member of."
 msgstr ""
 
 #. TRANS: Menu item title in local navigation menu.
 #. TRANS: %s is a user nickname.

-#: lib/subgroupnav.php:138
+#: lib/subgroupnav.php:139

 #, php-format
 msgid "List subscriptions by %s."
 msgstr ""
 
 #. TRANS: Menu item in local navigation menu.
 #, php-format
 msgid "List subscriptions by %s."
 msgstr ""
 
 #. TRANS: Menu item in local navigation menu.

-#: lib/subgroupnav.php:146
+#: lib/subgroupnav.php:147

 msgctxt "MENU"
 msgid "Invite"
 msgstr ""
 
 #. TRANS: Menu item title in local navigation menu.
 #. TRANS: %s is the StatusNet sitename.
 msgctxt "MENU"
 msgid "Invite"
 msgstr ""
 
 #. TRANS: Menu item title in local navigation menu.
 #. TRANS: %s is the StatusNet sitename.

-#: lib/subgroupnav.php:149
+#: lib/subgroupnav.php:150

 #, php-format
 msgid "Invite friends and colleagues to join you on %s."
 msgstr ""
 #, php-format
 msgid "Invite friends and colleagues to join you on %s."
 msgstr ""


@@ -10860,6 +10064,19 @@ msgctxt "NOTAGS"
 msgid "None"
 msgstr ""
 
 msgid "None"
 msgstr ""
 

+#. TRANS: Field label on list form.
+#: lib/tagprofileform.php:130
+msgctxt "LABEL"
+msgid "Lists"
+msgstr ""
+
+#. TRANS: Field title on list form.
+#: lib/tagprofileform.php:133
+msgid ""
+"Lists for this user (letters, numbers, -, ., and _), comma- or space- "
+"separated."
+msgstr ""
+

 #. TRANS: Server exception displayed if a theme name was invalid.
 #: lib/theme.php:79
 msgid "Invalid theme name."
 #. TRANS: Server exception displayed if a theme name was invalid.
 #: lib/theme.php:79
 msgid "Invalid theme name."


@@ -10928,62 +10145,22 @@ msgid "Error opening theme archive."
 msgstr ""
 
 #. TRANS: Header for Notices section.
 msgstr ""
 
 #. TRANS: Header for Notices section.

-#: lib/threadednoticelist.php:76
+#: lib/threadednoticelist.php:74

 msgctxt "HEADER"
 msgid "Notices"
 msgstr ""
 
 #. TRANS: Link to show replies for a notice.
 #. TRANS: %d is the number of replies to a notice and used for plural.
 msgctxt "HEADER"
 msgid "Notices"
 msgstr ""
 
 #. TRANS: Link to show replies for a notice.
 #. TRANS: %d is the number of replies to a notice and used for plural.

-#: lib/threadednoticelist.php:371
+#: lib/threadednoticelist.php:378

 #, php-format
 msgid "Show reply"
 msgid_plural "Show all %d replies"
 msgstr[0] ""
 msgstr[1] ""
 
 #, php-format
 msgid "Show reply"
 msgid_plural "Show all %d replies"
 msgstr[0] ""
 msgstr[1] ""
 

-#. TRANS: Reference to the logged in user in favourite list.
-#: lib/threadednoticelist.php:437
-msgctxt "FAVELIST"
-msgid "You"
-msgstr ""
-
-#. TRANS: For building a list such as "Jim, Bob, Mary and 5 others like this".
-#. TRANS: %1$s is a list of users, separated by a separator (default: ", "), %2$s is the last user in the list.
-#: lib/threadednoticelist.php:475
-#, php-format
-msgctxt "FAVELIST"
-msgid "%1$s and %2$s"
-msgstr ""
-
-#. TRANS: List message for notice favoured by logged in user.
-#: lib/threadednoticelist.php:509
-msgctxt "FAVELIST"
-msgid "You like this."
-msgstr ""
-
-#. TRANS: List message for when more than 4 people like something.
-#. TRANS: %%s is a list of users liking a notice, %d is the number over 4 that like the notice.
-#. TRANS: Plural is decided on the total number of users liking the notice (count of %%s + %d).
-#: lib/threadednoticelist.php:514
-#, php-format
-msgid "%%s and %d others like this."
-msgid_plural "%%s and %d others like this."
-msgstr[0] ""
-msgstr[1] ""
-
-#. TRANS: List message for favoured notices.
-#. TRANS: %%s is a list of users liking a notice.
-#. TRANS: Plural is based on the number of of users that have favoured a notice.
-#: lib/threadednoticelist.php:522
-#, php-format
-msgid "%%s likes this."
-msgid_plural "%%s like this."
-msgstr[0] ""
-msgstr[1] ""
-

 #. TRANS: List message for notice repeated by logged in user.
 #. TRANS: List message for notice repeated by logged in user.

-#: lib/threadednoticelist.php:586
+#: lib/threadednoticelist.php:455

 msgctxt "REPEATLIST"
 msgid "You repeated this."
 msgstr ""
 msgctxt "REPEATLIST"
 msgid "You repeated this."
 msgstr ""


@@ -10991,17 +10168,17 @@ msgstr ""
 #. TRANS: List message for when more than 4 people repeat something.
 #. TRANS: %%s is a list of users liking a notice, %d is the number over 4 that like the notice.
 #. TRANS: Plural is decided on the total number of users liking the notice (count of %%s + %d).
 #. TRANS: List message for when more than 4 people repeat something.
 #. TRANS: %%s is a list of users liking a notice, %d is the number over 4 that like the notice.
 #. TRANS: Plural is decided on the total number of users liking the notice (count of %%s + %d).

-#: lib/threadednoticelist.php:591
+#: lib/threadednoticelist.php:460

 #, php-format
 msgid "%%s and %d other repeated this."
 msgid_plural "%%s and %d others repeated this."
 msgstr[0] ""
 msgstr[1] ""
 
 #, php-format
 msgid "%%s and %d other repeated this."
 msgid_plural "%%s and %d others repeated this."
 msgstr[0] ""
 msgstr[1] ""
 

-#. TRANS: List message for favoured notices.
-#. TRANS: %%s is a list of users liking a notice.
-#. TRANS: Plural is based on the number of of users that have favoured a notice.
-#: lib/threadednoticelist.php:599
+#. TRANS: List message for repeated notices.
+#. TRANS: %%s is a list of users who have repeated a notice.
+#. TRANS: Plural is based on the number of of users that have repeated a notice.
+#: lib/threadednoticelist.php:468

 #, php-format
 msgid "%%s repeated this."
 msgid_plural "%%s repeated this."
 #, php-format
 msgid "%%s repeated this."
 msgid_plural "%%s repeated this."


@@ -11095,6 +10272,13 @@ msgctxt "TITLE"
 msgid "Unblock"
 msgstr ""
 
 msgid "Unblock"
 msgstr ""
 

+#. TRANS: Exception text shown when no object found with certain URI
+#. TRANS: %s is the URI.
+#: lib/unknownuriexception.php:43
+#, php-format
+msgid "No object found with URI \"%s\""
+msgstr ""
+

 #. TRANS: Title for unsandbox form.
 #: lib/unsandboxform.php:67
 msgctxt "TITLE"
 #. TRANS: Title for unsandbox form.
 #: lib/unsandboxform.php:67
 msgctxt "TITLE"


@@ -11133,30 +10317,23 @@ msgstr ""
 msgid "Unsubscribe from this user."
 msgstr ""
 
 msgid "Unsubscribe from this user."
 msgstr ""
 

-#. TRANS: Exception text shown when no profile can be found for a user.
-#. TRANS: %1$s is a user nickname, $2$d is a user ID (number).
-#: lib/usernoprofileexception.php:60
-#, php-format
-msgid "User %1$s (%2$d) has no profile record."
-msgstr ""
-

 #. TRANS: Authorisation exception thrown when a user a not allowed to login.
 #. TRANS: Authorisation exception thrown when a user a not allowed to login.

-#: lib/util.php:328
+#: lib/util.php:330

 msgid "Not allowed to log in."
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 msgid "Not allowed to log in."
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.

-#: lib/util.php:1346
+#: lib/util.php:1332

 msgid "a few seconds ago"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 msgid "a few seconds ago"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.

-#: lib/util.php:1349
+#: lib/util.php:1335

 msgid "about a minute ago"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 msgid "about a minute ago"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.

-#: lib/util.php:1353
+#: lib/util.php:1339

 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"


@@ -11164,12 +10341,12 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.

-#: lib/util.php:1356
+#: lib/util.php:1342

 msgid "about an hour ago"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 msgid "about an hour ago"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.

-#: lib/util.php:1360
+#: lib/util.php:1346

 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"


@@ -11177,12 +10354,12 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.

-#: lib/util.php:1363
+#: lib/util.php:1349

 msgid "about a day ago"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 msgid "about a day ago"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.

-#: lib/util.php:1367
+#: lib/util.php:1353

 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"


@@ -11190,12 +10367,12 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.

-#: lib/util.php:1370
+#: lib/util.php:1356

 msgid "about a month ago"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 msgid "about a month ago"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.

-#: lib/util.php:1374
+#: lib/util.php:1360

 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"


@@ -11203,10 +10380,15 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.

-#: lib/util.php:1377
+#: lib/util.php:1363

 msgid "about a year ago"
 msgstr ""
 
 msgid "about a year ago"
 msgstr ""
 

+#. TRANS: Human-readable full date-time specification (formatting on http://php.net/date)
+#: lib/util.php:1383
+msgid "l, d-M-Y H:i:s T"
+msgstr ""
+

 #. TRANS: Web color exception thrown when a hexadecimal color code does not validate.
 #. TRANS: %s is the provided (invalid) color code.
 #: lib/webcolor.php:81 lib/webcolor.php:121
 #. TRANS: Web color exception thrown when a hexadecimal color code does not validate.
 #. TRANS: %s is the provided (invalid) color code.
 #: lib/webcolor.php:81 lib/webcolor.php:121


@@ -11214,16 +10396,6 @@ msgstr ""
 msgid "%s is not a valid color! Use 3 or 6 hex characters."
 msgstr ""
 
 msgid "%s is not a valid color! Use 3 or 6 hex characters."
 msgstr ""
 

-#. TRANS: Exception.
-#: lib/xrd.php:63
-msgid "Invalid XML."
-msgstr ""
-
-#. TRANS: Exception.
-#: lib/xrd.php:68
-msgid "Invalid XML, missing XRD root."
-msgstr ""
-

 #. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
 #: scripts/restoreuser.php:62
 #, php-format
 #. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
 #: scripts/restoreuser.php:62
 #, php-format