Show more links work with AJAX-retrieved HTML

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

diff --git a/locale/statusnet.pot b/locale/statusnet.pot
index 7dcae950a095aecfd0ac6b3207982d37c785d1eb..ee5e0da1c15fb94fdf508f60e86b79ca308da110 100644 (file)
--- a/locale/statusnet.pot
+++ b/locale/statusnet.pot
@@ -8,7 +8,7 @@ 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: 2011-04-21 18:39+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"

 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"


@@ -18,7 +18,7 @@ msgstr ""
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
 #. TRANS: Database error message.
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
 #. TRANS: Database error message.

-#: index.php:110
+#: index.php:118

 #, php-format
 msgid ""
 "The database for %1$s is not responding correctly, so the site will not work "
 #, php-format
 msgid ""
 "The database for %1$s is not responding correctly, so the site will not work "


@@ -28,32 +28,25 @@ msgid ""
 msgstr ""
 
 #. TRANS: Error message.
 msgstr ""
 
 #. TRANS: Error message.

-#: index.php:121
-msgid ""
-"An important error occured, probably related to email setup. Check logfiles "
-"for more info."
-msgstr ""
-
-#. TRANS: Error message.
-#: index.php:131
+#: index.php:137

 msgid "An error occurred."
 msgstr ""
 
 #. TRANS: Error message displayed when there is no StatusNet configuration file.
 msgid "An error occurred."
 msgstr ""
 
 #. TRANS: Error message displayed when there is no StatusNet configuration file.

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

 #, 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:286
+#: index.php:301

 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:341 actions/recoverpassword.php:232
+#: index.php:356 actions/recoverpassword.php:232

 msgid "Unknown action"
 msgstr ""
 
 msgid "Unknown action"
 msgstr ""
 


@@ -80,7 +73,7 @@ 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.
 #. 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:185
+#: actions/accessadminpanel.php:157 actions/peopletagsbyuser.php:190

 #: lib/groupeditform.php:206
 msgctxt "LABEL"
 msgid "Private"
 #: lib/groupeditform.php:206
 msgctxt "LABEL"
 msgid "Private"


@@ -106,13 +99,12 @@ msgstr ""
 msgid "Closed"
 msgstr ""
 
 msgid "Closed"
 msgstr ""
 

-#. TRANS: Title for button to save access settings in site admin panel.
+#. TRANS: Button title to save access settings in site admin panel.

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

-msgid "Save access settings"
+msgid "Save access settings."

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Tooltip for button to save access settings in site admin panel.
-#. TRANS: Button text for saving theme settings.
+#. TRANS: Button text to save access settings in site admin panel.

 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
 #. TRANS: Button text in the license admin panel.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
 #. TRANS: Button text in the license admin panel.


@@ -128,18 +120,16 @@ msgstr ""
 #. 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: 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: Button text on profile design page to save settings.

 #. TRANS: Text for save button on group edit form.
 #. TRANS: Button text to save tags for a profile.
 #. TRANS: Text for save button on group edit form.
 #. TRANS: Button text to save tags for a profile.

-#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
-#: actions/emailsettings.php:251 actions/imsettings.php:201
-#: actions/licenseadminpanel.php:335 actions/pathsadminpanel.php:517
-#: actions/profilesettings.php:215 actions/sessionsadminpanel.php:202
-#: actions/siteadminpanel.php:319 actions/sitenoticeadminpanel.php:197
-#: actions/smssettings.php:204 actions/snapshotadminpanel.php:252
-#: actions/subscriptions.php:251 actions/tagprofile.php:169
-#: actions/urlsettings.php:152 actions/useradminpanel.php:300
-#: lib/applicationeditform.php:355 lib/designform.php:315
+#: actions/accessadminpanel.php:193 actions/emailsettings.php:251
+#: actions/imsettings.php:201 actions/licenseadminpanel.php:335
+#: actions/pathsadminpanel.php:454 actions/profilesettings.php:215
+#: actions/sessionsadminpanel.php:202 actions/siteadminpanel.php:373
+#: 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/useradminpanel.php:300 lib/applicationeditform.php:355

 #: lib/groupeditform.php:225 lib/peopletags.php:146
 msgctxt "BUTTON"
 msgid "Save"
 #: lib/groupeditform.php:225 lib/peopletags.php:146
 msgctxt "BUTTON"
 msgid "Save"


@@ -161,19 +151,17 @@ msgstr ""
 #: 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/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:66 actions/makeadmin.php:68 actions/newmessage.php:141
+#: 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/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:387
-#: actions/register.php:164 actions/remotesubscribe.php:78
-#: 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/userauthorization.php:54
-#: lib/designsettings.php:123
+#: 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

 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 


@@ -183,7 +171,7 @@ msgstr ""
 #: 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/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:121
+#: 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/pluginenable.php:99 actions/profilecompletion.php:92
 #: actions/removepeopletag.php:90 actions/subedit.php:33
 #: actions/subscribe.php:98 actions/unsubscribe.php:52


@@ -208,31 +196,24 @@ 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.
 #. 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:109
-#: actions/peopletagged.php:96 actions/peopletagsubscribers.php:96
+#: 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/profilecompletion.php:101 actions/profiletagbyid.php:67

-#: actions/removepeopletag.php:111 actions/showprofiletag.php:86
+#: actions/removepeopletag.php:111 actions/showprofiletag.php:90

 #: actions/subscribepeopletag.php:95 actions/unsubscribepeopletag.php:96
 msgid "No such list."
 msgstr ""
 
 #: actions/subscribepeopletag.php:95 actions/unsubscribepeopletag.php:96
 msgid "No such list."
 msgstr ""
 

-#. TRANS: Client error displayed when trying to add an OMB 0.1 remote profile to a list.
-#: actions/addpeopletag.php:121
-msgid "You cannot list an OMB 0.1 remote profile with this action."
-msgstr ""
-

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

-#. TRANS: Client error displayed when an unknown error occurs while listing a user.
-#. TRANS: %s is a username.
-#: actions/addpeopletag.php:150 actions/removepeopletag.php:152
+#: actions/addpeopletag.php:138

 #, 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:155
+#: actions/addpeopletag.php:143

 #, 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 "


@@ -240,7 +221,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: Title after adding a user to a list.
 msgstr ""
 
 #. TRANS: Title after adding a user to a list.

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

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


@@ -248,9 +229,9 @@ 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).
 #. 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:66 actions/public.php:104 actions/replies.php:93
-#: actions/showfavorites.php:140 actions/showprofiletag.php:100
-#: actions/tag.php:52
+#: actions/all.php:72 actions/public.php:110 actions/replies.php:96
+#: actions/showfavorites.php:140 actions/showprofiletag.php:104
+#: actions/tag.php:54

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


@@ -258,7 +239,6 @@ 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 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 when user not found updating a profile background image.

 #. 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 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.


@@ -284,14 +264,11 @@ msgstr ""
 #. 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 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 when trying to get a user hCard for a non-existing 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 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: Form validation error on page for remote subscribe when no user was provided.
-#. TRANS: Form validation error on page for remote subscribe when no user profile was found.

 #. 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 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.


@@ -300,15 +277,13 @@ msgstr ""
 #. 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: 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: Client error displayed providing a non-existing nickname.

 #. 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.
 #. 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:78 actions/allrss.php:69
+#: actions/all.php:84 actions/allrss.php:69

 #: actions/apiaccountupdatedeliverydevice.php:110
 #: actions/apiaccountupdateprofile.php:103
 #: actions/apiaccountupdatedeliverydevice.php:110
 #: actions/apiaccountupdateprofile.php:103

-#: actions/apiaccountupdateprofilebackgroundimage.php:118

 #: 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/apiaccountupdateprofileimage.php:104 actions/apiatomservice.php:59
 #: actions/apiblockcreate.php:96 actions/apiblockdestroy.php:94
 #: actions/apidirectmessage.php:75 actions/apidirectmessagenew.php:72


@@ -322,47 +297,41 @@ msgstr ""
 #: 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/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/hcard.php:67
-#: actions/microsummary.php:63 actions/newmessage.php:119 actions/otp.php:78
-#: actions/peopletagged.php:87 actions/peopletagsbyuser.php:97
-#: actions/peopletagsforuser.php:79 actions/peopletagsubscribers.php:87
-#: actions/peopletagsubscriptions.php:81 actions/remotesubscribe.php:156
-#: actions/remotesubscribe.php:166 actions/replies.php:72
-#: actions/repliesrss.php:38 actions/rsd.php:114 actions/showfavorites.php:106
-#: actions/showprofiletag.php:73 actions/showprofiletag.php:112
-#: actions/userbyid.php:75 actions/usergroups.php:95 actions/userrss.php:41
-#: actions/userxrd.php:60 actions/xrds.php:71 lib/command.php:624
-#: lib/galleryaction.php:61 lib/mailbox.php:79 lib/profileaction.php:77
+#: 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 ""
 
 msgid "No such user."
 msgstr ""
 

-#. TRANS: Page title. %1$s is user nickname, %2$d is page number
-#: actions/all.php:89
+#. TRANS: Title of a user's own start page.
+#: actions/all.php:96
+msgid "Home timeline"
+msgstr ""
+
+#. TRANS: Title of another user's start page.
+#. TRANS: %s is the other user's name.
+#: actions/all.php:101

 #, php-format
 #, php-format

-msgid "%1$s and friends, page %2$d"
+msgid "%s's home timeline"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Page title. %s is user nickname
-#. TRANS: H1 text for page. %s is a user nickname.
-#. 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: Timeline title for user and friends. %s is a user nickname.
-#. TRANS: Menu item title in administrator navigation panel.
-#. TRANS: %s is a username.
-#. TRANS: Menu item title in personal group navigation menu.
-#. TRANS: %s is a username.
-#. TRANS: Menu item title in settings navigation panel.
-#. TRANS: %s is a username.
-#: actions/all.php:92 actions/all.php:202 actions/allrss.php:110
-#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:113
-#: lib/adminpanelnav.php:73 lib/personalgroupnav.php:77 lib/settingsnav.php:73
+#. TRANS: %s is user nickname.
+#. TRANS: Feed title.
+#. TRANS: %s is tagger's nickname.
+#: actions/all.php:116 actions/showprofiletag.php:186

 #, php-format
 #, php-format

-msgid "%s and friends"
+msgid "Feed for friends of %s (Activity Streams JSON)"

 msgstr ""
 
 #. TRANS: %s is user nickname.
 msgstr ""
 
 #. TRANS: %s is user nickname.

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

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


@@ -370,19 +339,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:115 actions/showprofiletag.php:182
+#: actions/all.php:133 actions/showprofiletag.php:197

 #, 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:124
+#: actions/all.php:142

 #, 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:131
+#: actions/all.php:149

 #, 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."


@@ -390,7 +359,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:138
+#: actions/all.php:156

 #, 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 "


@@ -399,29 +368,46 @@ 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:142
+#: actions/all.php:160

 #, php-format
 msgid ""
 "You can try to [nudge %1$s](../%2$s) from their profile or [post something "
 "to them](%%%%action.newnotice%%%%?status_textarea=%3$s)."
 msgstr ""
 
 #, php-format
 msgid ""
 "You can try to [nudge %1$s](../%2$s) from their profile or [post something "
 "to them](%%%%action.newnotice%%%%?status_textarea=%3$s)."
 msgstr ""
 

-#. TRANS: Encoutagement displayed on empty timeline user pages for anonymous users.
+#. TRANS: Encouragement displayed on empty timeline user pages for anonymous users.

 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 #. TRANS: Empty list message for page with replies for a user for not logged in users.
 #. 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: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 #. TRANS: Empty list message for page with replies for a user for not logged in users.
 #. 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:147 actions/replies.php:214 actions/showstream.php:216
+#: actions/all.php:165 actions/replies.php:226 actions/showstream.php:241

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

-#. TRANS: H1 text for page when viewing a list for self.
-#: actions/all.php:199
-msgid "You and friends"
+#. 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
+msgctxt "BUTTON"
+msgid "Send invite"
+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: Timeline title for user and friends. %s is a user nickname.
+#. TRANS: Menu item title in administrator navigation panel.
+#. 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
+#, 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.
 msgstr ""
 
 #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.


@@ -438,31 +424,30 @@ msgstr ""
 #: actions/apiaccountratelimitstatus.php:70
 #: actions/apiaccountupdatedeliverydevice.php:92
 #: actions/apiaccountupdateprofile.php:94
 #: actions/apiaccountratelimitstatus.php:70
 #: actions/apiaccountupdatedeliverydevice.php:92
 #: actions/apiaccountupdateprofile.php:94

-#: actions/apiaccountupdateprofilebackgroundimage.php:92
-#: actions/apiaccountupdateprofilecolors.php:115
-#: actions/apiaccountverifycredentials.php:68 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:278
-#: actions/apitimelinegroup.php:148 actions/apitimelinehome.php:181
-#: actions/apitimelinelist.php:182 actions/apitimelinementions.php:182
-#: actions/apitimelinepublic.php:247 actions/apitimelineretweetedtome.php:150
-#: actions/apitimelineretweetsofme.php:149 actions/apitimelinetag.php:165
+#: 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
 msgid "API method not found."
 #: actions/apitimelineuser.php:217 actions/apiusershow.php:100
 #: lib/apilistusers.php:149
 msgid "API method not found."


@@ -474,8 +459,6 @@ msgstr ""
 #. TRANS: Client error. POST is a HTTP command. It should not be translated.
 #: actions/apiaccountupdatedeliverydevice.php:83
 #: actions/apiaccountupdateprofile.php:85
 #. TRANS: Client error. POST is a HTTP command. It should not be translated.
 #: actions/apiaccountupdatedeliverydevice.php:83
 #: actions/apiaccountupdateprofile.php:85

-#: actions/apiaccountupdateprofilebackgroundimage.php:83
-#: actions/apiaccountupdateprofilecolors.php:106

 #: 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/apiaccountupdateprofileimage.php:80 actions/apiblockcreate.php:87
 #: actions/apiblockdestroy.php:85 actions/apidirectmessagenew.php:107
 #: actions/apifavoritecreate.php:88 actions/apifavoritedestroy.php:88


@@ -502,38 +485,24 @@ msgstr ""
 #. 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 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 exception thrown on Profile design page when updating design settings fails.

 #: 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: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/urlsettings.php:213 actions/userdesignsettings.php:315
+#: actions/urlsettings.php:213

 msgid "Could not update user."
 msgstr ""
 
 msgid "Could not update user."
 msgstr ""
 

-#. TRANS: Client error displayed if a user profile could not be found.
-#. TRANS: Client error displayed when a user has no profile.
-#. TRANS: Client error displayed a user has no profile updating profile colours.
-#. TRANS: Client error displayed if a user profile could not be found updating a profile image.
-#. TRANS: Client error displayed when requesting user information for a user without a profile.
-#. TRANS: Client error displayed trying to get an avatar for a user without a profile.
-#. TRANS: Server error displayed when requesting Friends of a Friend feed for a user for which the profile could not be found.
-#. TRANS: Server error displayed when trying to get a user hCard for a user without a profile.
-#. TRANS: Server error displayed when a user has no profile.
-#. TRANS: Server error displayed when trying to reply to a user without a profile.
-#. TRANS: Server error displayed requesting groups for a user without a profile.
-#. TRANS: Server error displayed when trying to perform a gallery action with a user without a profile.
-#. TRANS: Server error displayed when calling a profile action while the specified user does not have a profile.
+#. TRANS: Error message displayed when referring to a user without a profile.

 #: actions/apiaccountupdateprofile.php:111
 #: actions/apiaccountupdateprofile.php:111

-#: actions/apiaccountupdateprofilebackgroundimage.php:199
-#: actions/apiaccountupdateprofilecolors.php:183

 #: actions/apiaccountupdateprofileimage.php:131
 #: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
 #: actions/apiaccountupdateprofileimage.php:131
 #: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108

-#: actions/avatarbynickname.php:85 actions/foaf.php:69 actions/hcard.php:75
-#: actions/peopletagsbyuser.php:105 actions/peopletagsforuser.php:87
-#: actions/peopletagsubscriptions.php:89 actions/replies.php:80
-#: actions/usergroups.php:103 lib/galleryaction.php:69
-#: lib/profileaction.php:85
+#: 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

 msgid "User has no profile."
 msgstr ""
 
 msgid "User has no profile."
 msgstr ""
 


@@ -545,13 +514,10 @@ 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.
 
 #. 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.

-#. TRANS: Form validation error in design settings form. POST should remain untranslated.
-#: actions/apiaccountupdateprofilebackgroundimage.php:108

 #: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
 #: actions/apistatusesupdate.php:210 actions/avatarsettings.php:271
 #: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
 #: actions/apistatusesupdate.php:210 actions/avatarsettings.php:271

-#: actions/designadminpanel.php:120 actions/editapplication.php:121
-#: actions/newapplication.php:102 actions/newnotice.php:94
-#: lib/designsettings.php:110
+#: actions/editapplication.php:121 actions/newapplication.php:102
+#: actions/newnotice.php:94

 #, 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 "


@@ -562,35 +528,6 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
 msgstr[0] ""
 msgstr[1] ""
 

-#. TRANS: Client error displayed when saving design settings fails because of an empty id.
-#. TRANS: Client error displayed when saving design settings fails because of an empty result.
-#. TRANS: Client error displayed when a database error occurs inserting profile colours.
-#. TRANS: Client error displayed when a database error occurs updating profile colours.
-#. TRANS: Form validation error displayed when group design settings could not be saved because of an application issue.
-#. TRANS: Form validation error on Profile design page when saving design settings has failed.
-#. TRANS: Form validation error on Profile design page when updating design settings has failed.
-#: actions/apiaccountupdateprofilebackgroundimage.php:138
-#: actions/apiaccountupdateprofilebackgroundimage.php:149
-#: actions/apiaccountupdateprofilecolors.php:160
-#: actions/apiaccountupdateprofilecolors.php:171
-#: actions/groupdesignsettings.php:295 actions/groupdesignsettings.php:306
-#: actions/userdesignsettings.php:222 actions/userdesignsettings.php:233
-#: actions/userdesignsettings.php:276 actions/userdesignsettings.php:287
-msgid "Unable to save your design settings."
-msgstr ""
-
-#. TRANS: Error displayed when updating design settings fails.
-#. TRANS: Client error displayed when a database error occurs updating profile colours.
-#. TRANS: Form validation error on Profile design page when updating design settings has failed.
-#. TRANS: Error message displayed if design settings could not be saved.
-#. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
-#: actions/apiaccountupdateprofilebackgroundimage.php:191
-#: actions/apiaccountupdateprofilecolors.php:139
-#: actions/userdesignsettings.php:199 lib/designsettings.php:217
-#: lib/designsettings.php:239
-msgid "Could not update your design."
-msgstr ""
-

 #. TRANS: Title for Atom feed.
 #: actions/apiatomservice.php:85
 msgctxt "ATOM"
 #. TRANS: Title for Atom feed.
 #: actions/apiatomservice.php:85
 msgctxt "ATOM"


@@ -602,7 +539,7 @@ msgstr ""
 #. 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
 #. 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/userrss.php:95 lib/atomgroupnoticefeed.php:63
+#: actions/userrss.php:93 lib/atomgroupnoticefeed.php:63

 #: lib/atomusernoticefeed.php:88
 #, php-format
 msgid "%s timeline"
 #: lib/atomusernoticefeed.php:88
 #, php-format
 msgid "%s timeline"


@@ -648,6 +585,23 @@ msgstr ""
 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."
+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
 #. TRANS: Title. %s is a user nickname.
 #: actions/apidirectmessage.php:88
 #, php-format


@@ -699,7 +653,10 @@ msgid "Cannot send direct messages to users who aren't your friend."
 msgstr ""
 
 #. TRANS: Client error displayed trying to direct message self (403).
 msgstr ""
 
 #. TRANS: Client error displayed trying to direct message self (403).

-#: actions/apidirectmessagenew.php:154
+#. 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 ""
 msgid ""
 "Do not send a message to yourself; just say it to yourself quietly instead."
 msgstr ""


@@ -779,7 +736,7 @@ msgstr ""
 #. 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
 #. 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:200 actions/newgroup.php:138
+#: 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 ""
 #: actions/profilesettings.php:293 actions/register.php:210
 msgid "Nickname already in use. Try another one."
 msgstr ""


@@ -791,7 +748,7 @@ msgstr ""
 #. 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
 #. 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:204 actions/newgroup.php:142
+#: actions/editgroup.php:198 actions/newgroup.php:142

 #: actions/profilesettings.php:263 actions/register.php:213
 msgid "Not a valid nickname."
 msgstr ""
 #: actions/profilesettings.php:263 actions/register.php:213
 msgid "Not a valid nickname."
 msgstr ""


@@ -805,7 +762,7 @@ msgstr ""
 #. 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
 #. 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:211
+#: 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."
 #: actions/newapplication.php:222 actions/newgroup.php:149
 #: actions/profilesettings.php:268 actions/register.php:222
 msgid "Homepage is not a valid URL."


@@ -818,7 +775,7 @@ msgstr ""
 #. 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
 #. 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:215 actions/newgroup.php:153
+#: 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 ""
 #: actions/profilesettings.php:272 actions/register.php:226
 msgid "Full name is too long (maximum 255 characters)."
 msgstr ""


@@ -837,8 +794,8 @@ msgstr ""
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed characters.
 #: actions/apigroupcreate.php:201 actions/apigroupprofileupdate.php:301
 #. 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:220
-#: actions/editpeopletag.php:265 actions/newapplication.php:183
+#: actions/editapplication.php:203 actions/editgroup.php:214
+#: actions/editpeopletag.php:269 actions/newapplication.php:183

 #: actions/newgroup.php:158
 #, php-format
 msgid "Description is too long (maximum %d character)."
 #: actions/newgroup.php:158
 #, php-format
 msgid "Description is too long (maximum %d character)."


@@ -853,7 +810,7 @@ msgstr[1] ""
 #. 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
 #. 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:227 actions/newgroup.php:165
+#: 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 ""
 #: actions/profilesettings.php:285 actions/register.php:238
 msgid "Location is too long (maximum 255 characters)."
 msgstr ""


@@ -867,7 +824,7 @@ msgstr ""
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
 #: actions/apigroupcreate.php:236 actions/apigroupprofileupdate.php:332
 #. 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:240 actions/newgroup.php:178
+#: actions/editgroup.php:234 actions/newgroup.php:178

 #, php-format
 msgid "Too many aliases! Maximum %d allowed."
 msgid_plural "Too many aliases! Maximum %d allowed."
 #, php-format
 msgid "Too many aliases! Maximum %d allowed."
 msgid_plural "Too many aliases! Maximum %d allowed."


@@ -890,14 +847,14 @@ msgstr ""
 #. 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
 #. 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:255 actions/newgroup.php:194
+#: 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.
 #, 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:262
+#: actions/apigroupcreate.php:278 actions/editgroup.php:256

 msgid "Alias can't be the same as nickname."
 msgstr ""
 
 msgid "Alias can't be the same as nickname."
 msgstr ""
 


@@ -933,7 +890,7 @@ 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:136 lib/command.php:359
+#: actions/apigroupjoin.php:133 actions/joingroup.php:140 lib/command.php:359

 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr ""
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr ""


@@ -947,7 +904,7 @@ 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:130
+#: actions/apigroupleave.php:124 actions/leavegroup.php:131

 #: lib/command.php:404
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 #: lib/command.php:404
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."


@@ -981,25 +938,23 @@ 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 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 trying to change group design settings without 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
 #. 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:176 actions/groupdesignsettings.php:109
-#: actions/grouplogo.php:111
+#: actions/editgroup.php:170 actions/grouplogo.php:111

 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:285
+#: actions/apigroupprofileupdate.php:173 actions/editgroup.php:279

 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:292
-#: classes/User_group.php:558
+#: actions/apigroupprofileupdate.php:196 actions/editgroup.php:286
+#: classes/User_group.php:624

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


@@ -1115,13 +1070,12 @@ msgid "Invalid nickname / password!"
 msgstr ""
 
 #. TRANS: Server error displayed when a database action fails.
 msgstr ""
 
 #. TRANS: Server error displayed when a database action fails.

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

 msgid "Database error inserting oauth_token_association."
 msgstr ""
 
 #. TRANS: Client error given on when invalid data was passed through a form in the OAuth API.
 #. TRANS: Unexpected validation error on avatar upload form.
 msgid "Database error inserting oauth_token_association."
 msgstr ""
 
 #. TRANS: Client error given on when invalid data was passed through a form in the OAuth API.
 #. TRANS: Unexpected validation error on avatar upload form.

-#. TRANS: Client error displayed when the submitted form contains unexpected data.

 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.


@@ -1130,29 +1084,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.

-#. TRANS: Unknown form validation error in design settings form.
-#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:297
-#: actions/designadminpanel.php:100 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 lib/designsettings.php:134
+#: 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

 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:387
+#: actions/apioauthauthorize.php:357

 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:404
+#: actions/apioauthauthorize.php:374

 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:425
+#: actions/apioauthauthorize.php:395

 #, 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 "


@@ -1163,7 +1115,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:433
+#: actions/apioauthauthorize.php:403

 #, 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 "


@@ -1172,21 +1124,18 @@ msgid ""
 msgstr ""
 
 #. TRANS: Fieldset legend.
 msgstr ""
 
 #. TRANS: Fieldset legend.

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

 msgctxt "LEGEND"
 msgid "Account"
 msgstr ""
 
 #. TRANS: Field label on OAuth API authorisation form.
 msgctxt "LEGEND"
 msgid "Account"
 msgstr ""
 
 #. TRANS: Field label on OAuth API authorisation form.

-#. TRANS: Field label on login page.

 #. TRANS: Field label in form for profile settings.
 #. TRANS: Field label on account registration page.
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Field label on account registration page.

-#. TRANS: Label for nickname on user authorisation page.

 #. TRANS: Field label on group edit form.
 #. TRANS: Dropdown option for searching in profiles.
 #. TRANS: Field label on group edit form.
 #. TRANS: Dropdown option for searching in profiles.

-#: actions/apioauthauthorize.php:459 actions/login.php:231
-#: actions/profilesettings.php:104 actions/register.php:438
-#: actions/userauthorization.php:147 lib/groupeditform.php:147
+#: actions/apioauthauthorize.php:429 actions/profilesettings.php:104
+#: actions/register.php:438 lib/groupeditform.php:147

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


@@ -1194,7 +1143,7 @@ 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:463 actions/login.php:235
+#: actions/apioauthauthorize.php:433 actions/login.php:235

 #: actions/register.php:444
 msgid "Password"
 msgstr ""
 #: actions/register.php:444
 msgid "Password"
 msgstr ""


@@ -1205,7 +1154,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:478 actions/emailsettings.php:125
+#: actions/apioauthauthorize.php:448 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"


@@ -1213,35 +1162,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:485
+#: actions/apioauthauthorize.php:455

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

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

 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:594
+#: actions/apioauthauthorize.php:564

 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:598
+#: actions/apioauthauthorize.php:568

 #, 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:621
+#: actions/apioauthauthorize.php:591

 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:625
+#: actions/apioauthauthorize.php:595

 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."


@@ -1249,14 +1198,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:632
+#: actions/apioauthauthorize.php:602

 #, 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:639
+#: actions/apioauthauthorize.php:609

 #, 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 "


@@ -1459,7 +1408,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:63
+#: actions/apitimelinetag.php:101 actions/tag.php:65

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


@@ -1557,12 +1506,9 @@ msgstr ""
 #. TRANS: Client error displayed when requesting Friends of a Friend feed for a nickname that is not a group.
 #. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing group.
 #. TRANS: Client error displayed referring to a group's permalink for a non-existing group ID.
 #. TRANS: Client error displayed when requesting Friends of a Friend feed for a nickname that is not a group.
 #. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing group.
 #. TRANS: Client error displayed referring to a group's permalink for a non-existing group ID.

-#. TRANS: Client error displayed trying to change group design settings while providing a nickname for a non-existing group.

 #. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
 #. TRANS: Client error displayed when trying to view group members for a non-existing group.
 #. TRANS: Client error displayed when trying to view group members for an object that is not a group.
 #. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
 #. TRANS: Client error displayed when trying to view group members for a non-existing group.
 #. TRANS: Client error displayed when trying to view group members for an object that is not a group.

-#. TRANS: Client error displayed when trying to view group members for a non-existing group.
-#. TRANS: Client error displayed when trying to view group members for an object that is not a group.

 #. TRANS: Client error displayed when requesting a group RSS feed for group that does not exist.
 #. TRANS: Client error displayed when requesting a group RSS feed for an object that is not a group.
 #. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
 #. TRANS: Client error displayed when requesting a group RSS feed for group that does not exist.
 #. TRANS: Client error displayed when requesting a group RSS feed for an object that is not a group.
 #. TRANS: Client error displayed when trying to unblock a user from a non-existing group.


@@ -1571,10 +1517,10 @@ msgstr ""
 #. TRANS: Client error displayed when trying to leave a non-local group.
 #. TRANS: Client error displayed when trying to leave a non-existing group.
 #. TRANS: Client error displayed when providing an invalid group ID on the Make Admin page.
 #. TRANS: Client error displayed when trying to leave a non-local group.
 #. TRANS: Client error displayed when trying to leave a non-existing group.
 #. TRANS: Client error displayed when providing an invalid group ID on the Make Admin page.

-#. 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: Command exception text shown when a group is requested that does not exist.
 #. TRANS: Error text shown when trying to leave a group that does not exist.
 #. TRANS: Command exception text shown when a group is requested that does not exist.
 #. 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/approvegroup.php:82 actions/approvegroup.php:95
 #: actions/atompubshowmembership.php:81 actions/blockedfromgroup.php:81
 #: actions/blockedfromgroup.php:89 actions/cancelgroup.php:81


@@ -1582,14 +1528,12 @@ msgstr ""
 #: 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/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/groupdesignsettings.php:101 actions/grouplogo.php:103
-#: actions/groupmembers.php:84 actions/groupmembers.php:92
-#: 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
-#: actions/showgroup.php:136 actions/showgroup.php:145 lib/command.php:168
-#: lib/command.php:389
+#: 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

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


@@ -1635,13 +1579,13 @@ msgstr ""
 
 #. TRANS: Client error displayed trying to approve/deny group membership.
 #. TRANS: Client error displayed trying to approve/deny subscription.
 
 #. 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:83
+#: actions/approvegroup.php:132 actions/approvesub.php:84

 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:87
+#: actions/approvegroup.php:136 actions/approvesub.php:88

 msgid "Internal error: received both cancel and abort."
 msgstr ""
 
 msgid "Internal error: received both cancel and abort."
 msgstr ""
 


@@ -1671,33 +1615,34 @@ msgid "Join request canceled."
 msgstr ""
 
 #. TRANS: Client error displayed trying to approve subscription for a non-existing request.
 msgstr ""
 
 #. TRANS: Client error displayed trying to approve subscription for a non-existing request.

-#: actions/approvesub.php:76
+#. TRANS: %s is a user nickname.
+#: actions/approvesub.php:77

 #, 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:116
+#: actions/approvesub.php:117

 #, 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:126
+#: actions/approvesub.php:127

 #, 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:132
+#: actions/approvesub.php:133

 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:135
+#: actions/approvesub.php:136

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


@@ -1853,15 +1798,13 @@ msgstr ""
 #. TRANS: Client error displayed trying to get an avatar without providing a nickname.
 #. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
 #. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
 #. TRANS: Client error displayed trying to get an avatar without providing a nickname.
 #. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
 #. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.

-#. TRANS: Client error displayed trying to change group design settings without providing a group nickname.

 #. TRANS: Client error displayed when trying to change group logo settings without providing a nickname.
 #. 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
 #. TRANS: Client error displayed when trying to change group logo settings without providing a nickname.
 #. 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/groupdesignsettings.php:84
-#: actions/grouplogo.php:86 actions/groupmembers.php:76
-#: actions/groupqueue.php:77 actions/grouprss.php:89 actions/showgroup.php:118
+#: actions/editgroup.php:85 actions/grouplogo.php:86 actions/groupqueue.php:77
+#: actions/grouprss.php:89 lib/groupaction.php:69

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


@@ -1887,18 +1830,6 @@ msgstr ""
 msgid "You can upload your personal avatar. The maximum file size is %s."
 msgstr ""
 
 msgid "You can upload your personal avatar. The maximum file size is %s."
 msgstr ""
 

-#. TRANS: Server error displayed in avatar upload page when no matching profile can be found for a user.
-#. TRANS: Server error displayed coming across a request from a user without a profile.
-#. TRANS: Server error displayed on page for remote subscribe when user does not have a matching profile.
-#. TRANS: Server error displayed when trying to authorise a remote subscription request
-#. TRANS: while the user has no profile.
-#. TRANS: Server error displayed in user RSS when user does not have a matching profile.
-#: actions/avatarsettings.php:108 actions/avatarsettings.php:194
-#: actions/grouplogo.php:184 actions/remotesubscribe.php:209
-#: actions/userauthorization.php:76 actions/userrss.php:110
-msgid "User without matching profile."
-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.


@@ -2046,7 +1977,7 @@ msgstr ""
 #. 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
 #. 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:174
+#: actions/deleteuser.php:154 actions/editpeopletag.php:178

 #: actions/groupblock.php:188
 msgctxt "BUTTON"
 msgid "No"
 #: actions/groupblock.php:188
 msgctxt "BUTTON"
 msgid "No"


@@ -2066,7 +1997,7 @@ msgstr ""
 #. 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
 #. 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:178
+#: actions/deleteuser.php:161 actions/editpeopletag.php:182

 #: actions/groupblock.php:195 lib/repeatform.php:126
 msgctxt "BUTTON"
 msgid "Yes"
 #: actions/groupblock.php:195 lib/repeatform.php:126
 msgctxt "BUTTON"
 msgid "Yes"


@@ -2102,19 +2033,19 @@ msgid "A list of the users blocked from joining this group."
 msgstr ""
 
 #. TRANS: Form legend for unblocking a user from a group.
 msgstr ""
 
 #. TRANS: Form legend for unblocking a user from a group.

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

 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:323
+#: actions/blockedfromgroup.php:317

 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:327 lib/unblockform.php:78
+#: actions/blockedfromgroup.php:321 lib/unblockform.php:78

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


@@ -2128,7 +2059,7 @@ 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:139
+#: actions/cancelgroup.php:157 actions/leavegroup.php:140

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


@@ -2222,6 +2153,18 @@ msgstr ""
 msgid "Conversation"
 msgstr ""
 
 msgid "Conversation"
 msgstr ""
 

+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#: actions/conversation.php:152 actions/conversation.php:168
+msgid "Conversation feed (Activity Streams JSON)"
+msgstr ""
+
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#: actions/conversation.php:160
+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
 #. TRANS: Title for conversation page.
 #. TRANS: Title for page that shows a notice.
 #: actions/conversationreplies.php:81 actions/shownotice.php:258


@@ -2293,7 +2236,7 @@ msgstr ""
 
 #. TRANS: Button title for user account deletion.
 #: actions/deleteaccount.php:323
 
 #. TRANS: Button title for user account deletion.
 #: actions/deleteaccount.php:323

-msgid "Permanently delete your account"
+msgid "Permanently delete your account."

 msgstr ""
 
 #. TRANS: Client error displayed trying to delete an application while not logged in.
 msgstr ""
 
 #. TRANS: Client error displayed trying to delete an application while not logged in.


@@ -2318,7 +2261,7 @@ msgstr ""
 #. 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
 #. 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:1466
+#: lib/action.php:1473

 msgid "There was a problem with your session token."
 msgstr ""
 
 msgid "There was a problem with your session token."
 msgstr ""
 


@@ -2460,195 +2403,107 @@ msgstr ""
 msgid "Delete this user."
 msgstr ""
 
 msgid "Delete this user."
 msgstr ""
 

-#. TRANS: Message used as title for design settings for the site.
-#: actions/designadminpanel.php:60
-msgid "Design"
-msgstr ""
-
-#. TRANS: Instructions for design adminsitration panel.
-#: actions/designadminpanel.php:71
-msgid "Design settings for this StatusNet site"
-msgstr ""
-
-#. TRANS: Client error displayed when a logo URL does is not valid.
-#: actions/designadminpanel.php:327
-msgid "Invalid logo URL."
-msgstr ""
-
-#. TRANS: Client error displayed when an SSL logo URL is invalid.
-#: actions/designadminpanel.php:333
-msgid "Invalid SSL logo URL."
-msgstr ""
-
-#. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
-#. TRANS: %s is the chosen unavailable theme.
-#: actions/designadminpanel.php:339
-#, php-format
-msgid "Theme not available: %s."
-msgstr ""
-
-#. TRANS: Fieldset legend for form to change logo.
-#: actions/designadminpanel.php:437
-msgid "Change logo"
-msgstr ""
-
-#. TRANS: Field label for StatusNet site logo.
-#: actions/designadminpanel.php:444
-msgid "Site logo"
-msgstr ""
-
-#. TRANS: Field label for SSL StatusNet site logo.
-#: actions/designadminpanel.php:452
-msgid "SSL logo"
-msgstr ""
-
-#. TRANS: Fieldset legend for form change StatusNet site's theme.
-#: actions/designadminpanel.php:467
-msgid "Change theme"
-msgstr ""
-
-#. TRANS: Field label for dropdown to choose site theme.
-#: actions/designadminpanel.php:485
-msgid "Site theme"
-msgstr ""
-
-#. TRANS: Title for field label for dropdown to choose site theme.
-#: actions/designadminpanel.php:487
-msgid "Theme for the site."
-msgstr ""
-
-#. TRANS: Field label for uploading a cutom theme.
-#: actions/designadminpanel.php:494
-msgid "Custom theme"
-msgstr ""
-
-#. TRANS: Form instructions for uploading a cutom StatusNet theme.
-#: actions/designadminpanel.php:499
-msgid "You can upload a custom StatusNet theme as a .ZIP archive."
-msgstr ""
-
-#. TRANS: Fieldset legend for theme background image.
-#: actions/designadminpanel.php:515
-msgid "Change background image"
+#. 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 ""
 
 msgstr ""
 

-#. TRANS: Field label for background image on theme designer page.
-#. TRANS: Field label for background color selector.
-#. TRANS: Label on profile design page for setting a profile page background colour.
-#: actions/designadminpanel.php:525 actions/designadminpanel.php:609
-#: lib/designform.php:233
-msgid "Background"
+#. TRANS: Title for page on which favorites can be added.
+#: actions/disfavor.php:98
+msgid "Add to favorites"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Form guide for background image upload form on theme designer page.
-#: actions/designadminpanel.php:531
+#. 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

 #, php-format
 #, php-format

-msgid ""
-"You can upload a background image for the site. The maximum file size is %1"
-"$s."
-msgstr ""
-
-#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:558
-msgid "On"
-msgstr ""
-
-#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:575
-msgid "Off"
+msgid "No such document \"%s\"."

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Form guide for turning background image on or off on theme designer page.
-#. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
-#. TRANS: use of the uploaded profile image.
-#: actions/designadminpanel.php:577 lib/designform.php:209
-msgid "Turn background image on or off."
+#. TRANS: Menu item in administrator navigation panel.
+#. 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
+msgctxt "MENU"
+msgid "Home"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Checkbox label to title background image on theme designer page.
-#. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#: actions/designadminpanel.php:583 lib/designform.php:215
-msgid "Tile background image"
+#: actions/doc.php:181
+msgctxt "MENU"
+msgid "Docs"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Fieldset legend for theme colors.
-#: actions/designadminpanel.php:598
-msgid "Change colors"
+#. TRANS: Secondary navigation menu item leading to help on StatusNet.
+#: actions/doc.php:195 lib/secondarynav.php:56
+msgctxt "MENU"
+msgid "Help"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Field label for content color selector.
-#. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:623 lib/designform.php:247
-msgid "Content"
+#: actions/doc.php:196
+msgid "Getting started"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Field label for sidebar color selector.
-#. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:637 lib/designform.php:261
-msgid "Sidebar"
+#. TRANS: Secondary navigation menu item leading to text about StatusNet site.
+#: actions/doc.php:200 lib/secondarynav.php:59
+msgctxt "MENU"
+msgid "About"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Field label for text color selector.
-#. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:651 lib/designform.php:275
-msgid "Text"
+#: actions/doc.php:201
+msgid "About this site"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Field label for link color selector.
-#. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:665 lib/designform.php:289
-msgid "Links"
+#. TRANS: Secondary navigation menu item leading to Frequently Asked Questions.
+#: actions/doc.php:205 lib/secondarynav.php:62
+msgctxt "MENU"
+msgid "FAQ"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Fieldset legend for advanced theme design settings.
-#: actions/designadminpanel.php:691
-msgid "Advanced"
+#: actions/doc.php:206
+msgid "Frequently asked questions"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Field label for custom CSS.
-#: actions/designadminpanel.php:696
-msgid "Custom CSS"
+#. TRANS: Secondary navigation menu item leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+#: actions/doc.php:210 lib/secondarynav.php:81
+msgctxt "MENU"
+msgid "Contact"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Button text for resetting theme settings.
-#: actions/designadminpanel.php:718
-msgctxt "BUTTON"
-msgid "Use defaults"
+#: actions/doc.php:211
+msgid "Contact info"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: actions/designadminpanel.php:720 lib/designform.php:135
-msgid "Restore default designs."
+#: actions/doc.php:215
+msgctxt "MENU"
+msgid "Tags"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: actions/designadminpanel.php:728 lib/designform.php:143
-msgid "Reset back to default."
+#: actions/doc.php:216
+msgid "Using tags"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Title for button for saving theme settings.
-#. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:736 lib/designform.php:317
-msgid "Save design."
+#. 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
+msgctxt "MENU"
+msgid "Groups"

 msgstr ""
 
 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!"
+#: actions/doc.php:221
+msgid "Using groups"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Title for page on which favorites can be added.
-#: actions/disfavor.php:98
-msgid "Add to favorites"
+#: actions/doc.php:225
+msgctxt "MENU"
+msgid "API"

 msgstr ""
 
 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
-#, php-format
-msgid "No such document \"%s\"."
+#: actions/doc.php:226
+msgid "RESTful API"

 msgstr ""
 
 #. TRANS: Title for "Edit application" form.
 msgstr ""
 
 #. TRANS: Title for "Edit application" form.


@@ -2756,21 +2611,21 @@ msgid "You must be logged in to create a group."
 msgstr ""
 
 #. TRANS: Form instructions for group edit form.
 msgstr ""
 
 #. TRANS: Form instructions for group edit form.

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

 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.
 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:250 actions/newgroup.php:189
+#: 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.
 #, php-format
 msgid "Invalid alias: \"%s\""
 msgstr ""
 
 #. TRANS: Group edit form success message.
 #. TRANS: Edit list form success message.

-#: actions/editgroup.php:312 actions/editpeopletag.php:322
+#: actions/editgroup.php:306 actions/editpeopletag.php:326

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


@@ -2791,58 +2646,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:99
+#: actions/editpeopletag.php:103

 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:116
+#: actions/editpeopletag.php:120

 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:122
+#: actions/editpeopletag.php:126

 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:219
+#: actions/editpeopletag.php:223

 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:240
+#: actions/editpeopletag.php:244

 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:248
+#: actions/editpeopletag.php:252

 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:254
+#: actions/editpeopletag.php:258

 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:259
+#: actions/editpeopletag.php:263

 #, 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:276
+#: actions/editpeopletag.php:280

 msgid ""
 "Setting a public tag as private will permanently remove all the existing "
 "subscriptions to it. Do you still want to continue?"
 msgstr ""
 
 msgid ""
 "Setting a public tag as private will permanently remove all the existing "
 "subscriptions to it. Do you still want to continue?"
 msgstr ""
 

-#. TRANS: TRANS: Server error displayed when updating a list fails.
-#: actions/editpeopletag.php:297
+#. TRANS: Server error displayed when updating a list fails.
+#: actions/editpeopletag.php:301

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


@@ -2999,7 +2854,7 @@ msgstr ""
 #. 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
 #. 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:144
+#: actions/siteadminpanel.php:154

 msgid "Not a valid email address."
 msgstr ""
 
 msgid "Not a valid email address."
 msgstr ""
 


@@ -3100,8 +2955,8 @@ 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.
 #. 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:62
-#: lib/publicgroupnav.php:90
+#: actions/favorited.php:65 lib/popularnoticesection.php:65
+#: lib/publicgroupnav.php:95

 msgid "Popular notices"
 msgstr ""
 
 msgid "Popular notices"
 msgstr ""
 


@@ -3161,7 +3016,7 @@ msgstr ""
 #. TRANS: Title for featured users section.
 #. TRANS: Menu item title in search group navigation panel.
 #: actions/featured.php:69 lib/featureduserssection.php:96
 #. 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:84
+#: lib/publicgroupnav.php:88

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


@@ -3199,48 +3054,6 @@ msgstr ""
 msgid "No uploaded attachments."
 msgstr ""
 
 msgid "No uploaded attachments."
 msgstr ""
 

-#. TRANS: Client error displayed when subscribing to a remote profile and an unexpected response is received.
-#: actions/finishremotesubscribe.php:69
-msgid "Not expecting this response!"
-msgstr ""
-
-#. TRANS: Client error displayed when subscribing to a remote profile that does not exist.
-#: actions/finishremotesubscribe.php:81
-msgid "User being listened to does not exist."
-msgstr ""
-
-#. TRANS: Client error displayed when subscribing to a remote profile that is a local profile.
-#. TRANS: Client error displayed when using remote subscribe for a local entity.
-#: actions/finishremotesubscribe.php:89 actions/remotesubscribe.php:59
-msgid "You can use the local subscription!"
-msgstr ""
-
-#. TRANS: Client error displayed when subscribing to a remote profile that is blocked form subscribing to.
-#: actions/finishremotesubscribe.php:102
-msgid "That user has blocked you from subscribing."
-msgstr ""
-
-#. TRANS: Client error displayed when subscribing to a remote profile without providing an authorised token.
-#: actions/finishremotesubscribe.php:114
-msgid "You are not authorized."
-msgstr ""
-
-#. TRANS: Client error displayed when subscribing to a remote profile and conversion of the request token to access token fails.
-#: actions/finishremotesubscribe.php:118
-msgid "Could not convert request token to access token."
-msgstr ""
-
-#. TRANS: Client error displayed when subscribing to a remote profile fails because of an unsupported version of the OMB protocol.
-#: actions/finishremotesubscribe.php:124
-msgid "Remote service uses unknown version of OMB protocol."
-msgstr ""
-
-#. TRANS: Server error displayed when subscribing to a remote profile fails because the remote profile could not be updated.
-#. TRANS: Exception thrown when updating a remote profile fails in OAuth store.
-#: actions/finishremotesubscribe.php:145 lib/oauthstore.php:316
-msgid "Error updating remote profile."
-msgstr ""
-

 #. TRANS: Client error displayed when requesting a non-existent file.
 #: actions/getfile.php:77
 msgid "No such file."
 #. TRANS: Client error displayed when requesting a non-existent file.
 #: actions/getfile.php:77
 msgid "No such file."


@@ -3346,34 +3159,6 @@ msgstr ""
 msgid "No ID."
 msgstr ""
 
 msgid "No ID."
 msgstr ""
 

-#. TRANS: Client error displayed trying to change group design settings while not logged in.
-#: actions/groupdesignsettings.php:67
-msgid "You must be logged in to edit a group."
-msgstr ""
-
-#. TRANS: Title group design settings page.
-#: actions/groupdesignsettings.php:146
-msgid "Group design"
-msgstr ""
-
-#. TRANS: Instructions for group design settings page.
-#: actions/groupdesignsettings.php:157
-msgid ""
-"Customize the way your group looks with a background image and a colour "
-"palette of your choice."
-msgstr ""
-
-#. TRANS: Form validation error displayed when group design settings could not be updated because of an application issue.
-#: actions/groupdesignsettings.php:272
-msgid "Unable to update your design settings."
-msgstr ""
-
-#. TRANS: Form text to confirm saved group design settings.
-#. TRANS: Confirmation message on Profile design page when saving design settings has succeeded.
-#: actions/groupdesignsettings.php:317 actions/userdesignsettings.php:245
-msgid "Design preferences saved."
-msgstr ""
-

 #. TRANS: Title for group logo settings page.
 #. TRANS: Group logo form legend.
 #: actions/grouplogo.php:144 actions/grouplogo.php:199
 #. TRANS: Title for group logo settings page.
 #. TRANS: Group logo form legend.
 #: actions/grouplogo.php:144 actions/grouplogo.php:199


@@ -3415,20 +3200,20 @@ msgstr ""
 
 #. TRANS: Title of the page showing group members.
 #. TRANS: %s is the name of the group.
 
 #. TRANS: Title of the page showing group members.
 #. TRANS: %s is the name of the group.

-#: actions/groupmembers.php:104
+#: actions/groupmembers.php:69

 #, php-format
 msgid "%s group members"
 msgstr ""
 
 #. TRANS: Title of the page showing group members.
 #. 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"
 msgstr ""
 
 #. TRANS: Title of the page showing group members.
 #. TRANS: %1$s is the name of the group, %2$d is the page number of the members list.

-#: actions/groupmembers.php:109
+#: actions/groupmembers.php:74

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

-#: actions/groupmembers.php:125
+#: actions/groupmembers.php:90

 msgid "A list of the users in this group."
 msgstr ""
 
 msgid "A list of the users in this group."
 msgstr ""
 


@@ -3563,8 +3348,8 @@ msgstr ""
 #: actions/imsettings.php:69
 #, php-format
 msgid ""
 #: actions/imsettings.php:69
 #, php-format
 msgid ""

-"You can send and receive notices through instant messaging [instant messages]"
-"(%%doc.im%%). Configure your addresses and settings below."
+"You can send and receive notices through [instant messaging](%%doc.im%%). "
+"Configure your addresses and settings below."

 msgstr ""
 
 #. TRANS: Message given in the IM settings if IM is not enabled on the site.
 msgstr ""
 
 #. TRANS: Message given in the IM settings if IM is not enabled on the site.


@@ -3729,12 +3514,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:143
+#: actions/invite.php:145

 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:146
+#: actions/invite.php:148

 msgid "Invite new users"
 msgstr ""
 
 msgid "Invite new users"
 msgstr ""
 


@@ -3742,7 +3527,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:166
+#: actions/invite.php:169

 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] ""


@@ -3750,7 +3535,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:172 actions/invite.php:186
+#: actions/invite.php:175 actions/invite.php:189

 #, php-format
 msgctxt "INVITE"
 msgid "%1$s (%2$s)"
 #, php-format
 msgctxt "INVITE"
 msgid "%1$s (%2$s)"


@@ -3759,7 +3544,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:180
+#: actions/invite.php:183

 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:"


@@ -3769,7 +3554,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:194
+#: actions/invite.php:197

 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] ""


@@ -3777,49 +3562,22 @@ 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:204
+#: actions/invite.php:207

 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:217
+#: actions/invite.php:222

 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 ""
 

-#. TRANS: Field label for a list of e-mail addresses.
-#: actions/invite.php:244
-msgid "Email addresses"
-msgstr ""
-
-#. TRANS: Tooltip for field label for a list of e-mail addresses.
-#: actions/invite.php:247
-msgid "Addresses of friends to invite (one per line)."
-msgstr ""
-
-#. TRANS: Field label for a personal message to send to invitees.
-#: actions/invite.php:251
-msgid "Personal message"
-msgstr ""
-
-#. TRANS: Tooltip for field label for a personal message to send to invitees.
-#: actions/invite.php:254
-msgid "Optionally add a personal message to the invitation."
-msgstr ""
-
-#. TRANS: Send button for inviting friends
-#. TRANS: Button text for sending notice.
-#: actions/invite.php:258 lib/noticeform.php:302
-msgctxt "BUTTON"
-msgid "Send"
-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:294
+#: actions/invite.php:275

 #, php-format
 msgid "%1$s has invited you to join them on %2$s"
 msgstr ""
 #, php-format
 msgid "%1$s has invited you to join them on %2$s"
 msgstr ""


@@ -3830,14 +3588,14 @@ msgid "You must be logged in to join a group."
 msgstr ""
 
 #. TRANS: Title for join group page after joining.
 msgstr ""
 
 #. TRANS: Title for join group page after joining.

-#: actions/joingroup.php:145
+#: actions/joingroup.php:149

 #, 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:158
+#: actions/joingroup.php:162

 msgid "Unknown error joining group."
 msgstr ""
 
 msgid "Unknown error joining group."
 msgstr ""
 


@@ -3976,13 +3734,6 @@ msgstr ""
 msgid "Save license settings."
 msgstr ""
 
 msgid "Save license settings."
 msgstr ""
 

-#. TRANS: Client error displayed when trying to log in 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/login.php:98 actions/otp.php:62 actions/register.php:136
-msgid "Already logged in."
-msgstr ""
-

 #. TRANS: Form validation error displayed when trying to log in with incorrect credentials.
 #: actions/login.php:127
 msgid "Incorrect username or password."
 #. TRANS: Form validation error displayed when trying to log in with incorrect credentials.
 #: actions/login.php:127
 msgid "Incorrect username or password."


@@ -4004,6 +3755,11 @@ msgstr ""
 msgid "Login to site"
 msgstr ""
 
 msgid "Login to site"
 msgstr ""
 

+#. TRANS: Field label on login page.
+#: actions/login.php:231
+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
 #. TRANS: Checkbox label label on login page.
 #. TRANS: Checkbox label on account registration page.
 #: actions/login.php:239 actions/register.php:514


@@ -4105,7 +3861,7 @@ msgstr ""
 msgid "Could not create application."
 msgstr ""
 
 msgid "Could not create application."
 msgstr ""
 

-#. TRANS: Form validation error on New application page when providing an invalid image upload.
+#. TRANS: Form validation error messages displayed when uploading an invalid application logo.

 #: actions/newapplication.php:299
 msgid "Invalid image."
 msgstr ""
 #: actions/newapplication.php:299
 msgid "Invalid image."
 msgstr ""


@@ -4116,7 +3872,7 @@ msgid "New group"
 msgstr ""
 
 #. TRANS: Client exception thrown when a user tries to create a group while banned.
 msgstr ""
 
 #. TRANS: Client exception thrown when a user tries to create a group while banned.

-#: actions/newgroup.php:73 classes/User_group.php:491
+#: actions/newgroup.php:73 classes/User_group.php:545

 msgid "You are not allowed to create groups on this site."
 msgstr ""
 
 msgid "You are not allowed to create groups on this site."
 msgstr ""
 


@@ -4151,13 +3907,6 @@ msgstr ""
 msgid "No recipient specified."
 msgstr ""
 
 msgid "No recipient specified."
 msgstr ""
 

-#. 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/newmessage.php:178 lib/command.php:632
-msgid ""
-"Don't send a message to yourself; just say it to yourself quietly instead."
-msgstr ""
-

 #. TRANS: Page title after sending a direct message.
 #: actions/newmessage.php:196
 msgid "Message sent"
 #. TRANS: Page title after sending a direct message.
 #: actions/newmessage.php:196
 msgid "Message sent"


@@ -4382,11 +4131,45 @@ 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.
 
 #. 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:1323
-#: lib/apiaction.php:1350 lib/apiaction.php:1485
+#: 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 ""
 
 msgid "Not a supported data format."
 msgstr ""
 

+#. TRANS: Page title for profile settings.
+#: actions/oldschoolsettings.php:58
+msgid "Old school UI settings"
+msgstr ""
+
+#. TRANS: Usage instructions for profile settings.
+#: actions/oldschoolsettings.php:69
+msgid "If you like it \"the old way\", you can set that here."
+msgstr ""
+
+#. 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
+msgid "Settings saved."
+msgstr ""
+
+#: actions/oldschoolsettings.php:161
+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
+msgid "Show nicknames (not full names) in timelines"
+msgstr ""
+
+#. TRANS: Button text to save a list.
+#: actions/oldschoolsettings.php:187 lib/peopletageditform.php:168
+msgid "Save"
+msgstr ""
+

 #. TRANS: ShortName in the OpenSearch interface when trying to find users.
 #: actions/opensearch.php:64
 msgid "People Search"
 #. TRANS: ShortName in the OpenSearch interface when trying to find users.
 #: actions/opensearch.php:64
 msgid "People Search"


@@ -4397,6 +4180,12 @@ msgstr ""
 msgid "Notice Search"
 msgstr ""
 
 msgid "Notice Search"
 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.
+#: actions/otp.php:62 actions/register.php:136
+msgid "Already logged in."
+msgstr ""
+

 #. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
 #: actions/otp.php:70
 msgid "No user ID specified."
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
 #: actions/otp.php:70
 msgid "No user ID specified."


@@ -4481,7 +4270,7 @@ msgid "Confirm"
 msgstr ""
 
 #. TRANS: Field title on page where to change password.
 msgstr ""
 
 #. TRANS: Field title on page where to change password.

-#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#. 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
 #. TRANS: Field title on account registration page.
 #: actions/passwordsettings.php:121 actions/recoverpassword.php:264
 #: actions/register.php:452


@@ -4519,7 +4308,7 @@ 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:422
+#: actions/passwordsettings.php:201 actions/recoverpassword.php:339

 msgid "Cannot save new password."
 msgstr ""
 
 msgid "Cannot save new password."
 msgstr ""
 


@@ -4540,269 +4329,230 @@ msgstr ""
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the directory that could not be read from.
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the directory that could not be read from.

-#: actions/pathsadminpanel.php:155
+#: actions/pathsadminpanel.php:154

 #, php-format
 msgid "Theme directory not readable: %s."
 msgstr ""
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the avatar directory that could not be written to.
 #, php-format
 msgid "Theme directory not readable: %s."
 msgstr ""
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the avatar directory that could not be written to.

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

 #, php-format
 msgid "Avatar directory not writable: %s."
 msgstr ""
 
 #. TRANS: Client error in Paths admin panel.
 #, php-format
 msgid "Avatar directory not writable: %s."
 msgstr ""
 
 #. TRANS: Client error in Paths admin panel.

-#. TRANS: %s is the background directory that could not be written to.
-#: actions/pathsadminpanel.php:171
+#. TRANS: %s is the locales directory that could not be read from.
+#: actions/pathsadminpanel.php:172

 #, php-format
 #, php-format

-msgid "Background directory not writable: %s."
-msgstr ""
-
-#. TRANS: Client error in Paths admin panel.
-#. TRANS: %s is the locales directory that could not be read from.
-#: actions/pathsadminpanel.php:181
-#, php-format
-msgid "Locales directory not readable: %s."
+msgid "Locales directory not readable: %s."

 msgstr ""
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the SSL server URL that is too long.
 msgstr ""
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the SSL server URL that is too long.

-#: actions/pathsadminpanel.php:189
+#: actions/pathsadminpanel.php:180

 msgid "Invalid SSL server. The maximum length is 255 characters."
 msgstr ""
 
 #. TRANS: Fieldset legend in Paths admin panel.
 msgid "Invalid SSL server. The maximum length is 255 characters."
 msgstr ""
 
 #. TRANS: Fieldset legend in Paths admin panel.

-#: actions/pathsadminpanel.php:235
+#: actions/pathsadminpanel.php:226

 msgid "Site"
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
 msgid "Site"
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.

-#: actions/pathsadminpanel.php:241 actions/pathsadminpanel.php:284
-#: actions/pathsadminpanel.php:375 actions/pathsadminpanel.php:430
+#: actions/pathsadminpanel.php:232 actions/pathsadminpanel.php:275
+#: actions/pathsadminpanel.php:367

 msgid "Server"
 msgstr ""
 
 #. TRANS: Field title in Paths admin panel.
 msgid "Server"
 msgstr ""
 
 #. TRANS: Field title in Paths admin panel.

-#: actions/pathsadminpanel.php:243
+#: actions/pathsadminpanel.php:234

 msgid "Site's server hostname."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
 msgid "Site's server hostname."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.

-#: actions/pathsadminpanel.php:249 actions/pathsadminpanel.php:293
-#: actions/pathsadminpanel.php:384 actions/pathsadminpanel.php:439
+#: actions/pathsadminpanel.php:240 actions/pathsadminpanel.php:284
+#: actions/pathsadminpanel.php:376

 msgid "Path"
 msgstr ""
 
 #. TRANS: Field title in Paths admin panel.
 msgid "Path"
 msgstr ""
 
 #. TRANS: Field title in Paths admin panel.

-#: actions/pathsadminpanel.php:251
+#: actions/pathsadminpanel.php:242

 msgid "Site path."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
 msgid "Site path."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.

-#: actions/pathsadminpanel.php:257
+#: actions/pathsadminpanel.php:248

 msgid "Locale directory"
 msgstr ""
 
 #. TRANS: Field title in Paths admin panel.
 msgid "Locale directory"
 msgstr ""
 
 #. TRANS: Field title in Paths admin panel.

-#: actions/pathsadminpanel.php:259
+#: actions/pathsadminpanel.php:250

 msgid "Directory path to locales."
 msgstr ""
 
 #. TRANS: Checkbox label in Paths admin panel.
 msgid "Directory path to locales."
 msgstr ""
 
 #. TRANS: Checkbox label in Paths admin panel.

-#: actions/pathsadminpanel.php:266
+#: actions/pathsadminpanel.php:257

 msgid "Fancy URLs"
 msgstr ""
 
 #. TRANS: Field title in Paths admin panel.
 msgid "Fancy URLs"
 msgstr ""
 
 #. TRANS: Field title in Paths admin panel.

-#: actions/pathsadminpanel.php:269
+#: actions/pathsadminpanel.php:260

 msgid "Use fancy URLs (more readable and memorable)?"
 msgstr ""
 
 #. TRANS: Fieldset legend in Paths admin panel.
 msgid "Use fancy URLs (more readable and memorable)?"
 msgstr ""
 
 #. TRANS: Fieldset legend in Paths admin panel.

-#: actions/pathsadminpanel.php:277
+#: actions/pathsadminpanel.php:268

 msgctxt "LEGEND"
 msgid "Theme"
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
 msgctxt "LEGEND"
 msgid "Theme"
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.

-#: actions/pathsadminpanel.php:286
+#: actions/pathsadminpanel.php:277

 msgid "Server for themes."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
 msgid "Server for themes."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.

-#: actions/pathsadminpanel.php:295
+#: actions/pathsadminpanel.php:286

 msgid "Web path to themes."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
 msgid "Web path to themes."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.

-#: actions/pathsadminpanel.php:302 actions/pathsadminpanel.php:393
-#: actions/pathsadminpanel.php:448 actions/pathsadminpanel.php:500
+#: actions/pathsadminpanel.php:293 actions/pathsadminpanel.php:385
+#: actions/pathsadminpanel.php:437

 msgid "SSL server"
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
 msgid "SSL server"
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.

-#: actions/pathsadminpanel.php:304
+#: actions/pathsadminpanel.php:295

 msgid "SSL server for themes (default: SSL server)."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
 msgid "SSL server for themes (default: SSL server)."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.

-#: actions/pathsadminpanel.php:311 actions/pathsadminpanel.php:402
-#: actions/pathsadminpanel.php:457
+#: actions/pathsadminpanel.php:302 actions/pathsadminpanel.php:394

 msgid "SSL path"
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
 msgid "SSL path"
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.

-#: actions/pathsadminpanel.php:313
+#: actions/pathsadminpanel.php:304

 msgid "SSL path to themes (default: /theme/)."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
 msgid "SSL path to themes (default: /theme/)."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.

-#: actions/pathsadminpanel.php:320 actions/pathsadminpanel.php:411
-#: actions/pathsadminpanel.php:466
+#: actions/pathsadminpanel.php:311 actions/pathsadminpanel.php:403

 msgid "Directory"
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
 msgid "Directory"
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.

-#: actions/pathsadminpanel.php:322
+#: actions/pathsadminpanel.php:313

 msgid "Directory where themes are located."
 msgstr ""
 
 #. TRANS: Fieldset legend in Paths admin panel.
 msgid "Directory where themes are located."
 msgstr ""
 
 #. TRANS: Fieldset legend in Paths admin panel.

-#: actions/pathsadminpanel.php:331
+#: actions/pathsadminpanel.php:322

 msgid "Avatars"
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
 msgid "Avatars"
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.

-#: actions/pathsadminpanel.php:338
+#: actions/pathsadminpanel.php:329

 msgid "Avatar server"
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
 msgid "Avatar server"
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.

-#: actions/pathsadminpanel.php:340
+#: actions/pathsadminpanel.php:331

 msgid "Server for avatars."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
 msgid "Server for avatars."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.

-#: actions/pathsadminpanel.php:347
+#: actions/pathsadminpanel.php:338

 msgid "Avatar path"
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
 msgid "Avatar path"
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.

-#: actions/pathsadminpanel.php:349
+#: actions/pathsadminpanel.php:340

 msgid "Web path to avatars."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
 msgid "Web path to avatars."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.

-#: actions/pathsadminpanel.php:356
+#: actions/pathsadminpanel.php:347

 msgid "Avatar directory"
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
 msgid "Avatar directory"
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.

-#: actions/pathsadminpanel.php:358
+#: actions/pathsadminpanel.php:349

 msgid "Directory where avatars are located."
 msgstr ""
 
 msgid "Directory where avatars are located."
 msgstr ""
 

-#. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:369
-msgid "Backgrounds"
-msgstr ""
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:377
-msgid "Server for backgrounds."
-msgstr ""
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:386
-msgid "Web path to backgrounds."
-msgstr ""
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:395
-msgid "Server for backgrounds on SSL pages."
-msgstr ""
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:404
-msgid "Web path to backgrounds on SSL pages."
-msgstr ""
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:413
-msgid "Directory where backgrounds are located."
-msgstr ""
-

 #. TRANS: Fieldset legens in Paths admin panel.
 #. TRANS: Fieldset legens in Paths admin panel.

-#: actions/pathsadminpanel.php:424
+#: actions/pathsadminpanel.php:361

 msgid "Attachments"
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
 msgid "Attachments"
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.

-#: actions/pathsadminpanel.php:432
+#: actions/pathsadminpanel.php:369

 msgid "Server for attachments."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
 msgid "Server for attachments."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.

-#: actions/pathsadminpanel.php:441
+#: actions/pathsadminpanel.php:378

 msgid "Web path to attachments."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
 msgid "Web path to attachments."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.

-#: actions/pathsadminpanel.php:450
+#: actions/pathsadminpanel.php:387

 msgid "Server for attachments on SSL pages."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
 msgid "Server for attachments on SSL pages."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.

-#: actions/pathsadminpanel.php:459
+#: actions/pathsadminpanel.php:396

 msgid "Web path to attachments on SSL pages."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
 msgid "Web path to attachments on SSL pages."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.

-#: actions/pathsadminpanel.php:468
+#: actions/pathsadminpanel.php:405

 msgid "Directory where attachments are located."
 msgstr ""
 
 #. TRANS: Fieldset legend in Paths admin panel.
 msgid "Directory where attachments are located."
 msgstr ""
 
 #. TRANS: Fieldset legend in Paths admin panel.

-#: actions/pathsadminpanel.php:477
+#: actions/pathsadminpanel.php:414

 msgctxt "LEGEND"
 msgid "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.
 msgctxt "LEGEND"
 msgid "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:482 actions/snapshotadminpanel.php:203
+#: actions/pathsadminpanel.php:419 actions/snapshotadminpanel.php:203

 msgid "Never"
 msgstr ""
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
 msgid "Never"
 msgstr ""
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").

-#: actions/pathsadminpanel.php:484
+#: actions/pathsadminpanel.php:421

 msgid "Sometimes"
 msgstr ""
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
 msgid "Sometimes"
 msgstr ""
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").

-#: actions/pathsadminpanel.php:486
+#: actions/pathsadminpanel.php:423

 msgid "Always"
 msgstr ""
 
 #. TRANS: Drop down label in Paths admin panel.
 msgid "Always"
 msgstr ""
 
 #. TRANS: Drop down label in Paths admin panel.

-#: actions/pathsadminpanel.php:490
+#: actions/pathsadminpanel.php:427

 msgid "Use SSL"
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
 msgid "Use SSL"
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.

-#: actions/pathsadminpanel.php:492
+#: actions/pathsadminpanel.php:429

 msgid "When to use SSL."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
 msgid "When to use SSL."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.

-#: actions/pathsadminpanel.php:502
+#: actions/pathsadminpanel.php:439

 msgid "Server to direct SSL requests to."
 msgstr ""
 
 #. TRANS: Button title text to store form data in the Paths admin panel.
 msgid "Server to direct SSL requests to."
 msgstr ""
 
 #. TRANS: Button title text to store form data in the Paths admin panel.

-#: actions/pathsadminpanel.php:519
-msgid "Save paths"
+#: actions/pathsadminpanel.php:456
+msgid "Save path settings."

 msgstr ""
 
 #. TRANS: Instructions for the "People search" page.
 msgstr ""
 
 #. TRANS: Instructions for the "People search" page.


@@ -4845,28 +4595,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:79 actions/peopletagsubscribers.php:79
-#: actions/showprofiletag.php:65
+#: actions/peopletagged.php:84 actions/peopletagsubscribers.php:84
+#: actions/showprofiletag.php:69

 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:108
+#: actions/peopletagged.php:113

 #, 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:113
+#: actions/peopletagged.php:118

 #, 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:192 actions/peopletagsubscribers.php:192
+#: actions/peopletagged.php:197 actions/peopletagsubscribers.php:197

 msgid "Creator"
 msgstr ""
 
 msgid "Creator"
 msgstr ""
 


@@ -4900,46 +4650,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:128
+#: actions/peopletagsbyuser.php:133

 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:154
+#: actions/peopletagsbyuser.php:159

 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:164
+#: actions/peopletagsbyuser.php:169

 #, 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:176 lib/galleryaction.php:138
+#: actions/peopletagsbyuser.php:181 lib/galleryaction.php:138

 msgid "Select tag to filter"
 msgstr ""
 
 #. TRANS: Checkbox title.
 msgid "Select tag to filter"
 msgstr ""
 
 #. TRANS: Checkbox title.

-#: actions/peopletagsbyuser.php:187
+#: actions/peopletagsbyuser.php:192

 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:189
+#: actions/peopletagsbyuser.php:194

 msgctxt "LABEL"
 msgid "Public"
 msgstr ""
 
 #. TRANS: Checkbox title.
 msgctxt "LABEL"
 msgid "Public"
 msgstr ""
 
 #. TRANS: Checkbox title.

-#: actions/peopletagsbyuser.php:191
+#: actions/peopletagsbyuser.php:196

 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:194 lib/galleryaction.php:145
+#: actions/peopletagsbyuser.php:199 lib/galleryaction.php:145

 msgctxt "BUTTON"
 msgid "Go"
 msgstr ""
 msgctxt "BUTTON"
 msgid "Go"
 msgstr ""


@@ -4947,20 +4697,20 @@ 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:210
+#: actions/peopletagsbyuser.php:215

 #, 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-"
 "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 "
 #, 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-"
 "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 "

-"tag's timeline."
+"list's timeline."

 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.
 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.

-#: actions/peopletagsbyuser.php:273
+#: actions/peopletagsbyuser.php:278

 #, 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 ""


@@ -4980,34 +4730,34 @@ 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:108
+#: actions/peopletagsforuser.php:113

 #, 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-"
 "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 "
 #, 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-"
 "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 "

-"tag's timeline."
+"list's timeline."

 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.
 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.

-#: actions/peopletagsforuser.php:144
+#: actions/peopletagsforuser.php:149

 #, 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:108
+#: actions/peopletagsubscribers.php:113

 #, 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:113
+#: actions/peopletagsubscribers.php:118

 #, 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 ""


@@ -5029,7 +4779,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:110
+#: actions/peopletagsubscriptions.php:115

 #, 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 "


@@ -5096,18 +4846,6 @@ msgid ""
 "All default plugins have been disabled from the site's configuration file."
 msgstr ""
 
 "All default plugins have been disabled from the site's configuration file."
 msgstr ""
 

-#. TRANS: Client error displayed if the notice posted has too many characters.
-#: actions/postnotice.php:96
-msgid "Invalid notice content."
-msgstr ""
-
-#. TRANS: Exception thrown if a notice's license is not compatible with the StatusNet site license.
-#. TRANS: %1$s is the notice license, %2$s is the StatusNet site's license.
-#: actions/postnotice.php:104
-#, php-format
-msgid "Notice license \"%1$s\" is not compatible with site license \"%2$s\"."
-msgstr ""
-

 #. TRANS: Client error displayed when trying to add an unindentified field to profile.
 #. TRANS: %s is a field name.
 #: actions/profilecompletion.php:109
 #. TRANS: Client error displayed when trying to add an unindentified field to profile.
 #. TRANS: %s is a field name.
 #: actions/profilecompletion.php:109


@@ -5220,7 +4958,10 @@ msgid "Share my current location when posting notices"
 msgstr ""
 
 #. TRANS: Field label in form for profile settings.
 msgstr ""
 
 #. 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:118

+#: lib/grouptagcloudsection.php:57

 msgid "Tags"
 msgstr ""
 
 msgid "Tags"
 msgstr ""
 


@@ -5254,7 +4995,7 @@ msgstr ""
 #. TRANS: Checkbox label in form for profile settings.
 #: actions/profilesettings.php:187
 msgid ""
 #. TRANS: Checkbox label in form for profile settings.
 #: actions/profilesettings.php:187
 msgid ""

-"Automatically subscribe to whoever subscribes to me (best for non-humans)."
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"

 msgstr ""
 
 #. TRANS: Dropdown field label on profile settings, for what policies to apply when someone else tries to subscribe to your updates.
 msgstr ""
 
 #. TRANS: Dropdown field label on profile settings, for what policies to apply when someone else tries to subscribe to your updates.


@@ -5296,7 +5037,7 @@ 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:152
+#: actions/profilesettings.php:289 actions/siteadminpanel.php:175

 msgid "Timezone not selected."
 msgstr ""
 
 msgid "Timezone not selected."
 msgstr ""
 


@@ -5333,12 +5074,6 @@ msgstr ""
 msgid "Could not save tags."
 msgstr ""
 
 msgid "Could not save tags."
 msgstr ""
 

-#. TRANS: Confirmation shown when user profile settings are saved.
-#. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:466 lib/adminpanelaction.php:138
-msgid "Settings saved."
-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
 #. 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


@@ -5353,40 +5088,45 @@ msgid "Beyond the page limit (%s)."
 msgstr ""
 
 #. TRANS: Server error displayed when a public timeline cannot be retrieved.
 msgstr ""
 
 #. TRANS: Server error displayed when a public timeline cannot be retrieved.

-#: actions/public.php:98
-msgid "Could not retrieve public stream."
+#: actions/public.php:104
+msgid "Could not retrieve public timeline."

 msgstr ""
 
 #. TRANS: Title for all public timeline pages but the first.
 #. TRANS: %d is the page number.
 msgstr ""
 
 #. TRANS: Title for all public timeline pages but the first.
 #. TRANS: %d is the page number.

-#: actions/public.php:136
+#: actions/public.php:142

 #, 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:139 lib/publicgroupnav.php:68
+#: actions/public.php:145 lib/publicgroupnav.php:69

 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:167
-msgid "Public Stream Feed (RSS 1.0)"
+#: actions/public.php:180
+msgid "Public Timeline Feed (Activity Streams JSON)"
+msgstr ""
+
+#. TRANS: Link description for public timeline feed.
+#: actions/public.php:183
+msgid "Public Timeline Feed (RSS 1.0)"

 msgstr ""
 
 #. TRANS: Link description for public timeline feed.
 msgstr ""
 
 #. TRANS: Link description for public timeline feed.

-#: actions/public.php:172
-msgid "Public Stream Feed (RSS 2.0)"
+#: actions/public.php:188
+msgid "Public Timeline Feed (RSS 2.0)"

 msgstr ""
 
 #. TRANS: Link description for public timeline feed.
 msgstr ""
 
 #. TRANS: Link description for public timeline feed.

-#: actions/public.php:177
-msgid "Public Stream Feed (Atom)"
+#: actions/public.php:193
+msgid "Public Timeline Feed (Atom)"

 msgstr ""
 
 #. TRANS: Text displayed for public feed when there are no public notices.
 msgstr ""
 
 #. TRANS: Text displayed for public feed when there are no public notices.

-#: actions/public.php:183
+#: actions/public.php:199

 #, 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 "


@@ -5394,12 +5134,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:187
+#: actions/public.php:203

 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:192
+#: actions/public.php:208

 #, 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!"


@@ -5407,7 +5147,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:240
+#: actions/public.php:280

 #, 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-"


@@ -5418,7 +5158,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:247
+#: actions/public.php:287

 #, 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-"


@@ -5426,52 +5166,6 @@ msgid ""
 "tool."
 msgstr ""
 
 "tool."
 msgstr ""
 

-#. TRANS: Title for page with public list cloud.
-#: actions/publicpeopletagcloud.php:57
-msgid "Public list cloud"
-msgstr ""
-
-#. TRANS: Page notice for page with public list cloud.
-#. TRANS: %s is a StatusNet sitename.
-#: actions/publicpeopletagcloud.php:65
-#, php-format
-msgid "These are largest lists on %s"
-msgstr ""
-
-#. TRANS: Empty list message on page with public list cloud.
-#. TRANS: This message contains Markdown links in the form [description](link).
-#: actions/publicpeopletagcloud.php:73
-#, php-format
-msgid "No one has [listed](%%doc.tags%%) anyone yet."
-msgstr ""
-
-#. TRANS: Additional empty list message on page with public list cloud for logged in users.
-#: actions/publicpeopletagcloud.php:77
-msgid "Be the first to list someone!"
-msgstr ""
-
-#. TRANS: Additional empty list message on page with public list cloud for anonymous users.
-#. TRANS: This message contains Markdown links in the form [description](link).
-#: actions/publicpeopletagcloud.php:82
-#, php-format
-msgid ""
-"Why not [register an account](%%action.register%%) and be the first to list "
-"someone!"
-msgstr ""
-
-#. TRANS: DT element on on page with public list cloud.
-#: actions/publicpeopletagcloud.php:136
-msgid "List cloud"
-msgstr ""
-
-#. TRANS: Link title for number of listed people. %d is the number of listed people.
-#: actions/publicpeopletagcloud.php:177
-#, php-format
-msgid "1 person listed"
-msgid_plural "%d people listed"
-msgstr[0] ""
-msgstr[1] ""
-

 #. TRANS: Public RSS feed description. %s is the StatusNet site name.
 #: actions/publicrss.php:106
 #, php-format
 #. TRANS: Public RSS feed description. %s is the StatusNet site name.
 #: actions/publicrss.php:106
 #, php-format


@@ -5601,7 +5295,7 @@ msgstr ""
 
 #. TRANS: Title for password recovery page in email sent mode.
 #. TRANS: Subject for password recovery e-mail.
 
 #. TRANS: Title for password recovery page in email sent mode.
 #. TRANS: Subject for password recovery e-mail.

-#: actions/recoverpassword.php:227 actions/recoverpassword.php:370
+#: actions/recoverpassword.php:227 classes/User.php:1146

 msgid "Password recovery requested"
 msgstr ""
 
 msgid "Password recovery requested"
 msgstr ""
 


@@ -5616,62 +5310,46 @@ msgid "6 or more characters, and do not forget it!"
 msgstr ""
 
 #. TRANS: Button text for password reset form.
 msgstr ""
 
 #. TRANS: Button text for password reset form.

-#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: actions/recoverpassword.php:268 lib/designform.php:140
+#: actions/recoverpassword.php:268

 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:278
+#: actions/recoverpassword.php:279

 msgid "Enter a nickname or email address."
 msgstr ""
 
 msgid "Enter a nickname or email address."
 msgstr ""
 

-#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
-#: actions/recoverpassword.php:313
-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.
-#: actions/recoverpassword.php:331
-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.
-#: actions/recoverpassword.php:346
-msgid "Error saving address confirmation."
-msgstr ""
-

 #. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
 #. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.

-#: actions/recoverpassword.php:374
+#: actions/recoverpassword.php:287

 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:395
+#: actions/recoverpassword.php:312

 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:404
+#: actions/recoverpassword.php:321

 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:409
+#: actions/recoverpassword.php:326

 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:430 actions/register.php:263
+#: actions/recoverpassword.php:347 actions/register.php:263

 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:438
+#: actions/recoverpassword.php:355

 msgid "New password successfully saved. You are now logged in."
 msgstr ""
 
 msgid "New password successfully saved. You are now logged in."
 msgstr ""
 


@@ -5826,85 +5504,16 @@ msgid ""
 "to confirm your email address.)"
 msgstr ""
 
 "to confirm your email address.)"
 msgstr ""
 

-#. TRANS: Page notice for remote subscribe. This message contains Markdown links.
-#. TRANS: Ensure to keep the correct markup of [link description](link).
-#: actions/remotesubscribe.php:101
+#. TRANS: Client error displayed when an unknown error occurs while delisting a user.
+#. TRANS: %s is a username.
+#: actions/removepeopletag.php:140

 #, php-format
 #, php-format

-msgid ""
-"To subscribe, you can [login](%%action.login%%), or [register](%%action."
-"register%%) a new  account. If you already have an account  on a [compatible "
-"microblogging site](%%doc.openmublog%%),  enter your profile URL below."
-msgstr ""
-
-#. TRANS: Page title for Remote subscribe.
-#: actions/remotesubscribe.php:116
-msgid "Remote subscribe"
-msgstr ""
-
-#. TRANS: Field legend on page for remote subscribe.
-#: actions/remotesubscribe.php:129
-msgid "Subscribe to a remote user"
-msgstr ""
-
-#. TRANS: Field label on page for remote subscribe.
-#: actions/remotesubscribe.php:135
-msgid "User nickname"
-msgstr ""
-
-#. TRANS: Field title on page for remote subscribe.
-#: actions/remotesubscribe.php:137
-msgid "Nickname of the user you want to follow."
-msgstr ""
-
-#. TRANS: Field label on page for remote subscribe.
-#: actions/remotesubscribe.php:141
-msgid "Profile URL"
-msgstr ""
-
-#. TRANS: Field title on page for remote subscribe.
-#: actions/remotesubscribe.php:143
-msgid "URL of your profile on another compatible microblogging service."
-msgstr ""
-
-#. TRANS: Button text on page for remote subscribe.
-#. TRANS: Link text for link that will subscribe to a remote profile.
-#. TRANS: Button text to subscribe to a user.
-#. TRANS: Button text for subscribing to a list.
-#: actions/remotesubscribe.php:147 lib/accountprofileblock.php:308
-#: lib/subscribeform.php:130 lib/subscribepeopletagform.php:106
-msgctxt "BUTTON"
-msgid "Subscribe"
-msgstr ""
-
-#. TRANS: Form validation error on page for remote subscribe when an invalid profile URL was provided.
-#: actions/remotesubscribe.php:172
-msgid "Invalid profile URL (bad format)."
-msgstr ""
-
-#. TRANS: Form validation error on page for remote subscribe when no the provided profile URL
-#. TRANS: does not contain expected data.
-#: actions/remotesubscribe.php:183
-msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
-msgstr ""
-
-#. TRANS: Form validation error on page for remote subscribe.
-#: actions/remotesubscribe.php:192
-msgid "That is a local profile! Login to subscribe."
-msgstr ""
-
-#. TRANS: Form validation error on page for remote subscribe when the remote service is not providing a request token.
-#: actions/remotesubscribe.php:200
-msgid "Could not get a request token."
-msgstr ""
-
-#. TRANS: Client error displayed when trying to (un)list an OMB 0.1 remote profile.
-#: actions/removepeopletag.php:122
-msgid "You cannot (un)list an OMB 0.1 remote profile with this action."
+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.
 msgstr ""
 
 #. TRANS: Client error displayed when an unknown error occurs while listing a user.
 #. TRANS: %s is a profile URL.

-#: actions/removepeopletag.php:157
+#: actions/removepeopletag.php:145

 #, 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 "


@@ -5912,7 +5521,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: Title after removing a user from a list.
 msgstr ""
 
 #. TRANS: Title after removing a user from a list.

-#: actions/removepeopletag.php:167
+#: actions/removepeopletag.php:155

 msgid "Unlisted"
 msgstr ""
 
 msgid "Unlisted"
 msgstr ""
 


@@ -5929,7 +5538,7 @@ msgstr ""
 
 #. TRANS: Title after repeating a notice.
 #. TRANS: Repeat form status in notice list when a notice has been repeated.
 
 #. 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:676
+#: actions/repeat.php:102 lib/noticelistitem.php:703

 msgid "Repeated"
 msgstr ""
 
 msgid "Repeated"
 msgstr ""
 


@@ -5943,7 +5552,7 @@ 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:126 actions/repliesrss.php:68
+#: actions/replies.php:129 actions/repliesrss.php:68

 #: lib/personalgroupnav.php:93
 #, php-format
 msgid "Replies to %s"
 #: lib/personalgroupnav.php:93
 #, php-format
 msgid "Replies to %s"


@@ -5951,35 +5560,42 @@ 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.
 
 #. 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:130
+#: actions/replies.php:133

 #, 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:148
+#: actions/replies.php:153
+#, 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

 #, 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:157
+#: actions/replies.php:169

 #, 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:166
+#: actions/replies.php:178

 #, 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:195
+#: actions/replies.php:207

 #, 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 "


@@ -5988,7 +5604,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:204
+#: actions/replies.php:216

 #, 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 "


@@ -5997,7 +5613,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:208
+#: actions/replies.php:220

 #, 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."


@@ -6087,7 +5703,7 @@ msgstr ""
 #. TRANS: Form instructions for feed restore.
 #: actions/restoreaccount.php:342
 msgid ""
 #. TRANS: Form instructions for feed restore.
 #: actions/restoreaccount.php:342
 msgid ""

-"You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
+"You can upload a backed-up timeline in <a href=\"http://activitystrea.ms/"

 "\">Activity Streams</a> format."
 msgstr ""
 
 "\">Activity Streams</a> format."
 msgstr ""
 


@@ -6224,15 +5840,40 @@ msgstr ""
 msgid "Application info"
 msgstr ""
 
 msgid "Application info"
 msgstr ""
 

+#. TRANS: Field label on application page.
+#: actions/showapplication.php:257
+msgid "Consumer key"
+msgstr ""
+
+#. TRANS: Field label on application page.
+#: actions/showapplication.php:260
+msgid "Consumer secret"
+msgstr ""
+
+#. TRANS: Field label on application page.
+#: actions/showapplication.php:263
+msgid "Request token URL"
+msgstr ""
+
+#. TRANS: Field label on application page.
+#: actions/showapplication.php:266
+msgid "Access token URL"
+msgstr ""
+
+#. TRANS: Field label on application page.
+#: actions/showapplication.php:269
+msgid "Authorize URL"
+msgstr ""
+

 #. TRANS: Note on the OAuth application page about signature support.
 #. TRANS: Note on the OAuth application page about signature support.

-#: actions/showapplication.php:272
+#: actions/showapplication.php:275

 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:293
+#: actions/showapplication.php:296

 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 ""
 


@@ -6249,25 +5890,31 @@ msgid "Could not retrieve favorite notices."
 msgstr ""
 
 #. TRANS: Feed link text. %s is a username.
 msgstr ""
 
 #. TRANS: Feed link text. %s is a username.

-#: actions/showfavorites.php:172
+#: actions/showfavorites.php:174

 #, php-format
 #, php-format

-msgid "Feed for favorites of %s (RSS 1.0)"
+msgid "Feed for favorites of %s (Activity Streams JSON)"

 msgstr ""
 
 #. TRANS: Feed link text. %s is a username.
 #: actions/showfavorites.php:180
 #, php-format
 msgstr ""
 
 #. TRANS: Feed link text. %s is a username.
 #: actions/showfavorites.php:180
 #, php-format

-msgid "Feed for favorites of %s (RSS 2.0)"
+msgid "Feed for favorites of %s (RSS 1.0)"

 msgstr ""
 
 #. TRANS: Feed link text. %s is a username.
 #: actions/showfavorites.php:188
 #, php-format
 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.
 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:198
+#: 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."
 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."


@@ -6275,7 +5922,7 @@ msgstr ""
 
 #. TRANS: Text displayed instead of favourite notices for a user that has no favourites while logged in.
 #. TRANS: %s is a username.
 
 #. 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:202
+#: actions/showfavorites.php:210

 #, php-format
 msgid ""
 "%s hasn't added any favorite notices yet. Post something interesting they "
 #, php-format
 msgid ""
 "%s hasn't added any favorite notices yet. Post something interesting they "


@@ -6285,7 +5932,7 @@ 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.
 #. 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:209
+#: actions/showfavorites.php:217

 #, php-format
 msgid ""
 "%s hasn't added any favorite notices yet. Why not [register an account](%%%%"
 #, php-format
 msgid ""
 "%s hasn't added any favorite notices yet. Why not [register an account](%%%%"


@@ -6294,95 +5941,58 @@ msgid ""
 msgstr ""
 
 #. TRANS: Page notice for show favourites page.
 msgstr ""
 
 #. TRANS: Page notice for show favourites page.

-#: actions/showfavorites.php:240
+#: 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.
 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:77
+#: actions/showgroup.php:75

 #, php-format
 msgid "%s group"
 msgstr ""
 
 #. TRANS: Page title for any but first group page.
 #. TRANS: %1$s is a group name, $2$s is a page number.
 #, php-format
 msgid "%s group"
 msgstr ""
 
 #. TRANS: Page title for any but first group page.
 #. TRANS: %1$s is a group name, $2$s is a page number.

-#: actions/showgroup.php:81
+#: actions/showgroup.php:79

 #, php-format
 msgid "%1$s group, page %2$d"
 msgstr ""
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "%1$s group, page %2$d"
 msgstr ""
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.

-#: actions/showgroup.php:227
+#: actions/showgroup.php:181
+#, 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

 #, 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:234
+#: actions/showgroup.php:194

 #, 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:241
+#: actions/showgroup.php:201

 #, 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:247
+#: actions/showgroup.php:207

 #, php-format
 msgid "FOAF for %s group"
 msgstr ""
 
 #, php-format
 msgid "FOAF for %s group"
 msgstr ""
 

-#. TRANS: Header for mini list of group members on a group page (h2).
-#: actions/showgroup.php:284
-msgid "Members"
-msgstr ""
-
-#. TRANS: Description for mini list of group members on a group page when the group has no members.
-#. TRANS: Content of "Listed" page if there are no listed users.
-#. TRANS: Content of "People following tag x" if there are no subscribed users.
-#. TRANS: Empty list message for tags.
-#. TRANS: Text for user subscription statistics if the user has no subscriptions.
-#. 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/showgroup.php:290 actions/showprofiletag.php:300
-#: actions/showprofiletag.php:338 lib/peopletags.php:166
-#: lib/profileaction.php:140 lib/profileaction.php:172
-#: lib/profileaction.php:270 lib/section.php:117
-msgid "(None)"
-msgstr ""
-
-#. TRANS: Link to all group members from mini list of group members if group has more than n members.
-#: actions/showgroup.php:299
-msgid "All members"
-msgstr ""
-
-#. TRANS: Header for group statistics on a group page (h2).
-#. TRANS: H2 text for user statistics.
-#: actions/showgroup.php:330 lib/profileaction.php:196
-msgid "Statistics"
-msgstr ""
-
-#. TRANS: Label for group creation date.
-#: actions/showgroup.php:335
-msgctxt "LABEL"
-msgid "Created"
-msgstr ""
-
-#. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:340
-msgctxt "LABEL"
-msgid "Members"
-msgstr ""
-

 #. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept new registrations.
 #. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept new registrations.

-#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. 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: %%%%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:355
+#: actions/showgroup.php:218

 #, 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."


@@ -6393,21 +6003,15 @@ msgid ""
 msgstr ""
 
 #. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept no new registrations.
 msgstr ""
 
 #. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept no new registrations.

-#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. 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: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).

-#: actions/showgroup.php:365
+#: actions/showgroup.php:227

 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
 "[StatusNet](http://status.net/) tool. Its members share short messages about "
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
 "[StatusNet](http://status.net/) tool. Its members share short messages about "

-"their life and interests. "
-msgstr ""
-
-#. TRANS: Title for list of group administrators on a group page.
-#: actions/showgroup.php:406
-msgctxt "TITLE"
-msgid "Admins"
+"their life and interests."

 msgstr ""
 
 #. TRANS: Client error displayed requesting a single message that does not exist.
 msgstr ""
 
 #. TRANS: Client error displayed requesting a single message that does not exist.


@@ -6446,56 +6050,56 @@ msgstr ""
 
 #. TRANS: Title for private list timeline.
 #. TRANS: %1$s is a list, %2$s is a page number.
 
 #. TRANS: Title for private list timeline.
 #. TRANS: %1$s is a list, %2$s is a page number.

-#: actions/showprofiletag.php:125
+#: actions/showprofiletag.php:129

 #, 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:133
+#: actions/showprofiletag.php:137

 #, 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:139
+#: actions/showprofiletag.php:143

 #, 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:148
+#: actions/showprofiletag.php:152

 #, 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:156
+#: actions/showprofiletag.php:160

 #, 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:162
+#: actions/showprofiletag.php:166

 #, 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:193
+#: actions/showprofiletag.php:208

 #, 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:210
+#: actions/showprofiletag.php:225

 #, 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 "


@@ -6503,13 +6107,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:218
+#: actions/showprofiletag.php:233

 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:223
+#: actions/showprofiletag.php:238

 #, 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 "


@@ -6517,109 +6121,126 @@ msgid ""
 msgstr ""
 
 #. TRANS: Header on show list page.
 msgstr ""
 
 #. TRANS: Header on show list page.

-#: actions/showprofiletag.php:291
+#. 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

 msgid "Listed"
 msgstr ""
 
 msgid "Listed"
 msgstr ""
 

+#. TRANS: Content of "Listed" page if there are no listed users.
+#. 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 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
+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.
 #. 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:312
+#: actions/showprofiletag.php:327

 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:329 lib/peopletaglist.php:183
+#: actions/showprofiletag.php:344 lib/peopletaglist.php:183

 msgid "Subscribers"
 msgstr ""
 
 msgid "Subscribers"
 msgstr ""
 

-#. TRANS: Link for more "People following tag x"
-#. TRANS: if there are more than the mini list's maximum.
-#: actions/showprofiletag.php:350
-msgid "All subscribers"
-msgstr ""
-
-#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: Page title showing tagged notices in one user's timeline.

 #. TRANS: %1$s is the username, %2$s is the hash tag.
 #. TRANS: %1$s is the username, %2$s is the hash tag.

-#: actions/showstream.php:70
+#: actions/showstream.php:89

 #, php-format
 msgid "Notices by %1$s tagged %2$s"
 msgstr ""
 
 #, php-format
 msgid "Notices by %1$s tagged %2$s"
 msgstr ""
 

-#. TRANS: Page title showing tagged notices in one user's stream.
+#. 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.
 #. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.

-#: actions/showstream.php:74
+#: actions/showstream.php:93

 #, php-format
 msgid "Notices by %1$s tagged %2$s, page %3$d"
 msgstr ""
 
 #, 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 stream.
+#. TRANS: Extended page title showing tagged notices in one user's timeline.

 #. TRANS: %1$s is the username, %2$d is the page number.
 #. TRANS: %1$s is the username, %2$d is the page number.

-#: actions/showstream.php:82
+#: actions/showstream.php:101

 #, 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:126
+#: actions/showstream.php:142

 #, 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:135
+#: actions/showstream.php:153
+#, 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

 #, 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:144
+#: actions/showstream.php:169

 #, 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:153
+#: actions/showstream.php:178

 #, 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:160
+#: actions/showstream.php:185

 #, php-format
 msgid "FOAF for %s"
 msgstr ""
 
 #, php-format
 msgid "FOAF for %s"
 msgstr ""
 

-#. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
-#: actions/showstream.php:200
+#. TRANS: First sentence of empty list message for a timeline. $1%s is a user nickname.
+#: actions/showstream.php:225

 #, 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:206
+#: actions/showstream.php:231

 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
 msgstr ""
 
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
 msgstr ""
 

-#. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
+#. 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: This message contains a Markdown link. Keep "](" together.

-#: actions/showstream.php:210
+#: actions/showstream.php:235

 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
 "%?status_textarea=%2$s)."
 msgstr ""
 
 #, php-format
 msgid ""
 "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 stream if site registrations are open.
+#. TRANS: Announcement for anonymous users showing a timeline if site registrations are open.

 #. TRANS: This message contains a Markdown link. Keep "](" together.
 #. TRANS: This message contains a Markdown link. Keep "](" together.

-#: actions/showstream.php:253
+#: actions/showstream.php:274

 #, 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."


@@ -6628,18 +6249,18 @@ msgid ""
 "follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
 msgstr ""
 
 "follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
 msgstr ""
 

-#. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
+#. 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: This message contains a Markdown link. Keep "](" together.

-#: actions/showstream.php:260
+#: actions/showstream.php:281

 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "

-"[StatusNet](http://status.net/) tool. "
+"[StatusNet](http://status.net/) tool."

 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:336
+#: actions/showstream.php:359

 #, php-format
 msgid "Repeat of %s"
 msgstr ""
 #, php-format
 msgid "Repeat of %s"
 msgstr ""


@@ -6667,134 +6288,160 @@ msgid "Basic settings for this StatusNet site"
 msgstr ""
 
 #. TRANS: Client error displayed trying to save an empty site name.
 msgstr ""
 
 #. TRANS: Client error displayed trying to save an empty site name.

-#: actions/siteadminpanel.php:131
+#: actions/siteadminpanel.php:141

 msgid "Site name must have non-zero length."
 msgstr ""
 
 #. TRANS: Client error displayed trying to save site settings without a contact address.
 msgid "Site name must have non-zero length."
 msgstr ""
 
 #. TRANS: Client error displayed trying to save site settings without a contact address.

-#: actions/siteadminpanel.php:140
+#: actions/siteadminpanel.php:150

 msgid "You must have a valid contact email address."
 msgstr ""
 
 msgid "You must have a valid contact email address."
 msgstr ""
 

+#. TRANS: Client error displayed when a logo URL is not valid.
+#: actions/siteadminpanel.php:161
+msgid "Invalid logo URL."
+msgstr ""
+
+#. TRANS: Client error displayed when a SSL logo URL is invalid.
+#: actions/siteadminpanel.php:167
+msgid "Invalid SSL logo URL."
+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:162
+#: actions/siteadminpanel.php:185

 #, 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:169
+#: actions/siteadminpanel.php:192

 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:176
+#: actions/siteadminpanel.php:199

 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:223
+#: actions/siteadminpanel.php:246

 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:227
+#: actions/siteadminpanel.php:250

 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:229
+#: actions/siteadminpanel.php:252

 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:234
+#: actions/siteadminpanel.php:257

 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:236
+#: actions/siteadminpanel.php:259

 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:241
+#: actions/siteadminpanel.php:264

 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:243
+#: actions/siteadminpanel.php:266

 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:247
+#: actions/siteadminpanel.php:270

 msgid "Email"
 msgstr ""
 
 #. TRANS: Field title on site settings panel.
 msgid "Email"
 msgstr ""
 
 #. TRANS: Field title on site settings panel.

-#: actions/siteadminpanel.php:249
+#: actions/siteadminpanel.php:272

 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:256
+#: actions/siteadminpanel.php:281

 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:268
+#: actions/siteadminpanel.php:293

 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:270
+#: actions/siteadminpanel.php:295

 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:277
+#: actions/siteadminpanel.php:302

 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:280
-msgid "Site language when autodetection from browser settings is not available"
+#: actions/siteadminpanel.php:305
+msgid ""
+"The site language when autodetection from browser settings is not available."

 msgstr ""
 
 #. TRANS: Fieldset legend on site settings panel.
 msgstr ""
 
 #. TRANS: Fieldset legend on site settings panel.

-#: actions/siteadminpanel.php:289
+#: actions/siteadminpanel.php:314

 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:294
+#: actions/siteadminpanel.php:319

 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:296
+#: actions/siteadminpanel.php:321

 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:302
+#: actions/siteadminpanel.php:327

 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:304
+#: actions/siteadminpanel.php:329

 msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr ""
 
 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
+msgid "Logo"
+msgstr ""
+
+#. TRANS: Field label for StatusNet site logo.
+#: actions/siteadminpanel.php:346
+msgid "Site logo"
+msgstr ""
+
+#. TRANS: Field label for SSL StatusNet site logo.
+#: actions/siteadminpanel.php:354
+msgid "SSL logo"
+msgstr ""
+

 #. TRANS: Button title for saving site settings.
 #. TRANS: Button title for saving site settings.

-#: actions/siteadminpanel.php:323
-msgid "Save site settings"
+#: actions/siteadminpanel.php:377
+msgid "Save the site settings."

 msgstr ""
 
 #. TRANS: Page title for site-wide notice tab in admin panel.
 msgstr ""
 
 #. TRANS: Page title for site-wide notice tab in admin panel.


@@ -6827,7 +6474,7 @@ msgstr ""
 msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
 msgstr ""
 
 msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
 msgstr ""
 

-#. TRANS: Title for button to save site notice in admin panel.
+#. TRANS: Button title to save site notice in admin panel.

 #: actions/sitenoticeadminpanel.php:201
 msgid "Save site notice."
 msgstr ""
 #: actions/sitenoticeadminpanel.php:201
 msgid "Save site notice."
 msgstr ""


@@ -7056,7 +6703,7 @@ msgstr ""
 msgid "Snapshots will be sent to this URL."
 msgstr ""
 
 msgid "Snapshots will be sent to this URL."
 msgstr ""
 

-#. TRANS: Title for button to save snapshot settings.
+#. TRANS: Button title to save snapshot settings.

 #: actions/snapshotadminpanel.php:256
 msgid "Save snapshot settings."
 msgstr ""
 #: actions/snapshotadminpanel.php:256
 msgid "Save snapshot settings."
 msgstr ""


@@ -7068,7 +6715,7 @@ 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.
 
 #. 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:147
+#: actions/subedit.php:90 classes/Subscription.php:177

 msgid "Could not save subscription."
 msgstr ""
 
 msgid "Could not save subscription."
 msgstr ""
 


@@ -7096,13 +6743,8 @@ msgstr ""
 msgid "A list of users awaiting approval to subscribe to you."
 msgstr ""
 
 msgid "A list of users awaiting approval to subscribe to you."
 msgstr ""
 

-#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
-#: actions/subscribe.php:121
-msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
-msgstr ""
-

 #. TRANS: Page title when subscription succeeded.
 #. TRANS: Page title when subscription succeeded.

-#: actions/subscribe.php:149
+#: actions/subscribe.php:137

 msgid "Subscribed"
 msgstr ""
 
 msgid "Subscribed"
 msgstr ""
 


@@ -7213,60 +6855,66 @@ msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
 "people you know. Try [people search](%%action.peoplesearch%%), look for "
 "members in groups you're interested in and in our [featured users](%%action."
 "You're not listening to anyone's notices right now, try subscribing to "
 "people you know. Try [people search](%%action.peoplesearch%%), look for "
 "members in groups you're interested in and in our [featured users](%%action."

-"featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can "
-"automatically subscribe to people you already follow there."
+"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.
 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.

-#: actions/subscriptions.php:141 actions/subscriptions.php:147
+#: actions/subscriptions.php:139 actions/subscriptions.php:145

 #, 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:166
+#: actions/subscriptions.php:164

 #, 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:231
+#: actions/subscriptions.php:229

 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:246
+#: actions/subscriptions.php:244

 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:67
+#: actions/tag.php:69

 #, 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:87
+#: actions/tag.php:90
+#, 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

 #, 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:95
+#: actions/tag.php:105

 #, 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:103
+#: actions/tag.php:113

 #, php-format
 msgid "Notice feed for tag %s (Atom)"
 msgstr ""
 #, php-format
 msgid "Notice feed for tag %s (Atom)"
 msgstr ""


@@ -7274,7 +6922,7 @@ 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:147 lib/command.php:440
+#: actions/tagprofile.php:56 classes/Profile_tag.php:171 lib/command.php:440

 #: lib/command.php:499
 msgid "You cannot tag this user."
 msgstr ""
 #: lib/command.php:499
 msgid "You cannot tag this user."
 msgstr ""


@@ -7369,17 +7017,6 @@ msgstr ""
 msgid "%1$s unsubscribed from list %2$s by %3$s"
 msgstr ""
 
 msgid "%1$s unsubscribed from list %2$s by %3$s"
 msgstr ""
 

-#. TRANS: Client error displayed when trying to update profile with an incompatible license.
-#. TRANS: %1$s is the license incompatible with site license %2$s.
-#. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
-#. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
-#: actions/updateprofile.php:65 actions/userauthorization.php:343
-#, php-format
-msgid ""
-"Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
-"\"."
-msgstr ""
-

 #. TRANS: Title of URL settings tab in profile settings.
 #: actions/urlsettings.php:57
 msgid "URL settings"
 #. TRANS: Title of URL settings tab in profile settings.
 #: actions/urlsettings.php:57
 msgid "URL settings"


@@ -7542,172 +7179,11 @@ msgstr ""
 msgid "Whether to allow users to invite new users."
 msgstr ""
 
 msgid "Whether to allow users to invite new users."
 msgstr ""
 

-#. TRANS: Title for button to save user settings in user admin panel.
+#. TRANS: Button title to save user settings in user admin panel.

 #: actions/useradminpanel.php:304
 msgid "Save user settings."
 msgstr ""
 
 #: actions/useradminpanel.php:304
 msgid "Save user settings."
 msgstr ""
 

-#. TRANS: Page title.
-#: actions/userauthorization.php:110
-msgid "Authorize subscription"
-msgstr ""
-
-#. TRANS: Page notice on "Authorize subscription" page.
-#: actions/userauthorization.php:116
-msgid ""
-"Please check these details to make sure that you want to subscribe to this "
-"user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
-"click \"Reject\"."
-msgstr ""
-
-#. TRANS: Button text on Authorise Subscription page.
-#. TRANS: Submit button text to accept a group membership request on approve group form.
-#. TRANS: Submit button text to accept a subscription request on approve sub form.
-#: actions/userauthorization.php:203 lib/approvegroupform.php:116
-#: lib/approvesubform.php:110
-msgctxt "BUTTON"
-msgid "Accept"
-msgstr ""
-
-#. TRANS: Title for button on Authorise Subscription page.
-#. TRANS: Button title to subscribe to a user.
-#: actions/userauthorization.php:205 lib/subscribeform.php:132
-msgid "Subscribe to this user."
-msgstr ""
-
-#. TRANS: Button text on Authorise Subscription page.
-#. TRANS: Submit button text to reject a group membership request on approve group form.
-#. TRANS: Submit button text to reject a subscription request on approve sub form.
-#: actions/userauthorization.php:208 lib/approvegroupform.php:118
-#: lib/approvesubform.php:112
-msgctxt "BUTTON"
-msgid "Reject"
-msgstr ""
-
-#. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:210
-msgid "Reject this subscription."
-msgstr ""
-
-#. TRANS: Client error displayed for an empty authorisation request.
-#: actions/userauthorization.php:223
-msgid "No authorization request!"
-msgstr ""
-
-#. TRANS: Accept message header from Authorise subscription page.
-#: actions/userauthorization.php:246
-msgid "Subscription authorized"
-msgstr ""
-
-#. TRANS: Accept message text from Authorise subscription page.
-#: actions/userauthorization.php:249
-msgid ""
-"The subscription has been authorized, but no callback URL was passed. Check "
-"with the site's instructions for details on how to authorize the "
-"subscription. Your subscription token is:"
-msgstr ""
-
-#. TRANS: Reject message header from Authorise subscription page.
-#: actions/userauthorization.php:260
-msgid "Subscription rejected"
-msgstr ""
-
-#. TRANS: Reject message from Authorise subscription page.
-#: actions/userauthorization.php:263
-msgid ""
-"The subscription has been rejected, but no callback URL was passed. Check "
-"with the site's instructions for details on how to fully reject the "
-"subscription."
-msgstr ""
-
-#. TRANS: Exception thrown when no valid user is found for an authorisation request.
-#. TRANS: %s is a listener URI.
-#: actions/userauthorization.php:300
-#, php-format
-msgid "Listener URI \"%s\" not found here."
-msgstr ""
-
-#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:307
-#, php-format
-msgid "Listenee URI \"%s\" is too long."
-msgstr ""
-
-#. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:315
-#, php-format
-msgid "Listenee URI \"%s\" is a local user."
-msgstr ""
-
-#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
-#. TRANS: %s is a profile URL.
-#: actions/userauthorization.php:333
-#, php-format
-msgid "Profile URL \"%s\" is for a local user."
-msgstr ""
-
-#. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:353
-#, php-format
-msgid "Avatar URL \"%s\" is not valid."
-msgstr ""
-
-#. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:360
-#, php-format
-msgid "Cannot read avatar URL \"%s\"."
-msgstr ""
-
-#. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:367
-#, php-format
-msgid "Wrong image type for avatar URL \"%s\"."
-msgstr ""
-
-#. TRANS: Title for profile design page.
-#. TRANS: Page title for profile design page.
-#: actions/userdesignsettings.php:75 lib/designsettings.php:61
-msgid "Profile design"
-msgstr ""
-
-#. TRANS: Instructions for Profile design page.
-#. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:86 lib/designsettings.php:72
-msgid ""
-"Customize the way your profile looks with a background image and a colour "
-"palette of your choice."
-msgstr ""
-
-#. TRANS: Succes message on Profile design page when finding an easter egg.
-#: actions/userdesignsettings.php:297
-msgid "Enjoy your hotdog!"
-msgstr ""
-
-#. TRANS: Form legend on Profile design page.
-#: actions/userdesignsettings.php:335
-msgid "Design settings"
-msgstr ""
-
-#. TRANS: Checkbox label on Profile design page.
-#: actions/userdesignsettings.php:351
-msgid "View profile designs"
-msgstr ""
-
-#. TRANS: Title for checkbox on Profile design page.
-#: actions/userdesignsettings.php:353
-msgid "Show or hide profile designs."
-msgstr ""
-
-#. TRANS: Form legend on Profile design page for form to choose a background image.
-#: actions/userdesignsettings.php:361
-msgid "Background file"
-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.
 #: actions/usergroups.php:67
 #. 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


@@ -7739,7 +7215,7 @@ msgstr ""
 #. TRANS: %1$s is a group name, %2$s is a site name.
 #. 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.
 #. TRANS: %1$s is a group name, %2$s is a site name.
 #. 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:98 lib/atomgroupnoticefeed.php:70
+#: actions/userrss.php:96 lib/atomgroupnoticefeed.php:70

 #: lib/atomusernoticefeed.php:95
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 #: lib/atomusernoticefeed.php:95
 #, php-format
 msgid "Updates from %1$s on %2$s!"


@@ -7756,7 +7232,7 @@ msgstr ""
 #: actions/version.php:151
 #, php-format
 msgid ""
 #: actions/version.php:151
 #, php-format
 msgid ""

-"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
+"This site is powered by %1$s version %2$s, Copyright 2008-2011 StatusNet, "

 "Inc. and contributors."
 msgstr ""
 
 "Inc. and contributors."
 msgstr ""
 


@@ -7766,31 +7242,31 @@ msgid "Contributors"
 msgstr ""
 
 #. TRANS: Header for StatusNet license section on the version page.
 msgstr ""
 
 #. TRANS: Header for StatusNet license section on the version page.

-#: actions/version.php:166
+#: actions/version.php:167

 msgid "License"
 msgstr ""
 
 #. TRANS: Content part of StatusNet version page.
 msgid "License"
 msgstr ""
 
 #. TRANS: Content part of StatusNet version page.

-#: actions/version.php:170
+#: actions/version.php:171

 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 "
 "Software Foundation, either version 3 of the License, or (at your option) "
 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 "
 "Software Foundation, either version 3 of the License, or (at your option) "

-"any later version. "
+"any later version."

 msgstr ""
 
 #. TRANS: Content part of StatusNet version page.
 msgstr ""
 
 #. TRANS: Content part of StatusNet version page.

-#: actions/version.php:177
+#: actions/version.php:178

 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 "
 "FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License "
 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 "
 "FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License "

-"for more details. "
+"for more details."

 msgstr ""
 
 #. TRANS: Content part of StatusNet version page.
 #. TRANS: %s is a link to the AGPL license with link description "http://www.gnu.org/licenses/agpl.html".
 msgstr ""
 
 #. TRANS: Content part of StatusNet version page.
 #. TRANS: %s is a link to the AGPL license with link description "http://www.gnu.org/licenses/agpl.html".

-#: actions/version.php:185
+#: actions/version.php:186

 #, php-format
 msgid ""
 "You should have received a copy of the GNU Affero General Public License "
 #, php-format
 msgid ""
 "You should have received a copy of the GNU Affero General Public License "


@@ -7798,74 +7274,85 @@ msgid ""
 msgstr ""
 
 #. TRANS: Header for StatusNet plugins section on the version page.
 msgstr ""
 
 #. TRANS: Header for StatusNet plugins section on the version page.

-#: actions/version.php:195
+#: actions/version.php:196

 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:202
+#: actions/version.php:203

 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:204
+#: actions/version.php:205

 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:206
+#: actions/version.php:207

 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:208
+#: actions/version.php:209

 msgctxt "HEADER"
 msgid "Description"
 msgstr ""
 
 #. TRANS: Activity title when marking a notice as favorite.
 msgctxt "HEADER"
 msgid "Description"
 msgstr ""
 
 #. TRANS: Activity title when marking a notice as favorite.

-#: classes/Fave.php:112
+#: classes/Fave.php:140

 msgid "Favor"
 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.
 msgid "Favor"
 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:115
+#: classes/Fave.php:143

 #, php-format
 msgid "%1$s marked notice %2$s as a favorite."
 msgstr ""
 
 #. TRANS: Server exception thrown when a URL cannot be processed.
 #, php-format
 msgid "%1$s marked notice %2$s as a favorite."
 msgstr ""
 
 #. TRANS: Server exception thrown when a URL cannot be processed.

-#: classes/File.php:162
+#: classes/File.php:175

 #, php-format
 msgid "Cannot process URL '%s'"
 msgstr ""
 
 #. TRANS: Server exception thrown when... Robin thinks something is impossible!
 #, php-format
 msgid "Cannot process URL '%s'"
 msgstr ""
 
 #. TRANS: Server exception thrown when... Robin thinks something is impossible!

-#: classes/File.php:194
+#: classes/File.php:207

 msgid "Robin thinks something is impossible."
 msgstr ""
 
 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.
+#: classes/File.php:223
+#, 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: Message given if an upload is larger than the configured maximum.

-#. TRANS: %1$d is the byte limit for uploads, %2$d is the byte count for the uploaded file.
-#. TRANS: %1$s is used for plural.
-#: classes/File.php:210
+#. 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

 #, php-format
 msgid ""
 #, php-format
 msgid ""

-"No file may be larger than %1$d byte and the file you sent was %2$d bytes. "
-"Try to upload a smaller version."
+"No file may be larger than %1$d byte and the file you sent was %2$s. Try to "
+"upload a smaller version."

 msgid_plural ""
 msgid_plural ""

-"No file may be larger than %1$d bytes and the file you sent was %2$d bytes. "
-"Try to upload a smaller version."
+"No file may be larger than %1$d bytes and the file you sent was %2$s. Try to "
+"upload a smaller version."

 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.
 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:223
+#: classes/File.php:243

 #, 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."
 #, 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."


@@ -7874,7 +7361,7 @@ 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.
 
 #. 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:235
+#: classes/File.php:255

 #, 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."


@@ -7882,182 +7369,189 @@ 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:282 classes/File.php:297
+#: classes/File.php:302 classes/File.php:317

 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:86
+#: classes/Group_join_queue.php:66 classes/Group_member.php:117

 #, 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:99
+#: classes/Group_join_queue.php:79 classes/Group_member.php:130

 #, 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:52
+#: classes/Group_member.php:83

 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:65
+#: classes/Group_member.php:96

 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:73
+#: classes/Group_member.php:104

 msgid "Group leave failed."
 msgstr ""
 
 #. TRANS: Activity title.
 msgid "Group leave failed."
 msgstr ""
 
 #. TRANS: Activity title.

-#: classes/Group_member.php:148
+#: classes/Group_member.php:176

 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:152
+#: classes/Group_member.php:180

 #, 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:42
+#: classes/Local_group.php:58

 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:78
+#: classes/Login_token.php:81

 #, 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:555
+#: classes/Memcached_DataObject.php:846

 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.
 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:45
+#: 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.
 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:69
+#: classes/Message.php:102

 msgid "Could not insert message."
 msgstr ""
 
 #. TRANS: Message given when a message could not be updated on the server.
 msgid "Could not insert message."
 msgstr ""
 
 #. TRANS: Message given when a message could not be updated on the server.

-#: classes/Message.php:80
+#: 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).
 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:109
+#: classes/Notice.php:167

 #, php-format
 msgid "No such profile (%1$d) for notice (%2$d)."
 msgstr ""
 
 #. TRANS: Server exception. %s are the error details.
 #, php-format
 msgid "No such profile (%1$d) for notice (%2$d)."
 msgstr ""
 
 #. TRANS: Server exception. %s are the error details.

-#: classes/Notice.php:211
+#: classes/Notice.php:274

 #, php-format
 msgid "Database error inserting hashtag: %s."
 msgstr ""
 
 #. TRANS: Client exception thrown if a notice contains too many characters.
 #, php-format
 msgid "Database error inserting hashtag: %s."
 msgstr ""
 
 #. TRANS: Client exception thrown if a notice contains too many characters.

-#: classes/Notice.php:294
+#: 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.
 msgid "Problem saving notice. Too long."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to save a notice for an unknown user.

-#: classes/Notice.php:299
+#: classes/Notice.php:365

 msgid "Problem saving notice. Unknown user."
 msgstr ""
 
 #. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
 msgid "Problem saving notice. Unknown user."
 msgstr ""
 
 #. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.

-#: classes/Notice.php:305
+#: classes/Notice.php:371

 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:312
+#: classes/Notice.php:378

 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:320
+#: classes/Notice.php:386

 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:367
+#: classes/Notice.php:433

 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:372
+#: classes/Notice.php:438

 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:378
+#: classes/Notice.php:444

 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:384
+#: classes/Notice.php:450

 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:389
+#: classes/Notice.php:455

 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:401
+#: classes/Notice.php:467

 #, 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.
 #, 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:490 classes/Notice.php:517
+#: classes/Notice.php:567 classes/Notice.php:594

 msgid "Problem saving notice."
 msgstr ""
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
 msgid "Problem saving notice."
 msgstr ""
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().

-#: classes/Notice.php:1061
+#: classes/Notice.php:1143

 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:1153
+#: classes/Notice.php:1235

 msgid "Problem saving group inbox."
 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.
 msgid "Problem saving group inbox."
 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.

-#: classes/Notice.php:1787
+#: classes/Notice.php:1864

 #, php-format
 msgid "RT @%1$s %2$s"
 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
 #, php-format
 msgid "RT @%1$s %2$s"
 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

-#: classes/Profile.php:186 classes/User_group.php:248
+#: classes/Profile.php:263 classes/User_group.php:307

 #, php-format
 msgctxt "FANCYNAME"
 msgid "%1$s (%2$s)"
 #, php-format
 msgctxt "FANCYNAME"
 msgid "%1$s (%2$s)"


@@ -8065,50 +7559,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:1005
+#: classes/Profile.php:1097

 #, 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:1014
+#: classes/Profile.php:1106

 #, 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:358
+#: classes/Profile_list.php:395

 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:593
+#: classes/Profile_list.php:630

 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:598
+#: classes/Profile_list.php:635

 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:636
+#: classes/Profile_list.php:673

 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:646
+#: classes/Profile_list.php:683

 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:663
+#: classes/Profile_list.php:700

 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:157
+#: classes/Profile_tag.php:181

 #, 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 "


@@ -8116,20 +7610,20 @@ 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:171
+#: classes/Profile_tag.php:195

 #, 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 "

-"allowed number.Try unlisting others first."
+"allowed number. Try unlisting others first."

 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:54
+#: classes/Profile_tag_subscription.php:77

 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:81
+#: classes/Profile_tag_subscription.php:104

 msgid "Removing list subscription failed."
 msgstr ""
 
 msgid "Removing list subscription failed."
 msgstr ""
 


@@ -8139,98 +7633,107 @@ msgid "Missing profile."
 msgstr ""
 
 #. TRANS: Exception thrown when a tag cannot be saved.
 msgstr ""
 
 #. TRANS: Exception thrown when a tag cannot be saved.

-#: classes/Status_network.php:338
+#: classes/Status_network.php:348

 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.

-#. TRANS: Error message displayed to a banned user when they try to subscribe.
-#: classes/Subscription.php:79 lib/oauthstore.php:483
+#: classes/Subscription.php:106

 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:84
+#: classes/Subscription.php:111

 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:89
+#: classes/Subscription.php:116

 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:182
+#: classes/Subscription.php:212

 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:189
+#: classes/Subscription.php:219

 msgid "Could not delete self-subscription."
 msgstr ""
 
 msgid "Could not delete self-subscription."
 msgstr ""
 

-#. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-#: classes/Subscription.php:217
-msgid "Could not delete subscription OMB token."
-msgstr ""
-

 #. TRANS: Exception thrown when a subscription could not be deleted on the server.
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.

-#: classes/Subscription.php:229
+#: classes/Subscription.php:236

 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:271
+#: classes/Subscription.php:275

 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:274
+#: classes/Subscription.php:278

 #, 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:409
+#: classes/User.php:466

 #, 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:813
+#: classes/User.php:865

 msgid "Not implemented since inbox change."
 msgstr ""
 
 #. TRANS: Server exception.
 msgid "Not implemented since inbox change."
 msgstr ""
 
 #. TRANS: Server exception.

-#: classes/User.php:899
+#: classes/User.php:951

 msgid "No single user defined for single-user mode."
 msgstr ""
 
 #. TRANS: Server exception.
 msgid "No single user defined for single-user mode."
 msgstr ""
 
 #. TRANS: Server exception.

-#: classes/User.php:903
+#: classes/User.php:955

 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 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
+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
+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
+msgid "Error saving address confirmation."
+msgstr ""
+

 #. TRANS: Server exception thrown when creating a group failed.
 #. TRANS: Server exception thrown when creating a group failed.

-#: classes/User_group.php:540
+#: classes/User_group.php:606

 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:550
+#: classes/User_group.php:616

 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:573
+#: classes/User_group.php:639

 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:590
+#: classes/User_group.php:656

 msgid "Could not save local group info."
 msgstr ""
 
 msgid "Could not save local group info."
 msgstr ""
 


@@ -8267,45 +7770,45 @@ msgid "User deletion in progress..."
 msgstr ""
 
 #. TRANS: Link title for link on user profile.
 msgstr ""
 
 #. TRANS: Link title for link on user profile.

-#: lib/accountprofileblock.php:151
+#: lib/accountprofileblock.php:148

 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:153
+#: lib/accountprofileblock.php:150 lib/groupprofileblock.php:122

 msgctxt "BUTTON"
 msgid "Edit"
 msgstr ""
 
 #. TRANS: Link title for link on user profile.
 msgctxt "BUTTON"
 msgid "Edit"
 msgstr ""
 
 #. TRANS: Link title for link on user profile.

-#: lib/accountprofileblock.php:180
+#: lib/accountprofileblock.php:177

 msgid "Send a direct message to this user."
 msgstr ""
 
 #. TRANS: Link text for link on user profile.
 msgid "Send a direct message to this user."
 msgstr ""
 
 #. TRANS: Link text for link on user profile.

-#: lib/accountprofileblock.php:182
+#: lib/accountprofileblock.php:179

 msgctxt "BUTTON"
 msgid "Message"
 msgstr ""
 
 #. TRANS: Label text on user profile to select a user role.
 msgctxt "BUTTON"
 msgid "Message"
 msgstr ""
 
 #. TRANS: Label text on user profile to select a user role.

-#: lib/accountprofileblock.php:224
+#: lib/accountprofileblock.php:221

 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:263
+#: lib/accountprofileblock.php:260

 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:266
+#: lib/accountprofileblock.php:263

 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:268
+#: lib/accountprofileblock.php:265

 msgctxt "role"
 msgid "Moderator"
 msgstr ""
 msgctxt "role"
 msgid "Moderator"
 msgstr ""


@@ -8322,25 +7825,25 @@ msgid "Untitled page"
 msgstr ""
 
 #. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
 msgstr ""
 
 #. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.

-#: lib/action.php:361
+#: lib/action.php:363

 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:364
+#: lib/action.php:366

 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:367 lib/threadednoticelist.php:384
+#: lib/action.php:369 lib/threadednoticelist.php:412

 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:617
+#: lib/action.php:627

 msgctxt "TAB"
 msgid "Status"
 msgstr ""
 msgctxt "TAB"
 msgid "Status"
 msgstr ""


@@ -8349,7 +7852,7 @@ msgstr ""
 #. 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:993
+#: lib/action.php:1003

 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."


@@ -8357,7 +7860,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
 msgstr ""
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.

-#: lib/action.php:996
+#: lib/action.php:1006

 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr ""
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr ""


@@ -8366,7 +7869,7 @@ msgstr ""
 #. 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.
 #. 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:1003
+#: lib/action.php:1013

 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"


@@ -8376,39 +7879,39 @@ msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.

-#: lib/action.php:1021
+#: lib/action.php:1031

 #, 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:1028
+#: lib/action.php:1038

 #, 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:1032
+#: lib/action.php:1042

 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:1064
+#: lib/action.php:1074

 #, 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:1410
+#: lib/action.php:1427

 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:1420
+#: lib/action.php:1437

 msgid "Before"
 msgstr ""
 
 msgid "Before"
 msgstr ""
 


@@ -8424,50 +7927,50 @@ msgid "Unknown verb: \"%s\"."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to force a subscription for an untrusted user.
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to force a subscription for an untrusted user.

-#: lib/activityimporter.php:107
+#: lib/activityimporter.php:101

 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:117
+#: lib/activityimporter.php:111

 msgid "Cannot force remote user to subscribe."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to subscribe to an unknown profile.
 msgid "Cannot force remote user to subscribe."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to subscribe to an unknown profile.

-#: lib/activityimporter.php:132
+#: lib/activityimporter.php:126

 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:138
+#: lib/activityimporter.php:132

 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:154
+#: lib/activityimporter.php:148

 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:163
+#: lib/activityimporter.php:157

 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:198
+#: lib/activityimporter.php:192

 #, 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:204
+#: lib/activityimporter.php:198

 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:220
+#: lib/activityimporter.php:214

 #, php-format
 msgid "No content for notice %s."
 msgstr ""
 #, php-format
 msgid "No content for notice %s."
 msgstr ""


@@ -8491,17 +7994,17 @@ msgid "%1$s %2$s %3$s"
 msgstr ""
 
 #. TRANS: Client exception thrown when there is no source attribute.
 msgstr ""
 
 #. TRANS: Client exception thrown when there is no source attribute.

-#: lib/activityutils.php:200
+#: lib/activityutils.php:229

 msgid "Can't handle remote content yet."
 msgstr ""
 
 #. TRANS: Client exception thrown when there embedded XML content is found that cannot be processed yet.
 msgid "Can't handle remote content yet."
 msgstr ""
 
 #. TRANS: Client exception thrown when there embedded XML content is found that cannot be processed yet.

-#: lib/activityutils.php:237
+#: lib/activityutils.php:266

 msgid "Can't handle embedded XML content yet."
 msgstr ""
 
 #. TRANS: Client exception thrown when base64 encoded content is found that cannot be processed yet.
 msgid "Can't handle embedded XML content yet."
 msgstr ""
 
 #. TRANS: Client exception thrown when base64 encoded content is found that cannot be processed yet.

-#: lib/activityutils.php:242
+#: lib/activityutils.php:271

 msgid "Can't handle embedded Base64 content yet."
 msgstr ""
 
 msgid "Can't handle embedded Base64 content yet."
 msgstr ""
 


@@ -8525,143 +8028,113 @@ msgstr ""
 msgid "saveSettings() not implemented."
 msgstr ""
 
 msgid "saveSettings() not implemented."
 msgstr ""
 

-#. TRANS: Client error message thrown if design settings could not be deleted in
-#. TRANS: the admin panel Design.
-#: lib/adminpanelaction.php:274
-msgid "Unable to delete design setting."
-msgstr ""
-

 #. TRANS: Header in administrator navigation panel.
 #. TRANS: Header in administrator navigation panel.

-#. TRANS: Header in settings navigation panel.
-#: lib/adminpanelnav.php:65 lib/settingsnav.php:65
+#: lib/adminpanelnav.php:66

 msgctxt "HEADER"
 msgid "Home"
 msgstr ""
 
 msgctxt "HEADER"
 msgid "Home"
 msgstr ""
 

-#. TRANS: Menu item in administrator navigation panel.
-#. TRANS: Menu item in default local navigation panel.
-#. TRANS: Menu item in personal group navigation menu.
-#. TRANS: Menu item in settings navigation panel.
-#: lib/adminpanelnav.php:70 lib/defaultlocalnav.php:60
-#: lib/personalgroupnav.php:74 lib/settingsnav.php:70
-msgctxt "MENU"
-msgid "Home"
-msgstr ""
-

 #. TRANS: Header in administrator navigation panel.
 #. TRANS: Header in administrator navigation panel.

-#: lib/adminpanelnav.php:81
+#: lib/adminpanelnav.php:84

 msgctxt "HEADER"
 msgid "Admin"
 msgstr ""
 
 #. TRANS: Menu item title in administrator navigation panel.
 msgctxt "HEADER"
 msgid "Admin"
 msgstr ""
 
 #. TRANS: Menu item title in administrator navigation panel.

-#: lib/adminpanelnav.php:88
+#: lib/adminpanelnav.php:91

 msgid "Basic site configuration"
 msgstr ""
 
 #. TRANS: Menu item in administrator navigation panel.
 msgid "Basic site configuration"
 msgstr ""
 
 #. TRANS: Menu item in administrator navigation panel.

-#: lib/adminpanelnav.php:90
+#: lib/adminpanelnav.php:93

 msgctxt "MENU"
 msgid "Site"
 msgstr ""
 
 #. TRANS: Menu item title in administrator navigation panel.
 msgctxt "MENU"
 msgid "Site"
 msgstr ""
 
 #. TRANS: Menu item title in administrator navigation panel.

-#: lib/adminpanelnav.php:96
-msgid "Design configuration"
-msgstr ""
-
-#. TRANS: Menu item in administrator navigation panel.
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: Menu item in settings navigation panel.
-#: lib/adminpanelnav.php:98 lib/groupnav.php:143 lib/settingsnav.php:115
-msgctxt "MENU"
-msgid "Design"
-msgstr ""
-
-#. TRANS: Menu item title in administrator navigation panel.
-#: lib/adminpanelnav.php:104
+#: lib/adminpanelnav.php:99

 msgid "User configuration"
 msgstr ""
 
 #. TRANS: Menu item in administrator navigation panel.
 msgid "User configuration"
 msgstr ""
 
 #. TRANS: Menu item in administrator navigation panel.

-#: lib/adminpanelnav.php:106
+#: lib/adminpanelnav.php:101

 msgctxt "MENU"
 msgid "User"
 msgstr ""
 
 #. TRANS: Menu item title in administrator navigation panel.
 msgctxt "MENU"
 msgid "User"
 msgstr ""
 
 #. TRANS: Menu item title in administrator navigation panel.

-#: lib/adminpanelnav.php:112
+#: lib/adminpanelnav.php:107

 msgid "Access configuration"
 msgstr ""
 
 #. TRANS: Menu item in administrator navigation panel.
 msgid "Access configuration"
 msgstr ""
 
 #. TRANS: Menu item in administrator navigation panel.

-#: lib/adminpanelnav.php:114
+#: lib/adminpanelnav.php:109

 msgctxt "MENU"
 msgid "Access"
 msgstr ""
 
 #. TRANS: Menu item title in administrator navigation panel.
 msgctxt "MENU"
 msgid "Access"
 msgstr ""
 
 #. TRANS: Menu item title in administrator navigation panel.

-#: lib/adminpanelnav.php:120
+#: lib/adminpanelnav.php:115

 msgid "Paths configuration"
 msgstr ""
 
 #. TRANS: Menu item in administrator navigation panel.
 msgid "Paths configuration"
 msgstr ""
 
 #. TRANS: Menu item in administrator navigation panel.

-#: lib/adminpanelnav.php:122
+#: lib/adminpanelnav.php:117

 msgctxt "MENU"
 msgid "Paths"
 msgstr ""
 
 #. TRANS: Menu item title in administrator navigation panel.
 msgctxt "MENU"
 msgid "Paths"
 msgstr ""
 
 #. TRANS: Menu item title in administrator navigation panel.

-#: lib/adminpanelnav.php:128
+#: lib/adminpanelnav.php:123

 msgid "Sessions configuration"
 msgstr ""
 
 #. TRANS: Menu item in administrator navigation panel.
 msgid "Sessions configuration"
 msgstr ""
 
 #. TRANS: Menu item in administrator navigation panel.

-#: lib/adminpanelnav.php:130
+#: lib/adminpanelnav.php:125

 msgctxt "MENU"
 msgid "Sessions"
 msgstr ""
 
 #. TRANS: Menu item title in administrator navigation panel.
 msgctxt "MENU"
 msgid "Sessions"
 msgstr ""
 
 #. TRANS: Menu item title in administrator navigation panel.

-#: lib/adminpanelnav.php:136
+#: lib/adminpanelnav.php:131

 msgid "Edit site notice"
 msgstr ""
 
 #. TRANS: Menu item in administrator navigation panel.
 msgid "Edit site notice"
 msgstr ""
 
 #. TRANS: Menu item in administrator navigation panel.

-#: lib/adminpanelnav.php:138
+#: lib/adminpanelnav.php:133

 msgctxt "MENU"
 msgid "Site notice"
 msgstr ""
 
 #. TRANS: Menu item title in administrator navigation panel.
 msgctxt "MENU"
 msgid "Site notice"
 msgstr ""
 
 #. TRANS: Menu item title in administrator navigation panel.

-#: lib/adminpanelnav.php:144
+#: lib/adminpanelnav.php:139

 msgid "Snapshots configuration"
 msgstr ""
 
 #. TRANS: Menu item in administrator navigation panel.
 msgid "Snapshots configuration"
 msgstr ""
 
 #. TRANS: Menu item in administrator navigation panel.

-#: lib/adminpanelnav.php:146
+#: lib/adminpanelnav.php:141

 msgctxt "MENU"
 msgid "Snapshots"
 msgstr ""
 
 #. TRANS: Menu item title in administrator navigation panel.
 msgctxt "MENU"
 msgid "Snapshots"
 msgstr ""
 
 #. TRANS: Menu item title in administrator navigation panel.

-#: lib/adminpanelnav.php:152
+#: lib/adminpanelnav.php:147

 msgid "Set site license"
 msgstr ""
 
 #. TRANS: Menu item in administrator navigation panel.
 msgid "Set site license"
 msgstr ""
 
 #. TRANS: Menu item in administrator navigation panel.

-#: lib/adminpanelnav.php:154
+#: lib/adminpanelnav.php:149

 msgctxt "MENU"
 msgid "License"
 msgstr ""
 
 #. TRANS: Menu item title in administrator navigation panel.
 msgctxt "MENU"
 msgid "License"
 msgstr ""
 
 #. TRANS: Menu item title in administrator navigation panel.

-#: lib/adminpanelnav.php:160
+#: lib/adminpanelnav.php:155

 msgid "Plugins configuration"
 msgstr ""
 
 #. TRANS: Menu item in administrator navigation panel.
 msgid "Plugins configuration"
 msgstr ""
 
 #. TRANS: Menu item in administrator navigation panel.

-#: lib/adminpanelnav.php:162
+#: lib/adminpanelnav.php:157

 msgctxt "MENU"
 msgid "Plugins"
 msgstr ""
 msgctxt "MENU"
 msgid "Plugins"
 msgstr ""


@@ -8677,67 +8150,26 @@ msgid "No application for that consumer key."
 msgstr ""
 
 #. TRANS: Authorization exception thrown when a user without API access tries to access the API.
 msgstr ""
 
 #. TRANS: Authorization exception thrown when a user without API access tries to access the API.

-#: lib/apiauth.php:203 lib/apiauth.php:286
+#: 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.
 msgid "Not allowed to use API."
 msgstr ""
 
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.

-#: lib/apiauth.php:226
+#: lib/apiauth.php:231

 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:231
+#: lib/apiauth.php:236

 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.
 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.

-#: lib/apiauth.php:273 lib/apiauth.php:304
+#: lib/apiauth.php:278 lib/apiauth.php:309

 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/apioauthstore.php:46
-msgid "Could not create anonymous consumer."
-msgstr ""
-
-#. TRANS: Server error displayed when trying to create an anynymous OAuth application.
-#: lib/apioauthstore.php:70
-msgid "Could not create anonymous OAuth application."
-msgstr ""
-
-#. TRANS: Exception thrown when no token association could be found.
-#: lib/apioauthstore.php:152
-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/apioauthstore.php:210
-msgid "Could not issue access token."
-msgstr ""
-
-#. TRANS: Exception thrown when a database error occurs.
-#: lib/apioauthstore.php:318
-msgid "Database error inserting OAuth application user."
-msgstr ""
-
-#. TRANS: Exception thrown when a database error occurs.
-#: lib/apioauthstore.php:346
-msgid "Database error updating OAuth application user."
-msgstr ""
-
-#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-#: lib/apioauthstore.php:372
-msgid "Tried to revoke unknown token."
-msgstr ""
-
-#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-#: lib/apioauthstore.php:377
-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"


@@ -8838,13 +8270,12 @@ msgstr ""
 
 #. TRANS: Submit button title.
 #: lib/applicationeditform.php:353
 
 #. TRANS: Submit button title.
 #: lib/applicationeditform.php:353

-msgid "Cancel"
+msgid "Cancel application changes."

 msgstr ""
 
 #. TRANS: Submit button title.
 msgstr ""
 
 #. TRANS: Submit button title.

-#. TRANS: Button text to save a list.
-#: lib/applicationeditform.php:357 lib/peopletageditform.php:168
-msgid "Save"
+#: lib/applicationeditform.php:357
+msgid "Save application changes."

 msgstr ""
 
 #. TRANS: Name for an anonymous application in application list.
 msgstr ""
 
 #. TRANS: Name for an anonymous application in application list.


@@ -8887,6 +8318,20 @@ msgctxt "BUTTON"
 msgid "Revoke"
 msgstr ""
 
 msgid "Revoke"
 msgstr ""
 

+#. TRANS: Submit button text to accept a group membership request on approve group form.
+#. TRANS: Submit button text to accept a subscription request on approve sub form.
+#: lib/approvegroupform.php:116 lib/approvesubform.php:110
+msgctxt "BUTTON"
+msgid "Accept"
+msgstr ""
+
+#. TRANS: Submit button text to reject a group membership request on approve group form.
+#. TRANS: Submit button text to reject a subscription request on approve sub form.
+#: lib/approvegroupform.php:118 lib/approvesubform.php:112
+msgctxt "BUTTON"
+msgid "Reject"
+msgstr ""
+

 #. TRANS: Atom feed exception thrown when an author element does not contain a name element.
 #: lib/atom10feed.php:113
 msgid "Author element must contain a name element."
 #. TRANS: Atom feed exception thrown when an author element does not contain a name element.
 #: lib/atom10feed.php:113
 msgid "Author element must contain a name element."


@@ -8911,7 +8356,7 @@ msgid "Updates from %1$s's list %2$s on %3$s!"
 msgstr ""
 
 #. TRANS: Title.
 msgstr ""
 
 #. TRANS: Title.

-#: lib/attachmentnoticesection.php:67
+#: lib/attachmentnoticesection.php:68

 msgid "Notices where this attachment appears"
 msgstr ""
 
 msgid "Notices where this attachment appears"
 msgstr ""
 


@@ -9069,8 +8514,8 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Separator for list of tags.
 msgstr[1] ""
 
 #. TRANS: Separator for list of tags.

-#. TRANS: Separator in list of user names like "You, Bob, Mary".
-#: lib/command.php:481 lib/command.php:534 lib/threadednoticelist.php:445
+#. TRANS: Separator in list of user names like "Jim, Bob, Mary".
+#: lib/command.php:481 lib/command.php:534 lib/threadednoticelist.php:472

 msgid ", "
 msgstr ""
 
 msgid ", "
 msgstr ""
 


@@ -9115,7 +8560,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:339
+#: lib/command.php:561 lib/mail.php:345

 #, php-format
 msgid "Location: %s"
 msgstr ""
 #, php-format
 msgid "Location: %s"
 msgstr ""


@@ -9123,7 +8568,7 @@ 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:344
+#: lib/command.php:565 lib/mail.php:350

 #, php-format
 msgid "Homepage: %s"
 msgstr ""
 #, php-format
 msgid "Homepage: %s"
 msgstr ""


@@ -9147,7 +8592,7 @@ msgstr ""
 #. 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).
 #. 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:492
+#: 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."
 #, 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."


@@ -9530,6 +8975,12 @@ msgstr ""
 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"


@@ -9537,20 +8988,11 @@ 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:66
+#: lib/defaultlocalnav.php:65 lib/publicgroupnav.php:67

 msgctxt "MENU"
 msgid "Public"
 msgstr ""
 
 msgctxt "MENU"
 msgid "Public"
 msgstr ""
 

-#. TRANS: Menu item in default local navigation panel.
-#. TRANS: Menu item in search group navigation panel.
-#. TRANS: Menu item in local navigation menu.
-#: lib/defaultlocalnav.php:71 lib/publicgroupnav.php:71
-#: lib/searchgroupnav.php:82 lib/subgroupnav.php:124
-msgctxt "MENU"
-msgid "Groups"
-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
 #. TRANS: Menu item in default local navigation panel.
 #. TRANS: Menu item title in local navigation menu.
 #: lib/defaultlocalnav.php:79 lib/subgroupnav.php:135


@@ -9560,7 +9002,7 @@ msgstr ""
 
 #. TRANS: Title of form for deleting a user.
 #. TRANS: Link text in notice list item to delete a notice.
 
 #. 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:653
+#: lib/deleteuserform.php:64 lib/noticelistitem.php:680

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


@@ -9569,50 +9011,6 @@ msgstr ""
 msgid "Delete this user"
 msgstr ""
 
 msgid "Delete this user"
 msgstr ""
 

-#. TRANS: Form legend of form for changing the page design.
-#: lib/designform.php:110
-msgid "Change design"
-msgstr ""
-
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: lib/designform.php:126
-msgid "Change colours"
-msgstr ""
-
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: lib/designform.php:133
-msgid "Use defaults"
-msgstr ""
-
-#. TRANS: Label in form on profile design page.
-#. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
-#: lib/designform.php:153
-msgid "Upload file"
-msgstr ""
-
-#. TRANS: Instructions for form on profile design page.
-#: lib/designform.php:158
-msgid ""
-"You can upload your personal background image. The maximum file size is 2MB."
-msgstr ""
-
-#. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-#: lib/designform.php:189
-msgctxt "RADIO"
-msgid "On"
-msgstr ""
-
-#. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-#: lib/designform.php:206
-msgctxt "RADIO"
-msgid "Off"
-msgstr ""
-
-#. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
-#: lib/designsettings.php:245
-msgid "Design defaults restored."
-msgstr ""
-

 #. TRANS: Exception. %s is an ID.
 #: lib/discovery.php:153
 #, php-format
 #. TRANS: Exception. %s is an ID.
 #: lib/discovery.php:153
 #, php-format


@@ -9620,8 +9018,7 @@ msgid "Unable to find services for %s."
 msgstr ""
 
 #. TRANS: Form legend for removing the favourite status for a favourite notice.
 msgstr ""
 
 #. TRANS: Form legend for removing the favourite status for a favourite notice.

-#. TRANS: Title for button text for removing the favourite status for a favourite notice.
-#: lib/disfavorform.php:108 lib/disfavorform.php:140
+#: lib/disfavorform.php:108

 msgid "Disfavor this notice"
 msgstr ""
 
 msgid "Disfavor this notice"
 msgstr ""
 


@@ -9631,9 +9028,13 @@ msgctxt "BUTTON"
 msgid "Disfavor favorite"
 msgstr ""
 
 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.
 #. TRANS: Form legend for adding the favourite status to a notice.

-#. TRANS: Title for button text for adding the favourite status to a notice.
-#: lib/favorform.php:108 lib/favorform.php:139
+#: lib/favorform.php:108

 msgid "Favor this notice"
 msgstr ""
 
 msgid "Favor this notice"
 msgstr ""
 


@@ -9643,26 +9044,36 @@ msgctxt "BUTTON"
 msgid "Favor"
 msgstr ""
 
 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."
+msgstr ""
+

 #. TRANS: Feed type name.
 #. TRANS: Feed type name.

-#: lib/feed.php:85
+#: lib/feed.php:88

 msgid "RSS 1.0"
 msgstr ""
 
 #. TRANS: Feed type name.
 msgid "RSS 1.0"
 msgstr ""
 
 #. TRANS: Feed type name.

-#: lib/feed.php:88
+#: lib/feed.php:91

 msgid "RSS 2.0"
 msgstr ""
 
 #. TRANS: Feed type name.
 msgid "RSS 2.0"
 msgstr ""
 
 #. TRANS: Feed type name.

-#: lib/feed.php:91
+#: lib/feed.php:94

 msgid "Atom"
 msgstr ""
 
 #. TRANS: Feed type name. FOAF stands for Friend of a Friend.
 msgid "Atom"
 msgstr ""
 
 #. TRANS: Feed type name. FOAF stands for Friend of a Friend.

-#: lib/feed.php:94
+#: lib/feed.php:97

 msgid "FOAF"
 msgstr ""
 
 msgid "FOAF"
 msgstr ""
 

+#. TRANS: Feed type name. See http://activitystrea.ms/
+#: lib/feed.php:100
+msgid "Activity Streams"
+msgstr ""
+

 #. TRANS: Client exception thrown when an imported feed does not have an author.
 #: lib/feedimporter.php:82
 msgid "No author in the feed."
 #. TRANS: Client exception thrown when an imported feed does not have an author.
 #: lib/feedimporter.php:82
 msgid "No author in the feed."


@@ -9701,6 +9112,32 @@ msgstr ""
 msgid "Grant this user the \"%s\" role"
 msgstr ""
 
 msgid "Grant this user the \"%s\" role"
 msgstr ""
 

+#. TRANS: Header for mini list of group members on a group page (h2).
+#: lib/groupaction.php:151
+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
+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
+msgid "Pending"
+msgstr ""
+
+#. TRANS: Header for mini list of users that are blocked in a group page (h2).
+#: lib/groupaction.php:244
+msgid "Blocked"
+msgstr ""
+
+#. TRANS: Title for list of group administrators on a group page.
+#: lib/groupaction.php:316
+msgctxt "TITLE"
+msgid "Admins"
+msgstr ""
+

 #. TRANS: Button text for the form that will block a user from a group.
 #: lib/groupblockform.php:124
 msgctxt "BUTTON"
 #. TRANS: Button text for the form that will block a user from a group.
 #: lib/groupblockform.php:124
 msgctxt "BUTTON"


@@ -9710,7 +9147,7 @@ msgstr ""
 #. TRANS: Submit button title.
 #: lib/groupblockform.php:128
 msgctxt "TOOLTIP"
 #. TRANS: Submit button title.
 #: lib/groupblockform.php:128
 msgctxt "TOOLTIP"

-msgid "Block this user"
+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.


@@ -9768,106 +9205,31 @@ msgctxt "GROUPADMIN"
 msgid "Admin"
 msgstr ""
 
 msgid "Admin"
 msgstr ""
 

-#. TRANS: Menu item in the group navigation page.
-#: lib/groupnav.php:81
-msgctxt "MENU"
-msgid "Group"
-msgstr ""
-
-#. TRANS: Tooltip for menu item in the group navigation page.
-#. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:84
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s group"
-msgstr ""
-
-#. TRANS: Menu item in the group navigation page.
-#: lib/groupnav.php:90
-msgctxt "MENU"
-msgid "Members"
-msgstr ""
-
-#. TRANS: Tooltip for menu item in the group navigation page.
-#. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:93
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s group members"
-msgstr ""
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %d is the number of pending members.
-#: lib/groupnav.php:106
-#, php-format
-msgctxt "MENU"
-msgid "Pending members (%d)"
-msgid_plural "Pending members (%d)"
-msgstr[0] ""
-msgstr[1] ""
-
-#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:109
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s pending members"
-msgstr ""
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:116
-msgctxt "MENU"
-msgid "Blocked"
-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/groupnav.php:119
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s blocked users"
-msgstr ""
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: Menu item in primary navigation panel.
-#: lib/groupnav.php:125 lib/primarynav.php:66
-msgctxt "MENU"
-msgid "Admin"
+#. TRANS: Group actions header (h2). Text hidden by default.
+#: lib/groupprofileblock.php:93
+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.
 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/groupnav.php:128
+#: lib/groupprofileblock.php:120

 #, php-format
 msgctxt "TOOLTIP"
 msgid "Edit %s group properties"
 msgstr ""
 
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Edit %s group properties"
 msgstr ""
 

-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:134
-msgctxt "MENU"
-msgid "Logo"
-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/groupnav.php:137
+#: lib/groupprofileblock.php:129

 #, php-format
 msgctxt "TOOLTIP"
 msgid "Add or edit %s logo"
 msgstr ""
 
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Add or edit %s logo"
 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/groupnav.php:146
-#, php-format
-msgctxt "TOOLTIP"
-msgid "Add or edit %s design"
-msgstr ""
-
-#. TRANS: Group actions header (h2). Text hidden by default.
-#: lib/groupprofileblock.php:94
-msgid "Group actions"
+#. TRANS: Link text for link on user profile.
+#: lib/groupprofileblock.php:131
+msgctxt "MENU"
+msgid "Logo"

 msgstr ""
 
 #. TRANS: Title for groups with the most members section.
 msgstr ""
 
 #. TRANS: Title for groups with the most members section.


@@ -9880,11 +9242,21 @@ msgstr ""
 msgid "Active groups"
 msgstr ""
 
 msgid "Active groups"
 msgstr ""
 

-#. TRANS: Title for group tag cloud section.
-#. TRANS: %s is a group name.
-#: lib/grouptagcloudsection.php:57
-#, php-format
-msgid "Tags in %s group's notices"
+#. TRANS: Link description for seeing all groups.
+#. TRANS: Link description for seeing all lists.
+#: lib/groupsnav.php:89 lib/listsnav.php:88
+msgid "See all"
+msgstr ""
+
+#. TRANS: Link title for seeing all groups.
+#: lib/groupsnav.php:91
+msgid "See all groups you belong to."
+msgstr ""
+
+#. TRANS: Menu item title in personal group navigation menu.
+#. TRANS: %s is a username.
+#: lib/homestubnav.php:58
+msgid "Back to top"

 msgstr ""
 
 #. TRANS: Client exception 406
 msgstr ""
 
 #. TRANS: Client exception 406


@@ -9952,7 +9324,7 @@ msgstr[1] ""
 #. TRANS: Body text for confirmation code e-mail.
 #. TRANS: %1$s is a user nickname, %2$s is the StatusNet sitename,
 #. TRANS: %3$s is the display name of an IM plugin.
 #. TRANS: Body text for confirmation code e-mail.
 #. TRANS: %1$s is a user nickname, %2$s is the StatusNet sitename,
 #. TRANS: %3$s is the display name of an IM plugin.

-#: lib/implugin.php:265
+#: lib/implugin.php:264

 #, php-format
 msgid ""
 "User \"%1$s\" on %2$s has said that your %3$s screenname belongs to them. If "
 #, php-format
 msgid ""
 "User \"%1$s\" on %2$s has said that your %3$s screenname belongs to them. If "


@@ -9964,18 +9336,18 @@ msgstr ""
 
 #. TRANS: Exception thrown when trying to deliver a notice to an unknown inbox.
 #. TRANS: %d is the unknown inbox ID (number).
 
 #. TRANS: Exception thrown when trying to deliver a notice to an unknown inbox.
 #. TRANS: %d is the unknown inbox ID (number).

-#: lib/implugin.php:353
+#: lib/implugin.php:352

 #, php-format
 msgid "Unknown inbox source %d."
 msgstr ""
 
 #. TRANS: Server exception thrown trying to initialise an IM plugin without meeting all prerequisites.
 #, php-format
 msgid "Unknown inbox source %d."
 msgstr ""
 
 #. TRANS: Server exception thrown trying to initialise an IM plugin without meeting all prerequisites.

-#: lib/implugin.php:629
+#: lib/implugin.php:633

 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:634
+#: lib/implugin.php:638

 msgid "Transport cannot be null."
 msgstr ""
 
 msgid "Transport cannot be null."
 msgstr ""
 


@@ -9985,12 +9357,49 @@ msgctxt "TITLE"
 msgid "Trends"
 msgstr ""
 
 msgid "Trends"
 msgstr ""
 

-#. TRANS: Button text for inviting more users to the StatusNet instance.
-#: lib/invitebuttonsection.php:60
+#. TRANS: Default button text for inviting more users to the StatusNet instance.
+#: lib/invitebuttonsection.php:56

 msgctxt "BUTTON"
 msgid "Invite more colleagues"
 msgstr ""
 
 msgctxt "BUTTON"
 msgid "Invite more colleagues"
 msgstr ""
 

+#. TRANS: Form legend.
+#: lib/inviteform.php:85
+msgid "Invite collegues"
+msgstr ""
+
+#. TRANS: Field label for a list of e-mail addresses.
+#: lib/inviteform.php:100
+msgid "Email addresses"
+msgstr ""
+
+#. TRANS: Field title for a list of e-mail addresses.
+#: lib/inviteform.php:103
+msgid "Addresses of friends to invite (one per line)."
+msgstr ""
+
+#. TRANS: Field label for a personal message to send to invitees.
+#: lib/inviteform.php:109
+msgid "Personal message"
+msgstr ""
+
+#. TRANS: Field title for a personal message to send to invitees.
+#: lib/inviteform.php:112
+msgid "Optionally add a personal message to the invitation."
+msgstr ""
+
+#. TRANS: Send button for inviting friends
+#. TRANS: Button text for sending notice.
+#: lib/inviteform.php:128 lib/noticeform.php:302
+msgctxt "BUTTON"
+msgid "Send"
+msgstr ""
+
+#. TRANS: Submit button title.
+#: lib/inviteform.php:131
+msgid "Send invitations."
+msgstr ""
+

 #. TRANS: Button text for joining a group.
 #: lib/joinform.php:108
 msgctxt "BUTTON"
 #. TRANS: Button text for joining a group.
 #: lib/joinform.php:108
 msgctxt "BUTTON"


@@ -10003,6 +9412,11 @@ msgctxt "BUTTON"
 msgid "Leave"
 msgstr ""
 
 msgid "Leave"
 msgstr ""
 

+#. TRANS: Link title for seeing all lists.
+#: lib/listsnav.php:90
+msgid "See all lists you have created."
+msgstr ""
+

 #. TRANS: Menu item for logging in to the StatusNet site.
 #. TRANS: Menu item in primary navigation panel.
 #: lib/logingroupnav.php:64 lib/primarynav.php:82
 #. TRANS: Menu item for logging in to the StatusNet site.
 #. TRANS: Menu item in primary navigation panel.
 #: lib/logingroupnav.php:64 lib/primarynav.php:82


@@ -10027,14 +9441,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:172
+#: lib/mail.php:179

 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:177
+#: lib/mail.php:184

 #, php-format
 msgid ""
 "Hey, %1$s.\n"
 #, php-format
 msgid ""
 "Hey, %1$s.\n"


@@ -10055,21 +9469,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:243 lib/mail.php:250
+#: lib/mail.php:250 lib/mail.php:256

 #, php-format
 #, php-format

-msgid "%1$s is now listening to your notices on %2$s."
+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.
 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:284
+#: lib/mail.php:290

 #, 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:291
+#: lib/mail.php:297

 #, 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 "


@@ -10079,7 +9493,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:310
+#: lib/mail.php:316

 #, php-format
 msgid ""
 "Faithfully yours,\n"
 #, php-format
 msgid ""
 "Faithfully yours,\n"


@@ -10091,21 +9505,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:335
+#: lib/mail.php:341

 #, 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:349
+#: lib/mail.php:355

 #, 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:359
+#: lib/mail.php:365

 #, 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 "


@@ -10114,7 +9528,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:387
+#: lib/mail.php:393

 #, php-format
 msgid "New email address for posting to %s"
 msgstr ""
 #, php-format
 msgid "New email address for posting to %s"
 msgstr ""


@@ -10122,7 +9536,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:393
+#: lib/mail.php:399

 #, 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"


@@ -10134,26 +9548,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:514
+#: lib/mail.php:523

 #, 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:540
+#: lib/mail.php:549

 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:544
+#: lib/mail.php:553

 #, 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:565
+#: lib/mail.php:574

 #, php-format
 msgid "You have been nudged by %s"
 msgstr ""
 #, php-format
 msgid "You have been nudged by %s"
 msgstr ""


@@ -10161,7 +9575,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:572
+#: lib/mail.php:581

 #, 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 "


@@ -10176,7 +9590,7 @@ 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:617
+#: lib/mail.php:626

 #, php-format
 msgid "New private message from %s"
 msgstr ""
 #, php-format
 msgid "New private message from %s"
 msgstr ""


@@ -10184,7 +9598,7 @@ 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,
 #. 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:624
+#: lib/mail.php:633

 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"


@@ -10202,7 +9616,7 @@ 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.
 
 #. 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:674
+#: lib/mail.php:683

 #, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
 msgstr ""
 #, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
 msgstr ""


@@ -10212,7 +9626,7 @@ msgstr ""
 #. 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.
 #. 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:681
+#: lib/mail.php:690

 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"


@@ -10231,7 +9645,7 @@ msgid ""
 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:738
+#: lib/mail.php:747

 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"


@@ -10241,7 +9655,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:746
+#: lib/mail.php:755

 #, 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 ""


@@ -10249,9 +9663,9 @@ msgstr ""
 #. TRANS: Body of @-reply notification e-mail.
 #. TRANS: %1$s is the sending user's name, $2$s is the StatusNet sitename,
 #. TRANS: %3$s is a URL to the notice, %4$s is the notice text,
 #. TRANS: Body of @-reply notification e-mail.
 #. TRANS: %1$s is the sending user's name, $2$s is the StatusNet sitename,
 #. TRANS: %3$s is a URL to the notice, %4$s is the notice text,

-#. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
+#. 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: %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:753
+#: lib/mail.php:762

 #, 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"


@@ -10275,18 +9689,23 @@ 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
+#, php-format
+msgid "%1$s has joined your group %2$s on %3$s"
+msgstr ""
+

 #. TRANS: Main body of group join 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 a block of profile info about the subscriber.
 #. TRANS: %5$s is a link to the addressed user's e-mail settings.
 #. TRANS: Main body of group join 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 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:824 lib/mail.php:834
+#: lib/mail.php:843

 #, 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:871
+#: lib/mail.php:880

 #, 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 ""


@@ -10294,7 +9713,7 @@ 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:879
+#: lib/mail.php:888

 #, php-format
 msgid ""
 "%1$s would like to join your group %2$s on %3$s. You may approve or reject "
 #, php-format
 msgid ""
 "%1$s would like to join your group %2$s on %3$s. You may approve or reject "


@@ -10376,7 +9795,7 @@ msgstr ""
 #. TRANS: Submit button title.
 #: lib/makeadminform.php:124
 msgctxt "TOOLTIP"
 #. TRANS: Submit button title.
 #: lib/makeadminform.php:124
 msgctxt "TOOLTIP"

-msgid "Make this user an admin"
+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.


@@ -10430,7 +9849,7 @@ msgstr ""
 msgid "Select recipient:"
 msgstr ""
 
 msgid "Select recipient:"
 msgstr ""
 

-#. TRANS Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
+#. 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 ""
 #: lib/messageform.php:145
 msgid "No mutual subscribers."
 msgstr ""


@@ -10453,12 +9872,12 @@ msgstr ""
 
 #. TRANS: Followed by notice source (usually the client used to send the notice).
 #. TRANS: Followed by notice source.
 
 #. 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:500
+#: lib/messagelistitem.php:123 lib/noticelistitem.php:526

 msgid "from"
 msgstr ""
 
 #. TRANS: A possible notice source (web interface).
 msgid "from"
 msgstr ""
 
 #. TRANS: A possible notice source (web interface).

-#: lib/messagelistitem.php:144 lib/noticelistitem.php:495
+#: lib/messagelistitem.php:144 lib/noticelistitem.php:521

 msgctxt "SOURCE"
 msgid "web"
 msgstr ""
 msgctxt "SOURCE"
 msgid "web"
 msgstr ""


@@ -10488,30 +9907,35 @@ msgid "api"
 msgstr ""
 
 #. TRANS: Client exception thrown when no author for an activity was found.
 msgstr ""
 
 #. TRANS: Client exception thrown when no author for an activity was found.

-#: lib/microappplugin.php:356
+#: lib/microappplugin.php:358

 msgid "Cannot get author for activity."
 msgstr ""
 
 #. TRANS: Client exception thrown when ...
 msgid "Cannot get author for activity."
 msgstr ""
 
 #. TRANS: Client exception thrown when ...

-#: lib/microappplugin.php:394
+#: lib/microappplugin.php:396

 msgid "Bookmark not posted to this group."
 msgstr ""
 
 #. TRANS: Client exception when ...
 msgid "Bookmark not posted to this group."
 msgstr ""
 
 #. TRANS: Client exception when ...

-#: lib/microappplugin.php:408
+#: lib/microappplugin.php:410

 msgid "Object not posted to this user."
 msgstr ""
 
 #. TRANS: Server exception thrown when a micro app plugin uses a target that cannot be handled.
 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/microappplugin.php:412
+#: lib/microappplugin.php:414

 msgid "Do not know how to handle this kind of target."
 msgstr ""
 
 #. TRANS: Server exception thrown when a micro app plugin developer has not done his job too well.
 msgid "Do not know how to handle this kind of target."
 msgstr ""
 
 #. TRANS: Server exception thrown when a micro app plugin developer has not done his job too well.

-#: lib/microappplugin.php:554
+#: lib/microappplugin.php:556

 msgid "You must implement either adaptNoticeListItem() or showNotice()."
 msgstr ""
 
 msgid "You must implement either adaptNoticeListItem() or showNotice()."
 msgstr ""
 

+#. TRANS: Link description to show more items in a list.
+#: lib/moremenu.php:98
+msgid "More ▼"
+msgstr ""
+

 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 #: lib/nickname.php:178
 msgid "Nickname cannot be empty."
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 #: lib/nickname.php:178
 msgid "Nickname cannot be empty."


@@ -10564,33 +9988,28 @@ msgid ""
 msgstr ""
 
 #. TRANS: Separator in profile addressees list.
 msgstr ""
 
 #. TRANS: Separator in profile addressees list.

-#: lib/noticelistitem.php:246 lib/noticelistitem.php:272
+#: lib/noticelistitem.php:255

 msgctxt "SEPARATOR"
 msgid ", "
 msgstr ""
 
 msgctxt "SEPARATOR"
 msgid ", "
 msgstr ""
 

-#. TRANS: Start of profile addressees list.
-#: lib/noticelistitem.php:248 lib/noticelistitem.php:275
-msgid " ▸ "
-msgstr ""
-

 #. TRANS: Used in coordinates as abbreviation of north.
 #. TRANS: Used in coordinates as abbreviation of north.

-#: lib/noticelistitem.php:423
+#: lib/noticelistitem.php:449

 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:425
+#: lib/noticelistitem.php:451

 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:427
+#: lib/noticelistitem.php:453

 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:429
+#: lib/noticelistitem.php:455

 msgid "W"
 msgstr ""
 
 msgid "W"
 msgstr ""
 


@@ -10599,43 +10018,43 @@ 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:436
+#: lib/noticelistitem.php:462

 #, 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:446
+#: lib/noticelistitem.php:472

 msgid "at"
 msgstr ""
 
 #. TRANS: Addition in notice list item if notice is part of a conversation.
 msgid "at"
 msgstr ""
 
 #. TRANS: Addition in notice list item if notice is part of a conversation.

-#: lib/noticelistitem.php:561
+#: lib/noticelistitem.php:587

 msgid "in context"
 msgstr ""
 
 #. TRANS: Addition in notice list item if notice was repeated. Followed by a span with a nickname.
 msgid "in context"
 msgstr ""
 
 #. TRANS: Addition in notice list item if notice was repeated. Followed by a span with a nickname.

-#: lib/noticelistitem.php:596
+#: lib/noticelistitem.php:622

 msgid "Repeated by"
 msgstr ""
 
 #. TRANS: Link title in notice list item to reply to a notice.
 msgid "Repeated by"
 msgstr ""
 
 #. TRANS: Link title in notice list item to reply to a notice.

-#: lib/noticelistitem.php:623
-msgid "Reply to this notice"
+#: lib/noticelistitem.php:650
+msgid "Reply to this notice."

 msgstr ""
 
 #. TRANS: Link text in notice list item to reply to a notice.
 msgstr ""
 
 #. TRANS: Link text in notice list item to reply to a notice.

-#: lib/noticelistitem.php:625
+#: lib/noticelistitem.php:652

 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:651
-msgid "Delete this notice"
+#: lib/noticelistitem.php:678
+msgid "Delete this notice from the timeline."

 msgstr ""
 
 #. TRANS: Title for repeat form status in notice list when a notice has been repeated.
 msgstr ""
 
 #. TRANS: Title for repeat form status in notice list when a notice has been repeated.

-#: lib/noticelistitem.php:674
+#: lib/noticelistitem.php:701

 msgid "Notice repeated."
 msgstr ""
 
 msgid "Notice repeated."
 msgstr ""
 


@@ -10660,31 +10079,6 @@ msgstr ""
 msgid "Send a nudge to this user."
 msgstr ""
 
 msgid "Send a nudge to this user."
 msgstr ""
 

-#. TRANS: Exception thrown when creating a new profile fails in OAuth store.
-#: lib/oauthstore.php:291
-msgid "Error inserting new profile."
-msgstr ""
-
-#. TRANS: Exception thrown when creating a new avatar fails in OAuth store.
-#: lib/oauthstore.php:300
-msgid "Error inserting avatar."
-msgstr ""
-
-#. TRANS: Exception thrown when creating a remote profile fails in OAuth store.
-#: lib/oauthstore.php:322
-msgid "Error inserting remote profile."
-msgstr ""
-
-#. TRANS: Exception thrown when a notice is denied because it has been sent before.
-#: lib/oauthstore.php:362
-msgid "Duplicate notice."
-msgstr ""
-
-#. TRANS: Exception thrown when creating a new subscription fails in OAuth store.
-#: lib/oauthstore.php:509
-msgid "Could not insert new subscription."
-msgstr ""
-

 #. TRANS: Server exception thrown in oEmbed action if no API endpoint is available.
 #: lib/oembedhelper.php:135
 msgid "No oEmbed API endpoint available."
 #. TRANS: Server exception thrown in oEmbed action if no API endpoint is available.
 #: lib/oembedhelper.php:135
 msgid "No oEmbed API endpoint available."


@@ -10732,56 +10126,51 @@ msgid "Search"
 msgstr ""
 
 #. TRANS: Menu item in list navigation panel.
 msgstr ""
 
 #. TRANS: Menu item in list navigation panel.

-#: lib/peopletaggroupnav.php:107
+#: lib/peopletaggroupnav.php:113

 msgctxt "MENU"
 msgid "List"
 msgstr ""
 
 #. TRANS: Menu item title in list navigation panel.
 #. TRANS: %1$s is a list, %2$s is a nickname.
 msgctxt "MENU"
 msgid "List"
 msgstr ""
 
 #. TRANS: Menu item title in list navigation panel.
 #. TRANS: %1$s is a list, %2$s is a nickname.

-#: lib/peopletaggroupnav.php:110 lib/peopletaggroupnav.php:121
+#: lib/peopletaggroupnav.php:116 lib/peopletaggroupnav.php:127

 #, php-format
 msgid "%1$s list by %2$s."
 msgstr ""
 
 #. TRANS: Menu item in list navigation panel.
 #, php-format
 msgid "%1$s list by %2$s."
 msgstr ""
 
 #. TRANS: Menu item in list navigation panel.

-#: lib/peopletaggroupnav.php:118
+#: lib/peopletaggroupnav.php:124

 msgctxt "MENU"
 msgid "Listed"
 msgstr ""
 
 #. TRANS: Menu item in list navigation panel.
 #. TRANS: Menu item in local navigation menu.
 msgctxt "MENU"
 msgid "Listed"
 msgstr ""
 
 #. TRANS: Menu item in list navigation panel.
 #. TRANS: Menu item in local navigation menu.

-#: lib/peopletaggroupnav.php:129 lib/subgroupnav.php:96
+#: lib/peopletaggroupnav.php:135 lib/subgroupnav.php:96

 msgctxt "MENU"
 msgid "Subscribers"
 msgstr ""
 
 #. TRANS: Menu item title in list navigation panel.
 #. TRANS: %1$s is a list, %2$s is a nickname.
 msgctxt "MENU"
 msgid "Subscribers"
 msgstr ""
 
 #. TRANS: Menu item title in list navigation panel.
 #. TRANS: %1$s is a list, %2$s is a nickname.

-#: lib/peopletaggroupnav.php:132
+#: lib/peopletaggroupnav.php:138

 #, php-format
 msgid "Subscribers to %1$s list by %2$s."
 msgstr ""
 
 #. TRANS: Menu item in list navigation panel.
 #, php-format
 msgid "Subscribers to %1$s list by %2$s."
 msgstr ""
 
 #. TRANS: Menu item in list navigation panel.

-#: lib/peopletaggroupnav.php:142
+#: lib/peopletaggroupnav.php:148

 msgctxt "MENU"
 msgid "Edit"
 msgstr ""
 
 #. TRANS: Menu item title in list navigation panel.
 #. TRANS: %s is a list.
 msgctxt "MENU"
 msgid "Edit"
 msgstr ""
 
 #. TRANS: Menu item title in list navigation panel.
 #. TRANS: %s is a list.

-#: lib/peopletaggroupnav.php:145
+#: lib/peopletaggroupnav.php:151

 #, php-format
 msgid "Edit %s list by you."
 msgstr ""
 
 #, php-format
 msgid "Edit %s list by you."
 msgstr ""
 

-#. TRANS: Link description for link to list of users tagged with a tag.
-#: lib/peopletaglist.php:173
-msgid "Tagged"
-msgstr ""
-

 #. TRANS: Title for link to edit list settings.
 #: lib/peopletaglist.php:196
 msgid "Edit list settings."
 #. TRANS: Title for link to edit list settings.
 #: lib/peopletaglist.php:196
 msgid "Edit list settings."


@@ -10895,7 +10284,7 @@ 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:87 lib/subgroupnav.php:77
+#: lib/personalgroupnav.php:82 lib/settingsnav.php:74 lib/subgroupnav.php:77

 msgctxt "MENU"
 msgid "Profile"
 msgstr ""
 msgctxt "MENU"
 msgid "Profile"
 msgstr ""


@@ -10951,9 +10340,11 @@ msgctxt "plugin"
 msgid "Enable"
 msgstr ""
 
 msgid "Enable"
 msgstr ""
 

-#: lib/pluginlist.php:196
+#. TRANS: Plugin description for a disabled plugin.
+#: lib/pluginlist.php:195

 msgctxt "plugin-description"
 msgctxt "plugin-description"

-msgid "(Plugin descriptions unavailable when disabled.)"
+msgid ""
+"(The plugin description is unavailable when a plugin has been disabled.)"

 msgstr ""
 
 #. TRANS: Menu item in primary navigation panel.
 msgstr ""
 
 #. TRANS: Menu item in primary navigation panel.


@@ -10967,6 +10358,12 @@ msgstr ""
 msgid "Change your personal settings."
 msgstr ""
 
 msgid "Change your personal settings."
 msgstr ""
 

+#. TRANS: Menu item in primary navigation panel.
+#: lib/primarynav.php:66
+msgctxt "MENU"
+msgid "Admin"
+msgstr ""
+

 #. TRANS: Menu item title in primary navigation panel.
 #: lib/primarynav.php:68
 msgid "Site configuration."
 #. TRANS: Menu item title in primary navigation panel.
 #: lib/primarynav.php:68
 msgid "Site configuration."


@@ -10988,55 +10385,48 @@ msgstr ""
 msgid "Login to the site."
 msgstr ""
 
 msgid "Login to the site."
 msgstr ""
 

-#. TRANS: Menu item in primary navigation panel.
-#: lib/primarynav.php:92
-msgctxt "MENU"
-msgid "Search"
-msgstr ""
-
-#. TRANS: Menu item title in primary navigation panel.
-#: lib/primarynav.php:94
-msgid "Search the site."
+#: lib/profileaction.php:93
+msgid "This profile has been silenced by site moderators"

 msgstr ""
 
 #. TRANS: H2 text for user subscription statistics.
 msgstr ""
 
 #. TRANS: H2 text for user subscription statistics.

-#: lib/profileaction.php:128
+#: lib/profileaction.php:135

 msgid "Following"
 msgstr ""
 
 #. TRANS: H2 text for user subscriber statistics.
 msgid "Following"
 msgstr ""
 
 #. TRANS: H2 text for user subscriber statistics.

-#: lib/profileaction.php:160
+#: lib/profileaction.php:167

 msgid "Followers"
 msgstr ""
 
 msgid "Followers"
 msgstr ""
 

-#. TRANS: Label for user statistics.
-#: lib/profileaction.php:204
-msgid "User ID"
+#. TRANS: H2 text for user statistics.
+#: lib/profileaction.php:203
+msgid "Statistics"

 msgstr ""
 
 #. TRANS: Label for user statistics.
 msgstr ""
 
 #. TRANS: Label for user statistics.

-#: lib/profileaction.php:210
-msgid "Member since"
+#: lib/profileaction.php:211
+msgid "User ID"

 msgstr ""
 
 #. TRANS: Label for user statistics.
 msgstr ""
 
 #. TRANS: Label for user statistics.

-#: lib/profileaction.php:216
-msgid "Notices"
+#: lib/profileaction.php:217
+msgid "Member since"

 msgstr ""
 
 #. TRANS: Label for user statistics.
 #. TRANS: Average count of posts made per day since account registration.
 msgstr ""
 
 #. TRANS: Label for user statistics.
 #. TRANS: Average count of posts made per day since account registration.

-#: lib/profileaction.php:223
+#: lib/profileaction.php:230

 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:260
+#: lib/profileaction.php:267

 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:298
+#: lib/profileaction.php:305

 msgid "Lists"
 msgstr ""
 
 msgid "Lists"
 msgstr ""
 


@@ -11046,29 +10436,29 @@ msgid "Unimplemented method."
 msgstr ""
 
 #. TRANS: Menu item title in search group navigation panel.
 msgstr ""
 
 #. TRANS: Menu item title in search group navigation panel.

-#: lib/publicgroupnav.php:73
+#: lib/publicgroupnav.php:75

 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:76
+#: lib/publicgroupnav.php:79

 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:78
+#: lib/publicgroupnav.php:81

 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:82
+#: lib/publicgroupnav.php:86

 msgctxt "MENU"
 msgid "Featured"
 msgstr ""
 
 #. TRANS: Menu item in search group navigation panel.
 msgctxt "MENU"
 msgid "Featured"
 msgstr ""
 
 #. TRANS: Menu item in search group navigation panel.

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

 msgctxt "MENU"
 msgid "Popular"
 msgstr ""
 msgctxt "MENU"
 msgid "Popular"
 msgstr ""


@@ -11101,7 +10491,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:1150
+#: lib/router.php:1140

 msgid "Page not found."
 msgstr ""
 
 msgid "Page not found."
 msgstr ""
 


@@ -11117,37 +10507,37 @@ msgid "Sandbox this user"
 msgstr ""
 
 #. TRANS: Fieldset legend for the search form.
 msgstr ""
 
 #. TRANS: Fieldset legend for the search form.

-#: lib/searchaction.php:120
+#: lib/searchaction.php:106

 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:128
+#: lib/searchaction.php:114

 msgid "Keyword(s)"
 msgstr ""
 
 #. TRANS: Button text for searching site.
 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.
 #. TRANS: Button text to search profiles.

-#: lib/searchaction.php:130 lib/togglepeopletag.php:134
+#: lib/searchaction.php:116 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:143
+#: lib/searchaction.php:129

 msgid ""
 "* Make sure all words are spelled correctly.\n"
 "* Try different keywords.\n"
 "* Try more general keywords.\n"
 msgid ""
 "* Make sure all words are spelled correctly.\n"
 "* Try different keywords.\n"
 "* Try more general keywords.\n"

-"* Try fewer keywords.\n"
+"* Try fewer keywords."

 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:152
+#: lib/searchaction.php:140

 #, php-format
 msgid ""
 #, php-format
 msgid ""

-"\n"

 "You can also try your search on other engines:\n"
 "\n"
 "* [Twingly](http://www.twingly.com/search?q=%s&content=microblog&site=%%%%"
 "You can also try your search on other engines:\n"
 "\n"
 "* [Twingly](http://www.twingly.com/search?q=%s&content=microblog&site=%%%%"


@@ -11155,7 +10545,7 @@ msgid ""
 "* [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"
 "* [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)\n"
+"* [Collecta](http://collecta.com/#q=%s)"

 msgstr ""
 
 #. TRANS: Menu item in search group navigation panel.
 msgstr ""
 
 #. TRANS: Menu item in search group navigation panel.


@@ -11185,24 +10575,6 @@ msgstr ""
 msgid "Find groups on this site"
 msgstr ""
 
 msgid "Find groups on this site"
 msgstr ""
 

-#. TRANS: Secondary navigation menu item leading to help on StatusNet.
-#: lib/secondarynav.php:56
-msgctxt "MENU"
-msgid "Help"
-msgstr ""
-
-#. TRANS: Secondary navigation menu item leading to text about StatusNet site.
-#: lib/secondarynav.php:59
-msgctxt "MENU"
-msgid "About"
-msgstr ""
-
-#. TRANS: Secondary navigation menu item leading to Frequently Asked Questions.
-#: lib/secondarynav.php:62
-msgctxt "MENU"
-msgid "FAQ"
-msgstr ""
-

 #. TRANS: Secondary navigation menu item leading to Terms of Service.
 #: lib/secondarynav.php:67
 msgctxt "MENU"
 #. TRANS: Secondary navigation menu item leading to Terms of Service.
 #: lib/secondarynav.php:67
 msgctxt "MENU"


@@ -11227,19 +10599,6 @@ msgctxt "MENU"
 msgid "Version"
 msgstr ""
 
 msgid "Version"
 msgstr ""
 

-#. TRANS: Secondary navigation menu item leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-#: lib/secondarynav.php:81
-msgctxt "MENU"
-msgid "Contact"
-msgstr ""
-
-#. TRANS: Secondary navigation menu item. Leads to information about embedding a timeline widget.
-#: lib/secondarynav.php:84
-msgctxt "MENU"
-msgid "Badge"
-msgstr ""
-

 #. TRANS: Default title for section/sidebar widget.
 #: lib/section.php:105
 msgid "Untitled section"
 #. TRANS: Default title for section/sidebar widget.
 #: lib/section.php:105
 msgid "Untitled section"


@@ -11251,98 +10610,104 @@ msgid "More..."
 msgstr ""
 
 #. TRANS: Header in settings navigation panel.
 msgstr ""
 
 #. TRANS: Header in settings navigation panel.

-#: lib/settingsnav.php:81
+#: lib/settingsnav.php:68

 msgctxt "HEADER"
 msgid "Settings"
 msgstr ""
 
 #. TRANS: Menu item title in settings navigation panel.
 msgctxt "HEADER"
 msgid "Settings"
 msgstr ""
 
 #. TRANS: Menu item title in settings navigation panel.

-#: lib/settingsnav.php:89
+#: lib/settingsnav.php:76

 msgid "Change your profile settings"
 msgstr ""
 
 #. TRANS: Menu item in settings navigation panel.
 msgid "Change your profile settings"
 msgstr ""
 
 #. TRANS: Menu item in settings navigation panel.

-#: lib/settingsnav.php:94
+#: lib/settingsnav.php:81

 msgctxt "MENU"
 msgid "Avatar"
 msgstr ""
 
 #. TRANS: Menu item title in settings navigation panel.
 msgctxt "MENU"
 msgid "Avatar"
 msgstr ""
 
 #. TRANS: Menu item title in settings navigation panel.

-#: lib/settingsnav.php:96
+#: lib/settingsnav.php:83

 msgid "Upload an avatar"
 msgstr ""
 
 #. TRANS: Menu item in settings navigation panel.
 msgid "Upload an avatar"
 msgstr ""
 
 #. TRANS: Menu item in settings navigation panel.

-#: lib/settingsnav.php:101
+#: lib/settingsnav.php:88

 msgctxt "MENU"
 msgid "Password"
 msgstr ""
 
 #. TRANS: Menu item title in settings navigation panel.
 msgctxt "MENU"
 msgid "Password"
 msgstr ""
 
 #. TRANS: Menu item title in settings navigation panel.

-#: lib/settingsnav.php:103
+#: lib/settingsnav.php:90

 msgid "Change your password"
 msgstr ""
 
 #. TRANS: Menu item in settings navigation panel.
 msgid "Change your password"
 msgstr ""
 
 #. TRANS: Menu item in settings navigation panel.

-#: lib/settingsnav.php:108
+#: lib/settingsnav.php:95

 msgctxt "MENU"
 msgid "Email"
 msgstr ""
 
 #. TRANS: Menu item title in settings navigation panel.
 msgctxt "MENU"
 msgid "Email"
 msgstr ""
 
 #. TRANS: Menu item title in settings navigation panel.

-#: lib/settingsnav.php:110
+#: lib/settingsnav.php:97

 msgid "Change email handling"
 msgstr ""
 
 msgid "Change email handling"
 msgstr ""
 

-#. TRANS: Menu item title in settings navigation panel.
-#: lib/settingsnav.php:117
-msgid "Design your profile"
-msgstr ""
-

 #. TRANS: Menu item in settings navigation panel.
 #. TRANS: Menu item in settings navigation panel.

-#: lib/settingsnav.php:122
+#: lib/settingsnav.php:102

 msgctxt "MENU"
 msgid "URL"
 msgstr ""
 
 #. TRANS: Menu item title in settings navigation panel.
 msgctxt "MENU"
 msgid "URL"
 msgstr ""
 
 #. TRANS: Menu item title in settings navigation panel.

-#: lib/settingsnav.php:124
+#: lib/settingsnav.php:104

 msgid "URL shorteners"
 msgstr ""
 
 #. TRANS: Menu item in settings navigation panel.
 msgid "URL shorteners"
 msgstr ""
 
 #. TRANS: Menu item in settings navigation panel.

-#: lib/settingsnav.php:132
+#: lib/settingsnav.php:116

 msgctxt "MENU"
 msgid "IM"
 msgstr ""
 
 #. TRANS: Menu item title in settings navigation panel.
 msgctxt "MENU"
 msgid "IM"
 msgstr ""
 
 #. TRANS: Menu item title in settings navigation panel.

-#: lib/settingsnav.php:134
+#: lib/settingsnav.php:118

 msgid "Updates by instant messenger (IM)"
 msgstr ""
 
 #. TRANS: Menu item in settings navigation panel.
 msgid "Updates by instant messenger (IM)"
 msgstr ""
 
 #. TRANS: Menu item in settings navigation panel.

-#: lib/settingsnav.php:141
+#: lib/settingsnav.php:125

 msgctxt "MENU"
 msgid "SMS"
 msgstr ""
 
 #. TRANS: Menu item title in settings navigation panel.
 msgctxt "MENU"
 msgid "SMS"
 msgstr ""
 
 #. TRANS: Menu item title in settings navigation panel.

-#: lib/settingsnav.php:143
+#: lib/settingsnav.php:127

 msgid "Updates by SMS"
 msgstr ""
 
 #. TRANS: Menu item in settings navigation panel.
 msgid "Updates by SMS"
 msgstr ""
 
 #. TRANS: Menu item in settings navigation panel.

-#: lib/settingsnav.php:149
+#: lib/settingsnav.php:133

 msgctxt "MENU"
 msgid "Connections"
 msgstr ""
 
 #. TRANS: Menu item title in settings navigation panel.
 msgctxt "MENU"
 msgid "Connections"
 msgstr ""
 
 #. TRANS: Menu item title in settings navigation panel.

-#: lib/settingsnav.php:151
+#: lib/settingsnav.php:135

 msgid "Authorized connected applications"
 msgstr ""
 
 msgid "Authorized connected applications"
 msgstr ""
 

+#. TRANS: Menu item in settings navigation panel.
+#: lib/settingsnav.php:141
+msgctxt "MENU"
+msgid "Old school"
+msgstr ""
+
+#. TRANS: Menu item title in settings navigation panel.
+#: lib/settingsnav.php:143
+msgid "UI tweaks for old-school users"
+msgstr ""
+

 #. TRANS: Title of form to silence a user.
 #: lib/silenceform.php:65
 msgctxt "TITLE"
 #. TRANS: Title of form to silence a user.
 #: lib/silenceform.php:65
 msgctxt "TITLE"


@@ -11354,6 +10719,47 @@ 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.
 #: lib/subgroupnav.php:85
 msgctxt "MENU"
 #. TRANS: Menu item in local navigation menu.
 #: lib/subgroupnav.php:85
 msgctxt "MENU"


@@ -11420,6 +10826,18 @@ msgstr ""
 msgid "Subscribe to this user"
 msgstr ""
 
 msgid "Subscribe to this user"
 msgstr ""
 

+#. TRANS: Button text to subscribe to a user.
+#. TRANS: Button text for subscribing to a list.
+#: lib/subscribeform.php:130 lib/subscribepeopletagform.php:106
+msgctxt "BUTTON"
+msgid "Subscribe"
+msgstr ""
+
+#. TRANS: Button title to subscribe to a user.
+#: lib/subscribeform.php:132
+msgid "Subscribe to this user."
+msgstr ""
+

 #. TRANS: Title of personal tag cloud section.
 #: lib/subscriberspeopleselftagcloudsection.php:48
 #: lib/subscriptionspeopleselftagcloudsection.php:48
 #. TRANS: Title of personal tag cloud section.
 #: lib/subscriberspeopleselftagcloudsection.php:48
 #: lib/subscriptionspeopleselftagcloudsection.php:48


@@ -11439,7 +10857,7 @@ msgid "None"
 msgstr ""
 
 #. TRANS: Server exception displayed if a theme name was invalid.
 msgstr ""
 
 #. TRANS: Server exception displayed if a theme name was invalid.

-#: lib/theme.php:77
+#: lib/theme.php:79

 msgid "Invalid theme name."
 msgstr ""
 
 msgid "Invalid theme name."
 msgstr ""
 


@@ -11513,7 +10931,7 @@ msgstr ""
 
 #. TRANS: Link to show replies for a notice.
 #. TRANS: %d is the number of replies to a notice and used for plural.
 
 #. 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:343
+#: lib/threadednoticelist.php:371

 #, php-format
 msgid "Show reply"
 msgid_plural "Show all %d replies"
 #, php-format
 msgid "Show reply"
 msgid_plural "Show all %d replies"


@@ -11521,46 +10939,68 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Reference to the logged in user in favourite list.
 msgstr[1] ""
 
 #. TRANS: Reference to the logged in user in favourite list.

-#: lib/threadednoticelist.php:409
+#: lib/threadednoticelist.php:437

 msgctxt "FAVELIST"
 msgid "You"
 msgstr ""
 
 msgctxt "FAVELIST"
 msgid "You"
 msgstr ""
 

-#. TRANS: For building a list such as "You, bob, mary and 5 others have favored this notice".
+#. 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.
 #. 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:448
+#: 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.
 #, php-format
 msgctxt "FAVELIST"
 msgid "%1$s and %2$s"
 msgstr ""
 
 #. TRANS: List message for notice favoured by logged in user.

-#: lib/threadednoticelist.php:473
+#: lib/threadednoticelist.php:509

 msgctxt "FAVELIST"
 msgctxt "FAVELIST"

-msgid "You have favored this notice."
+msgid "You like this."

 msgstr ""
 
 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: List message for favoured notices.

-#. TRANS: %d is the number of users that have favoured a notice.
-#: lib/threadednoticelist.php:477
+#. 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
 #, php-format

-msgid "One person has favored this notice."
-msgid_plural "%d people have favored this notice."
+msgid "%%s likes this."
+msgid_plural "%%s like this."

 msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: List message for notice repeated by logged in user.
 msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: List message for notice repeated by logged in user.

-#: lib/threadednoticelist.php:531
+#: lib/threadednoticelist.php:586

 msgctxt "REPEATLIST"
 msgctxt "REPEATLIST"

-msgid "You have repeated this notice."
+msgid "You repeated this."

 msgstr ""
 
 msgstr ""
 

-#. TRANS: List message for repeated notices.
-#. TRANS: %d is the number of users that have repeated a notice.
-#: lib/threadednoticelist.php:535
+#. 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

 #, php-format
 #, php-format

-msgid "One person has repeated this notice."
-msgid_plural "%d people have repeated this notice."
+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
+#, php-format
+msgid "%%s repeated this."
+msgid_plural "%%s repeated this."

 msgstr[0] ""
 msgstr[1] ""
 
 msgstr[0] ""
 msgstr[1] ""
 


@@ -11673,8 +11113,7 @@ msgid "Unsilence this user"
 msgstr ""
 
 #. TRANS: Form legend on unsubscribe form.
 msgstr ""
 
 #. TRANS: Form legend on unsubscribe form.

-#. TRANS: Button title on unsubscribe form.
-#: lib/unsubscribeform.php:109 lib/unsubscribeform.php:134
+#: lib/unsubscribeform.php:109

 msgid "Unsubscribe from this user"
 msgstr ""
 
 msgid "Unsubscribe from this user"
 msgstr ""
 


@@ -11685,6 +11124,11 @@ msgctxt "BUTTON"
 msgid "Unsubscribe"
 msgstr ""
 
 msgid "Unsubscribe"
 msgstr ""
 

+#. TRANS: Button title on unsubscribe form.
+#: lib/unsubscribeform.php:134
+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
 #. 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


@@ -11693,22 +11137,22 @@ msgid "User %1$s (%2$d) has no profile record."
 msgstr ""
 
 #. TRANS: Authorisation exception thrown when a user a not allowed to login.
 msgstr ""
 
 #. TRANS: Authorisation exception thrown when a user a not allowed to login.

-#: lib/util.php:322
+#: lib/util.php:328

 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:1337
+#: lib/util.php:1346

 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:1340
+#: lib/util.php:1349

 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:1344
+#: lib/util.php:1353

 #, 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"


@@ -11716,12 +11160,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:1347
+#: lib/util.php:1356

 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:1351
+#: lib/util.php:1360

 #, 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"


@@ -11729,12 +11173,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:1354
+#: lib/util.php:1363

 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:1358
+#: lib/util.php:1367

 #, 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"


@@ -11742,12 +11186,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:1361
+#: lib/util.php:1370

 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:1365
+#: lib/util.php:1374

 #, 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"


@@ -11755,7 +11199,7 @@ 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:1368
+#: lib/util.php:1377

 msgid "about a year ago"
 msgstr ""
 
 msgid "about a year ago"
 msgstr ""