Revert "Report a 404 not found if no posts found for User timeline"

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

diff --git a/locale/statusnet.pot b/locale/statusnet.pot
index 69aa295e1c0c6cc08f503da79a3d8076b91e64df..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-02-24 10:32+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"


@@ -17,9 +17,41 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 

+#. TRANS: Database error message.
+#: index.php:118
+#, php-format
+msgid ""
+"The database for %1$s is not responding correctly, so the site will not work "
+"properly. The site admins probably know about the problem, but you can "
+"contact them at %2$s to make sure. Otherwise, wait a few minutes and try "
+"again."
+msgstr ""
+
+#. TRANS: Error message.
+#: index.php:137
+msgid "An error occurred."
+msgstr ""
+
+#. TRANS: Error message displayed when there is no StatusNet configuration file.
+#: 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.
+#: 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.
+#: index.php:356 actions/recoverpassword.php:232
+msgid "Unknown action"
+msgstr ""
+

 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Page title for Access admin panel that allows configuring site access.

-#. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:53 lib/adminpanelaction.php:363
+#: actions/accessadminpanel.php:53

 msgid "Access"
 msgstr ""
 
 msgid "Access"
 msgstr ""
 


@@ -39,7 +71,10 @@ msgid "Prohibit anonymous users (not logged in) from viewing site?"
 msgstr ""
 
 #. TRANS: Checkbox label for prohibiting anonymous users from viewing site.
 msgstr ""
 
 #. TRANS: Checkbox label for prohibiting anonymous users from viewing site.

-#: actions/accessadminpanel.php:157
+#. TRANS: Checkbox label to show private tags.
+#. TRANS: Checkbox field label on group edit form to mark a group private.
+#: actions/accessadminpanel.php:157 actions/peopletagsbyuser.php:190
+#: lib/groupeditform.php:206

 msgctxt "LABEL"
 msgid "Private"
 msgstr ""
 msgctxt "LABEL"
 msgid "Private"
 msgstr ""


@@ -64,39 +99,139 @@ 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 e-mail preferences.

-#. TRANS: Button label to save Instant Messaging preferences.
-#. TRANS: Button text for saving "Other settings" in profile.
+#. TRANS: Button label to save IM preferences.
+#. TRANS: Button text in the license admin panel.

 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.

+#. TRANS: Submit button text on the sessions administration panel.
+#. TRANS: Button text for saving site settings.

 #. TRANS: Button text for saving site notice in admin panel.
 #. TRANS: Button label to save SMS preferences.
 #. TRANS: Button text for saving site notice in admin panel.
 #. TRANS: Button label to save SMS preferences.

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

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

+#. TRANS: Button text to save lists.
+#. TRANS: Button text for saving "Other settings" in profile.

 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: 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.
-#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
-#: actions/emailsettings.php:250 actions/imsettings.php:183
-#: actions/othersettings.php:136 actions/pathsadminpanel.php:512
-#: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
-#: actions/smssettings.php:205 actions/subscriptions.php:259
-#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
-#: lib/designsettings.php:270 lib/groupeditform.php:201
+#. TRANS: Text for save button on group edit form.
+#. TRANS: Button text to save tags for a profile.
+#: actions/accessadminpanel.php:193 actions/emailsettings.php:251
+#: actions/imsettings.php:201 actions/licenseadminpanel.php:335
+#: 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"
 msgstr ""
 
 msgctxt "BUTTON"
 msgid "Save"
 msgstr ""
 

+#. TRANS: Client error displayed when the session token does not match or is not given.
+#. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
+#. TRANS: Client error displayed when the session token does not match or is not given.
+#. TRANS: Form validation error message.
+#. TRANS: Client error displayed when the session token does not match or is not given.
+#. TRANS: Form validation error.
+#. TRANS: Form validation error message.
+#. TRANS: Client error displayed when the session token does not match or is not given.
+#. TRANS: Client error displayed when the session token is not okay.
+#. TRANS: Client error displayed when the session token does not match or is not given.
+#: actions/addpeopletag.php:78 actions/apioauthauthorize.php:147
+#: actions/avatarsettings.php:283 actions/cancelsubscription.php:75
+#: actions/deletenotice.php:178 actions/disfavor.php:75
+#: actions/emailsettings.php:293 actions/favor.php:76 actions/geocode.php:56
+#: actions/groupblock.php:66 actions/grouplogo.php:321
+#: actions/groupunblock.php:66 actions/imsettings.php:244
+#: actions/invite.php:67 actions/makeadmin.php:68 actions/newmessage.php:141
+#: actions/newnotice.php:105 actions/nudge.php:82
+#: actions/oauthappssettings.php:162 actions/oauthconnectionssettings.php:136
+#: actions/passwordsettings.php:147 actions/peopletagautocomplete.php:67
+#: actions/pluginenable.php:88 actions/profilecompletion.php:81
+#: actions/profilesettings.php:235 actions/recoverpassword.php:304
+#: actions/register.php:164 actions/removepeopletag.php:79
+#: actions/repeat.php:80 actions/smssettings.php:250 actions/subedit.php:41
+#: actions/subscribe.php:87 actions/subscribepeopletag.php:76
+#: actions/tagprofile.php:186 actions/unsubscribe.php:70
+#: actions/unsubscribepeopletag.php:77 actions/urlsettings.php:171
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+
+#. TRANS: Error message displayed when trying to perform an action that requires a logged in user.
+#: actions/addpeopletag.php:89 actions/cancelsubscription.php:57
+#: actions/deletenotice.php:52 actions/disfavor.php:61
+#: actions/editpeopletag.php:69 actions/favor.php:62 actions/groupblock.php:60
+#: actions/groupunblock.php:60 actions/logout.php:69 actions/makeadmin.php:62
+#: actions/newmessage.php:89 actions/newnotice.php:87 actions/nudge.php:64
+#: actions/peopletagautocomplete.php:57 actions/peopletagsbyuser.php:126
+#: actions/pluginenable.php:99 actions/profilecompletion.php:92
+#: actions/removepeopletag.php:90 actions/subedit.php:33
+#: actions/subscribe.php:98 actions/unsubscribe.php:52
+#: lib/adminpanelaction.php:71 lib/profileformaction.php:63
+#: lib/settingsaction.php:73
+msgid "Not logged in."
+msgstr ""
+
+#. TRANS: Client error displayed trying to perform an action related to a non-existing profile.
+#. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
+#. TRANS: Client exception.
+#. TRANS: Client error displayed when referring to a non-existing profile.
+#. TRANS: Client error displayed trying to subscribe to a non-existing profile.
+#. TRANS: Client error displayed trying to perform an action related to a non-existing profile.
+#: actions/addpeopletag.php:101 actions/atompubfavoritefeed.php:69
+#: actions/atompubmembershipfeed.php:71 actions/atompubshowfavorite.php:75
+#: actions/atompubshowmembership.php:72 actions/removepeopletag.php:102
+#: actions/subscribe.php:110 lib/command.php:435 lib/command.php:494
+msgid "No such profile."
+msgstr ""
+
+#. TRANS: Client error displayed trying to reference a non-existing list.
+#. TRANS: Client error displayed when referring to a non-existing list.
+#. TRANS: Client error displayed trying to reference a non-existing list.
+#: actions/addpeopletag.php:110 actions/editpeopletag.php:113
+#: actions/peopletagged.php:101 actions/peopletagsubscribers.php:101
+#: actions/profilecompletion.php:101 actions/profiletagbyid.php:67
+#: actions/removepeopletag.php:111 actions/showprofiletag.php:90
+#: actions/subscribepeopletag.php:95 actions/unsubscribepeopletag.php:96
+msgid "No such list."
+msgstr ""
+
+#. TRANS: Client error displayed when an unknown error occurs when adding a user to a list.
+#. TRANS: %s is a username.
+#: actions/addpeopletag.php:138
+#, php-format
+msgid "There was an unexpected error while listing %s."
+msgstr ""
+
+#. TRANS: Client error displayed when an unknown error occurs when adding a user to a list.
+#. TRANS: %s is a profile URL.
+#: actions/addpeopletag.php:143
+#, php-format
+msgid ""
+"There was a problem listing %s. The remote server is probably not responding "
+"correctly. Please try retrying later."
+msgstr ""
+
+#. TRANS: Title after adding a user to a list.
+#: actions/addpeopletag.php:153
+msgctxt "TITLE"
+msgid "Listed"
+msgstr ""
+

 #. TRANS: Server error when page not found (404).
 #. TRANS: Server error when page not found (404)
 #. TRANS: Server error when page not found (404).
 #. TRANS: Server error when page not found (404)

-#: actions/all.php:68 actions/public.php:98 actions/replies.php:93
-#: actions/showfavorites.php:140 actions/tag.php:52
+#. TRANS: Server error when page not found (404).
+#: actions/all.php:72 actions/public.php:110 actions/replies.php:96
+#: actions/showfavorites.php:140 actions/showprofiletag.php:104
+#: actions/tag.php:54

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


@@ -104,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.


@@ -115,6 +249,10 @@ msgstr ""
 #. TRANS: Client error displayed when checking group membership for a non-existing user.
 #. TRANS: Client error displayed when trying to have a non-existing user join a group.
 #. TRANS: Client error displayed when trying to have a non-existing user leave a group.
 #. TRANS: Client error displayed when checking group membership for a non-existing user.
 #. TRANS: Client error displayed when trying to have a non-existing user join a group.
 #. TRANS: Client error displayed when trying to have a non-existing user leave a group.

+#. TRANS: Client error displayed when user not found for an action.
+#. TRANS: Client error displayed when not providing a user or an invalid user.
+#. TRANS: Client error displayed when referring to a non-existing user.
+#. TRANS: Client error displayed trying to perform an action related to a non-existing user.

 #. TRANS: Client error displayed when updating a status for a non-existing user.
 #. TRANS: Client error displayed when requesting a list of followers for a non-existing user.
 #. TRANS: Client error displayed when requesting most recent favourite notices by a user for a non-existing user.
 #. TRANS: Client error displayed when updating a status for a non-existing user.
 #. TRANS: Client error displayed when requesting a list of followers for a non-existing user.
 #. TRANS: Client error displayed when requesting most recent favourite notices by a user for a non-existing user.


@@ -126,77 +264,94 @@ 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 trying to use "one time password login" without using an existing user.

+#. TRANS: Client error displayed when referring to non-existing user.
+#. TRANS: Client error displayed trying to perform an action related to a non-existing user.
+#. TRANS: Client error displayed when trying to reply to a non-exsting user.

 #. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.

+#. TRANS: Client error.

 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.

+#. TRANS: Client error displayed trying to perform an action related to a non-existing user.

 #. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
 #. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.

-#. TRANS: Client error displayed providing a non-existing nickname.
+#. TRANS: Client error displayed requesting groups for a non-existing user.
+#. TRANS: Client error displayed when user not found for an action.

 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: 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: Client error displayed when calling a profile action without specifying a user.

-#: actions/all.php:80 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/apigroupcreate.php:111 actions/apigroupismember.php:89
 #: actions/apigroupjoin.php:98 actions/apigroupleave.php:98
 #: actions/apiaccountupdateprofileimage.php:104 actions/apiatomservice.php:59
 #: actions/apiblockcreate.php:96 actions/apiblockdestroy.php:94
 #: actions/apidirectmessage.php:75 actions/apidirectmessagenew.php:72
 #: actions/apigroupcreate.php:111 actions/apigroupismember.php:89
 #: actions/apigroupjoin.php:98 actions/apigroupleave.php:98

-#: actions/apigrouplist.php:70 actions/apistatusesupdate.php:230
+#: actions/apigrouplist.php:71 actions/apigroupprofileupdate.php:107
+#: actions/apilistmember.php:76 actions/apilistmemberships.php:71
+#: actions/apilists.php:78 actions/apilistsubscriber.php:53
+#: actions/apilistsubscriptions.php:77 actions/apistatusesupdate.php:230

 #: actions/apisubscriptions.php:85 actions/apitimelinefavorites.php:70
 #: actions/apitimelinefriends.php:173 actions/apitimelinehome.php:78
 #: actions/apitimelinementions.php:77 actions/apitimelineuser.php:79
 #: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
 #: actions/apisubscriptions.php:85 actions/apitimelinefavorites.php:70
 #: actions/apitimelinefriends.php:173 actions/apitimelinehome.php:78
 #: actions/apitimelinementions.php:77 actions/apitimelineuser.php:79
 #: actions/avatarbynickname.php:79 actions/favoritesrss.php:72

-#: actions/foaf.php:42 actions/foaf.php:61 actions/hcard.php:67
-#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:78
-#: actions/remotesubscribe.php:144 actions/remotesubscribe.php:153
-#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:113
-#: actions/showfavorites.php:106 actions/userbyid.php:75
-#: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
-#: actions/xrds.php:71 lib/command.php:497 lib/galleryaction.php:59
-#: lib/mailbox.php:80 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:91
+#. 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: Timeline title for user and friends. %s is a user nickname.
-#. TRANS: Tooltop for personal group navigation menu option when logged in for viewing timeline of self and friends.
-#: actions/all.php:94 actions/all.php:191 actions/allrss.php:117
-#: actions/apitimelinefriends.php:207 actions/apitimelinehome.php:113
-#: lib/personalgroupnav.php:102
+#. 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:108
+#: actions/all.php:124

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

-#: actions/all.php:117
+#. TRANS: Feed title.
+#. TRANS: %s is tagger's nickname.
+#: 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:126
+#: 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:139
+#: 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."


@@ -204,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:146
+#: 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 "


@@ -213,93 +368,105 @@ 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:150
+#: 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: %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: 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:155 actions/replies.php:210 actions/showstream.php:227
+#: 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:188
-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.
 #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %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.
 #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name.

-#: actions/allrss.php:122 actions/apitimelinefriends.php:213
+#: actions/allrss.php:115 actions/apitimelinefriends.php:215

 #: actions/apitimelinehome.php:119
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr ""
 
 #: actions/apitimelinehome.php:119
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr ""
 

-#. TRANS: Client error displayed handling a non-existing API method.
-#. TRANS: Client error displayed when trying to handle an unknown API method.
-#. TRANS: Client error displayed trying to execute an unknown API method updating profile colours.
-#. TRANS: Client error displayed trying to execute an unknown API method verifying user credentials.
-#. TRANS: Client error given when an API method was not found (404).
+#. TRANS: Client error displayed when coming across a non-supported API method.

 #. TRANS: Client error displayed when trying to handle an unknown API method.
 #. TRANS: Client error displayed when trying to handle an unknown API method.

-#. TRANS: Client error displayed trying to execute an unknown API method showing friendship.
-#. TRANS: Client error given when an API method was not found (404).
-#. TRANS: Client error displayed trying to execute an unknown API method showing group membership.
-#. TRANS: Client error displayed trying to execute an unknown API method joining a group.
-#. TRANS: Client error displayed trying to execute an unknown API method leaving a group.
-#. TRANS: Client error displayed trying to execute an unknown API method checking group membership.
-#. TRANS: Client error displayed trying to execute an unknown API method listing the latest 20 groups.
-#. TRANS: Client error displayed trying to execute an unknown API method showing group membership.
-#. TRANS: Client error displayed trying to execute an unknown API method showing a group.
-#. TRANS: Client error displayed trying to execute an unknown API method testing API connectivity.
-#. TRANS: Client error displayed trying to execute an unknown API method deleting a status.
-#. TRANS: Client error displayed when trying to handle an unknown API method.
-#: actions/apiaccountratelimitstatus.php:69
+#. TRANS: Client error displayed when coming across a non-supported API method.
+#: actions/apiaccountratelimitstatus.php:70

 #: actions/apiaccountupdatedeliverydevice.php:92
 #: actions/apiaccountupdateprofile.php:94
 #: actions/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:160
-#: actions/apigroupleave.php:145 actions/apigrouplist.php:134
-#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
-#: actions/apigroupshow.php:114 actions/apihelptest.php:84
-#: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
-#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:138
-#: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
-#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
-#: actions/apitimelinegroup.php:147 actions/apitimelinehome.php:173
-#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:239
-#: actions/apitimelineretweetedtome.php:118
-#: actions/apitimelineretweetsofme.php:150 actions/apitimelinetag.php:159
-#: actions/apitimelineuser.php:206 actions/apiusershow.php:100
+#: 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."
 msgstr ""
 
 msgid "API method not found."
 msgstr ""
 

+#. TRANS: Client error message. POST is a HTTP command. It should not be translated.
+#. TRANS: Client error. POST is a HTTP command. It should not be translated.

 #. TRANS: Client error message. POST is a HTTP command. It should not be translated.
 #. TRANS: Client error. POST is a HTTP command. It should not be translated.
 #: actions/apiaccountupdatedeliverydevice.php:83
 #: actions/apiaccountupdateprofile.php:85
 #. TRANS: Client error message. POST is a HTTP command. It should not be translated.
 #. TRANS: Client error. POST is a HTTP command. It should not be translated.
 #: actions/apiaccountupdatedeliverydevice.php:83
 #: actions/apiaccountupdateprofile.php:85

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

-#: actions/apigroupleave.php:89 actions/apimediaupload.php:66
-#: actions/apistatusesretweet.php:63 actions/apistatusesupdate.php:194
+#: actions/apigroupleave.php:89 actions/apigroupprofileupdate.php:89
+#: actions/apimediaupload.php:66 actions/apistatusesretweet.php:63
+#: actions/apistatusesupdate.php:194

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


@@ -311,59 +478,46 @@ msgid ""
 msgstr ""
 
 #. TRANS: Server error displayed when a user's delivery device cannot be updated.
 msgstr ""
 
 #. TRANS: Server error displayed when a user's delivery device cannot be updated.

-#. TRANS: Server error displayed when a user update to the database fails in the contact address confirmation action.
+#. TRANS: Server error displayed when confirming an e-mail address or IM address fails.

 #. TRANS: Server error thrown on database error updating e-mail preferences.
 #. TRANS: Server error thrown on database error removing a registered e-mail address.
 #. TRANS: Server error thrown on database error updating e-mail preferences.
 #. TRANS: Server error thrown on database error removing a registered e-mail address.

-#. TRANS: Server error thrown on database error updating Instant Messaging preferences.
-#. TRANS: Server error thrown on database error removing a registered Instant Messaging address.
-#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.

 #. TRANS: Server error thrown when user profile settings could not be updated.
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #. TRANS: Server error thrown when user profile settings could not be updated.
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.

-#: actions/apiaccountupdatedeliverydevice.php:130
-#: actions/confirmaddress.php:118 actions/emailsettings.php:352
-#: actions/emailsettings.php:498 actions/imsettings.php:276
-#: actions/imsettings.php:432 actions/othersettings.php:186
-#: actions/profilesettings.php:322 actions/smssettings.php:301
-#: actions/smssettings.php:454
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
+#: actions/apiaccountupdatedeliverydevice.php:136
+#: actions/confirmaddress.php:122 actions/emailsettings.php:353
+#: actions/emailsettings.php:504 actions/profilesettings.php:348
+#: actions/smssettings.php:301 actions/smssettings.php:454
+#: actions/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 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/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
-#: 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 ""
 
 #. TRANS: Server error displayed if a user profile could not be saved.
 #. TRANS: Server error thrown when user profile settings could not be saved.
 msgid "User has no profile."
 msgstr ""
 
 #. TRANS: Server error displayed if a user profile could not be saved.
 #. TRANS: Server error thrown when user profile settings could not be saved.

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

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

-#. 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/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81

-#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
-#: actions/designadminpanel.php:120 actions/editapplication.php:121
-#: actions/newapplication.php:102 actions/newnotice.php:95
-#: lib/designsettings.php:298
+#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:271
+#: 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 "


@@ -374,29 +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.
-#: actions/apiaccountupdateprofilebackgroundimage.php:138
-#: actions/apiaccountupdateprofilebackgroundimage.php:149
-#: actions/apiaccountupdateprofilecolors.php:160
-#: actions/apiaccountupdateprofilecolors.php:171
-#: actions/groupdesignsettings.php:285 actions/groupdesignsettings.php:296
-#: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
-#: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
-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.
-#: actions/apiaccountupdateprofilebackgroundimage.php:191
-#: actions/apiaccountupdateprofilecolors.php:139
-#: actions/userdesignsettings.php:179
-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"


@@ -408,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:94 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"


@@ -454,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


@@ -487,7 +635,7 @@ msgstr ""
 #. TRANS: %d is the maximum number of characters for a message.
 #. TRANS: Form validation error displayed when message content is too long.
 #. TRANS: %d is the maximum number of characters for a message.
 #. TRANS: %d is the maximum number of characters for a message.
 #. TRANS: Form validation error displayed when message content is too long.
 #. TRANS: %d is the maximum number of characters for a message.

-#: actions/apidirectmessagenew.php:127 actions/newmessage.php:152
+#: actions/apidirectmessagenew.php:127 actions/newmessage.php:159

 #, php-format
 msgid "That's too long. Maximum message size is %d character."
 msgid_plural "That's too long. Maximum message size is %d characters."
 #, php-format
 msgid "That's too long. Maximum message size is %d character."
 msgid_plural "That's too long. Maximum message size is %d characters."


@@ -505,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 ""


@@ -526,7 +677,7 @@ msgstr ""
 #. TRANS: Client error displayed when marking a notice as favourite fails.
 #. TRANS: Server error displayed when trying to mark a notice as favorite fails in the database.
 #. TRANS: Error message text shown when a favorite could not be set.
 #. TRANS: Client error displayed when marking a notice as favourite fails.
 #. TRANS: Server error displayed when trying to mark a notice as favorite fails in the database.
 #. TRANS: Error message text shown when a favorite could not be set.

-#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:294
+#: actions/apifavoritecreate.php:132 actions/favor.php:87 lib/command.php:306

 msgid "Could not create favorite."
 msgstr ""
 
 msgid "Could not create favorite."
 msgstr ""
 


@@ -579,60 +730,73 @@ msgid "Could not find target user."
 msgstr ""
 
 #. TRANS: Client error trying to create a group with a nickname this is already in use.
 msgstr ""
 
 #. TRANS: Client error trying to create a group with a nickname this is already in use.

+#. TRANS: API validation exception thrown when nickname is already used.

 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.

-#: actions/apigroupcreate.php:156 actions/editgroup.php:191
-#: actions/newgroup.php:137 actions/profilesettings.php:273
-#: actions/register.php:206
+#. TRANS: Form validation error displayed when trying to register with an existing nickname.
+#: actions/apigroupcreate.php:156 actions/apigroupprofileupdate.php:257
+#: actions/editgroup.php:194 actions/newgroup.php:138
+#: actions/profilesettings.php:293 actions/register.php:210

 msgid "Nickname already in use. Try another one."
 msgstr ""
 
 #. TRANS: Client error in form for group creation.
 msgid "Nickname already in use. Try another one."
 msgstr ""
 
 #. TRANS: Client error in form for group creation.

+#. TRANS: API validation exception thrown when nickname does not validate.

 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.

-#: actions/apigroupcreate.php:164 actions/editgroup.php:195
-#: actions/newgroup.php:141 actions/profilesettings.php:243
-#: actions/register.php:208
+#. TRANS: Form validation error displayed when trying to register with an invalid nickname.
+#: actions/apigroupcreate.php:164 actions/apigroupprofileupdate.php:262
+#: actions/editgroup.php:198 actions/newgroup.php:142
+#: actions/profilesettings.php:263 actions/register.php:213

 msgid "Not a valid nickname."
 msgstr ""
 
 #. TRANS: Client error in form for group creation.
 msgid "Not a valid nickname."
 msgstr ""
 
 #. TRANS: Client error in form for group creation.

+#. TRANS: API validation exception thrown when homepage URL does not validate.

 #. TRANS: Validation error shown when providing an invalid homepage URL in the "Edit application" form.
 #. TRANS: Group edit form validation error.
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "New application" form.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "Edit application" form.
 #. TRANS: Group edit form validation error.
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "New application" form.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.

-#: actions/apigroupcreate.php:181 actions/editapplication.php:235
-#: actions/editgroup.php:202 actions/newapplication.php:221
-#: actions/newgroup.php:148 actions/profilesettings.php:248
-#: actions/register.php:215
+#. TRANS: Form validation error displayed when trying to register with an invalid homepage URL.
+#: actions/apigroupcreate.php:181 actions/apigroupprofileupdate.php:281
+#: actions/editapplication.php:236 actions/editgroup.php:205
+#: actions/newapplication.php:222 actions/newgroup.php:149
+#: actions/profilesettings.php:268 actions/register.php:222

 msgid "Homepage is not a valid URL."
 msgstr ""
 
 #. TRANS: Client error in form for group creation.
 msgid "Homepage is not a valid URL."
 msgstr ""
 
 #. TRANS: Client error in form for group creation.

+#. TRANS: API validation exception thrown when full name does not validate.

 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.

-#: actions/apigroupcreate.php:191 actions/editgroup.php:206
-#: actions/newgroup.php:152 actions/profilesettings.php:252
-#: actions/register.php:218
+#. TRANS: Form validation error displayed when trying to register with a too long full name.
+#: actions/apigroupcreate.php:191 actions/apigroupprofileupdate.php:291
+#: actions/editgroup.php:209 actions/newgroup.php:153
+#: actions/profilesettings.php:272 actions/register.php:226

 msgid "Full name is too long (maximum 255 characters)."
 msgstr ""
 
 #. TRANS: Client error shown when providing too long a description during group creation.
 #. TRANS: %d is the maximum number of allowed characters.
 msgid "Full name is too long (maximum 255 characters)."
 msgstr ""
 
 #. TRANS: Client error shown when providing too long a description during group creation.
 #. TRANS: %d is the maximum number of allowed characters.

+#. TRANS: API validation exception thrown when description does not validate.
+#. TRANS: %d is the maximum description length and used for plural.

 #. TRANS: Validation error shown when providing too long a description in the "Edit application" form.
 #. TRANS: %d is the maximum number of allowed characters.
 #. TRANS: Group edit form validation error.
 #. TRANS: Validation error shown when providing too long a description in the "Edit application" form.
 #. TRANS: %d is the maximum number of allowed characters.
 #. TRANS: Group edit form validation error.

+#. TRANS: Client error shown when providing too long a description when editing a list.
+#. TRANS: %d is the maximum number of allowed characters.

 #. TRANS: Form validation error in New application form.
 #. TRANS: %d is the maximum number of characters for the description.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed characters.
 #. TRANS: Form validation error in New application form.
 #. TRANS: %d is the maximum number of characters for the description.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed characters.

-#: actions/apigroupcreate.php:201 actions/editapplication.php:202
-#: actions/editgroup.php:211 actions/newapplication.php:182
-#: actions/newgroup.php:157
+#: actions/apigroupcreate.php:201 actions/apigroupprofileupdate.php:301
+#: actions/editapplication.php:203 actions/editgroup.php:214
+#: actions/editpeopletag.php:269 actions/newapplication.php:183
+#: actions/newgroup.php:158

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


@@ -640,23 +804,27 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Client error shown when providing too long a location during group creation.
 msgstr[1] ""
 
 #. TRANS: Client error shown when providing too long a location during group creation.

+#. TRANS: API validation exception thrown when location does not validate.

 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.

-#: actions/apigroupcreate.php:215 actions/editgroup.php:218
-#: actions/newgroup.php:164 actions/profilesettings.php:265
-#: actions/register.php:227
+#. TRANS: Form validation error displayed when trying to register with a too long location.
+#: actions/apigroupcreate.php:215 actions/apigroupprofileupdate.php:313
+#: actions/editgroup.php:221 actions/newgroup.php:165
+#: actions/profilesettings.php:285 actions/register.php:238

 msgid "Location is too long (maximum 255 characters)."
 msgstr ""
 
 #. TRANS: Client error shown when providing too many aliases during group creation.
 #. TRANS: %d is the maximum number of allowed aliases.
 msgid "Location is too long (maximum 255 characters)."
 msgstr ""
 
 #. TRANS: Client error shown when providing too many aliases during group creation.
 #. TRANS: %d is the maximum number of allowed aliases.

+#. TRANS: API validation exception thrown when aliases do not validate.
+#. TRANS: %d is the maximum number of aliases and used for plural.

 #. TRANS: Group edit form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
 #. TRANS: Group edit form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.

-#: actions/apigroupcreate.php:236 actions/editgroup.php:231
-#: actions/newgroup.php:177
+#: actions/apigroupcreate.php:236 actions/apigroupprofileupdate.php:332
+#: 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."


@@ -665,24 +833,28 @@ msgstr[1] ""
 
 #. TRANS: Client error shown when providing an invalid alias during group creation.
 #. TRANS: %s is the invalid alias.
 
 #. TRANS: Client error shown when providing an invalid alias during group creation.
 #. TRANS: %s is the invalid alias.

-#: actions/apigroupcreate.php:253
+#. TRANS: API validation exception thrown when aliases does not validate.
+#. TRANS: %s is the invalid alias.
+#: actions/apigroupcreate.php:253 actions/apigroupprofileupdate.php:350

 #, php-format
 msgid "Invalid alias: \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is already in use.
 #. TRANS: %s is the alias that is already in use.
 #, php-format
 msgid "Invalid alias: \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is already in use.
 #. TRANS: %s is the alias that is already in use.

+#. TRANS: API validation exception thrown when aliases is already used.
+#. TRANS: %s is the already used alias.

 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error. %s is the already used alias.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error. %s is the already used alias.

-#: actions/apigroupcreate.php:264 actions/editgroup.php:246
-#: actions/newgroup.php:193
+#: actions/apigroupcreate.php:264 actions/apigroupprofileupdate.php:361
+#: actions/editgroup.php:249 actions/newgroup.php:194

 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
 #. TRANS: Group edit form validation error.
 #, 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:253
+#: 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 ""
 


@@ -690,35 +862,35 @@ msgstr ""
 #. TRANS: Client error displayed when trying to join a group that does not exist.
 #. TRANS: Client error displayed when trying to leave a group that does not exist.
 #. TRANS: Client error displayed trying to show group membership on a non-existing group.
 #. TRANS: Client error displayed when trying to join a group that does not exist.
 #. TRANS: Client error displayed when trying to leave a group that does not exist.
 #. TRANS: Client error displayed trying to show group membership on a non-existing group.

+#. TRANS: Client error displayed when not providing a group or an invalid group.

 #. TRANS: Client error displayed when trying to show a group that could not be found.
 #. TRANS: Client error displayed requesting most recent notices to a group for a non-existing group.
 #: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
 #: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
 #. TRANS: Client error displayed when trying to show a group that could not be found.
 #. TRANS: Client error displayed requesting most recent notices to a group for a non-existing group.
 #: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
 #: actions/apigroupleave.php:104 actions/apigroupmembership.php:71

-#: actions/apigroupshow.php:81 actions/apitimelinegroup.php:89
+#: actions/apigroupprofileupdate.php:113 actions/apigroupshow.php:81
+#: actions/apitimelinegroup.php:89

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

-#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:345

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

-#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:338
+#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:350

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

-#. TRANS: Server error displayed when joining a group fails.
-#. TRANS: %1$s is a user nickname, $2$s is a group nickname.

 #. TRANS: Server error displayed when joining a group failed in the database.
 #. 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: Server error displayed when joining a group failed in the database.
 #. 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:142 actions/joingroup.php:139 lib/command.php:350
+#: 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 ""


@@ -728,43 +900,145 @@ msgstr ""
 msgid "You are not a member of this group."
 msgstr ""
 
 msgid "You are not a member of this group."
 msgstr ""
 

-#. TRANS: Server error displayed when leaving a group fails.
-#. TRANS: %1$s is a user nickname, $2$s is a group nickname.

 #. TRANS: Server error displayed when leaving a group failed in the database.
 #. 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: Server error displayed when leaving a group failed in the database.
 #. 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:127 actions/leavegroup.php:133
-#: lib/command.php:398
+#: 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."
 msgstr ""
 
 #. TRANS: Used as title in check for group membership. %s is a user name.
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 msgstr ""
 
 #. TRANS: Used as title in check for group membership. %s is a user name.

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

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

-#. TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
-#: actions/apigrouplist.php:104
+#. TRANS: Used as subtitle in check for group membership. %1$s is the site name, %2$s is a user name.
+#: actions/apigrouplist.php:105

 #, php-format
 msgid "%1$s groups %2$s is a member of."
 msgstr ""
 
 #. TRANS: Message is used as a title when listing the lastest 20 groups. %s is a site name.
 #, php-format
 msgid "%1$s groups %2$s is a member of."
 msgstr ""
 
 #. TRANS: Message is used as a title when listing the lastest 20 groups. %s is a site name.

-#. TRANS: Message is used as a page title. %s is a nick name.
+#. TRANS: Page title for first page of groups for a user.
+#. TRANS: %s is a nickname.

 #: actions/apigrouplistall.php:88 actions/usergroups.php:63
 #, php-format
 msgid "%s groups"
 msgstr ""
 
 #: actions/apigrouplistall.php:88 actions/usergroups.php:63
 #, php-format
 msgid "%s groups"
 msgstr ""
 

-#. TRANS: Message is used as a subtitle when listing the lastest 20 groups. %s is a site name.
+#. TRANS: Message is used as a subtitle when listing the latest 20 groups. %s is a site name.

 #: actions/apigrouplistall.php:93
 #, php-format
 msgid "groups on %s"
 msgstr ""
 
 #: actions/apigrouplistall.php:93
 #, php-format
 msgid "groups on %s"
 msgstr ""
 

+#. TRANS: Client error displayed when trying to edit a group without being an admin.
+#. TRANS: Client error displayed trying to edit a group while not being a group admin.
+#. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
+#: actions/apigroupprofileupdate.php:119 actions/editgroup.php:110
+#: 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.
+#: 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.
+#: actions/apigroupprofileupdate.php:196 actions/editgroup.php:286
+#: classes/User_group.php:624
+msgid "Could not create aliases."
+msgstr ""
+
+#. TRANS: API validation exception thrown when nickname does not validate.
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: actions/apigroupprofileupdate.php:252 lib/nickname.php:165
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr ""
+
+#. TRANS: API validation exception thrown when alias is the same as nickname.
+#. TRANS: Group create form validation error.
+#: actions/apigroupprofileupdate.php:370 actions/newgroup.php:201
+msgid "Alias cannot be the same as nickname."
+msgstr ""
+
+#. TRANS: Client error displayed when referring to a non-existing list.
+#. TRANS: Client error displayed trying to perform an action related to a non-existing list.
+#. TRANS: Client error displayed when referring to a non-existing list.
+#: actions/apilist.php:81 actions/apilistmember.php:70
+#: actions/apilistsubscriber.php:47 actions/apitimelinelist.php:95
+#: lib/apilistusers.php:67
+msgid "List not found."
+msgstr ""
+
+#. TRANS: Client error displayed when trying to update another user's list.
+#: actions/apilist.php:145
+msgid "You cannot update lists that do not belong to you."
+msgstr ""
+
+#. TRANS: Client error displayed when an unknown error occurs updating a list.
+#. TRANS: Client error displayed when an unknown error occurs viewing list members.
+#. TRANS: Client error displayed when an unknown error occurs in the list subscribers action.
+#. TRANS: Client error displayed when an unknown error occurs unsubscribing from a list.
+#: actions/apilist.php:161 actions/apilistmembers.php:70
+#: actions/apilistmembers.php:143 actions/apilistsubscribers.php:49
+#: actions/apilistsubscribers.php:96
+msgid "An error occured."
+msgstr ""
+
+#. TRANS: Client error displayed when trying to delete another user's list.
+#: actions/apilist.php:195
+msgid "You cannot delete lists that do not belong to you."
+msgstr ""
+
+#. TRANS: Client error displayed when referring to a non-list member.
+#: actions/apilistmember.php:99
+msgid "The specified user is not a member of this list."
+msgstr ""
+
+#. TRANS: Client error displayed when trying to add members to a list without having the right to do so.
+#: actions/apilistmembers.php:47
+msgid "You are not allowed to add members to this list."
+msgstr ""
+
+#. TRANS: Client error displayed when trying to modify list members without specifying them.
+#: actions/apilistmembers.php:57 actions/apilistmembers.php:116
+msgid "You must specify a member."
+msgstr ""
+
+#. TRANS: Client error displayed when trying to remove members from a list without having the right to do so.
+#: actions/apilistmembers.php:106
+msgid "You are not allowed to remove members from this list."
+msgstr ""
+
+#. TRANS: Client error displayed when trying to remove a list member that is not part of a list.
+#: actions/apilistmembers.php:131
+msgid "The user you are trying to remove from the list is not a member."
+msgstr ""
+
+#. TRANS: Client error displayed when trying to create a list without a name.
+#: actions/apilists.php:139
+msgid "A list must have a name."
+msgstr ""
+
+#. TRANS: Client error displayed when a membership check for a user is nagative.
+#: actions/apilistsubscriber.php:70
+msgid "The specified user is not a subscriber of this list."
+msgstr ""
+
+#. TRANS: Client error displayed when trying to unsubscribe from a non-subscribed list.
+#: actions/apilistsubscribers.php:84
+msgid "You are not subscribed to this list."
+msgstr ""
+

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


@@ -790,43 +1064,18 @@ msgstr ""
 msgid "Request token already authorized."
 msgstr ""
 
 msgid "Request token already authorized."
 msgstr ""
 

-#. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
-#. TRANS: Client error displayed when the session token does not match or is not given.
-#. TRANS: Form validation error message.
-#. TRANS: Form validation error.
-#. TRANS: Form validation error message.
-#. TRANS: Client error displayed when the session token is not okay.
-#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:75
-#: actions/emailsettings.php:291 actions/favor.php:75 actions/geocode.php:55
-#: actions/groupblock.php:65 actions/grouplogo.php:321
-#: actions/groupunblock.php:65 actions/imsettings.php:224
-#: actions/invite.php:60 actions/login.php:131 actions/makeadmin.php:66
-#: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
-#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:136
-#: actions/othersettings.php:155 actions/passwordsettings.php:137
-#: actions/profilesettings.php:217 actions/recoverpassword.php:383
-#: actions/register.php:164 actions/remotesubscribe.php:76
-#: actions/repeat.php:82 actions/smssettings.php:250 actions/subedit.php:40
-#: actions/subscribe.php:87 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:53
-#: lib/designsettings.php:310
-msgid "There was a problem with your session token. Try again, please."
-msgstr ""
-

 #. TRANS: Form validation error given when an invalid username and/or password was passed to the OAuth API.
 #: actions/apioauthauthorize.php:168
 msgid "Invalid nickname / password!"
 msgstr ""
 
 #. TRANS: Server error displayed when a database action fails.
 #. TRANS: Form validation error given when an invalid username and/or password was passed to the OAuth API.
 #: actions/apioauthauthorize.php:168
 msgid "Invalid nickname / password!"
 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.


@@ -835,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:294
-#: actions/designadminpanel.php:100 actions/editapplication.php:144
-#: actions/emailsettings.php:310 actions/grouplogo.php:332
-#: actions/imsettings.php:239 actions/newapplication.php:124
-#: actions/oauthconnectionssettings.php:145 actions/recoverpassword.php:46
-#: actions/smssettings.php:271 lib/designsettings.php:321
+#: 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 "


@@ -868,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 "


@@ -877,74 +1124,73 @@ 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.
 #. TRANS: Field label in form for profile settings.
 msgctxt "LEGEND"
 msgid "Account"
 msgstr ""
 
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label in form for profile settings.

-#. TRANS: Label for group nickname (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page.
-#. TRANS: DT for nick name in a profile.
-#: actions/apioauthauthorize.php:459 actions/login.php:242
-#: actions/profilesettings.php:106 actions/register.php:418
-#: actions/showgroup.php:243 actions/tagother.php:94
-#: actions/userauthorization.php:152 lib/groupeditform.php:145
-#: lib/userprofile.php:137
+#. TRANS: Field label on account registration page.
+#. TRANS: Field label on group edit form.
+#. TRANS: Dropdown option for searching in profiles.
+#: actions/apioauthauthorize.php:429 actions/profilesettings.php:104
+#: actions/register.php:438 lib/groupeditform.php:147
+#: lib/togglepeopletag.php:107

 msgid "Nickname"
 msgstr ""
 
 #. TRANS: Field label on OAuth API authorisation form.
 msgid "Nickname"
 msgstr ""
 
 #. TRANS: Field label on OAuth API authorisation form.

-#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:463 actions/login.php:245
-#: actions/register.php:422 lib/accountsettingsaction.php:120
+#. TRANS: Field label on login page.
+#. TRANS: Field label on account registration page.
+#: actions/apioauthauthorize.php:433 actions/login.php:235
+#: actions/register.php:444

 msgid "Password"
 msgstr ""
 
 #. TRANS: Button text that when clicked will cancel the process of allowing access to an account
 #. TRANS: by an external application.
 #. TRANS: Button label to cancel an e-mail address confirmation procedure.
 msgid "Password"
 msgstr ""
 
 #. TRANS: Button text that when clicked will cancel the process of allowing access to an account
 #. TRANS: by an external application.
 #. TRANS: Button label to cancel an e-mail address confirmation procedure.

-#. TRANS: Button label to cancel an Instant Messaging address confirmation procedure.
+#. 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 a SMS address confirmation procedure.
 #. TRANS: Button label in the "Edit application" form.

-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:124
-#: actions/imsettings.php:127 actions/smssettings.php:133
+#: actions/apioauthauthorize.php:448 actions/emailsettings.php:125
+#: actions/imsettings.php:136 actions/smssettings.php:132

 #: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Cancel"
 msgstr ""
 
 #. TRANS: Button text that when clicked will allow access to an account by an external application.
 #: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Cancel"
 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."


@@ -952,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 "


@@ -981,24 +1227,13 @@ msgstr ""
 #. TRANS: Client error displayed trying to display redents of a non-exiting notice.
 #. TRANS: Client exception thrown when referencing a non-existing notice.
 #. TRANS: Error message displayed trying to delete a non-existing notice.
 #. TRANS: Client error displayed trying to display redents of a non-exiting notice.
 #. TRANS: Client exception thrown when referencing a non-existing notice.
 #. TRANS: Error message displayed trying to delete a non-existing notice.

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

 #: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
 #: actions/atompubshowfavorite.php:82 actions/deletenotice.php:61
 #: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
 #: actions/atompubshowfavorite.php:82 actions/deletenotice.php:61

-#: actions/shownotice.php:92
+#: actions/shownotice.php:130

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

-#. TRANS: Client error displayed trying to repeat an own notice through the API.
-#. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:537
-msgid "Cannot repeat your own notice."
-msgstr ""
-
-#. TRANS: Client error displayed trying to re-repeat a notice through the API.
-#. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:543
-msgid "Already repeated that notice."
-msgstr ""
-

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


@@ -1052,10 +1287,13 @@ msgstr ""
 msgid "Client must provide a 'status' parameter with a value."
 msgstr ""
 
 msgid "Client must provide a 'status' parameter with a value."
 msgstr ""
 

+#. TRANS: Client error displayed exceeding the maximum notice length.
+#. TRANS: %d is the maximum length for a notice.

 #. TRANS: Client error displayed when the parameter "status" is missing.
 #. TRANS: %d is the maximum number of character for a notice.
 #. TRANS: Client error displayed when the parameter "status" is missing.
 #. TRANS: %d is the maximum number of character for a notice.

+#. TRANS: Error message in incoming mail handler used when an incoming e-mail contains too many characters.

 #: actions/apistatusesupdate.php:244 actions/newnotice.php:161
 #: actions/apistatusesupdate.php:244 actions/newnotice.php:161

-#: lib/mailhandler.php:60
+#: lib/mailhandler.php:65

 #, php-format
 msgid "That's too long. Maximum notice size is %d character."
 msgid_plural "That's too long. Maximum notice size is %d characters."
 #, php-format
 msgid "That's too long. Maximum notice size is %d character."
 msgid_plural "That's too long. Maximum notice size is %d characters."


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

-#: actions/apistatusesupdate.php:308 actions/newnotice.php:184
+#. TRANS: Client error displayed exceeding the maximum notice length.
+#. TRANS: %d is the maximum length for a notice.
+#: actions/apistatusesupdate.php:308 actions/newnotice.php:186

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


@@ -1097,11 +1337,11 @@ msgstr ""
 msgid "%1$s updates favorited by %2$s / %3$s."
 msgstr ""
 
 msgid "%1$s updates favorited by %2$s / %3$s."
 msgstr ""
 

-#. TRANS: Server error displayed when generating an Atom feed fails.
-#. TRANS: %s is the error.
-#: actions/apitimelinegroup.php:134
+#. TRANS: Server error displayed whe trying to get a timeline fails.
+#. TRANS: %s is the error message.
+#: actions/apitimelinelist.php:155

 #, php-format
 #, php-format

-msgid "Could not generate feed for group - %s"
+msgid "Could not generate feed for list - %s"

 msgstr ""
 
 #. TRANS: Title for timeline of most recent mentions of a user.
 msgstr ""
 
 #. TRANS: Title for timeline of most recent mentions of a user.


@@ -1138,81 +1378,99 @@ msgid "Unimplemented."
 msgstr ""
 
 #. TRANS: Title for Atom feed "repeated to me". %s is the user nickname.
 msgstr ""
 
 #. TRANS: Title for Atom feed "repeated to me". %s is the user nickname.

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

 #, php-format
 msgid "Repeated to %s"
 msgstr ""
 
 #, php-format
 msgid "Repeated to %s"
 msgstr ""
 

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

 #. TRANS: Title of list of repeated notices of the logged in user.
 #. TRANS: %s is the nickname of the logged in user.
 #. TRANS: Title of list of repeated notices of the logged in user.
 #. TRANS: %s is the nickname of the logged in user.

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

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

+#. TRANS: Subtitle of API time with retweets of me.
+#. TRANS: %1$s is the StatusNet sitename, %2$s is the user nickname, %3$s is the user profile name.
+#: actions/apitimelineretweetsofme.php:106
+#, php-format
+msgid "%1$s notices that %2$s / %3$s has repeated."
+msgstr ""
+

 #. TRANS: Title for timeline with lastest notices with a given tag.
 #. TRANS: %s is the tag.
 #. TRANS: Title for timeline with lastest notices with a given tag.
 #. TRANS: %s is the tag.

-#: actions/apitimelinetag.php:101 actions/tag.php:67
+#. TRANS: Title for first page of notices with tags.
+#. TRANS: %s is the tag.
+#: actions/apitimelinetag.php:101 actions/tag.php:65

 #, php-format
 msgid "Notices tagged with %s"
 msgstr ""
 
 #. TRANS: Subtitle for timeline with lastest notices with a given tag.
 #. TRANS: %1$s is the tag, $2$s is the StatusNet sitename.
 #, php-format
 msgid "Notices tagged with %s"
 msgstr ""
 
 #. TRANS: Subtitle for timeline with lastest notices with a given tag.
 #. TRANS: %1$s is the tag, $2$s is the StatusNet sitename.

-#: actions/apitimelinetag.php:105 actions/tagrss.php:65
+#. TRANS: Tag feed description.
+#. TRANS: %1$s is the tag name, %2$s is the StatusNet sitename.
+#: actions/apitimelinetag.php:105 actions/tagrss.php:67

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

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

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

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

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

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

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

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

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

-#: actions/apitimelineuser.php:323 actions/atompubfavoritefeed.php:228
+#: actions/apitimelineuser.php:337 actions/atompubfavoritefeed.php:228

 #: actions/atompubmembershipfeed.php:230
 #: actions/atompubsubscriptionfeed.php:236
 msgid "Atom post must be an Atom entry."
 msgstr ""
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
 #: actions/atompubmembershipfeed.php:230
 #: actions/atompubsubscriptionfeed.php:236
 msgid "Atom post must be an Atom entry."
 msgstr ""
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.

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

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

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

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

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

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

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

 #, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr ""
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr ""


@@ -1227,101 +1485,19 @@ msgstr ""
 msgid "User not found."
 msgstr ""
 
 msgid "User not found."
 msgstr ""
 

-#. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
-#. TRANS: Client exception.
-#. TRANS: Client error displayed trying to subscribe to a non-existing profile.
-#: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
-#: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
-#: actions/subscribe.php:110
-msgid "No such profile."
-msgstr ""
-
-#. TRANS: Subtitle for Atom favorites feed.
-#. TRANS: %1$s is a user nickname, %2$s is the StatusNet sitename.
-#: actions/atompubfavoritefeed.php:147
-#, php-format
-msgid "Notices %1$s has favorited on %2$s"
-msgstr ""
-
-#. TRANS: Client exception thrown when trying to set a favorite for another user.
-#. TRANS: Client exception thrown when trying to subscribe another user.
-#: actions/atompubfavoritefeed.php:217 actions/atompubsubscriptionfeed.php:225
-msgid "Cannot add someone else's subscription."
-msgstr ""
-
-#. TRANS: Client exception thrown when trying use an incorrect activity verb for the Atom pub method.
-#: actions/atompubfavoritefeed.php:240
-msgid "Can only handle favorite activities."
-msgstr ""
-
-#. TRANS: Client exception thrown when trying favorite an object that is not a notice.
-#: actions/atompubfavoritefeed.php:250 actions/atompubmembershipfeed.php:250
-msgid "Can only fave notices."
-msgstr ""
-
-#. TRANS: Client exception thrown when trying favorite a notice without content.
-#: actions/atompubfavoritefeed.php:259
-msgid "Unknown note."
-msgstr ""
-
-#. TRANS: Client exception thrown when trying favorite an already favorited notice.
-#: actions/atompubfavoritefeed.php:267
-msgid "Already a favorite."
-msgstr ""
-
-#. TRANS: Title for group membership feed.
-#. TRANS: %s is a username.
-#: actions/atompubmembershipfeed.php:144
-#, php-format
-msgid "%s group memberships"
-msgstr ""
-
-#. TRANS: Subtitle for group membership feed.
-#. TRANS: %1$s is a username, %2$s is the StatusNet sitename.
-#: actions/atompubmembershipfeed.php:149
-#, php-format
-msgid "Groups %1$s is a member of on %2$s"
-msgstr ""
-
-#. TRANS: Client exception thrown when trying subscribe someone else to a group.
-#: actions/atompubmembershipfeed.php:219
-msgid "Cannot add someone else's membership."
-msgstr ""
-
-#. TRANS: Client error displayed when not using the POST verb.
-#. TRANS: Do not translate POST.
-#: actions/atompubmembershipfeed.php:242
-msgid "Can only handle join activities."
-msgstr ""
-
-#. TRANS: Client exception thrown when trying to subscribe to a non-existing group.
-#: actions/atompubmembershipfeed.php:259
-msgid "Unknown group."
-msgstr ""
-
-#. TRANS: Client exception thrown when trying to subscribe to an already subscribed group.
-#: actions/atompubmembershipfeed.php:267
-msgid "Already a member."
-msgstr ""
-
-#. TRANS: Client exception thrown when trying to subscribe to group while blocked from that group.
-#: actions/atompubmembershipfeed.php:275
-msgid "Blocked by admin."
-msgstr ""
-
-#. TRANS: Client exception thrown when referencing a non-existing favorite.
-#: actions/atompubshowfavorite.php:90
-msgid "No such favorite."
-msgstr ""
-
-#. TRANS: Client exception thrown when trying to remove a favorite notice of another user.
-#: actions/atompubshowfavorite.php:151
-msgid "Cannot delete someone else's favorite."
+#. TRANS: Client error displayed when trying to leave a group while not logged in.
+#: actions/approvegroup.php:59 actions/cancelgroup.php:59
+#: actions/leavegroup.php:59
+msgid "You must be logged in to leave a group."

 msgstr ""
 
 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 exception thrown when referencing a non-existing group.
 #. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
 #. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
 #. TRANS: Client exception thrown when referencing a non-existing group.
 #. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
 #. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.

+#. 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 when trying to delete a non-local group.
 #. TRANS: Client error when trying to delete a non-existing group.
 #. TRANS: Client error displayed trying to edit a non-existing group.
 #. TRANS: Client error when trying to delete a non-local group.
 #. TRANS: Client error when trying to delete a non-existing group.
 #. TRANS: Client error displayed trying to edit a non-existing group.


@@ -1330,7 +1506,6 @@ 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.


@@ -1341,26 +1516,218 @@ msgstr ""
 #. TRANS: Client error displayed when trying to join a non-existing group.
 #. 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 trying to join a non-existing group.
 #. 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 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: Client error displayed when providing an invalid group ID on the Make Admin 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/atompubshowmembership.php:81 actions/blockedfromgroup.php:81

-#: actions/blockedfromgroup.php:89 actions/deletegroup.php:87
+#: actions/blockedfromgroup.php:89 actions/cancelgroup.php:81
+#: actions/cancelgroup.php:94 actions/deletegroup.php:87

 #: actions/deletegroup.php:100 actions/editgroup.php:102
 #: actions/foafgroup.php:46 actions/foafgroup.php:65 actions/foafgroup.php:73
 #: actions/deletegroup.php:100 actions/editgroup.php:102
 #: actions/foafgroup.php:46 actions/foafgroup.php:65 actions/foafgroup.php:73

-#: actions/groupblock.php:89 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:101 actions/grouplogo.php:103
-#: actions/groupmembers.php:84 actions/groupmembers.php:92
-#: actions/grouprss.php:97 actions/grouprss.php:105
-#: actions/groupunblock.php:89 actions/joingroup.php:82
+#: actions/groupblock.php:90 actions/groupbyid.php:83
+#: actions/grouplogo.php:103 actions/groupqueue.php:85
+#: actions/groupqueue.php:93 actions/grouprss.php:97 actions/grouprss.php:105
+#: actions/groupunblock.php:90 actions/joingroup.php:82

 #: actions/joingroup.php:95 actions/leavegroup.php:82
 #: actions/joingroup.php:95 actions/leavegroup.php:82

-#: actions/leavegroup.php:95 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
+#: 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 ""
 

+#. TRANS: Client error displayed when trying to leave a group without providing a group name or group ID.
+#. TRANS: Client error when trying to delete a group without providing a nickname or ID for the group.
+#. TRANS: Client error displayed when trying to join a group without providing a group name or group ID.
+#. TRANS: Client error displayed when trying to leave a group without providing a group name or group ID.
+#: actions/approvegroup.php:89 actions/cancelgroup.php:88
+#: actions/deletegroup.php:94 actions/joingroup.php:89
+#: actions/leavegroup.php:89
+msgid "No nickname or ID."
+msgstr ""
+
+#. TRANS: Client error displayed trying to approve group membership while not logged in.
+#. TRANS: Client error displayed when trying to leave a group while not logged in.
+#: actions/approvegroup.php:102 actions/approvesub.php:60
+#: actions/cancelgroup.php:101
+msgid "Must be logged in."
+msgstr ""
+
+#. TRANS: Client error displayed trying to approve group membership while not a group administrator.
+#. TRANS: Client error displayed when trying to approve or cancel a group join request without
+#. TRANS: being a group administrator.
+#: actions/approvegroup.php:110 actions/cancelgroup.php:110
+msgid "Only group admin can approve or cancel join requests."
+msgstr ""
+
+#. TRANS: Client error displayed trying to approve group membership without specifying a profile to approve.
+#. TRANS: Client error displayed trying to approve subscriptionswithout specifying a profile to approve.
+#: actions/approvegroup.php:115 actions/approvesub.php:67
+msgid "Must specify a profile."
+msgstr ""
+
+#. TRANS: Client error displayed trying to approve group membership for a non-existing request.
+#. TRANS: %s is a nickname.
+#. TRANS: Client error displayed when trying to approve a non-existing group join request.
+#. TRANS: %s is a user nickname.
+#: actions/approvegroup.php:125 actions/cancelgroup.php:123
+#: actions/cancelsubscription.php:102
+#, php-format
+msgid "%s is not in the moderation queue for this group."
+msgstr ""
+
+#. TRANS: Client error displayed trying to approve/deny group membership.
+#. TRANS: Client error displayed trying to approve/deny subscription.
+#: actions/approvegroup.php:132 actions/approvesub.php:84
+msgid "Internal error: received neither cancel nor abort."
+msgstr ""
+
+#. TRANS: Client error displayed trying to approve/deny group membership.
+#. TRANS: Client error displayed trying to approve/deny  subscription
+#: actions/approvegroup.php:136 actions/approvesub.php:88
+msgid "Internal error: received both cancel and abort."
+msgstr ""
+
+#. TRANS: Server error displayed when cancelling a queued group join request fails.
+#. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
+#: actions/approvegroup.php:164 actions/cancelgroup.php:147
+#, php-format
+msgid "Could not cancel request for user %1$s to join group %2$s."
+msgstr ""
+
+#. TRANS: Title for leave group page after group join request is approved/disapproved.
+#. TRANS: %1$s is the user nickname, %2$s is the group nickname.
+#: actions/approvegroup.php:174
+#, php-format
+msgctxt "TITLE"
+msgid "%1$s's request for %2$s"
+msgstr ""
+
+#. TRANS: Message on page for group admin after approving a join request.
+#: actions/approvegroup.php:181
+msgid "Join request approved."
+msgstr ""
+
+#. TRANS: Message on page for group admin after rejecting a join request.
+#: actions/approvegroup.php:184
+msgid "Join request canceled."
+msgstr ""
+
+#. TRANS: Client error displayed trying to approve subscription for a non-existing request.
+#. TRANS: %s is a user nickname.
+#: actions/approvesub.php:77
+#, php-format
+msgid "%s is not in the moderation queue for your subscriptions."
+msgstr ""
+
+#. TRANS: Server error displayed when cancelling a queued subscription request fails.
+#. TRANS: %1$s is the leaving user's nickname, $2$s is the nickname for which the leave failed.
+#: actions/approvesub.php:117
+#, php-format
+msgid "Could not cancel or approve request for user %1$s to join group %2$s."
+msgstr ""
+
+#. TRANS: Title for subscription approval ajax return
+#. TRANS: %1$s is the approved user's nickname
+#: actions/approvesub.php:127
+#, php-format
+msgctxt "TITLE"
+msgid "%1$s's request"
+msgstr ""
+
+#. TRANS: Message on page for user after approving a subscription request.
+#: actions/approvesub.php:133
+msgid "Subscription approved."
+msgstr ""
+
+#. TRANS: Message on page for user after rejecting a subscription request.
+#: actions/approvesub.php:136
+msgid "Subscription canceled."
+msgstr ""
+
+#. TRANS: Subtitle for Atom favorites feed.
+#. TRANS: %1$s is a user nickname, %2$s is the StatusNet sitename.
+#: actions/atompubfavoritefeed.php:147
+#, php-format
+msgid "Notices %1$s has favorited on %2$s"
+msgstr ""
+
+#. TRANS: Client exception thrown when trying to set a favorite for another user.
+#. TRANS: Client exception thrown when trying to subscribe another user.
+#: actions/atompubfavoritefeed.php:217 actions/atompubsubscriptionfeed.php:225
+msgid "Cannot add someone else's subscription."
+msgstr ""
+
+#. TRANS: Client exception thrown when trying use an incorrect activity verb for the Atom pub method.
+#: actions/atompubfavoritefeed.php:240
+msgid "Can only handle favorite activities."
+msgstr ""
+
+#. TRANS: Client exception thrown when trying favorite an object that is not a notice.
+#: actions/atompubfavoritefeed.php:250 actions/atompubmembershipfeed.php:249
+msgid "Can only fave notices."
+msgstr ""
+
+#. TRANS: Client exception thrown when trying favorite a notice without content.
+#: actions/atompubfavoritefeed.php:259
+msgid "Unknown notice."
+msgstr ""
+
+#. TRANS: Client exception thrown when trying favorite an already favorited notice.
+#: actions/atompubfavoritefeed.php:267
+msgid "Already a favorite."
+msgstr ""
+
+#. TRANS: Title for group membership feed.
+#. TRANS: %s is a username.
+#: actions/atompubmembershipfeed.php:144
+#, php-format
+msgid "Group memberships of %s"
+msgstr ""
+
+#. TRANS: Subtitle for group membership feed.
+#. TRANS: %1$s is a username, %2$s is the StatusNet sitename.
+#: actions/atompubmembershipfeed.php:149
+#, php-format
+msgid "Groups %1$s is a member of on %2$s"
+msgstr ""
+
+#. TRANS: Client exception thrown when trying subscribe someone else to a group.
+#: actions/atompubmembershipfeed.php:219
+msgid "Cannot add someone else's membership."
+msgstr ""
+
+#. TRANS: Client error displayed when not using the join verb.
+#: actions/atompubmembershipfeed.php:241
+msgid "Can only handle join activities."
+msgstr ""
+
+#. TRANS: Client exception thrown when trying to subscribe to a non-existing group.
+#: actions/atompubmembershipfeed.php:258
+msgid "Unknown group."
+msgstr ""
+
+#. TRANS: Client exception thrown when trying to subscribe to an already subscribed group.
+#: actions/atompubmembershipfeed.php:266
+msgid "Already a member."
+msgstr ""
+
+#. TRANS: Client exception thrown when trying to subscribe to group while blocked from that group.
+#: actions/atompubmembershipfeed.php:274
+msgid "Blocked by admin."
+msgstr ""
+
+#. TRANS: Client exception thrown when referencing a non-existing favorite.
+#: actions/atompubshowfavorite.php:90
+msgid "No such favorite."
+msgstr ""
+
+#. TRANS: Client exception thrown when trying to remove a favorite notice of another user.
+#: actions/atompubshowfavorite.php:151
+msgid "Cannot delete someone else's favorite."
+msgstr ""
+

 #. TRANS: Client exception thrown when trying to show membership of a non-subscribed group
 #: actions/atompubshowmembership.php:91
 msgid "Not a member."
 #. TRANS: Client exception thrown when trying to show membership of a non-subscribed group
 #: actions/atompubshowmembership.php:91
 msgid "Not a member."


@@ -1431,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/grouprss.php:89 actions/showgroup.php:116
+#: 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 ""
 


@@ -1454,10 +1819,7 @@ msgid "Invalid size."
 msgstr ""
 
 #. TRANS: Title for avatar upload page.
 msgstr ""
 
 #. TRANS: Title for avatar upload page.

-#. TRANS: Label for group avatar (dt). Text hidden by default.
-#. TRANS: Link description in user account settings menu.
-#: actions/avatarsettings.php:66 actions/showgroup.php:227
-#: lib/accountsettingsaction.php:113
+#: actions/avatarsettings.php:66

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


@@ -1468,20 +1830,10 @@ 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 when trying to authorise a remote subscription request
-#. TRANS: while the user has no profile.
-#: actions/avatarsettings.php:108 actions/avatarsettings.php:192
-#: actions/grouplogo.php:184 actions/remotesubscribe.php:190
-#: actions/userauthorization.php:75 actions/userrss.php:108
-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.

-#: actions/avatarsettings.php:122 actions/avatarsettings.php:205
+#: actions/avatarsettings.php:122 actions/avatarsettings.php:207

 #: actions/grouplogo.php:261
 msgid "Avatar settings"
 msgstr ""
 #: actions/grouplogo.php:261
 msgid "Avatar settings"
 msgstr ""


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

-#: actions/avatarsettings.php:131 actions/avatarsettings.php:214
+#: actions/avatarsettings.php:131 actions/avatarsettings.php:216

 #: actions/grouplogo.php:207 actions/grouplogo.php:270
 msgid "Original"
 msgstr ""
 #: actions/grouplogo.php:207 actions/grouplogo.php:270
 msgid "Original"
 msgstr ""


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

-#: actions/avatarsettings.php:147 actions/avatarsettings.php:227
+#: actions/avatarsettings.php:147 actions/avatarsettings.php:229

 #: actions/grouplogo.php:219 actions/grouplogo.php:283
 msgid "Preview"
 msgstr ""
 
 #. TRANS: Button on avatar upload page to delete current avatar.
 #. TRANS: Button text for user account deletion.
 #: actions/grouplogo.php:219 actions/grouplogo.php:283
 msgid "Preview"
 msgstr ""
 
 #. TRANS: Button on avatar upload page to delete current avatar.
 #. TRANS: Button text for user account deletion.

-#: actions/avatarsettings.php:155 actions/deleteaccount.php:319
+#. TRANS: Submit button text the OAuth application page to delete an application.
+#. TRANS: Button text for deleting a group.
+#. TRANS: Button text to delete a list.
+#: actions/avatarsettings.php:156 actions/deleteaccount.php:319
+#: actions/showapplication.php:243 lib/deletegroupform.php:115
+#: lib/peopletageditform.php:171

 msgctxt "BUTTON"
 msgid "Delete"
 msgstr ""
 
 #. TRANS: Button on avatar upload page to upload an avatar.
 #. TRANS: Submit button to confirm upload of a user backup file for account restore.
 msgctxt "BUTTON"
 msgid "Delete"
 msgstr ""
 
 #. TRANS: Button on avatar upload page to upload an avatar.
 #. TRANS: Submit button to confirm upload of a user backup file for account restore.

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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


@@ -1572,7 +1929,7 @@ msgid "You may not backup your account."
 msgstr ""
 
 #. TRANS: Information displayed on the backup account page.
 msgstr ""
 
 #. TRANS: Information displayed on the backup account page.

-#: actions/backupaccount.php:225
+#: actions/backupaccount.php:227

 msgid ""
 "You can backup your account data in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format. This is an experimental feature and provides "
 msgid ""
 "You can backup your account data in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format. This is an experimental feature and provides "


@@ -1582,13 +1939,13 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button to backup an account on the backup account page.
 msgstr ""
 
 #. TRANS: Submit button to backup an account on the backup account page.

-#: actions/backupaccount.php:248
+#: actions/backupaccount.php:250

 msgctxt "BUTTON"
 msgid "Backup"
 msgstr ""
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
 msgctxt "BUTTON"
 msgid "Backup"
 msgstr ""
 
 #. TRANS: Title for submit button to backup an account on the backup account page.

-#: actions/backupaccount.php:252
+#: actions/backupaccount.php:254

 msgid "Backup your account."
 msgstr ""
 
 msgid "Backup your account."
 msgstr ""
 


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

-#: actions/block.php:106 actions/block.php:136 actions/groupblock.php:165
+#: actions/block.php:106 actions/block.php:136 actions/groupblock.php:166

 msgid "Block user"
 msgstr ""
 
 msgid "Block user"
 msgstr ""
 


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

-#: actions/block.php:154 actions/deleteapplication.php:157
+#: actions/block.php:154 actions/deleteapplication.php:158

 #: actions/deletegroup.php:220 actions/deletenotice.php:155
 #: actions/deletegroup.php:220 actions/deletenotice.php:155

-#: actions/deleteuser.php:154 actions/groupblock.php:187
+#: actions/deleteuser.php:154 actions/editpeopletag.php:178
+#: actions/groupblock.php:188

 msgctxt "BUTTON"
 msgid "No"
 msgstr ""
 msgctxt "BUTTON"
 msgid "No"
 msgstr ""


@@ -1636,9 +1994,11 @@ msgstr ""
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.

-#: actions/block.php:161 actions/deleteapplication.php:164
+#. 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/deletegroup.php:227 actions/deletenotice.php:162

-#: actions/deleteuser.php:161 actions/groupblock.php:194
+#: actions/deleteuser.php:161 actions/editpeopletag.php:182
+#: actions/groupblock.php:195 lib/repeatform.php:126

 msgctxt "BUTTON"
 msgid "Yes"
 msgstr ""
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr ""


@@ -1673,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 ""
 


@@ -1696,6 +2056,42 @@ msgstr ""
 msgid "Post to %s"
 msgstr ""
 
 msgid "Post to %s"
 msgstr ""
 

+#. TRANS: Title for leave group page after leaving.
+#. TRANS: %s$s is the leaving user's name, %2$s is the group name.
+#. TRANS: Title for leave group page after leaving.
+#: actions/cancelgroup.php:157 actions/leavegroup.php:140
+#, php-format
+msgctxt "TITLE"
+msgid "%1$s left group %2$s"
+msgstr ""
+
+#. TRANS: Client error displayed when trying to leave a group without specifying an ID.
+#. TRANS: Client error displayed when trying to unsubscribe without providing a profile ID.
+#: actions/cancelsubscription.php:84 actions/unsubscribe.php:79
+msgid "No profile ID in request."
+msgstr ""
+
+#. TRANS: Client error displayed when trying to leave a non-existing group.
+#. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing profile.
+#. TRANS: Client error displayed when trying to unblock a user from a group without providing an existing profile.
+#. TRANS: Client error displayed when specifying an invalid profile ID on the Make Admin page.
+#. TRANS: Client error displayed trying a change a subscription for a non-existant profile ID.
+#. TRANS: Client error displayed when referring to non-existing profile ID.
+#. TRANS: Client error displayed when trying to unsubscribe while providing a non-existing profile ID.
+#. TRANS: Client error displayed when trying to change user options without specifying an existing user to work on.
+#: actions/cancelsubscription.php:92 actions/groupblock.php:78
+#: actions/groupunblock.php:78 actions/makeadmin.php:80 actions/subedit.php:58
+#: actions/tagprofile.php:48 actions/unsubscribe.php:87
+#: lib/profileformaction.php:87
+msgid "No profile with that ID."
+msgstr ""
+
+#. TRANS: Title after unsubscribing from a group.
+#: actions/cancelsubscription.php:111
+msgctxt "TITLE"
+msgid "Unsubscribed"
+msgstr ""
+

 #. TRANS: Client error displayed when not providing a confirmation code in the contact address confirmation action.
 #: actions/confirmaddress.php:74
 msgid "No confirmation code."
 #. TRANS: Client error displayed when not providing a confirmation code in the contact address confirmation action.
 #: actions/confirmaddress.php:74
 msgid "No confirmation code."


@@ -1711,45 +2107,69 @@ msgstr ""
 msgid "That confirmation code is not for you!"
 msgstr ""
 
 msgid "That confirmation code is not for you!"
 msgstr ""
 

-#. TRANS: Server error for a unknow address type %s, which can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:92
+#. TRANS: Server error for an unknown address type, which can be 'email', 'sms', or the name of an IM network (such as 'xmpp' or 'aim')
+#: actions/confirmaddress.php:94

 #, php-format
 #, php-format

-msgid "Unrecognized address type %s."
+msgid "Unrecognized address type %s"

 msgstr ""
 
 #. TRANS: Client error for an already confirmed email/jabber/sms address.
 msgstr ""
 
 #. TRANS: Client error for an already confirmed email/jabber/sms address.

-#: actions/confirmaddress.php:97
+#. TRANS: Client error for an already confirmed IM address.
+#: actions/confirmaddress.php:103 actions/confirmaddress.php:138

 msgid "That address has already been confirmed."
 msgstr ""
 
 msgid "That address has already been confirmed."
 msgstr ""
 

+#. TRANS: Server error displayed when updating IM preferences fails.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#: actions/confirmaddress.php:147 actions/imsettings.php:447
+msgid "Could not update user IM preferences."
+msgstr ""
+
+#. TRANS: Server error displayed when adding IM preferences fails.
+#: actions/confirmaddress.php:160
+msgid "Could not insert user IM preferences."
+msgstr ""
+

 #. TRANS: Server error displayed when an address confirmation code deletion from the
 #. TRANS: database fails in the contact address confirmation action.
 #. TRANS: Server error displayed when an address confirmation code deletion from the
 #. TRANS: database fails in the contact address confirmation action.

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

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

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

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

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

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

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

 msgid "Conversation"
 msgstr ""
 
 msgid "Conversation"
 msgstr ""
 

-#. TRANS: Header on conversation page. Hidden by default (h2).
-#. TRANS: Label for user statistics.
-#: actions/conversation.php:149 lib/noticelist.php:87
-#: lib/profileaction.php:246 lib/searchgroupnav.php:82
-msgid "Notices"
+#. 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
+msgctxt "TITLE"
+msgid "Notice"

 msgstr ""
 
 #. TRANS: Client exception displayed trying to delete a user account while not logged in.
 msgstr ""
 
 #. TRANS: Client exception displayed trying to delete a user account while not logged in.


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

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

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


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

-#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:262 actions/register.php:426
+#: actions/deleteaccount.php:300 actions/recoverpassword.php:262

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


@@ -1817,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.


@@ -1832,26 +2251,28 @@ msgstr ""
 
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
 
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.

+#. TRANS: Client error displayed trying to display an OAuth application for which the logged in user is not the owner.

 #: actions/deleteapplication.php:79 actions/editapplication.php:78
 #: actions/deleteapplication.php:79 actions/editapplication.php:78

-#: actions/showapplication.php:90
+#: actions/showapplication.php:93

 msgid "You are not the owner of this application."
 msgstr ""
 
 msgid "You are not the owner of this application."
 msgstr ""
 

+#. TRANS: Client error displayed when the session token does not match or is not given.

 #. TRANS: Client error text when there is a problem with the session token.
 #. TRANS: Client error text when there is a problem with the session token.

-#: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:112 actions/showapplication.php:113
-#: lib/action.php:1422
+#: actions/deleteapplication.php:103 actions/editapplication.php:132
+#: actions/newapplication.php:113 actions/showapplication.php:117
+#: lib/action.php:1473

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

-#: actions/deleteapplication.php:124 actions/deleteapplication.php:149
+#: actions/deleteapplication.php:125 actions/deleteapplication.php:150

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

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

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


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

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

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

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

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


@@ -1873,14 +2294,6 @@ msgstr ""
 msgid "You must be logged in to delete a group."
 msgstr ""
 
 msgid "You must be logged in to delete a group."
 msgstr ""
 

-#. TRANS: Client error when trying to delete a group without providing a nickname or ID for the group.
-#. TRANS: Client error displayed when trying to join a group without providing a group name or group ID.
-#. TRANS: Client error displayed when trying to leave a group without providing a group name or group ID.
-#: actions/deletegroup.php:94 actions/joingroup.php:89
-#: actions/leavegroup.php:89
-msgid "No nickname or ID."
-msgstr ""
-

 #. TRANS: Client error when trying to delete a group without having the rights to delete it.
 #: actions/deletegroup.php:107
 msgid "You are not allowed to delete this group."
 #. TRANS: Client error when trying to delete a group without having the rights to delete it.
 #: actions/deletegroup.php:107
 msgid "You are not allowed to delete this group."


@@ -1924,26 +2337,6 @@ msgstr ""
 msgid "Delete this group."
 msgstr ""
 
 msgid "Delete this group."
 msgstr ""
 

-#. TRANS: Error message displayed trying to delete a notice while not logged in.
-#. TRANS: Client error displayed when trying to remove a favorite while not logged in.
-#. TRANS: Client error displayed when trying to mark a notice as favorite without being logged in.
-#. TRANS: Client error displayed trying to block a user from a group while not logged in.
-#. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
-#. TRANS: Client error displayed trying to log out when not logged in.
-#. TRANS: Client error displayed trying a change a subscription while not logged in.
-#. TRANS: Client error displayed trying to subscribe when not logged in.
-#. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#. TRANS: Client error displayed when trying to change user options while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:70
-#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
-#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:98
-#: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:71 lib/profileformaction.php:63
-#: lib/settingsaction.php:72
-msgid "Not logged in."
-msgstr ""
-

 #. TRANS: Instructions for deleting a notice.
 #: actions/deletenotice.php:110
 msgid ""
 #. TRANS: Instructions for deleting a notice.
 #: actions/deletenotice.php:110
 msgid ""


@@ -2010,194 +2403,107 @@ msgstr ""
 msgid "Delete this user."
 msgstr ""
 
 msgid "Delete this user."
 msgstr ""
 

-#. TRANS: Message used as title for design settings for the site.
-#. TRANS: Link description in user account settings menu.
-#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134
-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.
-#. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:515 lib/designsettings.php:98
-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/designsettings.php:183
-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/designsettings.php:159
-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/designsettings.php:165
-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/designsettings.php:197
-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/designsettings.php:211
-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/designsettings.php:225
-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/designsettings.php:239
-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.
-#: actions/designadminpanel.php:720
-msgid "Restore default designs."
+#: actions/doc.php:215
+msgctxt "MENU"
+msgid "Tags"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:728
-msgid "Reset back to default."
+#: actions/doc.php:216
+msgid "Using tags"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Title for button for saving theme settings.
-#: actions/designadminpanel.php:736
-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:155
-#, 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.


@@ -2212,81 +2518,82 @@ msgid "You must be logged in to edit an application."
 msgstr ""
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.
 msgstr ""
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.

-#: actions/editapplication.php:83 actions/showapplication.php:83
+#. TRANS: Client error displayed trying to display a non-existing OAuth application.
+#: actions/editapplication.php:83 actions/showapplication.php:85

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

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

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

-#: actions/editapplication.php:184 actions/newapplication.php:164
+#: actions/editapplication.php:185 actions/newapplication.php:165

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

-#: actions/editapplication.php:188 actions/newapplication.php:172
+#: actions/editapplication.php:189 actions/newapplication.php:173

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

-#: actions/editapplication.php:192 actions/newapplication.php:168
+#: actions/editapplication.php:193 actions/newapplication.php:169

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

-#: actions/editapplication.php:196 actions/newapplication.php:176
+#: actions/editapplication.php:197 actions/newapplication.php:177

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

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

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

-#: actions/editapplication.php:216 actions/newapplication.php:199
+#: actions/editapplication.php:217 actions/newapplication.php:200

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

-#: actions/editapplication.php:220 actions/newapplication.php:203
+#: actions/editapplication.php:221 actions/newapplication.php:204

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

-#: actions/editapplication.php:224 actions/newapplication.php:207
+#: actions/editapplication.php:225 actions/newapplication.php:208

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

-#: actions/editapplication.php:228 actions/newapplication.php:211
+#: actions/editapplication.php:229 actions/newapplication.php:212

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

-#: actions/editapplication.php:239 actions/newapplication.php:225
+#: actions/editapplication.php:240 actions/newapplication.php:226

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

-#: actions/editapplication.php:247 actions/newapplication.php:235
+#: actions/editapplication.php:248 actions/newapplication.php:236

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

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

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


@@ -2303,80 +2610,135 @@ msgstr ""
 msgid "You must be logged in to create a group."
 msgstr ""
 
 msgid "You must be logged in to create a group."
 msgstr ""
 

-#. 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/editgroup.php:110 actions/editgroup.php:176
-#: actions/groupdesignsettings.php:109 actions/grouplogo.php:111
-msgid "You must be an admin to edit the group."
-msgstr ""
-

 #. TRANS: Form instructions for group edit form.
 #. 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:241 actions/newgroup.php:188
+#: actions/editgroup.php:244 actions/newgroup.php:189

 #, php-format
 msgid "Invalid alias: \"%s\""
 msgstr ""
 
 #, php-format
 msgid "Invalid alias: \"%s\""
 msgstr ""
 

-#. TRANS: Server error displayed when editing a group fails.
-#: actions/editgroup.php:274
-msgid "Could not update group."
+#. TRANS: Group edit form success message.
+#. TRANS: Edit list form success message.
+#: actions/editgroup.php:306 actions/editpeopletag.php:326
+msgid "Options saved."

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Server error displayed when group aliases could not be added.
-#. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:281 classes/User_group.php:540
-msgid "Could not create aliases."
+#. TRANS: Title for edit list page after deleting a tag.
+#. TRANS: %s is a list.
+#: actions/editpeopletag.php:52
+#, php-format
+msgid "Delete %s list"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Group edit form success message.
-#: actions/editgroup.php:301
-msgid "Options saved."
+#. TRANS: Title for edit list page.
+#. TRANS: %s is a list.
+#. TRANS: Form legend for list edit form.
+#. TRANS: %s is a list.
+#: actions/editpeopletag.php:56 lib/peopletageditform.php:110
+#, php-format
+msgid "Edit list %s"
+msgstr ""
+
+#. TRANS: Error message displayed when trying to perform an action that requires a tagging user or ID.
+#: actions/editpeopletag.php:103
+msgid "No tagger or ID."
+msgstr ""
+
+#. TRANS: Client error displayed when referring to non-local user.
+#: 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.
+#: actions/editpeopletag.php:126
+msgid "You must be the creator of the tag to edit it."
+msgstr ""
+
+#. TRANS: Form instruction for edit list form.
+#: 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.
+#: actions/editpeopletag.php:244
+msgid "Delete aborted."
+msgstr ""
+
+#. TRANS: Text in confirmation dialog for deleting a tag.
+#: 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.
+#: 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.
+#: 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.
+#: 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 ""
+
+#. TRANS: Server error displayed when updating a list fails.
+#: actions/editpeopletag.php:301
+msgid "Could not update list."

 msgstr ""
 
 #. TRANS: Title for e-mail settings.
 msgstr ""
 
 #. TRANS: Title for e-mail settings.

-#: actions/emailsettings.php:59
+#: actions/emailsettings.php:60

 msgid "Email settings"
 msgstr ""
 
 #. TRANS: E-mail settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
 msgid "Email settings"
 msgstr ""
 
 #. TRANS: E-mail settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.

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

 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr ""
 
 #. TRANS: Form legend for e-mail settings form.
 #. TRANS: Field label for e-mail address input in e-mail settings form.
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr ""
 
 #. TRANS: Form legend for e-mail settings form.
 #. TRANS: Field label for e-mail address input in e-mail settings form.

-#: actions/emailsettings.php:103 actions/emailsettings.php:129
+#: actions/emailsettings.php:104 actions/emailsettings.php:130

 msgid "Email address"
 msgstr ""
 
 #. TRANS: Form note in e-mail settings form.
 msgid "Email address"
 msgstr ""
 
 #. TRANS: Form note in e-mail settings form.

-#: actions/emailsettings.php:109
+#: actions/emailsettings.php:110

 msgid "Current confirmed email address."
 msgstr ""
 
 #. TRANS: Button label to remove a confirmed e-mail address.
 #. TRANS: Button label for removing a set sender e-mail address to post notices from.
 msgid "Current confirmed email address."
 msgstr ""
 
 #. TRANS: Button label to remove a confirmed e-mail address.
 #. TRANS: Button label for removing a set sender e-mail address to post notices from.

-#. TRANS: Button label to remove a confirmed Instant Messaging address.
+#. TRANS: Button label to remove a confirmed IM address.

 #. TRANS: Button label to remove a confirmed SMS address.
 #. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
 #. TRANS: Button label to remove a confirmed SMS address.
 #. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.

-#: actions/emailsettings.php:112 actions/emailsettings.php:179
-#: actions/imsettings.php:112 actions/smssettings.php:120
-#: actions/smssettings.php:176
+#. TRANS: Button text to untag a profile.
+#: actions/emailsettings.php:113 actions/emailsettings.php:180
+#: actions/imsettings.php:119 actions/smssettings.php:119
+#: actions/smssettings.php:175 lib/togglepeopletag.php:213

 msgctxt "BUTTON"
 msgid "Remove"
 msgstr ""
 
 #. TRANS: Form note in e-mail settings form.
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr ""
 
 #. TRANS: Form note in e-mail settings form.

-#: actions/emailsettings.php:119
+#: actions/emailsettings.php:120

 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."


@@ -2387,44 +2749,45 @@ msgstr ""
 #. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
 #. TRANS: Any other domain may be owned by a legitimate person or
 #. TRANS: organization.
 #. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
 #. TRANS: Any other domain may be owned by a legitimate person or
 #. TRANS: organization.

-#: actions/emailsettings.php:136
+#: actions/emailsettings.php:137

 msgid "Email address, like \"UserName@example.org\""
 msgstr ""
 
 #. TRANS: Button label for adding an e-mail address in e-mail settings form.
 msgid "Email address, like \"UserName@example.org\""
 msgstr ""
 
 #. TRANS: Button label for adding an e-mail address in e-mail settings form.

-#. TRANS: Button label for adding an Instant Messaging address in Instant Messaging settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.

 #. TRANS: Button label for adding a SMS phone number in SMS settings form.
 #. TRANS: Button label for adding a SMS phone number in SMS settings form.

-#: actions/emailsettings.php:140 actions/imsettings.php:147
-#: actions/smssettings.php:158
+#. TRANS: Button text to tag a profile.
+#: actions/emailsettings.php:141 actions/imsettings.php:149
+#: actions/smssettings.php:157 lib/togglepeopletag.php:290

 msgctxt "BUTTON"
 msgid "Add"
 msgstr ""
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
 msgctxt "BUTTON"
 msgid "Add"
 msgstr ""
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.

-#: actions/emailsettings.php:148 actions/smssettings.php:167
+#: actions/emailsettings.php:149 actions/smssettings.php:166

 msgid "Incoming email"
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
 msgid "Incoming email"
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.

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

 msgid "I want to post notices by email."
 msgstr ""
 
 #. TRANS: Form instructions for incoming e-mail form in e-mail settings.
 #. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
 msgid "I want to post notices by email."
 msgstr ""
 
 #. TRANS: Form instructions for incoming e-mail form in e-mail settings.
 #. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.

-#: actions/emailsettings.php:176 actions/smssettings.php:174
+#: actions/emailsettings.php:177 actions/smssettings.php:173

 msgid "Send email to this address to post new notices."
 msgstr ""
 
 #. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
 #. TRANS: Instructions for incoming SMS e-mail address input form.
 msgid "Send email to this address to post new notices."
 msgstr ""
 
 #. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
 #. TRANS: Instructions for incoming SMS e-mail address input form.

-#: actions/emailsettings.php:185 actions/smssettings.php:182
+#: actions/emailsettings.php:186 actions/smssettings.php:181

 msgid "Make a new email address for posting to; cancels the old one."
 msgstr ""
 
 #. TRANS: Instructions for incoming e-mail address input form.
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr ""
 
 #. TRANS: Instructions for incoming e-mail address input form.

-#: actions/emailsettings.php:189
+#: actions/emailsettings.php:190

 msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
 msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"


@@ -2432,87 +2795,89 @@ msgstr ""
 
 #. TRANS: Button label for adding an e-mail address to send notices from.
 #. TRANS: Button label for adding an SMS e-mail address to send notices from.
 
 #. TRANS: Button label for adding an e-mail address to send notices from.
 #. TRANS: Button label for adding an SMS e-mail address to send notices from.

-#: actions/emailsettings.php:195 actions/smssettings.php:185
+#: actions/emailsettings.php:196 actions/smssettings.php:184

 msgctxt "BUTTON"
 msgid "New"
 msgstr ""
 
 #. TRANS: Form legend for e-mail preferences form.
 msgctxt "BUTTON"
 msgid "New"
 msgstr ""
 
 #. TRANS: Form legend for e-mail preferences form.

-#: actions/emailsettings.php:204
+#: actions/emailsettings.php:205

 msgid "Email preferences"
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
 msgid "Email preferences"
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.

-#: actions/emailsettings.php:212
+#: actions/emailsettings.php:213

 msgid "Send me notices of new subscriptions through email."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
 msgid "Send me notices of new subscriptions through email."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.

-#: actions/emailsettings.php:218
+#: actions/emailsettings.php:219

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 msgid "Cannot normalize that email address."
 msgstr ""
 
 #. TRANS: Message given saving e-mail address that not valid.
 msgid "Cannot normalize that email address."
 msgstr ""
 
 #. TRANS: Message given saving e-mail address that not valid.

-#: actions/emailsettings.php:393 actions/register.php:204
-#: actions/siteadminpanel.php:144
+#. TRANS: Form validation error displayed when trying to register without a valid e-mail address.
+#. TRANS: Client error displayed trying to save site settings without a valid contact address.
+#: actions/emailsettings.php:394 actions/register.php:207
+#: actions/siteadminpanel.php:154

 msgid "Not a valid email address."
 msgstr ""
 
 #. TRANS: Message given saving e-mail address that is already set.
 msgid "Not a valid email address."
 msgstr ""
 
 #. TRANS: Message given saving e-mail address that is already set.

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

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

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

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

-#: actions/emailsettings.php:418 actions/imsettings.php:343
+#: actions/emailsettings.php:421 actions/imsettings.php:366

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

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

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


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

-#: actions/emailsettings.php:445 actions/imsettings.php:377
+#: actions/emailsettings.php:451 actions/imsettings.php:395

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

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

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

-#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:459 actions/smssettings.php:413
+#: actions/emailsettings.php:465

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

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

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

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

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

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

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

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

 msgid "No incoming email address."
 msgstr ""
 
 #. TRANS: Server error thrown on database error removing incoming e-mail address.
 #. TRANS: Server error thrown on database error adding incoming e-mail address.
 #. TRANS: Server error displayed when the user could not be updated in SMS settings.
 msgid "No incoming email address."
 msgstr ""
 
 #. TRANS: Server error thrown on database error removing incoming e-mail address.
 #. TRANS: Server error thrown on database error adding incoming e-mail address.
 #. TRANS: Server error displayed when the user could not be updated in SMS settings.

-#: actions/emailsettings.php:530 actions/emailsettings.php:554
+#: actions/emailsettings.php:536 actions/emailsettings.php:560

 #: actions/smssettings.php:566 actions/smssettings.php:591
 msgid "Could not update user record."
 msgstr ""
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
 #. TRANS: Confirmation text after updating SMS settings.
 #: actions/smssettings.php:566 actions/smssettings.php:591
 msgid "Could not update user record."
 msgstr ""
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
 #. TRANS: Confirmation text after updating SMS settings.

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

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

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

 msgid "New incoming email address added."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to mark a notice as favorite that already is a favorite.
 msgid "New incoming email address added."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to mark a notice as favorite that already is a favorite.

-#: actions/favor.php:80
+#: actions/favor.php:81

 msgid "This notice is already a favorite!"
 msgstr ""
 
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
 msgid "This notice is already a favorite!"
 msgstr ""
 
 #. TRANS: Page title for page on which favorite notices can be unfavourited.

-#: actions/favor.php:95
+#: actions/favor.php:96

 msgid "Disfavor favorite."
 msgstr ""
 
 #. TRANS: Page title for first page of favorited notices.
 #. TRANS: Title for favourited notices section.
 msgid "Disfavor favorite."
 msgstr ""
 
 #. TRANS: Page title for first page of favorited notices.
 #. TRANS: Title for favourited notices section.

-#: actions/favorited.php:65 lib/popularnoticesection.php:62
-#: lib/publicgroupnav.php:93
+#. TRANS: Menu item title in search group navigation panel.
+#: actions/favorited.php:65 lib/popularnoticesection.php:65
+#: lib/publicgroupnav.php:95

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


@@ -2632,9 +2997,10 @@ msgstr ""
 #. TRANS: %s is a user's nickname.
 #. TRANS: Title for first page of favourite notices of a user.
 #. TRANS: %s is the user for whom the favourite notices are displayed.
 #. TRANS: %s is a user's nickname.
 #. TRANS: Title for first page of favourite notices of a user.
 #. TRANS: %s is the user for whom the favourite notices are displayed.

-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing own favourited notices.
+#. TRANS: Menu item title in personal group navigation menu.
+#. TRANS: %s is a username.

 #: actions/favoritesrss.php:111 actions/showfavorites.php:76
 #: actions/favoritesrss.php:111 actions/showfavorites.php:76

-#: lib/personalgroupnav.php:122
+#: lib/personalgroupnav.php:102

 #, php-format
 msgid "%s's favorite notices"
 msgstr ""
 #, php-format
 msgid "%s's favorite notices"
 msgstr ""


@@ -2648,8 +3014,9 @@ msgstr ""
 
 #. TRANS: Page title for first page of featured users.
 #. TRANS: Title for featured users section.
 
 #. TRANS: Page title for first page of featured users.
 #. TRANS: Title for featured users section.

-#: actions/featured.php:69 lib/featureduserssection.php:87
-#: lib/publicgroupnav.php:89
+#. TRANS: Menu item title in search group navigation panel.
+#: actions/featured.php:69 lib/featureduserssection.php:96
+#: lib/publicgroupnav.php:88

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


@@ -2661,7 +3028,7 @@ msgid "Featured users, page %d"
 msgstr ""
 
 #. TRANS: Description on page displaying featured users.
 msgstr ""
 
 #. TRANS: Description on page displaying featured users.

-#: actions/featured.php:102
+#: actions/featured.php:96

 #, php-format
 msgid "A selection of some great users on %s."
 msgstr ""
 #, php-format
 msgid "A selection of some great users on %s."
 msgstr ""


@@ -2687,46 +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.
-#: actions/finishremotesubscribe.php:89 actions/remotesubscribe.php:58
-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.
-#: actions/finishremotesubscribe.php:145 lib/oauthstore.php:317
-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."


@@ -2738,11 +3065,13 @@ msgid "Cannot read file."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to assign an invalid role to a user.
 msgstr ""
 
 #. TRANS: Client error displayed when trying to assign an invalid role to a user.

-#: actions/grantrole.php:61 actions/revokerole.php:62
+#. TRANS: Client error displayed when trying to revoke an invalid role.
+#: actions/grantrole.php:61 actions/revokerole.php:61

 msgid "Invalid role."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to assign an reserved role to a user.
 msgid "Invalid role."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to assign an reserved role to a user.

+#. TRANS: Client error displayed when trying to revoke a reserved role.

 #: actions/grantrole.php:66 actions/revokerole.php:66
 msgid "This role is reserved and cannot be set."
 msgstr ""
 #: actions/grantrole.php:66 actions/revokerole.php:66
 msgid "This role is reserved and cannot be set."
 msgstr ""


@@ -2759,55 +3088,47 @@ msgstr ""
 
 #. TRANS: Client error displayed trying to block a user from a group while not specifying a to be blocked user profile.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a profile.
 
 #. TRANS: Client error displayed trying to block a user from a group while not specifying a to be blocked user profile.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a profile.

+#. TRANS: Client error displayed when not providing a profile ID on the Make Admin page.

 #. TRANS: Client error displayed trying a change a subscription without providing a profile.
 #. TRANS: Client error displayed when trying to change user options without specifying a user to work on.
 #. TRANS: Client error displayed trying a change a subscription without providing a profile.
 #. TRANS: Client error displayed when trying to change user options without specifying a user to work on.

-#: actions/groupblock.php:71 actions/groupunblock.php:71
-#: actions/makeadmin.php:71 actions/subedit.php:49
+#: actions/groupblock.php:72 actions/groupunblock.php:72
+#: actions/makeadmin.php:74 actions/subedit.php:50

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

-#. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing profile.
-#. TRANS: Client error displayed when trying to unblock a user from a group without providing an existing profile.
-#. TRANS: Client error displayed trying a change a subscription for a non-existant profile ID.
-#. TRANS: Client error displayed when trying to change user options without specifying an existing user to work on.
-#: actions/groupblock.php:77 actions/groupunblock.php:77
-#: actions/makeadmin.php:76 actions/subedit.php:57 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:87
-msgid "No profile with that ID."
-msgstr ""
-

 #. TRANS: Client error displayed trying to block a user from a group while not specifying a group to block a profile from.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a group.
 #. TRANS: Client error displayed trying to block a user from a group while not specifying a group to block a profile from.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a group.

-#: actions/groupblock.php:83 actions/groupunblock.php:83
-#: actions/makeadmin.php:81
+#. TRANS: Client error displayed when not providing a group ID on the Make Admin page.
+#: actions/groupblock.php:84 actions/groupunblock.php:84
+#: actions/makeadmin.php:86

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

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

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

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

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

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

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

-#: actions/groupblock.php:141 actions/groupmembers.php:364
+#: actions/groupblock.php:142 lib/groupblockform.php:91

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

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

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


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

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

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

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

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

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

 msgid "Database error blocking user from group."
 msgstr ""
 
 #. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
 msgid "Database error blocking user from group."
 msgstr ""
 
 #. TRANS: Client error displayed referring to a group's permalink without providing a group ID.

+#. TRANS: Client error displayed trying to perform an action without providing an ID.

 #. TRANS: Client error displayed trying to find a user by ID without providing an ID.
 #. TRANS: Client error displayed trying to find a user by ID without providing an ID.

-#: actions/groupbyid.php:73 actions/userbyid.php:70
+#: actions/groupbyid.php:73 actions/profiletagbyid.php:57
+#: actions/userbyid.php:70

 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:262
-msgid "Unable to update your design settings."
-msgstr ""
-
-#. TRANS: Form text to confirm saved group design settings.
-#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:222
-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


@@ -2904,58 +3200,48 @@ 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 ""
 

-#. TRANS: Indicator in group members list that this user is a group administrator.
-#: actions/groupmembers.php:190
-msgid "Admin"
-msgstr ""
-
-#. TRANS: Button text for the form that will block a user from a group.
-#: actions/groupmembers.php:397
-msgctxt "BUTTON"
-msgid "Block"
-msgstr ""
-
-#. TRANS: Submit button title.
-#: actions/groupmembers.php:401
-msgctxt "TOOLTIP"
-msgid "Block this user"
+#. TRANS: Client error displayed when trying to approve group applicants without being a group administrator.
+#: actions/groupqueue.php:100
+msgid "Only the group admin may approve users."

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Form legend for form to make a user a group admin.
-#: actions/groupmembers.php:488
-msgid "Make user an admin of the group"
+#. TRANS: Title of the first page showing pending group members still awaiting approval to join the group.
+#. TRANS: %s is the name of the group.
+#: actions/groupqueue.php:111
+#, php-format
+msgid "%s group members awaiting approval"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Button text for the form that will make a user administrator.
-#: actions/groupmembers.php:521
-msgctxt "BUTTON"
-msgid "Make Admin"
+#. TRANS: Title of all but the first page showing pending group members still awaiting approval to join the group.
+#. TRANS: %1$s is the name of the group, %2$d is the page number of the members list.
+#: actions/groupqueue.php:116
+#, php-format
+msgid "%1$s group members awaiting approval, page %2$d"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Submit button title.
-#: actions/groupmembers.php:525
-msgctxt "TOOLTIP"
-msgid "Make this user an admin"
+#. TRANS: Page notice for group members page.
+#: actions/groupqueue.php:132
+msgid "A list of users awaiting approval to join this group."

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
+#. TRANS: Message is used as link description. %1$s is a group name, %2$s is a site name.

 #: actions/grouprss.php:141
 #, php-format
 msgid "Updates from members of %1$s on %2$s!"
 #: actions/grouprss.php:141
 #, php-format
 msgid "Updates from members of %1$s on %2$s!"


@@ -2978,7 +3264,7 @@ msgstr ""
 #. TRANS: Page notice of group list. %%%%site.name%%%% is the StatusNet site name,
 #. TRANS: %%%%action.groupsearch%%%% and %%%%action.newgroup%%%% are URLs. Do not change them.
 #. TRANS: This message contains Markdown links in the form [link text](link).
 #. TRANS: Page notice of group list. %%%%site.name%%%% is the StatusNet site name,
 #. TRANS: %%%%action.groupsearch%%%% and %%%%action.newgroup%%%% are URLs. Do not change them.
 #. TRANS: This message contains Markdown links in the form [link text](link).

-#: actions/groups.php:95
+#: actions/groups.php:89

 #, php-format
 msgid ""
 "%%%%site.name%%%% groups let you find and talk with people of similar "
 #, php-format
 msgid ""
 "%%%%site.name%%%% groups let you find and talk with people of similar "


@@ -2989,7 +3275,9 @@ msgid ""
 msgstr ""
 
 #. TRANS: Link to create a new group on the group list page.
 msgstr ""
 
 #. TRANS: Link to create a new group on the group list page.

-#: actions/groups.php:113 actions/usergroups.php:126 lib/groupeditform.php:115
+#. TRANS: Link text on group page to create a new group.
+#. TRANS: Form legend for group edit form.
+#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:116

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


@@ -3009,8 +3297,9 @@ msgstr ""
 #. TRANS: Text on page where groups can be searched if no results were found for a query.
 #. TRANS: Text for notice search results is the query had no results.
 #. TRANS: Message on the "People search" page where a query has no results.
 #. TRANS: Text on page where groups can be searched if no results were found for a query.
 #. TRANS: Text for notice search results is the query had no results.
 #. TRANS: Message on the "People search" page where a query has no results.

-#: actions/groupsearch.php:82 actions/noticesearch.php:122
-#: actions/peoplesearch.php:87
+#. TRANS: Output when there are no results for a search.
+#: actions/groupsearch.php:82 actions/noticesearch.php:155
+#: actions/peoplesearch.php:87 actions/profilecompletion.php:150

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


@@ -3033,161 +3322,156 @@ msgid ""
 msgstr ""
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without being an administrator for the group.
 msgstr ""
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without being an administrator for the group.

-#: actions/groupunblock.php:95
+#: actions/groupunblock.php:96

 msgid "Only an admin can unblock group members."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to unblock a non-blocked user from a group.
 msgid "Only an admin can unblock group members."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to unblock a non-blocked user from a group.

-#: actions/groupunblock.php:100
+#: actions/groupunblock.php:101

 msgid "User is not blocked from group."
 msgstr ""
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
 #. TRANS: Server error displayed when removing a user block.
 msgid "User is not blocked from group."
 msgstr ""
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
 #. TRANS: Server error displayed when removing a user block.

-#: actions/groupunblock.php:132 actions/unblock.php:86
+#: actions/groupunblock.php:133 actions/unblock.php:86

 msgid "Error removing the block."
 msgstr ""
 
 #. TRANS: Title for Instant Messaging settings.
 msgid "Error removing the block."
 msgstr ""
 
 #. TRANS: Title for Instant Messaging settings.

-#: actions/imsettings.php:58
+#: actions/imsettings.php:56

 msgid "IM settings"
 msgstr ""
 
 #. TRANS: Instant messaging settings page instructions.
 #. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
 #. TRANS: the order and formatting of link text and link should remain unchanged.
 msgid "IM settings"
 msgstr ""
 
 #. TRANS: Instant messaging settings page instructions.
 #. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
 #. TRANS: the order and formatting of link text and link should remain unchanged.

-#: actions/imsettings.php:71
+#: actions/imsettings.php:69

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

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

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Message given in the Instant Messaging settings if XMPP is not enabled on the site.
+#. TRANS: Message given in the IM settings if IM is not enabled on the site.

 #: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr ""
 
 #: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr ""
 

-#. TRANS: Form legend for Instant Messaging settings form.
-#. TRANS: Field label for Instant Messaging address input in Instant Messaging settings form.
-#: actions/imsettings.php:102 actions/imsettings.php:132
-msgid "IM address"
-msgstr ""
-
-#: actions/imsettings.php:109
-msgid "Current confirmed Jabber/Google Talk address."
-msgstr ""
-
-#. TRANS: Form note in Instant Messaging settings form.
-#. TRANS: %s is the Instant Messaging address set for the site.
-#: actions/imsettings.php:120
+#. TRANS: Form note in IM settings form. %s is the type of IM address that was confirmed.
+#: actions/imsettings.php:116

 #, php-format
 #, php-format

-msgid ""
-"Awaiting confirmation on this address. Check your Jabber/Google Talk account "
-"for a message with further instructions. (Did you add %s to your buddy list?)"
+msgid "Current confirmed %s address."

 msgstr ""
 
 msgstr ""
 

-#. TRANS: IM address input field instructions in Instant Messaging settings form.
-#. TRANS: %s is the Instant Messaging address set for the site.
-#. TRANS: Do not translate "example.org". It is one of the domain names reserved for use in examples by
-#. TRANS: http://www.rfc-editor.org/rfc/rfc2606.txt. Any other domain may be owned by a legitimate
-#. TRANS: person or organization.
-#: actions/imsettings.php:139
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM service name, %2$s is the IM address set.
+#: actions/imsettings.php:128

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

-"Jabber or Google Talk address, like \"UserName@example.org\". First, make "
-"sure to add %s to your buddy list in your IM client or on Google Talk."
+"Awaiting confirmation on this address. Check your %1$s account for a message "
+"with further instructions. (Did you add %2$s to your buddy list?)"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Form legend for Instant Messaging preferences form.
-#: actions/imsettings.php:154
-msgid "IM preferences"
+#. TRANS: Field label for IM address.
+#: actions/imsettings.php:141
+msgid "IM address"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:159
-msgid "Send me notices through Jabber/Google Talk."
+#. TRANS: Field title for IM address. %s is the IM service name.
+#: actions/imsettings.php:144
+#, php-format
+msgid "%s screenname."

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Checkbox label in Instant Messaging preferences form.
+#. TRANS: Header for IM preferences form.

 #: actions/imsettings.php:165
 #: actions/imsettings.php:165

-msgid "Post a notice when my Jabber/Google Talk status changes."
+msgid "IM Preferences"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:171
-msgid ""
-"Send me replies through Jabber/Google Talk from people I'm not subscribed to."
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:176
+msgid "Send me notices"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Checkbox label in Instant Messaging preferences form.
+#. TRANS: Checkbox label in IM preferences form.

 #: actions/imsettings.php:178
 #: actions/imsettings.php:178

-msgid "Publish a MicroID for my Jabber/Google Talk address."
+msgid "Post a notice when my status changes."
+msgstr ""
+
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:180
+msgid "Send me replies from people I'm not subscribed to."
+msgstr ""
+
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:183
+msgid "Publish a MicroID"
+msgstr ""
+
+#. TRANS: Server error thrown on database error updating IM preferences.
+#: actions/imsettings.php:294
+msgid "Could not update IM preferences."

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Confirmation message for successful Instant Messaging preferences save.
+#. TRANS: Confirmation message for successful IM preferences save.

 #. TRANS: Confirmation message after saving preferences.
 #. TRANS: Confirmation message after saving preferences.

-#: actions/imsettings.php:283 actions/othersettings.php:193
+#: actions/imsettings.php:301 actions/urlsettings.php:247

 msgid "Preferences saved."
 msgstr ""
 
 msgid "Preferences saved."
 msgstr ""
 

-#. TRANS: Message given saving Instant Messaging address without having provided one.
-#: actions/imsettings.php:304
-msgid "No Jabber ID."
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:323
+msgid "No screenname."

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Message given saving Instant Messaging address that cannot be normalised.
-#: actions/imsettings.php:312
-msgid "Cannot normalize that Jabber ID."
+#. TRANS: Form validation error when no transport is available setting an IM address.
+#: actions/imsettings.php:329
+msgid "No transport."

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Message given saving Instant Messaging address that not valid.
-#: actions/imsettings.php:317
-msgid "Not a valid Jabber ID."
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:337
+msgid "Cannot normalize that screenname."

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Message given saving Instant Messaging address that is already set.
-#: actions/imsettings.php:321
-msgid "That is already your Jabber ID."
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:344
+msgid "Not a valid screenname."

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Message given saving Instant Messaging address that is already set for another user.
-#: actions/imsettings.php:325
-msgid "Jabber ID already belongs to another user."
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:348
+msgid "Screenname already belongs to another user."

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Message given saving valid Instant Messaging address that is to be confirmed.
-#. TRANS: %s is the Instant Messaging address set for the site.
-#: actions/imsettings.php:353
-#, php-format
-msgid ""
-"A confirmation code was sent to the IM address you added. You must approve %"
-"s for sending messages to you."
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#: actions/imsettings.php:373
+msgid "A confirmation code was sent to the IM address you added."

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Message given canceling Instant Messaging address confirmation for the wrong IM address.
-#: actions/imsettings.php:382
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:400

 msgid "That is the wrong IM address."
 msgstr ""
 
 msgid "That is the wrong IM address."
 msgstr ""
 

-#. TRANS: Server error thrown on database error canceling Instant Messaging address confirmation.
-#: actions/imsettings.php:391
-msgid "Could not delete IM confirmation."
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:409
+msgid "Could not delete confirmation."

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Message given after successfully canceling Instant Messaging address confirmation.
-#: actions/imsettings.php:396
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:414

 msgid "IM confirmation cancelled."
 msgstr ""
 
 msgid "IM confirmation cancelled."
 msgstr ""
 

-#. TRANS: Message given trying to remove an Instant Messaging address that is not
+#. TRANS: Message given trying to remove an IM address that is not

 #. TRANS: registered for the active user.
 #. TRANS: registered for the active user.

-#: actions/imsettings.php:417
-msgid "That is not your Jabber ID."
+#: actions/imsettings.php:438
+msgid "That is not your screenname."

 msgstr ""
 
 #. TRANS: Message given after successfully removing a registered Instant Messaging address.
 msgstr ""
 
 #. TRANS: Message given after successfully removing a registered Instant Messaging address.

-#: actions/imsettings.php:440
+#: actions/imsettings.php:454

 msgid "The IM address was removed."
 msgstr ""
 
 msgid "The IM address was removed."
 msgstr ""
 


@@ -3211,31 +3495,31 @@ msgid "This is your inbox, which lists your incoming private messages."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to sent invites while they have been disabled.
 msgstr ""
 
 #. TRANS: Client error displayed when trying to sent invites while they have been disabled.

-#: actions/invite.php:41
+#: actions/invite.php:46

 msgid "Invites have been disabled."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to sent invites while not logged in.
 #. TRANS: %s is the StatusNet site name.
 msgid "Invites have been disabled."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to sent invites while not logged in.
 #. TRANS: %s is the StatusNet site name.

-#: actions/invite.php:45
+#: actions/invite.php:50

 #, php-format
 msgid "You must be logged in to invite other users to use %s."
 msgstr ""
 
 #. TRANS: Form validation message when providing an e-mail address that does not validate.
 #. TRANS: %s is an invalid e-mail address.
 #, php-format
 msgid "You must be logged in to invite other users to use %s."
 msgstr ""
 
 #. TRANS: Form validation message when providing an e-mail address that does not validate.
 #. TRANS: %s is an invalid e-mail address.

-#: actions/invite.php:78
+#: actions/invite.php:100

 #, php-format
 msgid "Invalid email address: %s."
 msgstr ""
 
 #. TRANS: Page title when invitations have been sent.
 #, php-format
 msgid "Invalid email address: %s."
 msgstr ""
 
 #. TRANS: Page title when invitations have been sent.

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

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


@@ -3243,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:140
+#: 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] ""


@@ -3251,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:146 actions/invite.php:160
+#: 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)"


@@ -3260,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:154
+#: 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:"


@@ -3270,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:168
+#: 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] ""


@@ -3278,299 +3562,277 @@ 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:178
+#: 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:191
+#: 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:218
-msgid "Email addresses"
-msgstr ""
-
-#. TRANS: Tooltip for field label for a list of e-mail addresses.
-#: actions/invite.php:221
-msgid "Addresses of friends to invite (one per line)."
-msgstr ""
-
-#. TRANS: Field label for a personal message to send to invitees.
-#: actions/invite.php:225
-msgid "Personal message"
-msgstr ""
-
-#. TRANS: Tooltip for field label for a personal message to send to invitees.
-#: actions/invite.php:228
-msgid "Optionally add a personal message to the invitation."
-msgstr ""
-
-#. TRANS: Send button for inviting friends
-#: actions/invite.php:232
-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:264
+#: 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 ""
 

-#. TRANS: Body text 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 the
-#. TRANS: StatusNet sitename, %3$s is the site URL, %4$s is the personal message from the
-#. TRANS: inviting user, %s%5 a link to the timeline for the inviting user, %s$6 is a link
-#. TRANS: to register with the StatusNet site.
-#: actions/invite.php:271
-#, php-format
-msgid ""
-"%1$s has invited you to join them on %2$s (%3$s).\n"
-"\n"
-"%2$s is a micro-blogging service that lets you keep up-to-date with people "
-"you know and people who interest you.\n"
-"\n"
-"You can also share news about yourself, your thoughts, or your life online "
-"with people who know about you. It's also great for meeting new people who "
-"share your interests.\n"
-"\n"
-"%1$s said:\n"
-"\n"
-"%4$s\n"
-"\n"
-"You can see %1$s's profile page on %2$s here:\n"
-"\n"
-"%5$s\n"
-"\n"
-"If you'd like to try the service, click on the link below to accept the "
-"invitation.\n"
-"\n"
-"%6$s\n"
-"\n"
-"If not, you can ignore this message. Thanks for your patience and your "
-"time.\n"
-"\n"
-"Sincerely, %2$s\n"
-msgstr ""
-

 #. TRANS: Client error displayed when trying to join a group while not logged in.
 #: actions/joingroup.php:59
 msgid "You must be logged in to join a group."
 msgstr ""
 
 #. TRANS: Title for join group page after joining.
 #. TRANS: Client error displayed when trying to join a group while not logged in.
 #: actions/joingroup.php:59
 msgid "You must be logged in to join a group."
 msgstr ""
 
 #. TRANS: Title for join group page after joining.

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

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

-#. TRANS: Client error displayed when trying to leave a group while not logged in.
-#: actions/leavegroup.php:59
-msgid "You must be logged in to leave a group."
+#. TRANS: Exception thrown when there is an unknown error joining a group.
+#: actions/joingroup.php:162
+msgid "Unknown error joining group."

 msgstr ""
 
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
 msgstr ""
 
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown when trying to leave an existing group the user is not a member of.

-#: actions/leavegroup.php:103 lib/command.php:386
+#: actions/leavegroup.php:103 lib/command.php:395

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

-#. TRANS: Title for leave group page after leaving.
-#: actions/leavegroup.php:142
-#, php-format
-msgctxt "TITLE"
-msgid "%1$s left group %2$s"
-msgstr ""
-

 #. TRANS: User admin panel title
 #. TRANS: User admin panel title

-#: actions/licenseadminpanel.php:55
+#: actions/licenseadminpanel.php:54

 msgctxt "TITLE"
 msgid "License"
 msgstr ""
 
 msgctxt "TITLE"
 msgid "License"
 msgstr ""
 

+#. TRANS: Form instructions for the site license admin panel.

 #: actions/licenseadminpanel.php:65
 msgid "License for this StatusNet site"
 msgstr ""
 
 #: actions/licenseadminpanel.php:65
 msgid "License for this StatusNet site"
 msgstr ""
 

-#: actions/licenseadminpanel.php:134
+#. TRANS: Client error displayed selecting an invalid license in the license admin panel.
+#: actions/licenseadminpanel.php:135

 msgid "Invalid license selection."
 msgstr ""
 
 msgid "Invalid license selection."
 msgstr ""
 

-#: actions/licenseadminpanel.php:144
+#. TRANS: Client error displayed when not specifying an owner for the all rights reserved license in the license admin panel.
+#: actions/licenseadminpanel.php:146

 msgid ""
 "You must specify the owner of the content when using the All Rights Reserved "
 "license."
 msgstr ""
 
 msgid ""
 "You must specify the owner of the content when using the All Rights Reserved "
 "license."
 msgstr ""
 

-#: actions/licenseadminpanel.php:151
+#. TRANS: Client error displayed selecting a too long license title in the license admin panel.
+#: actions/licenseadminpanel.php:154

 msgid "Invalid license title. Maximum length is 255 characters."
 msgstr ""
 
 msgid "Invalid license title. Maximum length is 255 characters."
 msgstr ""
 

-#: actions/licenseadminpanel.php:163
+#. TRANS: Client error displayed specifying an invalid license URL in the license admin panel.
+#: actions/licenseadminpanel.php:167

 msgid "Invalid license URL."
 msgstr ""
 
 msgid "Invalid license URL."
 msgstr ""
 

-#: actions/licenseadminpanel.php:166
+#. TRANS: Client error displayed specifying an invalid license image URL in the license admin panel.
+#: actions/licenseadminpanel.php:171

 msgid "Invalid license image URL."
 msgstr ""
 
 msgid "Invalid license image URL."
 msgstr ""
 

-#: actions/licenseadminpanel.php:174
+#. TRANS: Client error displayed specifying an invalid license URL in the license admin panel.
+#: actions/licenseadminpanel.php:180

 msgid "License URL must be blank or a valid URL."
 msgstr ""
 
 msgid "License URL must be blank or a valid URL."
 msgstr ""
 

-#: actions/licenseadminpanel.php:182
+#. TRANS: Client error displayed specifying an invalid license image URL in the license admin panel.
+#: actions/licenseadminpanel.php:189

 msgid "License image must be blank or valid URL."
 msgstr ""
 
 msgid "License image must be blank or valid URL."
 msgstr ""
 

-#: actions/licenseadminpanel.php:232
+#. TRANS: Form legend in the license admin panel.
+#: actions/licenseadminpanel.php:240

 msgid "License selection"
 msgstr ""
 
 msgid "License selection"
 msgstr ""
 

-#: actions/licenseadminpanel.php:238
+#. TRANS: License option in the license admin panel.
+#. TRANS: Checkbox label to mark a list private.
+#: actions/licenseadminpanel.php:247 lib/peopletageditform.php:155

 msgid "Private"
 msgstr ""
 
 msgid "Private"
 msgstr ""
 

-#: actions/licenseadminpanel.php:239
+#. TRANS: License option in the license admin panel.
+#: actions/licenseadminpanel.php:249

 msgid "All Rights Reserved"
 msgstr ""
 
 msgid "All Rights Reserved"
 msgstr ""
 

-#: actions/licenseadminpanel.php:240
+#. TRANS: License option in the license admin panel.
+#: actions/licenseadminpanel.php:251

 msgid "Creative Commons"
 msgstr ""
 
 msgid "Creative Commons"
 msgstr ""
 

-#: actions/licenseadminpanel.php:245
+#. TRANS: Dropdown field label in the license admin panel.
+#: actions/licenseadminpanel.php:257

 msgid "Type"
 msgstr ""
 
 msgid "Type"
 msgstr ""
 

-#: actions/licenseadminpanel.php:247
-msgid "Select license"
+#. TRANS: Dropdown field instructions in the license admin panel.
+#: actions/licenseadminpanel.php:260
+msgid "Select a license."

 msgstr ""
 
 msgstr ""
 

-#: actions/licenseadminpanel.php:261
+#. TRANS: Form legend in the license admin panel.
+#: actions/licenseadminpanel.php:275

 msgid "License details"
 msgstr ""
 
 msgid "License details"
 msgstr ""
 

-#: actions/licenseadminpanel.php:267
+#. TRANS: Field label in the license admin panel.
+#: actions/licenseadminpanel.php:282

 msgid "Owner"
 msgstr ""
 
 msgid "Owner"
 msgstr ""
 

-#: actions/licenseadminpanel.php:268
+#. TRANS: Field title in the license admin panel.
+#: actions/licenseadminpanel.php:284

 msgid "Name of the owner of the site's content (if applicable)."
 msgstr ""
 
 msgid "Name of the owner of the site's content (if applicable)."
 msgstr ""
 

-#: actions/licenseadminpanel.php:276
+#. TRANS: Field label in the license admin panel.
+#: actions/licenseadminpanel.php:293

 msgid "License Title"
 msgstr ""
 
 msgid "License Title"
 msgstr ""
 

-#: actions/licenseadminpanel.php:277
+#. TRANS: Field title in the license admin panel.
+#: actions/licenseadminpanel.php:295

 msgid "The title of the license."
 msgstr ""
 
 msgid "The title of the license."
 msgstr ""
 

-#: actions/licenseadminpanel.php:285
+#. TRANS: Field label in the license admin panel.
+#: actions/licenseadminpanel.php:304

 msgid "License URL"
 msgstr ""
 
 msgid "License URL"
 msgstr ""
 

-#: actions/licenseadminpanel.php:286
+#. TRANS: Field title in the license admin panel.
+#: actions/licenseadminpanel.php:306

 msgid "URL for more information about the license."
 msgstr ""
 
 msgid "URL for more information about the license."
 msgstr ""
 

-#: actions/licenseadminpanel.php:293
+#. TRANS: Field label in the license admin panel.
+#: actions/licenseadminpanel.php:314

 msgid "License Image URL"
 msgstr ""
 
 msgid "License Image URL"
 msgstr ""
 

-#: actions/licenseadminpanel.php:294
+#. TRANS: Field title in the license admin panel.
+#: actions/licenseadminpanel.php:316

 msgid "URL for an image to display with the license."
 msgstr ""
 
 msgid "URL for an image to display with the license."
 msgstr ""
 

-#. TRANS: Submit button title.
-#: actions/licenseadminpanel.php:311 actions/sessionsadminpanel.php:199
-#: actions/siteadminpanel.php:292 actions/snapshotadminpanel.php:245
-#: actions/tagother.php:154 lib/applicationeditform.php:357
-msgid "Save"
-msgstr ""
-
-#: actions/licenseadminpanel.php:311
-msgid "Save license settings"
+#. TRANS: Button title in the license admin panel.
+#: actions/licenseadminpanel.php:339
+msgid "Save license settings."

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
-#: actions/login.php:97 actions/otp.php:62 actions/register.php:137
-msgid "Already logged in."
-msgstr ""
-
-#: actions/login.php:142
+#. TRANS: Form validation error displayed when trying to log in with incorrect credentials.
+#: actions/login.php:127

 msgid "Incorrect username or password."
 msgstr ""
 
 msgid "Incorrect username or password."
 msgstr ""
 

+#. TRANS: Server error displayed when during login a server error occurs.

 #. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
 #. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".

-#: actions/login.php:148 actions/otp.php:127
+#: actions/login.php:134 actions/otp.php:127

 msgid "Error setting user. You are probably not authorized."
 msgstr ""
 
 msgid "Error setting user. You are probably not authorized."
 msgstr ""
 

-#: actions/login.php:202 actions/login.php:253
+#. TRANS: Page title for login page.
+#: actions/login.php:189

 msgid "Login"
 msgstr ""
 
 msgid "Login"
 msgstr ""
 

-#: actions/login.php:239
+#. TRANS: Form legend on login page.
+#: actions/login.php:227

 msgid "Login to site"
 msgstr ""
 
 msgid "Login to site"
 msgstr ""
 

-#: actions/login.php:248 actions/register.php:476
+#. 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

 msgid "Remember me"
 msgstr ""
 
 msgid "Remember me"
 msgstr ""
 

-#: actions/login.php:249 actions/register.php:478
+#. TRANS: Checkbox title on login page.
+#. TRANS: Checkbox title on account registration page.
+#: actions/login.php:241 actions/register.php:517

 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 

-#: actions/login.php:259
+#. TRANS: Button text for log in on login page.
+#: actions/login.php:246
+msgctxt "BUTTON"
+msgid "Login"
+msgstr ""
+
+#. TRANS: Link text for link to "reset password" on login page.
+#: actions/login.php:252

 msgid "Lost or forgotten password?"
 msgstr ""
 
 msgid "Lost or forgotten password?"
 msgstr ""
 

-#: actions/login.php:277
+#. TRANS: Form instructions on login page before being able to change user settings.
+#: actions/login.php:271

 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
 msgstr ""
 
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
 msgstr ""
 

-#: actions/login.php:281
+#. TRANS: Form instructions on login page.
+#: actions/login.php:276

 msgid "Login with your username and password."
 msgstr ""
 
 msgid "Login with your username and password."
 msgstr ""
 

-#: actions/login.php:284
+#. TRANS: Form instructions on login page. This message contains Markdown links in the form [Link text](Link).
+#. TRANS: %%action.register%% is a link to the registration page.
+#: actions/login.php:281

 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
 msgstr ""
 
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
 msgstr ""
 

-#: actions/makeadmin.php:92
+#. TRANS: Client error displayed when trying to make another user admin on the Make Admin page while not an admin.
+#: actions/makeadmin.php:99

 msgid "Only an admin can make another user an admin."
 msgstr ""
 
 msgid "Only an admin can make another user an admin."
 msgstr ""
 

-#: actions/makeadmin.php:96
+#. TRANS: Client error displayed when trying to make another user admin on the Make Admin page who already is admin.
+#. TRANS: %1$s is the user that is already admin, %2$s is the group user is already admin for.
+#: actions/makeadmin.php:105

 #, php-format
 msgid "%1$s is already an admin for group \"%2$s\"."
 msgstr ""
 
 #, php-format
 msgid "%1$s is already an admin for group \"%2$s\"."
 msgstr ""
 

-#: actions/makeadmin.php:133
+#. TRANS: Server error displayed when trying to make another user admin on the Make Admin page fails
+#. TRANS: because the group membership record could not be gotten.
+#. TRANS: %1$s is the to be admin user, %2$s is the group user should be admin for.
+#: actions/makeadmin.php:145

 #, php-format
 msgid "Can't get membership record for %1$s in group %2$s."
 msgstr ""
 
 #, php-format
 msgid "Can't get membership record for %1$s in group %2$s."
 msgstr ""
 

-#: actions/makeadmin.php:146
+#. TRANS: Server error displayed when trying to make another user admin on the Make Admin page fails
+#. TRANS: because the group adminship record coud not be saved properly.
+#. TRANS: %1$s is the to be admin user, %2$s is the group user is already admin for.
+#: actions/makeadmin.php:161

 #, php-format
 msgid "Can't make %1$s an admin for group %2$s."
 msgstr ""
 
 #, php-format
 msgid "Can't make %1$s an admin for group %2$s."
 msgstr ""
 

-#: actions/microsummary.php:69
+#. TRANS: Client error displayed trying to make a micro summary without providing a status.
+#: actions/microsummary.php:71

 msgid "No current status."
 msgstr ""
 
 msgid "No current status."
 msgstr ""
 


@@ -3585,27 +3847,32 @@ msgid "You must be logged in to register an application."
 msgstr ""
 
 #. TRANS: Form instructions for registering a new application.
 msgstr ""
 
 #. TRANS: Form instructions for registering a new application.

-#: actions/newapplication.php:147
+#: actions/newapplication.php:148

 msgid "Use this form to register a new application."
 msgstr ""
 
 #. TRANS: Validation error shown when not providing a source URL in the "New application" form.
 msgid "Use this form to register a new application."
 msgstr ""
 
 #. TRANS: Validation error shown when not providing a source URL in the "New application" form.

-#: actions/newapplication.php:189
+#: actions/newapplication.php:190

 msgid "Source URL is required."
 msgstr ""
 
 #. TRANS: Server error displayed when an application could not be registered in the database through the "New application" form.
 msgid "Source URL is required."
 msgstr ""
 
 #. TRANS: Server error displayed when an application could not be registered in the database through the "New application" form.

-#: actions/newapplication.php:279 actions/newapplication.php:289
+#: actions/newapplication.php:280 actions/newapplication.php:290

 msgid "Could not create application."
 msgstr ""
 
 msgid "Could not create application."
 msgstr ""
 

+#. TRANS: Form validation error messages displayed when uploading an invalid application logo.
+#: actions/newapplication.php:299
+msgid "Invalid image."
+msgstr ""
+

 #. TRANS: Title for form to create a group.
 #: actions/newgroup.php:53
 msgid "New group"
 msgstr ""
 
 #. TRANS: Client exception thrown when a user tries to create a group while banned.
 #. TRANS: Title for form to create a group.
 #: actions/newgroup.php:53
 msgid "New group"
 msgstr ""
 
 #. TRANS: Client exception thrown when a user tries to create a group while banned.

-#: actions/newgroup.php:73 classes/User_group.php:485
+#: 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 ""
 


@@ -3614,63 +3881,67 @@ msgstr ""
 msgid "Use this form to create a new group."
 msgstr ""
 
 msgid "Use this form to create a new group."
 msgstr ""
 

-#. TRANS: Group create form validation error.
-#: actions/newgroup.php:200
-msgid "Alias cannot be the same as nickname."
-msgstr ""
-
-#: actions/newmessage.php:71 actions/newmessage.php:234
+#. TRANS: Page title for new direct message page.
+#. TRANS: Page title on page for sending a direct message.
+#: actions/newmessage.php:72 actions/newmessage.php:250

 msgid "New message"
 msgstr ""
 
 msgid "New message"
 msgstr ""
 

-#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:501
-msgid "You can't send a message to this user."
+#. TRANS: Client error displayed trying to send a direct message to a user while sender and
+#. TRANS: receiver are not subscribed to each other.
+#: actions/newmessage.php:126 actions/newmessage.php:174
+msgid "You cannot send a message to this user."

 msgstr ""
 
 msgstr ""
 

+#. TRANS: Form validator error displayed trying to send a direct message without content.
+#. TRANS: Client error displayed trying to send a notice without content.

 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.

-#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:478
-#: lib/command.php:581
+#: actions/newmessage.php:151 actions/newnotice.php:140 lib/command.php:605
+#: lib/command.php:694

 msgid "No content!"
 msgstr ""
 
 msgid "No content!"
 msgstr ""
 

-#: actions/newmessage.php:161
+#. TRANS: Form validation error displayed trying to send a direct message without specifying a recipient.
+#: actions/newmessage.php:169

 msgid "No recipient specified."
 msgstr ""
 
 msgid "No recipient specified."
 msgstr ""
 

-#. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:505
-msgid ""
-"Don't send a message to yourself; just say it to yourself quietly instead."
-msgstr ""
-
-#: actions/newmessage.php:184
+#. TRANS: Page title after sending a direct message.
+#: actions/newmessage.php:196

 msgid "Message sent"
 msgstr ""
 
 msgid "Message sent"
 msgstr ""
 

+#. TRANS: Confirmation text after sending a direct message.
+#. TRANS: %s is the direct message recipient.

 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.

-#: actions/newmessage.php:188 lib/command.php:513
+#: actions/newmessage.php:202 lib/command.php:640

 #, php-format
 msgid "Direct message to %s sent."
 msgstr ""
 
 #, php-format
 msgid "Direct message to %s sent."
 msgstr ""
 

-#: actions/newmessage.php:213 actions/newnotice.php:264
+#. TRANS: Page title after an AJAX error occurred on the "send direct message" page.
+#. TRANS: Page title after an AJAX error occurs on the send notice page.
+#: actions/newmessage.php:228 actions/newnotice.php:271 lib/error.php:117

 msgid "Ajax Error"
 msgstr ""
 
 msgid "Ajax Error"
 msgstr ""
 

-#: actions/newnotice.php:69
+#. TRANS: Page title for sending a new notice.
+#. TRANS: Title for form to send a new notice.
+#: actions/newnotice.php:67 actions/newnotice.php:293
+msgctxt "TITLE"

 msgid "New notice"
 msgstr ""
 
 msgid "New notice"
 msgstr ""
 

-#: actions/newnotice.php:230
+#. TRANS: Page title after sending a notice.
+#: actions/newnotice.php:237

 msgid "Notice posted"
 msgstr ""
 
 #. TRANS: Instructions for Notice search page.
 #. TRANS: %%site.name%% is the name of the StatusNet site.
 msgid "Notice posted"
 msgstr ""
 
 #. TRANS: Instructions for Notice search page.
 #. TRANS: %%site.name%% is the name of the StatusNet site.

-#: actions/noticesearch.php:69
+#: actions/noticesearch.php:95

 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "


@@ -3678,20 +3949,20 @@ msgid ""
 msgstr ""
 
 #. TRANS: Title of the page where users can search for notices.
 msgstr ""
 
 #. TRANS: Title of the page where users can search for notices.

-#: actions/noticesearch.php:80
+#: actions/noticesearch.php:106

 msgid "Text search"
 msgstr ""
 
 #. TRANS: Test in RSS notice search.
 #. TRANS: %1$s is the query, %2$s is the StatusNet site name.
 msgid "Text search"
 msgstr ""
 
 #. TRANS: Test in RSS notice search.
 #. TRANS: %1$s is the query, %2$s is the StatusNet site name.

-#: actions/noticesearch.php:95
+#: actions/noticesearch.php:121

 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr ""
 
 #. TRANS: Text for logged in users making a query for notices without results.
 #. TRANS: This message contains a Markdown link.
 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr ""
 
 #. TRANS: Text for logged in users making a query for notices without results.
 #. TRANS: This message contains a Markdown link.

-#: actions/noticesearch.php:128
+#: actions/noticesearch.php:161

 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"


@@ -3700,7 +3971,7 @@ msgstr ""
 
 #. TRANS: Text for not logged in users making a query for notices without results.
 #. TRANS: This message contains Markdown links.
 
 #. TRANS: Text for not logged in users making a query for notices without results.
 #. TRANS: This message contains Markdown links.

-#: actions/noticesearch.php:133
+#: actions/noticesearch.php:166

 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "


@@ -3720,48 +3991,51 @@ msgstr ""
 msgid "Updates matching search term \"%1$s\" on %2$s."
 msgstr ""
 
 msgid "Updates matching search term \"%1$s\" on %2$s."
 msgstr ""
 

-#: actions/nudge.php:85
+#. TRANS: Client error displayed trying to nudge a user that cannot be nudged.
+#: actions/nudge.php:88

 msgid ""
 "This user doesn't allow nudges or hasn't confirmed or set their email "
 "address yet."
 msgstr ""
 
 msgid ""
 "This user doesn't allow nudges or hasn't confirmed or set their email "
 "address yet."
 msgstr ""
 

-#: actions/nudge.php:94
+#. TRANS: Page title after sending a nudge.
+#: actions/nudge.php:98

 msgid "Nudge sent"
 msgstr ""
 
 msgid "Nudge sent"
 msgstr ""
 

-#: actions/nudge.php:97
+#. TRANS: Confirmation text after sending a nudge.
+#: actions/nudge.php:102

 msgid "Nudge sent!"
 msgstr ""
 
 #. TRANS: Message displayed to an anonymous user trying to view OAuth application list.
 msgid "Nudge sent!"
 msgstr ""
 
 #. TRANS: Message displayed to an anonymous user trying to view OAuth application list.

-#: actions/oauthappssettings.php:60
+#: actions/oauthappssettings.php:57

 msgid "You must be logged in to list your applications."
 msgstr ""
 
 #. TRANS: Page title for OAuth applications
 msgid "You must be logged in to list your applications."
 msgstr ""
 
 #. TRANS: Page title for OAuth applications

-#: actions/oauthappssettings.php:76
+#: actions/oauthappssettings.php:73

 msgid "OAuth applications"
 msgstr ""
 
 #. TRANS: Page instructions for OAuth applications
 msgid "OAuth applications"
 msgstr ""
 
 #. TRANS: Page instructions for OAuth applications

-#: actions/oauthappssettings.php:88
+#: actions/oauthappssettings.php:85

 msgid "Applications you have registered"
 msgstr ""
 
 #. TRANS: Empty list message on page with OAuth applications.
 msgid "Applications you have registered"
 msgstr ""
 
 #. TRANS: Empty list message on page with OAuth applications.

-#: actions/oauthappssettings.php:141
+#: actions/oauthappssettings.php:138

 #, php-format
 msgid "You have not registered any applications yet."
 msgstr ""
 
 #. TRANS: Title for OAuth connection settings.
 #, php-format
 msgid "You have not registered any applications yet."
 msgstr ""
 
 #. TRANS: Title for OAuth connection settings.

-#: actions/oauthconnectionssettings.php:70
+#: actions/oauthconnectionssettings.php:69

 msgid "Connected applications"
 msgstr ""
 
 #. TRANS: Instructions for OAuth connection settings.
 msgid "Connected applications"
 msgstr ""
 
 #. TRANS: Instructions for OAuth connection settings.

-#: actions/oauthconnectionssettings.php:81
+#: actions/oauthconnectionssettings.php:80

 msgid "The following connections exist for your account."
 msgstr ""
 
 msgid "The following connections exist for your account."
 msgstr ""
 


@@ -3801,103 +4075,115 @@ msgid ""
 "this instance of StatusNet."
 msgstr ""
 
 "this instance of StatusNet."
 msgstr ""
 

-#: actions/oembed.php:64
+#. TRANS: Server error displayed in oEmbed action when path not found.
+#. TRANS: %s is a path.
+#: actions/oembed.php:66

 #, php-format
 msgid "\"%s\" not found."
 msgstr ""
 
 #, php-format
 msgid "\"%s\" not found."
 msgstr ""
 

-#: actions/oembed.php:76
+#. TRANS: Server error displayed in oEmbed action when notice not found.
+#. TRANS: %s is a notice.
+#: actions/oembed.php:80

 #, php-format
 msgid "Notice %s not found."
 msgstr ""
 
 #, php-format
 msgid "Notice %s not found."
 msgstr ""
 

-#: actions/oembed.php:80 actions/shownotice.php:100
+#. TRANS: Server error displayed in oEmbed action when notice has not profile.
+#. TRANS: Server error displayed trying to show a notice without a connected profile.
+#: actions/oembed.php:85 actions/shownotice.php:99

 msgid "Notice has no profile."
 msgstr ""
 
 msgid "Notice has no profile."
 msgstr ""
 

-#: actions/oembed.php:83 actions/shownotice.php:172
+#. TRANS: oEmbed title. %1$s is the author name, %2$s is the creation date.
+#. TRANS: Title of the page that shows a notice.
+#. TRANS: %1$s is a user name, %2$s is the notice creation date/time.
+#: actions/oembed.php:89 actions/shownotice.php:196

 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr ""
 
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr ""
 

-#: actions/oembed.php:95
+#. TRANS: Server error displayed in oEmbed action when attachment not found.
+#. TRANS: %d is an attachment ID.
+#: actions/oembed.php:103

 #, php-format
 msgid "Attachment %s not found."
 msgstr ""
 
 #, php-format
 msgid "Attachment %s not found."
 msgstr ""
 

-#: actions/oembed.php:136
+#. TRANS: Server error displayed in oEmbed request when a path is not supported.
+#. TRANS: %s is a path.
+#: actions/oembed.php:146

 #, php-format
 msgid "\"%s\" not supported for oembed requests."
 msgstr ""
 
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
 #, php-format
 msgid "\"%s\" not supported for oembed requests."
 msgstr ""
 
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')

-#: actions/oembed.php:168
+#: actions/oembed.php:178

 #, php-format
 msgid "Content type %s not supported."
 msgstr ""
 
 #. TRANS: Error message displaying attachments. %s is the site's base URL.
 #, php-format
 msgid "Content type %s not supported."
 msgstr ""
 
 #. TRANS: Error message displaying attachments. %s is the site's base URL.

-#: actions/oembed.php:172
+#: actions/oembed.php:182

 #, php-format
 msgid "Only %s URLs over plain HTTP please."
 msgstr ""
 
 #, php-format
 msgid "Only %s URLs over plain HTTP please."
 msgstr ""
 

+#. TRANS: Server error displayed in oEmbed action when request specifies an unsupported data format.

 #. TRANS: Client error on an API request with an unsupported data format.
 #. TRANS: Client error on an API request with an unsupported data format.

-#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1205
-#: lib/apiaction.php:1232 lib/apiaction.php:1367
+#: 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: ShortName in the OpenSearch interface when trying to find users.
-#: actions/opensearch.php:64
-msgid "People Search"
+#. TRANS: Page title for profile settings.
+#: actions/oldschoolsettings.php:58
+msgid "Old school UI settings"

 msgstr ""
 
 msgstr ""
 

-#: actions/opensearch.php:68
-msgid "Notice Search"
+#. TRANS: Usage instructions for profile settings.
+#: actions/oldschoolsettings.php:69
+msgid "If you like it \"the old way\", you can set that here."

 msgstr ""
 
 msgstr ""
 

-#: actions/othersettings.php:59
-msgid "Other settings"
+#. TRANS: Confirmation shown when user profile settings are saved.
+#. TRANS: Message after successful saving of administrative settings.
+#: actions/oldschoolsettings.php:124 actions/profilesettings.php:466
+#: lib/adminpanelaction.php:138
+msgid "Settings saved."

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Instructions for tab "Other" in user profile settings.
-#: actions/othersettings.php:71
-msgid "Manage various other options."
+#: actions/oldschoolsettings.php:161
+msgid "Only stream mode (no conversations) in timelines"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
-#. TRANS: user's profile settings. Use of "free" is as in "open", indicating that the
-#. TRANS: information on the shortener site is freely distributable.
-#. TRANS: This message has one space at the beginning. Use your language's word separator
-#. TRANS: here if it has one (most likely a single space).
-#: actions/othersettings.php:113
-msgid " (free service)"
+#: actions/oldschoolsettings.php:165
+msgid "Show conversation page as hierarchical trees"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Label for dropdown with URL shortener services.
-#: actions/othersettings.php:122
-msgid "Shorten URLs with"
+#: actions/oldschoolsettings.php:169
+msgid "Show nicknames (not full names) in timelines"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Tooltip for for dropdown with URL shortener services.
-#: actions/othersettings.php:124
-msgid "Automatic shortening service to use."
+#. TRANS: Button text to save a list.
+#: actions/oldschoolsettings.php:187 lib/peopletageditform.php:168
+msgid "Save"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Label for checkbox.
-#: actions/othersettings.php:130
-msgid "View profile designs"
+#. TRANS: ShortName in the OpenSearch interface when trying to find users.
+#: actions/opensearch.php:64
+msgid "People Search"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Tooltip for checkbox.
-#: actions/othersettings.php:132
-msgid "Show or hide profile designs."
+#. TRANS: ShortName in the OpenSearch interface when trying to find notices.
+#: actions/opensearch.php:68
+msgid "Notice Search"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Form validation error for form "Other settings" in user profile.
-#: actions/othersettings.php:164
-msgid "URL shortening service is too long (maximum 50 characters)."
+#. 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.
 msgstr ""
 
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a user.


@@ -3943,70 +4229,96 @@ msgstr ""
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 

-#: actions/passwordsettings.php:58
+#. TRANS: Title for page where to change password.
+#: actions/passwordsettings.php:59
+msgctxt "TITLE"

 msgid "Change password"
 msgstr ""
 
 msgid "Change password"
 msgstr ""
 

-#: actions/passwordsettings.php:69
+#. TRANS: Instructions for page where to change password.
+#: actions/passwordsettings.php:71

 msgid "Change your password."
 msgstr ""
 
 msgid "Change your password."
 msgstr ""
 

+#. TRANS: Fieldset legend on page where to change password.

 #. TRANS: Fieldset legend for password reset form.
 #. TRANS: Fieldset legend for password reset form.

-#: actions/passwordsettings.php:96 actions/recoverpassword.php:251
+#: actions/passwordsettings.php:99 actions/recoverpassword.php:251

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

-#: actions/passwordsettings.php:104
+#. TRANS: Field label on page where to change password.
+#: actions/passwordsettings.php:108

 msgid "Old password"
 msgstr ""
 
 msgid "Old password"
 msgstr ""
 

+#. TRANS: Field label on page where to change password.

 #. TRANS: Field label for password reset form.
 #. TRANS: Field label for password reset form.

-#: actions/passwordsettings.php:108 actions/recoverpassword.php:256
+#: actions/passwordsettings.php:113 actions/recoverpassword.php:256

 msgid "New password"
 msgstr ""
 
 msgid "New password"
 msgstr ""
 

-#: actions/passwordsettings.php:109 actions/register.php:423
+#. TRANS: Field title on page where to change password.
+#. TRANS: Field title on account registration page.
+#: actions/passwordsettings.php:115 actions/register.php:446

 msgid "6 or more characters."
 msgstr ""
 
 msgid "6 or more characters."
 msgstr ""
 

-#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:264
-#: actions/register.php:427
+#. TRANS: Field label on page where to change password. In this field the new password should be typed a second time.
+#: actions/passwordsettings.php:119
+msgctxt "LABEL"
+msgid "Confirm"
+msgstr ""
+
+#. TRANS: Field title on page where to change password.
+#. TRANS: Title for field label for password reset form where the password has to be typed again.
+#. TRANS: Field title on account registration page.
+#: actions/passwordsettings.php:121 actions/recoverpassword.php:264
+#: actions/register.php:452

 msgid "Same as password above."
 msgstr ""
 
 msgid "Same as password above."
 msgstr ""
 

-#: actions/passwordsettings.php:117
+#. TRANS: Button text on page where to change password.
+#: actions/passwordsettings.php:126
+msgctxt "BUTTON"

 msgid "Change"
 msgstr ""
 
 msgid "Change"
 msgstr ""
 

-#: actions/passwordsettings.php:153 actions/register.php:230
+#. TRANS: Form validation error on page where to change password.
+#. TRANS: Form validation error displayed when trying to register with too short a password.
+#: actions/passwordsettings.php:164 actions/register.php:242

 msgid "Password must be 6 or more characters."
 msgstr ""
 
 msgid "Password must be 6 or more characters."
 msgstr ""
 

-#: actions/passwordsettings.php:156 actions/register.php:233
-msgid "Passwords don't match."
+#. TRANS: Form validation error on password change when password confirmation does not match.
+#. TRANS: Form validation error displayed when trying to register with non-matching passwords.
+#: actions/passwordsettings.php:168 actions/register.php:246
+msgid "Passwords do not match."

 msgstr ""
 
 msgstr ""
 

-#: actions/passwordsettings.php:164
-msgid "Incorrect old password"
+#. TRANS: Form validation error on page where to change password.
+#: actions/passwordsettings.php:177
+msgid "Incorrect old password."

 msgstr ""
 
 msgstr ""
 

-#: actions/passwordsettings.php:180
+#. TRANS: Form validation error on page where to change password.
+#: actions/passwordsettings.php:194

 msgid "Error saving user; invalid."
 msgstr ""
 
 msgid "Error saving user; invalid."
 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: Reset password form validation error message.

-#: actions/passwordsettings.php:185 actions/recoverpassword.php:418
+#: actions/passwordsettings.php:201 actions/recoverpassword.php:339

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

-#: actions/passwordsettings.php:191
+#. TRANS: Form validation notice on page where to change password.
+#: actions/passwordsettings.php:208

 msgid "Password saved."
 msgstr ""
 
 #. TRANS: Title for Paths admin panel.
 msgid "Password saved."
 msgstr ""
 
 #. TRANS: Title for Paths admin panel.

-#. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:58 lib/adminpanelaction.php:371
+#: actions/pathsadminpanel.php:58

 msgid "Paths"
 msgstr ""
 
 msgid "Paths"
 msgstr ""
 


@@ -4017,261 +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 ""
 
 #, 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
-#, 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.
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the locales directory that could not be read from.

-#: actions/pathsadminpanel.php:181
+#: actions/pathsadminpanel.php:172

 #, php-format
 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.
 #, php-format
 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.

-#: 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/siteadminpanel.php:58
+#: 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:279
-#: actions/pathsadminpanel.php:370 actions/pathsadminpanel.php:425
+#: actions/pathsadminpanel.php:232 actions/pathsadminpanel.php:275
+#: actions/pathsadminpanel.php:367

 msgid "Server"
 msgstr ""
 
 msgid "Server"
 msgstr ""
 

-#: actions/pathsadminpanel.php:242
+#. TRANS: Field title in Paths admin panel.
+#: 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:248 actions/pathsadminpanel.php:288
-#: actions/pathsadminpanel.php:379 actions/pathsadminpanel.php:434
+#: actions/pathsadminpanel.php:240 actions/pathsadminpanel.php:284
+#: actions/pathsadminpanel.php:376

 msgid "Path"
 msgstr ""
 
 msgid "Path"
 msgstr ""
 

-#: actions/pathsadminpanel.php:249
+#. TRANS: Field title in Paths admin panel.
+#: 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:255
+#: actions/pathsadminpanel.php:248

 msgid "Locale directory"
 msgstr ""
 
 msgid "Locale directory"
 msgstr ""
 

-#: actions/pathsadminpanel.php:256
+#. TRANS: Field title in Paths admin panel.
+#: 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:263
+#: actions/pathsadminpanel.php:257

 msgid "Fancy URLs"
 msgstr ""
 
 msgid "Fancy URLs"
 msgstr ""
 

-#: actions/pathsadminpanel.php:265
-msgid "Use fancy (more readable and memorable) URLs?"
+#. TRANS: Field title in Paths admin panel.
+#: actions/pathsadminpanel.php:260
+msgid "Use fancy URLs (more readable and memorable)?"

 msgstr ""
 
 msgstr ""
 

-#: actions/pathsadminpanel.php:272
+#. TRANS: Fieldset legend in Paths admin panel.
+#: actions/pathsadminpanel.php:268
+msgctxt "LEGEND"

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

-#: actions/pathsadminpanel.php:281
+#: 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:290
+#: 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:297 actions/pathsadminpanel.php:388
-#: actions/pathsadminpanel.php:443 actions/pathsadminpanel.php:495
+#: 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:299
+#: 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:306 actions/pathsadminpanel.php:397
-#: actions/pathsadminpanel.php:452
+#: 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:308
+#: 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:315 actions/pathsadminpanel.php:406
-#: actions/pathsadminpanel.php:461
+#: 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:317
+#: 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:326
+#: 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:333
+#: 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:335
+#: 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:342
+#: 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:344
+#: 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:351
+#: 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:353
+#: 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:364
-msgid "Backgrounds"
-msgstr ""
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:372
-msgid "Server for backgrounds."
-msgstr ""
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:381
-msgid "Web path to backgrounds."
-msgstr ""
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:390
-msgid "Server for backgrounds on SSL pages."
-msgstr ""
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:399
-msgid "Web path to backgrounds on SSL pages."
-msgstr ""
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:408
-msgid "Directory where backgrounds are located."
-msgstr ""
-

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

-#. TRANS: DT element label in attachment list.
-#: actions/pathsadminpanel.php:419 lib/attachmentlist.php:98
+#: 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:427
+#: 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:436
+#: 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:445
+#: 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:454
+#: 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:463
+#: 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:472
+#: actions/pathsadminpanel.php:414
+msgctxt "LEGEND"

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

-#: actions/pathsadminpanel.php:477 actions/snapshotadminpanel.php:202
+#. TRANS: Option in dropdown for snapshot method in admin panel for snapshots.
+#: 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:479
+#: 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:481
+#: actions/pathsadminpanel.php:423

 msgid "Always"
 msgstr ""
 
 msgid "Always"
 msgstr ""
 

-#: actions/pathsadminpanel.php:485
+#. TRANS: Drop down label in Paths admin panel.
+#: 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:487
+#: 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:497
+#: 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:514
-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.


@@ -4288,154 +4569,466 @@ msgstr ""
 msgid "People search"
 msgstr ""
 
 msgid "People search"
 msgstr ""
 

-#: actions/peopletag.php:68
+#. TRANS: Title for list page.
+#. TRANS: %s is a list.
+#: actions/peopletag.php:57
+#, php-format
+msgid "Public list %s"
+msgstr ""
+
+#. TRANS: Title for list page.
+#. TRANS: %1$s is a list, %2$d is a page number.
+#: actions/peopletag.php:61
+#, php-format
+msgid "Public list %1$s, page %2$d"
+msgstr ""
+
+#. TRANS: Message for anonymous users on list page.
+#. TRANS: This message contains Markdown links in the form [description](link).
+#: actions/peopletag.php:105
+#, php-format
+msgid ""
+"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 then easily keep "
+"track of what they are doing by subscribing to the list's timeline."
+msgstr ""
+
+#. TRANS: Client error displayed when a tagger is expected but not provided.
+#: actions/peopletagged.php:84 actions/peopletagsubscribers.php:84
+#: actions/showprofiletag.php:69
+msgid "No tagger."
+msgstr ""
+
+#. TRANS: Title for list of people listed by the user.
+#. TRANS: %1$s is a list, %2$s is a username.
+#: actions/peopletagged.php:113
+#, php-format
+msgid "People listed in %1$s by %2$s"
+msgstr ""
+
+#. TRANS: Title for list of people listed by the user.
+#. TRANS: %1$s is a list, %2$s is a username, %2$s is a page number.
+#: actions/peopletagged.php:118
+#, php-format
+msgid "People listed in %1$s by %2$s, page %3$d"
+msgstr ""
+
+#. TRANS: Addition in tag membership list for creator of a tag.
+#. TRANS: Addition in tag subscribers list for creator of a tag.
+#: actions/peopletagged.php:197 actions/peopletagsubscribers.php:197
+msgid "Creator"
+msgstr ""
+
+#. TRANS: Title for lists by a user page for a private tag.
+#: actions/peopletagsbyuser.php:53
+msgid "Private lists by you"
+msgstr ""
+
+#. TRANS: Title for lists by a user page for a public tag.
+#: actions/peopletagsbyuser.php:56
+msgid "Public lists by you"
+msgstr ""
+
+#. TRANS: Title for lists by a user page.
+#: actions/peopletagsbyuser.php:59
+msgid "Lists by you"
+msgstr ""
+
+#. TRANS: Title for lists by a user page.
+#. TRANS: %s is a user nickname.
+#: actions/peopletagsbyuser.php:63
+#, php-format
+msgid "Lists by %s"
+msgstr ""
+
+#. TRANS: Title for lists by a user page.
+#. TRANS: %1$s is a user nickname, %2$d is a page number.
+#: actions/peopletagsbyuser.php:67
+#, php-format
+msgid "Lists by %1$s, page %2$d"
+msgstr ""
+
+#. TRANS: Client error displayed when trying view another user's private lists.
+#: actions/peopletagsbyuser.php:133
+msgid "You cannot view others' private lists"
+msgstr ""
+
+#. TRANS: Mode selector label.
+#: actions/peopletagsbyuser.php:159
+msgid "Mode"
+msgstr ""
+
+#. TRANS: Link text to show lists for user %s.
+#: actions/peopletagsbyuser.php:169
+#, php-format
+msgid "Lists for %s"
+msgstr ""
+
+#. TRANS: Fieldset legend.
+#. TRANS: Fieldset legend on gallery action page.
+#: actions/peopletagsbyuser.php:181 lib/galleryaction.php:138
+msgid "Select tag to filter"
+msgstr ""
+
+#. TRANS: Checkbox title.
+#: actions/peopletagsbyuser.php:192
+msgid "Show private tags."
+msgstr ""
+
+#. TRANS: Checkbox label to show public tags.
+#: actions/peopletagsbyuser.php:194
+msgctxt "LABEL"
+msgid "Public"
+msgstr ""
+
+#. TRANS: Checkbox title.
+#: 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.
+#: actions/peopletagsbyuser.php:199 lib/galleryaction.php:145
+msgctxt "BUTTON"
+msgid "Go"
+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.
+#: 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 "
+"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.
+#: actions/peopletagsbyuser.php:278
+#, php-format
+msgid "%s has not created any [lists](%%%%doc.lists%%%%) yet."
+msgstr ""
+
+#. TRANS: Page title. %s is a tagged user's nickname.
+#: actions/peopletagsforuser.php:50
+#, php-format
+msgid "Lists with %s in them"
+msgstr ""
+
+#. TRANS: Page title. %1$s is a tagged user's nickname, %2$s is a page number.
+#: actions/peopletagsforuser.php:53
+#, php-format
+msgid "Lists with %1$s, page %2$d"
+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.
+#: 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 "
+"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.
+#: 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.
+#: 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.
+#: actions/peopletagsubscribers.php:118
+#, php-format
+msgid "Subscribers to list %1$s by %2$s, page %3$d"
+msgstr ""
+
+#. TRANS: Title for page that displays lists subscribed to by a user.
+#. TRANS: %s is a profile nickname.
+#: actions/peopletagsubscriptions.php:51
+#, php-format
+msgid "Lists subscribed to by %s"
+msgstr ""
+
+#. TRANS: Title for page that displays lists subscribed to by a user.
+#. TRANS: %1$s is a profile nickname, %2$d is a page number.
+#: actions/peopletagsubscriptions.php:55

 #, php-format
 #, php-format

-msgid "Not a valid people tag: %s."
+msgid "Lists subscribed to by %1$s, page %2$d"

 msgstr ""
 
 msgstr ""
 

-#: actions/peopletag.php:142
+#. TRANS: Message displayed for anonymous users on page that displays lists subscribed to by a user.
+#. TRANS: This message contains Markdown links in the form [description](links).
+#. TRANS: %s is a profile nickname.
+#: actions/peopletagsubscriptions.php:115

 #, php-format
 #, php-format

-msgid "Users self-tagged with %1$s - page %2$d"
+msgid ""
+"These are lists subscribed to by **%s**. Lists are how you sort similar "
+"people on %%%%site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/"
+"Micro-blogging) service based on the Free Software [StatusNet](http://status."
+"net/) tool. You can easily keep track of what they are doing by subscribing "
+"to the list's timeline."
+msgstr ""
+
+#. TRANS: Page title for AJAX form return when a disabling a plugin.
+#: actions/plugindisable.php:68
+msgctxt "plugin"
+msgid "Disabled"
+msgstr ""
+
+#. TRANS: Client error displayed when trying to use another method than POST.
+#. TRANS: Do not translate POST.
+#. TRANS: Client error displayed trying to perform any request method other than POST.
+#. TRANS: Do not translate POST.
+#. TRANS: Client error displayed when trying to use another method than POST.
+#: actions/pluginenable.php:78 actions/subscribe.php:77
+#: actions/subscribepeopletag.php:66 actions/unsubscribepeopletag.php:67
+msgid "This action only accepts POST requests."
+msgstr ""
+
+#. TRANS: Client error displayed when trying to enable or disable a plugin without access rights.
+#: actions/pluginenable.php:105
+msgid "You cannot administer plugins."
+msgstr ""
+
+#. TRANS: Client error displayed when trying to enable or disable a non-existing plugin.
+#: actions/pluginenable.php:113
+msgid "No such plugin."
+msgstr ""
+
+#. TRANS: Page title for AJAX form return when enabling a plugin.
+#: actions/pluginenable.php:162
+msgctxt "plugin"
+msgid "Enabled"
+msgstr ""
+
+#. TRANS: Tab and title for plugins admin panel.
+#: actions/pluginsadminpanel.php:53
+msgctxt "TITLE"
+msgid "Plugins"
+msgstr ""
+
+#. TRANS: Instructions at top of plugin admin page.
+#: actions/pluginsadminpanel.php:64
+msgid ""
+"Additional plugins can be enabled and configured manually. See the <a href="
+"\"http://status.net/wiki/Plugins\">online plugin documentation</a> for more "
+"details."

 msgstr ""
 
 msgstr ""
 

-#: actions/postnotice.php:95
-msgid "Invalid notice content."
+#. TRANS: Admin form section header
+#: actions/pluginsadminpanel.php:79
+msgid "Default plugins"

 msgstr ""
 
 msgstr ""
 

-#: actions/postnotice.php:101
+#. TRANS: Text displayed on plugin admin page when no plugin are enabled.
+#: actions/pluginsadminpanel.php:102
+msgid ""
+"All default plugins have been disabled from the site's configuration file."
+msgstr ""
+
+#. TRANS: Client error displayed when trying to add an unindentified field to profile.
+#. TRANS: %s is a field name.
+#: actions/profilecompletion.php:109

 #, php-format
 #, php-format

-msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
+msgid "Unidentified field %s."
+msgstr ""
+
+#. TRANS: Page title.
+#: actions/profilecompletion.php:134
+msgctxt "TITLE"
+msgid "Search results"
+msgstr ""
+
+#. TRANS: Error message in case a search is shorter than three characters.
+#: actions/profilecompletion.php:164
+msgid "The search string must be at least 3 characters long."

 msgstr ""
 
 #. TRANS: Page title for profile settings.
 msgstr ""
 
 #. TRANS: Page title for profile settings.

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

 msgid "Profile settings"
 msgstr ""
 
 #. TRANS: Usage instructions for profile settings.
 msgid "Profile settings"
 msgstr ""
 
 #. TRANS: Usage instructions for profile settings.

-#: actions/profilesettings.php:70
+#: actions/profilesettings.php:68

 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
 
 #. TRANS: Profile settings form legend.
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
 
 #. TRANS: Profile settings form legend.

-#: actions/profilesettings.php:98
+#: actions/profilesettings.php:96

 msgid "Profile information"
 msgstr ""
 
 #. TRANS: Tooltip for field label in form for profile settings.
 msgid "Profile information"
 msgstr ""
 
 #. TRANS: Tooltip for field label in form for profile settings.

-#: actions/profilesettings.php:109 actions/register.php:419
+#. TRANS: Field title on account registration page.
+#. TRANS: Field title on group edit form.
+#: actions/profilesettings.php:107 actions/register.php:440
+#: lib/groupeditform.php:150

 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr ""
 
 #. TRANS: Field label in form for profile settings.
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr ""
 
 #. TRANS: Field label in form for profile settings.

-#. TRANS: Label for full group name (dt). Text hidden by default.
-#. TRANS: DT for full name in a profile.
-#: actions/profilesettings.php:113 actions/register.php:441
-#: actions/showgroup.php:255 actions/tagother.php:104
-#: lib/groupeditform.php:150 lib/userprofile.php:156
+#. TRANS: Field label on account registration page.
+#. TRANS: Field label on group edit form.
+#: actions/profilesettings.php:111 actions/register.php:471
+#: lib/groupeditform.php:154

 msgid "Full name"
 msgstr ""
 
 #. TRANS: Field label in form for profile settings.
 msgid "Full name"
 msgstr ""
 
 #. TRANS: Field label in form for profile settings.

+#. TRANS: Field label on account registration page.

 #. TRANS: Form input field label.
 #. TRANS: Form input field label.

-#: actions/profilesettings.php:118 actions/register.php:446
-#: lib/applicationeditform.php:236 lib/groupeditform.php:154
+#. TRANS: Field label on group edit form; points to "more info" for a group.
+#: actions/profilesettings.php:116 actions/register.php:478
+#: lib/applicationeditform.php:236 lib/groupeditform.php:159

 msgid "Homepage"
 msgstr ""
 
 #. TRANS: Tooltip for field label in form for profile settings.
 msgid "Homepage"
 msgstr ""
 
 #. TRANS: Tooltip for field label in form for profile settings.

-#: actions/profilesettings.php:121 actions/register.php:448
+#. TRANS: Field title on account registration page.
+#: actions/profilesettings.php:119 actions/register.php:481

 msgid "URL of your homepage, blog, or profile on another site."
 msgstr ""
 
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr ""
 
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).

-#: actions/profilesettings.php:129 actions/register.php:457
+#. TRANS: Text area title in form for account registration. Plural
+#. TRANS: is decided by the number of characters available for the
+#. TRANS: biography (%d).
+#: actions/profilesettings.php:127 actions/register.php:490

 #, php-format
 #, php-format

-msgid "Describe yourself and your interests in %d character"
-msgid_plural "Describe yourself and your interests in %d characters"
+msgid "Describe yourself and your interests in %d character."
+msgid_plural "Describe yourself and your interests in %d characters."

 msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Tooltip for field label in form for profile settings.
 msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Tooltip for field label in form for profile settings.

-#: actions/profilesettings.php:135 actions/register.php:462
-msgid "Describe yourself and your interests"
+#. TRANS: Text area title on account registration page.
+#: actions/profilesettings.php:133 actions/register.php:496
+msgid "Describe yourself and your interests."

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Text area label in form for profile settings where users can provide.
+#. TRANS: Text area label in form for profile settings where users can provide

 #. TRANS: their biography.
 #. TRANS: their biography.

-#: actions/profilesettings.php:139 actions/register.php:464
+#. TRANS: Text area label on account registration page.
+#: actions/profilesettings.php:137 actions/register.php:499

 msgid "Bio"
 msgstr ""
 
 #. TRANS: Field label in form for profile settings.
 msgid "Bio"
 msgstr ""
 
 #. TRANS: Field label in form for profile settings.

-#. TRANS: Label for group location (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page.
-#. TRANS: DT for location in a profile.
-#: actions/profilesettings.php:145 actions/register.php:469
-#: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:174 lib/groupeditform.php:173
-#: lib/userprofile.php:172
+#. TRANS: Field label on account registration page.
+#. TRANS: Field label on group edit form.
+#. TRANS: Dropdown option for searching in profiles.
+#: actions/profilesettings.php:143 actions/register.php:505
+#: lib/groupeditform.php:184 lib/togglepeopletag.php:113

 msgid "Location"
 msgstr ""
 
 #. TRANS: Tooltip for field label in form for profile settings.
 msgid "Location"
 msgstr ""
 
 #. TRANS: Tooltip for field label in form for profile settings.

-#: actions/profilesettings.php:148
-msgid "Where you are, like \"City, State (or Region), Country\""
+#. TRANS: Field title on account registration page.
+#: actions/profilesettings.php:146 actions/register.php:508
+msgid "Where you are, like \"City, State (or Region), Country\"."

 msgstr ""
 
 #. TRANS: Checkbox label in form for profile settings.
 msgstr ""
 
 #. TRANS: Checkbox label in form for profile settings.

-#: actions/profilesettings.php:153
+#: actions/profilesettings.php:151

 msgid "Share my current location when posting notices"
 msgstr ""
 
 #. TRANS: Field label in form for profile settings.
 msgid "Share my current location when posting notices"
 msgstr ""
 
 #. TRANS: Field label in form for profile settings.

-#. TRANS: DT for tags in a profile.
-#: actions/profilesettings.php:161 actions/tagother.php:149
-#: actions/tagother.php:209 lib/subscriptionlist.php:106
-#: lib/subscriptionlist.php:108 lib/userprofile.php:220
+#. TRANS: Title for group tag cloud section.
+#. TRANS: %s is a group name.
+#: actions/profilesettings.php:159 lib/galleryaction.php:118
+#: lib/grouptagcloudsection.php:57

 msgid "Tags"
 msgstr ""
 
 #. TRANS: Tooltip for field label in form for profile settings.
 msgid "Tags"
 msgstr ""
 
 #. TRANS: Tooltip for field label in form for profile settings.

-#: actions/profilesettings.php:164
+#: actions/profilesettings.php:162

 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
 "separated."
 msgstr ""
 
 #. TRANS: Dropdownlist label in form for profile settings.
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
 "separated."
 msgstr ""
 
 #. TRANS: Dropdownlist label in form for profile settings.

-#: actions/profilesettings.php:169
+#: actions/profilesettings.php:167

 msgid "Language"
 msgstr ""
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
 msgid "Language"
 msgstr ""
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.

-#: actions/profilesettings.php:171
+#: actions/profilesettings.php:169

 msgid "Preferred language."
 msgstr ""
 
 #. TRANS: Dropdownlist label in form for profile settings.
 msgid "Preferred language."
 msgstr ""
 
 #. TRANS: Dropdownlist label in form for profile settings.

-#: actions/profilesettings.php:181
+#: actions/profilesettings.php:179

 msgid "Timezone"
 msgstr ""
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
 msgid "Timezone"
 msgstr ""
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.

-#: actions/profilesettings.php:183
+#: actions/profilesettings.php:181

 msgid "What timezone are you normally in?"
 msgstr ""
 
 #. TRANS: Checkbox label in form for profile settings.
 msgid "What timezone are you normally in?"
 msgstr ""
 
 #. TRANS: Checkbox label in form for profile settings.

-#: actions/profilesettings.php:189
+#: actions/profilesettings.php:187

 msgid ""
 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.
+#: actions/profilesettings.php:195
+msgid "Subscription policy"
+msgstr ""
+
+#. TRANS: Dropdown field option for following policy.
+#: actions/profilesettings.php:197
+msgid "Let anyone follow me"
+msgstr ""
+
+#. TRANS: Dropdown field option for following policy.
+#: actions/profilesettings.php:199
+msgid "Ask me first"
+msgstr ""
+
+#. TRANS: Dropdown field title on group edit form.
+#: actions/profilesettings.php:201
+msgid "Whether other users need your permission to follow your updates."
+msgstr ""
+
+#. TRANS: Checkbox label in profile settings.
+#: actions/profilesettings.php:209
+msgid "Make updates visible only to my followers"

 msgstr ""
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
 msgstr ""
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).

-#: actions/profilesettings.php:258 actions/register.php:221
+#. TRANS: Form validation error on registration page when providing too long a bio text.
+#. TRANS: %d is the maximum number of characters for bio; used for plural.
+#: actions/profilesettings.php:278 actions/register.php:231

 #, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
 #, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."


@@ -4443,98 +5036,118 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Validation error in form for profile settings.
 msgstr[1] ""
 
 #. TRANS: Validation error in form for profile settings.

-#: actions/profilesettings.php:269 actions/siteadminpanel.php:151
+#. TRANS: Client error displayed trying to save site settings without a timezone.
+#: actions/profilesettings.php:289 actions/siteadminpanel.php:175

 msgid "Timezone not selected."
 msgstr ""
 
 #. TRANS: Validation error in form for profile settings.
 msgid "Timezone not selected."
 msgstr ""
 
 #. TRANS: Validation error in form for profile settings.

-#: actions/profilesettings.php:277
+#: actions/profilesettings.php:297

 msgid "Language is too long (maximum 50 characters)."
 msgstr ""
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
 msgid "Language is too long (maximum 50 characters)."
 msgstr ""
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.

-#: actions/profilesettings.php:291
+#. TRANS: Form validation error displayed if a given tag is invalid.
+#. TRANS: %s is the invalid tag.
+#. TRANS: Error displayed if a given tag is invalid.
+#. TRANS: %s is the invalid tag.
+#: actions/profilesettings.php:314 actions/tagprofile.php:205
+#: lib/command.php:455

 #, php-format
 msgid "Invalid tag: \"%s\"."
 msgstr ""
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
 #. TRANS: automatically subscribe to any subscriber.
 #, php-format
 msgid "Invalid tag: \"%s\"."
 msgstr ""
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
 #. TRANS: automatically subscribe to any subscriber.

-#: actions/profilesettings.php:347
-msgid "Could not update user for autosubscribe."
+#: actions/profilesettings.php:377
+msgid "Could not update user for autosubscribe or subscribe_policy."

 msgstr ""
 
 #. TRANS: Server error thrown when user profile location preference settings could not be updated.
 msgstr ""
 
 #. TRANS: Server error thrown when user profile location preference settings could not be updated.

-#: actions/profilesettings.php:405
+#: actions/profilesettings.php:435

 msgid "Could not save location prefs."
 msgstr ""
 
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
 msgid "Could not save location prefs."
 msgstr ""
 
 #. TRANS: Server error thrown when user profile settings tags could not be saved.

-#: actions/profilesettings.php:427 actions/tagother.php:200
+#: actions/profilesettings.php:457

 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:436 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.
 #. 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:483 actions/restoreaccount.php:60
+#: actions/profilesettings.php:513 actions/restoreaccount.php:60

 msgid "Restore account"
 msgstr ""
 
 msgid "Restore account"
 msgstr ""
 

-#: actions/public.php:83
+#. TRANS: Client error displayed when requesting a public timeline page beyond the page limit.
+#. TRANS: %s is the page limit.
+#: actions/public.php:84

 #, php-format
 msgid "Beyond the page limit (%s)."
 msgstr ""
 
 #, php-format
 msgid "Beyond the page limit (%s)."
 msgstr ""
 

-#: actions/public.php:92
-msgid "Could not retrieve public stream."
+#. TRANS: Server error displayed when a public timeline cannot be retrieved.
+#: actions/public.php:104
+msgid "Could not retrieve public timeline."

 msgstr ""
 
 msgstr ""
 

-#: actions/public.php:130
+#. TRANS: Title for all public timeline pages but the first.
+#. TRANS: %d is the page number.
+#: actions/public.php:142

 #, php-format
 msgid "Public timeline, page %d"
 msgstr ""
 
 #, php-format
 msgid "Public timeline, page %d"
 msgstr ""
 

-#: actions/public.php:132 lib/publicgroupnav.php:79
+#. TRANS: Title for the first public timeline page.
+#. TRANS: Menu item title in search group navigation panel.
+#: actions/public.php:145 lib/publicgroupnav.php:69

 msgid "Public timeline"
 msgstr ""
 
 msgid "Public timeline"
 msgstr ""
 

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

-#: actions/public.php:164
-msgid "Public Stream Feed (RSS 2.0)"
+#. TRANS: Link description for public timeline feed.
+#: actions/public.php:188
+msgid "Public Timeline Feed (RSS 2.0)"

 msgstr ""
 
 msgstr ""
 

-#: actions/public.php:168
-msgid "Public Stream Feed (Atom)"
+#. TRANS: Link description for public timeline feed.
+#: actions/public.php:193
+msgid "Public Timeline Feed (Atom)"

 msgstr ""
 
 msgstr ""
 

-#: actions/public.php:188
+#. TRANS: Text displayed for public feed when there are no public notices.
+#: actions/public.php:199

 #, php-format
 msgid ""
 "This is the public timeline for %%site.name%% but no one has posted anything "
 "yet."
 msgstr ""
 
 #, php-format
 msgid ""
 "This is the public timeline for %%site.name%% but no one has posted anything "
 "yet."
 msgstr ""
 

-#: actions/public.php:191
+#. TRANS: Additional text displayed for public feed when there are no public notices for a logged in user.
+#: actions/public.php:203

 msgid "Be the first to post!"
 msgstr ""
 
 msgid "Be the first to post!"
 msgstr ""
 

-#: actions/public.php:195
+#. TRANS: Additional text displayed for public feed when there are no public notices for a not logged in user.
+#: actions/public.php:208

 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post!"
 msgstr ""
 
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post!"
 msgstr ""
 

-#: actions/public.php:242
+#. TRANS: Message for not logged in users at an invite-only site trying to view the public feed of notices.
+#. TRANS: This message contains Markdown links. Please mind the formatting.
+#: actions/public.php:280

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


@@ -4543,7 +5156,9 @@ msgid ""
 "friends, family, and colleagues! ([Read more](%%doc.help%%))"
 msgstr ""
 
 "friends, family, and colleagues! ([Read more](%%doc.help%%))"
 msgstr ""
 

-#: actions/public.php:247
+#. TRANS: Message for not logged in users at a closed site trying to view the public feed of notices.
+#. TRANS: This message contains Markdown links. Please mind the formatting.
+#: actions/public.php:287

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


@@ -4595,10 +5210,6 @@ msgid ""
 "one!"
 msgstr ""
 
 "one!"
 msgstr ""
 

-#: actions/publictagcloud.php:146
-msgid "Tag cloud"
-msgstr ""
-

 #. TRANS: Client error displayed trying to recover password while already logged in.
 #: actions/recoverpassword.php:37
 msgid "You are already logged in!"
 #. TRANS: Client error displayed trying to recover password while already logged in.
 #: actions/recoverpassword.php:37
 msgid "You are already logged in!"


@@ -4641,6 +5252,7 @@ msgid ""
 "the email address you have stored in your account."
 msgstr ""
 
 "the email address you have stored in your account."
 msgstr ""
 

+#. TRANS: Page notice for password change page.

 #: actions/recoverpassword.php:167
 msgid "You have been identified. Enter a new password below."
 msgstr ""
 #: actions/recoverpassword.php:167
 msgid "You have been identified. Enter a new password below."
 msgstr ""


@@ -4683,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:366
+#: actions/recoverpassword.php:227 classes/User.php:1146

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


@@ -4692,161 +5304,181 @@ msgstr ""
 msgid "Password saved"
 msgstr ""
 
 msgid "Password saved"
 msgstr ""
 

-#. TRANS: Title for password recovery page when an unknown action has been specified.
-#: actions/recoverpassword.php:232
-msgid "Unknown action"
-msgstr ""
-

 #. TRANS: Title for field label for password reset form.
 #: actions/recoverpassword.php:258
 msgid "6 or more characters, and do not forget it!"
 msgstr ""
 
 #. TRANS: Button text for password reset form.
 #. TRANS: Title for field label for password reset form.
 #: actions/recoverpassword.php:258
 msgid "6 or more characters, and do not forget it!"
 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/designsettings.php:264
+#: 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:309
-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:327
-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:342
-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:370
+#: 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:391
+#: 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:400
+#: 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:405
+#: 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.
 msgid "Password and confirmation do not match."
 msgstr ""
 
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.

-#: actions/recoverpassword.php:426 actions/register.php:248
+#. TRANS: Server error displayed when saving fails during user registration.
+#: 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:434
+#: 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 ""
 

-#: actions/register.php:87 actions/register.php:188 actions/register.php:399
+#. TRANS: Client exception thrown when no ID parameter was provided.
+#: actions/redirecturl.php:70
+msgid "No id parameter."
+msgstr ""
+
+#. TRANS: Client exception thrown when an invalid ID parameter was provided for a file.
+#. TRANS: %d is the provided ID for which the file is not present (number).
+#: actions/redirecturl.php:78
+#, php-format
+msgid "No such file \"%d\"."
+msgstr ""
+
+#. TRANS: Client error displayed when trying to register to an invite-only site without an invitation.
+#: actions/register.php:81 actions/register.php:189 actions/register.php:417

 msgid "Sorry, only invited people can register."
 msgstr ""
 
 msgid "Sorry, only invited people can register."
 msgstr ""
 

-#: actions/register.php:94
+#. TRANS: Client error displayed when trying to register to an invite-only site without a valid invitation.
+#: actions/register.php:89

 msgid "Sorry, invalid invitation code."
 msgstr ""
 
 msgid "Sorry, invalid invitation code."
 msgstr ""
 

-#: actions/register.php:113
+#. TRANS: Title for registration page after a succesful registration.
+#: actions/register.php:109

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

-#: actions/register.php:115 actions/register.php:497
+#. TRANS: Title for registration page.
+#: actions/register.php:112
+msgctxt "TITLE"

 msgid "Register"
 msgstr ""
 
 msgid "Register"
 msgstr ""
 

-#: actions/register.php:135
+#. TRANS: Client error displayed when trying to register to a closed site.
+#: actions/register.php:133

 msgid "Registration not allowed."
 msgstr ""
 
 msgid "Registration not allowed."
 msgstr ""
 

-#: actions/register.php:201
-msgid "You cannot register if you don't agree to the license."
+#. TRANS: Form validation error displayed when trying to register without agreeing to the site license.
+#: actions/register.php:203
+msgid "You cannot register if you do not agree to the license."

 msgstr ""
 
 msgstr ""
 

-#: actions/register.php:210
+#. TRANS: Form validation error displayed when trying to register with an already registered e-mail address.
+#: actions/register.php:216

 msgid "Email address already exists."
 msgstr ""
 
 msgid "Email address already exists."
 msgstr ""
 

-#: actions/register.php:243 actions/register.php:265
+#. TRANS: Form validation error displayed when trying to register with an invalid username or password.
+#: actions/register.php:257 actions/register.php:281

 msgid "Invalid username or password."
 msgstr ""
 
 msgid "Invalid username or password."
 msgstr ""
 

-#: actions/register.php:340
+#. TRANS: Page notice on registration page.
+#: actions/register.php:357

 msgid ""
 "With this form you can create a new account. You can then post notices and "
 "link up to friends and colleagues."
 msgstr ""
 
 msgid ""
 "With this form you can create a new account. You can then post notices and "
 "link up to friends and colleagues."
 msgstr ""
 

-#. TRANS: Link description in user account settings menu.
-#: actions/register.php:431 actions/register.php:435
-#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
+#. TRANS: Field label on account registration page. In this field the password has to be entered a second time.
+#: actions/register.php:450
+msgctxt "PASSWORD"
+msgid "Confirm"
+msgstr ""
+
+#. TRANS: Field label on account registration page.
+#: actions/register.php:457 actions/register.php:463
+msgctxt "LABEL"

 msgid "Email"
 msgstr ""
 
 msgid "Email"
 msgstr ""
 

-#: actions/register.php:432 actions/register.php:436
+#. TRANS: Field title on account registration page.
+#: actions/register.php:459 actions/register.php:465

 msgid "Used only for updates, announcements, and password recovery."
 msgstr ""
 
 msgid "Used only for updates, announcements, and password recovery."
 msgstr ""
 

-#: actions/register.php:443
+#. TRANS: Field title on account registration page.
+#: actions/register.php:474

 msgid "Longer name, preferably your \"real\" name."
 msgstr ""
 
 msgid "Longer name, preferably your \"real\" name."
 msgstr ""
 

-#: actions/register.php:471
-msgid "Where you are, like \"City, State (or Region), Country\"."
+#. TRANS: Button text to register a user on account registration page.
+#: actions/register.php:537
+msgctxt "BUTTON"
+msgid "Register"

 msgstr ""
 
 msgstr ""
 

-#: actions/register.php:510
+#. TRANS: Copyright checkbox label in registration dialog, for private sites.
+#. TRANS: %1$s is the StatusNet sitename.
+#: actions/register.php:550

 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr ""
 
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr ""
 

-#: actions/register.php:520
+#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with a specified copyright owner.
+#. TRANS: %1$s is the license owner.
+#: actions/register.php:561

 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.

-#: actions/register.php:524
+#: actions/register.php:565

 msgid "My text and files remain under my own copyright."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
 msgid "My text and files remain under my own copyright."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.

-#: actions/register.php:527
+#: actions/register.php:568

 msgid "All rights reserved."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
 msgid "All rights reserved."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.

-#: actions/register.php:532
+#: actions/register.php:573

 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
 "email address, IM address, and phone number."
 msgstr ""
 
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
 "email address, IM address, and phone number."
 msgstr ""
 

-#: actions/register.php:573
+#. TRANS: Text displayed after successful account registration.
+#. TRANS: %1$s is the registered nickname, %2$s is the profile URL.
+#. TRANS: This message contains Markdown links in the form [link text](link)
+#. TRANS: and variables in the form %%%%variable%%%%. Please mind the syntax.
+#: actions/register.php:619

 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "


@@ -4865,133 +5497,123 @@ msgid ""
 "Thanks for signing up and we hope you enjoy using this service."
 msgstr ""
 
 "Thanks for signing up and we hope you enjoy using this service."
 msgstr ""
 

-#: actions/register.php:597
+#. TRANS: Instruction text on how to deal with the e-mail address confirmation e-mail.
+#: actions/register.php:644

 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
 msgstr ""
 
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
 msgstr ""
 

-#: actions/remotesubscribe.php:97
+#. 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 ""
-
-#: actions/remotesubscribe.php:111
-msgid "Remote subscribe"
-msgstr ""
-
-#: actions/remotesubscribe.php:123
-msgid "Subscribe to a remote user"
-msgstr ""
-
-#: actions/remotesubscribe.php:128
-msgid "User nickname"
+msgid "There was an unexpected error while delisting %s."

 msgstr ""
 
 msgstr ""
 

-#: actions/remotesubscribe.php:129
-msgid "Nickname of the user you want to follow."
-msgstr ""
-
-#: actions/remotesubscribe.php:132
-msgid "Profile URL"
-msgstr ""
-
-#: actions/remotesubscribe.php:133
-msgid "URL of your profile on another compatible microblogging service."
-msgstr ""
-
-#. TRANS: Link text for link that will subscribe to a remote profile.
-#: actions/remotesubscribe.php:136 lib/subscribeform.php:139
-#: lib/userprofile.php:431
-msgid "Subscribe"
-msgstr ""
-
-#: actions/remotesubscribe.php:158
-msgid "Invalid profile URL (bad format)."
-msgstr ""
-
-#: actions/remotesubscribe.php:167
-msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
-msgstr ""
-
-#: actions/remotesubscribe.php:175
-msgid "That is a local profile! Login to subscribe."
+#. TRANS: Client error displayed when an unknown error occurs while listing a user.
+#. TRANS: %s is a profile URL.
+#: actions/removepeopletag.php:145
+#, php-format
+msgid ""
+"There was a problem listing %s. The remote server is probably not responding "
+"correctly, please try retrying later."

 msgstr ""
 
 msgstr ""
 

-#: actions/remotesubscribe.php:182
-msgid "Could not get a request token."
+#. TRANS: Title after removing a user from a list.
+#: actions/removepeopletag.php:155
+msgid "Unlisted"

 msgstr ""
 
 msgstr ""
 

+#. TRANS: Client error displayed when trying to repeat a notice while not logged in.

 #: actions/repeat.php:56
 msgid "Only logged-in users can repeat notices."
 msgstr ""
 
 #: actions/repeat.php:56
 msgid "Only logged-in users can repeat notices."
 msgstr ""
 

-#: actions/repeat.php:63 actions/repeat.php:70
+#. TRANS: Client error displayed when trying to repeat a notice while not providing a notice ID.
+#. TRANS: Client error displayed when trying to repeat a non-existing notice.
+#: actions/repeat.php:64 actions/repeat.php:72

 msgid "No notice specified."
 msgstr ""
 
 msgid "No notice specified."
 msgstr ""
 

-#: actions/repeat.php:75
-msgid "You cannot repeat your own notice."
-msgstr ""
-
-#: actions/repeat.php:89
-msgid "You already repeated that notice."
-msgstr ""
-
-#: actions/repeat.php:112 lib/noticelist.php:692
+#. TRANS: Title after repeating a notice.
+#. TRANS: Repeat form status in notice list when a notice has been repeated.
+#: actions/repeat.php:102 lib/noticelistitem.php:703

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

-#: actions/repeat.php:117
+#. TRANS: Confirmation text after repeating a notice.
+#: actions/repeat.php:108

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

+#. TRANS: Title for first page of replies for a user.
+#. TRANS: %s is a user nickname.

 #. TRANS: RSS reply feed title. %s is a user nickname.
 #. TRANS: RSS reply feed title. %s is a user nickname.

-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing @-replies.
-#: actions/replies.php:126 actions/repliesrss.php:68
-#: lib/personalgroupnav.php:109
+#. TRANS: Menu item title in personal group navigation menu.
+#. TRANS: %s is a username.
+#: actions/replies.php:129 actions/repliesrss.php:68
+#: lib/personalgroupnav.php:93

 #, php-format
 msgid "Replies to %s"
 msgstr ""
 
 #, php-format
 msgid "Replies to %s"
 msgstr ""
 

-#: actions/replies.php:128
+#. TRANS: Title for all but the first page of replies for a user.
+#. TRANS: %1$s is a user nickname, %2$d is a page number.
+#: actions/replies.php:133

 #, php-format
 msgid "Replies to %1$s, page %2$d"
 msgstr ""
 
 #, php-format
 msgid "Replies to %1$s, page %2$d"
 msgstr ""
 

-#: actions/replies.php:145
+#. TRANS: Link for feed with replies for a user.
+#. TRANS: %s is a user nickname.
+#: 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 ""
 
 #, php-format
 msgid "Replies feed for %s (RSS 1.0)"
 msgstr ""
 

-#: actions/replies.php:152
+#. TRANS: Link for feed with replies for a user.
+#. TRANS: %s is a user nickname.
+#: actions/replies.php:169

 #, php-format
 msgid "Replies feed for %s (RSS 2.0)"
 msgstr ""
 
 #, php-format
 msgid "Replies feed for %s (RSS 2.0)"
 msgstr ""
 

-#: actions/replies.php:159
+#. TRANS: Link for feed with replies for a user.
+#. TRANS: %s is a user nickname.
+#: actions/replies.php:178

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

-#: actions/replies.php:199
+#. TRANS: Empty list message for page with replies for a user.
+#. TRANS: %1$s and %s$s are the user nickname.
+#: actions/replies.php:207

 #, php-format
 msgid ""
 "This is the timeline showing replies to %1$s but %2$s hasn't received a "
 "notice to them yet."
 msgstr ""
 
 #, php-format
 msgid ""
 "This is the timeline showing replies to %1$s but %2$s hasn't received a "
 "notice to them yet."
 msgstr ""
 

-#: actions/replies.php:204
+#. TRANS: Empty list message for page with replies for a user for the logged in user.
+#. TRANS: This message contains a Markdown link in the form [link text](link).
+#: actions/replies.php:216

 #, php-format
 msgid ""
 "You can engage other users in a conversation, subscribe to more people or "
 "[join groups](%%action.groups%%)."
 msgstr ""
 
 #, php-format
 msgid ""
 "You can engage other users in a conversation, subscribe to more people or "
 "[join groups](%%action.groups%%)."
 msgstr ""
 

-#: actions/replies.php:206
+#. TRANS: Empty list message for page with replies for a user for all logged in users but the user themselves.
+#. TRANS: %1$s, %2$s and %3$s are a user nickname. This message contains a Markdown link in the form [link text](link).
+#: actions/replies.php:220

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


@@ -5061,7 +5683,8 @@ msgid "System error uploading file."
 msgstr ""
 
 #. TRANS: Client exception thrown when a feed is not an Atom feed.
 msgstr ""
 
 #. TRANS: Client exception thrown when a feed is not an Atom feed.

-#: actions/restoreaccount.php:207
+#. TRANS: Client exception thrown when an imported feed is not an Atom feed.
+#: actions/restoreaccount.php:207 lib/feedimporter.php:74

 msgid "Not an Atom feed."
 msgstr ""
 
 msgid "Not an Atom feed."
 msgstr ""
 


@@ -5080,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 ""
 


@@ -5089,143 +5712,168 @@ msgstr ""
 msgid "Upload the file"
 msgstr ""
 
 msgid "Upload the file"
 msgstr ""
 

-#: actions/revokerole.php:75
+#. TRANS: Client error displayed when trying to revoke a role without having the right to do that.
+#: actions/revokerole.php:76

 msgid "You cannot revoke user roles on this site."
 msgstr ""
 
 msgid "You cannot revoke user roles on this site."
 msgstr ""
 

-#: actions/revokerole.php:82
-msgid "User doesn't have this role."
+#. TRANS: Client error displayed when trying to revoke a role that is not set.
+#: actions/revokerole.php:84
+msgid "User does not have this role."

 msgstr ""
 
 msgstr ""
 

-#: actions/rsd.php:142 actions/version.php:159
+#. TRANS: Engine name for RSD.
+#. TRANS: Engine name.
+#: actions/rsd.php:144 actions/version.php:156

 msgid "StatusNet"
 msgstr ""
 
 msgid "StatusNet"
 msgstr ""
 

-#: actions/sandbox.php:65 actions/unsandbox.php:65
+#. TRANS: Client error displayed trying to sandbox users on a site where the feature is not enabled.
+#. TRANS: Client error on page to unsandbox a user when the feature is not enabled.
+#: actions/sandbox.php:64 actions/unsandbox.php:64

 msgid "You cannot sandbox users on this site."
 msgstr ""
 
 msgid "You cannot sandbox users on this site."
 msgstr ""
 

+#. TRANS: Client error displayed trying to sandbox an already sandboxed user.

 #: actions/sandbox.php:72
 msgid "User is already sandboxed."
 msgstr ""
 
 #: actions/sandbox.php:72
 msgid "User is already sandboxed."
 msgstr ""
 

-#. TRANS: Menu item for site administration
-#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:379
+#. TRANS: Client error displayed when trying to list a profile with an invalid list.
+#. TRANS: %s is the invalid list name.
+#: actions/selftag.php:68
+#, php-format
+msgid "Not a valid list: %s."
+msgstr ""
+
+#. TRANS: Page title for page showing self tags.
+#. TRANS: %1$s is a tag, %2$d is a page number.
+#: actions/selftag.php:154
+#, php-format
+msgid "Users self-tagged with %1$s, page %2$d"
+msgstr ""
+
+#. TRANS: Title for the sessions administration panel.
+#: actions/sessionsadminpanel.php:53
+msgctxt "TITLE"

 msgid "Sessions"
 msgstr ""
 
 msgid "Sessions"
 msgstr ""
 

-#: actions/sessionsadminpanel.php:65
+#. TRANS: Instructions for the sessions administration panel.
+#: actions/sessionsadminpanel.php:64

 msgid "Session settings for this StatusNet site"
 msgstr ""
 
 msgid "Session settings for this StatusNet site"
 msgstr ""
 

-#: actions/sessionsadminpanel.php:175
+#. TRANS: Fieldset legend on the sessions administration panel.
+#: actions/sessionsadminpanel.php:165
+msgctxt "LEGEND"
+msgid "Sessions"
+msgstr ""
+
+#. TRANS: Checkbox title on the sessions administration panel.
+#. TRANS: Indicates if StatusNet should handle session administration.
+#: actions/sessionsadminpanel.php:172

 msgid "Handle sessions"
 msgstr ""
 
 msgid "Handle sessions"
 msgstr ""
 

-#: actions/sessionsadminpanel.php:177
-msgid "Whether to handle sessions ourselves."
+#. TRANS: Checkbox title on the sessions administration panel.
+#. TRANS: Indicates if StatusNet should handle session administration.
+#: actions/sessionsadminpanel.php:176
+msgid "Handle sessions ourselves."

 msgstr ""
 
 msgstr ""
 

-#: actions/sessionsadminpanel.php:181
+#. TRANS: Checkbox label on the sessions administration panel.
+#. TRANS: Indicates if StatusNet should write session debugging output.
+#: actions/sessionsadminpanel.php:182

 msgid "Session debugging"
 msgstr ""
 
 msgid "Session debugging"
 msgstr ""
 

-#: actions/sessionsadminpanel.php:183
-msgid "Turn on debugging output for sessions."
+#. TRANS: Checkbox title on the sessions administration panel.
+#: actions/sessionsadminpanel.php:185
+msgid "Enable debugging output for sessions."

 msgstr ""
 
 msgstr ""
 

-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-msgid "Save site settings"
+#. TRANS: Title for submit button on the sessions administration panel.
+#: actions/sessionsadminpanel.php:206
+msgid "Save session settings"

 msgstr ""
 
 msgstr ""
 

-#: actions/showapplication.php:78
+#. TRANS: Client error displayed trying to display an OAuth application while not logged in.
+#: actions/showapplication.php:79

 msgid "You must be logged in to view an application."
 msgstr ""
 
 msgid "You must be logged in to view an application."
 msgstr ""
 

-#: actions/showapplication.php:151
+#. TRANS: Header on the OAuth application page.
+#: actions/showapplication.php:156

 msgid "Application profile"
 msgstr ""
 
 msgid "Application profile"
 msgstr ""
 

-#. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:153 lib/applicationeditform.php:177
-msgid "Icon"
+#. TRANS: Information output on an OAuth application page.
+#. TRANS: %1$s is the application creator, %2$s is "read-only" or "read-write",
+#. TRANS: %3$d is the number of users using the OAuth application.
+#: actions/showapplication.php:187
+#, php-format
+msgid "Created by %1$s - %2$s access by default - %3$d user"
+msgid_plural "Created by %1$s - %2$s access by default - %3$d users"
+msgstr[0] ""
+msgstr[1] ""
+
+#. TRANS: Header on the OAuth application page.
+#: actions/showapplication.php:200
+msgid "Application actions"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Form input field label for application name.
-#: actions/showapplication.php:163 actions/version.php:197
-#: lib/applicationeditform.php:190
-msgid "Name"
+#. TRANS: Link text to edit application on the OAuth application page.
+#: actions/showapplication.php:207
+msgctxt "EDITAPP"
+msgid "Edit"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Form input field label.
-#: actions/showapplication.php:172 lib/applicationeditform.php:227
-msgid "Organization"
+#. TRANS: Button text on the OAuth application page.
+#. TRANS: Resets the OAuth consumer key and secret.
+#: actions/showapplication.php:226
+msgid "Reset key & secret"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Form input field label.
-#: actions/showapplication.php:181 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:168
-msgid "Description"
+#. TRANS: Header on the OAuth application page.
+#: actions/showapplication.php:253
+msgid "Application info"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Header for group statistics on a group page (h2).
-#. TRANS: H2 text for user statistics.
-#: actions/showapplication.php:186 actions/showgroup.php:460
-#: lib/profileaction.php:205
-msgid "Statistics"
+#. TRANS: Field label on application page.
+#: actions/showapplication.php:257
+msgid "Consumer key"

 msgstr ""
 
 msgstr ""
 

-#: actions/showapplication.php:197
-#, php-format
-msgid "Created by %1$s - %2$s access by default - %3$d users"
-msgstr ""
-
-#: actions/showapplication.php:207
-msgid "Application actions"
-msgstr ""
-
-#: actions/showapplication.php:230
-msgid "Reset key & secret"
-msgstr ""
-
-#. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:246 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:64 lib/noticelist.php:673
-msgid "Delete"
-msgstr ""
-
-#: actions/showapplication.php:255
-msgid "Application info"
-msgstr ""
-
-#: actions/showapplication.php:257
-msgid "Consumer key"
-msgstr ""
-
-#: actions/showapplication.php:262
+#. TRANS: Field label on application page.
+#: actions/showapplication.php:260

 msgid "Consumer secret"
 msgstr ""
 
 msgid "Consumer secret"
 msgstr ""
 

-#: actions/showapplication.php:267
+#. TRANS: Field label on application page.
+#: actions/showapplication.php:263

 msgid "Request token URL"
 msgstr ""
 
 msgid "Request token URL"
 msgstr ""
 

-#: actions/showapplication.php:272
+#. TRANS: Field label on application page.
+#: actions/showapplication.php:266

 msgid "Access token URL"
 msgstr ""
 
 msgid "Access token URL"
 msgstr ""
 

-#: actions/showapplication.php:277
+#. TRANS: Field label on application page.
+#: actions/showapplication.php:269

 msgid "Authorize URL"
 msgstr ""
 
 msgid "Authorize URL"
 msgstr ""
 

-#: actions/showapplication.php:282
+#. TRANS: Note on the OAuth application page about signature support.
+#: actions/showapplication.php:275

 msgid ""
 msgid ""

-"Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
-"signature method."
+"Note: HMAC-SHA1 signatures are supported. The plaintext signature method is "
+"not supported."

 msgstr ""
 
 msgstr ""
 

-#: actions/showapplication.php:302
+#. TRANS: Text in confirmation dialog to reset consumer key and secret for an OAuth application.
+#: 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 ""
 


@@ -5242,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:209
+#: 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."


@@ -5268,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:213
+#: 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 "


@@ -5278,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:220
+#: 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](%%%%"


@@ -5287,7 +5941,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: Page notice for show favourites page.
 msgstr ""
 
 #. TRANS: Page notice for show favourites page.

-#: actions/showfavorites.php:251
+#: actions/showfavorites.php:248

 msgid "This is a way to share what you like."
 msgstr ""
 
 msgid "This is a way to share what you like."
 msgstr ""
 


@@ -5304,98 +5958,41 @@ msgstr ""
 msgid "%1$s group, page %2$d"
 msgstr ""
 
 msgid "%1$s group, page %2$d"
 msgstr ""
 

-#. TRANS: Group profile header (h2). Text hidden by default.
-#: actions/showgroup.php:223
-msgid "Group profile"
-msgstr ""
-
-#. TRANS: Label for group URL (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page.
-#. TRANS: DT for URL in a profile.
-#: actions/showgroup.php:273 actions/tagother.php:118
-#: actions/userauthorization.php:184 lib/userprofile.php:186
-msgid "URL"
-msgstr ""
-
-#. TRANS: Label for group description or group note (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page where bio is displayed.
-#. TRANS: DT for note in a profile.
-#: actions/showgroup.php:285 actions/tagother.php:128
-#: actions/userauthorization.php:197 lib/userprofile.php:204
-msgid "Note"
-msgstr ""
-
-#. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:296 lib/groupeditform.php:180
-msgid "Aliases"
-msgstr ""
-
-#. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:313
-msgid "Group actions"
+#. TRANS: Tooltip for feed link. %s is a group nickname.
+#: 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.
 msgstr ""
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.

-#: actions/showgroup.php:357
+#: 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:364
+#: 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:371
+#: 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:377
+#: 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:414
-msgid "Members"
-msgstr ""
-
-#. TRANS: Description for mini list of group members on a group page when the group has no members.
-#. 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.
-#: actions/showgroup.php:420 lib/profileaction.php:137
-#: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
-#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
-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:429
-msgid "All members"
-msgstr ""
-
-#. TRANS: Label for creation date in statistics on group page.
-#: actions/showgroup.php:465
-msgctxt "LABEL"
-msgid "Created"
-msgstr ""
-
-#. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:473
-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:488
+#: 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."


@@ -5406,20 +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:498
+#: 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: Header for list of group administrators on a group page (h2).
-#: actions/showgroup.php:527
-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.


@@ -5446,88 +6038,209 @@ msgstr ""
 msgid "Message from %1$s on %2$s"
 msgstr ""
 
 msgid "Message from %1$s on %2$s"
 msgstr ""
 

-#: actions/shownotice.php:90
+#. TRANS: Client exception thrown when trying a view a notice the user has no access to.
+#: actions/shownotice.php:92
+msgid "Not available."
+msgstr ""
+
+#. TRANS: Client error displayed trying to show a deleted notice.
+#: actions/shownotice.php:127

 msgid "Notice deleted."
 msgstr ""
 
 msgid "Notice deleted."
 msgstr ""
 

-#. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
-#: actions/showstream.php:70
+#. TRANS: Title for private list timeline.
+#. TRANS: %1$s is a list, %2$s is a page number.
+#: 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.
+#: 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.
+#: 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.
+#: 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.
+#: 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.
+#: 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.
+#: 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.
+#: actions/showprofiletag.php:225
+#, php-format
+msgid ""
+"This is the timeline for %1$s list by %2$s but no one has posted anything "
+"yet."
+msgstr ""
+
+#. TRANS: Additional empty list message for list timeline for currently logged in user tagged tags.
+#: 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).
+#: actions/showprofiletag.php:238
+#, php-format
+msgid ""
+"Why not [register an account](%%%%action.register%%%%) and start following "
+"this timeline!"
+msgstr ""
+
+#. TRANS: Header on show list page.
+#. TRANS: Link description for link to list of users tagged with a tag (so part of a list).
+#: actions/showprofiletag.php:306 lib/peopletaglist.php:173
+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.
+#: 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.
+#: actions/showprofiletag.php:344 lib/peopletaglist.php:183
+msgid "Subscribers"
+msgstr ""
+
+#. TRANS: Page title showing tagged notices in one user's timeline.
+#. TRANS: %1$s is the username, %2$s is the hash tag.
+#: actions/showstream.php:89

 #, php-format
 #, php-format

-msgid "%1$s tagged %2$s"
+msgid "Notices by %1$s tagged %2$s"

 msgstr ""
 
 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
 #, php-format

-msgid "%1$s tagged %2$s, page %3$d"
+msgid "Notices by %1$s tagged %2$s, page %3$d"

 msgstr ""
 
 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
 #, php-format

-msgid "%1$s, page %2$d"
+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.
 msgstr ""
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %1$s is a user nickname, %2$s is a hashtag.

-#: actions/showstream.php:127
+#: 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:136
+#: 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:145
+#: actions/showstream.php:169

 #, php-format
 msgid "Notice feed for %s (RSS 2.0)"
 msgstr ""
 
 #, php-format
 msgid "Notice feed for %s (RSS 2.0)"
 msgstr ""
 

-#: actions/showstream.php:152
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#: 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:159
+#: 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:211
+#. 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:217
+#: 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:221
+#: 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:264
+#: 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."


@@ -5536,127 +6249,201 @@ 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:271
+#: 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:328
+#: actions/showstream.php:359

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

-#: actions/silence.php:65 actions/unsilence.php:65
+#. TRANS: Client error displayed trying to silence a user on a site where the feature is not enabled.
+#. TRANS: Client error on page to unsilence a user when the feature is not enabled.
+#: actions/silence.php:64 actions/unsilence.php:64

 msgid "You cannot silence users on this site."
 msgstr ""
 
 msgid "You cannot silence users on this site."
 msgstr ""
 

+#. TRANS: Client error displayed trying to silence an already silenced user.

 #: actions/silence.php:72
 msgid "User is already silenced."
 msgstr ""
 
 #: actions/silence.php:72
 msgid "User is already silenced."
 msgstr ""
 

-#: actions/siteadminpanel.php:69
+#. TRANS: Title for site administration panel.
+#: actions/siteadminpanel.php:57
+msgctxt "TITLE"
+msgid "Site"
+msgstr ""
+
+#. TRANS: Instructions for site administration panel.
+#: actions/siteadminpanel.php:68

 msgid "Basic settings for this StatusNet site"
 msgstr ""
 
 msgid "Basic settings for this StatusNet site"
 msgstr ""
 

-#: actions/siteadminpanel.php:133
+#. TRANS: Client error displayed trying to save an empty site name.
+#: actions/siteadminpanel.php:141

 msgid "Site name must have non-zero length."
 msgstr ""
 
 msgid "Site name must have non-zero length."
 msgstr ""
 

-#: actions/siteadminpanel.php:141
+#. TRANS: Client error displayed trying to save site settings without a contact address.
+#: actions/siteadminpanel.php:150

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

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

 #, php-format
 msgid "Unknown language \"%s\"."
 msgstr ""
 
 #, php-format
 msgid "Unknown language \"%s\"."
 msgstr ""
 

-#: actions/siteadminpanel.php:165
+#. TRANS: Client error displayed trying to save site settings with a text limit below 0.
+#: actions/siteadminpanel.php:192

 msgid "Minimum text limit is 0 (unlimited)."
 msgstr ""
 
 msgid "Minimum text limit is 0 (unlimited)."
 msgstr ""
 

-#: actions/siteadminpanel.php:171
+#. TRANS: Client error displayed trying to save site settings with a text limit below 1.
+#: actions/siteadminpanel.php:199

 msgid "Dupe limit must be one or more seconds."
 msgstr ""
 
 msgid "Dupe limit must be one or more seconds."
 msgstr ""
 

-#: actions/siteadminpanel.php:221
+#. TRANS: Fieldset legend on site settings panel.
+#: actions/siteadminpanel.php:246
+msgctxt "LEGEND"

 msgid "General"
 msgstr ""
 
 msgid "General"
 msgstr ""
 

-#: actions/siteadminpanel.php:224
+#. TRANS: Field label on site settings panel.
+#: actions/siteadminpanel.php:250
+msgctxt "LABEL"

 msgid "Site name"
 msgstr ""
 
 msgid "Site name"
 msgstr ""
 

-#: actions/siteadminpanel.php:225
-msgid "The name of your site, like \"Yourcompany Microblog\""
+#. TRANS: Field title on site settings panel.
+#: actions/siteadminpanel.php:252
+msgid "The name of your site, like \"Yourcompany Microblog\"."

 msgstr ""
 
 msgstr ""
 

-#: actions/siteadminpanel.php:229
+#. TRANS: Field label on site settings panel.
+#: actions/siteadminpanel.php:257

 msgid "Brought by"
 msgstr ""
 
 msgid "Brought by"
 msgstr ""
 

-#: actions/siteadminpanel.php:230
-msgid "Text used for credits link in footer of each page"
+#. TRANS: Field title on site settings panel.
+#: actions/siteadminpanel.php:259
+msgid "Text used for credits link in footer of each page."

 msgstr ""
 
 msgstr ""
 

-#: actions/siteadminpanel.php:234
+#. TRANS: Field label on site settings panel.
+#: actions/siteadminpanel.php:264

 msgid "Brought by URL"
 msgstr ""
 
 msgid "Brought by URL"
 msgstr ""
 

-#: actions/siteadminpanel.php:235
-msgid "URL used for credits link in footer of each page"
+#. TRANS: Field title on site settings panel.
+#: actions/siteadminpanel.php:266
+msgid "URL used for credits link in footer of each page."
+msgstr ""
+
+#. TRANS: Field label on site settings panel.
+#: actions/siteadminpanel.php:270
+msgid "Email"

 msgstr ""
 
 msgstr ""
 

-#: actions/siteadminpanel.php:239
-msgid "Contact email address for your site"
+#. TRANS: Field title on site settings panel.
+#: actions/siteadminpanel.php:272
+msgid "Contact email address for your site."

 msgstr ""
 
 msgstr ""
 

-#: actions/siteadminpanel.php:245
+#. TRANS: Fieldset legend on site settings panel.
+#: actions/siteadminpanel.php:281
+msgctxt "LEGEND"

 msgid "Local"
 msgstr ""
 
 msgid "Local"
 msgstr ""
 

-#: actions/siteadminpanel.php:256
+#. TRANS: Dropdown label on site settings panel.
+#: actions/siteadminpanel.php:293

 msgid "Default timezone"
 msgstr ""
 
 msgid "Default timezone"
 msgstr ""
 

-#: actions/siteadminpanel.php:257
+#. TRANS: Dropdown title on site settings panel.
+#: actions/siteadminpanel.php:295

 msgid "Default timezone for the site; usually UTC."
 msgstr ""
 
 msgid "Default timezone for the site; usually UTC."
 msgstr ""
 

-#: actions/siteadminpanel.php:262
+#. TRANS: Dropdown label on site settings panel.
+#: actions/siteadminpanel.php:302

 msgid "Default language"
 msgstr ""
 
 msgid "Default language"
 msgstr ""
 

-#: actions/siteadminpanel.php:263
-msgid "Site language when autodetection from browser settings is not available"
+#. TRANS: Dropdown title on site settings panel.
+#: actions/siteadminpanel.php:305
+msgid ""
+"The site language when autodetection from browser settings is not available."

 msgstr ""
 
 msgstr ""
 

-#: actions/siteadminpanel.php:271
+#. TRANS: Fieldset legend on site settings panel.
+#: actions/siteadminpanel.php:314
+msgctxt "LEGEND"

 msgid "Limits"
 msgstr ""
 
 msgid "Limits"
 msgstr ""
 

-#: actions/siteadminpanel.php:274
+#. TRANS: Field label on site settings panel.
+#: actions/siteadminpanel.php:319

 msgid "Text limit"
 msgstr ""
 
 msgid "Text limit"
 msgstr ""
 

-#: actions/siteadminpanel.php:274
+#. TRANS: Field title on site settings panel.
+#: actions/siteadminpanel.php:321

 msgid "Maximum number of characters for notices."
 msgstr ""
 
 msgid "Maximum number of characters for notices."
 msgstr ""
 

-#: actions/siteadminpanel.php:278
+#. TRANS: Field label on site settings panel.
+#: actions/siteadminpanel.php:327

 msgid "Dupe limit"
 msgstr ""
 
 msgid "Dupe limit"
 msgstr ""
 

-#: actions/siteadminpanel.php:278
+#. TRANS: Field title on site settings panel.
+#: 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.
+#: actions/siteadminpanel.php:377
+msgid "Save the site settings."
+msgstr ""
+

 #. TRANS: Page title for site-wide notice tab in admin panel.
 #: actions/sitenoticeadminpanel.php:55
 msgid "Site Notice"
 #. TRANS: Page title for site-wide notice tab in admin panel.
 #: actions/sitenoticeadminpanel.php:55
 msgid "Site Notice"


@@ -5687,76 +6474,76 @@ 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 ""
 
 #. TRANS: Title for SMS settings.
 #: actions/sitenoticeadminpanel.php:201
 msgid "Save site notice."
 msgstr ""
 
 #. TRANS: Title for SMS settings.

-#: actions/smssettings.php:57
+#: actions/smssettings.php:56

 msgid "SMS settings"
 msgstr ""
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
 msgid "SMS settings"
 msgstr ""
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.

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

 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr ""
 
 #. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr ""
 
 #. TRANS: Message given in the SMS settings if SMS is not enabled on the site.

-#: actions/smssettings.php:93
+#: actions/smssettings.php:92

 msgid "SMS is not available."
 msgstr ""
 
 #. TRANS: Form legend for SMS settings form.
 msgid "SMS is not available."
 msgstr ""
 
 #. TRANS: Form legend for SMS settings form.

-#: actions/smssettings.php:107
+#: actions/smssettings.php:106

 msgid "SMS address"
 msgstr ""
 
 #. TRANS: Form guide in SMS settings form.
 msgid "SMS address"
 msgstr ""
 
 #. TRANS: Form guide in SMS settings form.

-#: actions/smssettings.php:116
+#: actions/smssettings.php:115

 msgid "Current confirmed SMS-enabled phone number."
 msgstr ""
 
 #. TRANS: Form guide in IM settings form.
 msgid "Current confirmed SMS-enabled phone number."
 msgstr ""
 
 #. TRANS: Form guide in IM settings form.

-#: actions/smssettings.php:129
+#: actions/smssettings.php:128

 msgid "Awaiting confirmation on this phone number."
 msgstr ""
 
 #. TRANS: Field label for SMS address input in SMS settings form.
 msgid "Awaiting confirmation on this phone number."
 msgstr ""
 
 #. TRANS: Field label for SMS address input in SMS settings form.

-#: actions/smssettings.php:138
+#: actions/smssettings.php:137

 msgid "Confirmation code"
 msgstr ""
 
 #. TRANS: Form field instructions in SMS settings form.
 msgid "Confirmation code"
 msgstr ""
 
 #. TRANS: Form field instructions in SMS settings form.

-#: actions/smssettings.php:140
+#: actions/smssettings.php:139

 msgid "Enter the code you received on your phone."
 msgstr ""
 
 #. TRANS: Button label to confirm SMS confirmation code in SMS settings.
 msgid "Enter the code you received on your phone."
 msgstr ""
 
 #. TRANS: Button label to confirm SMS confirmation code in SMS settings.

-#: actions/smssettings.php:144
+#: actions/smssettings.php:143

 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr ""
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr ""
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.

-#: actions/smssettings.php:149
+#: actions/smssettings.php:148

 msgid "SMS phone number"
 msgstr ""
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
 msgid "SMS phone number"
 msgstr ""
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.

-#: actions/smssettings.php:152
+#: actions/smssettings.php:151

 msgid "Phone number, no punctuation or spaces, with area code."
 msgstr ""
 
 #. TRANS: Form legend for SMS preferences form.
 msgid "Phone number, no punctuation or spaces, with area code."
 msgstr ""
 
 #. TRANS: Form legend for SMS preferences form.

-#: actions/smssettings.php:191
+#: actions/smssettings.php:190

 msgid "SMS preferences"
 msgstr ""
 
 #. TRANS: Checkbox label in SMS preferences form.
 msgid "SMS preferences"
 msgstr ""
 
 #. TRANS: Checkbox label in SMS preferences form.

-#: actions/smssettings.php:197
+#: actions/smssettings.php:196

 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."


@@ -5799,6 +6586,11 @@ msgstr ""
 msgid "That is the wrong confirmation number."
 msgstr ""
 
 msgid "That is the wrong confirmation number."
 msgstr ""
 

+#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
+#: actions/smssettings.php:413
+msgid "Could not delete SMS confirmation."
+msgstr ""
+

 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
 #: actions/smssettings.php:418
 msgid "SMS confirmation cancelled."
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
 #: actions/smssettings.php:418
 msgid "SMS confirmation cancelled."


@@ -5839,91 +6631,147 @@ msgstr ""
 msgid "No code entered."
 msgstr ""
 
 msgid "No code entered."
 msgstr ""
 

-#. TRANS: Menu item for site administration
-#: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:395
+#. TRANS: Title for admin panel to configure snapshots.
+#: actions/snapshotadminpanel.php:53
+msgctxt "TITLE"

 msgid "Snapshots"
 msgstr ""
 
 msgid "Snapshots"
 msgstr ""
 

-#: actions/snapshotadminpanel.php:65
+#. TRANS: Instructions for admin panel to configure snapshots.
+#: actions/snapshotadminpanel.php:64

 msgid "Manage snapshot configuration"
 msgstr ""
 
 msgid "Manage snapshot configuration"
 msgstr ""
 

-#: actions/snapshotadminpanel.php:127
+#. TRANS: Client error displayed on admin panel for snapshots when providing an invalid run value.
+#: actions/snapshotadminpanel.php:125

 msgid "Invalid snapshot run value."
 msgstr ""
 
 msgid "Invalid snapshot run value."
 msgstr ""
 

-#: actions/snapshotadminpanel.php:133
+#. TRANS: Client error displayed on admin panel for snapshots when providing an invalid value for frequency.
+#: actions/snapshotadminpanel.php:132

 msgid "Snapshot frequency must be a number."
 msgstr ""
 
 msgid "Snapshot frequency must be a number."
 msgstr ""
 

+#. TRANS: Client error displayed on admin panel for snapshots when providing an invalid report URL.

 #: actions/snapshotadminpanel.php:144
 msgid "Invalid snapshot report URL."
 msgstr ""
 
 #: actions/snapshotadminpanel.php:144
 msgid "Invalid snapshot report URL."
 msgstr ""
 

-#: actions/snapshotadminpanel.php:200
+#. TRANS: Fieldset legend on admin panel for snapshots.
+#: actions/snapshotadminpanel.php:194
+msgctxt "LEGEND"
+msgid "Snapshots"
+msgstr ""
+
+#. TRANS: Option in dropdown for snapshot method in admin panel for snapshots.
+#: actions/snapshotadminpanel.php:199

 msgid "Randomly during web hit"
 msgstr ""
 
 msgid "Randomly during web hit"
 msgstr ""
 

+#. TRANS: Option in dropdown for snapshot method in admin panel for snapshots.

 #: actions/snapshotadminpanel.php:201
 msgid "In a scheduled job"
 msgstr ""
 
 #: actions/snapshotadminpanel.php:201
 msgid "In a scheduled job"
 msgstr ""
 

-#: actions/snapshotadminpanel.php:206
+#. TRANS: Dropdown label for snapshot method in admin panel for snapshots.
+#: actions/snapshotadminpanel.php:208

 msgid "Data snapshots"
 msgstr ""
 
 msgid "Data snapshots"
 msgstr ""
 

-#: actions/snapshotadminpanel.php:208
-msgid "When to send statistical data to status.net servers"
+#. TRANS: Dropdown title for snapshot method in admin panel for snapshots.
+#: actions/snapshotadminpanel.php:211
+msgid "When to send statistical data to status.net servers."

 msgstr ""
 
 msgstr ""
 

-#: actions/snapshotadminpanel.php:217
+#. TRANS: Input field label for snapshot frequency in admin panel for snapshots.
+#: actions/snapshotadminpanel.php:221

 msgid "Frequency"
 msgstr ""
 
 msgid "Frequency"
 msgstr ""
 

-#: actions/snapshotadminpanel.php:218
-msgid "Snapshots will be sent once every N web hits"
+#. TRANS: Input field title for snapshot frequency in admin panel for snapshots.
+#: actions/snapshotadminpanel.php:223
+msgid "Snapshots will be sent once every N web hits."

 msgstr ""
 
 msgstr ""
 

-#: actions/snapshotadminpanel.php:226
+#. TRANS: Input field label for snapshot report URL in admin panel for snapshots.
+#: actions/snapshotadminpanel.php:232

 msgid "Report URL"
 msgstr ""
 
 msgid "Report URL"
 msgstr ""
 

-#: actions/snapshotadminpanel.php:227
-msgid "Snapshots will be sent to this URL"
+#. TRANS: Input field title for snapshot report URL in admin panel for snapshots.
+#: actions/snapshotadminpanel.php:234
+msgid "Snapshots will be sent to this URL."

 msgstr ""
 
 msgstr ""
 

-#: actions/snapshotadminpanel.php:248
-msgid "Save snapshot settings"
+#. TRANS: Button title to save snapshot settings.
+#: actions/snapshotadminpanel.php:256
+msgid "Save snapshot settings."

 msgstr ""
 
 #. TRANS: Client error displayed trying a change a subscription for a non-subscribed profile.
 msgstr ""
 
 #. TRANS: Client error displayed trying a change a subscription for a non-subscribed profile.

-#: actions/subedit.php:75
+#: actions/subedit.php:76

 msgid "You are not subscribed to that profile."
 msgstr ""
 
 #. TRANS: Server error displayed when updating a subscription fails with a database error.
 #. TRANS: Exception thrown when a subscription could not be stored on the server.
 msgid "You are not subscribed to that profile."
 msgstr ""
 
 #. TRANS: Server error displayed when updating a subscription fails with a database error.
 #. TRANS: Exception thrown when a subscription could not be stored on the server.

-#: actions/subedit.php:89 classes/Subscription.php:141
+#: actions/subedit.php:90 classes/Subscription.php:177

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

-#. TRANS: Client error displayed trying to perform any request method other than POST.
-#. TRANS: Do not translate POST.
-#: actions/subscribe.php:77
-msgid "This action only accepts POST requests."
+#. TRANS: Client error displayed when trying to approve group applicants without being a group administrator.
+#: actions/subqueue.php:62
+msgid "You may only approve your own pending subscriptions."
+msgstr ""
+
+#. TRANS: Title of the first page showing pending subscribers still awaiting approval.
+#. TRANS: %s is the name of the user.
+#: actions/subqueue.php:73
+#, php-format
+msgid "%s subscribers awaiting approval"

 msgstr ""
 
 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."
+#. TRANS: Title of all but the first page showing pending subscribersmembers still awaiting approval.
+#. TRANS: %1$s is the name of the user, %2$d is the page number of the members list.
+#: actions/subqueue.php:78
+#, php-format
+msgid "%1$s subscribers awaiting approval, page %2$d"
+msgstr ""
+
+#. TRANS: Page notice for group members page.
+#: actions/subqueue.php:88
+msgid "A list of users awaiting approval to subscribe to you."

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

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

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

+#. TRANS: Client error displayed when trying to perform an action while not logged in.
+#: actions/subscribepeopletag.php:59 actions/unsubscribepeopletag.php:60
+msgid "You must be logged in to unsubscribe from a list."
+msgstr ""
+
+#. TRANS: Client error displayed when trying to perform an action without providing an ID.
+#: actions/subscribepeopletag.php:89 actions/unsubscribepeopletag.php:90
+msgid "No ID given."
+msgstr ""
+
+#. TRANS: Server error displayed subscribing to a list fails.
+#. TRANS: %1$s is a user nickname, %2$s is a list, %3$s is the error message (no period).
+#: actions/subscribepeopletag.php:125
+#, php-format
+msgid "Could not subscribe user %1$s to list %2$s: %3$s"
+msgstr ""
+
+#. TRANS: Title of form to subscribe to a list.
+#. TRANS: %1%s is a user nickname, %2$s is a list, %3$s is a tagger nickname.
+#: actions/subscribepeopletag.php:134
+#, php-format
+msgid "%1$s subscribed to list %2$s by %3$s"
+msgstr ""
+

 #. TRANS: Header for list of subscribers for a user (first page).
 #. TRANS: %s is the user's nickname.
 #: actions/subscribers.php:51
 #. TRANS: Header for list of subscribers for a user (first page).
 #. TRANS: %s is the user's nickname.
 #: actions/subscribers.php:51


@@ -6007,100 +6855,137 @@ 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:176
+#: actions/subscriptions.php:164

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

-#. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:239
-msgid "Jabber"
+#. TRANS: Checkbox label for enabling IM messages for a profile in a subscriptions list.
+#: actions/subscriptions.php:229
+msgctxt "LABEL"
+msgid "IM"

 msgstr ""
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
 msgstr ""
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.

-#: actions/subscriptions.php:254
+#: actions/subscriptions.php:244

 msgid "SMS"
 msgstr ""
 
 msgid "SMS"
 msgstr ""
 

+#. TRANS: Title for all but the first page of notices with tags.
+#. TRANS: %1$s is the tag, %2$d is the page number.

 #: actions/tag.php:69
 #, php-format
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr ""
 
 #: actions/tag.php:69
 #, php-format
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr ""
 

-#: actions/tag.php:87
+#. TRANS: Link label for feed on "notices with tag" page.
+#. TRANS: %s is the tag the feed is for.
+#: 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 ""
 
 #, php-format
 msgid "Notice feed for tag %s (RSS 1.0)"
 msgstr ""
 

-#: actions/tag.php:93
+#. TRANS: Link label for feed on "notices with tag" page.
+#. TRANS: %s is the tag the feed is for.
+#: actions/tag.php:105

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

-#: actions/tag.php:99
+#. TRANS: Link label for feed on "notices with tag" page.
+#. TRANS: %s is the tag the feed is for.
+#: actions/tag.php:113

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

-#: actions/tagother.php:39
-msgid "No ID argument."
+#. TRANS: Client error displayed when trying to tag a user that cannot be tagged.
+#. TRANS: Client exception thrown trying to set a tag for a user that cannot be tagged.
+#. TRANS: Error displayed when trying to tag a user that cannot be tagged.
+#: actions/tagprofile.php:56 classes/Profile_tag.php:171 lib/command.php:440
+#: lib/command.php:499
+msgid "You cannot tag this user."
+msgstr ""
+
+#. TRANS: Title for list form when not on a profile page.
+#: actions/tagprofile.php:78
+msgid "List a profile"

 msgstr ""
 
 msgstr ""
 

-#: actions/tagother.php:65
+#. TRANS: Title for list form when on a profile page.
+#. TRANS: %s is a profile nickname.
+#: actions/tagprofile.php:82

 #, php-format
 #, php-format

-msgid "Tag %s"
+msgctxt "ADDTOLIST"
+msgid "List %s"
+msgstr ""
+
+#. TRANS: Title for list form when an error has occurred.
+#: actions/tagprofile.php:92
+msgctxt "TITLE"
+msgid "Error"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: H2 for user profile information.
-#: actions/tagother.php:77 lib/userprofile.php:76
+#. TRANS: Header in list form.
+#: actions/tagprofile.php:108

 msgid "User profile"
 msgstr ""
 
 msgid "User profile"
 msgstr ""
 

-#. TRANS: DT element on Authorise Subscription page.
-#. TRANS: DT element in area for user avatar.
-#: actions/tagother.php:81 actions/userauthorization.php:138
-#: lib/userprofile.php:108
-msgid "Photo"
+#. TRANS: Fieldset legend for list form.
+#: actions/tagprofile.php:151
+msgid "List user"

 msgstr ""
 
 msgstr ""
 

-#: actions/tagother.php:141
-msgid "Tag user"
+#. TRANS: Field label on list form.
+#: actions/tagprofile.php:162
+msgctxt "LABEL"
+msgid "Lists"

 msgstr ""
 
 msgstr ""
 

-#: actions/tagother.php:151
+#. TRANS: Field title on list form.
+#: actions/tagprofile.php:165

 msgid ""
 msgid ""

-"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
-"separated"
+"Lists for this user (letters, numbers, -, ., and _), comma- or space- "
+"separated."

 msgstr ""
 
 msgstr ""
 

-#: actions/tagother.php:178
-#, php-format
-msgid "Invalid tag: \"%s\""
+#. TRANS: Title for personal tag cloud section.
+#: actions/tagprofile.php:228 lib/personaltagcloudsection.php:56
+msgctxt "TITLE"
+msgid "Tags"

 msgstr ""
 
 msgstr ""
 

-#: actions/tagother.php:193
-msgid ""
-"You can only tag people you are subscribed to or who are subscribed to you."
+#. TRANS: Success message if lists are saved.
+#: actions/tagprofile.php:244
+msgid "Lists saved."

 msgstr ""
 
 msgstr ""
 

-#: actions/tagother.php:236
-msgid "Use this form to add tags to your subscribers or subscriptions."
+#. TRANS: Page notice.
+#: actions/tagprofile.php:260
+msgid "Use this form to add your subscribers or subscriptions to lists."

 msgstr ""
 
 msgstr ""
 

+#. TRANS: Client error when requesting a tag feed for a non-existing tag.

 #: actions/tagrss.php:35
 msgid "No such tag."
 msgstr ""
 #: actions/tagrss.php:35
 msgid "No such tag."
 msgstr ""


@@ -6110,29 +6995,107 @@ msgstr ""
 msgid "You haven't blocked that user."
 msgstr ""
 
 msgid "You haven't blocked that user."
 msgstr ""
 

+#. TRANS: Client error on page to unsilence a user when the to be unsandboxed user has not been sandboxed.

 #: actions/unsandbox.php:72
 msgid "User is not sandboxed."
 msgstr ""
 
 #: actions/unsandbox.php:72
 msgid "User is not sandboxed."
 msgstr ""
 

+#. TRANS: Client error on page to unsilence a user when the to be unsilenced user has not been silenced.

 #: actions/unsilence.php:72
 msgid "User is not silenced."
 msgstr ""
 
 #: actions/unsilence.php:72
 msgid "User is not silenced."
 msgstr ""
 

-#: actions/unsubscribe.php:77
-msgid "No profile ID in request."
-msgstr ""
-
-#: actions/unsubscribe.php:98
+#. TRANS: Page title for page to unsubscribe.
+#: actions/unsubscribe.php:102

 msgid "Unsubscribed"
 msgstr ""
 
 msgid "Unsubscribed"
 msgstr ""
 

-#: actions/updateprofile.php:64
+#. TRANS: Page title for form that allows unsubscribing from a list.
+#. TRANS: %1$s is a nickname, %2$s is a list, %3$s is a tagger nickname.
+#: actions/unsubscribepeopletag.php:127

 #, php-format
 #, php-format

+msgid "%1$s unsubscribed from list %2$s by %3$s"
+msgstr ""
+
+#. TRANS: Title of URL settings tab in profile settings.
+#: actions/urlsettings.php:57
+msgid "URL settings"
+msgstr ""
+
+#. TRANS: Instructions for tab "Other" in user profile settings.
+#: actions/urlsettings.php:68
+msgid "Manage various other options."
+msgstr ""
+
+#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
+#. TRANS: user's profile settings. This message has one space at the beginning. Use your
+#. TRANS: language's word separator here if it has one (most likely a single space).
+#: actions/urlsettings.php:110
+msgid " (free service)"
+msgstr ""
+
+#. TRANS: Default value for URL shortening settings.
+#: actions/urlsettings.php:117
+msgid "[none]"
+msgstr ""
+
+#. TRANS: Default value for URL shortening settings.
+#: actions/urlsettings.php:119
+msgid "[internal]"
+msgstr ""
+
+#. TRANS: Label for dropdown with URL shortener services.
+#: actions/urlsettings.php:126
+msgid "Shorten URLs with"
+msgstr ""
+
+#. TRANS: Tooltip for for dropdown with URL shortener services.
+#: actions/urlsettings.php:128
+msgid "Automatic shortening service to use."
+msgstr ""
+
+#. TRANS: Field label in URL settings in profile.
+#: actions/urlsettings.php:135
+msgid "URL longer than"
+msgstr ""
+
+#. TRANS: Field title in URL settings in profile.
+#: actions/urlsettings.php:139
+msgid "URLs longer than this will be shortened, 0 means always shorten."
+msgstr ""
+
+#. TRANS: Field label in URL settings in profile.
+#: actions/urlsettings.php:144
+msgid "Text longer than"
+msgstr ""
+
+#. TRANS: Field title in URL settings in profile.
+#: actions/urlsettings.php:148

 msgid ""
 msgid ""

-"Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
+"URLs in notices longer than this will be shortened, 0 means always shorten."

 msgstr ""
 
 msgstr ""
 

-#. TRANS: User admin panel title
+#. TRANS: Form validation error for form "Other settings" in user profile.
+#: actions/urlsettings.php:180
+msgid "URL shortening service is too long (maximum 50 characters)."
+msgstr ""
+
+#. TRANS: Client exception thrown when the maximum URL settings value is invalid in profile URL settings.
+#: actions/urlsettings.php:188
+msgid "Invalid number for maximum URL length."
+msgstr ""
+
+#. TRANS: Client exception thrown when the maximum notice length settings value is invalid in profile URL settings.
+#: actions/urlsettings.php:195
+msgid "Invalid number for maximum notice length."
+msgstr ""
+
+#. TRANS: Server exception thrown in profile URL settings when preferences could not be saved.
+#: actions/urlsettings.php:241
+msgid "Error saving user URL shortening preferences."
+msgstr ""
+
+#. TRANS: User admin panel title.

 #: actions/useradminpanel.php:58
 msgctxt "TITLE"
 msgid "User"
 #: actions/useradminpanel.php:58
 msgctxt "TITLE"
 msgid "User"


@@ -6160,227 +7123,89 @@ msgstr ""
 msgid "Invalid default subscripton: \"%1$s\" is not a user."
 msgstr ""
 
 msgid "Invalid default subscripton: \"%1$s\" is not a user."
 msgstr ""
 

-#. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:215 lib/accountsettingsaction.php:106
+#. TRANS: Fieldset legend in user administration panel.
+#: actions/useradminpanel.php:217
+msgctxt "LEGEND"

 msgid "Profile"
 msgstr ""
 
 #. TRANS: Field label in user admin panel for setting the character limit for the bio field.
 msgid "Profile"
 msgstr ""
 
 #. TRANS: Field label in user admin panel for setting the character limit for the bio field.

-#: actions/useradminpanel.php:220
+#: actions/useradminpanel.php:222

 msgid "Bio Limit"
 msgstr ""
 
 #. TRANS: Tooltip in user admin panel for setting the character limit for the bio field.
 msgid "Bio Limit"
 msgstr ""
 
 #. TRANS: Tooltip in user admin panel for setting the character limit for the bio field.

-#: actions/useradminpanel.php:222
+#: actions/useradminpanel.php:224

 msgid "Maximum length of a profile bio in characters."
 msgstr ""
 
 #. TRANS: Form legend in user admin panel.
 msgid "Maximum length of a profile bio in characters."
 msgstr ""
 
 #. TRANS: Form legend in user admin panel.

-#: actions/useradminpanel.php:231
+#: actions/useradminpanel.php:233

 msgid "New users"
 msgstr ""
 
 #. TRANS: Field label in user admin panel for setting new user welcome text.
 msgid "New users"
 msgstr ""
 
 #. TRANS: Field label in user admin panel for setting new user welcome text.

-#: actions/useradminpanel.php:236
+#: actions/useradminpanel.php:238

 msgid "New user welcome"
 msgstr ""
 
 #. TRANS: Tooltip in user admin panel for setting new user welcome text.
 msgid "New user welcome"
 msgstr ""
 
 #. TRANS: Tooltip in user admin panel for setting new user welcome text.

-#: actions/useradminpanel.php:238
+#: actions/useradminpanel.php:240

 msgid "Welcome text for new users (maximum 255 characters)."
 msgstr ""
 
 #. TRANS: Field label in user admin panel for setting default subscription for new users.
 msgid "Welcome text for new users (maximum 255 characters)."
 msgstr ""
 
 #. TRANS: Field label in user admin panel for setting default subscription for new users.

-#: actions/useradminpanel.php:244
+#: actions/useradminpanel.php:246

 msgid "Default subscription"
 msgstr ""
 
 #. TRANS: Tooltip in user admin panel for setting default subscription for new users.
 msgid "Default subscription"
 msgstr ""
 
 #. TRANS: Tooltip in user admin panel for setting default subscription for new users.

-#: actions/useradminpanel.php:246
+#: actions/useradminpanel.php:248

 msgid "Automatically subscribe new users to this user."
 msgstr ""
 
 #. TRANS: Form legend in user admin panel.
 msgid "Automatically subscribe new users to this user."
 msgstr ""
 
 #. TRANS: Form legend in user admin panel.

-#: actions/useradminpanel.php:256
+#: actions/useradminpanel.php:258

 msgid "Invitations"
 msgstr ""
 
 #. TRANS: Field label for checkbox in user admin panel for allowing users to invite friend using site e-mail.
 msgid "Invitations"
 msgstr ""
 
 #. TRANS: Field label for checkbox in user admin panel for allowing users to invite friend using site e-mail.

-#: actions/useradminpanel.php:262
+#: actions/useradminpanel.php:264

 msgid "Invitations enabled"
 msgstr ""
 
 #. TRANS: Tooltip for checkbox in user admin panel for allowing users to invite friend using site e-mail.
 msgid "Invitations enabled"
 msgstr ""
 
 #. TRANS: Tooltip for checkbox in user admin panel for allowing users to invite friend using site e-mail.

-#: actions/useradminpanel.php:265
+#: actions/useradminpanel.php:267

 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.
-#: actions/useradminpanel.php:302
+#. TRANS: Button title to save user settings in user admin panel.
+#: actions/useradminpanel.php:304

 msgid "Save user settings."
 msgstr ""
 
 msgid "Save user settings."
 msgstr ""
 

-#. TRANS: Page title.
-#: actions/userauthorization.php:109
-msgid "Authorize subscription"
-msgstr ""
-
-#. TRANS: Page notice on "Auhtorize subscription" page.
-#: actions/userauthorization.php:115
-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: DT element on Authorise Subscription page where license is displayed.
-#. TRANS: Menu item for site administration
-#: actions/userauthorization.php:207 actions/version.php:167
-#: lib/adminpanelaction.php:403
-msgid "License"
-msgstr ""
-
-#. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:229
-msgctxt "BUTTON"
-msgid "Accept"
-msgstr ""
-
-#. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:231
-msgid "Subscribe to this user."
-msgstr ""
-
-#. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:233
-msgctxt "BUTTON"
-msgid "Reject"
-msgstr ""
-
-#. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:235
-msgid "Reject this subscription."
-msgstr ""
-
-#. TRANS: Client error displayed for an empty authorisation request.
-#: actions/userauthorization.php:248
-msgid "No authorization request!"
-msgstr ""
-
-#. TRANS: Accept message header from Authorise subscription page.
-#: actions/userauthorization.php:271
-msgid "Subscription authorized"
-msgstr ""
-
-#: actions/userauthorization.php:274
-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:285
-msgid "Subscription rejected"
-msgstr ""
-
-#: actions/userauthorization.php:288
-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:325
-#, 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:332
-#, 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:340
-#, 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:358
-#, php-format
-msgid "Profile URL \"%s\" is for a local user."
-msgstr ""
-
-#. 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/userauthorization.php:368
-#, php-format
-msgid ""
-"Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
-"\"."
-msgstr ""
-
-#. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:378
-#, 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:385
-#, 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:392
-#, php-format
-msgid "Wrong image type for avatar URL \"%s\"."
-msgstr ""
-
-#. TRANS: Page title for profile design page.
-#: actions/userdesignsettings.php:74 lib/designsettings.php:63
-msgid "Profile design"
-msgstr ""
-
-#. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:84 lib/designsettings.php:74
-msgid ""
-"Customize the way your profile looks with a background image and a colour "
-"palette of your choice."
-msgstr ""
-
-#: actions/userdesignsettings.php:272
-msgid "Enjoy your hotdog!"
-msgstr ""
-
-#. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
-#: actions/usergroups.php:66
+#. 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

 #, php-format
 msgid "%1$s groups, page %2$d"
 msgstr ""
 
 #, php-format
 msgid "%1$s groups, page %2$d"
 msgstr ""
 

-#: actions/usergroups.php:132
+#. TRANS: Link text on group page to search for groups.
+#: actions/usergroups.php:131

 msgid "Search for more groups"
 msgstr ""
 
 msgid "Search for more groups"
 msgstr ""
 

-#: actions/usergroups.php:159
+#. TRANS: Text on group page for a user that is not a member of any group.
+#. TRANS: %s is a user nickname.
+#: actions/usergroups.php:160

 #, php-format
 msgid "%s is not a member of any group."
 msgstr ""
 
 #, php-format
 msgid "%s is not a member of any group."
 msgstr ""
 

-#: actions/usergroups.php:164
+#. TRANS: Text on group page for a user that is not a member of any group. This message contains
+#. TRANS: a Markdown link in the form [link text](link) and a variable that should not be changed.
+#: actions/usergroups.php:167

 #, php-format
 msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
 msgstr ""
 #, php-format
 msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
 msgstr ""


@@ -6390,104 +7215,144 @@ 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:97 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!"
 msgstr ""
 
 #: lib/atomusernoticefeed.php:95
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr ""
 

-#: actions/version.php:75
+#. TRANS: Title for version page. %s is the StatusNet version.
+#: actions/version.php:73

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

-#: actions/version.php:155
+#. TRANS: Content part of StatusNet version page.
+#. TRANS: %1$s is the engine name (StatusNet) and %2$s is the StatusNet version.
+#: actions/version.php:151

 #, php-format
 msgid ""
 #, 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 ""
 

-#: actions/version.php:163
+#. TRANS: Header for StatusNet contributors section on the version page.
+#: actions/version.php:161

 msgid "Contributors"
 msgstr ""
 
 msgid "Contributors"
 msgstr ""
 

-#: actions/version.php:170
+#. TRANS: Header for StatusNet license section on the version page.
+#: actions/version.php:167
+msgid "License"
+msgstr ""
+
+#. TRANS: Content part of StatusNet version page.
+#: 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 ""
 
 msgstr ""
 

-#: actions/version.php:176
+#. TRANS: Content part of StatusNet version page.
+#: 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 ""
 
 msgstr ""
 

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

 #, php-format
 msgid ""
 "You should have received a copy of the GNU Affero General Public License "
 "along with this program.  If not, see %s."
 msgstr ""
 
 #, php-format
 msgid ""
 "You should have received a copy of the GNU Affero General Public License "
 "along with this program.  If not, see %s."
 msgstr ""
 

-#: actions/version.php:191
+#. TRANS: Header for StatusNet plugins section on the version page.
+#: actions/version.php:196

 msgid "Plugins"
 msgstr ""
 
 msgid "Plugins"
 msgstr ""
 

-#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:898
+#. TRANS: Column header for plugins table on version page.
+#: actions/version.php:203
+msgctxt "HEADER"
+msgid "Name"
+msgstr ""
+
+#. TRANS: Column header for plugins table on version page.
+#: actions/version.php:205
+msgctxt "HEADER"

 msgid "Version"
 msgstr ""
 
 msgid "Version"
 msgstr ""
 

-#: actions/version.php:199
+#. TRANS: Column header for plugins table on version page.
+#: actions/version.php:207
+msgctxt "HEADER"

 msgid "Author(s)"
 msgstr ""
 
 msgid "Author(s)"
 msgstr ""
 

+#. TRANS: Column header for plugins table on version page.
+#: actions/version.php:209
+msgctxt "HEADER"
+msgid "Description"
+msgstr ""
+

 #. TRANS: Activity title when marking a notice as favorite.
 #. TRANS: Activity title when marking a notice as favorite.

-#: classes/Fave.php:164
+#: 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:167
+#: 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."


@@ -6496,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."


@@ -6504,156 +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 ""
 
 msgid "Invalid filename."
 msgstr ""
 

-#. TRANS: Exception thrown when joining a group fails.
-#: classes/Group_member.php:51
-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:64
-msgid "Not part of group."
-msgstr ""
-
-#. TRANS: Exception thrown when trying to leave a group fails.
-#: classes/Group_member.php:72
-msgid "Group leave failed."
-msgstr ""
-

 #. TRANS: Exception thrown providing an invalid profile ID.
 #. TRANS: %s is the invalid profile ID.
 #. TRANS: Exception thrown providing an invalid profile ID.
 #. TRANS: %s is the invalid profile ID.

-#: classes/Group_member.php:85
+#: 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_member.php:98
+#: classes/Group_join_queue.php:79 classes/Group_member.php:130

 #, php-format
 msgid "Group ID %s is invalid."
 msgstr ""
 
 #, php-format
 msgid "Group ID %s is invalid."
 msgstr ""
 

+#. TRANS: Exception thrown when joining a group fails.
+#: 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.
+#: classes/Group_member.php:96
+msgid "Not part of group."
+msgstr ""
+
+#. TRANS: Exception thrown when trying to leave a group fails.
+#: classes/Group_member.php:104
+msgid "Group leave failed."
+msgstr ""
+

 #. TRANS: Activity title.
 #. TRANS: Activity title.

-#: classes/Group_member.php:147 lib/joinform.php:114
+#: 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:151
+#: 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:542
+#: 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:98
+#: 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:199
+#: classes/Notice.php:274

 #, php-format
 #, php-format

-msgid "Database error inserting hashtag: %s"
+msgid "Database error inserting hashtag: %s."

 msgstr ""
 
 #. TRANS: Client exception thrown if a notice contains too many characters.
 msgstr ""
 
 #. TRANS: Client exception thrown if a notice contains too many characters.

-#: classes/Notice.php:279
+#: 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:284
+#: 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:290
+#: 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:297
+#: 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:305
+#: classes/Notice.php:386

 msgid "You are banned from posting notices on this site."
 msgstr ""
 
 msgid "You are banned from posting notices on this site."
 msgstr ""
 

+#. TRANS: Client exception thrown in notice when trying to repeat a missing or deleted notice.
+#: classes/Notice.php:433
+msgid "Cannot repeat; original notice is missing or deleted."
+msgstr ""
+
+#. TRANS: Client error displayed when trying to repeat an own notice.
+#: classes/Notice.php:438
+msgid "You cannot repeat your own notice."
+msgstr ""
+
+#. TRANS: Client error displayed when trying to repeat a non-public notice.
+#: classes/Notice.php:444
+msgid "Cannot repeat a private notice."
+msgstr ""
+
+#. TRANS: Client error displayed when trying to repeat a notice you cannot access.
+#: 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.
+#: 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).
+#: 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.
 #. TRANS: Server exception thrown when a notice cannot be saved.
 #. TRANS: Server exception thrown when a notice cannot be updated.

-#: classes/Notice.php:372 classes/Notice.php:399
+#: 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:929
+#: 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:1028
+#: classes/Notice.php:1235

 msgid "Problem saving group inbox."
 msgstr ""
 
 msgid "Problem saving group inbox."
 msgstr ""
 

-#. TRANS: Server exception thrown when a reply cannot be saved.
-#. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1142
-#, php-format
-msgid "Could not save reply for %1$d, %2$d."
-msgstr ""
-

 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.

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

 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr ""
 
 #, 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
 #. TRANS: Full name of a profile or group followed by nickname in parens

-#: classes/Profile.php:172 classes/User_group.php:242
+#: 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)"


@@ -6661,109 +7559,181 @@ 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:775
+#: 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:784
+#: classes/Profile.php:1106

 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
 
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
 

+#. TRANS: Server exception.
+#: 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.
+#: classes/Profile_list.php:630
+msgid "No tagger specified."
+msgstr ""
+
+#. TRANS: Server exception saving new tag without having a tag specified.
+#: classes/Profile_list.php:635
+msgid "No tag specified."
+msgstr ""
+
+#. TRANS: Server exception saving new tag.
+#: classes/Profile_list.php:673
+msgid "Could not create profile tag."
+msgstr ""
+
+#. TRANS: Server exception saving new tag.
+#: classes/Profile_list.php:683
+msgid "Could not set profile tag URI."
+msgstr ""
+
+#. TRANS: Server exception saving new tag.
+#: classes/Profile_list.php:700
+msgid "Could not set profile tag mainpage."
+msgstr ""
+
+#. TRANS: Client exception thrown trying to set more tags than allowed.
+#: classes/Profile_tag.php:181
+#, php-format
+msgid ""
+"You already have created %d or more tags which is the maximum allowed number "
+"of tags. Try using or deleting some existing tags."
+msgstr ""
+
+#. TRANS: Client exception thrown when trying to add more people than allowed to a list.
+#: classes/Profile_tag.php:195
+#, 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."
+msgstr ""
+
+#. TRANS: Exception thrown when inserting a list subscription in the database fails.
+#: classes/Profile_tag_subscription.php:77
+msgid "Adding list subscription failed."
+msgstr ""
+
+#. TRANS: Exception thrown when deleting a list subscription from the database fails.
+#: classes/Profile_tag_subscription.php:104
+msgid "Removing list subscription failed."
+msgstr ""
+

 #. TRANS: Exception thrown when a right for a non-existing user profile is checked.
 #: classes/Remote_profile.php:54
 msgid "Missing profile."
 msgstr ""
 
 #. TRANS: Exception thrown when a tag cannot be saved.
 #. TRANS: Exception thrown when a right for a non-existing user profile is checked.
 #: classes/Remote_profile.php:54
 msgid "Missing profile."
 msgstr ""
 
 #. TRANS: Exception thrown when a tag cannot be saved.

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

-#: classes/Subscription.php:77 lib/oauthstore.php:482
+#: 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:82
+#: 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:87
+#: 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:176
+#: 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:183
+#: 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:211
-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:223
+#: classes/Subscription.php:236

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

-#. TRANS: Activity tile when subscribing to another person.
-#: classes/Subscription.php:265
+#. TRANS: Activity title when subscribing to another person.
+#: 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.
 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:268
+#: 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:395
+#: classes/User.php:466

 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr ""
 
 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr ""
 

+#. TRANS: Exception thrown when trying view "repeated to me".
+#: classes/User.php:865
+msgid "Not implemented since inbox change."
+msgstr ""
+

 #. TRANS: Server exception.
 #. TRANS: Server exception.

-#: classes/User.php:918
+#: 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:922
+#: 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:522
+#: 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:532
+#: 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:555
+#: 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:570
+#: classes/User_group.php:656

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


@@ -6788,327 +7758,160 @@ msgstr ""
 msgid "No AtomPub API service for %s."
 msgstr ""
 
 msgid "No AtomPub API service for %s."
 msgstr ""
 

-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:104
-msgid "Change your profile settings"
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+#: lib/accountprofileblock.php:120 lib/accountprofileblock.php:135
+msgid "User actions"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:111
-msgid "Upload an avatar"
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+#: lib/accountprofileblock.php:124
+msgid "User deletion in progress..."

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:118
-msgid "Change your password"
+#. TRANS: Link title for link on user profile.
+#: lib/accountprofileblock.php:148
+msgid "Edit profile settings."

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:125
-msgid "Change email handling"
+#. TRANS: Link text for link on user profile.
+#: lib/accountprofileblock.php:150 lib/groupprofileblock.php:122
+msgctxt "BUTTON"
+msgid "Edit"
+msgstr ""
+
+#. TRANS: Link title for link on user profile.
+#: lib/accountprofileblock.php:177
+msgid "Send a direct message to this user."
+msgstr ""
+
+#. TRANS: Link text for link on user profile.
+#: lib/accountprofileblock.php:179
+msgctxt "BUTTON"
+msgid "Message"
+msgstr ""
+
+#. TRANS: Label text on user profile to select a user role.
+#: lib/accountprofileblock.php:221
+msgid "Moderate"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:132
-msgid "Design your profile"
+#. TRANS: Label text on user profile to select a user role.
+#: lib/accountprofileblock.php:260
+msgid "User role"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:139
-msgid "Other options"
+#. TRANS: Role that can be set for a user profile.
+#: lib/accountprofileblock.php:263
+msgctxt "role"
+msgid "Administrator"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Link description in user account settings menu.
-#: lib/accountsettingsaction.php:141
-msgid "Other"
+#. TRANS: Role that can be set for a user profile.
+#: lib/accountprofileblock.php:265
+msgctxt "role"
+msgid "Moderator"

 msgstr ""
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 msgstr ""
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.

-#: lib/action.php:161
+#: lib/action.php:168

 #, php-format
 msgid "%1$s - %2$s"
 msgstr ""
 
 #. TRANS: Page title for a page without a title set.
 #, php-format
 msgid "%1$s - %2$s"
 msgstr ""
 
 #. TRANS: Page title for a page without a title set.

-#: lib/action.php:177
+#: lib/action.php:184

 msgid "Untitled page"
 msgstr ""
 
 #. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
 msgid "Untitled page"
 msgstr ""
 
 #. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.

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

 msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr ""
 
 msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr ""
 

-#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:544
-msgid "Primary site navigation"
+#. TRANS: Inline reply form submit button: submits a reply comment.
+#: lib/action.php:366
+msgctxt "BUTTON"
+msgid "Reply"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Tooltip for main menu option "Personal".
-#: lib/action.php:550
-msgctxt "TOOLTIP"
-msgid "Personal profile and friends timeline"
+#. TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form.
+#. TRANS: Field label for reply mini form.
+#: lib/action.php:369 lib/threadednoticelist.php:412
+msgid "Write a reply..."

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Main menu option when logged in for access to personal profile and friends timeline.
-#. TRANS: Personal group navigation menu option when logged in for viewing timeline of self and friends.
-#: lib/action.php:553 lib/personalgroupnav.php:100
-msgctxt "MENU"
-msgid "Personal"
+#. TRANS: Tab on the notice form.
+#: lib/action.php:627
+msgctxt "TAB"
+msgid "Status"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Tooltip for main menu option "Account".
-#: lib/action.php:555
-msgctxt "TOOLTIP"
-msgid "Change your email, avatar, password, profile"
+#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
+#. TRANS: Text between [] is a link description, text between () is the link itself.
+#. TRANS: Make sure there is no whitespace between "]" and "(".
+#. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
+#: lib/action.php:1003
+#, php-format
+msgid ""
+"**%%site.name%%** is a microblogging service brought to you by [%%site."
+"broughtby%%](%%site.broughtbyurl%%)."

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Main menu option when logged in for access to user settings.
-#: lib/action.php:558
-msgid "Account"
+#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
+#: lib/action.php:1006
+#, php-format
+msgid "**%%site.name%%** is a microblogging service."

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Tooltip for main menu option "Services".
-#: lib/action.php:560
-msgctxt "TOOLTIP"
-msgid "Connect to services"
+#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
+#. TRANS: Make sure there is no whitespace between "]" and "(".
+#. TRANS: Text between [] is a link description, text between () is the link itself.
+#. TRANS: %s is the version of StatusNet that is being used.
+#: lib/action.php:1013
+#, php-format
+msgid ""
+"It runs the [StatusNet](http://status.net/) microblogging software, version %"
+"s, available under the [GNU Affero General Public License](http://www.fsf."
+"org/licensing/licenses/agpl-3.0.html)."

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services.
-#: lib/action.php:563
-msgid "Connect"
+#. TRANS: Content license displayed when license is set to 'private'.
+#. TRANS: %1$s is the site name.
+#: lib/action.php:1031
+#, php-format
+msgid "Content and data of %1$s are private and confidential."

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Tooltip for menu option "Admin".
-#: lib/action.php:566
-msgctxt "TOOLTIP"
-msgid "Change site configuration"
+#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
+#. TRANS: %1$s is the copyright owner.
+#: lib/action.php:1038
+#, php-format
+msgid "Content and data copyright by %1$s. All rights reserved."

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Main menu option when logged in and site admin for access to site configuration.
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/action.php:569 lib/groupnav.php:117
-msgctxt "MENU"
-msgid "Admin"
+#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
+#: lib/action.php:1042
+msgid "Content and data copyright by contributors. All rights reserved."

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Tooltip for main menu option "Invite".
-#: lib/action.php:573
+#. TRANS: license message in footer.
+#. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
+#: lib/action.php:1074

 #, php-format
 #, php-format

-msgctxt "TOOLTIP"
-msgid "Invite friends and colleagues to join you on %s"
+msgid "All %1$s content and data are available under the %2$s license."

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users.
-#: lib/action.php:576
-msgctxt "MENU"
-msgid "Invite"
-msgstr ""
-
-#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:582
-msgctxt "TOOLTIP"
-msgid "Logout from the site"
-msgstr ""
-
-#. TRANS: Main menu option when logged in to log out the current user.
-#: lib/action.php:585
-msgctxt "MENU"
-msgid "Logout"
-msgstr ""
-
-#. TRANS: Tooltip for main menu option "Register".
-#: lib/action.php:590
-msgctxt "TOOLTIP"
-msgid "Create an account"
-msgstr ""
-
-#. TRANS: Main menu option when not logged in to register a new account.
-#. TRANS: Menu item for registering with the StatusNet site.
-#: lib/action.php:593 lib/logingroupnav.php:85
-msgctxt "MENU"
-msgid "Register"
-msgstr ""
-
-#. TRANS: Tooltip for main menu option "Login".
-#: lib/action.php:596
-msgctxt "TOOLTIP"
-msgid "Login to the site"
-msgstr ""
-
-#. TRANS: Main menu option when not logged in to log in.
-#. TRANS: Menu item for logging in to the StatusNet site.
-#: lib/action.php:599 lib/logingroupnav.php:77
-msgctxt "MENU"
-msgid "Login"
-msgstr ""
-
-#. TRANS: Tooltip for main menu option "Help".
-#: lib/action.php:602
-msgctxt "TOOLTIP"
-msgid "Help me!"
-msgstr ""
-
-#. TRANS: Main menu option for help on the StatusNet site.
-#: lib/action.php:605
-msgctxt "MENU"
-msgid "Help"
-msgstr ""
-
-#. TRANS: Tooltip for main menu option "Search".
-#: lib/action.php:608
-msgctxt "TOOLTIP"
-msgid "Search for people or text"
-msgstr ""
-
-#. TRANS: Main menu option when logged in or when the StatusNet instance is not private.
-#: lib/action.php:611
-msgctxt "MENU"
-msgid "Search"
-msgstr ""
-
-#. TRANS: DT element for site notice. String is hidden in default CSS.
-#. TRANS: Menu item for site administration
-#: lib/action.php:633 lib/adminpanelaction.php:387
-msgid "Site notice"
-msgstr ""
-
-#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:700
-msgid "Local views"
-msgstr ""
-
-#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:770
-msgid "Page notice"
-msgstr ""
-
-#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:871
-msgid "Secondary site navigation"
-msgstr ""
-
-#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:877
-msgid "Help"
-msgstr ""
-
-#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:880
-msgid "About"
-msgstr ""
-
-#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:883
-msgid "FAQ"
-msgstr ""
-
-#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:888
-msgid "TOS"
-msgstr ""
-
-#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:892
-msgid "Privacy"
-msgstr ""
-
-#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:895
-msgid "Source"
-msgstr ""
-
-#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:902
-msgid "Contact"
-msgstr ""
-
-#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:905
-msgid "Badge"
-msgstr ""
-
-#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:934
-msgid "StatusNet software license"
-msgstr ""
-
-#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#. TRANS: Text between [] is a link description, text between () is the link itself.
-#. TRANS: Make sure there is no whitespace between "]" and "(".
-#. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:941
-#, php-format
-msgid ""
-"**%%site.name%%** is a microblogging service brought to you by [%%site."
-"broughtby%%](%%site.broughtbyurl%%)."
-msgstr ""
-
-#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:944
-#, php-format
-msgid "**%%site.name%%** is a microblogging service."
-msgstr ""
-
-#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#. 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:951
-#, php-format
-msgid ""
-"It runs the [StatusNet](http://status.net/) microblogging software, version %"
-"s, available under the [GNU Affero General Public License](http://www.fsf."
-"org/licensing/licenses/agpl-3.0.html)."
-msgstr ""
-
-#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:967
-msgid "Site content license"
-msgstr ""
-
-#. TRANS: Content license displayed when license is set to 'private'.
-#. TRANS: %1$s is the site name.
-#: lib/action.php:974
-#, 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:981
-#, 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:985
-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:1017
-#, php-format
-msgid "All %1$s content and data are available under the %2$s license."
-msgstr ""
-
-#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1353
-msgid "Pagination"
-msgstr ""
-
-#. TRANS: Pagination message to go to a page displaying information more in the
-#. TRANS: present than the currently displayed information.
-#: lib/action.php:1364
-msgid "After"
+#. TRANS: Pagination message to go to a page displaying information more in the
+#. TRANS: present than the currently displayed information.
+#: 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.
 msgstr ""
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.

-#: lib/action.php:1374
+#: lib/action.php:1437

 msgid "Before"
 msgstr ""
 
 msgid "Before"
 msgstr ""
 


@@ -7124,57 +7927,58 @@ 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 ""
 
 msgid "Cannot force subscription for untrusted user."
 msgstr ""
 

-#. TRANS: Client exception thrown when trying to for a remote user to subscribe.
-#: lib/activityimporter.php:117
+#. TRANS: Client exception thrown when trying to force a remote user to subscribe.
+#: 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:201
+#: 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:207
+#: 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:223
+#: lib/activityimporter.php:214

 #, php-format
 msgid "No content for notice %s."
 msgstr ""
 
 #, php-format
 msgid "No content for notice %s."
 msgstr ""
 

-#: lib/activitymover.php:84
+#. TRANS: Exception thrown if a non-existing user is provided. %s is a user ID.
+#: lib/activitymover.php:85

 #, php-format
 #, php-format

-msgid "No such user %s."
+msgid "No such user \"%s\"."

 msgstr ""
 
 #. TRANS: Client exception thrown when post to collection fails with a 400 status.
 msgstr ""
 
 #. TRANS: Client exception thrown when post to collection fails with a 400 status.


@@ -7190,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 ""
 


@@ -7224,75 +8028,117 @@ 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."
+#. TRANS: Header in administrator navigation panel.
+#: lib/adminpanelnav.php:66
+msgctxt "HEADER"
+msgid "Home"
+msgstr ""
+
+#. TRANS: Header in administrator navigation panel.
+#: lib/adminpanelnav.php:84
+msgctxt "HEADER"
+msgid "Admin"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:337
+#. TRANS: Menu item title in administrator navigation panel.
+#: lib/adminpanelnav.php:91

 msgid "Basic site configuration"
 msgstr ""
 
 msgid "Basic site configuration"
 msgstr ""
 

-#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:339
+#. TRANS: Menu item in administrator navigation panel.
+#: lib/adminpanelnav.php:93

 msgctxt "MENU"
 msgid "Site"
 msgstr ""
 
 msgctxt "MENU"
 msgid "Site"
 msgstr ""
 

-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:345
-msgid "Design configuration"
+#. TRANS: Menu item title in administrator navigation panel.
+#: lib/adminpanelnav.php:99
+msgid "User configuration"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Menu item for site administration
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/adminpanelaction.php:347 lib/groupnav.php:135
+#. TRANS: Menu item in administrator navigation panel.
+#: lib/adminpanelnav.php:101

 msgctxt "MENU"
 msgctxt "MENU"

-msgid "Design"
+msgid "User"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:353
-msgid "User configuration"
+#. TRANS: Menu item title in administrator navigation panel.
+#: lib/adminpanelnav.php:107
+msgid "Access configuration"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:122
-msgid "User"
+#. TRANS: Menu item in administrator navigation panel.
+#: lib/adminpanelnav.php:109
+msgctxt "MENU"
+msgid "Access"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:361
-msgid "Access configuration"
+#. TRANS: Menu item title in administrator navigation panel.
+#: lib/adminpanelnav.php:115
+msgid "Paths configuration"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:369
-msgid "Paths configuration"
+#. TRANS: Menu item in administrator navigation panel.
+#: lib/adminpanelnav.php:117
+msgctxt "MENU"
+msgid "Paths"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:377
+#. TRANS: Menu item title in administrator navigation panel.
+#: lib/adminpanelnav.php:123

 msgid "Sessions configuration"
 msgstr ""
 
 msgid "Sessions configuration"
 msgstr ""
 

-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:385
+#. TRANS: Menu item in administrator navigation panel.
+#: lib/adminpanelnav.php:125
+msgctxt "MENU"
+msgid "Sessions"
+msgstr ""
+
+#. TRANS: Menu item title in administrator navigation panel.
+#: lib/adminpanelnav.php:131

 msgid "Edit site notice"
 msgstr ""
 
 msgid "Edit site notice"
 msgstr ""
 

-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:393
+#. TRANS: Menu item in administrator navigation panel.
+#: lib/adminpanelnav.php:133
+msgctxt "MENU"
+msgid "Site notice"
+msgstr ""
+
+#. TRANS: Menu item title in administrator navigation panel.
+#: lib/adminpanelnav.php:139

 msgid "Snapshots configuration"
 msgstr ""
 
 msgid "Snapshots configuration"
 msgstr ""
 

-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:401
+#. TRANS: Menu item in administrator navigation panel.
+#: lib/adminpanelnav.php:141
+msgctxt "MENU"
+msgid "Snapshots"
+msgstr ""
+
+#. TRANS: Menu item title in administrator navigation panel.
+#: lib/adminpanelnav.php:147

 msgid "Set site license"
 msgstr ""
 
 msgid "Set site license"
 msgstr ""
 

+#. TRANS: Menu item in administrator navigation panel.
+#: lib/adminpanelnav.php:149
+msgctxt "MENU"
+msgid "License"
+msgstr ""
+
+#. TRANS: Menu item title in administrator navigation panel.
+#: lib/adminpanelnav.php:155
+msgid "Plugins configuration"
+msgstr ""
+
+#. TRANS: Menu item in administrator navigation panel.
+#: lib/adminpanelnav.php:157
+msgctxt "MENU"
+msgid "Plugins"
+msgstr ""
+

 #. TRANS: Client error 401.
 #: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
 #. TRANS: Client error 401.
 #: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."


@@ -7303,63 +8149,30 @@ msgstr ""
 msgid "No application for that consumer key."
 msgstr ""
 
 msgid "No application for that consumer key."
 msgstr ""
 

-#: lib/apiauth.php:202 lib/apiauth.php:284
+#. TRANS: Authorization exception thrown when a user without API access tries to access the API.
+#: lib/apiauth.php:203 lib/apiauth.php:291

 msgid "Not allowed to use API."
 msgstr ""
 
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
 msgid "Not allowed to use API."
 msgstr ""
 
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.

-#: lib/apiauth.php:225
+#: 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:230
+#: 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:272 lib/apiauth.php:302
+#: 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:45
-msgid "Could not create anonymous consumer."
-msgstr ""
-
-#. TRANS: Server error displayed when trying to create an anynymous OAuth application.
-#: lib/apioauthstore.php:69
-msgid "Could not create anonymous OAuth application."
-msgstr ""
-
-#. TRANS: Exception thrown when no token association could be found.
-#: lib/apioauthstore.php:151
-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:209
-msgid "Could not issue access token."
-msgstr ""
-
-#: lib/apioauthstore.php:317
-msgid "Database error inserting OAuth application user."
-msgstr ""
-
-#: lib/apioauthstore.php:345
-msgid "Database error updating OAuth application user."
-msgstr ""
-
-#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-#: lib/apioauthstore.php:371
-msgid "Tried to revoke unknown token."
-msgstr ""
-
-#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-#: lib/apioauthstore.php:376
-msgid "Failed to delete revoked token."
+#. TRANS: Form input field label for application icon.
+#: lib/applicationeditform.php:177
+msgid "Icon"

 msgstr ""
 
 #. TRANS: Form guide.
 msgstr ""
 
 #. TRANS: Form guide.


@@ -7367,6 +8180,11 @@ msgstr ""
 msgid "Icon for this application"
 msgstr ""
 
 msgid "Icon for this application"
 msgstr ""
 

+#. TRANS: Form input field label for application name.
+#: lib/applicationeditform.php:190
+msgid "Name"
+msgstr ""
+

 #. TRANS: Form input field instructions.
 #. TRANS: %d is the number of available characters for the description.
 #: lib/applicationeditform.php:201
 #. TRANS: Form input field instructions.
 #. TRANS: %d is the number of available characters for the description.
 #: lib/applicationeditform.php:201


@@ -7381,6 +8199,15 @@ msgstr[1] ""
 msgid "Describe your application"
 msgstr ""
 
 msgid "Describe your application"
 msgstr ""
 

+#. TRANS: Form input field label.
+#. TRANS: Text area label on group edit form; contains description of group.
+#. TRANS: Field label for description of list.
+#. TRANS: Dropdown option for searching in profiles.
+#: lib/applicationeditform.php:208 lib/groupeditform.php:178
+#: lib/peopletageditform.php:151 lib/togglepeopletag.php:111
+msgid "Description"
+msgstr ""
+

 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:216
 msgid "URL of the homepage of this application"
 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:216
 msgid "URL of the homepage of this application"


@@ -7396,6 +8223,11 @@ msgstr ""
 msgid "Organization responsible for this application"
 msgstr ""
 
 msgid "Organization responsible for this application"
 msgstr ""
 

+#. TRANS: Form input field label.
+#: lib/applicationeditform.php:227
+msgid "Organization"
+msgstr ""
+

 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:234
 msgid "URL for the homepage of the organization"
 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:234
 msgid "URL for the homepage of the organization"


@@ -7438,42 +8270,69 @@ 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.
+#: lib/applicationeditform.php:357
+msgid "Save application changes."
+msgstr ""
+
+#. TRANS: Name for an anonymous application in application list.
+#: lib/applicationlist.php:241
+msgid "Unknown application"

 msgstr ""
 
 msgstr ""
 

-#: lib/applicationlist.php:247
+#. TRANS: Message has a leading space and a trailing space. Used in application list.
+#. TRANS: Before this message the application name is put, behind it the organisation that manages it.
+#: lib/applicationlist.php:250

 msgid " by "
 msgstr ""
 
 #. TRANS: Application access type
 msgid " by "
 msgstr ""
 
 #. TRANS: Application access type

-#: lib/applicationlist.php:260
+#: lib/applicationlist.php:263

 msgid "read-write"
 msgstr ""
 
 #. TRANS: Application access type
 msgid "read-write"
 msgstr ""
 
 #. TRANS: Application access type

-#: lib/applicationlist.php:262
+#: lib/applicationlist.php:265

 msgid "read-only"
 msgstr ""
 
 #. TRANS: Used in application list. %1$s is a modified date, %2$s is access type ("read-write" or "read-only")
 msgid "read-only"
 msgstr ""
 
 #. TRANS: Used in application list. %1$s is a modified date, %2$s is access type ("read-write" or "read-only")

-#: lib/applicationlist.php:268
+#: lib/applicationlist.php:271

 #, php-format
 msgid "Approved %1$s - \"%2$s\" access."
 msgstr ""
 
 #. TRANS: Access token in the application list.
 #. TRANS: %s are the first 7 characters of the access token.
 #, php-format
 msgid "Approved %1$s - \"%2$s\" access."
 msgstr ""
 
 #. TRANS: Access token in the application list.
 #. TRANS: %s are the first 7 characters of the access token.

-#: lib/applicationlist.php:282
+#: lib/applicationlist.php:286

 #, php-format
 msgid "Access token starting with: %s"
 msgstr ""
 
 #, php-format
 msgid "Access token starting with: %s"
 msgstr ""
 

-#. TRANS: Button label
-#: lib/applicationlist.php:298
+#. TRANS: Button label in application list to revoke access to user data.
+#: lib/applicationlist.php:302

 msgctxt "BUTTON"
 msgid "Revoke"
 msgstr ""
 
 msgctxt "BUTTON"
 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."
 msgstr ""
 #: lib/atom10feed.php:113
 msgid "Author element must contain a name element."
 msgstr ""


@@ -7483,18 +8342,21 @@ msgstr ""
 msgid "Do not use this method!"
 msgstr ""
 
 msgid "Do not use this method!"
 msgstr ""
 

-#. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:293
-msgid "Author"
+#. TRANS: Title in atom list notice feed. %1$s is a list name, %2$s is a tagger's nickname.
+#: lib/atomlistnoticefeed.php:65
+#, php-format
+msgid "Timeline for people in list %1$s by %2$s"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:307
-msgid "Provider"
+#. TRANS: Message is used as a subtitle in atom list notice feed.
+#. TRANS: %1$s is a tagger's nickname, %2$s is a list name, %3$s is a site name.
+#: lib/atomlistnoticefeed.php:72
+#, php-format
+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 ""
 


@@ -7523,23 +8385,36 @@ msgstr ""
 msgid "Block this user"
 msgstr ""
 
 msgid "Block this user"
 msgstr ""
 

+#. TRANS: Submit button text on form to cancel group join request.
+#: lib/cancelgroupform.php:115
+msgctxt "BUTTON"
+msgid "Cancel join request"
+msgstr ""
+
+#. TRANS: Button text for form action to cancel a subscription request.
+#: lib/cancelsubscriptionform.php:122
+msgctxt "BUTTON"
+msgid "Cancel subscription request"
+msgstr ""
+

 #. TRANS: Title for command results.
 #. TRANS: Title for command results.

-#: lib/channel.php:160 lib/channel.php:181
+#: lib/channel.php:104 lib/channel.php:125

 msgid "Command results"
 msgstr ""
 
 #. TRANS: Title for command results.
 msgid "Command results"
 msgstr ""
 
 #. TRANS: Title for command results.

-#: lib/channel.php:194
+#: lib/channel.php:138

 msgid "AJAX error"
 msgstr ""
 
 #. TRANS: E-mail subject when a command has completed.
 msgid "AJAX error"
 msgstr ""
 
 #. TRANS: E-mail subject when a command has completed.

-#: lib/channel.php:233 lib/mailhandler.php:143
+#. TRANS: E-mail subject for reply to an e-mail command.
+#: lib/channel.php:177 lib/mailhandler.php:147

 msgid "Command complete"
 msgstr ""
 
 #. TRANS: E-mail subject when a command has failed.
 msgid "Command complete"
 msgstr ""
 
 #. TRANS: E-mail subject when a command has failed.

-#: lib/channel.php:244
+#: lib/channel.php:188

 msgid "Command failed"
 msgstr ""
 
 msgid "Command failed"
 msgstr ""
 


@@ -7550,7 +8425,7 @@ msgstr ""
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.

-#: lib/command.php:99 lib/command.php:630
+#: lib/command.php:99 lib/command.php:743

 msgid "User has no last notice."
 msgstr ""
 
 msgid "User has no last notice."
 msgstr ""
 


@@ -7597,64 +8472,116 @@ msgid ""
 "Notices: %3$s"
 msgstr ""
 
 "Notices: %3$s"
 msgstr ""
 

+#. TRANS: Error message text shown when a favorite could not be set because it has already been favorited.
+#: lib/command.php:298
+msgid "Could not create favorite: Already favorited."
+msgstr ""
+

 #. TRANS: Text shown when a notice has been marked as favourite successfully.
 #. TRANS: Text shown when a notice has been marked as favourite successfully.

-#: lib/command.php:312
+#: lib/command.php:324

 msgid "Notice marked as fave."
 msgstr ""
 
 #. TRANS: Message given having added a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
 msgid "Notice marked as fave."
 msgstr ""
 
 #. TRANS: Message given having added a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.

-#: lib/command.php:357
+#: lib/command.php:366

 #, php-format
 msgid "%1$s joined group %2$s."
 msgstr ""
 
 #. TRANS: Message given having removed a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
 #, php-format
 msgid "%1$s joined group %2$s."
 msgstr ""
 
 #. TRANS: Message given having removed a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.

-#: lib/command.php:405
+#: lib/command.php:411

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

+#. TRANS: Error displayed if tagging a user fails.
+#. TRANS: %1$s is the tagged user, %2$s is the error message (no punctuation).
+#: lib/command.php:468
+#, php-format
+msgid "Error tagging %1$s: %2$s"
+msgstr ""
+
+#. TRANS: Succes message displayed if tagging a user succeeds.
+#. TRANS: %1$s is the tagged user's nickname, %2$s is a list of tags.
+#. TRANS: Plural is decided based on the number of tags added (not part of message).
+#: lib/command.php:476
+#, php-format
+msgid "%1$s was tagged %2$s"
+msgid_plural "%1$s was tagged %2$s"
+msgstr[0] ""
+msgstr[1] ""
+
+#. TRANS: Separator for list of tags.
+#. TRANS: Separator in list of user names like "Jim, Bob, Mary".
+#: lib/command.php:481 lib/command.php:534 lib/threadednoticelist.php:472
+msgid ", "
+msgstr ""
+
+#. TRANS: Error displayed if a given tag is invalid.
+#. TRANS: %s is the invalid tag.
+#: lib/command.php:509
+#, php-format
+msgid "Invalid tag: \"%s\""
+msgstr ""
+
+#. TRANS: Error displayed if untagging a user fails.
+#. TRANS: %1$s is the untagged user, %2$s is the error message (no punctuation).
+#: lib/command.php:521
+#, php-format
+msgid "Error untagging %1$s: %2$s"
+msgstr ""
+
+#. TRANS: Succes message displayed if untagging a user succeeds.
+#. TRANS: %1$s is the untagged user's nickname, %2$s is a list of tags.
+#. TRANS: Plural is decided based on the number of tags removed (not part of message).
+#: lib/command.php:529
+#, php-format
+msgid "The following tag was removed from user %1$s: %2$s."
+msgid_plural "The following tags were removed from user %1$s: %2$s."
+msgstr[0] ""
+msgstr[1] ""
+

 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.

-#: lib/command.php:426
+#: lib/command.php:553

 #, php-format
 msgctxt "WHOIS"
 msgid "%1$s (%2$s)"
 msgstr ""
 
 #. TRANS: Whois output. %s is the full name of the queried user.
 #, php-format
 msgctxt "WHOIS"
 msgid "%1$s (%2$s)"
 msgstr ""
 
 #. TRANS: Whois output. %s is the full name of the queried user.

-#: lib/command.php:430
+#: lib/command.php:557

 #, php-format
 msgid "Fullname: %s"
 msgstr ""
 
 #. TRANS: Whois output. %s is the location of the queried user.
 #, php-format
 msgid "Fullname: %s"
 msgstr ""
 
 #. TRANS: Whois output. %s is the location of the queried user.

-#. TRANS: Profile info line in new-subscriber notification e-mail.
+#. TRANS: Profile info line in notification e-mail.

 #. TRANS: %s is a location.
 #. TRANS: %s is a location.

-#: lib/command.php:434 lib/mail.php:270
+#: lib/command.php:561 lib/mail.php:345

 #, php-format
 msgid "Location: %s"
 msgstr ""
 
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #, php-format
 msgid "Location: %s"
 msgstr ""
 
 #. TRANS: Whois output. %s is the homepage of the queried user.

-#. TRANS: Profile info line in new-subscriber notification e-mail.
+#. TRANS: Profile info line in notification e-mail.

 #. TRANS: %s is a homepage.
 #. TRANS: %s is a homepage.

-#: lib/command.php:438 lib/mail.php:274
+#: lib/command.php:565 lib/mail.php:350

 #, php-format
 msgid "Homepage: %s"
 msgstr ""
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
 #, php-format
 msgid "Homepage: %s"
 msgstr ""
 
 #. TRANS: Whois output. %s is the bio information of the queried user.

-#: lib/command.php:442
+#: lib/command.php:569

 #, php-format
 msgid "About: %s"
 msgstr ""
 
 #. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
 #. TRANS: %s is a remote profile.
 #, php-format
 msgid "About: %s"
 msgstr ""
 
 #. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
 #. TRANS: %s is a remote profile.

-#: lib/command.php:471
+#: lib/command.php:598

 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "


@@ -7663,33 +8590,35 @@ msgstr ""
 
 #. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
 
 #. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.

-#: lib/command.php:488
+#. TRANS: Message given when a status is too long. %1$s is the maximum number of characters,
+#. TRANS: %2$s is the number of characters sent (used for plural).
+#: lib/command.php:615 lib/implugin.php:491

 #, php-format
 msgid "Message too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
 msgstr[0] ""
 msgstr[1] ""
 
 #, php-format
 msgid "Message too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
 msgstr[0] ""
 msgstr[1] ""
 

+#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
+#: lib/command.php:628
+msgid "You can't send a message to this user."
+msgstr ""
+

 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.

-#: lib/command.php:516
+#: lib/command.php:643

 msgid "Error sending direct message."
 msgstr ""
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
 msgid "Error sending direct message."
 msgstr ""
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.

-#: lib/command.php:553
+#: lib/command.php:667

 #, php-format
 msgid "Notice from %s repeated."
 msgstr ""
 
 #, php-format
 msgid "Notice from %s repeated."
 msgstr ""
 

-#. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:556
-msgid "Error repeating notice."
-msgstr ""
-

 #. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
 #. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.

-#: lib/command.php:591
+#: lib/command.php:704

 #, php-format
 msgid "Notice too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
 #, php-format
 msgid "Notice too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."


@@ -7698,100 +8627,100 @@ msgstr[1] ""
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.

-#: lib/command.php:604
+#: lib/command.php:717

 #, php-format
 msgid "Reply to %s sent."
 msgstr ""
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
 #, php-format
 msgid "Reply to %s sent."
 msgstr ""
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.

-#: lib/command.php:607
+#: lib/command.php:720

 msgid "Error saving notice."
 msgstr ""
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
 msgid "Error saving notice."
 msgstr ""
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.

-#: lib/command.php:654
+#: lib/command.php:767

 msgid "Specify the name of the user to subscribe to."
 msgstr ""
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
 msgid "Specify the name of the user to subscribe to."
 msgstr ""
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.

-#: lib/command.php:663
+#: lib/command.php:776

 msgid "Can't subscribe to OMB profiles by command."
 msgstr ""
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
 msgid "Can't subscribe to OMB profiles by command."
 msgstr ""
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.

-#: lib/command.php:671
+#: lib/command.php:784

 #, php-format
 msgid "Subscribed to %s."
 msgstr ""
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
 #, php-format
 msgid "Subscribed to %s."
 msgstr ""
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.

-#: lib/command.php:692 lib/command.php:803
+#: lib/command.php:805 lib/command.php:916

 msgid "Specify the name of the user to unsubscribe from."
 msgstr ""
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
 msgid "Specify the name of the user to unsubscribe from."
 msgstr ""
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.

-#: lib/command.php:703
+#: lib/command.php:816

 #, php-format
 msgid "Unsubscribed from %s."
 msgstr ""
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr ""
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.

-#: lib/command.php:723 lib/command.php:749
+#: lib/command.php:836 lib/command.php:862

 msgid "Command not yet implemented."
 msgstr ""
 
 #. TRANS: Text shown when issuing the command "off" successfully.
 msgid "Command not yet implemented."
 msgstr ""
 
 #. TRANS: Text shown when issuing the command "off" successfully.

-#: lib/command.php:727
+#: lib/command.php:840

 msgid "Notification off."
 msgstr ""
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
 msgid "Notification off."
 msgstr ""
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.

-#: lib/command.php:730
+#: lib/command.php:843

 msgid "Can't turn off notification."
 msgstr ""
 
 #. TRANS: Text shown when issuing the command "on" successfully.
 msgid "Can't turn off notification."
 msgstr ""
 
 #. TRANS: Text shown when issuing the command "on" successfully.

-#: lib/command.php:753
+#: lib/command.php:866

 msgid "Notification on."
 msgstr ""
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
 msgid "Notification on."
 msgstr ""
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.

-#: lib/command.php:756
+#: lib/command.php:869

 msgid "Can't turn on notification."
 msgstr ""
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
 msgid "Can't turn on notification."
 msgstr ""
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.

-#: lib/command.php:770
+#: lib/command.php:883

 msgid "Login command is disabled."
 msgstr ""
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
 msgid "Login command is disabled."
 msgstr ""
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..

-#: lib/command.php:783
+#: lib/command.php:896

 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.

-#: lib/command.php:812
+#: lib/command.php:925

 #, php-format
 msgid "Unsubscribed %s."
 msgstr ""
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
 #, php-format
 msgid "Unsubscribed %s."
 msgstr ""
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.

-#: lib/command.php:830
+#: lib/command.php:943

 msgid "You are not subscribed to anyone."
 msgstr ""
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
 msgid "You are not subscribed to anyone."
 msgstr ""
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.

-#: lib/command.php:835
+#: lib/command.php:948

 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] ""
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] ""


@@ -7799,14 +8728,14 @@ msgstr[1] ""
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.

-#: lib/command.php:857
+#: lib/command.php:970

 msgid "No one is subscribed to you."
 msgstr ""
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
 msgid "No one is subscribed to you."
 msgstr ""
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.

-#: lib/command.php:862
+#: lib/command.php:975

 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] ""
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] ""


@@ -7814,184 +8743,272 @@ msgstr[1] ""
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.

-#: lib/command.php:884
+#: lib/command.php:997

 msgid "You are not a member of any groups."
 msgstr ""
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
 msgid "You are not a member of any groups."
 msgstr ""
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.

-#: lib/command.php:889
+#: lib/command.php:1002

 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] ""
 msgstr[1] ""
 
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] ""
 msgstr[1] ""
 

-#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:904
-msgid ""
-"Commands:\n"
-"on - turn on notifications\n"
-"off - turn off notifications\n"
-"help - show this help\n"
-"follow <nickname> - subscribe to user\n"
-"groups - lists the groups you have joined\n"
-"subscriptions - list the people you follow\n"
-"subscribers - list the people that follow you\n"
-"leave <nickname> - unsubscribe from user\n"
-"d <nickname> <text> - direct message to user\n"
-"get <nickname> - get last notice from user\n"
-"whois <nickname> - get profile info on user\n"
-"lose <nickname> - force user to stop following you\n"
-"fav <nickname> - add user's last notice as a 'fave'\n"
-"fav #<notice_id> - add notice with the given id as a 'fave'\n"
-"repeat #<notice_id> - repeat a notice with a given id\n"
-"repeat <nickname> - repeat the last notice from user\n"
-"reply #<notice_id> - reply to notice with a given id\n"
-"reply <nickname> - reply to the last notice from user\n"
-"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
-"drop <group> - leave group\n"
-"stats - get your stats\n"
-"stop - same as 'off'\n"
-"quit - same as 'off'\n"
-"sub <nickname> - same as 'follow'\n"
-"unsub <nickname> - same as 'leave'\n"
-"last <nickname> - same as 'get'\n"
-"on <nickname> - not yet implemented.\n"
-"off <nickname> - not yet implemented.\n"
-"nudge <nickname> - remind a user to update.\n"
-"invite <phone number> - not yet implemented.\n"
-"track <word> - not yet implemented.\n"
-"untrack <word> - not yet implemented.\n"
-"track off - not yet implemented.\n"
-"untrack all - not yet implemented.\n"
-"tracks - not yet implemented.\n"
-"tracking - not yet implemented.\n"
+#. TRANS: Header line of help text for commands.
+#: lib/command.php:1016
+msgctxt "COMMANDHELP"
+msgid "Commands:"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:162
-msgid "No configuration file found."
+#. TRANS: Help message for IM/SMS command "on".
+#: lib/command.php:1018
+msgctxt "COMMANDHELP"
+msgid "turn on notifications"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:165
-msgid "I looked for configuration files in the following places:"
+#. TRANS: Help message for IM/SMS command "off".
+#: lib/command.php:1020
+msgctxt "COMMANDHELP"
+msgid "turn off notifications"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:168
-msgid "You may wish to run the installer to fix this."
+#. TRANS: Help message for IM/SMS command "help".
+#: lib/command.php:1022
+msgctxt "COMMANDHELP"
+msgid "show this help"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:172
-msgid "Go to the installer."
+#. TRANS: Help message for IM/SMS command "follow <nickname>".
+#: lib/command.php:1024
+msgctxt "COMMANDHELP"
+msgid "subscribe to user"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Menu item for Instant Messaging settings.
-#: lib/connectsettingsaction.php:106
-msgctxt "MENU"
-msgid "IM"
+#. TRANS: Help message for IM/SMS command "groups".
+#: lib/command.php:1026
+msgctxt "COMMANDHELP"
+msgid "lists the groups you have joined"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Tooltip for Instant Messaging menu item.
-#: lib/connectsettingsaction.php:108
-msgid "Updates by instant messenger (IM)"
+#. TRANS: Help message for IM/SMS command "tag".
+#: lib/command.php:1028
+msgctxt "COMMANDHELP"
+msgid "tag a user"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Menu item for Short Message Service settings.
-#: lib/connectsettingsaction.php:113
-msgctxt "MENU"
-msgid "SMS"
+#. TRANS: Help message for IM/SMS command "untag".
+#: lib/command.php:1030
+msgctxt "COMMANDHELP"
+msgid "untag a user"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Tooltip for Short Message Service menu item.
-#: lib/connectsettingsaction.php:115
-msgid "Updates by SMS"
+#. TRANS: Help message for IM/SMS command "subscriptions".
+#: lib/command.php:1032
+msgctxt "COMMANDHELP"
+msgid "list the people you follow"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Menu item for OuAth connection settings.
-#: lib/connectsettingsaction.php:120
-msgctxt "MENU"
-msgid "Connections"
+#. TRANS: Help message for IM/SMS command "subscribers".
+#: lib/command.php:1034
+msgctxt "COMMANDHELP"
+msgid "list the people that follow you"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Tooltip for connected applications (Connections through OAuth) menu item.
-#: lib/connectsettingsaction.php:122
-msgid "Authorized connected applications"
+#. TRANS: Help message for IM/SMS command "leave <nickname>".
+#: lib/command.php:1036
+msgctxt "COMMANDHELP"
+msgid "unsubscribe from user"

 msgstr ""
 
 msgstr ""
 

-#: lib/dberroraction.php:59
-msgid "Database error"
+#. TRANS: Help message for IM/SMS command "d <nickname> <text>".
+#: lib/command.php:1038
+msgctxt "COMMANDHELP"
+msgid "direct message to user"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Description of form for deleting a user.
-#: lib/deleteuserform.php:75
-msgid "Delete this user"
+#. TRANS: Help message for IM/SMS command "get <nickname>".
+#: lib/command.php:1040
+msgctxt "COMMANDHELP"
+msgid "get last notice from user"

 msgstr ""
 
 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/designsettings.php:108
-msgid "Upload file"
+#. TRANS: Help message for IM/SMS command "whois <nickname>".
+#: lib/command.php:1042
+msgctxt "COMMANDHELP"
+msgid "get profile info on user"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Instructions for form on profile design page.
-#: lib/designsettings.php:113
-msgid ""
-"You can upload your personal background image. The maximum file size is 2MB."
+#. TRANS: Help message for IM/SMS command "lose <nickname>".
+#: lib/command.php:1044
+msgctxt "COMMANDHELP"
+msgid "force user to stop following you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav <nickname>".
+#: lib/command.php:1046
+msgctxt "COMMANDHELP"
+msgid "add user's last notice as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav #<notice_id>".
+#: lib/command.php:1048
+msgctxt "COMMANDHELP"
+msgid "add notice with the given id as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat #<notice_id>".
+#: lib/command.php:1050
+msgctxt "COMMANDHELP"
+msgid "repeat a notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat <nickname>".
+#: lib/command.php:1052
+msgctxt "COMMANDHELP"
+msgid "repeat the last notice from user"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "reply #<notice_id>".
+#: lib/command.php:1054
+msgctxt "COMMANDHELP"
+msgid "reply to notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "reply <nickname>".
+#: lib/command.php:1056
+msgctxt "COMMANDHELP"
+msgid "reply to the last notice from user"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "join <group>".
+#: lib/command.php:1058
+msgctxt "COMMANDHELP"
+msgid "join group"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "login".
+#: lib/command.php:1060
+msgctxt "COMMANDHELP"
+msgid "Get a link to login to the web interface"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "drop <group>".
+#: lib/command.php:1062
+msgctxt "COMMANDHELP"
+msgid "leave group"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "stats".
+#: lib/command.php:1064
+msgctxt "COMMANDHELP"
+msgid "get your stats"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "stop".
+#. TRANS: Help message for IM/SMS command "quit".
+#: lib/command.php:1066 lib/command.php:1068
+msgctxt "COMMANDHELP"
+msgid "same as 'off'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "sub <nickname>".
+#: lib/command.php:1070
+msgctxt "COMMANDHELP"
+msgid "same as 'follow'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "unsub <nickname>".
+#: lib/command.php:1072
+msgctxt "COMMANDHELP"
+msgid "same as 'leave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "last <nickname>".
+#: lib/command.php:1074
+msgctxt "COMMANDHELP"
+msgid "same as 'get'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "on <nickname>".
+#. TRANS: Help message for IM/SMS command "off <nickname>".
+#. TRANS: Help message for IM/SMS command "invite <phone number>".
+#. TRANS: Help message for IM/SMS command "track <word>".
+#. TRANS: Help message for IM/SMS command "untrack <word>".
+#. TRANS: Help message for IM/SMS command "track off".
+#. TRANS: Help message for IM/SMS command "untrack all".
+#. TRANS: Help message for IM/SMS command "tracks".
+#. TRANS: Help message for IM/SMS command "tracking".
+#: lib/command.php:1076 lib/command.php:1078 lib/command.php:1082
+#: lib/command.php:1084 lib/command.php:1086 lib/command.php:1088
+#: lib/command.php:1090 lib/command.php:1092 lib/command.php:1094
+msgctxt "COMMANDHELP"
+msgid "not yet implemented."
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "nudge <nickname>".
+#: lib/command.php:1080
+msgctxt "COMMANDHELP"
+msgid "remind a user to update."
+msgstr ""
+
+#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
+#: lib/common.php:36
+msgid "No configuration file found."

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-#: lib/designsettings.php:139
-msgctxt "RADIO"
-msgid "On"
+#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
+#. TRANS: Is followed by a list of directories (separated by HTML breaks).
+#: lib/common.php:39
+msgid "I looked for configuration files in the following places:"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-#: lib/designsettings.php:156
-msgctxt "RADIO"
-msgid "Off"
+#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
+#: lib/common.php:42
+msgid "You may wish to run the installer to fix this."

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: lib/designsettings.php:175
-msgid "Change colours"
+#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
+#. TRANS: The text is link text that leads to the installer page.
+#: lib/common.php:46
+msgid "Go to the installer."

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: lib/designsettings.php:257
-msgid "Use defaults"
+#. 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 ""
 
 msgstr ""
 

-#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: lib/designsettings.php:259
-msgid "Restore default designs"
+#. TRANS: Page title for when a database error occurs.
+#: lib/dberroraction.php:60
+msgid "Database error"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:267
-msgid "Reset back to default"
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item in search group navigation panel.
+#: lib/defaultlocalnav.php:65 lib/publicgroupnav.php:67
+msgctxt "MENU"
+msgid "Public"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Title for button on profile design page to save settings.
-#: lib/designsettings.php:272
-msgid "Save design"
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item title in local navigation menu.
+#: lib/defaultlocalnav.php:79 lib/subgroupnav.php:135
+msgctxt "MENU"
+msgid "Lists"

 msgstr ""
 
 msgstr ""
 

-#. 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".
-#: lib/designsettings.php:405 lib/designsettings.php:427
-msgid "Couldn't update your design."
+#. TRANS: Title of form for deleting a user.
+#. TRANS: Link text in notice list item to delete a notice.
+#: lib/deleteuserform.php:64 lib/noticelistitem.php:680
+msgid "Delete"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
-#: lib/designsettings.php:433
-msgid "Design defaults restored."
+#. TRANS: Description of form for deleting a user.
+#: lib/deleteuserform.php:75
+msgid "Delete this user"

 msgstr ""
 
 #. TRANS: Exception. %s is an ID.
 msgstr ""
 
 #. TRANS: Exception. %s is an ID.


@@ -8001,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 ""
 


@@ -8012,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 ""
 


@@ -8024,32 +9044,45 @@ msgctxt "BUTTON"
 msgid "Favor"
 msgstr ""
 
 msgid "Favor"
 msgstr ""
 

-#: lib/feed.php:84
+#. 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.
+#: lib/feed.php:88

 msgid "RSS 1.0"
 msgstr ""
 
 msgid "RSS 1.0"
 msgstr ""
 

-#: lib/feed.php:86
+#. TRANS: Feed type name.
+#: lib/feed.php:91

 msgid "RSS 2.0"
 msgstr ""
 
 msgid "RSS 2.0"
 msgstr ""
 

-#: lib/feed.php:88
+#. TRANS: Feed type name.
+#: lib/feed.php:94

 msgid "Atom"
 msgstr ""
 
 msgid "Atom"
 msgstr ""
 

-#: lib/feed.php:90
+#. TRANS: Feed type name. FOAF stands for Friend of a Friend.
+#: lib/feed.php:97

 msgid "FOAF"
 msgstr ""
 
 msgid "FOAF"
 msgstr ""
 

-#: lib/feedimporter.php:75
-msgid "Not an atom feed."
+#. TRANS: Feed type name. See http://activitystrea.ms/
+#: lib/feed.php:100
+msgid "Activity Streams"

 msgstr ""
 
 msgstr ""
 

+#. TRANS: Client exception thrown when an imported feed does not have an author.

 #: lib/feedimporter.php:82
 msgid "No author in the feed."
 msgstr ""
 
 #: lib/feedimporter.php:82
 msgid "No author in the feed."
 msgstr ""
 

-#: lib/feedimporter.php:89
-msgid "Can't import without a user."
+#. TRANS: Client exception thrown when an imported feed does not have an author that
+#. TRANS: can be associated with a user.
+#: lib/feedimporter.php:91
+msgid "Cannot import without a user."

 msgstr ""
 
 #. TRANS: Header for feed links (h2).
 msgstr ""
 
 #. TRANS: Header for feed links (h2).


@@ -8057,60 +9090,99 @@ msgstr ""
 msgid "Feeds"
 msgstr ""
 
 msgid "Feeds"
 msgstr ""
 

-#: lib/galleryaction.php:121
-msgid "Filter tags"
+#. TRANS: List element on gallery action page to show all tags.
+#: lib/galleryaction.php:129
+msgctxt "TAGS"
+msgid "All"

 msgstr ""
 
 msgstr ""
 

-#: lib/galleryaction.php:131
-msgid "All"
+#. TRANS: Dropdown field label on gallery action page for a list containing tags.
+#: lib/galleryaction.php:140
+msgid "Tag"

 msgstr ""
 
 msgstr ""
 

-#: lib/galleryaction.php:139
-msgid "Select tag to filter"
+#. TRANS: Dropdown field title on gallery action page for a list containing tags.
+#: lib/galleryaction.php:142
+msgid "Choose a tag to narrow list."

 msgstr ""
 
 msgstr ""
 

-#: lib/galleryaction.php:140
-msgid "Tag"
+#. TRANS: Description on form for granting a role.
+#: lib/grantroleform.php:88
+#, php-format
+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 ""
 
 msgstr ""
 

-#: lib/galleryaction.php:141
-msgid "Choose a tag to narrow list"
+#. 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 ""
 
 msgstr ""
 

-#: lib/galleryaction.php:143
-msgid "Go"
+#. TRANS: Header for mini list of users with a pending membership request on a group page (h2).
+#: lib/groupaction.php:209
+msgid "Pending"

 msgstr ""
 
 msgstr ""
 

-#: lib/grantroleform.php:91
-#, php-format
-msgid "Grant this user the \"%s\" role"
+#. TRANS: Header for mini list of users that are blocked in a group page (h2).
+#: lib/groupaction.php:244
+msgid "Blocked"

 msgstr ""
 
 msgstr ""
 

-#: lib/groupeditform.php:147
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+#. 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"
+msgid "Block"
+msgstr ""
+
+#. TRANS: Submit button title.
+#: lib/groupblockform.php:128
+msgctxt "TOOLTIP"
+msgid "Block this user so that they can no longer post messages to it."

 msgstr ""
 
 msgstr ""
 

-#: lib/groupeditform.php:156
+#. TRANS: Field title on group edit form.
+#: lib/groupeditform.php:162

 msgid "URL of the homepage or blog of the group or topic."
 msgstr ""
 
 msgid "URL of the homepage or blog of the group or topic."
 msgstr ""
 

-#: lib/groupeditform.php:161
-msgid "Describe the group or topic"
+#. TRANS: Text area title for group description when there is no text limit.
+#: lib/groupeditform.php:168
+msgid "Describe the group or topic."

 msgstr ""
 
 msgstr ""
 

-#: lib/groupeditform.php:163
+#. TRANS: Text area title for group description.
+#. TRANS: %d is the number of characters available for the description.
+#: lib/groupeditform.php:172

 #, php-format
 #, php-format

-msgid "Describe the group or topic in %d character or less"
-msgid_plural "Describe the group or topic in %d characters or less"
+msgid "Describe the group or topic in %d character or less."
+msgid_plural "Describe the group or topic in %d characters or less."

 msgstr[0] ""
 msgstr[1] ""
 
 msgstr[0] ""
 msgstr[1] ""
 

-#: lib/groupeditform.php:175
+#. TRANS: Field title on group edit form.
+#: lib/groupeditform.php:187

 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr ""
 
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr ""
 

-#: lib/groupeditform.php:183
+#. TRANS: Field label on group edit form.
+#: lib/groupeditform.php:193
+msgid "Aliases"
+msgstr ""
+
+#. TRANS: Input field title for group aliases.
+#. TRANS: %d is the maximum number of group aliases available.
+#: lib/groupeditform.php:198

 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "


@@ -8121,93 +9193,70 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
 msgstr[0] ""
 msgstr[1] ""
 

-#. TRANS: Menu item in the group navigation page.
-#: lib/groupnav.php:86
-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:89
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s group"
-msgstr ""
-
-#. TRANS: Menu item in the group navigation page.
-#: lib/groupnav.php:95
-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:98
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s group members"
+#. TRANS: Checkbox field title on group edit form to mark a group private.
+#: lib/groupeditform.php:210
+msgid ""
+"New members must be approved by admin and all posts are forced to be private."

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:108
-msgctxt "MENU"
-msgid "Blocked"
+#. TRANS: Indicator in group members list that this user is a group administrator.
+#: lib/groupmemberlistitem.php:21
+msgctxt "GROUPADMIN"
+msgid "Admin"

 msgstr ""
 
 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:111
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s blocked users"
+#. 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:120
+#: 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:126
-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:129
+#: 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:138
-#, php-format
-msgctxt "TOOLTIP"
-msgid "Add or edit %s design"
+#. 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.
 #: lib/groupsbymemberssection.php:71
 msgstr ""
 
 #. TRANS: Title for groups with the most members section.
 #: lib/groupsbymemberssection.php:71

-msgid "Groups with most members"
+msgid "Popular groups"

 msgstr ""
 
 #. TRANS: Title for groups with the most posts section.
 #: lib/groupsbypostssection.php:71
 msgstr ""
 
 #. TRANS: Title for groups with the most posts section.
 #: lib/groupsbypostssection.php:71

-msgid "Groups with most posts"
+msgid "Active groups"

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


@@ -8272,39 +9321,134 @@ msgid_plural "%dB"
 msgstr[0] ""
 msgstr[1] ""
 
 msgstr[0] ""
 msgstr[1] ""
 

-#: lib/jabber.php:387
+#. 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:264

 #, php-format
 #, php-format

-msgid "[%s]"
+msgid ""
+"User \"%1$s\" on %2$s has said that your %3$s screenname belongs to them. If "
+"that is true, you can confirm by clicking on this URL: %4$s . (If you cannot "
+"click it, copy-and-paste it into the address bar of your browser). If that "
+"user is not you, or if you did not request this confirmation, just ignore "
+"this message."

 msgstr ""
 
 msgstr ""
 

-#: lib/jabber.php:567
+#. TRANS: Exception thrown when trying to deliver a notice to an unknown inbox.
+#. TRANS: %d is the unknown inbox ID (number).
+#: lib/implugin.php:352

 #, php-format
 msgid "Unknown inbox source %d."
 msgstr ""
 
 #, php-format
 msgid "Unknown inbox source %d."
 msgstr ""
 

-#: lib/leaveform.php:114
+#. TRANS: Server exception thrown trying to initialise an IM plugin without meeting all prerequisites.
+#: 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.
+#: lib/implugin.php:638
+msgid "Transport cannot be null."
+msgstr ""
+
+#. TRANS: Title for inbox tag cloud section.
+#: lib/inboxtagcloudsection.php:56
+msgctxt "TITLE"
+msgid "Trends"
+msgstr ""
+
+#. TRANS: Default button text for inviting more users to the StatusNet instance.
+#: lib/invitebuttonsection.php:56
+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"
+msgid "Join"
+msgstr ""
+
+#. TRANS: Button text on form to leave a group.
+#: lib/leaveform.php:109
+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
+msgctxt "MENU"
+msgid "Login"
+msgstr ""
+

 #. TRANS: Title for menu item for logging in to the StatusNet site.
 #. TRANS: Title for menu item for logging in to the StatusNet site.

-#: lib/logingroupnav.php:79
+#: lib/logingroupnav.php:66

 msgid "Login with a username and password"
 msgstr ""
 
 msgid "Login with a username and password"
 msgstr ""
 

+#. TRANS: Menu item for registering with the StatusNet site.
+#: lib/logingroupnav.php:73
+msgctxt "MENU"
+msgid "Register"
+msgstr ""
+

 #. TRANS: Title for menu item for registering with the StatusNet site.
 #. TRANS: Title for menu item for registering with the StatusNet site.

-#: lib/logingroupnav.php:87
+#: lib/logingroupnav.php:75

 msgid "Sign up for a new account"
 msgstr ""
 
 #. TRANS: Subject for address confirmation email.
 msgid "Sign up for a new account"
 msgstr ""
 
 #. TRANS: Subject for address confirmation email.

-#: lib/mail.php:168
+#: 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:173
+#: lib/mail.php:184

 #, php-format
 msgid ""
 "Hey, %1$s.\n"
 #, php-format
 msgid ""
 "Hey, %1$s.\n"


@@ -8323,50 +9467,68 @@ msgstr ""
 
 #. TRANS: Subject of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
 
 #. TRANS: Subject of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.

-#: lib/mail.php:238
+#. TRANS: Main body of new-subscriber notification e-mail.
+#. TRANS: %1$s is the subscriber's long name, %2$s is the StatusNet sitename.
+#: lib/mail.php:250 lib/mail.php:256
+#, php-format
+msgid "%1$s is now following you on %2$s."
+msgstr ""
+
+#. TRANS: Subject of pending new-subscriber notification e-mail.
+#. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
+#: lib/mail.php:290

 #, php-format
 #, php-format

-msgid "%1$s is now listening to your notices on %2$s."
+msgid "%1$s would like to listen to your notices on %2$s."

 msgstr ""
 
 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:245
+#. TRANS: Main body of pending new-subscriber notification e-mail.
+#. TRANS: %1$s is the subscriber's long name, %2$s is the StatusNet sitename.
+#: lib/mail.php:297

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

-"If you believe this account is being used abusively, you can block them from "
-"your subscribers list and report as spam to site administrators at %s"
+"%1$s would like to listen to your notices on %2$s. You may approve or reject "
+"their subscription at %3$s"

 msgstr ""
 
 msgstr ""
 

-#. 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: %3$s is the subscriber's profile URL, %4$s is the subscriber's location (or empty)
-#. TRANS: %5$s is the subscriber's homepage URL (or empty), %6%s is the subscriber's bio (or empty)
-#. TRANS: %7$s is a link to the addressed user's e-mail settings.
-#: lib/mail.php:255
+#. TRANS: Common footer block for StatusNet notification emails.
+#. TRANS: %1$s is the StatusNet sitename,
+#. TRANS: %2$s is a link to the addressed user's e-mail settings.
+#: lib/mail.php:316

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

-"%1$s is now listening to your notices on %2$s.\n"
-"\n"
-"\t%3$s\n"
-"\n"
-"%4$s%5$s%6$s\n"

 "Faithfully yours,\n"
 "Faithfully yours,\n"

-"%2$s.\n"
+"%1$s.\n"

 "\n"
 "----\n"
 "\n"
 "----\n"

-"Change your email address or notification options at %7$s\n"
+"Change your email address or notification options at %2$s"
+msgstr ""
+
+#. TRANS: Profile info line in notification e-mail.
+#. TRANS: %s is a URL.
+#: lib/mail.php:341
+#, php-format
+msgid "Profile: %s"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Profile info line in new-subscriber notification e-mail.
+#. TRANS: Profile info line in notification e-mail.

 #. TRANS: %s is biographical information.
 #. TRANS: %s is biographical information.

-#: lib/mail.php:278
+#: lib/mail.php:355

 #, php-format
 msgid "Bio: %s"
 msgstr ""
 
 #, php-format
 msgid "Bio: %s"
 msgstr ""
 

+#. TRANS: This is a paragraph in a new-subscriber e-mail.
+#. TRANS: %s is a URL where the subscriber can be reported as abusive.
+#: lib/mail.php:365
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s."
+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:307
+#: 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 ""


@@ -8374,49 +9536,46 @@ 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:313
+#: lib/mail.php:399

 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
 "\n"
 "Send email to %2$s to post new messages.\n"
 "\n"
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
 "\n"
 "Send email to %2$s to post new messages.\n"
 "\n"

-"More email instructions at %3$s.\n"
-"\n"
-"Faithfully yours,\n"
-"%1$s"
+"More email instructions at %3$s."

 msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
 msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.

-#: lib/mail.php:434
+#: 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:460
+#: 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:464
+#: 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:485
+#: lib/mail.php:574

 #, php-format
 msgid "You have been nudged by %s"
 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,
 #, php-format
 msgid "You have been nudged by %s"
 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, %4$s is the StatusNet sitename.
-#: lib/mail.php:492
+#. TRANS: %3$s is a URL to post notices at.
+#: 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 "


@@ -8426,15 +9585,12 @@ msgid ""
 "\n"
 "%3$s\n"
 "\n"
 "\n"
 "%3$s\n"
 "\n"

-"Don't reply to this email; it won't get to them.\n"
-"\n"
-"With kind regards,\n"
-"%4$s\n"
+"Don't reply to this email; it won't get to them."

 msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
 msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.

-#: lib/mail.php:539
+#: lib/mail.php:626

 #, php-format
 msgid "New private message from %s"
 msgstr ""
 #, php-format
 msgid "New private message from %s"
 msgstr ""


@@ -8442,8 +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,

-#. TRANS: %5$s is the StatusNet sitename.
-#: lib/mail.php:547
+#: 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"


@@ -8456,15 +9611,12 @@ msgid ""
 "\n"
 "%4$s\n"
 "\n"
 "\n"
 "%4$s\n"
 "\n"

-"Don't reply to this email; it won't get to them.\n"
-"\n"
-"With kind regards,\n"
-"%5$s\n"
+"Don't reply to this email; it won't get to them."

 msgstr ""
 
 #. TRANS: Subject for favorite notification e-mail.
 #. TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.
 msgstr ""
 
 #. TRANS: Subject for favorite notification e-mail.
 #. TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.

-#: lib/mail.php:599
+#: 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 ""


@@ -8474,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:606
+#: 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"


@@ -8489,14 +9641,11 @@ msgid ""
 "\n"
 "You can see the list of %1$s's favorites here:\n"
 "\n"
 "\n"
 "You can see the list of %1$s's favorites here:\n"
 "\n"

-"%5$s\n"
-"\n"
-"Faithfully yours,\n"
-"%6$s\n"
+"%5$s"

 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:664
+#: 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"


@@ -8506,21 +9655,20 @@ 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:672
+#: lib/mail.php:755

 #, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
 msgstr ""
 
 #. TRANS: Body of @-reply notification e-mail.
 #, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
 msgstr ""
 
 #. TRANS: Body of @-reply notification e-mail.

-#. TRANS: %1$s is the sending user's long name, $2$s is the StatusNet sitename,
+#. 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: %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: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replied for the addressed user,
-#. TRANS: %8$s is a URL to the addressed user's e-mail settings, %9$s is the sender's nickname.
-#: lib/mail.php:680
+#. TRANS: %5$s is the text "The full conversation can be read here:" and a URL to the full conversion if it exists (otherwise empty),
+#. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replies for the addressed user,
+#: lib/mail.php:762

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

-"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
+"%1$s just sent a notice to your attention (an '@-reply') on %2$s.\n"

 "\n"
 "The notice is here:\n"
 "\n"
 "\n"
 "The notice is here:\n"
 "\n"


@@ -8536,43 +9684,118 @@ msgid ""
 "\n"
 "The list of all @-replies for you here:\n"
 "\n"
 "\n"
 "The list of all @-replies for you here:\n"
 "\n"

-"%7$s\n"
-"\n"
-"Faithfully yours,\n"
-"%2$s\n"
-"\n"
-"P.S. You can turn off these email notifications here: %8$s\n"
+"%7$s"
+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.
+#: 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.
+#: 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.
+#: lib/mail.php:880
+#, php-format
+msgid "%1$s wants to join your group %2$s on %3$s."
+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.
+#: 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 "
+"their group membership at %4$s"

 msgstr ""
 
 msgstr ""
 

+#. TRANS: Client error displayed when trying to access a mailbox that is not of the logged in user.

 #: lib/mailbox.php:87
 msgid "Only the user can read their own mailboxes."
 msgstr ""
 
 #: lib/mailbox.php:87
 msgid "Only the user can read their own mailboxes."
 msgstr ""
 

-#: lib/mailbox.php:125
+#. TRANS: Message displayed when there are no private messages in the inbox of a user.
+#: lib/mailbox.php:120

 msgid ""
 "You have no private messages. You can send private message to engage other "
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
 msgid ""
 "You have no private messages. You can send private message to engage other "
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 

-#: lib/mailhandler.php:37
+#. TRANS: Menu item in mailbox menu. Leads to incoming private messages.
+#: lib/mailboxmenu.php:59
+msgctxt "MENU"
+msgid "Inbox"
+msgstr ""
+
+#. TRANS: Menu item title in mailbox menu. Leads to incoming private messages.
+#: lib/mailboxmenu.php:61
+msgid "Your incoming messages."
+msgstr ""
+
+#. TRANS: Menu item in mailbox menu. Leads to outgoing private messages.
+#: lib/mailboxmenu.php:66
+msgctxt "MENU"
+msgid "Outbox"
+msgstr ""
+
+#. TRANS: Menu item title in mailbox menu. Leads to outgoing private messages.
+#: lib/mailboxmenu.php:68
+msgid "Your sent messages."
+msgstr ""
+
+#. TRANS: Error message in incoming mail handler used when an incoming e-mail cannot be processed.
+#: lib/mailhandler.php:38

 msgid "Could not parse message."
 msgstr ""
 
 msgid "Could not parse message."
 msgstr ""
 

-#: lib/mailhandler.php:42
+#. TRANS: Error message in incoming mail handler used when an incoming e-mail is not from a registered user.
+#: lib/mailhandler.php:44

 msgid "Not a registered user."
 msgstr ""
 
 msgid "Not a registered user."
 msgstr ""
 

-#: lib/mailhandler.php:46
+#. TRANS: Error message in incoming mail handler used when an incoming e-mail is not from a user's incoming e-mail address.
+#: lib/mailhandler.php:49

 msgid "Sorry, that is not your incoming email address."
 msgstr ""
 
 msgid "Sorry, that is not your incoming email address."
 msgstr ""
 

-#: lib/mailhandler.php:50
+#. TRANS: Error message in incoming mail handler used when no incoming e-mail is allowed.
+#: lib/mailhandler.php:54

 msgid "Sorry, no incoming email allowed."
 msgstr ""
 
 msgid "Sorry, no incoming email allowed."
 msgstr ""
 

-#: lib/mailhandler.php:229
+#. TRANS: Error message in incoming mail handler used when an incoming e-mail is of an unsupported type.
+#. TRANS: %s is the unsupported type.
+#: lib/mailhandler.php:235

 #, php-format
 #, php-format

-msgid "Unsupported message type: %s"
+msgid "Unsupported message type: %s."
+msgstr ""
+
+#. TRANS: Form legend for form to make a user a group admin.
+#: lib/makeadminform.php:87
+msgid "Make user an admin of the group"
+msgstr ""
+
+#. TRANS: Button text for the form that will make a user administrator.
+#: lib/makeadminform.php:120
+msgctxt "BUTTON"
+msgid "Make Admin"
+msgstr ""
+
+#. TRANS: Submit button title.
+#: lib/makeadminform.php:124
+msgctxt "TOOLTIP"
+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.


@@ -8614,44 +9837,103 @@ msgstr ""
 msgid "\"%s\" is not a supported file type on this server."
 msgstr ""
 
 msgid "\"%s\" is not a supported file type on this server."
 msgstr ""
 

-#: lib/messageform.php:120
+#. TRANS: Form legend for direct notice.
+#: lib/messageform.php:114

 msgid "Send a direct notice"
 msgstr ""
 
 msgid "Send a direct notice"
 msgstr ""
 

-#. TRANS Label entry in drop-down selection box in direct-message inbox/outbox. This is the default entry in the drop-down box, doubling as instructions and a brake against accidental submissions with the first user in the list.
-#: lib/messageform.php:137
+#. TRANS: Label entry in drop-down selection box in direct-message inbox/outbox.
+#. TRANS: This is the default entry in the drop-down box, doubling as instructions
+#. TRANS: and a brake against accidental submissions with the first user in the list.
+#: lib/messageform.php:132

 msgid "Select recipient:"
 msgstr ""
 
 msgid "Select recipient:"
 msgstr ""
 

-#. TRANS Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
-#: lib/messageform.php:150
+#. 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 ""
 
 msgid "No mutual subscribers."
 msgstr ""
 

-#: lib/messageform.php:153
+#. TRANS: Dropdown label in direct notice form.
+#: lib/messageform.php:149

 msgid "To"
 msgstr ""
 
 msgid "To"
 msgstr ""
 

-#: lib/messageform.php:166 lib/noticeform.php:186
-msgid "Available characters"
-msgstr ""
-
-#: lib/messageform.php:185 lib/noticeform.php:237
+#. TRANS: Button text for sending a direct notice.
+#: lib/messageform.php:179

 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr ""
 
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr ""
 

+#. TRANS: Header in message list.

 #: lib/messagelist.php:77
 msgid "Messages"
 msgstr ""
 
 #: lib/messagelist.php:77
 msgid "Messages"
 msgstr ""
 

-#: lib/messagelistitem.php:123 lib/noticelist.php:522
+#. TRANS: Followed by notice source (usually the client used to send the notice).
+#. TRANS: Followed by notice source.
+#: lib/messagelistitem.php:123 lib/noticelistitem.php:526

 msgid "from"
 msgstr ""
 
 msgid "from"
 msgstr ""
 

-#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:165
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
+#. TRANS: A possible notice source (web interface).
+#: lib/messagelistitem.php:144 lib/noticelistitem.php:521
+msgctxt "SOURCE"
+msgid "web"
+msgstr ""
+
+#. TRANS: A possible notice source (XMPP).
+#: lib/messagelistitem.php:146
+msgctxt "SOURCE"
+msgid "xmpp"
+msgstr ""
+
+#. TRANS: A possible notice source (e-mail).
+#: lib/messagelistitem.php:148
+msgctxt "SOURCE"
+msgid "mail"
+msgstr ""
+
+#. TRANS: A possible notice source (OpenMicroBlogging).
+#: lib/messagelistitem.php:150
+msgctxt "SOURCE"
+msgid "omb"
+msgstr ""
+
+#. TRANS: A possible notice source (Application Programming Interface).
+#: lib/messagelistitem.php:152
+msgctxt "SOURCE"
+msgid "api"
+msgstr ""
+
+#. TRANS: Client exception thrown when no author for an activity was found.
+#: lib/microappplugin.php:358
+msgid "Cannot get author for activity."
+msgstr ""
+
+#. TRANS: Client exception thrown when ...
+#: lib/microappplugin.php:396
+msgid "Bookmark not posted to this group."
+msgstr ""
+
+#. TRANS: Client exception when ...
+#: 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.
+#: 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.
+#: lib/microappplugin.php:556
+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.
 msgstr ""
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.


@@ -8667,171 +9949,378 @@ msgid_plural "Nickname cannot be more than %d characters long."
 msgstr[0] ""
 msgstr[1] ""
 
 msgstr[0] ""
 msgstr[1] ""
 

-#: lib/noticeform.php:160
+#. TRANS: Form legend for notice form.
+#: lib/noticeform.php:194

 msgid "Send a notice"
 msgstr ""
 
 msgid "Send a notice"
 msgstr ""
 

-#: lib/noticeform.php:174
+#. TRANS: Title for notice label. %s is the user's nickname.
+#: lib/noticeform.php:208

 #, php-format
 msgid "What's up, %s?"
 msgstr ""
 
 #, php-format
 msgid "What's up, %s?"
 msgstr ""
 

-#: lib/noticeform.php:194
+#. TRANS: Input label in notice form for adding an attachment.
+#: lib/noticeform.php:228

 msgid "Attach"
 msgstr ""
 
 msgid "Attach"
 msgstr ""
 

-#: lib/noticeform.php:198
-msgid "Attach a file"
+#. TRANS: Title for input field to attach a file to a notice.
+#: lib/noticeform.php:233
+msgid "Attach a file."

 msgstr ""
 
 msgstr ""
 

-#: lib/noticeform.php:213
+#. TRANS: Field label to add location to a notice.
+#: lib/noticeform.php:271

 msgid "Share my location"
 msgstr ""
 
 msgid "Share my location"
 msgstr ""
 

-#: lib/noticeform.php:216
+#. TRANS: Text to not share location for a notice in notice form.
+#: lib/noticeform.php:276

 msgid "Do not share my location"
 msgstr ""
 
 msgid "Do not share my location"
 msgstr ""
 

-#: lib/noticeform.php:217
+#. TRANS: Timeout error text for location retrieval in notice form.
+#: lib/noticeform.php:278

 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
 msgstr ""
 
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
 msgstr ""
 

-#. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:452
+#. TRANS: Separator in profile addressees list.
+#: lib/noticelistitem.php:255
+msgctxt "SEPARATOR"
+msgid ", "
+msgstr ""
+
+#. TRANS: Used in coordinates as abbreviation of north.
+#: lib/noticelistitem.php:449

 msgid "N"
 msgstr ""
 
 msgid "N"
 msgstr ""
 

-#. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:454
+#. TRANS: Used in coordinates as abbreviation of south.
+#: lib/noticelistitem.php:451

 msgid "S"
 msgstr ""
 
 msgid "S"
 msgstr ""
 

-#. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:456
+#. TRANS: Used in coordinates as abbreviation of east.
+#: lib/noticelistitem.php:453

 msgid "E"
 msgstr ""
 
 msgid "E"
 msgstr ""
 

-#. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:458
+#. TRANS: Used in coordinates as abbreviation of west.
+#: lib/noticelistitem.php:455

 msgid "W"
 msgstr ""
 
 msgid "W"
 msgstr ""
 

-#: lib/noticelist.php:460
+#. TRANS: Coordinates message.
+#. TRANS: %1$s is lattitude degrees, %2$s is lattitude minutes,
+#. TRANS: %3$s is lattitude seconds, %4$s is N (north) or S (south) depending on lattitude,
+#. TRANS: %5$s is longitude degrees, %6$s is longitude minutes,
+#. TRANS: %7$s is longitude seconds, %8$s is E (east) or W (west) depending on longitude,
+#: lib/noticelistitem.php:462

 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr ""
 
 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr ""
 

-#: lib/noticelist.php:469
+#. TRANS: Followed by geo location.
+#: lib/noticelistitem.php:472

 msgid "at"
 msgstr ""
 
 msgid "at"
 msgstr ""
 

-#: lib/noticelist.php:518
-msgid "web"
-msgstr ""
-
-#: lib/noticelist.php:584
+#. TRANS: Addition in notice list item if notice is part of a conversation.
+#: lib/noticelistitem.php:587

 msgid "in context"
 msgstr ""
 
 msgid "in context"
 msgstr ""
 

-#: lib/noticelist.php:619
+#. TRANS: Addition in notice list item if notice was repeated. Followed by a span with a nickname.
+#: lib/noticelistitem.php:622

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

-#: lib/noticelist.php:646
-msgid "Reply to this notice"
+#. TRANS: Link title in notice list item to reply to a notice.
+#: lib/noticelistitem.php:650
+msgid "Reply to this notice."

 msgstr ""
 
 msgstr ""
 

-#: lib/noticelist.php:647
+#. TRANS: Link text in notice list item to reply to a notice.
+#: lib/noticelistitem.php:652

 msgid "Reply"
 msgstr ""
 
 msgid "Reply"
 msgstr ""
 

-#: lib/noticelist.php:673
-msgid "Delete this notice"
+#. TRANS: Link title in notice list item to delete a 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.
+#: lib/noticelistitem.php:701
+msgid "Notice repeated."

 msgstr ""
 
 msgstr ""
 

-#: lib/noticelist.php:691
-msgid "Notice repeated"
+#. TRANS: Field label for notice text.
+#: lib/noticeplaceholderform.php:55
+msgid "Update your status..."

 msgstr ""
 
 msgstr ""
 

-#: lib/nudgeform.php:116
+#. TRANS: Form legend of form to nudge/ping another user.
+#: lib/nudgeform.php:111

 msgid "Nudge this user"
 msgstr ""
 
 msgid "Nudge this user"
 msgstr ""
 

-#: lib/nudgeform.php:128
+#. TRANS: Button text to nudge/ping another user.
+#: lib/nudgeform.php:124
+msgctxt "BUTTON"

 msgid "Nudge"
 msgstr ""
 
 msgid "Nudge"
 msgstr ""
 

+#. TRANS: Button title to nudge/ping another user.

 #: lib/nudgeform.php:128
 #: lib/nudgeform.php:128

-msgid "Send a nudge to this user"
+msgid "Send a nudge to this user."
+msgstr ""
+
+#. TRANS: Server exception thrown in oEmbed action if no API endpoint is available.
+#: lib/oembedhelper.php:135
+msgid "No oEmbed API endpoint available."

 msgstr ""
 
 msgstr ""
 

-#: lib/oauthstore.php:294
-msgid "Error inserting new profile."
+#. TRANS: Field label for list.
+#: lib/peopletageditform.php:131
+msgctxt "LABEL"
+msgid "List"
+msgstr ""
+
+#. TRANS: Field title for list.
+#: lib/peopletageditform.php:134
+msgid "Change the list (letters, numbers, -, ., and _ are allowed)."

 msgstr ""
 
 msgstr ""
 

-#: lib/oauthstore.php:302
-msgid "Error inserting avatar."
+#. TRANS: Field title for description of list.
+#: lib/peopletageditform.php:141
+msgid "Describe the list or topic."

 msgstr ""
 
 msgstr ""
 

-#: lib/oauthstore.php:322
-msgid "Error inserting remote profile."
+#. TRANS: Field title for description of list.
+#. TRANS: %d is the maximum number of characters for the description.
+#: lib/peopletageditform.php:145
+#, php-format
+msgid "Describe the list or topic in %d character."
+msgid_plural "Describe the list or topic in %d characters."
+msgstr[0] ""
+msgstr[1] ""
+
+#. TRANS: Button title to delete a list.
+#: lib/peopletageditform.php:175
+msgid "Delete this list."

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Exception thrown when a notice is denied because it has been sent before.
-#: lib/oauthstore.php:362
-msgid "Duplicate notice."
+#. TRANS: Header in list edit form.
+#: lib/peopletageditform.php:182
+msgid "Add or remove people"

 msgstr ""
 
 msgstr ""
 

-#: lib/oauthstore.php:507
-msgid "Couldn't insert new subscription."
+#. TRANS: Header in list edit form.
+#: lib/peopletageditform.php:186
+msgctxt "HEADER"
+msgid "Search"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Personal group navigation menu option when logged in for viewing @-replies.
-#: lib/personalgroupnav.php:107
+#. TRANS: Menu item in list navigation panel.
+#: lib/peopletaggroupnav.php:113

 msgctxt "MENU"
 msgctxt "MENU"

-msgid "Replies"
+msgid "List"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Personal group navigation menu option when logged in for seeing own profile.
-#: lib/personalgroupnav.php:114
+#. TRANS: Menu item title in list navigation panel.
+#. TRANS: %1$s is a list, %2$s is a nickname.
+#: 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.
+#: lib/peopletaggroupnav.php:124

 msgctxt "MENU"
 msgctxt "MENU"

-msgid "Profile"
+msgid "Listed"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Personal group navigation menu option when logged in for viewing own favourited notices.
-#: lib/personalgroupnav.php:120
+#. TRANS: Menu item in list navigation panel.
+#. TRANS: Menu item in local navigation menu.
+#: lib/peopletaggroupnav.php:135 lib/subgroupnav.php:96

 msgctxt "MENU"
 msgctxt "MENU"

-msgid "Favorites"
+msgid "Subscribers"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Personal group navigation menu option when logged in for viewing recieved personal messages.
-#: lib/personalgroupnav.php:133
+#. TRANS: Menu item title in list navigation panel.
+#. TRANS: %1$s is a list, %2$s is a nickname.
+#: lib/peopletaggroupnav.php:138
+#, php-format
+msgid "Subscribers to %1$s list by %2$s."
+msgstr ""
+
+#. TRANS: Menu item in list navigation panel.
+#: lib/peopletaggroupnav.php:148

 msgctxt "MENU"
 msgctxt "MENU"

-msgid "Inbox"
+msgid "Edit"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing recieved personal messages.
-#: lib/personalgroupnav.php:135
-msgid "Your incoming messages"
+#. TRANS: Menu item title in list navigation panel.
+#. TRANS: %s is a list.
+#: lib/peopletaggroupnav.php:151
+#, php-format
+msgid "Edit %s list by you."
+msgstr ""
+
+#. TRANS: Title for link to edit list settings.
+#: lib/peopletaglist.php:196
+msgid "Edit list settings."
+msgstr ""
+
+#. TRANS: Text for link to edit list settings.
+#: lib/peopletaglist.php:198
+msgid "Edit"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Personal group navigation menu option when logged in for viewing senet personal messages.
-#: lib/personalgroupnav.php:140
+#. TRANS: Privacy mode text in list list item for private list.
+#: lib/peopletaglist.php:260
+msgctxt "MODE"
+msgid "Private"
+msgstr ""
+
+#. TRANS: Menu item in the group navigation page.
+#: lib/peopletagnav.php:78

 msgctxt "MENU"
 msgctxt "MENU"

-msgid "Outbox"
+msgid "List Subscriptions"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing senet personal messages.
-#: lib/personalgroupnav.php:142
-msgid "Your sent messages"
+#. TRANS: Tooltip for menu item in the group navigation page.
+#. TRANS: %s is a user nickname.
+#: lib/peopletagnav.php:81
+#, php-format
+msgctxt "TOOLTIP"
+msgid "Lists subscribed to by %s."

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Title for personal tag cloud section. %s is a user nickname.
-#: lib/personaltagcloudsection.php:56
+#. TRANS: Menu item in the group navigation page.
+#. TRANS: %s is a user nickname.
+#: lib/peopletagnav.php:88

 #, php-format
 #, php-format

-msgid "Tags in %s's notices"
+msgctxt "MENU"
+msgid "Lists with %s"
+msgstr ""
+
+#. TRANS: Tooltip for menu item in the group navigation page.
+#. TRANS: %s is a user nickname.
+#: lib/peopletagnav.php:91
+#, php-format
+msgctxt "TOOLTIP"
+msgid "Lists with %s."
+msgstr ""
+
+#. TRANS: Menu item in the group navigation page.
+#. TRANS: %s is a user nickname.
+#: lib/peopletagnav.php:98
+#, php-format
+msgctxt "MENU"
+msgid "Lists by %s"
+msgstr ""
+
+#. TRANS: Tooltip for menu item in the group navigation page.
+#. TRANS: %s is a user nickname.
+#: lib/peopletagnav.php:101
+#, php-format
+msgctxt "TOOLTIP"
+msgid "Lists by %s."
+msgstr ""
+
+#. TRANS: Label in lists widget.
+#: lib/peopletags.php:87
+msgctxt "LABEL"
+msgid "Your lists"
+msgstr ""
+
+#. TRANS: Fieldset legend in lists widget.
+#: lib/peopletags.php:135
+msgctxt "LEGEND"
+msgid "Edit lists"
+msgstr ""
+
+#. TRANS: Label in self tags widget.
+#: lib/peopletags.php:193
+msgctxt "LABEL"
+msgid "Tags"
+msgstr ""
+
+#. TRANS: Title for section contaning lists with the most subscribers.
+#: lib/peopletagsbysubssection.php:69
+msgid "Popular lists"
+msgstr ""
+
+#. TRANS: List summary. %1$d is the number of users in the list,
+#. TRANS: %2$d is the number of subscribers to the list.
+#: lib/peopletagsection.php:125
+#, php-format
+msgid "Listed: %1$d Subscribers: %2$d"
+msgstr ""
+
+#. TRANS: Title for page that displays which lists current user is part of.
+#: lib/peopletagsforusersection.php:69
+#, php-format
+msgid "Lists with you"
+msgstr ""
+
+#. TRANS: Title for page that displays which lists a user is part of.
+#. TRANS: %s is a profile name.
+#: lib/peopletagsforusersection.php:73
+#, php-format
+msgid "Lists with %s"
+msgstr ""
+
+#. TRANS: Title for page that displays lists a user has subscribed to.
+#: lib/peopletagsubscriptionssection.php:66
+msgid "List subscriptions"
+msgstr ""
+
+#. TRANS: Menu item in personal group navigation menu.
+#. TRANS: Menu item in settings navigation panel.
+#. TRANS: Menu item in local navigation menu.
+#: lib/personalgroupnav.php:82 lib/settingsnav.php:74 lib/subgroupnav.php:77
+msgctxt "MENU"
+msgid "Profile"
+msgstr ""
+
+#. TRANS: Menu item title in personal group navigation menu.
+#: lib/personalgroupnav.php:84
+msgid "Your profile"
+msgstr ""
+
+#. TRANS: Menu item in personal group navigation menu.
+#: lib/personalgroupnav.php:90
+msgctxt "MENU"
+msgid "Replies"
+msgstr ""
+
+#. TRANS: Menu item in personal group navigation menu.
+#: lib/personalgroupnav.php:98
+msgctxt "MENU"
+msgid "Favorites"
+msgstr ""
+
+#. TRANS: Replaces %s in '%s\'s favorite notices'. (Yes, we know we need to fix this.)
+#: lib/personalgroupnav.php:104
+msgctxt "FIXME"
+msgid "User"
+msgstr ""
+
+#. TRANS: Menu item in personal group navigation menu.
+#: lib/personalgroupnav.php:115
+msgctxt "MENU"
+msgid "Messages"
+msgstr ""
+
+#. TRANS: Menu item title in personal group navigation menu.
+#: lib/personalgroupnav.php:117
+msgid "Your incoming messages"

 msgstr ""
 
 #. TRANS: Displayed as version information for a plugin if no version information was found.
 msgstr ""
 
 #. TRANS: Displayed as version information for a plugin if no version information was found.


@@ -8839,54 +10328,106 @@ msgstr ""
 msgid "Unknown"
 msgstr ""
 
 msgid "Unknown"
 msgstr ""
 

-#. TRANS: H2 text for user subscription statistics.
-#. TRANS: Label for user statistics.
-#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:82
-msgid "Subscriptions"
+#. TRANS: Plugin admin panel controls
+#: lib/plugindisableform.php:90
+msgctxt "plugin"
+msgid "Disable"
+msgstr ""
+
+#. TRANS: Plugin admin panel controls
+#: lib/pluginenableform.php:112
+msgctxt "plugin"
+msgid "Enable"
+msgstr ""
+
+#. TRANS: Plugin description for a disabled plugin.
+#: lib/pluginlist.php:195
+msgctxt "plugin-description"
+msgid ""
+"(The plugin description is unavailable when a plugin has been disabled.)"
+msgstr ""
+
+#. TRANS: Menu item in primary navigation panel.
+#: lib/primarynav.php:58
+msgctxt "MENU"
+msgid "Settings"
+msgstr ""
+
+#. TRANS: Menu item title in primary navigation panel.
+#: lib/primarynav.php:60
+msgid "Change your personal settings."
+msgstr ""
+
+#. TRANS: Menu item in primary navigation panel.
+#: lib/primarynav.php:66
+msgctxt "MENU"
+msgid "Admin"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Text for user subscription statistics if user has more subscriptions than displayed.
-#: lib/profileaction.php:144
-msgid "All subscriptions"
+#. TRANS: Menu item title in primary navigation panel.
+#: lib/primarynav.php:68
+msgid "Site configuration."
+msgstr ""
+
+#. TRANS: Menu item in primary navigation panel.
+#: lib/primarynav.php:74
+msgctxt "MENU"
+msgid "Logout"
+msgstr ""
+
+#. TRANS: Menu item title in primary navigation panel.
+#: lib/primarynav.php:76
+msgid "Logout from the site."
+msgstr ""
+
+#. TRANS: Menu item title in primary navigation panel.
+#: lib/primarynav.php:84
+msgid "Login to the site."
+msgstr ""
+
+#: lib/profileaction.php:93
+msgid "This profile has been silenced by site moderators"
+msgstr ""
+
+#. TRANS: H2 text for user subscription statistics.
+#: lib/profileaction.php:135
+msgid "Following"

 msgstr ""
 
 #. TRANS: H2 text for user subscriber statistics.
 msgstr ""
 
 #. TRANS: H2 text for user subscriber statistics.

-#. TRANS: Label for user statistics.
-#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:90
-msgid "Subscribers"
+#: lib/profileaction.php:167
+msgid "Followers"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Text for user subscription statistics if user has more subscribers than displayed.
-#: lib/profileaction.php:181
-msgid "All subscribers"
+#. 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:213
+#: lib/profileaction.php:211

 msgid "User ID"
 msgstr ""
 
 #. TRANS: Label for user statistics.
 msgid "User ID"
 msgstr ""
 
 #. TRANS: Label for user statistics.

-#: lib/profileaction.php:219
+#: lib/profileaction.php:217

 msgid "Member since"
 msgstr ""
 
 msgid "Member since"
 msgstr ""
 

-#. TRANS: Label for user statistics.
-#. TRANS: H2 text for user group membership statistics.
-#: lib/profileaction.php:239 lib/profileaction.php:290
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
-msgid "Groups"
-msgstr ""
-

 #. TRANS: Label for user statistics.
 #. TRANS: Average count of posts made per day since account registration.
 #. TRANS: Label for user statistics.
 #. TRANS: Average count of posts made per day since account registration.

-#: lib/profileaction.php:253
+#: lib/profileaction.php:230

 msgid "Daily average"
 msgstr ""
 
 msgid "Daily average"
 msgstr ""
 

-#. TRANS: Text for user group membership statistics if user has more subscriptions than displayed.
+#. TRANS: H2 text for user group membership statistics.
+#: lib/profileaction.php:267
+msgid "Groups"
+msgstr ""
+
+#. TRANS: H2 text for user list membership statistics.

 #: lib/profileaction.php:305
 #: lib/profileaction.php:305

-msgid "All groups"
+msgid "Lists"

 msgstr ""
 
 #. TRANS: Server error displayed when using an unimplemented method.
 msgstr ""
 
 #. TRANS: Server error displayed when using an unimplemented method.


@@ -8894,180 +10435,458 @@ msgstr ""
 msgid "Unimplemented method."
 msgstr ""
 
 msgid "Unimplemented method."
 msgstr ""
 

-#: lib/publicgroupnav.php:78
-msgid "Public"
+#. TRANS: Menu item title in search group navigation panel.
+#: lib/publicgroupnav.php:75
+msgid "User groups"

 msgstr ""
 
 msgstr ""
 

-#: lib/publicgroupnav.php:82
-msgid "User groups"
+#. TRANS: Menu item in search group navigation panel.
+#: lib/publicgroupnav.php:79
+msgctxt "MENU"
+msgid "Recent tags"

 msgstr ""
 
 msgstr ""
 

-#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
+#. TRANS: Menu item title in search group navigation panel.
+#: lib/publicgroupnav.php:81

 msgid "Recent tags"
 msgstr ""
 
 msgid "Recent tags"
 msgstr ""
 

-#: lib/publicgroupnav.php:88
+#. TRANS: Menu item in search group navigation panel.
+#: lib/publicgroupnav.php:86
+msgctxt "MENU"

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

-#: lib/publicgroupnav.php:92
+#. TRANS: Menu item in search group navigation panel.
+#: lib/publicgroupnav.php:93
+msgctxt "MENU"

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

-#: lib/redirectingaction.php:95
-msgid "No return-to arguments."
+#. TRANS: Title for inbox tag cloud section.
+#: lib/publictagcloudsection.php:53
+msgctxt "TITLE"
+msgid "Trending topics"

 msgstr ""
 
 msgstr ""
 

-#: lib/repeatform.php:107
-msgid "Repeat this notice?"
+#. TRANS: Client error displayed when return-to was defined without a target.
+#: lib/redirectingaction.php:93
+msgid "No return-to arguments."

 msgstr ""
 
 msgstr ""
 

-#: lib/repeatform.php:132
-msgid "Yes"
+#. TRANS: For legend for notice repeat form.
+#: lib/repeatform.php:102
+msgid "Repeat this notice?"

 msgstr ""
 
 msgstr ""
 

-#: lib/repeatform.php:132
-msgid "Repeat this notice"
+#. TRANS: Button title to repeat a notice on notice repeat form.
+#: lib/repeatform.php:128
+msgid "Repeat this notice."

 msgstr ""
 
 msgstr ""
 

-#: lib/revokeroleform.php:91
+#. TRANS: Description of role revoke form. %s is the role to be revoked.
+#: lib/revokeroleform.php:88

 #, php-format
 msgid "Revoke the \"%s\" role from this user"
 msgstr ""
 
 #. TRANS: Client error on action trying to visit a non-existing page.
 #, php-format
 msgid "Revoke the \"%s\" role from this user"
 msgstr ""
 
 #. TRANS: Client error on action trying to visit a non-existing page.

-#: lib/router.php:974
+#: lib/router.php:1140

 msgid "Page not found."
 msgstr ""
 
 msgid "Page not found."
 msgstr ""
 

-#: lib/sandboxform.php:67
+#. TRANS: Title of form to sandbox a user.
+#: lib/sandboxform.php:65
+msgctxt "TITLE"

 msgid "Sandbox"
 msgstr ""
 
 msgid "Sandbox"
 msgstr ""
 

-#: lib/sandboxform.php:78
+#. TRANS: Description of form to sandbox a user.
+#: lib/sandboxform.php:76

 msgid "Sandbox this user"
 msgstr ""
 
 #. TRANS: Fieldset legend for the search form.
 msgid "Sandbox this user"
 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.

-#: lib/searchaction.php:130
+#. TRANS: Button text for search button on search form.
+#. TRANS: Button text to search profiles.
+#: lib/searchaction.php:116 lib/searchform.php:76 lib/togglepeopletag.php:134

 msgctxt "BUTTON"
 msgid "Search"
 msgstr ""
 
 msgctxt "BUTTON"
 msgid "Search"
 msgstr ""
 

-#. TRANS: Definition list item with instructions on how to get (better) search results.
-#: lib/searchaction.php:170
-msgid "Search help"
+#. TRANS: Standard search suggestions shown when a search does not give any results.
+#: lib/searchaction.php:129
+msgid ""
+"* Make sure all words are spelled correctly.\n"
+"* Try different keywords.\n"
+"* Try more general keywords.\n"
+"* Try fewer keywords."

 msgstr ""
 
 msgstr ""
 

-#: lib/searchgroupnav.php:80
+#. TRANS: Standard search suggestions shown when a search does not give any results.
+#: lib/searchaction.php:140
+#, php-format
+msgid ""
+"You can also try your search on other engines:\n"
+"\n"
+"* [Twingly](http://www.twingly.com/search?q=%s&content=microblog&site=%%%%"
+"site.server%%%%)\n"
+"* [Tweet scan](http://www.tweetscan.com/indexi.php?s=%s)\n"
+"* [Google](http://www.google.com/search?q=site%%3A%%%%site.server%%%%+%s)\n"
+"* [Yahoo](http://search.yahoo.com/search?p=site%%3A%%%%site.server%%%%+%s)\n"
+"* [Collecta](http://collecta.com/#q=%s)"
+msgstr ""
+
+#. TRANS: Menu item in search group navigation panel.
+#: lib/searchgroupnav.php:74
+msgctxt "MENU"

 msgid "People"
 msgstr ""
 
 msgid "People"
 msgstr ""
 

-#: lib/searchgroupnav.php:81
+#. TRANS: Menu item title in search group navigation panel.
+#: lib/searchgroupnav.php:76

 msgid "Find people on this site"
 msgstr ""
 
 msgid "Find people on this site"
 msgstr ""
 

-#: lib/searchgroupnav.php:83
+#. TRANS: Menu item in search group navigation panel.
+#: lib/searchgroupnav.php:78
+msgctxt "MENU"
+msgid "Notices"
+msgstr ""
+
+#. TRANS: Menu item title in search group navigation panel.
+#: lib/searchgroupnav.php:80

 msgid "Find content of notices"
 msgstr ""
 
 msgid "Find content of notices"
 msgstr ""
 

-#: lib/searchgroupnav.php:85
+#. TRANS: Menu item title in search group navigation panel.
+#: lib/searchgroupnav.php:84

 msgid "Find groups on this site"
 msgstr ""
 
 msgid "Find groups on this site"
 msgstr ""
 

-#: lib/section.php:89
+#. TRANS: Secondary navigation menu item leading to Terms of Service.
+#: lib/secondarynav.php:67
+msgctxt "MENU"
+msgid "TOS"
+msgstr ""
+
+#. TRANS: Secondary navigation menu item leading to privacy policy.
+#: lib/secondarynav.php:71
+msgctxt "MENU"
+msgid "Privacy"
+msgstr ""
+
+#. TRANS: Secondary navigation menu item. Leads to information about StatusNet and its license.
+#: lib/secondarynav.php:74
+msgctxt "MENU"
+msgid "Source"
+msgstr ""
+
+#. TRANS: Secondary navigation menu item leading to version information on the StatusNet site.
+#: lib/secondarynav.php:77
+msgctxt "MENU"
+msgid "Version"
+msgstr ""
+
+#. TRANS: Default title for section/sidebar widget.
+#: lib/section.php:105

 msgid "Untitled section"
 msgstr ""
 
 msgid "Untitled section"
 msgstr ""
 

-#: lib/section.php:106
+#. TRANS: Default "More..." title for section/sidebar widget.
+#: lib/section.php:129

 msgid "More..."
 msgstr ""
 
 msgid "More..."
 msgstr ""
 

-#: lib/silenceform.php:67
+#. TRANS: Header in settings navigation panel.
+#: lib/settingsnav.php:68
+msgctxt "HEADER"
+msgid "Settings"
+msgstr ""
+
+#. TRANS: Menu item title in settings navigation panel.
+#: lib/settingsnav.php:76
+msgid "Change your profile settings"
+msgstr ""
+
+#. TRANS: Menu item in settings navigation panel.
+#: lib/settingsnav.php:81
+msgctxt "MENU"
+msgid "Avatar"
+msgstr ""
+
+#. TRANS: Menu item title in settings navigation panel.
+#: lib/settingsnav.php:83
+msgid "Upload an avatar"
+msgstr ""
+
+#. TRANS: Menu item in settings navigation panel.
+#: lib/settingsnav.php:88
+msgctxt "MENU"
+msgid "Password"
+msgstr ""
+
+#. TRANS: Menu item title in settings navigation panel.
+#: lib/settingsnav.php:90
+msgid "Change your password"
+msgstr ""
+
+#. TRANS: Menu item in settings navigation panel.
+#: lib/settingsnav.php:95
+msgctxt "MENU"
+msgid "Email"
+msgstr ""
+
+#. TRANS: Menu item title in settings navigation panel.
+#: lib/settingsnav.php:97
+msgid "Change email handling"
+msgstr ""
+
+#. TRANS: Menu item in settings navigation panel.
+#: lib/settingsnav.php:102
+msgctxt "MENU"
+msgid "URL"
+msgstr ""
+
+#. TRANS: Menu item title in settings navigation panel.
+#: lib/settingsnav.php:104
+msgid "URL shorteners"
+msgstr ""
+
+#. TRANS: Menu item in settings navigation panel.
+#: lib/settingsnav.php:116
+msgctxt "MENU"
+msgid "IM"
+msgstr ""
+
+#. TRANS: Menu item title in settings navigation panel.
+#: lib/settingsnav.php:118
+msgid "Updates by instant messenger (IM)"
+msgstr ""
+
+#. TRANS: Menu item in settings navigation panel.
+#: lib/settingsnav.php:125
+msgctxt "MENU"
+msgid "SMS"
+msgstr ""
+
+#. TRANS: Menu item title in settings navigation panel.
+#: lib/settingsnav.php:127
+msgid "Updates by SMS"
+msgstr ""
+
+#. TRANS: Menu item in settings navigation panel.
+#: lib/settingsnav.php:133
+msgctxt "MENU"
+msgid "Connections"
+msgstr ""
+
+#. TRANS: Menu item title in settings navigation panel.
+#: lib/settingsnav.php:135
+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"

 msgid "Silence"
 msgstr ""
 
 msgid "Silence"
 msgstr ""
 

-#: lib/silenceform.php:78
+#. TRANS: Description of form to silence a user.
+#: lib/silenceform.php:76

 msgid "Silence this user"
 msgstr ""
 
 msgid "Silence this user"
 msgstr ""
 

-#: lib/subgroupnav.php:83
-#, php-format
-msgid "People %s subscribes to"
+#. 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 ""
 
 msgstr ""
 

-#: lib/subgroupnav.php:91
+#. 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"
+msgid "Subscriptions"
+msgstr ""
+
+#. TRANS: Menu item title in local navigation menu.
+#. TRANS: %s is a user nickname.
+#: lib/subgroupnav.php:88

 #, php-format
 #, php-format

-msgid "People subscribed to %s"
+msgid "People %s subscribes to."

 msgstr ""
 
 msgstr ""
 

+#. TRANS: Menu item title in local navigation menu.
+#. TRANS: %s is a user nickname.

 #: lib/subgroupnav.php:99
 #, php-format
 #: lib/subgroupnav.php:99
 #, php-format

-msgid "Groups %s is a member of"
+msgid "People subscribed to %s."
+msgstr ""
+
+#. TRANS: Menu item in local navigation menu.
+#. TRANS: %d is the number of pending subscription requests.
+#: lib/subgroupnav.php:112
+#, php-format
+msgctxt "MENU"
+msgid "Pending (%d)"
+msgstr ""
+
+#. TRANS: Menu item title in local navigation menu.
+#: lib/subgroupnav.php:114
+#, php-format
+msgid "Approve pending subscription requests."

 msgstr ""
 
 msgstr ""
 

-#: lib/subgroupnav.php:105
+#. TRANS: Menu item title in local navigation menu.
+#. TRANS: %s is a user nickname.
+#: lib/subgroupnav.php:127
+#, php-format
+msgid "Groups %s is a member of."
+msgstr ""
+
+#. TRANS: Menu item title in local navigation menu.
+#. TRANS: %s is a user nickname.
+#: lib/subgroupnav.php:138
+#, php-format
+msgid "List subscriptions by %s."
+msgstr ""
+
+#. TRANS: Menu item in local navigation menu.
+#: lib/subgroupnav.php:146
+msgctxt "MENU"

 msgid "Invite"
 msgstr ""
 
 msgid "Invite"
 msgstr ""
 

-#: lib/subgroupnav.php:106
+#. TRANS: Menu item title in local navigation menu.
+#. TRANS: %s is the StatusNet sitename.
+#: lib/subgroupnav.php:149

 #, php-format
 #, php-format

-msgid "Invite friends and colleagues to join you on %s"
+msgid "Invite friends and colleagues to join you on %s."

 msgstr ""
 
 msgstr ""
 

-#: lib/subscribeform.php:115 lib/subscribeform.php:139
+#. TRANS: Form of form to subscribe to a user.
+#: lib/subscribeform.php:107

 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
 msgid "People Tagcloud as self-tagged"
 msgstr ""
 
 #: lib/subscriberspeopleselftagcloudsection.php:48
 #: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
 msgstr ""
 

+#. TRANS: Title of personal tag cloud section.

 #: lib/subscriberspeopletagcloudsection.php:48
 #: lib/subscriptionspeopletagcloudsection.php:48
 msgid "People Tagcloud as tagged"
 msgstr ""
 
 #: lib/subscriberspeopletagcloudsection.php:48
 #: lib/subscriptionspeopletagcloudsection.php:48
 msgid "People Tagcloud as tagged"
 msgstr ""
 

-#: lib/tagcloudsection.php:56
+#. TRANS: Content displayed in a tag cloud section if there are no tags.
+#: lib/tagcloudsection.php:56 lib/tagcloudsection.php:72
+msgctxt "NOTAGS"

 msgid "None"
 msgstr ""
 
 #. TRANS: Server exception displayed if a theme name was invalid.
 msgid "None"
 msgstr ""
 
 #. TRANS: Server exception displayed if a theme name was invalid.

-#: lib/theme.php:74
+#: lib/theme.php:79

 msgid "Invalid theme name."
 msgstr ""
 
 msgid "Invalid theme name."
 msgstr ""
 

-#: lib/themeuploader.php:50
+#. TRANS: Exception thrown when a compressed theme is uploaded while no support present in PHP configuration.
+#: lib/themeuploader.php:51

 msgid "This server cannot handle theme uploads without ZIP support."
 msgstr ""
 
 msgid "This server cannot handle theme uploads without ZIP support."
 msgstr ""
 

-#: lib/themeuploader.php:58 lib/themeuploader.php:61
+#. TRANS: Server exception thrown when uploading a theme fails.
+#: lib/themeuploader.php:60 lib/themeuploader.php:64

 msgid "The theme file is missing or the upload failed."
 msgstr ""
 
 msgid "The theme file is missing or the upload failed."
 msgstr ""
 

-#: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:279 lib/themeuploader.php:283
-#: lib/themeuploader.php:291 lib/themeuploader.php:298
+#. TRANS: Server exception thrown when saving an uploaded theme after decompressing it fails.
+#. TRANS: Server exception thrown when an uploaded theme cannot be saved during extraction.
+#: lib/themeuploader.php:95 lib/themeuploader.php:107
+#: lib/themeuploader.php:293 lib/themeuploader.php:298
+#: lib/themeuploader.php:307 lib/themeuploader.php:315

 msgid "Failed saving theme."
 msgstr ""
 
 msgid "Failed saving theme."
 msgstr ""
 

-#: lib/themeuploader.php:147
-msgid "Invalid theme: bad directory structure."
+#. TRANS: Server exception thrown when an uploaded theme has an incorrect structure.
+#: lib/themeuploader.php:153
+msgid "Invalid theme: Bad directory structure."

 msgstr ""
 
 msgstr ""
 

-#: lib/themeuploader.php:166
+#. TRANS: Client exception thrown when an uploaded theme is larger than the limit.
+#. TRANS: %d is the number of bytes of the uncompressed theme.
+#: lib/themeuploader.php:174

 #, php-format
 msgid "Uploaded theme is too large; must be less than %d byte uncompressed."
 msgid_plural ""
 #, php-format
 msgid "Uploaded theme is too large; must be less than %d byte uncompressed."
 msgid_plural ""


@@ -9075,144 +10894,265 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
 msgstr[0] ""
 msgstr[1] ""
 

-#: lib/themeuploader.php:179
-msgid "Invalid theme archive: missing file css/display.css"
+#. TRANS: Server exception thrown when an uploaded theme is incomplete.
+#: lib/themeuploader.php:188
+msgid "Invalid theme archive: Missing file css/display.css"

 msgstr ""
 
 msgstr ""
 

-#: lib/themeuploader.php:219
+#. TRANS: Server exception thrown when an uploaded theme has an incorrect file or folder name.
+#: lib/themeuploader.php:229

 msgid ""
 "Theme contains invalid file or folder name. Stick with ASCII letters, "
 "digits, underscore, and minus sign."
 msgstr ""
 
 msgid ""
 "Theme contains invalid file or folder name. Stick with ASCII letters, "
 "digits, underscore, and minus sign."
 msgstr ""
 

-#: lib/themeuploader.php:225
+#. TRANS: Server exception thrown when an uploaded theme contains files with unsafe file extensions.
+#: lib/themeuploader.php:236

 msgid "Theme contains unsafe file extension names; may be unsafe."
 msgstr ""
 
 msgid "Theme contains unsafe file extension names; may be unsafe."
 msgstr ""
 

-#: lib/themeuploader.php:242
+#. TRANS: Server exception thrown when an uploaded theme contains a file type that is not allowed.
+#. TRANS: %s is the file type that is not allowed.
+#: lib/themeuploader.php:255

 #, php-format
 #, php-format

-msgid "Theme contains file of type '.%s', which is not allowed."
+msgid "Theme contains file of type \".%s\", which is not allowed."

 msgstr ""
 
 msgstr ""
 

-#: lib/themeuploader.php:260
+#. TRANS: Server exception thrown when an uploaded compressed theme cannot be opened.
+#: lib/themeuploader.php:273

 msgid "Error opening theme archive."
 msgstr ""
 
 msgid "Error opening theme archive."
 msgstr ""
 

-#: lib/topposterssection.php:74
-msgid "Top posters"
+#. TRANS: Header for Notices section.
+#: lib/threadednoticelist.php:76
+msgctxt "HEADER"
+msgid "Notices"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Title for the form to unblock a user.
-#: lib/unblockform.php:67
-msgctxt "TITLE"
-msgid "Unblock"
+#. TRANS: Link to show replies for a notice.
+#. TRANS: %d is the number of replies to a notice and used for plural.
+#: lib/threadednoticelist.php:371
+#, php-format
+msgid "Show reply"
+msgid_plural "Show all %d replies"
+msgstr[0] ""
+msgstr[1] ""
+
+#. TRANS: Reference to the logged in user in favourite list.
+#: lib/threadednoticelist.php:437
+msgctxt "FAVELIST"
+msgid "You"

 msgstr ""
 
 msgstr ""
 

-#: lib/unsandboxform.php:69
-msgid "Unsandbox"
+#. TRANS: For building a list such as "Jim, Bob, Mary and 5 others like this".
+#. TRANS: %1$s is a list of users, separated by a separator (default: ", "), %2$s is the last user in the list.
+#: lib/threadednoticelist.php:475
+#, php-format
+msgctxt "FAVELIST"
+msgid "%1$s and %2$s"

 msgstr ""
 
 msgstr ""
 

-#: lib/unsandboxform.php:80
-msgid "Unsandbox this user"
+#. TRANS: List message for notice favoured by logged in user.
+#: lib/threadednoticelist.php:509
+msgctxt "FAVELIST"
+msgid "You like this."

 msgstr ""
 
 msgstr ""
 

-#: lib/unsilenceform.php:67
-msgid "Unsilence"
+#. TRANS: List message for when more than 4 people like something.
+#. TRANS: %%s is a list of users liking a notice, %d is the number over 4 that like the notice.
+#. TRANS: Plural is decided on the total number of users liking the notice (count of %%s + %d).
+#: lib/threadednoticelist.php:514
+#, php-format
+msgid "%%s and %d others like this."
+msgid_plural "%%s and %d others like this."
+msgstr[0] ""
+msgstr[1] ""
+
+#. TRANS: List message for favoured notices.
+#. TRANS: %%s is a list of users liking a notice.
+#. TRANS: Plural is based on the number of of users that have favoured a notice.
+#: lib/threadednoticelist.php:522
+#, php-format
+msgid "%%s likes this."
+msgid_plural "%%s like this."
+msgstr[0] ""
+msgstr[1] ""
+
+#. TRANS: List message for notice repeated by logged in user.
+#: lib/threadednoticelist.php:586
+msgctxt "REPEATLIST"
+msgid "You repeated this."

 msgstr ""
 
 msgstr ""
 

-#: lib/unsilenceform.php:78
-msgid "Unsilence this user"
+#. 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
+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] ""
+
+#. TRANS: Form legend.
+#: lib/togglepeopletag.php:94
+#, php-format
+msgid "Search and list people"

 msgstr ""
 
 msgstr ""
 

-#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
-msgid "Unsubscribe from this user"
+#. TRANS: Dropdown option for searching in profiles.
+#: lib/togglepeopletag.php:105
+msgid "Everything"

 msgstr ""
 
 msgstr ""
 

-#: lib/unsubscribeform.php:137
-msgid "Unsubscribe"
+#. TRANS: Dropdown option for searching in profiles.
+#: lib/togglepeopletag.php:109
+msgid "Fullname"

 msgstr ""
 
 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: Dropdown option for searching in profiles.
+#: lib/togglepeopletag.php:115
+msgid "URI (Remote users)"
+msgstr ""
+
+#. TRANS: Dropdown field label.
+#: lib/togglepeopletag.php:121
+msgctxt "LABEL"
+msgid "Search in"
+msgstr ""
+
+#. TRANS: Dropdown field title.
+#: lib/togglepeopletag.php:123
+msgid "Choose a field to search."
+msgstr ""
+
+#. TRANS: Form legend.
+#. TRANS: %1$s is a nickname, $2$s is a list.
+#: lib/togglepeopletag.php:190

 #, php-format
 #, php-format

-msgid "User %1$s (%2$d) has no profile record."
+msgid "Remove %1$s from list %2$s"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Link text for changeing the avatar of the logged in user.
-#: lib/userprofile.php:121
-msgid "Edit Avatar"
+#. TRANS: Legend on form to add a profile to a list.
+#. TRANS: %1$s is a nickname, %2$s is a list.
+#: lib/togglepeopletag.php:268
+#, php-format
+msgid "Add %1$s to list %2$s"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: H2 for user actions in a profile.
-#. TRANS: H2 for entity actions in a profile.
-#: lib/userprofile.php:245 lib/userprofile.php:261
-msgid "User actions"
+#. TRANS: Title for top posters section.
+#: lib/topposterssection.php:74
+msgid "Top posters"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Text shown in user profile of not yet compeltely deleted users.
-#: lib/userprofile.php:249
-msgid "User deletion in progress..."
+#. TRANS: Option in drop-down of potential addressees.
+#: lib/toselector.php:87
+msgctxt "SENDTO"
+msgid "Everyone"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:277
-msgid "Edit profile settings"
+#. TRANS: Option in drop-down of potential addressees.
+#. TRANS: %s is a StatusNet sitename.
+#: lib/toselector.php:93
+#, php-format
+msgid "My colleagues at %s"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:279
-msgid "Edit"
+#. TRANS: Label for drop-down of potential addressees.
+#: lib/toselector.php:115
+msgctxt "LABEL"
+msgid "To:"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:303
-msgid "Send a direct message to this user"
+#. TRANS: Checkbox label in widget for selecting potential addressees to mark the notice private.
+#: lib/toselector.php:124
+msgid "Private?"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:305
-msgid "Message"
+#. TRANS: Client exception thrown in widget for selecting potential addressees when an invalid fill option was received.
+#: lib/toselector.php:163
+#, php-format
+msgid "Unknown to value: \"%s\"."

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:347
-msgid "Moderate"
+#. TRANS: Title for the form to unblock a user.
+#: lib/unblockform.php:67
+msgctxt "TITLE"
+msgid "Unblock"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:386
-msgid "User role"
+#. TRANS: Title for unsandbox form.
+#: lib/unsandboxform.php:67
+msgctxt "TITLE"
+msgid "Unsandbox"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:389
-msgctxt "role"
-msgid "Administrator"
+#. TRANS: Description for unsandbox form.
+#: lib/unsandboxform.php:78
+msgid "Unsandbox this user"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:391
-msgctxt "role"
-msgid "Moderator"
+#. TRANS: Title for unsilence form.
+#: lib/unsilenceform.php:65
+msgid "Unsilence"
+msgstr ""
+
+#. TRANS: Form description for unsilence form.
+#: lib/unsilenceform.php:76
+msgid "Unsilence this user"

 msgstr ""
 
 msgstr ""
 

-#: lib/util.php:305
+#. TRANS: Form legend on unsubscribe form.
+#: lib/unsubscribeform.php:109
+msgid "Unsubscribe from this user"
+msgstr ""
+
+#. TRANS: Button text on unsubscribe form.
+#. TRANS: Button text for unsubscribing from a list.
+#: lib/unsubscribeform.php:132 lib/unsubscribepeopletagform.php:106
+msgctxt "BUTTON"
+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
+#, php-format
+msgid "User %1$s (%2$d) has no profile record."
+msgstr ""
+
+#. TRANS: Authorisation exception thrown when a user a not allowed to login.
+#: 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:1309
+#: 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:1312
+#: 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:1316
+#: 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"


@@ -9220,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:1319
+#: 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:1323
+#: 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"


@@ -9233,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:1326
+#: 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:1330
+#: 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"


@@ -9246,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:1333
+#: 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:1337
+#: 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"


@@ -9259,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:1340
+#: lib/util.php:1377

 msgid "about a year ago"
 msgstr ""
 
 msgid "about a year ago"
 msgstr ""
 


@@ -9270,21 +11210,6 @@ msgstr ""
 msgid "%s is not a valid color! Use 3 or 6 hex characters."
 msgstr ""
 
 msgid "%s is not a valid color! Use 3 or 6 hex characters."
 msgstr ""
 

-#. TRANS: %s is the URL to the StatusNet site's Instant Messaging settings.
-#: lib/xmppmanager.php:287
-#, php-format
-msgid "Unknown user. Go to %s to add your address to your account"
-msgstr ""
-
-#. TRANS: Response to XMPP source when it sent too long a message.
-#. TRANS: %1$d the maximum number of allowed characters (used for plural), %2$d is the sent number.
-#: lib/xmppmanager.php:406
-#, php-format
-msgid "Message too long. Maximum is %1$d character, you sent %2$d."
-msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
-msgstr[0] ""
-msgstr[1] ""
-

 #. TRANS: Exception.
 #: lib/xrd.php:63
 msgid "Invalid XML."
 #. TRANS: Exception.
 #: lib/xrd.php:63
 msgid "Invalid XML."