Merge branch '1.0.x' into testing

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

diff --git a/locale/statusnet.pot b/locale/statusnet.pot
index 8722900213d0ab32aedea586290fa53b2f3bf6e1..5847bda11cc929fe3a24db12981c394f538f691c 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-01-14 23:32+0000\n"
+"POT-Creation-Date: 2011-04-03 23:11+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,48 @@ 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:110
+#, 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:121
+msgid ""
+"An important error occured, probably related to email setup. Check logfiles "
+"for more info."
+msgstr ""
+
+#. TRANS: Error message.
+#: index.php:131
+msgid "An error occurred."
+msgstr ""
+
+#. TRANS: Error message displayed when there is no StatusNet configuration file.
+#: index.php:255
+#, php-format
+msgid ""
+"No configuration file found. Try running the installation program first."
+msgstr ""
+
+#. TRANS: Error message displayed when trying to access a non-existing page.
+#: index.php:286
+msgid "Unknown page"
+msgstr ""
+
+#. TRANS: Error message displayed when trying to perform an undefined action.
+#. TRANS: Title for password recovery page when an unknown action has been specified.
+#: index.php:341 actions/recoverpassword.php:232
+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 ""
 


@@ -70,32 +109,43 @@ msgid "Save access settings"
 msgstr ""
 
 #. TRANS: Tooltip for button to save access settings in site admin panel.
 msgstr ""
 
 #. TRANS: Tooltip for button to save access settings in site admin panel.

+#. TRANS: Button text for saving theme settings.

 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.

-#. TRANS: Button text for saving "Other settings" in profile.
+#. 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 for saving tags for other users.
+#. TRANS: Button text for saving "Other settings" in profile.

 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.
 #. TRANS: 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/emailsettings.php:254
-#: actions/imsettings.php:187 actions/othersettings.php:134
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
-#: actions/subscriptions.php:262 actions/useradminpanel.php:298
-#: lib/applicationeditform.php:355 lib/designsettings.php:270
-#: lib/groupeditform.php:207
+#. TRANS: Text for save button on group edit form.
+#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
+#: actions/emailsettings.php:251 actions/imsettings.php:201
+#: actions/licenseadminpanel.php:335 actions/pathsadminpanel.php:517
+#: actions/profilesettings.php:215 actions/sessionsadminpanel.php:202
+#: actions/siteadminpanel.php:319 actions/sitenoticeadminpanel.php:197
+#: actions/smssettings.php:204 actions/snapshotadminpanel.php:252
+#: actions/subscriptions.php:261 actions/tagother.php:144
+#: actions/urlsettings.php:152 actions/useradminpanel.php:300
+#: lib/applicationeditform.php:355 lib/designform.php:315
+#: lib/groupeditform.php:230

 msgctxt "BUTTON"
 msgid "Save"
 msgstr ""
 
 #. TRANS: Server error when page not found (404).
 #. TRANS: Server error when page not found (404)
 msgctxt "BUTTON"
 msgid "Save"
 msgstr ""
 
 #. 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:138 actions/tag.php:52
+#. TRANS: Server error when page not found (404).
+#: actions/all.php:68 actions/public.php:102 actions/replies.php:93
+#: actions/showfavorites.php:140 actions/tag.php:52

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


@@ -105,6 +155,8 @@ msgstr ""
 #. 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 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 when user not found for an API action to remove a block for a user.
 #. TRANS: Client error given when a user was not found (404).
 #. TRANS: Client error when user not found for an API direct message action.
 #. TRANS: Client error when user not found for an API action to remove a block for a user.
 #. TRANS: Client error given when a user was not found (404).
 #. TRANS: Client error when user not found for an API direct message action.


@@ -112,6 +164,8 @@ 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 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.


@@ -120,29 +174,49 @@ msgstr ""
 #. TRANS: Client error displayed when requesting most recent mentions for a non-existing user.
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed trying to get an avatar for a non-existing user.
 #. TRANS: Client error displayed when requesting most recent mentions for a non-existing user.
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed trying to get an avatar for a non-existing user.

+#. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a user nickname.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for an object that is not a user.
+#. TRANS: Client error displayed 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: Form validation error on page for remote subscribe when no user was provided.
+#. TRANS: Form validation error on page for remote subscribe when no user profile was found.
+#. TRANS: Client error displayed when trying to reply to a non-exsting user.
+#. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
+#. TRANS: Client error.
+#. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
+#. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
+#. TRANS: Client error displayed requesting groups for a non-existing user.
+#. TRANS: Client error displayed when user not found for an action.
+#. TRANS: Client error displayed providing a non-existing nickname.

 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.

+#. TRANS: Client error displayed when trying to perform a gallery action with an unknown user.
+#. TRANS: Client error displayed when trying to access a mailbox without providing a user.
+#. TRANS: Client error displayed when calling a profile action without specifying a user.

 #: actions/all.php:80 actions/allrss.php:69
 #: actions/apiaccountupdatedeliverydevice.php:110
 #: actions/apiaccountupdateprofile.php:103
 #: actions/apiaccountupdateprofilebackgroundimage.php:118
 #: actions/all.php:80 actions/allrss.php:69
 #: actions/apiaccountupdatedeliverydevice.php:110
 #: actions/apiaccountupdateprofile.php:103
 #: actions/apiaccountupdateprofilebackgroundimage.php:118

-#: actions/apiaccountupdateprofileimage.php:104 actions/apiatomservice.php:60
-#: actions/apiblockcreate.php:95 actions/apiblockdestroy.php:94
+#: 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/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/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:74
-#: actions/foaf.php:40 actions/foaf.php:58 actions/hcard.php:67
-#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
-#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154
-#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
-#: actions/showfavorites.php:105 actions/userbyid.php:74
-#: 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:82 lib/profileaction.php:77
+#: actions/apigrouplist.php:71 actions/apigroupprofileupdate.php:107
+#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:85
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:173
+#: actions/apitimelinehome.php:78 actions/apitimelinementions.php:77
+#: actions/apitimelineuser.php:79 actions/avatarbynickname.php:79
+#: actions/favoritesrss.php:72 actions/foaf.php:42 actions/foaf.php:61
+#: actions/hcard.php:67 actions/microsummary.php:63 actions/newmessage.php:119
+#: actions/otp.php:78 actions/remotesubscribe.php:156
+#: actions/remotesubscribe.php:166 actions/replies.php:72
+#: actions/repliesrss.php:38 actions/rsd.php:114 actions/showfavorites.php:106
+#: actions/userbyid.php:75 actions/usergroups.php:95 actions/userrss.php:41
+#: actions/userxrd.php:60 actions/xrds.php:71 lib/command.php:503
+#: lib/galleryaction.php:61 lib/mailbox.php:79 lib/profileaction.php:77

 msgid "No such user."
 msgstr ""
 
 msgid "No such user."
 msgstr ""
 


@@ -155,10 +229,18 @@ 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: Page title. %s is user nickname
 #. TRANS: H1 text for page. %s is a user nickname.
 #. TRANS: Message is used as link title. %s is a user nickname.

+#. TRANS: Title of API timeline for a user and friends.
+#. TRANS: %s is a username.

 #. TRANS: Timeline title for user and friends. %s is a user nickname.
 #. TRANS: Timeline title for user and friends. %s is a user nickname.

-#: actions/all.php:94 actions/all.php:191 actions/allrss.php:117
-#: actions/apitimelinefriends.php:207 actions/apitimelinehome.php:113
-#: lib/personalgroupnav.php:103
+#. TRANS: Menu item title in administrator navigation panel.
+#. TRANS: %s is a username.
+#. TRANS: Menu item title in personal group navigation menu.
+#. TRANS: %s is a username.
+#. TRANS: Menu item title in settings navigation panel.
+#. TRANS: %s is a username.
+#: actions/all.php:94 actions/all.php:185 actions/allrss.php:117
+#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:113
+#: lib/adminpanelnav.php:73 lib/personalgroupnav.php:77 lib/settingsnav.php:73

 #, php-format
 msgid "%s and friends"
 msgstr ""
 #, php-format
 msgid "%s and friends"
 msgstr ""


@@ -182,7 +264,7 @@ msgid "Feed for friends of %s (Atom)"
 msgstr ""
 
 #. TRANS: Empty list message. %s is a user nickname.
 msgstr ""
 
 #. TRANS: Empty list message. %s is a user nickname.

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

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


@@ -190,7 +272,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:140

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


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

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

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


@@ -208,9 +290,11 @@ msgstr ""
 
 #. TRANS: Encoutagement displayed on empty timeline user pages for anonymous users.
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 
 #. TRANS: Encoutagement displayed on empty timeline user pages for anonymous users.
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.

+#. TRANS: Empty list message for page with replies for a user for not logged in users.
+#. TRANS: %1$s is a user nickname. This message contains a Markdown link in the form [link text](link).

 #. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
 #. TRANS: 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:149 actions/replies.php:214 actions/showstream.php:222

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


@@ -218,37 +302,22 @@ msgid ""
 msgstr ""
 
 #. TRANS: H1 text for page when viewing a list for self.
 msgstr ""
 
 #. TRANS: H1 text for page when viewing a list for self.

-#: actions/all.php:188
+#: actions/all.php:182

 msgid "You 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.
 msgid "You and friends"
 msgstr ""
 
 #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
 #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name.

-#: actions/allrss.php:122 actions/apitimelinefriends.php:213
+#: actions/allrss.php:122 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 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 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.

-#: 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/apiaccountupdateprofilebackgroundimage.php:92
 #: actions/apiaccountupdatedeliverydevice.php:92
 #: actions/apiaccountupdateprofile.php:94
 #: actions/apiaccountupdateprofilebackgroundimage.php:92


@@ -257,22 +326,25 @@ msgstr ""
 #: 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/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/apigroupismember.php:115 actions/apigroupjoin.php:148
+#: actions/apigroupleave.php:138 actions/apigrouplist.php:135

 #: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
 #: 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/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
 #: 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/apistatusesshow.php:105 actions/apistatusnetconfig.php:139

 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
 #: 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/apitimelinefavorites.php:182 actions/apitimelinefriends.php:278
+#: actions/apitimelinegroup.php:148 actions/apitimelinehome.php:181
+#: actions/apitimelinementions.php:182 actions/apitimelinepublic.php:247
+#: actions/apitimelineretweetedtome.php:150
+#: actions/apitimelineretweetsofme.php:149 actions/apitimelinetag.php:165
+#: actions/apitimelineuser.php:217 actions/apiusershow.php:100

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


@@ -284,8 +356,9 @@ msgstr ""
 #: 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/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 ""
 


@@ -297,7 +370,19 @@ 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.

-#: actions/apiaccountupdatedeliverydevice.php:130
+#. 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 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 displayed when "Other" settings in user profile could not be updated on the server.
+#. TRANS: Server exception thrown on Profile design page when updating design settings fails.
+#: actions/apiaccountupdatedeliverydevice.php:136
+#: actions/confirmaddress.php:122 actions/emailsettings.php:353
+#: actions/emailsettings.php:499 actions/profilesettings.php:342
+#: actions/smssettings.php:301 actions/smssettings.php:454
+#: actions/urlsettings.php:213 actions/userdesignsettings.php:315

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


@@ -307,19 +392,26 @@ msgstr ""
 #. 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: 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 trying to reply to a user without a profile.
+#. TRANS: Server error displayed requesting groups for a user without a profile.
+#. TRANS: Server error displayed when trying to perform a gallery action with a user without a profile.
+#. TRANS: Server error displayed when calling a profile action while the specified user does not have a profile.

 #: actions/apiaccountupdateprofile.php:111
 #: actions/apiaccountupdateprofilebackgroundimage.php:199
 #: actions/apiaccountupdateprofilecolors.php:183
 #: actions/apiaccountupdateprofile.php:111
 #: actions/apiaccountupdateprofilebackgroundimage.php:199
 #: actions/apiaccountupdateprofilecolors.php:183

-#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiaccountupdateprofileimage.php:131

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

-#: actions/avatarbynickname.php:85 actions/foaf.php:65 actions/hcard.php:74
-#: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
-#: lib/profileaction.php:84
+#: actions/avatarbynickname.php:85 actions/foaf.php:69 actions/hcard.php:75
+#: actions/replies.php:80 actions/usergroups.php:103 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.
 msgid "User has no profile."
 msgstr ""
 
 #. TRANS: Server error displayed if a user profile could not be saved.

-#: actions/apiaccountupdateprofile.php:147
+#. TRANS: Server error thrown when user profile settings could not be saved.
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:442

 msgid "Could not save profile."
 msgstr ""
 
 msgid "Could not save profile."
 msgstr ""
 


@@ -329,9 +421,9 @@ msgstr ""
 #: actions/apiaccountupdateprofilebackgroundimage.php:108
 #: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
 #: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
 #: actions/apiaccountupdateprofilebackgroundimage.php:108
 #: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
 #: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269

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

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


@@ -346,62 +438,80 @@ msgstr[1] ""
 #. 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: Client error displayed when saving design settings fails because of an empty result.
 #. TRANS: Client error displayed when a database error occurs inserting profile colours.
 #. TRANS: Client error displayed when a database error occurs updating profile colours.

+#. TRANS: Form validation error displayed when group design settings could not be saved because of an application issue.
+#. TRANS: Form validation error on Profile design page when saving design settings has failed.
+#. TRANS: Form validation error on Profile design page when updating design settings has failed.

 #: actions/apiaccountupdateprofilebackgroundimage.php:138
 #: actions/apiaccountupdateprofilebackgroundimage.php:149
 #: actions/apiaccountupdateprofilecolors.php:160
 #: actions/apiaccountupdateprofilecolors.php:171
 #: actions/apiaccountupdateprofilebackgroundimage.php:138
 #: actions/apiaccountupdateprofilebackgroundimage.php:149
 #: actions/apiaccountupdateprofilecolors.php:160
 #: actions/apiaccountupdateprofilecolors.php:171

-#: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300
-#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
-#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
+#: actions/groupdesignsettings.php:295 actions/groupdesignsettings.php:306
+#: actions/userdesignsettings.php:222 actions/userdesignsettings.php:233
+#: actions/userdesignsettings.php:276 actions/userdesignsettings.php:287

 msgid "Unable to save your design settings."
 msgstr ""
 
 #. TRANS: Error displayed when updating design settings fails.
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
 msgid "Unable to save your design settings."
 msgstr ""
 
 #. TRANS: Error displayed when updating design settings fails.
 #. TRANS: Client error displayed when a database error occurs updating profile colours.

+#. TRANS: Form validation error on Profile design page when updating design settings has failed.
+#. TRANS: Error message displayed if design settings could not be saved.
+#. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".

 #: actions/apiaccountupdateprofilebackgroundimage.php:191
 #: actions/apiaccountupdateprofilecolors.php:139
 #: actions/apiaccountupdateprofilebackgroundimage.php:191
 #: actions/apiaccountupdateprofilecolors.php:139

+#: actions/userdesignsettings.php:199 lib/designsettings.php:217
+#: lib/designsettings.php:239

 msgid "Could not update your design."
 msgstr ""
 
 msgid "Could not update your design."
 msgstr ""
 

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

 msgid "Main"
 msgstr ""
 
 msgid "Main"
 msgstr ""
 

+#. TRANS: Title for Atom feed. %s is a user nickname.

 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title in atom group notice feed. %s is a group name.
 #. TRANS: Title in atom user notice feed. %s is a user name.
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title in atom group notice feed. %s is a group name.
 #. TRANS: Title in atom user notice feed. %s is a user name.

-#: actions/apiatomservice.php:93 actions/grouprss.php:139
-#: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
-#: lib/atomusernoticefeed.php:68
+#: actions/apiatomservice.php:93 actions/grouprss.php:138
+#: actions/userrss.php:95 lib/atomgroupnoticefeed.php:63
+#: lib/atomusernoticefeed.php:88

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

+#. TRANS: Title for Atom feed with a user's subscriptions. %s is a user nickname.
+#. TRANS: Title for Atom subscription feed.
+#. TRANS: %s is a user nickname.

 #. TRANS: Header for subscriptions overview for a user (first page).
 #. TRANS: %s is a user nickname.
 #. TRANS: Header for subscriptions overview for a user (first page).
 #. TRANS: %s is a user nickname.

-#: actions/apiatomservice.php:103 actions/atompubsubscriptionfeed.php:147
+#: actions/apiatomservice.php:104 actions/atompubsubscriptionfeed.php:148

 #: actions/subscriptions.php:51
 #, php-format
 msgid "%s subscriptions"
 msgstr ""
 
 #: actions/subscriptions.php:51
 #, php-format
 msgid "%s subscriptions"
 msgstr ""
 

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

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

-#: actions/apiatomservice.php:123
+#. TRANS: Title for Atom feed with a user's memberships. %s is a user nickname.
+#: actions/apiatomservice.php:126

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

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

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

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

 msgid "Block user failed."
 msgstr ""
 
 msgid "Block user failed."
 msgstr ""
 


@@ -443,7 +553,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."


@@ -457,7 +567,7 @@ msgstr ""
 
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
 #: actions/apidirectmessagenew.php:144
 
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
 #: actions/apidirectmessagenew.php:144

-msgid "Can't send direct messages to users who aren't your friend."
+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).


@@ -480,8 +590,9 @@ msgid "This status is already a favorite."
 msgstr ""
 
 #. TRANS: Client error displayed when marking a notice as favourite fails.
 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: Error message text shown when a favorite could not be set.

-#: actions/apifavoritecreate.php:132 actions/favor.php:84 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 ""
 


@@ -491,7 +602,8 @@ msgid "That status is not a favorite."
 msgstr ""
 
 #. TRANS: Client error displayed when removing a favourite has failed.
 msgstr ""
 
 #. TRANS: Client error displayed when removing a favourite has failed.

-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#. TRANS: Server error displayed when removing a favorite from the database fails.
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:90

 msgid "Could not delete favorite."
 msgstr ""
 
 msgid "Could not delete favorite."
 msgstr ""
 


@@ -533,58 +645,70 @@ 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:189
-#: actions/newgroup.php:136 actions/profilesettings.php:277
-#: actions/register.php:214
+#. TRANS: Form validation error displayed when trying to register with an existing nickname.
+#: actions/apigroupcreate.php:156 actions/apigroupprofileupdate.php:257
+#: actions/editgroup.php:192 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:193
-#: actions/newgroup.php:140 actions/profilesettings.php:247
-#: actions/register.php:216
+#. TRANS: Form validation error displayed when trying to register with an invalid nickname.
+#: actions/apigroupcreate.php:164 actions/apigroupprofileupdate.php:262
+#: actions/editgroup.php:196 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 "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: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.

-#: actions/apigroupcreate.php:181 actions/editapplication.php:233
-#: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:252
-#: actions/register.php:223
+#. 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:203
+#: 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:204
-#: actions/newgroup.php:151 actions/profilesettings.php:256
-#: actions/register.php:226
+#. 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:207 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: 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: 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: Group edit form validation error.
 #. 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:201
-#: actions/editgroup.php:209 actions/newapplication.php:178
-#: actions/newgroup.php:156
+#: actions/apigroupcreate.php:201 actions/apigroupprofileupdate.php:301
+#: actions/editapplication.php:203 actions/editgroup.php:212
+#: 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)."


@@ -592,23 +716,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:216
-#: actions/newgroup.php:163 actions/profilesettings.php:269
-#: actions/register.php:235
+#. 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:219 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:229
-#: actions/newgroup.php:176
+#: actions/apigroupcreate.php:236 actions/apigroupprofileupdate.php:332
+#: actions/editgroup.php:232 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."


@@ -617,26 +745,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 edit form validation error.

-#. TRANS: Group create form validation error.
-#: actions/apigroupcreate.php:264 actions/editgroup.php:244
-#: actions/newgroup.php:191
+#. TRANS: Group create form validation error. %s is the already used alias.
+#: actions/apigroupcreate.php:264 actions/apigroupprofileupdate.php:361
+#: actions/editgroup.php:247 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.

-#. TRANS: Group create form validation error.
-#: actions/apigroupcreate.php:278 actions/editgroup.php:251
-#: actions/newgroup.php:198
+#: actions/apigroupcreate.php:278 actions/editgroup.php:254

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


@@ -644,31 +774,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
 #. 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:89
-#: actions/apigroupshow.php:81 actions/apitimelinegroup.php:89
+#: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
+#: actions/apigroupprofileupdate.php:113 actions/apigroupshow.php:81
+#: actions/apitimelinegroup.php:89

 msgid "Group not found."
 msgstr ""
 
 #. TRANS: Server error displayed when trying to join a group the user is already a member of.
 msgid "Group not found."
 msgstr ""
 
 #. TRANS: Server error displayed when trying to join a group the user is already a member of.

+#. TRANS: Client error displayed when trying to join a group while already a member.

 #. TRANS: Error text shown a user tries to join a group they already are a member of.
 #. TRANS: Error text shown a user tries to join a group they already are a member of.

-#: actions/apigroupjoin.php:111 actions/joingroup.php:100 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.
 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.
 #. TRANS: Error text shown when a user tries to join a group they are blocked from joining.

-#: actions/apigroupjoin.php:121 actions/joingroup.php:105 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: 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:134 lib/command.php:350
+#: actions/apigroupjoin.php:133 actions/joingroup.php:136 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 ""


@@ -678,30 +812,31 @@ 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: 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:129
-#: lib/command.php:398
+#: actions/apigroupleave.php:124 actions/leavegroup.php:130
+#: 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"
 #: actions/apigrouplistall.php:88 actions/usergroups.php:63
 #, php-format
 msgid "%s groups"


@@ -713,13 +848,49 @@ msgstr ""
 msgid "groups on %s"
 msgstr ""
 
 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 trying to change group design settings without being a (group) admin.
+#. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
+#: actions/apigroupprofileupdate.php:119 actions/editgroup.php:110
+#: actions/editgroup.php:176 actions/groupdesignsettings.php:109
+#: 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:276
+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:283
+#: classes/User_group.php:548
+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 uploading a media file has failed.
 #: actions/apimediaupload.php:101
 msgid "Upload failed."
 msgstr ""
 
 #. TRANS: Client error given from the OAuth API when the request token or verifier is invalid.
 #. TRANS: Client error displayed when uploading a media file has failed.
 #: actions/apimediaupload.php:101
 msgid "Upload failed."
 msgstr ""
 
 #. TRANS: Client error given from the OAuth API when the request token or verifier is invalid.

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

 msgid "Invalid request token or verifier."
 msgstr ""
 
 msgid "Invalid request token or verifier."
 msgstr ""
 


@@ -739,21 +910,29 @@ msgid "Request token already authorized."
 msgstr ""
 
 #. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
 msgstr ""
 
 #. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.

-#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:74
-#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
-#: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:65 actions/imsettings.php:230
-#: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
-#: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
-#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
-#: actions/othersettings.php:153 actions/passwordsettings.php:138
-#: actions/profilesettings.php:221 actions/recoverpassword.php:350
-#: actions/register.php:172 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:40
-#: actions/subscribe.php:86 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:52
-#: lib/designsettings.php:310
+#. 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/apioauthauthorize.php:147 actions/avatarsettings.php:281
+#: 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:61 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/pluginenable.php:88
+#: actions/profilesettings.php:235 actions/recoverpassword.php:387
+#: actions/register.php:164 actions/remotesubscribe.php:78
+#: actions/repeat.php:80 actions/smssettings.php:250 actions/subedit.php:41
+#: actions/subscribe.php:87 actions/tagother.php:157
+#: actions/unsubscribe.php:70 actions/urlsettings.php:171
+#: actions/userauthorization.php:54 lib/designsettings.php:123

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


@@ -769,18 +948,22 @@ 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 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: 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: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Form validation error message when an unsupported argument is used.
+#. TRANS: Message given submitting a form with an unknown action in Instant Messaging settings.
+#. TRANS: Client error displayed when encountering an unexpected action on form submission.

 #. TRANS: Client error when submitting a form with unexpected information.
 #. 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.
 #. 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:104 actions/editapplication.php:144
-#: actions/emailsettings.php:316 actions/grouplogo.php:322
-#: actions/imsettings.php:245 actions/newapplication.php:125
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:277 lib/designsettings.php:321
+#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:295
+#: actions/designadminpanel.php:100 actions/editapplication.php:145
+#: actions/emailsettings.php:312 actions/grouplogo.php:332
+#: actions/imsettings.php:259 actions/newapplication.php:125
+#: actions/oauthconnectionssettings.php:145 actions/recoverpassword.php:46
+#: actions/smssettings.php:271 lib/designsettings.php:134

 msgid "Unexpected form submission."
 msgstr ""
 
 msgid "Unexpected form submission."
 msgstr ""
 


@@ -822,20 +1005,22 @@ msgid "Account"
 msgstr ""
 
 #. TRANS: Field label on OAuth API authorisation form.
 msgstr ""
 
 #. TRANS: Field label on OAuth API authorisation form.

+#. TRANS: Field label on login page.

 #. TRANS: Field label in form for profile settings.
 #. TRANS: Field label in form for profile settings.

-#. TRANS: Label for group nickname (dt). Text hidden by default.
-#: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:110 actions/register.php:432
-#: actions/showgroup.php:240 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:152
-#: lib/userprofile.php:134
+#. TRANS: Field label on account registration page.
+#. TRANS: Label for nickname on user authorisation page.
+#. TRANS: Field label on group edit form.
+#: actions/apioauthauthorize.php:459 actions/login.php:231
+#: actions/profilesettings.php:104 actions/register.php:438
+#: actions/userauthorization.php:147 lib/groupeditform.php:147

 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:255
-#: actions/register.php:437 lib/accountsettingsaction.php:120
+#. TRANS: Field label on login page.
+#. TRANS: Field label on account registration page.
+#: actions/apioauthauthorize.php:463 actions/login.php:235
+#: actions/register.php:444

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


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

-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:128
-#: actions/imsettings.php:131 actions/smssettings.php:137
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:125
+#: actions/imsettings.php:136 actions/smssettings.php:132

 #: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Cancel"
 #: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Cancel"


@@ -916,58 +1101,59 @@ msgstr ""
 
 #. TRANS: Client error displayed trying to repeat a non-existing notice through the API.
 #. TRANS: Client error displayed trying to display redents of a non-exiting notice.
 
 #. TRANS: Client error displayed trying to repeat a non-existing notice through the API.
 #. TRANS: Client error displayed trying to display redents of a non-exiting notice.

+#. TRANS: Client exception thrown when referencing a non-existing notice.

 #. TRANS: Error message displayed trying to delete 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 exception thrown when using an unsupported HTTP method.

 #. TRANS: Client error shown when using a non-supported HTTP method.
 #. TRANS: Client error shown when using a non-supported HTTP method.

-#: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
-#: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
+#: actions/apistatusesshow.php:118 actions/atompubfavoritefeed.php:103
+#: actions/atompubmembershipfeed.php:105 actions/atompubshowfavorite.php:117
+#: actions/atompubshowmembership.php:116

 #: actions/atompubshowsubscription.php:122
 #: actions/atompubsubscriptionfeed.php:109
 msgid "HTTP method not supported."
 msgstr ""
 
 #: actions/atompubshowsubscription.php:122
 #: actions/atompubsubscriptionfeed.php:109
 msgid "HTTP method not supported."
 msgstr ""
 

-#: actions/apistatusesshow.php:141
+#. TRANS: Exception thrown requesting an unsupported notice output format.
+#. TRANS: %s is the requested output format.
+#: actions/apistatusesshow.php:144

 #, php-format
 #, php-format

-msgid "Unsupported format: %s"
+msgid "Unsupported format: %s."

 msgstr ""
 
 #. TRANS: Client error displayed requesting a deleted status.
 msgstr ""
 
 #. TRANS: Client error displayed requesting a deleted status.

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

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

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

 msgid "No status with that ID found."
 msgstr ""
 
 msgid "No status with that ID found."
 msgstr ""
 

-#: actions/apistatusesshow.php:223
+#. TRANS: Client error displayed when trying to delete a notice not using the Atom format.
+#: actions/apistatusesshow.php:227

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

+#. TRANS: Client error displayed when a user has no rights to delete notices of other users.

 #. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
 #. TRANS: Error message displayed trying to delete a notice that was not made by the current user.

-#: actions/apistatusesshow.php:230 actions/deletenotice.php:78
-msgid "Can't delete this notice."
+#: actions/apistatusesshow.php:235 actions/deletenotice.php:78
+msgid "Cannot delete this notice."

 msgstr ""
 
 msgstr ""
 

-#: actions/apistatusesshow.php:243
+#. TRANS: Confirmation of notice deletion in API. %d is the ID (number) of the deleted notice.
+#: actions/apistatusesshow.php:249

 #, php-format
 msgid "Deleted notice %d"
 msgstr ""
 #, php-format
 msgid "Deleted notice %d"
 msgstr ""


@@ -977,10 +1163,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."


@@ -994,7 +1183,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."


@@ -1022,13 +1213,6 @@ 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
-#, php-format
-msgid "Could not generate feed for group - %s"
-msgstr ""
-

 #. TRANS: Title for timeline of most recent mentions of a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname.
 #: actions/apitimelinementions.php:115
 #. TRANS: Title for timeline of most recent mentions of a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname.
 #: actions/apitimelinementions.php:115


@@ -1045,13 +1229,14 @@ msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr ""
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.
 msgstr ""
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.

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

 #: actions/apitimelinepublic.php:193 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr ""
 
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
 #: actions/apitimelinepublic.php:193 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr ""
 
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.

-#: actions/apitimelinepublic.php:199 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:199

 #, php-format
 msgid "%s updates from everyone!"
 msgstr ""
 #, php-format
 msgid "%s updates from everyone!"
 msgstr ""


@@ -1062,87 +1247,103 @@ 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:69

 #, 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 ""
 
 msgid "Only accept AtomPub for Atom feeds."
 msgstr ""
 

-#: actions/apitimelineuser.php:310
+#. TRANS: Client error displayed attempting to post an empty API notice.
+#: actions/apitimelineuser.php:322

 msgid "Atom post must not be empty."
 msgstr ""
 
 msgid "Atom post must not be empty."
 msgstr ""
 

-#: actions/apitimelineuser.php:315
+#. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
+#: 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:321 actions/atompubfavoritefeed.php:226
-#: actions/atompubmembershipfeed.php:228
-#: actions/atompubsubscriptionfeed.php:233
+#: 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 ""
 
 msgid "Atom post must be an Atom entry."
 msgstr ""
 

-#. TRANS: Client error displayed when not using the POST verb.
-#. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:334
+#. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
+#: 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.
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.

-#: actions/apitimelineuser.php:378
+#. TRANS: %d is the notice ID (number).
+#: actions/apitimelineuser.php:393

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

-#: actions/apitimelineuser.php:406
+#. TRANS: %s is the notice URI.
+#: actions/apitimelineuser.php:422

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

-#: actions/apitimelineuser.php:437
-#, php-format
-msgid "AtomPub post with unknown attention URI %s"
-msgstr ""
-

 #. TRANS: Server error for unfinished API method showTrends.
 #: actions/apitrends.php:85
 msgid "API method under construction."
 #. TRANS: Server error for unfinished API method showTrends.
 #: actions/apitrends.php:85
 msgid "API method under construction."


@@ -1153,96 +1354,270 @@ msgstr ""
 msgid "User not found."
 msgstr ""
 
 msgid "User not found."
 msgstr ""
 

-#: actions/atompubfavoritefeed.php:70
-msgid "No such profile"
+#. 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 ""
+
+#. 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 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 displayed when requesting Friends of a Friend feed without providing a group nickname.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for a non-local group.
+#. 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 view group members for a non-existing group.
+#. TRANS: Client error displayed when trying to view group members for an object that is not a group.
+#. TRANS: Client error displayed when requesting a group RSS feed for group that does not exist.
+#. TRANS: Client error displayed when requesting a group RSS feed for an object that is not a group.
+#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
+#. TRANS: Client error displayed when trying to join a non-local 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 when providing an invalid group ID on the Make Admin page.
+#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
+#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
+#. TRANS: Command exception text shown when a group is requested that does not exist.
+#. TRANS: Error text shown when trying to leave a group that does not exist.
+#: actions/approvegroup.php:82 actions/approvegroup.php:95
+#: actions/atompubshowmembership.php:81 actions/blockedfromgroup.php:81
+#: actions/blockedfromgroup.php:89 actions/cancelgroup.php:81
+#: actions/cancelgroup.php:94 actions/deletegroup.php:87
+#: actions/deletegroup.php:100 actions/editgroup.php:102
+#: actions/foafgroup.php:46 actions/foafgroup.php:65 actions/foafgroup.php:73
+#: actions/groupblock.php:90 actions/groupbyid.php:83
+#: actions/groupdesignsettings.php:101 actions/grouplogo.php:103
+#: actions/groupmembers.php:84 actions/groupmembers.php:92
+#: actions/groupqueue.php:85 actions/groupqueue.php:93 actions/grouprss.php:97
+#: actions/grouprss.php:105 actions/groupunblock.php:90
+#: actions/joingroup.php:82 actions/joingroup.php:95 actions/leavegroup.php:82
+#: actions/leavegroup.php:95 actions/makeadmin.php:92
+#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
+#: lib/command.php:389
+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:83
+msgid "Internal error: received neither cancel nor abort."
+msgstr ""
+
+#. TRANS: Client error displayed trying to approve/deny group membership.
+#. TRANS: Client error displayed trying to approve/deny  subscription
+#: actions/approvegroup.php:136 actions/approvesub.php:87
+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 ""
 
 msgstr ""
 

-#: actions/atompubfavoritefeed.php:145
+#. 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
 #, php-format

-msgid "Notices %s has favorited to on %s"
+msgctxt "TITLE"
+msgid "%1$s's request for %2$s"

 msgstr ""
 
 msgstr ""
 

-#: actions/atompubfavoritefeed.php:215 actions/atompubsubscriptionfeed.php:222
-msgid "Can't add someone else's subscription"
+#. TRANS: Message on page for group admin after approving a join request.
+#: actions/approvegroup.php:181
+msgid "Join request approved."

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Client error displayed when not using the POST verb.
-#. TRANS: Do not translate POST.
-#: actions/atompubfavoritefeed.php:239
-msgid "Can only handle Favorite activities."
+#. TRANS: Message on page for group admin after rejecting a join request.
+#: actions/approvegroup.php:184
+msgid "Join request canceled."

 msgstr ""
 
 msgstr ""
 

-#: actions/atompubfavoritefeed.php:248 actions/atompubmembershipfeed.php:248
-msgid "Can only fave notices."
+#. TRANS: Client error displayed trying to approve subscription for a non-existing request.
+#: actions/approvesub.php:76
+#, php-format
+msgid "%s is not in the moderation queue for your subscriptions."

 msgstr ""
 
 msgstr ""
 

-#: actions/atompubfavoritefeed.php:256
-msgid "Unknown note."
+#. TRANS: Server error displayed when cancelling a queued subscription request fails.
+#. TRANS: %1$s is the leaving user's nickname, $2$s is the nickname for which the leave failed.
+#: actions/approvesub.php:116
+#, php-format
+msgid "Could not cancel or approve request for user %1$s to join group %2$s."

 msgstr ""
 
 msgstr ""
 

-#: actions/atompubfavoritefeed.php:263
-msgid "Already a favorite."
+#. TRANS: Title for subscription approval ajax return
+#. TRANS: %1$s is the approved user's nickname
+#: actions/approvesub.php:126
+#, php-format
+msgctxt "TITLE"
+msgid "%1$s's request"
+msgstr ""
+
+#. TRANS: Message on page for user after approving a subscription request.
+#: actions/approvesub.php:132
+msgid "Subscription approved."

 msgstr ""
 
 msgstr ""
 

-#: actions/atompubmembershipfeed.php:72 actions/atompubshowfavorite.php:76
-#: actions/atompubshowmembership.php:73 actions/subscribe.php:107
+#. TRANS: Message on page for user after rejecting a subscription request.
+#: actions/approvesub.php:135
+msgid "Subscription canceled."
+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 ""
 
 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: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
 #: actions/atompubmembershipfeed.php:144
 #, php-format

-msgid "%s group memberships"
+msgid "Group memberships of %s"

 msgstr ""
 
 msgstr ""
 

-#: actions/atompubmembershipfeed.php:147
+#. TRANS: Subtitle for group membership feed.
+#. TRANS: %1$s is a username, %2$s is the StatusNet sitename.
+#: actions/atompubmembershipfeed.php:149

 #, php-format
 #, php-format

-msgid "Groups %s is a member of on %s"
+msgid "Groups %1$s is a member of on %2$s"

 msgstr ""
 
 msgstr ""
 

-#: actions/atompubmembershipfeed.php:217
-msgid "Can't add someone else's membership"
+#. TRANS: Client exception thrown when trying subscribe someone else to a group.
+#: actions/atompubmembershipfeed.php:219
+msgid "Cannot add someone else's membership."

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Client error displayed when not using the POST verb.
-#. TRANS: Do not translate POST.
+#. TRANS: Client error displayed when not using the join verb.

 #: actions/atompubmembershipfeed.php:241
 #: actions/atompubmembershipfeed.php:241

-msgid "Can only handle Join activities."
+msgid "Can only handle join activities."

 msgstr ""
 
 msgstr ""
 

-#: actions/atompubmembershipfeed.php:256
+#. TRANS: Client exception thrown when trying to subscribe to a non-existing group.
+#: actions/atompubmembershipfeed.php:258

 msgid "Unknown group."
 msgstr ""
 
 msgid "Unknown group."
 msgstr ""
 

-#: actions/atompubmembershipfeed.php:263
+#. TRANS: Client exception thrown when trying to subscribe to an already subscribed group.
+#: actions/atompubmembershipfeed.php:266

 msgid "Already a member."
 msgstr ""
 
 msgid "Already a member."
 msgstr ""
 

-#: actions/atompubmembershipfeed.php:270
+#. TRANS: Client exception thrown when trying to subscribe to group while blocked from that group.
+#: actions/atompubmembershipfeed.php:274

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

-#: actions/atompubshowfavorite.php:89
+#. TRANS: Client exception thrown when referencing a non-existing favorite.
+#: actions/atompubshowfavorite.php:90

 msgid "No such favorite."
 msgstr ""
 
 msgid "No such favorite."
 msgstr ""
 

+#. TRANS: Client exception thrown when trying to remove a favorite notice of another user.

 #: actions/atompubshowfavorite.php:151
 #: actions/atompubshowfavorite.php:151

-msgid "Can't delete someone else's favorite"
-msgstr ""
-
-#: actions/atompubshowmembership.php:81
-msgid "No such group"
-msgstr ""
-
-#: actions/atompubshowmembership.php:90
-msgid "Not a member"
+msgid "Cannot delete someone else's favorite."

 msgstr ""
 
 msgstr ""
 

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

 msgstr ""
 
 msgstr ""
 

+#. TRANS: Client exception thrown when deleting someone else's membership.

 #: actions/atompubshowmembership.php:150
 #: actions/atompubshowmembership.php:150

-msgid "Can't delete someone else's membership"
+msgid "Cannot delete someone else's membership."

 msgstr ""
 
 #. TRANS: Client exception thrown when trying to display a subscription for a non-existing profile ID.
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to display a subscription for a non-existing profile ID.


@@ -1251,39 +1626,50 @@ msgstr ""
 #: actions/atompubshowsubscription.php:83
 #: actions/atompubsubscriptionfeed.php:74
 #, php-format
 #: actions/atompubshowsubscription.php:83
 #: actions/atompubsubscriptionfeed.php:74
 #, php-format

-msgid "No such profile id: %d"
+msgid "No such profile id: %d."

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

-msgid "Profile %1$d not subscribed to profile %2$d"
+msgid "Profile %1$d not subscribed to profile %2$d."

 msgstr ""
 
 #. TRANS: Client exception thrown when trying to delete a subscription of another user.
 #: actions/atompubshowsubscription.php:157
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to delete a subscription of another user.
 #: actions/atompubshowsubscription.php:157

-msgid "Cannot delete someone else's subscription"
+msgid "Cannot delete someone else's subscription."

 msgstr ""
 
 msgstr ""
 

-#: actions/atompubsubscriptionfeed.php:150
+#. TRANS: Subtitle for Atom subscription feed.
+#. TRANS: %1$s is a user nickname, %s$s is the StatusNet sitename.
+#: actions/atompubsubscriptionfeed.php:153

 #, php-format
 #, php-format

-msgid "People %s has subscribed to on %s"
+msgid "People %1$s has subscribed to on %2$s"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Client error displayed when not using the POST verb.
-#. TRANS: Do not translate POST.
-#: actions/atompubsubscriptionfeed.php:246
+#. TRANS: Client error displayed when not using the follow verb.
+#: actions/atompubsubscriptionfeed.php:248

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

-#: actions/atompubsubscriptionfeed.php:253
+#. TRANS: Client exception thrown when subscribing to an object that is not a person.
+#: actions/atompubsubscriptionfeed.php:256

 msgid "Can only follow people."
 msgstr ""
 
 msgid "Can only follow people."
 msgstr ""
 

-#: actions/atompubsubscriptionfeed.php:262
+#. TRANS: Client exception thrown when subscribing to a non-existing profile.
+#. TRANS: %s is the unknown profile ID.
+#: actions/atompubsubscriptionfeed.php:267

 #, php-format
 #, php-format

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

 msgstr ""
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.
 msgstr ""
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.


@@ -1294,11 +1680,15 @@ 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
 #: actions/editgroup.php:85 actions/groupdesignsettings.php:84
 #: actions/grouplogo.php:86 actions/groupmembers.php:76
 #. 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:91 actions/showgroup.php:116
+#: actions/groupqueue.php:77 actions/grouprss.php:89 actions/showgroup.php:116

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


@@ -1313,10 +1703,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:224
-#: lib/accountsettingsaction.php:113
+#: actions/avatarsettings.php:66

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


@@ -1328,36 +1715,49 @@ 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.
 msgstr ""
 
 #. TRANS: Server error displayed in avatar upload page when no matching profile can be found for a user.

+#. TRANS: Server error displayed coming across a request from a user without a profile.
+#. TRANS: Server error displayed on page for remote subscribe when user does not have a matching profile.
+#. TRANS: Server error displayed when trying to authorise a remote subscription request
+#. TRANS: while the user has no profile.
+#. TRANS: Server error displayed in user RSS when user does not have a matching profile.

 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192

-#: actions/grouplogo.php:181 actions/remotesubscribe.php:191
-#: actions/userauthorization.php:72 actions/userrss.php:108
+#: actions/grouplogo.php:184 actions/remotesubscribe.php:209
+#: actions/userauthorization.php:76 actions/userrss.php:110

 msgid "User without matching profile."
 msgstr ""
 
 #. TRANS: Avatar upload page form legend.
 #. TRANS: Avatar upload page crop form legend.
 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.

 #: actions/avatarsettings.php:122 actions/avatarsettings.php:205
 #: actions/avatarsettings.php:122 actions/avatarsettings.php:205

-#: actions/grouplogo.php:254
+#: actions/grouplogo.php:261

 msgid "Avatar settings"
 msgstr ""
 
 #. TRANS: Header on avatar upload page for thumbnail of originally uploaded avatar (h2).
 #. TRANS: Header on avatar upload crop form for thumbnail of originally uploaded avatar (h2).
 msgid "Avatar settings"
 msgstr ""
 
 #. TRANS: Header on avatar upload page for thumbnail of originally uploaded avatar (h2).
 #. 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:214

-#: actions/grouplogo.php:202 actions/grouplogo.php:262
+#: actions/grouplogo.php:207 actions/grouplogo.php:270

 msgid "Original"
 msgstr ""
 
 #. TRANS: Header on avatar upload page for thumbnail of to be used rendition of uploaded avatar (h2).
 #. TRANS: Header on avatar upload crop form for thumbnail of to be used rendition of uploaded avatar (h2).
 msgid "Original"
 msgstr ""
 
 #. TRANS: Header on avatar upload page for thumbnail of to be used rendition of uploaded avatar (h2).
 #. 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:227

-#: actions/grouplogo.php:213 actions/grouplogo.php:274
+#: 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.
 msgid "Preview"
 msgstr ""
 
 #. TRANS: Button on avatar upload page to delete current avatar.
 #. TRANS: Button text for user account deletion.

+#. TRANS: Submit button text the OAuth application page to delete an application.
+#. TRANS: Button text for deleting a group.

 #: actions/avatarsettings.php:155 actions/deleteaccount.php:319
 #: actions/avatarsettings.php:155 actions/deleteaccount.php:319

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

 msgctxt "BUTTON"
 msgid "Delete"
 msgstr ""
 msgctxt "BUTTON"
 msgid "Delete"
 msgstr ""


@@ -1376,17 +1776,18 @@ msgid "Crop"
 msgstr ""
 
 #. TRANS: Validation error on avatar upload form when no file was uploaded.
 msgstr ""
 
 #. TRANS: Validation error on avatar upload form when no file was uploaded.

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

 msgid "No file uploaded."
 msgstr ""
 
 msgid "No file uploaded."
 msgstr ""
 

-#. TRANS: Avatar upload form unstruction after uploading a file.
+#. TRANS: Avatar upload form instruction after uploading a file.

 #: actions/avatarsettings.php:346
 #: actions/avatarsettings.php:346

-msgid "Pick a square area of the image to be your avatar"
+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.
 msgstr ""
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.

-#: actions/avatarsettings.php:361 actions/grouplogo.php:380
+#. TRANS: Server error displayed trying to crop an uploaded group logo that is no longer present.
+#: actions/avatarsettings.php:361 actions/grouplogo.php:391

 msgid "Lost our file data."
 msgstr ""
 
 msgid "Lost our file data."
 msgstr ""
 


@@ -1405,34 +1806,41 @@ msgstr ""
 msgid "Avatar deleted."
 msgstr ""
 
 msgid "Avatar deleted."
 msgstr ""
 

-#: actions/backupaccount.php:62 actions/profilesettings.php:467
+#. 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:491

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

-#: actions/backupaccount.php:80
+#. TRANS: Client exception thrown when trying to backup an account while not logged in.
+#: actions/backupaccount.php:79

 msgid "Only logged-in users can backup their account."
 msgstr ""
 
 msgid "Only logged-in users can backup their account."
 msgstr ""
 

+#. TRANS: Client exception thrown when trying to backup an account without having backup rights.

 #: actions/backupaccount.php:84
 msgid "You may not backup your account."
 msgstr ""
 
 #: actions/backupaccount.php:84
 msgid "You may not backup your account."
 msgstr ""
 

-#: actions/backupaccount.php:232
+#. TRANS: Information displayed on the backup account page.
+#: actions/backupaccount.php:227

 msgid ""
 "You can backup your account data in <a href=\"http://activitystrea.ms/"
 msgid ""
 "You can backup your account data in <a href=\"http://activitystrea.ms/"

-"\">Activity Streams</a> format.  This is an experimental feature and "
-"provides an incomplete backup; private account information like email and IM "
+"\">Activity Streams</a> format. This is an experimental feature and provides "
+"an incomplete backup; private account information like email and IM "

 "addresses is not backed up. Additionally, uploaded files and direct messages "
 "are not backed up."
 msgstr ""
 
 "addresses is not backed up. Additionally, uploaded files and direct messages "
 "are not backed up."
 msgstr ""
 

-#: actions/backupaccount.php:255
+#. TRANS: Submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:250

 msgctxt "BUTTON"
 msgid "Backup"
 msgstr ""
 
 msgctxt "BUTTON"
 msgid "Backup"
 msgstr ""
 

-#: actions/backupaccount.php:258
-msgid "Backup your account"
+#. TRANS: Title for submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:254
+msgid "Backup your account."

 msgstr ""
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
 msgstr ""
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.


@@ -1442,7 +1850,8 @@ msgstr ""
 
 #. TRANS: Title for block user page.
 #. TRANS: Legend for block user form.
 
 #. TRANS: Title for block user page.
 #. TRANS: Legend for block user form.

-#: actions/block.php:106 actions/block.php:136 actions/groupblock.php:158
+#. TRANS: Fieldset legend for block user from group form.
+#: actions/block.php:106 actions/block.php:136 actions/groupblock.php:166

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


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

-#: actions/block.php:154 actions/deleteapplication.php: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:152 actions/groupblock.php:178
+#: actions/deleteuser.php:154 actions/groupblock.php:188

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

-#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:158 actions/deleteuser.php:156
-msgid "Do not block this user"
+#: actions/block.php:158
+msgid "Do not block this user."

 msgstr ""
 
 #. TRANS: Button label on the user block form.
 msgstr ""
 
 #. TRANS: Button label on the user block form.


@@ -1479,17 +1887,18 @@ 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:159 actions/groupblock.php:185
+#: actions/deleteuser.php:161 actions/groupblock.php:195
+#: lib/repeatform.php:126

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

-#. TRANS: Description of the form to block a user.
-#: actions/block.php:165 lib/blockform.php:79
-msgid "Block this user"
+#: actions/block.php:165
+msgid "Block this user."

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


@@ -1497,31 +1906,6 @@ msgstr ""
 msgid "Failed to save block information."
 msgstr ""
 
 msgid "Failed to save block information."
 msgstr ""
 

-#. 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 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 displayed when trying to unblock a user from 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: 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.
-#: actions/blockedfromgroup.php:81 actions/blockedfromgroup.php:89
-#: actions/deletegroup.php:87 actions/deletegroup.php:100
-#: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
-#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:102
-#: actions/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:88 actions/joingroup.php:82
-#: actions/joingroup.php:93 actions/leavegroup.php:82
-#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
-msgid "No such group."
-msgstr ""
-

 #. TRANS: Title for first page with list of users blocked from a group.
 #. TRANS: %s is a group nickname.
 #: actions/blockedfromgroup.php:101
 #. TRANS: Title for first page with list of users blocked from a group.
 #. TRANS: %s is a group nickname.
 #: actions/blockedfromgroup.php:101


@@ -1565,6 +1949,54 @@ 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:139
+#, php-format
+msgctxt "TITLE"
+msgid "%1$s left group %2$s"
+msgstr ""
+
+#. TRANS: Error message displayed when trying to perform an action that requires a logged in user.
+#: actions/cancelsubscription.php:57 actions/deletenotice.php:52
+#: actions/disfavor.php:61 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/pluginenable.php:99 actions/subedit.php:33 actions/subscribe.php:98
+#: actions/tagother.php:35 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 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 on user tag page when trying to add tags providing a non-existing user 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/tagother.php:50 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."


@@ -1580,48 +2012,43 @@ 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 a user update to the database fails in the contact address confirmation action.
-#. 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 IM preferences.
+#. TRANS: Server error displayed when updating IM preferences fails.

 #. TRANS: Server error thrown on database error removing a registered IM address.
 #. TRANS: Server error thrown on database error removing a registered IM 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.
-#: actions/confirmaddress.php:118 actions/emailsettings.php:359
-#: actions/emailsettings.php:508 actions/imsettings.php:283
-#: actions/imsettings.php:442 actions/othersettings.php:184
-#: actions/profilesettings.php:326 actions/smssettings.php:308
-#: actions/smssettings.php:464
-msgid "Couldn't update user."
+#: 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.
 msgstr ""
 
 #. TRANS: Server error displayed when an address confirmation code deletion from the
 #. TRANS: database fails in the contact address confirmation action.

-#: actions/confirmaddress.php: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 ""
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr ""


@@ -1632,11 +2059,18 @@ msgid "Conversation"
 msgstr ""
 
 #. TRANS: Header on conversation page. Hidden by default (h2).
 msgstr ""
 
 #. TRANS: Header on conversation page. Hidden by default (h2).

-#: actions/conversation.php:149 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:229 lib/searchgroupnav.php:82
+#. TRANS: Label for user statistics.
+#: actions/conversation.php:149 lib/profileaction.php:246

 msgid "Notices"
 msgstr ""
 
 msgid "Notices"
 msgstr ""
 

+#. TRANS: Title for conversation page.
+#. TRANS: Title for page that shows a notice.
+#: actions/conversationreplies.php:83 actions/shownotice.php:267
+msgctxt "TITLE"
+msgid "Notice"
+msgstr ""
+

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


@@ -1656,7 +2090,7 @@ msgstr ""
 #. TRANS: %s is the text that needs to be input.
 #: actions/deleteaccount.php:164
 #, php-format
 #. TRANS: %s is the text that needs to be input.
 #: actions/deleteaccount.php:164
 #, php-format

-msgid "You must write  \"%s\" exactly in the box."
+msgid "You must write \"%s\" exactly in the box."

 msgstr ""
 
 #. TRANS: Confirmation that a user account has been deleted.
 msgstr ""
 
 #. TRANS: Confirmation that a user account has been deleted.


@@ -1665,7 +2099,8 @@ msgid "Account deleted."
 msgstr ""
 
 #. TRANS: Page title for page on which a user account can be deleted.
 msgstr ""
 
 #. TRANS: Page title for page on which a user account can be deleted.

-#: actions/deleteaccount.php:228 actions/profilesettings.php:474
+#. TRANS: Option in profile settings to delete the account of the currently logged in user.
+#: actions/deleteaccount.php:228 actions/profilesettings.php:499

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


@@ -1686,8 +2121,8 @@ msgid ""
 msgstr ""
 
 #. TRANS: Field label for delete account confirmation entry.
 msgstr ""
 
 #. TRANS: Field label for delete account confirmation entry.

-#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:239 actions/register.php:441
+#. TRANS: Field label for password reset form where the password has to be typed again.
+#: actions/deleteaccount.php:300 actions/recoverpassword.php:262

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


@@ -1715,26 +2150,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:94
+#: 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:114 actions/showapplication.php:118
-#: lib/action.php:1409
+#: actions/deleteapplication.php:103 actions/editapplication.php:132
+#: actions/newapplication.php:113 actions/showapplication.php:117
+#: lib/action.php:1460

 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 "


@@ -1742,13 +2179,13 @@ 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
-msgid "Do not delete this application"
+#: actions/deleteapplication.php:162
+msgid "Do not delete this application."

 msgstr ""
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
 msgstr ""
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.

-#: actions/deleteapplication.php:167
-msgid "Delete this application"
+#: actions/deleteapplication.php:168
+msgid "Delete this application."

 msgstr ""
 
 #. TRANS: Client error when trying to delete group while not logged in.
 msgstr ""
 
 #. TRANS: Client error when trying to delete group while not logged in.


@@ -1756,12 +2193,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.
-#: actions/deletegroup.php:94 actions/joingroup.php:88
-#: actions/leavegroup.php:88
-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."


@@ -1797,26 +2228,12 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting a group.
 #: actions/deletegroup.php:224
 
 #. TRANS: Submit button title for 'No' when deleting a group.
 #: actions/deletegroup.php:224

-msgid "Do not delete this group"
+msgid "Do not delete this group."

 msgstr ""
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
 #: actions/deletegroup.php:231
 msgstr ""
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
 #: actions/deletegroup.php:231

-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 unblock a user from a group while not logged in.
-#. TRANS: Client error displayed trying a change a subscription while not logged in.
-#. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
-#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
-#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
-#: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:71 lib/profileformaction.php:64
-#: lib/settingsaction.php:72
-msgid "Not logged in."
+msgid "Delete this group."

 msgstr ""
 
 #. TRANS: Instructions for deleting a notice.
 msgstr ""
 
 #. TRANS: Instructions for deleting a notice.


@@ -1839,104 +2256,134 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
 #: actions/deletenotice.php:159
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
 #: actions/deletenotice.php:159

-msgid "Do not delete this notice"
+msgid "Do not delete this notice."

 msgstr ""
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
 msgstr ""
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.

-#: actions/deletenotice.php:166 lib/noticelist.php:673
-msgid "Delete this notice"
+#: actions/deletenotice.php:166
+msgid "Delete this notice."

 msgstr ""
 
 msgstr ""
 

-#: actions/deleteuser.php:67
+#. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
+#: actions/deleteuser.php:66

 msgid "You cannot delete users."
 msgstr ""
 
 msgid "You cannot delete users."
 msgstr ""
 

+#. TRANS: Client error displayed when trying to delete a non-local user.

 #: actions/deleteuser.php:74
 msgid "You can only delete local users."
 msgstr ""
 
 #: actions/deleteuser.php:74
 msgid "You can only delete local users."
 msgstr ""
 

-#: actions/deleteuser.php:110 actions/deleteuser.php:133
+#. TRANS: Title of delete user page.
+#: actions/deleteuser.php:110
+msgctxt "TITLE"
+msgid "Delete user"
+msgstr ""
+
+#. TRANS: Fieldset legend on delete user page.
+#: actions/deleteuser.php:134

 msgid "Delete user"
 msgstr ""
 
 msgid "Delete user"
 msgstr ""
 

-#: actions/deleteuser.php:136
+#. TRANS: Information text to request if a user is certain that the described action has to be performed.
+#: actions/deleteuser.php:138

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

+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/deleteuser.php:158
+msgid "Do not delete this user."
+msgstr ""
+

 #. TRANS: Submit button title for 'Yes' when deleting a user.
 #. TRANS: Submit button title for 'Yes' when deleting a user.

-#: actions/deleteuser.php:163 lib/deleteuserform.php:77
-msgid "Delete this user"
+#: actions/deleteuser.php:165
+msgid "Delete this user."

 msgstr ""
 
 #. TRANS: Message used as title for design settings for the site.
 msgstr ""
 
 #. TRANS: Message used as title for design settings for the site.

-#. TRANS: Link description in user account settings menu.
-#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:134
+#: actions/designadminpanel.php:60

 msgid "Design"
 msgstr ""
 
 msgid "Design"
 msgstr ""
 

-#: actions/designadminpanel.php:74
+#. TRANS: Instructions for design adminsitration panel.
+#: actions/designadminpanel.php:71

 msgid "Design settings for this StatusNet site"
 msgstr ""
 
 msgid "Design settings for this StatusNet site"
 msgstr ""
 

-#: actions/designadminpanel.php:335
+#. TRANS: Client error displayed when a logo URL does is not valid.
+#: actions/designadminpanel.php:327

 msgid "Invalid logo URL."
 msgstr ""
 
 msgid "Invalid logo URL."
 msgstr ""
 

-#: actions/designadminpanel.php:340
+#. TRANS: Client error displayed when an SSL logo URL is invalid.
+#: actions/designadminpanel.php:333

 msgid "Invalid SSL logo URL."
 msgstr ""
 
 msgid "Invalid SSL logo URL."
 msgstr ""
 

-#: actions/designadminpanel.php:344
+#. 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 ""
 
 #, php-format
 msgid "Theme not available: %s."
 msgstr ""
 

-#: actions/designadminpanel.php:448
+#. TRANS: Fieldset legend for form to change logo.
+#: actions/designadminpanel.php:437

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

-#: actions/designadminpanel.php:453
+#. TRANS: Field label for StatusNet site logo.
+#: actions/designadminpanel.php:444

 msgid "Site logo"
 msgstr ""
 
 msgid "Site logo"
 msgstr ""
 

-#: actions/designadminpanel.php:457
+#. TRANS: Field label for SSL StatusNet site logo.
+#: actions/designadminpanel.php:452

 msgid "SSL logo"
 msgstr ""
 
 msgid "SSL logo"
 msgstr ""
 

-#: actions/designadminpanel.php:469
+#. TRANS: Fieldset legend for form change StatusNet site's theme.
+#: actions/designadminpanel.php:467

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

-#: actions/designadminpanel.php:486
+#. TRANS: Field label for dropdown to choose site theme.
+#: actions/designadminpanel.php:485

 msgid "Site theme"
 msgstr ""
 
 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 ""
 
 #: actions/designadminpanel.php:487
 msgid "Theme for the site."
 msgstr ""
 

-#: actions/designadminpanel.php:493
+#. TRANS: Field label for uploading a cutom theme.
+#: actions/designadminpanel.php:494

 msgid "Custom theme"
 msgstr ""
 
 msgid "Custom theme"
 msgstr ""
 

-#: actions/designadminpanel.php:497
+#. 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 ""
 
 msgid "You can upload a custom StatusNet theme as a .ZIP archive."
 msgstr ""
 

-#. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:512 lib/designsettings.php:98
+#. TRANS: Fieldset legend for theme background image.
+#: actions/designadminpanel.php:515

 msgid "Change background image"
 msgstr ""
 
 msgid "Change background image"
 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.
 #. TRANS: Label on profile design page for setting a profile page background colour.

-#: actions/designadminpanel.php:517 actions/designadminpanel.php:600
-#: lib/designsettings.php:183
+#: actions/designadminpanel.php:525 actions/designadminpanel.php:609
+#: lib/designform.php:233

 msgid "Background"
 msgstr ""
 
 msgid "Background"
 msgstr ""
 

-#: actions/designadminpanel.php:522
+#. TRANS: Form guide for background image upload form on theme designer page.
+#: actions/designadminpanel.php:531

 #, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
 #, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"


@@ -1944,98 +2391,106 @@ msgid ""
 msgstr ""
 
 #. TRANS: Used as radio button label to add a background image.
 msgstr ""
 
 #. TRANS: Used as radio button label to add a background image.

-#: actions/designadminpanel.php:553
+#: actions/designadminpanel.php:558

 msgid "On"
 msgstr ""
 
 #. TRANS: Used as radio button label to not add a background image.
 msgid "On"
 msgstr ""
 
 #. TRANS: Used as radio button label to not add a background image.

-#: actions/designadminpanel.php:570
+#: actions/designadminpanel.php:575

 msgid "Off"
 msgstr ""
 
 msgid "Off"
 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.
 #. 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:571 lib/designsettings.php:159
+#: actions/designadminpanel.php:577 lib/designform.php:209

 msgid "Turn background image on or off."
 msgstr ""
 
 msgid "Turn background image on or off."
 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.
 #. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.

-#: actions/designadminpanel.php:576 lib/designsettings.php:165
+#: actions/designadminpanel.php:583 lib/designform.php:215

 msgid "Tile background image"
 msgstr ""
 
 msgid "Tile background image"
 msgstr ""
 

-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: actions/designadminpanel.php:590 lib/designsettings.php:175
-msgid "Change colours"
+#. TRANS: Fieldset legend for theme colors.
+#: actions/designadminpanel.php:598
+msgid "Change colors"

 msgstr ""
 
 msgstr ""
 

+#. TRANS: Field label for content color selector.

 #. TRANS: Label on profile design page for setting a profile page content colour.
 #. TRANS: Label on profile design page for setting a profile page content colour.

-#: actions/designadminpanel.php:613 lib/designsettings.php:197
+#: actions/designadminpanel.php:623 lib/designform.php:247

 msgid "Content"
 msgstr ""
 
 msgid "Content"
 msgstr ""
 

+#. TRANS: Field label for sidebar color selector.

 #. TRANS: Label on profile design page for setting a profile page sidebar colour.
 #. TRANS: Label on profile design page for setting a profile page sidebar colour.

-#: actions/designadminpanel.php:626 lib/designsettings.php:211
+#: actions/designadminpanel.php:637 lib/designform.php:261

 msgid "Sidebar"
 msgstr ""
 
 msgid "Sidebar"
 msgstr ""
 

+#. TRANS: Field label for text color selector.

 #. TRANS: Label on profile design page for setting a profile page text colour.
 #. TRANS: Label on profile design page for setting a profile page text colour.

-#: actions/designadminpanel.php:639 lib/designsettings.php:225
+#: actions/designadminpanel.php:651 lib/designform.php:275

 msgid "Text"
 msgstr ""
 
 msgid "Text"
 msgstr ""
 

+#. TRANS: Field label for link color selector.

 #. TRANS: Label on profile design page for setting a profile page links colour.
 #. TRANS: Label on profile design page for setting a profile page links colour.

-#: actions/designadminpanel.php:652 lib/designsettings.php:239
+#: actions/designadminpanel.php:665 lib/designform.php:289

 msgid "Links"
 msgstr ""
 
 msgid "Links"
 msgstr ""
 

-#: actions/designadminpanel.php:677
+#. TRANS: Fieldset legend for advanced theme design settings.
+#: actions/designadminpanel.php:691

 msgid "Advanced"
 msgstr ""
 
 msgid "Advanced"
 msgstr ""
 

-#: actions/designadminpanel.php:681
+#. TRANS: Field label for custom CSS.
+#: actions/designadminpanel.php:696

 msgid "Custom CSS"
 msgstr ""
 
 msgid "Custom CSS"
 msgstr ""
 

-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: actions/designadminpanel.php:702 lib/designsettings.php:257
+#. TRANS: Button text for resetting theme settings.
+#: actions/designadminpanel.php:718
+msgctxt "BUTTON"

 msgid "Use defaults"
 msgstr ""
 
 msgid "Use defaults"
 msgstr ""
 

+#. TRANS: Title for button for resetting theme settings.

 #. TRANS: Title for button on profile design page to reset all colour settings to default.
 #. TRANS: Title for button on profile design page to reset all colour settings to default.

-#: actions/designadminpanel.php:703 lib/designsettings.php:259
-msgid "Restore default designs"
+#: actions/designadminpanel.php:720 lib/designform.php:135
+msgid "Restore default designs."

 msgstr ""
 
 msgstr ""
 

+#. TRANS: Title for button for resetting theme settings.

 #. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
 #. TRANS: Title for button on profile design page to reset all colour settings to default without saving.

-#: actions/designadminpanel.php:709 lib/designsettings.php:267
-msgid "Reset back to default"
-msgstr ""
-
-#. TRANS: Submit button title.
-#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:319
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: lib/applicationeditform.php:357
-msgid "Save"
+#: actions/designadminpanel.php:728 lib/designform.php:143
+msgid "Reset back to default."

 msgstr ""
 
 msgstr ""
 

+#. TRANS: Title for button for saving theme settings.

 #. TRANS: Title for button on profile design page to save settings.
 #. TRANS: Title for button on profile design page to save settings.

-#: actions/designadminpanel.php:712 lib/designsettings.php:272
-msgid "Save design"
+#: actions/designadminpanel.php:736 lib/designform.php:317
+msgid "Save design."

 msgstr ""
 
 msgstr ""
 

-#: actions/disfavor.php:81
+#. 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 ""
 
 msgid "This notice is not a favorite!"
 msgstr ""
 

-#: actions/disfavor.php:94
+#. TRANS: Title for page on which favorites can be added.
+#: actions/disfavor.php:98

 msgid "Add to favorites"
 msgstr ""
 
 msgid "Add to favorites"
 msgstr ""
 

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

-msgid "No such document \"%s\""
+msgid "No such document \"%s\"."

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


@@ -2050,71 +2505,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:87
+#. 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.
 msgid "Use this form to edit your application."
 msgstr ""
 
 #. TRANS: Validation error shown when not providing a name in the "Edit application" form.

-#: actions/editapplication.php:184 actions/newapplication.php:163
+#. TRANS: Validation error shown when not providing a name in the "New application" form.
+#: 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.
 msgid "Name is required."
 msgstr ""
 
 #. TRANS: Validation error shown when providing too long a name in the "Edit application" form.

-#: actions/editapplication.php:188 actions/newapplication.php:169
+#. TRANS: Validation error shown when providing too long a name in the "New application" form.
+#: 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.
 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.

-#: actions/editapplication.php:192 actions/newapplication.php:166
+#. TRANS: Validation error shown when providing a name for an application that already exists in the "New application" form.
+#: actions/editapplication.php:193 actions/newapplication.php:169

 msgid "Name already in use. Try another one."
 msgstr ""
 
 #. TRANS: Validation error shown when not providing a description in the "Edit 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.

-#: actions/editapplication.php:196 actions/newapplication.php:172
+#. TRANS: Validation error shown when not providing a description in the "New application" form.
+#: 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:208
+#: 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.
 msgid "Source URL is too long."
 msgstr ""
 
 #. TRANS: Validation error shown when providing an invalid source URL in the "Edit application" form.

-#: actions/editapplication.php:215 actions/newapplication.php:193
+#. TRANS: Validation error shown when providing an invalid source URL in the "New application" form.
+#: 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.
 msgid "Source URL is not valid."
 msgstr ""
 
 #. TRANS: Validation error shown when not providing an organisation in the "Edit application" form.

-#: actions/editapplication.php:219 actions/newapplication.php:196
+#. TRANS: Validation error shown when not providing an organisation in the "New application" form.
+#: 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:223 actions/newapplication.php:199
+#: actions/editapplication.php:225 actions/newapplication.php:208

 msgid "Organization is too long (maximum 255 characters)."
 msgstr ""
 
 msgid "Organization is too long (maximum 255 characters)."
 msgstr ""
 

-#: actions/editapplication.php:226 actions/newapplication.php:202
+#. TRANS: Form validation error show when an organisation name has not been provided in the edit application form.
+#. TRANS: Form validation error show when an organisation name has not been provided in the new application form.
+#: actions/editapplication.php:229 actions/newapplication.php:212

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

-#: actions/editapplication.php:237 actions/newapplication.php:214
+#. TRANS: Validation error shown when providing too long a callback URL in the "New application" form.
+#: 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.
 msgid "Callback is too long."
 msgstr ""
 
 #. TRANS: Validation error shown when providing an invalid callback URL in the "Edit application" form.

-#: actions/editapplication.php:245 actions/newapplication.php:223
+#. TRANS: Validation error shown when providing an invalid callback URL in the "New application" form.
+#: 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:282
+#: actions/editapplication.php:285

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


@@ -2125,17 +2591,12 @@ msgid "Edit %s group"
 msgstr ""
 
 #. TRANS: Client error displayed trying to edit a group while not logged in.
 msgstr ""
 
 #. TRANS: Client error displayed trying to edit a group while not logged in.

+#. TRANS: Client error displayed when trying to create a group while not logged in.

 #. TRANS: Client error displayed trying to create a group while not logged in.
 #. TRANS: Client error displayed trying to create a group while not logged in.

-#: actions/editgroup.php:68 actions/grouplogo.php:70 actions/newgroup.php:65
+#: actions/editgroup.php:68 actions/grouplogo.php:69 actions/newgroup.php:65

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

 #. TRANS: Form instructions for group edit form.
 #: actions/editgroup.php:161
 msgid "Use this form to edit the group."
 #. TRANS: Form instructions for group edit form.
 #: actions/editgroup.php:161
 msgid "Use this form to edit the group."


@@ -2143,47 +2604,37 @@ msgstr ""
 
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.

-#: actions/editgroup.php:239 actions/newgroup.php:186
+#. TRANS: %s is the invalid alias.
+#: actions/editgroup.php:242 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:272
-msgid "Could not update group."
-msgstr ""
-
-#. TRANS: Server error displayed when group aliases could not be added.
-#. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:279 classes/User_group.php:534
-msgid "Could not create aliases."
-msgstr ""
-

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

-#: actions/editgroup.php:296
+#: actions/editgroup.php:303

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

-#: actions/emailsettings.php:61
+#: 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:76
+#: 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:107 actions/emailsettings.php:133
+#: 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:113
+#: actions/emailsettings.php:110

 msgid "Current confirmed email address."
 msgstr ""
 
 msgid "Current confirmed email address."
 msgstr ""
 


@@ -2192,14 +2643,15 @@ msgstr ""
 #. 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 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.

-#: actions/emailsettings.php:116 actions/emailsettings.php:183
-#: actions/imsettings.php:116 actions/smssettings.php:124
-#: actions/smssettings.php:180
+#: actions/emailsettings.php:113 actions/emailsettings.php:180
+#: actions/imsettings.php:119 actions/smssettings.php:119
+#: actions/smssettings.php:175

 msgctxt "BUTTON"
 msgid "Remove"
 msgstr ""
 
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr ""
 

-#: actions/emailsettings.php:123
+#. TRANS: Form note in e-mail settings form.
+#: 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."


@@ -2210,44 +2662,44 @@ 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:140
+#: 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.
 #. 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.
 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 IM address in IM settings form.
 #. TRANS: Button label for adding a SMS phone number in SMS settings form.

-#: actions/emailsettings.php:144 actions/imsettings.php:151
-#: actions/smssettings.php:162
+#: actions/emailsettings.php:141 actions/imsettings.php:149
+#: actions/smssettings.php:157

 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:152 actions/smssettings.php:171
+#: 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:158
+#: 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:180 actions/smssettings.php:178
+#: 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:189 actions/smssettings.php:186
+#: 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:193
+#: 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:"


@@ -2255,323 +2707,382 @@ 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:199 actions/smssettings.php:189
+#: 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:208
+#: 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:216
+#: 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:222
+#: 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:229
+#: 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:235
+#: 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:241
+#: 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:247
+#: 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:368
+#: 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:388
+#: 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:396
-msgid "Cannot normalize that email address"
+#: actions/emailsettings.php:389
+msgid "Cannot normalize that email address."

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

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

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

-#: actions/emailsettings.php:405
+#: 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:409
+#: 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.
 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 IM 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.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.

-#: actions/emailsettings.php:426 actions/imsettings.php:351
-#: actions/smssettings.php:373
-msgid "Couldn't insert confirmation code."
+#: actions/emailsettings.php:419 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.
 msgstr ""
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.

-#: actions/emailsettings.php:433
+#: actions/emailsettings.php:426

 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."
 msgstr ""
 
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 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."
 msgstr ""
 
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.

-#. TRANS: Message given canceling IM 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 SMS phone number confirmation that is not pending.

-#: actions/emailsettings.php:454 actions/imsettings.php:386
-#: actions/smssettings.php:408
+#: actions/emailsettings.php:446 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.
 msgid "No pending confirmation to cancel."
 msgstr ""
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.

-#: actions/emailsettings.php:459
+#: actions/emailsettings.php:451

 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:468 actions/smssettings.php:422
-msgid "Couldn't delete email confirmation."
+#: actions/emailsettings.php:460
+msgid "Could not delete email confirmation."

 msgstr ""
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
 msgstr ""
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.

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

 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:493
+#: actions/emailsettings.php:484

 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:514
+#: actions/emailsettings.php:505

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

-#: actions/emailsettings.php:528 actions/smssettings.php:568
+#. TRANS: Form validation error displayed when trying to remove an incoming e-mail address while no address has been set.
+#: actions/emailsettings.php:519 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.
 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.

-#: actions/emailsettings.php:540 actions/emailsettings.php:565
-#: actions/smssettings.php:578 actions/smssettings.php:602
-msgid "Couldn't update user record."
+#. TRANS: Server error displayed when the user could not be updated in SMS settings.
+#: actions/emailsettings.php:531 actions/emailsettings.php:555
+#: 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.
 msgstr ""
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.

-#: actions/emailsettings.php:544 actions/smssettings.php:581
+#. TRANS: Confirmation text after updating SMS settings.
+#: actions/emailsettings.php:535 actions/smssettings.php:570

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

-#: actions/emailsettings.php:569 actions/smssettings.php:605
+#. TRANS: Confirmation text after updating SMS settings.
+#: actions/emailsettings.php:559 actions/smssettings.php:595

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

-#: actions/favor.php:79
+#. TRANS: Client error displayed when trying to mark a notice as favorite that already is a favorite.
+#: actions/favor.php:81

 msgid "This notice is already a favorite!"
 msgstr ""
 
 msgid "This notice is already a favorite!"
 msgstr ""
 

-#: actions/favor.php:92 lib/disfavorform.php:144
-msgid "Disfavor favorite"
+#. TRANS: Page title for page on which favorite notices can be unfavourited.
+#: actions/favor.php:96
+msgid "Disfavor favorite."

 msgstr ""
 
 msgstr ""
 

+#. TRANS: Page title for first page of favorited notices.
+#. TRANS: Title for favourited notices section.
+#. TRANS: Menu item title in search group navigation panel.

 #: actions/favorited.php:65 lib/popularnoticesection.php:62
 #: actions/favorited.php:65 lib/popularnoticesection.php:62

-#: lib/publicgroupnav.php:93
+#: lib/publicgroupnav.php:87

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

-#: actions/favorited.php:67
+#. TRANS: Page title for all but first page of favorited notices.
+#. TRANS: %d is the page number being displayed.
+#: actions/favorited.php:69

 #, php-format
 msgid "Popular notices, page %d"
 msgstr ""
 
 #, php-format
 msgid "Popular notices, page %d"
 msgstr ""
 

-#: actions/favorited.php:79
+#. TRANS: Description on page displaying favorited notices.
+#: actions/favorited.php:81

 msgid "The most popular notices on the site right now."
 msgstr ""
 
 msgid "The most popular notices on the site right now."
 msgstr ""
 

-#: actions/favorited.php:150
+#. TRANS: Text displayed instead of a list when a site does not yet have any favourited notices.
+#: actions/favorited.php:149

 msgid "Favorite notices appear on this page but no one has favorited one yet."
 msgstr ""
 
 msgid "Favorite notices appear on this page but no one has favorited one yet."
 msgstr ""
 

+#. TRANS: Additional text displayed instead of a list when a site does not yet have any favourited notices for logged in users.

 #: actions/favorited.php:153
 msgid ""
 "Be the first to add a notice to your favorites by clicking the fave button "
 "next to any notice you like."
 msgstr ""
 
 #: actions/favorited.php:153
 msgid ""
 "Be the first to add a notice to your favorites by clicking the fave button "
 "next to any notice you like."
 msgstr ""
 

-#: actions/favorited.php:156
+#. TRANS: Additional text displayed instead of a list when a site does not yet have any favourited notices for not logged in users.
+#. TRANS: %%action.register%% is a registration link. "[link text](link)" is Mark Down. Do not change the formatting.
+#: actions/favorited.php:158

 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to add a "
 "notice to your favorites!"
 msgstr ""
 
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to add a "
 "notice to your favorites!"
 msgstr ""
 

-#: actions/favoritesrss.php:111 actions/showfavorites.php:77
-#: lib/personalgroupnav.php:118
+#. TRANS: Title of RSS feed with favourite notices of a user.
+#. TRANS: %s is a user's nickname.
+#. TRANS: Title for first page of favourite notices of a user.
+#. TRANS: %s is the user for whom the favourite notices are displayed.
+#. TRANS: Menu item title in personal group navigation menu.
+#. TRANS: %s is a username.
+#: actions/favoritesrss.php:111 actions/showfavorites.php:76
+#: lib/personalgroupnav.php:102

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

-#: actions/favoritesrss.php:115
+#. TRANS: Desciption of RSS feed with favourite notices of a user.
+#. TRANS: %1$s is a user's nickname, %2$s is the name of the StatusNet site.
+#: actions/favoritesrss.php:117

 #, php-format
 msgid "Updates favored by %1$s on %2$s!"
 msgstr ""
 
 #, php-format
 msgid "Updates favored by %1$s on %2$s!"
 msgstr ""
 

+#. TRANS: Page title for first page of featured users.
+#. TRANS: Title for featured users section.
+#. TRANS: Menu item title in search group navigation panel.

 #: actions/featured.php:69 lib/featureduserssection.php:87
 #: actions/featured.php:69 lib/featureduserssection.php:87

-#: lib/publicgroupnav.php:89
+#: lib/publicgroupnav.php:81

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

-#: actions/featured.php:71
+#. TRANS: Page title for all but first page of featured users.
+#. TRANS: %d is the page number being displayed.
+#: actions/featured.php:73

 #, php-format
 msgid "Featured users, page %d"
 msgstr ""
 
 #, php-format
 msgid "Featured users, page %d"
 msgstr ""
 

-#: actions/featured.php:99
+#. TRANS: Description on page displaying featured users.
+#: actions/featured.php:96

 #, php-format
 #, php-format

-msgid "A selection of some great users on %s"
+msgid "A selection of some great users on %s."

 msgstr ""
 
 msgstr ""
 

-#: actions/file.php:34
+#. TRANS: Client error displayed when no notice ID was given trying do display a file.
+#: actions/file.php:36

 msgid "No notice ID."
 msgstr ""
 
 msgid "No notice ID."
 msgstr ""
 

-#: actions/file.php:38
+#. TRANS: Client error displayed when an invalid notice ID was given trying do display a file.
+#: actions/file.php:41

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

-#: actions/file.php:42
+#. TRANS: Client error displayed when trying do display a file for a notice without a file attachement.
+#: actions/file.php:46

 msgid "No attachments."
 msgstr ""
 
 msgid "No attachments."
 msgstr ""
 

-#: actions/file.php:51
+#. TRANS: Client error displayed when trying do display a file for a notice with file attachements
+#. TRANS: that could not be found.
+#: actions/file.php:58

 msgid "No uploaded attachments."
 msgstr ""
 
 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 ""
 
 #: actions/finishremotesubscribe.php:69
 msgid "Not expecting this response!"
 msgstr ""
 

-#: actions/finishremotesubscribe.php:80
+#. 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 ""
 
 msgid "User being listened to does not exist."
 msgstr ""
 

-#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
+#. TRANS: Client error displayed when subscribing to a remote profile that is a local profile.
+#. TRANS: Client error displayed when using remote subscribe for a local entity.
+#: actions/finishremotesubscribe.php:89 actions/remotesubscribe.php:59

 msgid "You can use the local subscription!"
 msgstr ""
 
 msgid "You can use the local subscription!"
 msgstr ""
 

-#: actions/finishremotesubscribe.php:99
+#. 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 ""
 
 msgid "That user has blocked you from subscribing."
 msgstr ""
 

-#: actions/finishremotesubscribe.php:110
+#. 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 ""
 
 msgid "You are not authorized."
 msgstr ""
 

-#: actions/finishremotesubscribe.php:113
+#. 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 ""
 
 msgid "Could not convert request token to access token."
 msgstr ""
 

-#: actions/finishremotesubscribe.php:118
+#. 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 ""
 
 msgid "Remote service uses unknown version of OMB protocol."
 msgstr ""
 

-#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:317
+#. TRANS: Server error displayed when subscribing to a remote profile fails because the remote profile could not be updated.
+#. TRANS: Exception thrown when updating a remote profile fails in OAuth store.
+#: actions/finishremotesubscribe.php:145 lib/oauthstore.php:316

 msgid "Error updating remote profile."
 msgstr ""
 
 msgid "Error updating remote profile."
 msgstr ""
 

-#: actions/getfile.php:79
+#. TRANS: Client error displayed when requesting a non-existent file.
+#: actions/getfile.php:77

 msgid "No such file."
 msgstr ""
 
 msgid "No such file."
 msgstr ""
 

-#: actions/getfile.php:83
+#. TRANS: Client error displayed when requesting a file without having read access to it.
+#: actions/getfile.php:82

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

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

 msgid "Invalid role."
 msgstr ""
 
 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 ""
 

-#: actions/grantrole.php:75
+#. TRANS: Client error displayed when trying to assign a role to a user while not being allowed to set roles.
+#: actions/grantrole.php:76

 msgid "You cannot grant user roles on this site."
 msgstr ""
 
 msgid "You cannot grant user roles on this site."
 msgstr ""
 

-#: actions/grantrole.php:82
+#. TRANS: Client error displayed when trying to assign a role to a user that already has that role.
+#: actions/grantrole.php:84

 msgid "User already has this role."
 msgstr ""
 
 msgid "User already has this role."
 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 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 trying a change a subscription without providing a profile.

-#: actions/groupblock.php:71 actions/groupunblock.php:71
-#: actions/makeadmin.php:71 actions/subedit.php:49
+#. TRANS: Client error displayed when trying to change user options without specifying a user to work on.
+#: actions/groupblock.php:72 actions/groupunblock.php:72
+#: actions/makeadmin.php:74 actions/subedit.php:50

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

-#. 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.
-#: actions/groupblock.php:76 actions/groupunblock.php:77
-#: actions/makeadmin.php:76 actions/subedit.php:57 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:86
-msgid "No profile with that ID."
-msgstr ""
-
-#: actions/groupblock.php:81 actions/groupunblock.php:82
-#: actions/makeadmin.php:81
+#. TRANS: Client error displayed trying to block a user from a group while not specifying a group to block a profile from.
+#. TRANS: Client error displayed when trying to unblock a user from a group without providing a group.
+#. TRANS: Client error displayed when not providing a group ID on the Make Admin page.
+#: actions/groupblock.php:84 actions/groupunblock.php:84
+#: actions/makeadmin.php:86

 msgid "No group specified."
 msgstr ""
 
 msgid "No group specified."
 msgstr ""
 

-#: actions/groupblock.php:91
+#. TRANS: Client error displayed trying to block a user from a group while not being an admin user.
+#: actions/groupblock.php:96

 msgid "Only an admin can block group members."
 msgstr ""
 
 msgid "Only an admin can block group members."
 msgstr ""
 

-#: actions/groupblock.php:95
+#. TRANS: Client error displayed trying to block a user from a group while user is already blocked from the given group.
+#: actions/groupblock.php:101

 msgid "User is already blocked from group."
 msgstr ""
 
 msgid "User is already blocked from group."
 msgstr ""
 

-#: actions/groupblock.php:100
+#. TRANS: Client error displayed trying to block a user from a group while user is not a member of given group.
+#: actions/groupblock.php:107

 msgid "User is not a member of group."
 msgstr ""
 
 msgid "User is not a member of group."
 msgstr ""
 

-#: actions/groupblock.php:134 actions/groupmembers.php:364
+#. TRANS: Title for block user from group page.
+#. TRANS: Form legend for form to block user from a group.
+#: actions/groupblock.php:142 lib/groupblockform.php:91

 msgid "Block user from group"
 msgstr ""
 
 msgid "Block user from group"
 msgstr ""
 

-#: actions/groupblock.php:160
+#. TRANS: Explanatory text for block user from group form before setting the block.
+#. TRANS: %1$s is that to be blocked user, %2$s is the group the user will be blocked from.
+#: actions/groupblock.php:170

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


@@ -2580,182 +3091,209 @@ 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:182
-msgid "Do not block this user from this group"
+#: 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.
 msgstr ""
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.

-#: actions/groupblock.php:189
-msgid "Block this user from this group"
+#: actions/groupblock.php:199
+msgid "Block this user from this group."

 msgstr ""
 
 msgstr ""
 

-#: actions/groupblock.php:206
+#. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
+#: actions/groupblock.php:216

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

-#: actions/groupbyid.php:74 actions/userbyid.php:70
+#. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
+#. TRANS: Client error displayed trying to find a user by ID without providing an ID.
+#: actions/groupbyid.php:73 actions/userbyid.php:70

 msgid "No ID."
 msgstr ""
 
 msgid "No ID."
 msgstr ""
 

-#: actions/groupdesignsettings.php:68
+#. 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 ""
 
 msgid "You must be logged in to edit a group."
 msgstr ""
 

-#: actions/groupdesignsettings.php:144
+#. TRANS: Title group design settings page.
+#: actions/groupdesignsettings.php:146

 msgid "Group design"
 msgstr ""
 
 msgid "Group design"
 msgstr ""
 

-#: actions/groupdesignsettings.php:155
+#. 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 ""
 
 msgid ""
 "Customize the way your group looks with a background image and a colour "
 "palette of your choice."
 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".
-#: actions/groupdesignsettings.php:266 actions/userdesignsettings.php:186
-#: lib/designsettings.php:405 lib/designsettings.php:427
-msgid "Couldn't update your design."
+#. TRANS: Form validation error displayed when group design settings could not be updated because of an application issue.
+#: actions/groupdesignsettings.php:272
+msgid "Unable to update your design settings."

 msgstr ""
 
 msgstr ""
 

-#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:231
+#. TRANS: Form text to confirm saved group design settings.
+#. TRANS: Confirmation message on Profile design page when saving design settings has succeeded.
+#: actions/groupdesignsettings.php:317 actions/userdesignsettings.php:245

 msgid "Design preferences saved."
 msgstr ""
 
 msgid "Design preferences saved."
 msgstr ""
 

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

 msgid "Group logo"
 msgstr ""
 
 msgid "Group logo"
 msgstr ""
 

-#: actions/grouplogo.php:153
+#. TRANS: Instructions for group logo page.
+#. TRANS: %s is the maximum file size for that site.
+#: actions/grouplogo.php:156

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

-#: actions/grouplogo.php:236
+#. TRANS: Submit button for uploading a group logo.
+#: actions/grouplogo.php:243

 msgid "Upload"
 msgstr ""
 
 msgid "Upload"
 msgstr ""
 

-#: actions/grouplogo.php:289
+#. TRANS: Button text for cropping an uploaded group logo.
+#: actions/grouplogo.php:299

 msgid "Crop"
 msgstr ""
 
 msgid "Crop"
 msgstr ""
 

-#: actions/grouplogo.php:365
+#. TRANS: Form instructions on the group logo page.
+#: actions/grouplogo.php:376

 msgid "Pick a square area of the image to be the logo."
 msgstr ""
 
 msgid "Pick a square area of the image to be the logo."
 msgstr ""
 

-#: actions/grouplogo.php:399
+#. TRANS: Form success message after updating a group logo.
+#: actions/grouplogo.php:411

 msgid "Logo updated."
 msgstr ""
 
 msgid "Logo updated."
 msgstr ""
 

-#: actions/grouplogo.php:401
+#. TRANS: Form failure message after failing to update a group logo.
+#: actions/grouplogo.php:414

 msgid "Failed updating logo."
 msgstr ""
 
 #. TRANS: Title of the page showing group members.
 #. TRANS: %s is the name of the group.
 msgid "Failed updating logo."
 msgstr ""
 
 #. TRANS: Title of the page showing group members.
 #. TRANS: %s is the name of the group.

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

 #, 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:107
+#: actions/groupmembers.php:109

 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr ""
 
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr ""
 

-#: actions/groupmembers.php:122
+#. TRANS: Page notice for group members page.
+#: actions/groupmembers.php:125

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

-#: actions/groupmembers.php:186
-msgid "Admin"
-msgstr ""
-
-#. TRANS: Button text for the form that will block a user from a group.
-#: actions/groupmembers.php:399
-msgctxt "BUTTON"
-msgid "Block"
-msgstr ""
-
-#. TRANS: Submit button title.
-#: actions/groupmembers.php:403
-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 ""
 

-#: actions/groupmembers.php:498
-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:533
-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:537
-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 ""
 
 #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
 msgstr ""
 
 #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.

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

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

-#: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#. TRANS: Title for first page of the groups list.
+#: actions/groups.php:62
+msgctxt "TITLE"

 msgid "Groups"
 msgstr ""
 
 msgid "Groups"
 msgstr ""
 

-#: actions/groups.php:64
+#. TRANS: Title for all but the first page of the groups list.
+#. TRANS: %d is the page number.
+#: actions/groups.php:66

 #, php-format
 #, php-format

+msgctxt "TITLE"

 msgid "Groups, page %d"
 msgstr ""
 
 msgid "Groups, page %d"
 msgstr ""
 

-#: actions/groups.php:90
+#. 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:89

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

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

 msgstr ""
 
 msgstr ""
 

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

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

-#: actions/groupsearch.php:52
+#. TRANS: Instructions for page where groups can be searched. %%site.name%% is the name of the StatusNet site.
+#: actions/groupsearch.php:53

 #, php-format
 msgid ""
 "Search for groups on %%site.name%% by their name, location, or description. "
 "Separate the terms by spaces; they must be 3 characters or more."
 msgstr ""
 
 #, php-format
 msgid ""
 "Search for groups on %%site.name%% by their name, location, or description. "
 "Separate the terms by spaces; they must be 3 characters or more."
 msgstr ""
 

-#: actions/groupsearch.php:58
+#. TRANS: Title for page where groups can be searched.
+#: actions/groupsearch.php:60

 msgid "Group search"
 msgstr ""
 
 msgid "Group search"
 msgstr ""
 

-#: actions/groupsearch.php:79 actions/noticesearch.php:117
-#: actions/peoplesearch.php:83
+#. 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

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

-#: actions/groupsearch.php:82
+#. TRANS: Additional text on page where groups can be searched if no results were found for a query for a logged in user.
+#. TRANS: This message contains Markdown links in the form [link text](link).
+#: actions/groupsearch.php:87

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

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

 msgstr ""
 
 msgstr ""
 

-#: actions/groupsearch.php:85
+#. TRANS: Additional text on page where groups can be searched if no results were found for a query for a not logged in user.
+#. TRANS: This message contains Markdown links in the form [link text](link).
+#: actions/groupsearch.php:92

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


@@ -2763,201 +3301,204 @@ 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:94
+#: 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:99
+#: 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.
 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.

-#: actions/groupunblock.php:131 actions/unblock.php:86
+#. TRANS: Server error displayed when removing a user block.
+#: actions/groupunblock.php:133 actions/unblock.php:86

 msgid "Error removing the block."
 msgstr ""
 
 msgid "Error removing the block."
 msgstr ""
 

-#. TRANS: Title for instance messaging settings.
-#: actions/imsettings.php:60
+#. TRANS: Title for Instant Messaging settings.
+#: 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:74
+#: actions/imsettings.php:69

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

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

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
-#: actions/imsettings.php:94
+#. 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 ""
 
 msgid "IM is not available."
 msgstr ""
 

-#. TRANS: Form legend for IM settings form.
-#. TRANS: Field label for IM address input in IM settings form.
-#: actions/imsettings.php:106 actions/imsettings.php:136
-msgid "IM address"
-msgstr ""
-
-#: actions/imsettings.php:113
-msgid "Current confirmed Jabber/GTalk address."
+#. TRANS: Form note in IM settings form. %s is the type of IM address that was confirmed.
+#: actions/imsettings.php:116
+#, php-format
+msgid "Current confirmed %s address."

 msgstr ""
 
 #. TRANS: Form note in IM settings form.
 msgstr ""
 
 #. TRANS: Form note in IM settings form.

-#. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:124
+#. TRANS: %s is the IM service name, %2$s is the IM address set.
+#: actions/imsettings.php:128

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

-"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
-"message with further instructions. (Did you add %s to your buddy list?)"
+"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 ""
+
+#. TRANS: Field label for IM address.
+#: actions/imsettings.php:141
+msgid "IM address"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: IM address input field instructions in IM settings form.
-#. TRANS: %s is the IM 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:143
+#. TRANS: Field title for IM address. %s is the IM service name.
+#: actions/imsettings.php:144

 #, php-format
 #, php-format

-msgid ""
-"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
-"add %s to your buddy list in your IM client or on GTalk."
+msgid "%s screenname."

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Form legend for IM preferences form.
-#: actions/imsettings.php:158
-msgid "IM preferences"
+#. TRANS: Header for IM preferences form.
+#: actions/imsettings.php:165
+msgid "IM Preferences"

 msgstr ""
 
 #. TRANS: Checkbox label in IM preferences form.
 msgstr ""
 
 #. TRANS: Checkbox label in IM preferences form.

-#: actions/imsettings.php:163
-msgid "Send me notices through Jabber/GTalk."
+#: actions/imsettings.php:176
+msgid "Send me notices"

 msgstr ""
 
 #. TRANS: Checkbox label in IM preferences form.
 msgstr ""
 
 #. TRANS: Checkbox label in IM preferences form.

-#: actions/imsettings.php:169
-msgid "Post a notice when my Jabber/GTalk status changes."
+#: actions/imsettings.php:178
+msgid "Post a notice when my status changes."

 msgstr ""
 
 #. TRANS: Checkbox label in IM preferences form.
 msgstr ""
 
 #. TRANS: Checkbox label in IM preferences form.

-#: actions/imsettings.php:175
-msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
+#: actions/imsettings.php:180
+msgid "Send me replies from people I'm not subscribed to."

 msgstr ""
 
 #. TRANS: Checkbox label in IM preferences form.
 msgstr ""
 
 #. TRANS: Checkbox label in IM preferences form.

-#: actions/imsettings.php:182
-msgid "Publish a MicroID for my Jabber/GTalk address."
+#: 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 ""
 
 #. TRANS: Confirmation message for successful IM preferences save.
 msgstr ""
 
 #. TRANS: Confirmation message for successful IM preferences save.

-#: actions/imsettings.php:290 actions/othersettings.php:190
+#. TRANS: Confirmation message after saving preferences.
+#: actions/imsettings.php:301 actions/urlsettings.php:247

 msgid "Preferences saved."
 msgstr ""
 
 #. TRANS: Message given saving IM address without having provided one.
 msgid "Preferences saved."
 msgstr ""
 
 #. TRANS: Message given saving IM address without having provided one.

-#: actions/imsettings.php:312
-msgid "No Jabber ID."
+#: actions/imsettings.php:323
+msgid "No screenname."

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:320
-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 IM address that not valid.
-#: actions/imsettings.php:325
-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 IM address that is already set.
-#: actions/imsettings.php:329
-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 ""
 
 #. TRANS: Message given saving IM address that is already set for another user.
 msgstr ""
 
 #. TRANS: Message given saving IM address that is already set for another user.

-#: actions/imsettings.php:333
-msgid "Jabber ID already belongs to another user."
+#: actions/imsettings.php:348
+msgid "Screenname already belongs to another user."

 msgstr ""
 
 #. TRANS: Message given saving valid IM address that is to be confirmed.
 msgstr ""
 
 #. TRANS: Message given saving valid IM address that is to be confirmed.

-#. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:361
-#, php-format
-msgid ""
-"A confirmation code was sent to the IM address you added. You must approve %"
-"s for sending messages to you."
+#: actions/imsettings.php:373
+msgid "A confirmation code was sent to the IM address you added."

 msgstr ""
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
 msgstr ""
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.

-#: actions/imsettings.php:391
+#: actions/imsettings.php:400

 msgid "That is the wrong IM address."
 msgstr ""
 
 #. TRANS: Server error thrown on database error canceling IM address confirmation.
 msgid "That is the wrong IM address."
 msgstr ""
 
 #. TRANS: Server error thrown on database error canceling IM address confirmation.

-#: actions/imsettings.php:400
-msgid "Couldn't delete IM confirmation."
+#: actions/imsettings.php:409
+msgid "Could not delete confirmation."

 msgstr ""
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
 msgstr ""
 
 #. TRANS: Message given after successfully canceling IM address confirmation.

-#: actions/imsettings.php:405
+#: actions/imsettings.php:414

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

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

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Message given after successfully removing a registered IM address.
-#: actions/imsettings.php:450
+#. TRANS: Message given after successfully removing a registered Instant Messaging address.
+#: actions/imsettings.php:454

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

+#. TRANS: Title for all but the first page of the inbox page.
+#. TRANS: %1$s is the user's nickname, %2$s is the page number.

 #: actions/inbox.php:59
 #, php-format
 msgid "Inbox for %1$s - page %2$d"
 msgstr ""
 
 #: actions/inbox.php:59
 #, php-format
 msgid "Inbox for %1$s - page %2$d"
 msgstr ""
 

-#: actions/inbox.php:62
+#. TRANS: Title for the first page of the inbox page.
+#. TRANS: %s is the user's nickname.
+#: actions/inbox.php:64

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

-#: actions/inbox.php:115
+#. TRANS: Instructions for user inbox page.
+#: actions/inbox.php:106

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

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

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

 #, 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:77
+#: actions/invite.php:79

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

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

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


@@ -2965,7 +3506,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:139
+#: actions/invite.php:141

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


@@ -2973,7 +3514,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:145 actions/invite.php:159
+#: actions/invite.php:147 actions/invite.php:161

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


@@ -2982,7 +3523,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:153
+#: actions/invite.php:155

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


@@ -2992,7 +3533,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:167
+#: actions/invite.php:169

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


@@ -3000,40 +3541,41 @@ 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:177
+#: actions/invite.php:179

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

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

 msgid "Email addresses"
 msgstr ""
 
 #. TRANS: Tooltip for field label for a list of e-mail addresses.
 msgid "Email addresses"
 msgstr ""
 
 #. TRANS: Tooltip for field label for a list of e-mail addresses.

-#: actions/invite.php:220
-msgid "Addresses of friends to invite (one per line)"
+#: actions/invite.php:222
+msgid "Addresses of friends to invite (one per line)."

 msgstr ""
 
 #. TRANS: Field label for a personal message to send to invitees.
 msgstr ""
 
 #. TRANS: Field label for a personal message to send to invitees.

-#: actions/invite.php:224
+#: actions/invite.php:226

 msgid "Personal message"
 msgstr ""
 
 #. TRANS: Tooltip for field label for a personal message to send to invitees.
 msgid "Personal message"
 msgstr ""
 
 #. TRANS: Tooltip for field label for a personal message to send to invitees.

-#: actions/invite.php:227
+#: actions/invite.php:229

 msgid "Optionally add a personal message to the invitation."
 msgstr ""
 
 #. TRANS: Send button for inviting friends
 msgid "Optionally add a personal message to the invitation."
 msgstr ""
 
 #. TRANS: Send button for inviting friends

-#: actions/invite.php:231
+#. TRANS: Button text for sending notice.
+#: actions/invite.php:233 lib/noticeform.php:302

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


@@ -3041,7 +3583,7 @@ 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:263
+#: actions/invite.php:265

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


@@ -3051,7 +3593,7 @@ msgstr ""
 #. 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.
 #. 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:270
+#: actions/invite.php:272

 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"


@@ -3082,201 +3624,259 @@ msgid ""
 "Sincerely, %2$s\n"
 msgstr ""
 
 "Sincerely, %2$s\n"
 msgstr ""
 

-#: actions/joingroup.php:60
+#. 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 ""
 
 msgid "You must be logged in to join a group."
 msgstr ""
 

-#: actions/joingroup.php:141
+#. TRANS: Title for join group page after joining.
+#: actions/joingroup.php:145

 #, php-format
 #, php-format

+msgctxt "TITLE"

 msgid "%1$s joined group %2$s"
 msgstr ""
 
 msgid "%1$s joined group %2$s"
 msgstr ""
 

-#: actions/leavegroup.php:60
-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:158
+msgid "Unknown error joining group."

 msgstr ""
 
 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.
 #. TRANS: Error text shown when trying to leave an existing group the user is not a member of.

-#: actions/leavegroup.php:100 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 ""
 

-#: actions/leavegroup.php:137
-#, php-format
-msgid "%1$s left group %2$s"
-msgstr ""
-

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

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

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

-#: actions/licenseadminpanel.php:67
+#. TRANS: Form instructions for the site license admin panel.
+#: actions/licenseadminpanel.php:65

 msgid "License for this StatusNet site"
 msgstr ""
 
 msgid "License for this StatusNet site"
 msgstr ""
 

-#: actions/licenseadminpanel.php:139
+#. 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:149
+#. 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:156
+#. 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:168
+#. 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 ""
 

+#. 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 ""
 
 #: actions/licenseadminpanel.php:171
 msgid "Invalid license image URL."
 msgstr ""
 

-#: actions/licenseadminpanel.php:179
+#. 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:187
+#. 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:239
+#. TRANS: Form legend in the license admin panel.
+#: actions/licenseadminpanel.php:240

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

-#: actions/licenseadminpanel.php:245
+#. TRANS: License option in the license admin panel.
+#. TRANS: Checkbox label in widget for selecting potential addressees to mark the notice private.
+#: actions/licenseadminpanel.php:247 lib/toselector.php:123

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

-#: actions/licenseadminpanel.php:246
+#. 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:247
+#. TRANS: License option in the license admin panel.
+#: actions/licenseadminpanel.php:251

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

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

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

-#: actions/licenseadminpanel.php:254
-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:268
+#. TRANS: Form legend in the license admin panel.
+#: actions/licenseadminpanel.php:275

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

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

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

-#: actions/licenseadminpanel.php:275
+#. 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:283
+#. TRANS: Field label in the license admin panel.
+#: actions/licenseadminpanel.php:293

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

-#: actions/licenseadminpanel.php:284
+#. 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:292
+#. TRANS: Field label in the license admin panel.
+#: actions/licenseadminpanel.php:304

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

-#: actions/licenseadminpanel.php:293
+#. 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:300
+#. 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:301
+#. 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 ""
 

-#: actions/licenseadminpanel.php:319
-msgid "Save license settings"
+#. TRANS: Button title in the license admin panel.
+#: actions/licenseadminpanel.php:339
+msgid "Save license settings."

 msgstr ""
 
 msgstr ""
 

-#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
+#. TRANS: Client error displayed when trying to log in while already logged in.
+#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
+#. TRANS: Client error displayed when trying to register while already logged in.
+#: actions/login.php:98 actions/otp.php:62 actions/register.php:136

 msgid "Already logged in."
 msgstr ""
 
 msgid "Already logged in."
 msgstr ""
 

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

-#: actions/login.php:154 actions/otp.php:120
+#. TRANS: Server error displayed when during login a server error occurs.
+#. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
+#: actions/login.php:134 actions/otp.php:127

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

-#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
+#. TRANS: Page title for login page.
+#: actions/login.php:189

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

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

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

-#: actions/login.php:258 actions/register.php:491
+#. 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:259 actions/register.php:493
+#. 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:269
+#. 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:288
+#. 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:292
+#. 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:295
+#. 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 ""
 


@@ -3286,29 +3886,37 @@ msgid "New application"
 msgstr ""
 
 #. TRANS: Client error displayed trying to add a new application while not logged in.
 msgstr ""
 
 #. TRANS: Client error displayed trying to add a new application while not logged in.

-#: actions/newapplication.php:65
+#: actions/newapplication.php:64

 msgid "You must be logged in to register an application."
 msgstr ""
 
 msgid "You must be logged in to register an application."
 msgstr ""
 

-#: actions/newapplication.php:147
+#. TRANS: Form instructions for registering a new application.
+#: actions/newapplication.php:148

 msgid "Use this form to register a new application."
 msgstr ""
 
 msgid "Use this form to register a new application."
 msgstr ""
 

-#: actions/newapplication.php:184
+#. TRANS: Validation error shown when not providing a source URL in the "New application" form.
+#: actions/newapplication.php:190

 msgid "Source URL is required."
 msgstr ""
 
 msgid "Source URL is required."
 msgstr ""
 

-#: actions/newapplication.php:266 actions/newapplication.php:275
+#. TRANS: Server error displayed when an application could not be registered in the database through the "New application" form.
+#: actions/newapplication.php:280 actions/newapplication.php:290

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

+#. TRANS: Form validation error on New application page when providing an invalid image upload.
+#: 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:488

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


@@ -3317,155 +3925,186 @@ msgstr ""
 msgid "Use this form to create a new group."
 msgstr ""
 
 msgid "Use this form to create a new group."
 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:484
+#: lib/command.php:573

 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: Client error displayed trying to send a direct message to self.

 #. TRANS: Error text shown when trying to send a direct message to self.
 #. TRANS: Error text shown when trying to send a direct message to self.

-#: actions/newmessage.php:167 lib/command.php:505
+#: actions/newmessage.php:178 lib/command.php:511

 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
 
 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:519

 #, 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 ""
 
 msgid "Notice posted"
 msgstr ""
 

-#: actions/noticesearch.php:68
+#. TRANS: Instructions for Notice search page.
+#. TRANS: %%site.name%% is the name of the StatusNet site.
+#: actions/noticesearch.php:69

 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
 "by spaces; they must be 3 characters or more."
 msgstr ""
 
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
 "by spaces; they must be 3 characters or more."
 msgstr ""
 

-#: actions/noticesearch.php:78
+#. TRANS: Title of the page where users can search for notices.
+#: actions/noticesearch.php:80

 msgid "Text search"
 msgstr ""
 
 msgid "Text search"
 msgstr ""
 

-#: actions/noticesearch.php:91
+#. TRANS: Test in RSS notice search.
+#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
+#: actions/noticesearch.php:95

 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr ""
 
 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr ""
 

-#: actions/noticesearch.php:121
+#. TRANS: Text for logged in users making a query for notices without results.
+#. TRANS: This message contains a Markdown link.
+#: actions/noticesearch.php:128

 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
 "status_textarea=%s)!"
 msgstr ""
 
 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
 "status_textarea=%s)!"
 msgstr ""
 

-#: actions/noticesearch.php:124
+#. TRANS: Text for not logged in users making a query for notices without results.
+#. TRANS: This message contains Markdown links.
+#: actions/noticesearch.php:133

 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
 "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
 msgstr ""
 
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
 "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
 msgstr ""
 

-#: actions/noticesearchrss.php:96
+#. TRANS: RSS notice search feed title. %s is the query.
+#: actions/noticesearchrss.php:95

 #, php-format
 msgid "Updates with \"%s\""
 msgstr ""
 
 #, php-format
 msgid "Updates with \"%s\""
 msgstr ""
 

-#: actions/noticesearchrss.php:98
+#. TRANS: RSS notice search feed description.
+#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
+#: actions/noticesearchrss.php:99

 #, php-format
 #, php-format

-msgid "Updates matching search term \"%1$s\" on %2$s!"
+msgid "Updates matching search term \"%1$s\" on %2$s."

 msgstr ""
 
 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:71
+#: 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:83
+#: actions/oauthconnectionssettings.php:80

 msgid "The following connections exist for your account."
 msgstr ""
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
 msgid "The following connections exist for your account."
 msgstr ""
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.

-#: actions/oauthconnectionssettings.php:168
+#: actions/oauthconnectionssettings.php:166

 msgid "You are not a user of that application."
 msgstr ""
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
 msgid "You are not a user of that application."
 msgstr ""
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.

-#: actions/oauthconnectionssettings.php:183
+#: actions/oauthconnectionssettings.php:181

 #, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr ""
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
 #, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr ""
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.

-#: actions/oauthconnectionssettings.php:202
+#: actions/oauthconnectionssettings.php:200

 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "


@@ -3473,189 +4112,224 @@ msgid ""
 msgstr ""
 
 #. TRANS: Empty list message when no applications have been authorised yet.
 msgstr ""
 
 #. TRANS: Empty list message when no applications have been authorised yet.

-#: actions/oauthconnectionssettings.php:213
+#: actions/oauthconnectionssettings.php:211

 msgid "You have not authorized any applications to use your account."
 msgstr ""
 
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.
 msgid "You have not authorized any applications to use your account."
 msgstr ""
 
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.

-#: actions/oauthconnectionssettings.php:233
+#: actions/oauthconnectionssettings.php:231

 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
 "this instance of StatusNet."
 msgstr ""
 
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
 "this instance of StatusNet."
 msgstr ""
 

-#: actions/oembed.php:80 actions/shownotice.php:100
+#. TRANS: Server error displayed in oEmbed action when path not found.
+#. TRANS: %s is a path.
+#: actions/oembed.php:66
+#, php-format
+msgid "\"%s\" not found."
+msgstr ""
+
+#. TRANS: Server error displayed in oEmbed action when notice not found.
+#. TRANS: %s is a notice.
+#: actions/oembed.php:80
+#, php-format
+msgid "Notice %s not found."
+msgstr ""
+
+#. TRANS: Server error displayed in oEmbed action when notice has not profile.
+#. TRANS: Server error displayed trying to show a notice without a connected profile.
+#: actions/oembed.php:85 actions/shownotice.php:99

 msgid "Notice has no profile."
 msgstr ""
 
 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 ""
 

+#. TRANS: Server error displayed in oEmbed action when attachment not found.
+#. TRANS: %d is an attachment ID.
+#: actions/oembed.php:103
+#, php-format
+msgid "Attachment %s not found."
+msgstr ""
+
+#. TRANS: Server error displayed in oEmbed request when a path is not supported.
+#. TRANS: %s is a path.
+#: actions/oembed.php:146
+#, php-format
+msgid "\"%s\" not supported for oembed requests."
+msgstr ""
+

 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
 #. 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:1206
-#: lib/apiaction.php:1233 lib/apiaction.php:1362
+#: actions/oembed.php:204 actions/oembed.php:224 lib/apiaction.php:1207
+#: lib/apiaction.php:1234 lib/apiaction.php:1369

 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"
 msgstr ""
 
 #: actions/opensearch.php:64
 msgid "People Search"
 msgstr ""
 

-#: actions/opensearch.php:67
+#. TRANS: ShortName in the OpenSearch interface when trying to find notices.
+#: actions/opensearch.php:68

 msgid "Notice Search"
 msgstr ""
 
 msgid "Notice Search"
 msgstr ""
 

-#: actions/othersettings.php:59
-msgid "Other settings"
-msgstr ""
-
-#. TRANS: Instructions for tab "Other" in user profile settings.
-#: actions/othersettings.php:71
-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/othersettings.php:111
-msgid " (free service)"
-msgstr ""
-
-#. TRANS: Label for dropdown with URL shortener services.
-#: actions/othersettings.php:120
-msgid "Shorten URLs with"
-msgstr ""
-
-#. TRANS: Tooltip for for dropdown with URL shortener services.
-#: actions/othersettings.php:122
-msgid "Automatic shortening service to use."
-msgstr ""
-
-#. TRANS: Label for checkbox.
-#: actions/othersettings.php:128
-msgid "View profile designs"
-msgstr ""
-
-#. TRANS: Tooltip for checkbox.
-#: actions/othersettings.php:130
-msgid "Show or hide profile designs."
-msgstr ""
-
-#. TRANS: Form validation error for form "Other settings" in user profile.
-#: actions/othersettings.php:162
-msgid "URL shortening service is too long (maximum 50 characters)."
-msgstr ""
-
-#: actions/otp.php:69
+#. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
+#: actions/otp.php:70

 msgid "No user ID specified."
 msgstr ""
 
 msgid "No user ID specified."
 msgstr ""
 

-#: actions/otp.php:83
+#. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
+#: actions/otp.php:86

 msgid "No login token specified."
 msgstr ""
 
 msgid "No login token specified."
 msgstr ""
 

-#: actions/otp.php:90
+#. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
+#: actions/otp.php:94

 msgid "No login token requested."
 msgstr ""
 
 msgid "No login token requested."
 msgstr ""
 

-#: actions/otp.php:95
+#. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
+#: actions/otp.php:100

 msgid "Invalid login token specified."
 msgstr ""
 
 msgid "Invalid login token specified."
 msgstr ""
 

-#: actions/otp.php:104
+#. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
+#: actions/otp.php:110

 msgid "Login token expired."
 msgstr ""
 
 msgid "Login token expired."
 msgstr ""
 

-#: actions/outbox.php:58
+#. TRANS: Title for outbox for any but the fist page.
+#. TRANS: %1$s is the user nickname, %2$d is the page number.
+#: actions/outbox.php:57

 #, php-format
 msgid "Outbox for %1$s - page %2$d"
 msgstr ""
 
 #, php-format
 msgid "Outbox for %1$s - page %2$d"
 msgstr ""
 

+#. TRANS: Title for first page of outbox.

 #: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr ""
 
 #: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr ""
 

-#: actions/outbox.php:116
+#. TRANS: Instructions for outbox.
+#: actions/outbox.php:103

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

-#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+#. TRANS: Fieldset legend on page where to change password.
+#. TRANS: Fieldset legend for password reset form.
+#: 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 ""
 

-#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+#. TRANS: Field label on page where to change password.
+#. TRANS: Field label for password reset form.
+#: actions/passwordsettings.php:113 actions/recoverpassword.php:256

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

-#: actions/passwordsettings.php:109
-msgid "6 or more characters"
+#. 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 ""
 
 msgstr ""
 

-#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
-msgid "Same as password above"
+#. 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: Ttile 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 ""
 
 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:154 actions/register.php:238
+#. 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:157 actions/register.php:241
-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:165
-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:181
+#. 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 ""
 

-#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
-msgid "Can't save new password."
+#. TRANS: Server error displayed on page where to change password when password change
+#. TRANS: could not be made because of a server error.
+#. TRANS: Reset password form validation error message.
+#: actions/passwordsettings.php:201 actions/recoverpassword.php:422
+msgid "Cannot save new password."

 msgstr ""
 
 msgstr ""
 

-#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+#. 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 ""
 


@@ -3699,384 +4373,498 @@ msgid "Invalid SSL server. The maximum length is 255 characters."
 msgstr ""
 
 #. TRANS: Fieldset legend in Paths admin panel.
 msgstr ""
 
 #. TRANS: Fieldset legend in Paths admin panel.

-#: actions/pathsadminpanel.php:235 actions/siteadminpanel.php:58
+#: actions/pathsadminpanel.php:235

 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:241 actions/pathsadminpanel.php:284
+#: actions/pathsadminpanel.php:375 actions/pathsadminpanel.php:430

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

-#: actions/pathsadminpanel.php:242
+#. TRANS: Field title in Paths admin panel.
+#: actions/pathsadminpanel.php:243

 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:249 actions/pathsadminpanel.php:293
+#: actions/pathsadminpanel.php:384 actions/pathsadminpanel.php:439

 msgid "Path"
 msgstr ""
 
 msgid "Path"
 msgstr ""
 

-#: actions/pathsadminpanel.php:249
+#. TRANS: Field title in Paths admin panel.
+#: actions/pathsadminpanel.php:251

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

 msgid "Locale directory"
 msgstr ""
 
 msgid "Locale directory"
 msgstr ""
 

-#: actions/pathsadminpanel.php:256
+#. TRANS: Field title in Paths admin panel.
+#: actions/pathsadminpanel.php:259

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

 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:269
+msgid "Use fancy URLs (more readable and memorable)?"

 msgstr ""
 
 msgstr ""
 

-#: actions/pathsadminpanel.php:272
+#. TRANS: Fieldset legend in Paths admin panel.
+#: actions/pathsadminpanel.php:277
+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:286

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

 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:302 actions/pathsadminpanel.php:393
+#: actions/pathsadminpanel.php:448 actions/pathsadminpanel.php:500

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

 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:311 actions/pathsadminpanel.php:402
+#: actions/pathsadminpanel.php:457

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

 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:320 actions/pathsadminpanel.php:411
+#: actions/pathsadminpanel.php:466

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

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

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

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

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

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

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

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

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

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

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

-#: actions/pathsadminpanel.php:372
+#: actions/pathsadminpanel.php:377

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

-#: actions/pathsadminpanel.php:381
+#: actions/pathsadminpanel.php:386

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

-#: actions/pathsadminpanel.php:390
+#: actions/pathsadminpanel.php:395

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

-#: actions/pathsadminpanel.php:399
+#: actions/pathsadminpanel.php:404

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

-#: actions/pathsadminpanel.php:408
+#: actions/pathsadminpanel.php:413

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

-#. TRANS: DT element label in attachment list.
-#: actions/pathsadminpanel.php:419 lib/attachmentlist.php:99
+#: actions/pathsadminpanel.php:424

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

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

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

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

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

 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:477
+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:482 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:484

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

 msgid "Always"
 msgstr ""
 
 msgid "Always"
 msgstr ""
 

-#: actions/pathsadminpanel.php:485
+#. TRANS: Drop down label in Paths admin panel.
+#: actions/pathsadminpanel.php:490

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

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

 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
+#: actions/pathsadminpanel.php:519

 msgid "Save paths"
 msgstr ""
 
 msgid "Save paths"
 msgstr ""
 

-#: actions/peoplesearch.php:52
+#. TRANS: Instructions for the "People search" page.
+#. TRANS: %%site.name%% is the name of the StatusNet site.
+#: actions/peoplesearch.php:54

 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
 "Separate the terms by spaces; they must be 3 characters or more."
 msgstr ""
 
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
 "Separate the terms by spaces; they must be 3 characters or more."
 msgstr ""
 

-#: actions/peoplesearch.php:58
+#. TRANS: Title of a page where users can search for other users.
+#: actions/peoplesearch.php:61

 msgid "People search"
 msgstr ""
 
 msgid "People search"
 msgstr ""
 

-#: actions/peopletag.php:68
+#. TRANS: Client error displayed when trying to tag a profile with an invalid tag.
+#. TRANS: %s is the invalid tag.
+#: actions/peopletag.php:69

 #, php-format
 msgid "Not a valid people tag: %s."
 msgstr ""
 
 #, php-format
 msgid "Not a valid people tag: %s."
 msgstr ""
 

-#: actions/peopletag.php:142
+#. TRANS: Page title for users with a certain self-tag.
+#. TRANS: %1$s is the tag, %2$s is the page number.
+#: actions/peopletag.php:145

 #, php-format
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr ""
 
 #, php-format
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr ""
 

-#: actions/postnotice.php:95
+#. 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.
+#: actions/pluginenable.php:78 actions/subscribe.php:77
+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 ""
+
+#. TRANS: Admin form section header
+#: actions/pluginsadminpanel.php:79
+msgid "Default plugins"
+msgstr ""
+
+#. 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 if the notice posted has too many characters.
+#: actions/postnotice.php:96

 msgid "Invalid notice content."
 msgstr ""
 
 msgid "Invalid notice content."
 msgstr ""
 

-#: actions/postnotice.php:101
+#. TRANS: Exception thrown if a notice's license is not compatible with the StatusNet site license.
+#. TRANS: %1$s is the notice license, %2$s is the StatusNet site's license.
+#: actions/postnotice.php:104

 #, php-format
 #, php-format

-msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
+msgid "Notice license \"%1$s\" is not compatible with site license \"%2$s\"."

 msgstr ""
 
 #. TRANS: Page title for profile settings.
 msgstr ""
 
 #. TRANS: Page title for profile settings.

-#: actions/profilesettings.php:61
+#: 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:73
+#: 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:102
+#: 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:113
+#. 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.
-#: actions/profilesettings.php:117 actions/register.php:456
-#: actions/showgroup.php:252 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:152
+#. 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:122 actions/register.php:461
-#: lib/applicationeditform.php:236 lib/groupeditform.php:161
+#. 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:125
+#. 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:133 actions/register.php:472
+#. 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:139 actions/register.php:477
-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:143 actions/register.php:479
+#. 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.
-#: actions/profilesettings.php:149 actions/register.php:484
-#: actions/showgroup.php:262 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:180
-#: lib/userprofile.php:167
+#. TRANS: Field label on account registration page.
+#. TRANS: Field label on group edit form.
+#: actions/profilesettings.php:143 actions/register.php:505
+#: lib/groupeditform.php:184

 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:152 actions/register.php:486
-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:157
+#: 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.

-#: actions/profilesettings.php:165 actions/tagother.php:149
-#: actions/tagother.php:209 lib/subscriptionlist.php:106
-#: lib/subscriptionlist.php:108 lib/userprofile.php:212
+#. TRANS: Field label for inputting tags on "tag other users" page.
+#. TRANS: Description for link to "tag other users" in widget to show a list of profiles.
+#. TRANS: Text widget to show a list of profiles with their tags.
+#: actions/profilesettings.php:159 actions/tagother.php:137
+#: lib/subscriptionlist.php:104 lib/subscriptionlist.php:107

 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:168
+#: actions/profilesettings.php:162

 msgid ""
 msgid ""

-"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
+"separated."

 msgstr ""
 
 #. TRANS: Dropdownlist label in form for profile settings.
 msgstr ""
 
 #. TRANS: Dropdownlist label in form for profile settings.

-#: actions/profilesettings.php:173
+#: 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:175
-msgid "Preferred language"
+#: actions/profilesettings.php:169
+msgid "Preferred language."

 msgstr ""
 
 #. TRANS: Dropdownlist label in form for profile settings.
 msgstr ""
 
 #. TRANS: Dropdownlist label in form for profile settings.

-#: actions/profilesettings.php:185
+#: 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:187
+#: 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:193
+#: 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:262 actions/register.php:229
+#. 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)."


@@ -4084,102 +4872,117 @@ 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:273 actions/siteadminpanel.php:151
+#. TRANS: Client error displayed trying to save site settings without a timezone.
+#: actions/profilesettings.php:289 actions/siteadminpanel.php:152

 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:281
+#: 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:295 actions/tagother.php:178
+#. TRANS: Form validation error when entering an invalid tag.
+#. TRANS: %s is the invalid tag.
+#: actions/profilesettings.php:311 actions/tagother.php:171

 #, php-format
 #, php-format

-msgid "Invalid tag: \"%s\""
+msgid "Invalid tag: \"%s\"."

 msgstr ""
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
 #. TRANS: automatically subscribe to any subscriber.
 msgstr ""
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
 #. TRANS: automatically subscribe to any subscriber.

-#: actions/profilesettings.php:351
-msgid "Couldn't update user for autosubscribe."
+#: actions/profilesettings.php:371
+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:409
-msgid "Couldn't save location prefs."
-msgstr ""
-
-#. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/profilesettings.php:422
-msgid "Couldn't save profile."
+#: actions/profilesettings.php:429
+msgid "Could not save location prefs."

 msgstr ""
 
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
 msgstr ""
 
 #. TRANS: Server error thrown when user profile settings tags could not be saved.

-#: actions/profilesettings.php:431
-msgid "Couldn't save tags."
+#. TRANS: Client error on "tag other users" page when saving tags fails server side.
+#: actions/profilesettings.php:451 actions/tagother.php:195
+msgid "Could not save tags."

 msgstr ""
 
 #. TRANS: Confirmation shown when user profile settings are saved.
 #. TRANS: Message after successful saving of administrative settings.
 msgstr ""
 
 #. TRANS: Confirmation shown when user profile settings are saved.
 #. TRANS: Message after successful saving of administrative settings.

-#: actions/profilesettings.php:440 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:460 lib/adminpanelaction.php:138

 msgid "Settings saved."
 msgstr ""
 
 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: Page title for page where a user account can be restored from backup.

-#: actions/profilesettings.php:481 actions/restoreaccount.php:60
+#: actions/profilesettings.php:507 actions/restoreaccount.php:60

 msgid "Restore account"
 msgstr ""
 
 msgid "Restore account"
 msgstr ""
 

+#. TRANS: Client error displayed when requesting a public timeline page beyond the page limit.
+#. TRANS: %s is the page limit.

 #: actions/public.php:83
 #, php-format
 msgid "Beyond the page limit (%s)."
 msgstr ""
 
 #: actions/public.php:83
 #, php-format
 msgid "Beyond the page limit (%s)."
 msgstr ""
 

-#: actions/public.php:92
+#. TRANS: Server error displayed when a public timeline cannot be retrieved.
+#: actions/public.php:96

 msgid "Could not retrieve public stream."
 msgstr ""
 
 msgid "Could not retrieve public stream."
 msgstr ""
 

-#: actions/public.php:130
+#. TRANS: Title for all public timeline pages but the first.
+#. TRANS: %d is the page number.
+#: actions/public.php:134

 #, 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:137 lib/publicgroupnav.php:65

 msgid "Public timeline"
 msgstr ""
 
 msgid "Public timeline"
 msgstr ""
 

-#: actions/public.php:160
+#. TRANS: Link description for public timeline feed.
+#: actions/public.php:165

 msgid "Public Stream Feed (RSS 1.0)"
 msgstr ""
 
 msgid "Public Stream Feed (RSS 1.0)"
 msgstr ""
 

-#: actions/public.php:164
+#. TRANS: Link description for public timeline feed.
+#: actions/public.php:170

 msgid "Public Stream Feed (RSS 2.0)"
 msgstr ""
 
 msgid "Public Stream Feed (RSS 2.0)"
 msgstr ""
 

-#: actions/public.php:168
+#. TRANS: Link description for public timeline feed.
+#: actions/public.php:175

 msgid "Public Stream Feed (Atom)"
 msgstr ""
 
 msgid "Public Stream Feed (Atom)"
 msgstr ""
 

-#: actions/public.php:188
+#. TRANS: Text displayed for public feed when there are no public notices.
+#: actions/public.php:181

 #, 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:185

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

 #, 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:238

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


@@ -4188,7 +4991,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:245

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


@@ -4196,6 +5001,12 @@ msgid ""
 "tool."
 msgstr ""
 
 "tool."
 msgstr ""
 

+#. TRANS: Public RSS feed description. %s is the StatusNet site name.
+#: actions/publicrss.php:106
+#, php-format
+msgid "%s updates from everyone."
+msgstr ""
+

 #. TRANS: Title for public tag cloud.
 #: actions/publictagcloud.php:57
 msgid "Public tag cloud"
 #. TRANS: Title for public tag cloud.
 #: actions/publictagcloud.php:57
 msgid "Public tag cloud"


@@ -4234,228 +5045,291 @@ msgid ""
 "one!"
 msgstr ""
 
 "one!"
 msgstr ""
 

-#: actions/publictagcloud.php:146
-msgid "Tag cloud"
-msgstr ""
-
-#: actions/recoverpassword.php:36
+#. TRANS: Client error displayed trying to recover password while already logged in.
+#: actions/recoverpassword.php:37

 msgid "You are already logged in!"
 msgstr ""
 
 msgid "You are already logged in!"
 msgstr ""
 

-#: actions/recoverpassword.php:62
+#. TRANS: Client error displayed when password recovery code is not correct.
+#: actions/recoverpassword.php:64

 msgid "No such recovery code."
 msgstr ""
 
 msgid "No such recovery code."
 msgstr ""
 

-#: actions/recoverpassword.php:66
+#. TRANS: Client error displayed when no proper password recovery code was submitted.
+#: actions/recoverpassword.php:69

 msgid "Not a recovery code."
 msgstr ""
 
 msgid "Not a recovery code."
 msgstr ""
 

-#: actions/recoverpassword.php:73
+#. TRANS: Server error displayed trying to recover password without providing a user.
+#: actions/recoverpassword.php:77

 msgid "Recovery code for unknown user."
 msgstr ""
 
 msgid "Recovery code for unknown user."
 msgstr ""
 

-#: actions/recoverpassword.php:86
+#. TRANS: Server error displayed removing a password recovery code from the database.
+#: actions/recoverpassword.php:91

 msgid "Error with confirmation code."
 msgstr ""
 
 msgid "Error with confirmation code."
 msgstr ""
 

-#: actions/recoverpassword.php:97
+#. TRANS: Client error displayed trying to recover password with too old a recovery code.
+#: actions/recoverpassword.php:103

 msgid "This confirmation code is too old. Please start again."
 msgstr ""
 
 msgid "This confirmation code is too old. Please start again."
 msgstr ""
 

-#: actions/recoverpassword.php:111
+#. TRANS: Server error displayed when updating a user's e-mail address in the database fails while recovering a password.
+#: actions/recoverpassword.php:118

 msgid "Could not update user with confirmed email address."
 msgstr ""
 
 msgid "Could not update user with confirmed email address."
 msgstr ""
 

-#: actions/recoverpassword.php:152
+#. TRANS: Page notice for password recovery page.
+#: actions/recoverpassword.php:160

 msgid ""
 "If you have forgotten or lost your password, you can get a new one sent to "
 "the email address you have stored in your account."
 msgstr ""
 
 msgid ""
 "If you have forgotten or lost your password, you can get a new one sent to "
 "the email address you have stored in your account."
 msgstr ""
 

-#: actions/recoverpassword.php:158
-msgid "You have been identified. Enter a new password below. "
+#. TRANS: Page notice for password change page.
+#: actions/recoverpassword.php:167
+msgid "You have been identified. Enter a new password below."

 msgstr ""
 
 msgstr ""
 

-#: actions/recoverpassword.php:188
+#. TRANS: Fieldset legend for password recovery page.
+#: actions/recoverpassword.php:198

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

-#: actions/recoverpassword.php:191
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:202

 msgid "Nickname or email address"
 msgstr ""
 
 msgid "Nickname or email address"
 msgstr ""
 

-#: actions/recoverpassword.php:193
+#. TRANS: Title for field label on password recovery page.
+#: actions/recoverpassword.php:205

 msgid "Your nickname on this server, or your registered email address."
 msgstr ""
 
 msgid "Your nickname on this server, or your registered email address."
 msgstr ""
 

-#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:212
+msgid "Recover"
+msgstr ""
+
+#. TRANS: Button text on password recovery page.
+#: actions/recoverpassword.php:214
+msgctxt "BUTTON"

 msgid "Recover"
 msgstr ""
 
 msgid "Recover"
 msgstr ""
 

-#: actions/recoverpassword.php:208
+#. TRANS: Title for password recovery page in password reset mode.
+#: actions/recoverpassword.php:223

 msgid "Reset password"
 msgstr ""
 
 msgid "Reset password"
 msgstr ""
 

-#: actions/recoverpassword.php:209
+#. TRANS: Title for password recovery page in password recover mode.
+#: actions/recoverpassword.php:225

 msgid "Recover password"
 msgstr ""
 
 msgid "Recover password"
 msgstr ""
 

-#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
+#. TRANS: Title for password recovery page in email sent mode.
+#. TRANS: Subject for password recovery e-mail.
+#: actions/recoverpassword.php:227 actions/recoverpassword.php:370

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

-#: actions/recoverpassword.php:213
-msgid "Unknown action"
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/recoverpassword.php:229
+msgid "Password saved"

 msgstr ""
 
 msgstr ""
 

-#: actions/recoverpassword.php:236
-msgid "6 or more characters, and don't forget it!"
+#. TRANS: Title for field label for password reset form.
+#: actions/recoverpassword.php:258
+msgid "6 or more characters, and do not forget it!"

 msgstr ""
 
 msgstr ""
 

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

 msgid "Reset"
 msgstr ""
 
 msgid "Reset"
 msgstr ""
 

-#: actions/recoverpassword.php:252
+#. TRANS: Form instructions for password recovery form.
+#: actions/recoverpassword.php:278

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

-#: actions/recoverpassword.php:282
+#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
+#: actions/recoverpassword.php:313

 msgid "No user with that email address or username."
 msgstr ""
 
 msgid "No user with that email address or username."
 msgstr ""
 

-#: actions/recoverpassword.php:299
+#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
+#: actions/recoverpassword.php:331

 msgid "No registered email address for that user."
 msgstr ""
 
 msgid "No registered email address for that user."
 msgstr ""
 

-#: actions/recoverpassword.php:313
+#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
+#: actions/recoverpassword.php:346

 msgid "Error saving address confirmation."
 msgstr ""
 
 msgid "Error saving address confirmation."
 msgstr ""
 

-#: actions/recoverpassword.php:338
+#. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
+#: actions/recoverpassword.php:374

 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
 msgstr ""
 
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
 msgstr ""
 

-#: actions/recoverpassword.php:357
+#. TRANS: Client error displayed when trying to reset as password without providing a user.
+#: actions/recoverpassword.php:395

 msgid "Unexpected password reset."
 msgstr ""
 
 msgid "Unexpected password reset."
 msgstr ""
 

-#: actions/recoverpassword.php:365
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:404

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

-#: actions/recoverpassword.php:369
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:409

 msgid "Password and confirmation do not match."
 msgstr ""
 
 msgid "Password and confirmation do not match."
 msgstr ""
 

-#: actions/recoverpassword.php:388 actions/register.php:256
+#. TRANS: Server error displayed when something does wrong with the user object during password reset.
+#. TRANS: Server error displayed when saving fails during user registration.
+#: actions/recoverpassword.php:430 actions/register.php:263

 msgid "Error setting user."
 msgstr ""
 
 msgid "Error setting user."
 msgstr ""
 

-#: actions/recoverpassword.php:395
+#. TRANS: Success message for user after password reset.
+#: actions/recoverpassword.php:438

 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:92 actions/register.php:196 actions/register.php:413
+#. 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:99
+#. 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:119
+#. TRANS: Title for registration page after a succesful registration.
+#: actions/register.php:109

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

-#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
+#. TRANS: Title for registration page.
+#: actions/register.php:112
+msgctxt "TITLE"

 msgid "Register"
 msgstr ""
 
 msgid "Register"
 msgstr ""
 

-#: actions/register.php:142
+#. 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:209
-msgid "You can't 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:218
+#. 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:251 actions/register.php:273
+#. 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:351
+#. 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 "
 msgid ""
 "With this form you can create a new account. You can then post notices and "

-"link up to friends and colleagues. "
-msgstr ""
-
-#: actions/register.php:433
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr ""
-
-#: actions/register.php:438
-msgid "6 or more characters. Required."
+"link up to friends and colleagues."

 msgstr ""
 
 msgstr ""
 

-#: actions/register.php:442
-msgid "Same as password above. Required."
+#. 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 ""
 
 msgstr ""
 

-#. TRANS: Link description in user account settings menu.
-#: actions/register.php:446 actions/register.php:450
-#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
+#. 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:447 actions/register.php:451
-msgid "Used only for updates, announcements, and password recovery"
+#. 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 ""
 
 msgstr ""
 

-#: actions/register.php:458
-msgid "Longer name, preferably your \"real\" name"
+#. TRANS: Field title on account registration page.
+#: actions/register.php:474
+msgid "Longer name, preferably your \"real\" name."

 msgstr ""
 
 msgstr ""
 

-#: actions/register.php:463
-msgid "URL of your homepage, blog, or profile on another site"
+#. TRANS: Button text to register a user on account registration page.
+#: actions/register.php:537
+msgctxt "BUTTON"
+msgid "Register"

 msgstr ""
 
 msgstr ""
 

-#: actions/register.php:524
+#. 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:534
+#. 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:538
+#: 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:541
+#: 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:546
+#: 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:589
+#. 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:618

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


@@ -4474,13 +5348,16 @@ 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:613
+#. TRANS: Instruction text on how to deal with the e-mail address confirmation e-mail.
+#: actions/register.php:643

 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:98
+#. TRANS: Page notice for remote subscribe. This message contains Markdown links.
+#. TRANS: Ensure to keep the correct markup of [link description](link).
+#: actions/remotesubscribe.php:101

 #, php-format
 msgid ""
 "To subscribe, you can [login](%%action.login%%), or [register](%%action."
 #, php-format
 msgid ""
 "To subscribe, you can [login](%%action.login%%), or [register](%%action."


@@ -4488,108 +5365,138 @@ msgid ""
 "microblogging site](%%doc.openmublog%%),  enter your profile URL below."
 msgstr ""
 
 "microblogging site](%%doc.openmublog%%),  enter your profile URL below."
 msgstr ""
 

-#: actions/remotesubscribe.php:112
+#. TRANS: Page title for Remote subscribe.
+#: actions/remotesubscribe.php:116

 msgid "Remote subscribe"
 msgstr ""
 
 msgid "Remote subscribe"
 msgstr ""
 

-#: actions/remotesubscribe.php:124
+#. TRANS: Field legend on page for remote subscribe.
+#: actions/remotesubscribe.php:129

 msgid "Subscribe to a remote user"
 msgstr ""
 
 msgid "Subscribe to a remote user"
 msgstr ""
 

-#: actions/remotesubscribe.php:129
+#. TRANS: Field label on page for remote subscribe.
+#: actions/remotesubscribe.php:135

 msgid "User nickname"
 msgstr ""
 
 msgid "User nickname"
 msgstr ""
 

-#: actions/remotesubscribe.php:130
-msgid "Nickname of the user you want to follow"
+#. TRANS: Field title on page for remote subscribe.
+#: actions/remotesubscribe.php:137
+msgid "Nickname of the user you want to follow."

 msgstr ""
 
 msgstr ""
 

-#: actions/remotesubscribe.php:133
+#. TRANS: Field label on page for remote subscribe.
+#: actions/remotesubscribe.php:141

 msgid "Profile URL"
 msgstr ""
 
 msgid "Profile URL"
 msgstr ""
 

-#: actions/remotesubscribe.php:134
-msgid "URL of your profile on another compatible microblogging service"
+#. TRANS: Field title on page for remote subscribe.
+#: actions/remotesubscribe.php:143
+msgid "URL of your profile on another compatible microblogging service."

 msgstr ""
 
 msgstr ""
 

-#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:411
+#. TRANS: Button text on page for remote subscribe.
+#. TRANS: Link text for link that will subscribe to a remote profile.
+#. TRANS: Button text to subscribe to a user.
+#: actions/remotesubscribe.php:147 lib/accountprofileblock.php:290
+#: lib/subscribeform.php:130
+msgctxt "BUTTON"

 msgid "Subscribe"
 msgstr ""
 
 msgid "Subscribe"
 msgstr ""
 

-#: actions/remotesubscribe.php:159
-msgid "Invalid profile URL (bad format)"
+#. TRANS: Form validation error on page for remote subscribe when an invalid profile URL was provided.
+#: actions/remotesubscribe.php:172
+msgid "Invalid profile URL (bad format)."

 msgstr ""
 
 msgstr ""
 

-#: actions/remotesubscribe.php:168
+#. TRANS: Form validation error on page for remote subscribe when no the provided profile URL
+#. TRANS: does not contain expected data.
+#: actions/remotesubscribe.php:183

 msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
 msgstr ""
 
 msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
 msgstr ""
 

-#: actions/remotesubscribe.php:176
-msgid "That’s a local profile! Login to subscribe."
+#. TRANS: Form validation error on page for remote subscribe.
+#: actions/remotesubscribe.php:192
+msgid "That is a local profile! Login to subscribe."

 msgstr ""
 
 msgstr ""
 

-#: actions/remotesubscribe.php:183
-msgid "Couldn’t get a request token."
+#. TRANS: Form validation error on page for remote subscribe when the remote service is not providing a request token.
+#: actions/remotesubscribe.php:200
+msgid "Could not get a request token."

 msgstr ""
 
 msgstr ""
 

-#: actions/repeat.php:57
+#. 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 ""
 
 msgid "Only logged-in users can repeat notices."
 msgstr ""
 

-#: actions/repeat.php:64 actions/repeat.php:71
+#. 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:76
-msgid "You can't repeat your own notice."
-msgstr ""
-
-#: actions/repeat.php:90
-msgid "You already repeated that notice."
-msgstr ""
-
-#: actions/repeat.php:114 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:605

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

-#: actions/repeat.php:119
+#. 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: Menu item title in personal group navigation menu.
+#. TRANS: %s is a username.

 #: actions/replies.php:126 actions/repliesrss.php:68
 #: actions/replies.php:126 actions/repliesrss.php:68

-#: lib/personalgroupnav.php:108
+#: 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:130

 #, 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:148

 #, 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:157

 #, 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:166

 #, 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:195

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

+#. TRANS: Empty list message for page with replies for a user for the logged in user.
+#. TRANS: This message contains a Markdown link in the form [link text](link).

 #: actions/replies.php:204
 #, php-format
 msgid ""
 #: actions/replies.php:204
 #, php-format
 msgid ""


@@ -4597,16 +5504,20 @@ msgid ""
 "[join groups](%%action.groups%%)."
 msgstr ""
 
 "[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:208

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

-#: actions/repliesrss.php:72
+#. TRANS: RSS reply feed description.
+#. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
+#: actions/repliesrss.php:74

 #, php-format
 #, php-format

-msgid "Replies to %1$s on %2$s!"
+msgid "Replies to %1$s on %2$s."

 msgstr ""
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
 msgstr ""
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.


@@ -4658,12 +5569,15 @@ msgid "File upload stopped by extension."
 msgstr ""
 
 #. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
 msgstr ""
 
 #. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.

-#: actions/restoreaccount.php:164 lib/imagefile.php:103 lib/mediafile.php:228
+#. TRANS: Exception thrown when uploading an image fails for an unknown reason.
+#. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
+#: actions/restoreaccount.php:164 lib/imagefile.php:106 lib/mediafile.php:228

 msgid "System error uploading file."
 msgstr ""
 
 #. TRANS: Client exception thrown when a feed is not an Atom feed.
 msgid "System error uploading file."
 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 ""
 


@@ -4691,182 +5605,182 @@ 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:146 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: 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:82
+#. 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:157
+#. 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:159 lib/applicationeditform.php:173
-msgid "Icon"
-msgstr ""
-
-#. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:197
-#: lib/applicationeditform.php:190
-msgid "Name"
-msgstr ""
-
-#. TRANS: Form input field label.
-#: actions/showapplication.php:178 lib/applicationeditform.php:227
-msgid "Organization"
-msgstr ""
-
-#. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:175
-msgid "Description"
-msgstr ""
-
-#. TRANS: Header for group statistics on a group page (h2).
-#: actions/showapplication.php:192 actions/showgroup.php:448
-#: lib/profileaction.php:187
-msgid "Statistics"
-msgstr ""
-
-#: actions/showapplication.php:203
+#. 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
 #, php-format

-msgid "Created by %1$s - %2$s access by default - %3$d users"
-msgstr ""
+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] ""

 
 

-#: actions/showapplication.php:213
+#. TRANS: Header on the OAuth application page.
+#: actions/showapplication.php:200

 msgid "Application actions"
 msgstr ""
 
 msgid "Application actions"
 msgstr ""
 

-#: actions/showapplication.php:236
-msgid "Reset key & secret"
+#. TRANS: Link text to edit application on the OAuth application page.
+#: actions/showapplication.php:207
+msgctxt "EDITAPP"
+msgid "Edit"

 msgstr ""
 
 msgstr ""
 

-#: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:66 lib/noticelist.php:673
-msgid "Delete"
+#. 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 ""
 

-#: actions/showapplication.php:261
+#. TRANS: Header on the OAuth application page.
+#: actions/showapplication.php:253

 msgid "Application info"
 msgstr ""
 
 msgid "Application info"
 msgstr ""
 

-#: actions/showapplication.php:263
-msgid "Consumer key"
-msgstr ""
-
-#: actions/showapplication.php:268
-msgid "Consumer secret"
-msgstr ""
-
-#: actions/showapplication.php:273
-msgid "Request token URL"
-msgstr ""
-
-#: actions/showapplication.php:278
-msgid "Access token URL"
-msgstr ""
-
-#: actions/showapplication.php:283
-msgid "Authorize URL"
-msgstr ""
-
-#: actions/showapplication.php:288
+#. TRANS: Note on the OAuth application page about signature support.
+#: actions/showapplication.php:272

 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:309
+#. TRANS: Text in confirmation dialog to reset consumer key and secret for an OAuth application.
+#: actions/showapplication.php:293

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

-#: actions/showfavorites.php:79
+#. TRANS: Title for all but the first page of favourite notices of a user.
+#. TRANS: %1$s is the user for whom the favourite notices are displayed, %2$d is the page number.
+#: actions/showfavorites.php:80

 #, php-format
 msgid "%1$s's favorite notices, page %2$d"
 msgstr ""
 
 #, php-format
 msgid "%1$s's favorite notices, page %2$d"
 msgstr ""
 

-#: actions/showfavorites.php:132
+#. TRANS: Server error displayed when favourite notices could not be retrieved from the database.
+#: actions/showfavorites.php:134

 msgid "Could not retrieve favorite notices."
 msgstr ""
 
 msgid "Could not retrieve favorite notices."
 msgstr ""
 

-#: actions/showfavorites.php:171
+#. TRANS: Feed link text. %s is a username.
+#: actions/showfavorites.php:172

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

-#: actions/showfavorites.php:178
+#. TRANS: Feed link text. %s is a username.
+#: actions/showfavorites.php:180

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

-#: actions/showfavorites.php:185
+#. TRANS: Feed link text. %s is a username.
+#: actions/showfavorites.php:188

 #, php-format
 msgid "Feed for favorites of %s (Atom)"
 msgstr ""
 
 #, php-format
 msgid "Feed for favorites of %s (Atom)"
 msgstr ""
 

-#: actions/showfavorites.php:206
+#. TRANS: Text displayed instead of favourite notices for the current logged in user that has no favourites.
+#: actions/showfavorites.php:198

 msgid ""
 "You haven't chosen any favorite notices yet. Click the fave button on "
 "notices you like to bookmark them for later or shed a spotlight on them."
 msgstr ""
 
 msgid ""
 "You haven't chosen any favorite notices yet. Click the fave button on "
 "notices you like to bookmark them for later or shed a spotlight on them."
 msgstr ""
 

-#: actions/showfavorites.php:208
+#. TRANS: Text displayed instead of favourite notices for a user that has no favourites while logged in.
+#. TRANS: %s is a username.
+#: actions/showfavorites.php:202

 #, php-format
 msgid ""
 "%s hasn't added any favorite notices yet. Post something interesting they "
 "would add to their favorites :)"
 msgstr ""
 
 #, php-format
 msgid ""
 "%s hasn't added any favorite notices yet. Post something interesting they "
 "would add to their favorites :)"
 msgstr ""
 

-#: actions/showfavorites.php:212
+#. TRANS: Text displayed instead of favourite notices for a user that has no favourites while not logged in.
+#. TRANS: %s is a username, %%%%action.register%%%% is a link to the user registration page.
+#. TRANS: (link text)[link] is a Mark Down link.
+#: actions/showfavorites.php:209

 #, 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](%%%%"


@@ -4874,7 +5788,8 @@ msgid ""
 "their favorites :)"
 msgstr ""
 
 "their favorites :)"
 msgstr ""
 

-#: actions/showfavorites.php:243
+#. TRANS: Page notice for show favourites page.
+#: actions/showfavorites.php:240

 msgid "This is a way to share what you like."
 msgstr ""
 
 msgid "This is a way to share what you like."
 msgstr ""
 


@@ -4891,82 +5806,66 @@ 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:220
-msgid "Group profile"
-msgstr ""
-
-#. TRANS: Label for group URL (dt). Text hidden by default.
-#: actions/showgroup.php:270 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:180
-msgid "URL"
-msgstr ""
-
-#. TRANS: Label for group description or group note (dt). Text hidden by default.
-#: actions/showgroup.php:282 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:197
-msgid "Note"
-msgstr ""
-
-#. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:293 lib/groupeditform.php:187
-msgid "Aliases"
-msgstr ""
-
-#. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:304
-msgid "Group actions"
-msgstr ""
-

 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #. TRANS: Tooltip for feed link. %s is a group nickname.

-#: actions/showgroup.php:345
+#: actions/showgroup.php:221

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

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

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

 #, php-format
 msgid "FOAF for %s group"
 msgstr ""
 
 #. TRANS: Header for mini list of group members on a group page (h2).
 #, php-format
 msgid "FOAF for %s group"
 msgstr ""
 
 #. TRANS: Header for mini list of group members on a group page (h2).

-#: actions/showgroup.php:402
+#: actions/showgroup.php:278

 msgid "Members"
 msgstr ""
 
 #. TRANS: Description for mini list of group members on a group page when the group has no members.
 msgid "Members"
 msgstr ""
 
 #. TRANS: Description for mini list of group members on a group page when the group has no members.

-#: actions/showgroup.php:408 lib/profileaction.php:117
-#: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95
-#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
+#. 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.
+#. TRANS: Text if there are no tags in widget to show a list of profiles by tag.
+#: actions/showgroup.php:284 lib/profileaction.php:137
+#: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
+#: lib/subscriptionlist.php:125

 msgid "(None)"
 msgstr ""
 
 #. TRANS: Link to all group members from mini list of group members if group has more than n members.
 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:417
+#: actions/showgroup.php:293

 msgid "All members"
 msgstr ""
 
 msgid "All members"
 msgstr ""
 

-#. TRANS: Label for creation date in statistics on group page.
-#: actions/showgroup.php:453
+#. TRANS: Header for group statistics on a group page (h2).
+#. TRANS: H2 text for user statistics.
+#: actions/showgroup.php:324 lib/profileaction.php:205
+msgid "Statistics"
+msgstr ""
+
+#. TRANS: Label for group creation date.
+#: actions/showgroup.php:329

 msgctxt "LABEL"
 msgid "Created"
 msgstr ""
 
 #. TRANS: Label for member count in statistics on group page.
 msgctxt "LABEL"
 msgid "Created"
 msgstr ""
 
 #. TRANS: Label for member count in statistics on group page.

-#: actions/showgroup.php:461
+#: actions/showgroup.php:334

 msgctxt "LABEL"
 msgid "Members"
 msgstr ""
 msgctxt "LABEL"
 msgid "Members"
 msgstr ""


@@ -4975,7 +5874,7 @@ msgstr ""
 #. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
 #. TRANS: %%%%action.register%%%% is the URL for registration, %%%%doc.help%%%% is a URL to help.
 #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
 #. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
 #. TRANS: %%%%action.register%%%% is the URL for registration, %%%%doc.help%%%% is a URL to help.
 #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).

-#: actions/showgroup.php:476
+#: actions/showgroup.php:349

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


@@ -4988,7 +5887,7 @@ 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: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
 #. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept no new registrations.
 #. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
 #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).

-#: actions/showgroup.php:486
+#: actions/showgroup.php:359

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


@@ -4997,100 +5896,110 @@ msgid ""
 "their life and interests. "
 msgstr ""
 
 "their life and interests. "
 msgstr ""
 

-#. TRANS: Header for list of group administrators on a group page (h2).
-#: actions/showgroup.php:515
+#. TRANS: Title for list of group administrators on a group page.
+#: actions/showgroup.php:400
+msgctxt "TITLE"

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

-#: actions/showmessage.php:79
+#: actions/showmessage.php:76

 msgid "No such message."
 msgstr ""
 
 #. TRANS: Client error displayed requesting a single direct message the requesting user was not a party in.
 msgid "No such message."
 msgstr ""
 
 #. TRANS: Client error displayed requesting a single direct message the requesting user was not a party in.

-#: actions/showmessage.php:97
+#: actions/showmessage.php:86

 msgid "Only the sender and recipient may read this message."
 msgstr ""
 
 #. TRANS: Page title for single direct message display when viewing user is the sender.
 #. TRANS: %1$s is the addressed user's nickname, $2$s is a timestamp.
 msgid "Only the sender and recipient may read this message."
 msgstr ""
 
 #. TRANS: Page title for single direct message display when viewing user is the sender.
 #. TRANS: %1$s is the addressed user's nickname, $2$s is a timestamp.

-#: actions/showmessage.php:110
+#: actions/showmessage.php:105

 #, php-format
 msgid "Message to %1$s on %2$s"
 msgstr ""
 
 #. TRANS: Page title for single message display.
 #. TRANS: %1$s is the sending user's nickname, $2$s is a timestamp.
 #, php-format
 msgid "Message to %1$s on %2$s"
 msgstr ""
 
 #. TRANS: Page title for single message display.
 #. TRANS: %1$s is the sending user's nickname, $2$s is a timestamp.

-#: actions/showmessage.php:118
+#: actions/showmessage.php:113

 #, php-format
 msgid "Message from %1$s on %2$s"
 msgstr ""
 
 #, php-format
 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.
+#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: %1$s is the username, %2$s is the hash tag.

 #: actions/showstream.php:70
 #, php-format
 #: actions/showstream.php:70
 #, php-format

-msgid "%1$s tagged %2$s"
+msgid "Notices by %1$s tagged %2$s"

 msgstr ""
 
 #. TRANS: Page title showing tagged notices in one user's stream.
 msgstr ""
 
 #. TRANS: Page title showing tagged notices in one user's stream.

-#. TRANS: %1$s is the username, %2$s is the hash tag, %1$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
 #, php-format
 #: actions/showstream.php:74
 #, php-format

-msgid "%1$s tagged %2$s, page %3$d"
+msgid "Notices by %1$s tagged %2$s, page %3$d"

 msgstr ""
 
 #. TRANS: Extended page title showing tagged notices in one user's stream.
 #. TRANS: %1$s is the username, %2$d is the page number.
 #: actions/showstream.php:82
 #, php-format
 msgstr ""
 
 #. TRANS: Extended page title showing tagged notices in one user's stream.
 #. TRANS: %1$s is the username, %2$d is the page number.
 #: actions/showstream.php:82
 #, 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:132

 #, 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:141

 #, 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:150

 #, 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:159

 #, 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:166

 #, php-format
 msgid "FOAF for %s"
 msgstr ""
 
 #. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
 #, 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
+#: actions/showstream.php:206

 #, 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:212

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


@@ -5098,7 +6007,7 @@ 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: This message contains a Markdown link. Keep "](" together.
 
 #. 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: This message contains a Markdown link. Keep "](" together.

-#: actions/showstream.php:221
+#: actions/showstream.php:216

 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"


@@ -5107,7 +6016,7 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.

-#: actions/showstream.php:264
+#: actions/showstream.php:259

 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."


@@ -5118,7 +6027,7 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.

-#: actions/showstream.php:271
+#: actions/showstream.php:266

 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."


@@ -5127,116 +6036,164 @@ msgid ""
 msgstr ""
 
 #. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
 msgstr ""
 
 #. TRANS: Link to the author of a repeated notice. %s is a linked nickname.

-#: actions/showstream.php:328
+#: actions/showstream.php:342

 #, 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:131

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

 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 trying to save site settings with an invalid language code.
+#. TRANS: %s is the invalid language code.
+#: actions/siteadminpanel.php:162

 #, 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:169

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

 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:223
+msgctxt "LEGEND"

 msgid "General"
 msgstr ""
 
 msgid "General"
 msgstr ""
 

-#: actions/siteadminpanel.php:224
+#. TRANS: Field label on site settings panel.
+#: actions/siteadminpanel.php:227
+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:229
+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:234

 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:236
+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:241

 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:243
+msgid "URL used for credits link in footer of each page."

 msgstr ""
 
 msgstr ""
 

-#: actions/siteadminpanel.php:239
-msgid "Contact email address for your site"
+#. TRANS: Field label on site settings panel.
+#: actions/siteadminpanel.php:247
+msgid "Email"

 msgstr ""
 
 msgstr ""
 

-#: actions/siteadminpanel.php:245
-msgid "Local"
+#. TRANS: Field title on site settings panel.
+#: actions/siteadminpanel.php:249
+msgid "Contact email address for your site."

 msgstr ""
 
 msgstr ""
 

+#. TRANS: Fieldset legend on site settings panel.

 #: actions/siteadminpanel.php:256
 #: actions/siteadminpanel.php:256

+msgctxt "LEGEND"
+msgid "Local"
+msgstr ""
+
+#. TRANS: Dropdown label on site settings panel.
+#: actions/siteadminpanel.php:268

 msgid "Default timezone"
 msgstr ""
 
 msgid "Default timezone"
 msgstr ""
 

-#: actions/siteadminpanel.php:257
+#. TRANS: Dropdown title on site settings panel.
+#: actions/siteadminpanel.php:270

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

 msgid "Default language"
 msgstr ""
 
 msgid "Default language"
 msgstr ""
 

-#: actions/siteadminpanel.php:263
+#. TRANS: Dropdown title on site settings panel.
+#: actions/siteadminpanel.php:280

 msgid "Site language when autodetection from browser settings is not available"
 msgstr ""
 
 msgid "Site language when autodetection from browser settings is not available"
 msgstr ""
 

-#: actions/siteadminpanel.php:271
+#. TRANS: Fieldset legend on site settings panel.
+#: actions/siteadminpanel.php:289
+msgctxt "LEGEND"

 msgid "Limits"
 msgstr ""
 
 msgid "Limits"
 msgstr ""
 

-#: actions/siteadminpanel.php:274
+#. TRANS: Field label on site settings panel.
+#: actions/siteadminpanel.php:294

 msgid "Text limit"
 msgstr ""
 
 msgid "Text limit"
 msgstr ""
 

-#: actions/siteadminpanel.php:274
+#. TRANS: Field title on site settings panel.
+#: actions/siteadminpanel.php:296

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

 msgid "Dupe limit"
 msgstr ""
 
 msgid "Dupe limit"
 msgstr ""
 

-#: actions/siteadminpanel.php:278
+#. TRANS: Field title on site settings panel.
+#: actions/siteadminpanel.php:304

 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: Button title for saving site settings.
+#: actions/siteadminpanel.php:323
+msgid "Save 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"


@@ -5269,145 +6226,150 @@ msgstr ""
 
 #. TRANS: Title for button to save site notice in admin panel.
 #: actions/sitenoticeadminpanel.php:201
 
 #. TRANS: Title for button to save site notice in admin panel.
 #: actions/sitenoticeadminpanel.php:201

-msgid "Save site notice"
+msgid "Save site notice."

 msgstr ""
 
 #. TRANS: Title for SMS settings.
 msgstr ""
 
 #. TRANS: Title for SMS settings.

-#: actions/smssettings.php:59
+#: 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:74
+#: 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:97
+#: 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:111
+#: 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:120
+#: 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:133
+#: 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:142
+#: 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:144
+#: 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:148
+#: 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:153
+#: 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:156
-msgid "Phone number, no punctuation or spaces, with area code"
+#: actions/smssettings.php:151
+msgid "Phone number, no punctuation or spaces, with area code."

 msgstr ""
 
 #. TRANS: Form legend for SMS preferences form.
 msgstr ""
 
 #. TRANS: Form legend for SMS preferences form.

-#: actions/smssettings.php:195
+#: 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:201
+#: actions/smssettings.php:196

 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
 msgstr ""
 
 #. TRANS: Confirmation message for successful SMS preferences save.
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
 msgstr ""
 
 #. TRANS: Confirmation message for successful SMS preferences save.

-#: actions/smssettings.php:315
+#: actions/smssettings.php:308

 msgid "SMS preferences saved."
 msgstr ""
 
 #. TRANS: Message given saving SMS phone number without having provided one.
 msgid "SMS preferences saved."
 msgstr ""
 
 #. TRANS: Message given saving SMS phone number without having provided one.

-#: actions/smssettings.php:338
+#: actions/smssettings.php:330

 msgid "No phone number."
 msgstr ""
 
 #. TRANS: Message given saving SMS phone number without having selected a carrier.
 msgid "No phone number."
 msgstr ""
 
 #. TRANS: Message given saving SMS phone number without having selected a carrier.

-#: actions/smssettings.php:344
+#: actions/smssettings.php:336

 msgid "No carrier selected."
 msgstr ""
 
 #. TRANS: Message given saving SMS phone number that is already set.
 msgid "No carrier selected."
 msgstr ""
 
 #. TRANS: Message given saving SMS phone number that is already set.

-#: actions/smssettings.php:352
+#: actions/smssettings.php:344

 msgid "That is already your phone number."
 msgstr ""
 
 #. TRANS: Message given saving SMS phone number that is already set for another user.
 msgid "That is already your phone number."
 msgstr ""
 
 #. TRANS: Message given saving SMS phone number that is already set for another user.

-#: actions/smssettings.php:356
+#: actions/smssettings.php:348

 msgid "That phone number already belongs to another user."
 msgstr ""
 
 #. TRANS: Message given saving valid SMS phone number that is to be confirmed.
 msgid "That phone number already belongs to another user."
 msgstr ""
 
 #. TRANS: Message given saving valid SMS phone number that is to be confirmed.

-#: actions/smssettings.php:384
+#: actions/smssettings.php:376

 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
 msgstr ""
 
 #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
 msgstr ""
 
 #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.

-#: actions/smssettings.php:413
+#: actions/smssettings.php:404

 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.
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.

-#: actions/smssettings.php:427
+#: actions/smssettings.php:418

 msgid "SMS confirmation cancelled."
 msgstr ""
 
 #. TRANS: Message given trying to remove an SMS phone number that is not
 #. TRANS: registered for the active user.
 msgid "SMS confirmation cancelled."
 msgstr ""
 
 #. TRANS: Message given trying to remove an SMS phone number that is not
 #. TRANS: registered for the active user.

-#: actions/smssettings.php:448
+#: actions/smssettings.php:438

 msgid "That is not your phone number."
 msgstr ""
 
 #. TRANS: Message given after successfully removing a registered SMS phone number.
 msgid "That is not your phone number."
 msgstr ""
 
 #. TRANS: Message given after successfully removing a registered SMS phone number.

-#: actions/smssettings.php:470
+#: actions/smssettings.php:460

 msgid "The SMS phone number was removed."
 msgstr ""
 
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
 msgid "The SMS phone number was removed."
 msgstr ""
 
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.

-#: actions/smssettings.php:511
+#: actions/smssettings.php:499

 msgid "Mobile carrier"
 msgstr ""
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
 msgid "Mobile carrier"
 msgstr ""
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.

-#: actions/smssettings.php:516
+#: actions/smssettings.php:504

 msgid "Select a carrier"
 msgstr ""
 
 #. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
 #. TRANS: %s is an administrative contact's e-mail address.
 msgid "Select a carrier"
 msgstr ""
 
 #. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
 #. TRANS: %s is an administrative contact's e-mail address.

-#: actions/smssettings.php:525
+#: actions/smssettings.php:513

 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "


@@ -5415,88 +6377,129 @@ msgid ""
 msgstr ""
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
 msgstr ""
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.

-#: actions/smssettings.php:548
-msgid "No code entered"
+#: actions/smssettings.php:535
+msgid "No code entered."

 msgstr ""
 
 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: Title for button 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:147

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

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

-#: actions/subscribe.php:117
+#. 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 ""
+
+#. 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: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
+#: actions/subscribe.php:121

 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr ""
 
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr ""
 

-#: actions/subscribe.php:145
+#. TRANS: Page title when subscription succeeded.
+#: actions/subscribe.php:149

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


@@ -5528,7 +6531,7 @@ msgid "These are the people who listen to %s's notices."
 msgstr ""
 
 #. TRANS: Subscriber list text when the logged in user has no subscribers.
 msgstr ""
 
 #. TRANS: Subscriber list text when the logged in user has no subscribers.

-#: actions/subscribers.php:116
+#: actions/subscribers.php:114

 msgid ""
 "You have no subscribers. Try subscribing to people you know and they might "
 "return the favor."
 msgid ""
 "You have no subscribers. Try subscribing to people you know and they might "
 "return the favor."


@@ -5536,7 +6539,7 @@ msgstr ""
 
 #. TRANS: Subscriber list text when looking at the subscribers for a of a user other
 #. TRANS: than the logged in user that has no subscribers. %s is the user nickname.
 
 #. TRANS: Subscriber list text when looking at the subscribers for a of a user other
 #. TRANS: than the logged in user that has no subscribers. %s is the user nickname.

-#: actions/subscribers.php:120
+#: actions/subscribers.php:118

 #, php-format
 msgid "%s has no subscribers. Want to be the first?"
 msgstr ""
 #, php-format
 msgid "%s has no subscribers. Want to be the first?"
 msgstr ""


@@ -5546,7 +6549,7 @@ msgstr ""
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.

-#: actions/subscribers.php:129
+#: actions/subscribers.php:127

 #, php-format
 msgid ""
 "%s has no subscribers. Why not [register an account](%%%%action.register%%%"
 #, php-format
 msgid ""
 "%s has no subscribers. Why not [register an account](%%%%action.register%%%"


@@ -5577,7 +6580,7 @@ msgstr ""
 #. TRANS: This message contains Markdown URLs. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
 #. TRANS: This message contains Markdown URLs. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.

-#: actions/subscriptions.php:135
+#: actions/subscriptions.php:133

 #, php-format
 msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
 #, php-format
 msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "


@@ -5591,118 +6594,216 @@ msgstr ""
 #. TRANS: than the logged in user that has no subscriptions. %s is the user nickname.
 #. TRANS: Subscription list text when looking at the subscriptions for a of a user that has none
 #. TRANS: as an anonymous user. %s is the user nickname.
 #. TRANS: 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:143 actions/subscriptions.php:149
+#: actions/subscriptions.php:141 actions/subscriptions.php:147

 #, php-format
 msgid "%s is not listening to anyone."
 msgstr ""
 
 #, php-format
 msgid "%s is not listening to anyone."
 msgstr ""
 

-#: actions/subscriptions.php:178
+#. TRANS: Atom feed title. %s is a profile nickname.
+#: actions/subscriptions.php:176

 #, php-format
 msgid "Subscription feed for %s (Atom)"
 msgstr ""
 
 #. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
 #, 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:242
-msgid "Jabber"
+#: actions/subscriptions.php:241
+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:257
+#: actions/subscriptions.php:256

 msgid "SMS"
 msgstr ""
 
 msgid "SMS"
 msgstr ""
 

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

 #, php-format
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr ""
 
 #, 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:93

 #, 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:101

 #, 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:109

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

-#: actions/tagother.php:39
+#. TRANS: Client error displayed on user tag page when trying to add tags without providing a user ID.
+#: actions/tagother.php:42

 msgid "No ID argument."
 msgstr ""
 
 msgid "No ID argument."
 msgstr ""
 

-#: actions/tagother.php:65
+#. TRANS: Title for "tag other users" page.
+#. TRANS: %s is the user nickname.
+#: actions/tagother.php:71

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

-#: actions/tagother.php:77 lib/userprofile.php:76
+#. TRANS: Header for user details on "tag other users" page.
+#: actions/tagother.php:84

 msgid "User profile"
 msgstr ""
 
 msgid "User profile"
 msgstr ""
 

-#: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:107
-msgid "Photo"
-msgstr ""
-
-#: actions/tagother.php:141
+#. TRANS: Fieldset legend on "tag other users" page.
+#: actions/tagother.php:128

 msgid "Tag user"
 msgstr ""
 
 msgid "Tag user"
 msgstr ""
 

-#: actions/tagother.php:151
+#. TRANS: Title for input field for inputting tags on "tag other users" page.
+#: actions/tagother.php:140

 msgid ""
 msgid ""

-"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
-"separated"
+"Tags for this user (letters, numbers, -, ., and _), separated by commas or "
+"spaces."

 msgstr ""
 
 msgstr ""
 

-#: actions/tagother.php:193
+#. TRANS: Client error on "tag other users" page when tagging a user is not possible because of missing mutual subscriptions.
+#: actions/tagother.php:187

 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 

-#: actions/tagother.php:200
-msgid "Could not save tags."
+#. TRANS: Title of "tag other users" page.
+#: actions/tagother.php:205
+msgctxt "TITLE"
+msgid "Tags"

 msgstr ""
 
 msgstr ""
 

-#: actions/tagother.php:236
+#. TRANS: Page notice on "tag other users" page.
+#: actions/tagother.php:233

 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 
 msgid "Use this form to add tags to your subscribers or subscriptions."
 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 ""
 

+#. TRANS: Client error displayed when trying to unblock a non-blocked user.

 #: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr ""
 
 #: actions/unblock.php:59
 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 actions/userauthorization.php:337
+#. TRANS: Client error displayed when trying to update profile with an incompatible license.
+#. TRANS: %1$s is the license incompatible with site license %2$s.
+#. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
+#. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
+#: actions/updateprofile.php:65 actions/userauthorization.php:343

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

-"Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
+"Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
+"\"."

 msgstr ""
 
 msgstr ""
 

-#. TRANS: User admin panel title
+#. 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 ""
+"URLs in notices longer than this will be shortened, 0 means always shorten."
+msgstr ""
+
+#. 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"


@@ -5727,197 +6828,253 @@ msgstr ""
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
 #, php-format
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
 #, php-format

-msgid "Invalid default subscripton: '%1$s' is not a user."
+msgid "Invalid default subscripton: \"%1$s\" is not a user."

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:215 lib/accountsettingsaction.php:106
-#: lib/personalgroupnav.php:112
+#. 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 ""
 
 #. TRANS: Title for button to save user settings in user admin panel.
 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
-msgid "Save user settings"
+#: actions/useradminpanel.php:304
+msgid "Save user settings."

 msgstr ""
 
 msgstr ""
 

-#: actions/userauthorization.php:105
+#. TRANS: Page title.
+#: actions/userauthorization.php:110

 msgid "Authorize subscription"
 msgstr ""
 
 msgid "Authorize subscription"
 msgstr ""
 

-#: actions/userauthorization.php:110
+#. TRANS: Page notice on "Authorize subscription" page.
+#: actions/userauthorization.php:116

 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
 "user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
 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”."
+"click \"Reject\"."

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Menu item for site administration
-#: actions/userauthorization.php:196 actions/version.php:167
-#: lib/adminpanelaction.php:403
-msgid "License"
-msgstr ""
-
-#: actions/userauthorization.php:217
+#. TRANS: Button text on Authorise Subscription page.
+#. TRANS: Submit button text to accept a group membership request on approve group form.
+#. TRANS: Submit button text to accept a subscription request on approve sub form.
+#: actions/userauthorization.php:203 lib/approvegroupform.php:116
+#: lib/approvesubform.php:110
+msgctxt "BUTTON"

 msgid "Accept"
 msgstr ""
 
 msgid "Accept"
 msgstr ""
 

-#: actions/userauthorization.php:218 lib/subscribeform.php:115
-#: lib/subscribeform.php:139
-msgid "Subscribe to this user"
+#. TRANS: Title for button on Authorise Subscription page.
+#. TRANS: Button title to subscribe to a user.
+#: actions/userauthorization.php:205 lib/subscribeform.php:132
+msgid "Subscribe to this user."

 msgstr ""
 
 msgstr ""
 

-#: actions/userauthorization.php:219
+#. TRANS: Button text on Authorise Subscription page.
+#. TRANS: Submit button text to reject a group membership request on approve group form.
+#. TRANS: Submit button text to reject a subscription request on approve sub form.
+#: actions/userauthorization.php:208 lib/approvegroupform.php:118
+#: lib/approvesubform.php:112
+msgctxt "BUTTON"

 msgid "Reject"
 msgstr ""
 
 msgid "Reject"
 msgstr ""
 

-#: actions/userauthorization.php:220
-msgid "Reject this subscription"
+#. TRANS: Title for button on Authorise Subscription page.
+#: actions/userauthorization.php:210
+msgid "Reject this subscription."

 msgstr ""
 
 msgstr ""
 

-#: actions/userauthorization.php:232
+#. TRANS: Client error displayed for an empty authorisation request.
+#: actions/userauthorization.php:223

 msgid "No authorization request!"
 msgstr ""
 
 msgid "No authorization request!"
 msgstr ""
 

-#: actions/userauthorization.php:254
+#. TRANS: Accept message header from Authorise subscription page.
+#: actions/userauthorization.php:246

 msgid "Subscription authorized"
 msgstr ""
 
 msgid "Subscription authorized"
 msgstr ""
 

-#: actions/userauthorization.php:256
+#. TRANS: Accept message text from Authorise subscription page.
+#: actions/userauthorization.php:249

 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 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 "
+"with the site's instructions for details on how to authorize the "

 "subscription. Your subscription token is:"
 msgstr ""
 
 "subscription. Your subscription token is:"
 msgstr ""
 

-#: actions/userauthorization.php:266
+#. TRANS: Reject message header from Authorise subscription page.
+#: actions/userauthorization.php:260

 msgid "Subscription rejected"
 msgstr ""
 
 msgid "Subscription rejected"
 msgstr ""
 

-#: actions/userauthorization.php:268
+#. TRANS: Reject message from Authorise subscription page.
+#: actions/userauthorization.php:263

 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 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 "
+"with the site's instructions for details on how to fully reject the "

 "subscription."
 msgstr ""
 
 "subscription."
 msgstr ""
 

-#: actions/userauthorization.php:303
+#. TRANS: Exception thrown when no valid user is found for an authorisation request.
+#. TRANS: %s is a listener URI.
+#: actions/userauthorization.php:300

 #, php-format
 #, php-format

-msgid "Listener URI ‘%s’ not found here."
+msgid "Listener URI \"%s\" not found here."

 msgstr ""
 
 msgstr ""
 

-#: actions/userauthorization.php:308
+#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
+#. TRANS: %s is a listenee URI.
+#: actions/userauthorization.php:307

 #, php-format
 #, php-format

-msgid "Listenee URI ‘%s’ is too long."
+msgid "Listenee URI \"%s\" is too long."

 msgstr ""
 
 msgstr ""
 

-#: actions/userauthorization.php:314
+#. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
+#. TRANS: %s is a listenee URI.
+#: actions/userauthorization.php:315

 #, php-format
 #, php-format

-msgid "Listenee URI ‘%s’ is a local user."
+msgid "Listenee URI \"%s\" is a local user."

 msgstr ""
 
 msgstr ""
 

-#: actions/userauthorization.php:329
+#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
+#. TRANS: %s is a profile URL.
+#: actions/userauthorization.php:333

 #, php-format
 #, php-format

-msgid "Profile URL ‘%s’ is for a local user."
+msgid "Profile URL \"%s\" is for a local user."

 msgstr ""
 
 msgstr ""
 

-#: actions/userauthorization.php:345
+#. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
+#. TRANS: %s is an avatar URL.
+#: actions/userauthorization.php:353

 #, php-format
 #, php-format

-msgid "Avatar URL ‘%s’ is not valid."
+msgid "Avatar URL \"%s\" is not valid."

 msgstr ""
 
 msgstr ""
 

-#: actions/userauthorization.php:350
+#. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
+#. TRANS: %s is an avatar URL.
+#: actions/userauthorization.php:360

 #, php-format
 #, php-format

-msgid "Can’t read avatar URL ‘%s’."
+msgid "Cannot read avatar URL \"%s\"."

 msgstr ""
 
 msgstr ""
 

-#: actions/userauthorization.php:355
+#. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
+#. TRANS: %s is an avatar URL.
+#: actions/userauthorization.php:367

 #, php-format
 #, php-format

-msgid "Wrong image type for avatar URL ‘%s’."
+msgid "Wrong image type for avatar URL \"%s\"."

 msgstr ""
 
 msgstr ""
 

+#. TRANS: Title for profile design page.

 #. TRANS: Page title for profile design page.
 #. TRANS: Page title for profile design page.

-#: actions/userdesignsettings.php:76 lib/designsettings.php:63
+#: actions/userdesignsettings.php:75 lib/designsettings.php:61

 msgid "Profile design"
 msgstr ""
 
 msgid "Profile design"
 msgstr ""
 

+#. TRANS: Instructions for Profile design page.

 #. TRANS: Instructions for profile design page.
 #. TRANS: Instructions for profile design page.

-#: actions/userdesignsettings.php:87 lib/designsettings.php:74
+#: actions/userdesignsettings.php:86 lib/designsettings.php:72

 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."
 msgstr ""
 
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."
 msgstr ""
 

-#: actions/userdesignsettings.php:282
+#. TRANS: Succes message on Profile design page when finding an easter egg.
+#: actions/userdesignsettings.php:297

 msgid "Enjoy your hotdog!"
 msgstr ""
 
 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: Form legend on Profile design page.
+#: actions/userdesignsettings.php:335
+msgid "Design settings"
+msgstr ""
+
+#. TRANS: Checkbox label on Profile design page.
+#: actions/userdesignsettings.php:351
+msgid "View profile designs"
+msgstr ""
+
+#. TRANS: Title for checkbox on Profile design page.
+#: actions/userdesignsettings.php:353
+msgid "Show or hide profile designs."
+msgstr ""
+
+#. TRANS: Form legend on Profile design page for form to choose a background image.
+#: actions/userdesignsettings.php:361
+msgid "Background file"
+msgstr ""
+
+#. TRANS: Page title for all but the first page of groups for a user.
+#. TRANS: %1$s is a nickname, %2$d is a page number.
+#: actions/usergroups.php:67

 #, 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:137

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

 #, 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:173

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


@@ -5927,28 +7084,38 @@ 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
-#: lib/atomusernoticefeed.php:75
+#: actions/userrss.php:98 lib/atomgroupnoticefeed.php:70
+#: lib/atomusernoticefeed.php:95

 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr ""
 
 #, 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 ""
 "This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
 "Inc. and contributors."
 msgstr ""
 
 #, php-format
 msgid ""
 "This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
 "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 ""
 

+#. TRANS: Header for StatusNet license section on the version page.
+#: actions/version.php:166
+msgid "License"
+msgstr ""
+
+#. TRANS: Content part of StatusNet version page.

 #: actions/version.php:170
 msgid ""
 "StatusNet is free software: you can redistribute it and/or modify it under "
 #: actions/version.php:170
 msgid ""
 "StatusNet is free software: you can redistribute it and/or modify it under "


@@ -5957,7 +7124,8 @@ msgid ""
 "any later version. "
 msgstr ""
 
 "any later version. "
 msgstr ""
 

-#: actions/version.php:176
+#. TRANS: Content part of StatusNet version page.
+#: actions/version.php:177

 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "


@@ -5965,53 +7133,71 @@ msgid ""
 "for more details. "
 msgstr ""
 
 "for more details. "
 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:185

 #, 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:195

 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:885
+#. TRANS: Column header for plugins table on version page.
+#: actions/version.php:202
+msgctxt "HEADER"
+msgid "Name"
+msgstr ""
+
+#. TRANS: Column header for plugins table on version page.
+#: actions/version.php:204
+msgctxt "HEADER"

 msgid "Version"
 msgstr ""
 
 msgid "Version"
 msgstr ""
 

-#: actions/version.php:199
+#. TRANS: Column header for plugins table on version page.
+#: actions/version.php:206
+msgctxt "HEADER"

 msgid "Author(s)"
 msgstr ""
 
 msgid "Author(s)"
 msgstr ""
 

+#. TRANS: Column header for plugins table on version page.
+#: actions/version.php:208
+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 lib/favorform.php:143
+#: classes/Fave.php:112

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

 #, 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:156
+#: classes/File.php:162

 #, 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:188
+#: classes/File.php:194

 msgid "Robin thinks something is impossible."
 msgstr ""
 
 #. 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.
 msgid "Robin thinks something is impossible."
 msgstr ""
 
 #. 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:204
+#: classes/File.php:210

 #, php-format
 msgid ""
 "No file may be larger than %1$d byte and the file you sent was %2$d bytes. "
 #, php-format
 msgid ""
 "No file may be larger than %1$d byte and the file you sent was %2$d bytes. "


@@ -6024,7 +7210,7 @@ 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.
 
 #. 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:217
+#: classes/File.php:223

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


@@ -6033,7 +7219,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:229
+#: classes/File.php:235

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


@@ -6041,47 +7227,47 @@ 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:276 classes/File.php:291
+#: classes/File.php:282 classes/File.php:297

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

 #, 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:99

 #, 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:52
+msgid "Group join failed."
+msgstr ""
+
+#. TRANS: Exception thrown when trying to leave a group the user is not a member of.
+#: classes/Group_member.php:65
+msgid "Not part of group."
+msgstr ""
+
+#. TRANS: Exception thrown when trying to leave a group fails.
+#: classes/Group_member.php:73
+msgid "Group leave failed."
+msgstr ""
+

 #. TRANS: Activity title.
 #. TRANS: Activity title.

-#: classes/Group_member.php:147 lib/joinform.php:114
+#: classes/Group_member.php:148

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

 #, php-format
 msgid "%1$s has joined group %2$s."
 msgstr ""
 #, php-format
 msgid "%1$s has joined group %2$s."
 msgstr ""


@@ -6099,7 +7285,7 @@ msgid "Could not create login token for %s"
 msgstr ""
 
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
 msgstr ""
 
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.

-#: classes/Memcached_DataObject.php:537
+#: classes/Memcached_DataObject.php:556

 msgid "No database name or DSN found anywhere."
 msgstr ""
 
 msgid "No database name or DSN found anywhere."
 msgstr ""
 


@@ -6120,77 +7306,110 @@ 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).
 
 #. 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:106

 #, 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:207

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

-#: classes/Notice.php:279
+#: classes/Notice.php:290

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

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

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

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

 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:355
+msgid "Cannot repeat; original notice is missing or deleted."
+msgstr ""
+
+#. TRANS: Client error displayed when trying to repeat an own notice.
+#: classes/Notice.php:360
+msgid "You cannot repeat your own notice."
+msgstr ""
+
+#. TRANS: Client error displayed when trying to repeat a non-public notice.
+#: classes/Notice.php:366
+msgid "Cannot repeat a private notice."
+msgstr ""
+
+#. TRANS: Client error displayed when trying to repeat a notice you cannot access.
+#: classes/Notice.php:372
+msgid "Cannot repeat a notice you cannot read."
+msgstr ""
+
+#. TRANS: Client error displayed when trying to repeat an already repeated notice.
+#: classes/Notice.php:377
+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:390
+#, 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:445 classes/Notice.php:472

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

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

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

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

-#: classes/Notice.php:1646
+#: classes/Notice.php:1618

 #, 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:172 classes/User_group.php:245

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


@@ -6198,14 +7417,14 @@ 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:765
+#: classes/Profile.php:790

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

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


@@ -6221,346 +7440,215 @@ msgid "Unable to save tag."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
 msgstr ""
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.

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

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

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

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

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

 msgid "Could not delete self-subscription."
 msgstr ""
 
 #. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
 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
+#: classes/Subscription.php:217

 msgid "Could not delete subscription OMB token."
 msgstr ""
 
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.
 msgid "Could not delete subscription OMB token."
 msgstr ""
 
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.

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

 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:271
+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:274

 #, 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:404

 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr ""
 
 #. TRANS: Server exception.
 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr ""
 
 #. TRANS: Server exception.

-#: classes/User.php:918
+#: classes/User.php:882

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

 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.

-#: classes/User_group.php:516
+#: classes/User_group.php:530

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

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

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

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

-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:104
-msgid "Change your profile settings"
+#. TRANS: Exception thrown when an account could not be located when it should be moved.
+#. TRANS: %s is the remote site.
+#: lib/accountmover.php:65
+#, php-format
+msgid "Cannot locate account %s."

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:111
-msgid "Upload an avatar"
+#. TRANS: Exception thrown when a service document could not be located account move.
+#. TRANS: %s is the remote site.
+#: lib/accountmover.php:106
+#, php-format
+msgid "Cannot find XRD for %s."

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:118
-msgid "Change your password"
+#. TRANS: Exception thrown when an account could not be located when it should be moved.
+#. TRANS: %s is the remote site.
+#: lib/accountmover.php:131
+#, php-format
+msgid "No AtomPub API service for %s."

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:125
-msgid "Change email handling"
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+#: lib/accountprofileblock.php:102 lib/accountprofileblock.php:117
+msgid "User actions"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:132
-msgid "Design your profile"
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+#: lib/accountprofileblock.php:106
+msgid "User deletion in progress..."

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:139
-msgid "Other options"
+#. TRANS: Link title for link on user profile.
+#: lib/accountprofileblock.php:133
+msgid "Edit profile settings."

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Link description in user account settings menu.
-#: lib/accountsettingsaction.php:141
-msgid "Other"
+#. TRANS: Link text for link on user profile.
+#: lib/accountprofileblock.php:135
+msgctxt "BUTTON"
+msgid "Edit"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:148
-#, php-format
-msgid "%1$s - %2$s"
+#. TRANS: Link title for link on user profile.
+#: lib/accountprofileblock.php:162
+msgid "Send a direct message to this user."

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Page title for a page without a title set.
-#: lib/action.php:164
-msgid "Untitled page"
+#. TRANS: Link text for link on user profile.
+#: lib/accountprofileblock.php:164
+msgctxt "BUTTON"
+msgid "Message"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
-#: lib/action.php:312
-msgctxt "TOOLTIP"
-msgid "Show more"
+#. TRANS: Label text on user profile to select a user role.
+#: lib/accountprofileblock.php:206
+msgid "Moderate"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:531
-msgid "Primary site navigation"
+#. TRANS: Label text on user profile to select a user role.
+#: lib/accountprofileblock.php:245
+msgid "User role"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:537
-msgctxt "TOOLTIP"
-msgid "Personal profile and friends timeline"
+#. TRANS: Role that can be set for a user profile.
+#: lib/accountprofileblock.php:248
+msgctxt "role"
+msgid "Administrator"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:540
-msgctxt "MENU"
-msgid "Personal"
+#. TRANS: Role that can be set for a user profile.
+#: lib/accountprofileblock.php:250
+msgctxt "role"
+msgid "Moderator"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:542
-msgctxt "TOOLTIP"
-msgid "Change your email, avatar, password, profile"
+#. TRANS: Page title. %1$s is the title, %2$s is the site name.
+#: lib/action.php:168
+#, php-format
+msgid "%1$s - %2$s"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Main menu option when logged in for access to user settings
-#: lib/action.php:545
-msgid "Account"
+#. TRANS: Page title for a page without a title set.
+#: lib/action.php:184
+msgid "Untitled page"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:547
+#. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
+#: lib/action.php:357

 msgctxt "TOOLTIP"
 msgctxt "TOOLTIP"

-msgid "Connect to services"
+msgid "Show more"

 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:550
-msgid "Connect"
+#. TRANS: Inline reply form submit button: submits a reply comment.
+#: lib/action.php:360
+msgctxt "BUTTON"
+msgid "Reply"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:553
-msgctxt "TOOLTIP"
-msgid "Change site configuration"
+#. 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:363 lib/threadednoticelist.php:333
+msgid "Write a reply..."

 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:556 lib/groupnav.php:117
-msgctxt "MENU"
-msgid "Admin"
+#. TRANS: Tab on the notice form.
+#: lib/action.php:613
+msgctxt "TAB"
+msgid "Status"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:560
+#. 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:990

 #, php-format
 #, php-format

-msgctxt "TOOLTIP"
-msgid "Invite friends and colleagues to join you on %s"
-msgstr ""
-
-#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:563
-msgctxt "MENU"
-msgid "Invite"
-msgstr ""
-
-#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:569
-msgctxt "TOOLTIP"
-msgid "Logout from the site"
-msgstr ""
-
-#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:572
-msgctxt "MENU"
-msgid "Logout"
-msgstr ""
-
-#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:577
-msgctxt "TOOLTIP"
-msgid "Create an account"
-msgstr ""
-
-#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:580
-msgctxt "MENU"
-msgid "Register"
-msgstr ""
-
-#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:583
-msgctxt "TOOLTIP"
-msgid "Login to the site"
-msgstr ""
-
-#. TRANS: Main menu option when not logged in to log in
-#: lib/action.php:586
-msgctxt "MENU"
-msgid "Login"
-msgstr ""
-
-#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:589
-msgctxt "TOOLTIP"
-msgid "Help me!"
-msgstr ""
-
-#. TRANS: Main menu option for help on the StatusNet site
-#: lib/action.php:592
-msgctxt "MENU"
-msgid "Help"
-msgstr ""
-
-#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:595
-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:598
-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:620 lib/adminpanelaction.php:387
-msgid "Site notice"
-msgstr ""
-
-#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:687
-msgid "Local views"
-msgstr ""
-
-#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:757
-msgid "Page notice"
-msgstr ""
-
-#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:858
-msgid "Secondary site navigation"
-msgstr ""
-
-#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:864
-msgid "Help"
-msgstr ""
-
-#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:867
-msgid "About"
-msgstr ""
-
-#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:870
-msgid "FAQ"
-msgstr ""
-
-#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:875
-msgid "TOS"
-msgstr ""
-
-#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:879
-msgid "Privacy"
-msgstr ""
-
-#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:882
-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:889
-msgid "Contact"
-msgstr ""
-
-#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:892
-msgid "Badge"
-msgstr ""
-
-#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:921
-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:928
-#, php-format
-msgid ""
-"**%%site.name%%** is a microblogging service brought to you by [%%site."
-"broughtby%%](%%site.broughtbyurl%%)."
+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.
 msgstr ""
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.

-#: lib/action.php:931
+#: lib/action.php:993

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


@@ -6569,7 +7657,7 @@ msgstr ""
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.

-#: lib/action.php:938
+#: lib/action.php:1000

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


@@ -6577,51 +7665,41 @@ msgid ""
 "org/licensing/licenses/agpl-3.0.html)."
 msgstr ""
 
 "org/licensing/licenses/agpl-3.0.html)."
 msgstr ""
 

-#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:954
-msgid "Site content license"
-msgstr ""
-

 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.

-#: lib/action.php:961
+#: lib/action.php:1018

 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.

-#: lib/action.php:968
+#: lib/action.php:1025

 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.

-#: lib/action.php:972
+#: lib/action.php:1029

 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.

-#: lib/action.php:1004
+#: lib/action.php:1061

 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 
 #, 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:1340
-msgid "Pagination"
-msgstr ""
-

 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.

-#: lib/action.php:1351
+#: lib/action.php:1404

 msgid "After"
 msgstr ""
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
 msgid "After"
 msgstr ""
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.

-#: lib/action.php:1361
+#: lib/action.php:1414

 msgid "Before"
 msgstr ""
 
 msgid "Before"
 msgstr ""
 


@@ -6666,18 +7744,43 @@ msgstr ""
 msgid "User is already a member of this group."
 msgstr ""
 
 msgid "User is already a member of this group."
 msgstr ""
 

+#. TRANS: Client exception thrown when trying to import a notice by another user.
+#. TRANS: %1$s is the source URI of the notice, %2$s is the URI of the author.
+#: lib/activityimporter.php:198
+#, 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.
 #. 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:204

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

 #, php-format
 msgid "No content for notice %s."
 msgstr ""
 
 #, php-format
 msgid "No content for notice %s."
 msgstr ""
 

+#. TRANS: Exception thrown if no user is provided. %s is a user ID.
+#: lib/activitymover.php:85
+#, php-format
+msgid "No such user \"%s\"."
+msgstr ""
+
+#. TRANS: Client exception thrown when post to collection fails with a 400 status.
+#. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
+#. TRANS: Server exception thrown when post to collection fails with a 500 status.
+#. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
+#. TRANS: Exception thrown when post to collection fails with a status that is not handled.
+#. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
+#: lib/activitysink.php:163 lib/activitysink.php:167 lib/activitysink.php:172
+#, php-format
+msgctxt "URLSTATUSREASON"
+msgid "%1$s %2$s %3$s"
+msgstr ""
+

 #. TRANS: Client exception thrown when there is no source attribute.
 #: lib/activityutils.php:200
 msgid "Can't handle remote content yet."
 #. TRANS: Client exception thrown when there is no source attribute.
 #: lib/activityutils.php:200
 msgid "Can't handle remote content yet."


@@ -6719,69 +7822,141 @@ msgstr ""
 msgid "Unable to delete design setting."
 msgstr ""
 
 msgid "Unable to delete design setting."
 msgstr ""
 

-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:337
+#. TRANS: Header in administrator navigation panel.
+#. TRANS: Header in settings navigation panel.
+#: lib/adminpanelnav.php:65 lib/settingsnav.php:65
+msgctxt "HEADER"
+msgid "Home"
+msgstr ""
+
+#. TRANS: Menu item in administrator navigation panel.
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item in personal group navigation menu.
+#. TRANS: Menu item in settings navigation panel.
+#: lib/adminpanelnav.php:70 lib/defaultlocalnav.php:58
+#: lib/personalgroupnav.php:74 lib/settingsnav.php:70
+msgctxt "MENU"
+msgid "Home"
+msgstr ""
+
+#. TRANS: Header in administrator navigation panel.
+#: lib/adminpanelnav.php:81
+msgctxt "HEADER"
+msgid "Admin"
+msgstr ""
+
+#. TRANS: Menu item title in administrator navigation panel.
+#: lib/adminpanelnav.php:88

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

 msgctxt "MENU"
 msgid "Site"
 msgstr ""
 
 msgctxt "MENU"
 msgid "Site"
 msgstr ""
 

-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:345
+#. TRANS: Menu item title in administrator navigation panel.
+#: lib/adminpanelnav.php:96

 msgid "Design configuration"
 msgstr ""
 
 msgid "Design configuration"
 msgstr ""
 

-#. TRANS: Menu item for site administration
+#. TRANS: Menu item in administrator navigation panel.

 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
 #. 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 settings navigation panel.
+#: lib/adminpanelnav.php:98 lib/groupnav.php:143 lib/settingsnav.php:115

 msgctxt "MENU"
 msgid "Design"
 msgstr ""
 
 msgctxt "MENU"
 msgid "Design"
 msgstr ""
 

-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:353
+#. TRANS: Menu item title in administrator navigation panel.
+#: lib/adminpanelnav.php:104

 msgid "User configuration"
 msgstr ""
 
 msgid "User configuration"
 msgstr ""
 

-#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:118
+#. TRANS: Menu item in administrator navigation panel.
+#: lib/adminpanelnav.php:106
+msgctxt "MENU"

 msgid "User"
 msgstr ""
 
 msgid "User"
 msgstr ""
 

-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:361
+#. TRANS: Menu item title in administrator navigation panel.
+#: lib/adminpanelnav.php:112

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

-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:369
+#. TRANS: Menu item in administrator navigation panel.
+#: lib/adminpanelnav.php:114
+msgctxt "MENU"
+msgid "Access"
+msgstr ""
+
+#. TRANS: Menu item title in administrator navigation panel.
+#: lib/adminpanelnav.php:120

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

-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:377
+#. TRANS: Menu item in administrator navigation panel.
+#: lib/adminpanelnav.php:122
+msgctxt "MENU"
+msgid "Paths"
+msgstr ""
+
+#. TRANS: Menu item title in administrator navigation panel.
+#: lib/adminpanelnav.php:128

 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:130
+msgctxt "MENU"
+msgid "Sessions"
+msgstr ""
+
+#. TRANS: Menu item title in administrator navigation panel.
+#: lib/adminpanelnav.php:136

 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:138
+msgctxt "MENU"
+msgid "Site notice"
+msgstr ""
+
+#. TRANS: Menu item title in administrator navigation panel.
+#: lib/adminpanelnav.php:144

 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:146
+msgctxt "MENU"
+msgid "Snapshots"
+msgstr ""
+
+#. TRANS: Menu item title in administrator navigation panel.
+#: lib/adminpanelnav.php:152

 msgid "Set site license"
 msgstr ""
 
 msgid "Set site license"
 msgstr ""
 

+#. TRANS: Menu item in administrator navigation panel.
+#: lib/adminpanelnav.php:154
+msgctxt "MENU"
+msgid "License"
+msgstr ""
+
+#. TRANS: Menu item title in administrator navigation panel.
+#: lib/adminpanelnav.php:160
+msgid "Plugins configuration"
+msgstr ""
+
+#. TRANS: Menu item in administrator navigation panel.
+#: lib/adminpanelnav.php:162
+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."


@@ -6792,63 +7967,83 @@ msgstr ""
 msgid "No application for that consumer key."
 msgstr ""
 
 msgid "No application for that consumer key."
 msgstr ""
 

+#. TRANS: Authorization exception thrown when a user without API access tries to access the API.
+#: lib/apiauth.php:203 lib/apiauth.php:286
+msgid "Not allowed to use API."
+msgstr ""
+

 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.

-#: lib/apiauth.php:219
+#: lib/apiauth.php:226

 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:224
+#: lib/apiauth.php:231

 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:266 lib/apiauth.php:293
+#: lib/apiauth.php:273 lib/apiauth.php:304

 msgid "Could not authenticate you."
 msgstr ""
 
 #. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
 msgid "Could not authenticate you."
 msgstr ""
 
 #. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.

-#: lib/apioauthstore.php:45
+#: lib/apioauthstore.php:46

 msgid "Could not create anonymous consumer."
 msgstr ""
 
 #. TRANS: Server error displayed when trying to create an anynymous OAuth application.
 msgid "Could not create anonymous consumer."
 msgstr ""
 
 #. TRANS: Server error displayed when trying to create an anynymous OAuth application.

-#: lib/apioauthstore.php:69
+#: lib/apioauthstore.php:70

 msgid "Could not create anonymous OAuth application."
 msgstr ""
 
 #. TRANS: Exception thrown when no token association could be found.
 msgid "Could not create anonymous OAuth application."
 msgstr ""
 
 #. TRANS: Exception thrown when no token association could be found.

-#: lib/apioauthstore.php:151
+#: lib/apioauthstore.php:152

 msgid ""
 "Could not find a profile and application associated with the request token."
 msgstr ""
 
 #. TRANS: Exception thrown when no access token can be issued.
 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:186
+#: lib/apioauthstore.php:210

 msgid "Could not issue access token."
 msgstr ""
 
 msgid "Could not issue access token."
 msgstr ""
 

-#. TRANS: Server error displayed when a database error occurs.
-#: lib/apioauthstore.php:243
+#. TRANS: Exception thrown when a database error occurs.
+#: lib/apioauthstore.php:318

 msgid "Database error inserting OAuth application user."
 msgstr ""
 
 msgid "Database error inserting OAuth application user."
 msgstr ""
 

+#. TRANS: Exception thrown when a database error occurs.
+#: lib/apioauthstore.php:346
+msgid "Database error updating OAuth application user."
+msgstr ""
+

 #. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
 #. TRANS: Exception thrown when an attempt is made to revoke an unknown token.

-#: lib/apioauthstore.php:285
+#: lib/apioauthstore.php:372

 msgid "Tried to revoke unknown token."
 msgstr ""
 
 #. TRANS: Exception thrown when an attempt is made to remove a revoked token.
 msgid "Tried to revoke unknown token."
 msgstr ""
 
 #. TRANS: Exception thrown when an attempt is made to remove a revoked token.

-#: lib/apioauthstore.php:290
+#: lib/apioauthstore.php:377

 msgid "Failed to delete revoked token."
 msgstr ""
 
 msgid "Failed to delete revoked token."
 msgstr ""
 

+#. TRANS: Form input field label for application icon.
+#: lib/applicationeditform.php:177
+msgid "Icon"
+msgstr ""
+

 #. TRANS: Form guide.
 #. TRANS: Form guide.

-#: lib/applicationeditform.php:178
+#: lib/applicationeditform.php:182

 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


@@ -6863,6 +8058,12 @@ 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.
+#: lib/applicationeditform.php:208 lib/groupeditform.php:178
+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"


@@ -6878,6 +8079,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"


@@ -6923,39 +8129,52 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
 msgid "Cancel"
 msgstr ""
 

-#: lib/applicationlist.php:247
+#. TRANS: Submit button title.
+#: lib/applicationeditform.php:357
+msgid "Save"
+msgstr ""
+
+#. TRANS: Name for an anonymous application in application list.
+#: lib/applicationlist.php:241
+msgid "Unknown application"
+msgstr ""
+
+#. TRANS: Message has a leading space and a trailing space. Used in application list.
+#. TRANS: Before this message the application name is put, behind it the organisation that manages it.
+#: lib/applicationlist.php:250

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


@@ -6965,16 +8184,6 @@ 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:294
-msgid "Author"
-msgstr ""
-
-#. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:308
-msgid "Provider"
-msgstr ""
-

 #. TRANS: Title.
 #: lib/attachmentnoticesection.php:67
 msgid "Notices where this attachment appears"
 #. TRANS: Title.
 #: lib/attachmentnoticesection.php:67
 msgid "Notices where this attachment appears"


@@ -7000,23 +8209,41 @@ msgstr ""
 msgid "Block"
 msgstr ""
 
 msgid "Block"
 msgstr ""
 

+#. TRANS: Description of the form to block a user.
+#: lib/blockform.php:79
+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 ""
 


@@ -7027,7 +8254,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:622

 msgid "User has no last notice."
 msgstr ""
 
 msgid "User has no last notice."
 msgstr ""
 


@@ -7074,64 +8301,69 @@ 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 ""
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
 #, php-format
 msgid "%1$s left group %2$s."
 msgstr ""
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.

-#: lib/command.php:426
+#: lib/command.php:432

 #, 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:436

 #, 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:278
+#: lib/command.php:440 lib/mail.php:339

 #, 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:282
+#: lib/command.php:444 lib/mail.php:344

 #, 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:448

 #, 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:477

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


@@ -7140,33 +8372,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:494 lib/implugin.php:492

 #, 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:507
+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:522

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

 #, 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:583

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


@@ -7175,100 +8409,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:596

 #, 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:599

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

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

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

 #, 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:684 lib/command.php:795

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

 #, 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:715 lib/command.php:741

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

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

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

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

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

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

 #, 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:804

 #, 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:822

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

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


@@ -7276,14 +8510,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:849

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

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


@@ -7291,251 +8525,437 @@ 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:876

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

 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:895
+msgctxt "COMMANDHELP"
+msgid "Commands:"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:150
-msgid "No configuration file found."
+#. TRANS: Help message for IM/SMS command "on"
+#: lib/command.php:897
+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:153
-msgid "I looked for configuration files in the following places:"
+#. TRANS: Help message for IM/SMS command "off"
+#: lib/command.php:899
+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:156
-msgid "You may wish to run the installer to fix this."
+#. TRANS: Help message for IM/SMS command "help"
+#: lib/command.php:901
+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:160
-msgid "Go to the installer."
+#. TRANS: Help message for IM/SMS command "follow <nickname>"
+#: lib/command.php:903
+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:905
+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 "subscriptions"
+#: lib/command.php:907
+msgctxt "COMMANDHELP"
+msgid "list the people you follow"

 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 "subscribers"
+#: lib/command.php:909
+msgctxt "COMMANDHELP"
+msgid "list the people that follow you"

 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 "leave <nickname>"
+#: lib/command.php:911
+msgctxt "COMMANDHELP"
+msgid "unsubscribe from user"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Menu item for OuAth connection settings.
-#: lib/connectsettingsaction.php:120
-msgctxt "MENU"
-msgid "Connections"
+#. TRANS: Help message for IM/SMS command "d <nickname> <text>"
+#: lib/command.php:913
+msgctxt "COMMANDHELP"
+msgid "direct message to user"

 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 "get <nickname>"
+#: lib/command.php:915
+msgctxt "COMMANDHELP"
+msgid "get last notice from user"

 msgstr ""
 
 msgstr ""
 

-#: lib/dberroraction.php:59
-msgid "Database error"
+#. TRANS: Help message for IM/SMS command "whois <nickname>"
+#: lib/command.php:917
+msgctxt "COMMANDHELP"
+msgid "get profile info on 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:104
-msgid "Upload file"
+#. TRANS: Help message for IM/SMS command "lose <nickname>"
+#: lib/command.php:919
+msgctxt "COMMANDHELP"
+msgid "force user to stop following you"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Instructions for form on profile design page.
-#: lib/designsettings.php:109
-msgid ""
-"You can upload your personal background image. The maximum file size is 2MB."
+#. TRANS: Help message for IM/SMS command "fav <nickname>"
+#: lib/command.php:921
+msgctxt "COMMANDHELP"
+msgid "add user's last notice as a 'fave'"

 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: Help message for IM/SMS command "fav #<notice_id>"
+#: lib/command.php:923
+msgctxt "COMMANDHELP"
+msgid "add notice with the given id as a 'fave'"

 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: Help message for IM/SMS command "repeat #<notice_id>"
+#: lib/command.php:925
+msgctxt "COMMANDHELP"
+msgid "repeat a notice with a given id"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:264
-msgctxt "BUTTON"
-msgid "Reset"
+#. TRANS: Help message for IM/SMS command "repeat <nickname>"
+#: lib/command.php:927
+msgctxt "COMMANDHELP"
+msgid "repeat the last notice from user"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
-#: lib/designsettings.php:433
-msgid "Design defaults restored."
+#. TRANS: Help message for IM/SMS command "reply #<notice_id>"
+#: lib/command.php:929
+msgctxt "COMMANDHELP"
+msgid "reply to notice with a given id"

 msgstr ""
 
 msgstr ""
 

-#: lib/disfavorform.php:114 lib/disfavorform.php:144
-msgid "Disfavor this notice"
+#. TRANS: Help message for IM/SMS command "reply <nickname>"
+#: lib/command.php:931
+msgctxt "COMMANDHELP"
+msgid "reply to the last notice from user"

 msgstr ""
 
 msgstr ""
 

-#: lib/favorform.php:114 lib/favorform.php:143
-msgid "Favor this notice"
+#. TRANS: Help message for IM/SMS command "join <group>"
+#: lib/command.php:933
+msgctxt "COMMANDHELP"
+msgid "join group"

 msgstr ""
 
 msgstr ""
 

-#: lib/feed.php:84
-msgid "RSS 1.0"
+#. TRANS: Help message for IM/SMS command "login"
+#: lib/command.php:935
+msgctxt "COMMANDHELP"
+msgid "Get a link to login to the web interface"

 msgstr ""
 
 msgstr ""
 

-#: lib/feed.php:86
-msgid "RSS 2.0"
+#. TRANS: Help message for IM/SMS command "drop <group>"
+#: lib/command.php:937
+msgctxt "COMMANDHELP"
+msgid "leave group"

 msgstr ""
 
 msgstr ""
 

-#: lib/feed.php:88
-msgid "Atom"
+#. TRANS: Help message for IM/SMS command "stats"
+#: lib/command.php:939
+msgctxt "COMMANDHELP"
+msgid "get your stats"

 msgstr ""
 
 msgstr ""
 

-#: lib/feed.php:90
-msgid "FOAF"
+#. TRANS: Help message for IM/SMS command "stop"
+#. TRANS: Help message for IM/SMS command "quit"
+#: lib/command.php:941 lib/command.php:943
+msgctxt "COMMANDHELP"
+msgid "same as 'off'"

 msgstr ""
 
 msgstr ""
 

-#: lib/feedimporter.php:75
-msgid "Not an atom feed."
+#. TRANS: Help message for IM/SMS command "sub <nickname>"
+#: lib/command.php:945
+msgctxt "COMMANDHELP"
+msgid "same as 'follow'"

 msgstr ""
 
 msgstr ""
 

-#: lib/feedimporter.php:82
-msgid "No author in the feed."
+#. TRANS: Help message for IM/SMS command "unsub <nickname>"
+#: lib/command.php:947
+msgctxt "COMMANDHELP"
+msgid "same as 'leave'"

 msgstr ""
 
 msgstr ""
 

-#: lib/feedimporter.php:89
-msgid "Can't import without a user."
+#. TRANS: Help message for IM/SMS command "last <nickname>"
+#: lib/command.php:949
+msgctxt "COMMANDHELP"
+msgid "same as 'get'"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Header for feed links (h2).
-#: lib/feedlist.php:66
-msgid "Feeds"
+#. 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:951 lib/command.php:953 lib/command.php:957
+#: lib/command.php:959 lib/command.php:961 lib/command.php:963
+#: lib/command.php:965 lib/command.php:967 lib/command.php:969
+msgctxt "COMMANDHELP"
+msgid "not yet implemented."

 msgstr ""
 
 msgstr ""
 

-#: lib/galleryaction.php:121
-msgid "Filter tags"
+#. TRANS: Help message for IM/SMS command "nudge <nickname>"
+#: lib/command.php:955
+msgctxt "COMMANDHELP"
+msgid "remind a user to update."

 msgstr ""
 
 msgstr ""
 

-#: lib/galleryaction.php:131
-msgid "All"
+#. 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 ""
 

-#: lib/galleryaction.php:139
-msgid "Select tag to filter"
+#. 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 ""
 

-#: lib/galleryaction.php:140
-msgid "Tag"
+#. 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 ""
 

-#: lib/galleryaction.php:141
-msgid "Choose a tag to narrow list"
+#. 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 ""
 

-#: lib/galleryaction.php:143
-msgid "Go"
+#. TRANS: Page title for when a database error occurs.
+#: lib/dberroraction.php:60
+msgid "Database error"

 msgstr ""
 
 msgstr ""
 

-#: lib/grantroleform.php:91
-#, php-format
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item in search group navigation panel.
+#: lib/defaultlocalnav.php:63 lib/publicgroupnav.php:63
+msgctxt "MENU"
+msgid "Public"
+msgstr ""
+
+#. TRANS: Title of form for deleting a user.
+#. TRANS: Link text in notice list item to delete a notice.
+#: lib/deleteuserform.php:64 lib/noticelistitem.php:582
+msgid "Delete"
+msgstr ""
+
+#. TRANS: Description of form for deleting a user.
+#: lib/deleteuserform.php:75
+msgid "Delete this user"
+msgstr ""
+
+#. TRANS: Form legend of form for changing the page design.
+#: lib/designform.php:110
+msgid "Change design"
+msgstr ""
+
+#. TRANS: Fieldset legend on profile design page to change profile page colours.
+#: lib/designform.php:126
+msgid "Change colours"
+msgstr ""
+
+#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
+#: lib/designform.php:133
+msgid "Use defaults"
+msgstr ""
+
+#. TRANS: Label in form on profile design page.
+#. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
+#: lib/designform.php:153
+msgid "Upload file"
+msgstr ""
+
+#. TRANS: Instructions for form on profile design page.
+#: lib/designform.php:158
+msgid ""
+"You can upload your personal background image. The maximum file size is 2MB."
+msgstr ""
+
+#. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
+#: lib/designform.php:189
+msgctxt "RADIO"
+msgid "On"
+msgstr ""
+
+#. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
+#: lib/designform.php:206
+msgctxt "RADIO"
+msgid "Off"
+msgstr ""
+
+#. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
+#: lib/designsettings.php:245
+msgid "Design defaults restored."
+msgstr ""
+
+#. TRANS: Exception. %s is an ID.
+#: lib/discovery.php:153
+#, php-format
+msgid "Unable to find services for %s."
+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
+msgid "Disfavor this notice"
+msgstr ""
+
+#. TRANS: Button text for removing the favourite status for a favourite notice.
+#: lib/disfavorform.php:136
+msgctxt "BUTTON"
+msgid "Disfavor favorite"
+msgstr ""
+
+#. TRANS: 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
+msgid "Favor this notice"
+msgstr ""
+
+#. TRANS: Button text for adding the favourite status to a notice.
+#: lib/favorform.php:135
+msgctxt "BUTTON"
+msgid "Favor"
+msgstr ""
+
+#. TRANS: Feed type name.
+#: lib/feed.php:85
+msgid "RSS 1.0"
+msgstr ""
+
+#. TRANS: Feed type name.
+#: lib/feed.php:88
+msgid "RSS 2.0"
+msgstr ""
+
+#. TRANS: Feed type name.
+#: lib/feed.php:91
+msgid "Atom"
+msgstr ""
+
+#. TRANS: Feed type name. FOAF stands for Friend of a Friend.
+#: lib/feed.php:94
+msgid "FOAF"
+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 ""
+
+#. 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).
+#: lib/feedlist.php:66
+msgid "Feeds"
+msgstr ""
+
+#. TRANS: List element on gallery action page to show all tags.
+#: lib/galleryaction.php:132
+msgctxt "TAGS"
+msgid "All"
+msgstr ""
+
+#. TRANS: Fieldset legend on gallery action page.
+#: lib/galleryaction.php:141
+msgid "Select tag to filter"
+msgstr ""
+
+#. TRANS: Dropdown field label on gallery action page for a list containing tags.
+#: lib/galleryaction.php:143
+msgid "Tag"
+msgstr ""
+
+#. TRANS: Dropdown field title on gallery action page for a list containing tags.
+#: lib/galleryaction.php:145
+msgid "Choose a tag to narrow list."
+msgstr ""
+
+#. TRANS: Submit button text on gallery action page.
+#: lib/galleryaction.php:148
+msgctxt "BUTTON"
+msgid "Go"
+msgstr ""
+
+#. TRANS: Description on form for granting a role.
+#: lib/grantroleform.php:88
+#, php-format

 msgid "Grant this user the \"%s\" role"
 msgstr ""
 
 msgid "Grant this user the \"%s\" role"
 msgstr ""
 

-#: lib/groupeditform.php:154
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+#. 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"

 msgstr ""
 
 msgstr ""
 

-#: lib/groupeditform.php:163
+#. 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 ""
 

+#. TRANS: Text area title for group description when there is no text limit.

 #: lib/groupeditform.php:168
 #: lib/groupeditform.php:168

-msgid "Describe the group or topic"
+msgid "Describe the group or topic."

 msgstr ""
 
 msgstr ""
 

-#: lib/groupeditform.php:170
+#. 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:182
+#. 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:190
+#. 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 "


@@ -7546,65 +8966,116 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
 msgstr[0] ""
 msgstr[1] ""
 

+#. TRANS: Dropdown fieldd label on group edit form.
+#: lib/groupeditform.php:207
+msgid "Membership policy"
+msgstr ""
+
+#. TRANS: Group membership policy option.
+#: lib/groupeditform.php:209
+msgid "Open to all"
+msgstr ""
+
+#. TRANS: Group membership policy option.
+#: lib/groupeditform.php:211
+msgid "Admin must approve all members"
+msgstr ""
+
+#. TRANS: Dropdown field title on group edit form.
+#: lib/groupeditform.php:213
+msgid "Whether admin approval is required to join this group."
+msgstr ""
+
+#. TRANS: Indicator in group members list that this user is a group administrator.
+#: lib/groupmemberlistitem.php:21
+msgctxt "GROUPADMIN"
+msgid "Admin"
+msgstr ""
+

 #. TRANS: Menu item in the group navigation page.
 #. TRANS: Menu item in the group navigation page.

-#: lib/groupnav.php:86
+#: lib/groupnav.php:81

 msgctxt "MENU"
 msgid "Group"
 msgstr ""
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is the nickname of the group.
 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
+#: lib/groupnav.php:84

 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s group"
 msgstr ""
 
 #. TRANS: Menu item in the group navigation page.
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s group"
 msgstr ""
 
 #. TRANS: Menu item in the group navigation page.

-#: lib/groupnav.php:95
+#: lib/groupnav.php:90

 msgctxt "MENU"
 msgid "Members"
 msgstr ""
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is the nickname of the group.
 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
+#: lib/groupnav.php:93

 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s group members"
 msgstr ""
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s group members"
 msgstr ""
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.

-#: lib/groupnav.php:108
+#. TRANS: %d is the number of pending members.
+#: lib/groupnav.php:106
+#, php-format
+msgctxt "MENU"
+msgid "Pending members (%d)"
+msgid_plural "Pending members (%d)"
+msgstr[0] ""
+msgstr[1] ""
+
+#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
+#. TRANS: %s is the nickname of the group.
+#: lib/groupnav.php:109
+#, php-format
+msgctxt "TOOLTIP"
+msgid "%s pending members"
+msgstr ""
+
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/groupnav.php:116

 msgctxt "MENU"
 msgid "Blocked"
 msgstr ""
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
 msgctxt "MENU"
 msgid "Blocked"
 msgstr ""
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.

-#: lib/groupnav.php:111
+#: lib/groupnav.php:119

 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s blocked users"
 msgstr ""
 
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s blocked users"
 msgstr ""
 

+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#. TRANS: Menu item in primary navigation panel.
+#: lib/groupnav.php:125 lib/primarynav.php:66
+msgctxt "MENU"
+msgid "Admin"
+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:120
+#: lib/groupnav.php:128

 #, php-format
 msgctxt "TOOLTIP"
 msgid "Edit %s group properties"
 msgstr ""
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
 #, 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
+#: lib/groupnav.php:134

 msgctxt "MENU"
 msgid "Logo"
 msgstr ""
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
 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.

-#: lib/groupnav.php:129
+#: lib/groupnav.php:137

 #, php-format
 msgctxt "TOOLTIP"
 msgid "Add or edit %s logo"
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Add or edit %s logo"


@@ -7612,12 +9083,17 @@ 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:138
+#: lib/groupnav.php:146

 #, php-format
 msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr ""
 
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr ""
 

+#. TRANS: Group actions header (h2). Text hidden by default.
+#: lib/groupprofileblock.php:94
+msgid "Group actions"
+msgstr ""
+

 #. TRANS: Title for groups with the most members section.
 #: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
 #. TRANS: Title for groups with the most members section.
 #: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"


@@ -7640,35 +9116,41 @@ msgstr ""
 msgid "This page is not available in a media type you accept"
 msgstr ""
 
 msgid "This page is not available in a media type you accept"
 msgstr ""
 

-#: lib/imagefile.php:72
+#. TRANS: Exception thrown when trying to upload an unsupported image file format.
+#: lib/imagefile.php:73

 msgid "Unsupported image file format."
 msgstr ""
 
 #. TRANS: Exception thrown when too large a file is uploaded.
 #. TRANS: %s is the maximum file size, for example "500b", "10kB" or "2MB".
 msgid "Unsupported image file format."
 msgstr ""
 
 #. TRANS: Exception thrown when too large a file is uploaded.
 #. TRANS: %s is the maximum file size, for example "500b", "10kB" or "2MB".

-#: lib/imagefile.php:90
+#: lib/imagefile.php:91

 #, php-format
 msgid "That file is too big. The maximum file size is %s."
 msgstr ""
 
 #, php-format
 msgid "That file is too big. The maximum file size is %s."
 msgstr ""
 

-#: lib/imagefile.php:95
+#. TRANS: Exception thrown when uploading an image and that action could not be completed.
+#: lib/imagefile.php:97

 msgid "Partial upload."
 msgstr ""
 
 msgid "Partial upload."
 msgstr ""
 

-#: lib/imagefile.php:111
+#. TRANS: Exception thrown when uploading a file as image that is not an image or is a corrupt file.
+#: lib/imagefile.php:115

 msgid "Not an image or corrupt file."
 msgstr ""
 
 msgid "Not an image or corrupt file."
 msgstr ""
 

-#: lib/imagefile.php:160
+#. TRANS: Exception thrown during resize when image has been registered as present, but is no longer there.
+#: lib/imagefile.php:178

 msgid "Lost our file."
 msgstr ""
 
 msgid "Lost our file."
 msgstr ""
 

-#: lib/imagefile.php:197 lib/imagefile.php:237
+#. TRANS: Exception thrown when trying to resize an unknown file type.
+#. TRANS: Exception thrown when trying resize an unknown file type.
+#: lib/imagefile.php:216 lib/imagefile.php:257

 msgid "Unknown file type"
 msgstr ""
 
 #. TRANS: Number of megabytes. %d is the number.
 msgid "Unknown file type"
 msgstr ""
 
 #. TRANS: Number of megabytes. %d is the number.

-#: lib/imagefile.php:283
+#: lib/imagefile.php:303

 #, php-format
 msgid "%dMB"
 msgid_plural "%dMB"
 #, php-format
 msgid "%dMB"
 msgid_plural "%dMB"


@@ -7676,7 +9158,7 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Number of kilobytes. %d is the number.
 msgstr[1] ""
 
 #. TRANS: Number of kilobytes. %d is the number.

-#: lib/imagefile.php:287
+#: lib/imagefile.php:307

 #, php-format
 msgid "%dkB"
 msgid_plural "%dkB"
 #, php-format
 msgid "%dkB"
 msgid_plural "%dkB"


@@ -7684,44 +9166,87 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Number of bytes. %d is the number.
 msgstr[1] ""
 
 #. TRANS: Number of bytes. %d is the number.

-#: lib/imagefile.php:290
+#: lib/imagefile.php:310

 #, php-format
 msgid "%dB"
 msgid_plural "%dB"
 msgstr[0] ""
 msgstr[1] ""
 
 #, php-format
 msgid "%dB"
 msgid_plural "%dB"
 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:265

 #, 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:353

 #, 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:629
+msgid "Queueing must be enabled to use IM plugins."
+msgstr ""
+
+#. TRANS: Server exception thrown trying to initialise an IM plugin without a transport method.
+#: lib/implugin.php:634
+msgid "Transport cannot be null."
+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 ""
 

-#: lib/logingroupnav.php:80
+#. 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.
+#: lib/logingroupnav.php:66

 msgid "Login with a username and password"
 msgstr ""
 
 msgid "Login with a username and password"
 msgstr ""
 

-#: lib/logingroupnav.php:86
+#. 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.
+#: 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:174
+#: lib/mail.php:172

 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:179
+#: lib/mail.php:177

 #, php-format
 msgid ""
 "Hey, %1$s.\n"
 #, php-format
 msgid ""
 "Hey, %1$s.\n"


@@ -7740,50 +9265,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:246
+#. TRANS: Main body of new-subscriber notification e-mail.
+#. TRANS: %1$s is the subscriber's long name, %2$s is the StatusNet sitename.
+#: lib/mail.php:243 lib/mail.php:250

 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr ""
 
 #, php-format
 msgid "%1$s is now listening to your notices on %2$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:253
+#. TRANS: Subject of pending new-subscriber notification e-mail.
+#. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
+#: lib/mail.php:284
+#, php-format
+msgid "%1$s would like to listen to your notices on %2$s."
+msgstr ""
+
+#. TRANS: Main body of pending new-subscriber notification e-mail.
+#. TRANS: %1$s is the subscriber's long name, %2$s is the StatusNet sitename.
+#: lib/mail.php:291

 #, 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:263
+#. TRANS: Common footer block for StatusNet notification emails.
+#. TRANS: %1$s is the StatusNet sitename,
+#. TRANS: %2$s is a link to the addressed user's e-mail settings.
+#: lib/mail.php:310

 #, 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:335
+#, 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:286
+#: lib/mail.php:349

 #, 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:359
+#, 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:315
+#: lib/mail.php:387

 #, php-format
 msgid "New email address for posting to %s"
 msgstr ""
 #, php-format
 msgid "New email address for posting to %s"
 msgstr ""


@@ -7791,49 +9334,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:321
+#: lib/mail.php:393

 #, 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:442
+#: lib/mail.php:514

 #, 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:468
+#: lib/mail.php:540

 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:472
+#: lib/mail.php:544

 #, 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:493
+#: lib/mail.php:565

 #, php-format
 #, php-format

-msgid "You've been nudged by %s"
+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,
 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:500
+#. TRANS: %3$s is a URL to post notices at.
+#: lib/mail.php:572

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


@@ -7843,15 +9383,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:547
+#: lib/mail.php:617

 #, php-format
 msgid "New private message from %s"
 msgstr ""
 #, php-format
 msgid "New private message from %s"
 msgstr ""


@@ -7859,8 +9396,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:555
+#: lib/mail.php:624

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


@@ -7873,15 +9409,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:607
+#: lib/mail.php:674

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


@@ -7891,7 +9424,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:614
+#: lib/mail.php:681

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


@@ -7906,14 +9439,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:672
+#: lib/mail.php:738

 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"


@@ -7923,21 +9453,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:680
+#: lib/mail.php:746

 #, 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: %5$s is a URL to the full conversion if it exists (otherwise empty),
 #. 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:688
+#. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replies for the addressed user,
+#: lib/mail.php:753

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


@@ -7953,47 +9482,113 @@ 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.
+#. TRANS: Main body of group join notification e-mail.
+#. TRANS: %1$s is the subscriber's long name, %2$s is the group name, and %3$s is the StatusNet sitename,
+#. TRANS: %4$s is a block of profile info about the subscriber.
+#. TRANS: %5$s is a link to the addressed user's e-mail settings.
+#: lib/mail.php:824 lib/mail.php:834
+#, php-format
+msgid "%1$s has joined your group %2$s on %3$s."
+msgstr ""
+
+#. TRANS: Subject of pending group join request notification e-mail.
+#. TRANS: %1$s is the joining user's nickname, %2$s is the group name, and %3$s is the StatusNet sitename.
+#: lib/mail.php:871
+#, php-format
+msgid "%1$s wants to join your group %2$s on %3$s."

 msgstr ""
 
 msgstr ""
 

-#: lib/mailbox.php:89
+#. TRANS: Main body of pending group join request notification e-mail.
+#. TRANS: %1$s is the subscriber's long name, %2$s is the group name, and %3$s is the StatusNet sitename,
+#. TRANS: %4$s is the URL to the moderation queue page.
+#: lib/mail.php:879
+#, php-format
+msgid ""
+"%1$s would like to join your group %2$s on %3$s. You may approve or reject "
+"their group membership at %4$s"
+msgstr ""
+
+#. TRANS: Client error displayed when trying to access a mailbox that is not of the logged in user.
+#: lib/mailbox.php:87

 msgid "Only the user can read their own mailboxes."
 msgstr ""
 
 msgid "Only the user can read their own mailboxes."
 msgstr ""
 

-#: lib/mailbox.php:139
+#. 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/mailbox.php:228 lib/noticelist.php:522
-msgid "from"
+#. 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 ""
 
 msgstr ""
 

-#: lib/mailhandler.php:37
+#. 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.


@@ -8035,155 +9630,250 @@ 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 ""
 
 #. TRANS Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
 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
+#: 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: 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: Header in message list.
+#: lib/messagelist.php:77
+msgid "Messages"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:178
-msgid "Nickname cannot be empty."
+#. 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:429
+msgid "from"

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:191
-#, php-format
-msgid "Nickname cannot be more than %d character long."
-msgid_plural "Nickname cannot be more than %d characters long."
-msgstr[0] ""
-msgstr[1] ""
+#. TRANS: A possible notice source (web interface).
+#: lib/messagelistitem.php:144 lib/noticelistitem.php:424
+msgctxt "SOURCE"
+msgid "web"
+msgstr ""

 
 

-#: lib/noticeform.php:160
-msgid "Send a notice"
+#. TRANS: A possible notice source (XMPP).
+#: lib/messagelistitem.php:146
+msgctxt "SOURCE"
+msgid "xmpp"

 msgstr ""
 
 msgstr ""
 

-#: lib/noticeform.php:174
-#, php-format
-msgid "What's up, %s?"
+#. TRANS: A possible notice source (e-mail).
+#: lib/messagelistitem.php:148
+msgctxt "SOURCE"
+msgid "mail"

 msgstr ""
 
 msgstr ""
 

-#: lib/noticeform.php:193
+#. 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:336
+msgid "Cannot get author for activity."
+msgstr ""
+
+#. TRANS: Client exception.
+#: lib/microappplugin.php:374
+msgid "Bookmark not posted to this group."
+msgstr ""
+
+#. TRANS: Client exception.
+#: lib/microappplugin.php:388
+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:392
+msgid "Do not know how to handle this kind of target."
+msgstr ""
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:178
+msgid "Nickname cannot be empty."
+msgstr ""
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:191
+#, php-format
+msgid "Nickname cannot be more than %d character long."
+msgid_plural "Nickname cannot be more than %d characters long."
+msgstr[0] ""
+msgstr[1] ""
+
+#. TRANS: Form legend for notice form.
+#: lib/noticeform.php:194
+msgid "Send a notice"
+msgstr ""
+
+#. TRANS: Title for notice label. %s is the user's nickname.
+#: lib/noticeform.php:208
+#, php-format
+msgid "What's up, %s?"
+msgstr ""
+
+#. TRANS: Input label in notice form for adding an attachment.
+#: lib/noticeform.php:228

 msgid "Attach"
 msgstr ""
 
 msgid "Attach"
 msgstr ""
 

-#: lib/noticeform.php:197
-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: Header in notice list.
+#. TRANS: Header for Notices section.
+#: lib/noticelist.php:85 lib/threadednoticelist.php:65
+msgctxt "HEADER"
+msgid "Notices"
+msgstr ""
+
+#. TRANS: Used in coordinates as abbreviation of north.
+#: lib/noticelistitem.php:352

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

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

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

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

 #, 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:375

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

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

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

-#: lib/noticelist.php:646
+#. TRANS: Link title in notice list item to reply to a notice.
+#: lib/noticelistitem.php:552

 msgid "Reply to this notice"
 msgstr ""
 
 msgid "Reply to this notice"
 msgstr ""
 

-#: lib/noticelist.php:647
+#. TRANS: Link text in notice list item to reply to a notice.
+#: lib/noticelistitem.php:554

 msgid "Reply"
 msgstr ""
 
 msgid "Reply"
 msgstr ""
 

-#: lib/noticelist.php:691
-msgid "Notice repeated"
+#. TRANS: Link title in notice list item to delete a notice.
+#: lib/noticelistitem.php:580
+msgid "Delete this notice"
+msgstr ""
+
+#. TRANS: Title for repeat form status in notice list when a notice has been repeated.
+#: lib/noticelistitem.php:603
+msgid "Notice repeated."
+msgstr ""
+
+#. 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 ""
 
 msgstr ""
 

-#: lib/oauthstore.php:294
+#. TRANS: Exception thrown when creating a new profile fails in OAuth store.
+#: lib/oauthstore.php:291

 msgid "Error inserting new profile."
 msgstr ""
 
 msgid "Error inserting new profile."
 msgstr ""
 

-#: lib/oauthstore.php:302
+#. TRANS: Exception thrown when creating a new avatar fails in OAuth store.
+#: lib/oauthstore.php:300

 msgid "Error inserting avatar."
 msgstr ""
 
 msgid "Error inserting avatar."
 msgstr ""
 

+#. TRANS: Exception thrown when creating a remote profile fails in OAuth store.

 #: lib/oauthstore.php:322
 msgid "Error inserting remote profile."
 msgstr ""
 #: lib/oauthstore.php:322
 msgid "Error inserting remote profile."
 msgstr ""


@@ -8193,136 +9883,247 @@ msgstr ""
 msgid "Duplicate notice."
 msgstr ""
 
 msgid "Duplicate notice."
 msgstr ""
 

-#: lib/oauthstore.php:507
-msgid "Couldn't insert new subscription."
+#. TRANS: Exception thrown when creating a new subscription fails in OAuth store.
+#: lib/oauthstore.php:509
+msgid "Could not insert new subscription."

 msgstr ""
 
 msgstr ""
 

-#: lib/personalgroupnav.php:102
-msgid "Personal"
+#. TRANS: Menu item in personal group navigation menu.
+#. TRANS: Menu item in settings navigation panel.
+#. TRANS: Menu item in local navigation menu.
+#: lib/personalgroupnav.php:82 lib/settingsnav.php:87 lib/subgroupnav.php:77
+msgctxt "MENU"
+msgid "Profile"

 msgstr ""
 
 msgstr ""
 

-#: lib/personalgroupnav.php:107
-msgid "Replies"
+#. TRANS: Menu item title in personal group navigation menu.
+#: lib/personalgroupnav.php:84
+msgid "Your profile"

 msgstr ""
 
 msgstr ""
 

-#: lib/personalgroupnav.php:117
-msgid "Favorites"
+#. TRANS: Menu item in personal group navigation menu.
+#: lib/personalgroupnav.php:90
+msgctxt "MENU"
+msgid "Replies"

 msgstr ""
 
 msgstr ""
 

-#: lib/personalgroupnav.php:128
-msgid "Inbox"
+#. TRANS: Menu item in personal group navigation menu.
+#: lib/personalgroupnav.php:98
+msgctxt "MENU"
+msgid "Favorites"

 msgstr ""
 
 msgstr ""
 

-#: lib/personalgroupnav.php:129
-msgid "Your incoming messages"
+#. 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 ""
 
 msgstr ""
 

-#: lib/personalgroupnav.php:133
-msgid "Outbox"
+#. TRANS: Menu item in personal group navigation menu.
+#: lib/personalgroupnav.php:115
+msgctxt "MENU"
+msgid "Messages"

 msgstr ""
 
 msgstr ""
 

-#: lib/personalgroupnav.php:134
-msgid "Your sent messages"
+#. TRANS: Menu item title in personal group navigation menu.
+#: lib/personalgroupnav.php:117
+msgid "Your incoming messages"

 msgstr ""
 
 msgstr ""
 

+#. TRANS: Title for personal tag cloud section. %s is a user nickname.

 #: lib/personaltagcloudsection.php:56
 #, php-format
 msgid "Tags in %s's notices"
 msgstr ""
 
 #. TRANS: Displayed as version information for a plugin if no version information was found.
 #: lib/personaltagcloudsection.php:56
 #, php-format
 msgid "Tags in %s's notices"
 msgstr ""
 
 #. TRANS: Displayed as version information for a plugin if no version information was found.

-#: lib/plugin.php:121
+#: lib/plugin.php:126

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

-#: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82
+#. 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 ""
+
+#: lib/pluginlist.php:196
+msgctxt "plugin-description"
+msgid "(Plugin descriptions unavailable when 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 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 ""
+
+#. TRANS: Menu item in primary navigation panel.
+#: lib/primarynav.php:92
+msgctxt "MENU"
+msgid "Search"
+msgstr ""
+
+#. TRANS: Menu item title in primary navigation panel.
+#: lib/primarynav.php:94
+msgid "Search the site."
+msgstr ""
+
+#. TRANS: H2 text for user subscription statistics.
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:127 lib/profileaction.php:225

 msgid "Subscriptions"
 msgstr ""
 
 msgid "Subscriptions"
 msgstr ""
 

-#: lib/profileaction.php:126
+#. TRANS: Text for user subscription statistics if user has more subscriptions than displayed.
+#: lib/profileaction.php:144

 msgid "All subscriptions"
 msgstr ""
 
 msgid "All subscriptions"
 msgstr ""
 

-#: lib/profileaction.php:144 lib/profileaction.php:214 lib/subgroupnav.php:90
+#. TRANS: H2 text for user subscriber statistics.
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:164 lib/profileaction.php:232

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

-#: lib/profileaction.php:161
+#. TRANS: Text for user subscription statistics if user has more subscribers than displayed.
+#: lib/profileaction.php:181

 msgid "All subscribers"
 msgstr ""
 
 msgid "All subscribers"
 msgstr ""
 

-#: lib/profileaction.php:191
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:213

 msgid "User ID"
 msgstr ""
 
 msgid "User ID"
 msgstr ""
 

-#: lib/profileaction.php:196
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:219

 msgid "Member since"
 msgstr ""
 
 msgid "Member since"
 msgstr ""
 

-#. TRANS: Average count of posts made per day since account registration
-#: lib/profileaction.php:235
+#. TRANS: Label for user statistics.
+#. TRANS: H2 text for user group membership statistics.
+#: lib/profileaction.php:239 lib/profileaction.php:290
+msgid "Groups"
+msgstr ""
+
+#. TRANS: Label for user statistics.
+#. TRANS: Average count of posts made per day since account registration.
+#: lib/profileaction.php:253

 msgid "Daily average"
 msgstr ""
 
 msgid "Daily average"
 msgstr ""
 

-#: lib/profileaction.php:264
+#. TRANS: Text for user group membership statistics if user has more subscriptions than displayed.
+#: lib/profileaction.php:305

 msgid "All groups"
 msgstr ""
 
 msgid "All groups"
 msgstr ""
 

+#. TRANS: Server error displayed when using an unimplemented method.

 #: lib/profileformaction.php:123
 msgid "Unimplemented method."
 msgstr ""
 
 #: lib/profileformaction.php:123
 msgid "Unimplemented method."
 msgstr ""
 

-#: lib/publicgroupnav.php:78
-msgid "Public"
+#. TRANS: Menu item in search group navigation panel.
+#. TRANS: Menu item in local navigation menu.
+#: lib/publicgroupnav.php:68 lib/searchgroupnav.php:82 lib/subgroupnav.php:124
+msgctxt "MENU"
+msgid "Groups"

 msgstr ""
 
 msgstr ""
 

-#: lib/publicgroupnav.php:82
+#. TRANS: Menu item title in search group navigation panel.
+#: lib/publicgroupnav.php:70

 msgid "User groups"
 msgstr ""
 
 msgid "User groups"
 msgstr ""
 

-#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
+#. TRANS: Menu item in search group navigation panel.
+#: lib/publicgroupnav.php:73
+msgctxt "MENU"

 msgid "Recent tags"
 msgstr ""
 
 msgid "Recent tags"
 msgstr ""
 

-#: lib/publicgroupnav.php:88
+#. TRANS: Menu item title in search group navigation panel.
+#: lib/publicgroupnav.php:75
+msgid "Recent tags"
+msgstr ""
+
+#. TRANS: Menu item in search group navigation panel.
+#: lib/publicgroupnav.php:79
+msgctxt "MENU"

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

-#: lib/publicgroupnav.php:92
+#. TRANS: Menu item in search group navigation panel.
+#: lib/publicgroupnav.php:85
+msgctxt "MENU"

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

-#: lib/redirectingaction.php:95
+#. TRANS: Client error displayed when return-to was defined without a target.
+#: lib/redirectingaction.php:93

 msgid "No return-to arguments."
 msgstr ""
 
 msgid "No return-to arguments."
 msgstr ""
 

-#: lib/repeatform.php:107
+#. TRANS: For legend for notice repeat form.
+#: lib/repeatform.php:102

 msgid "Repeat this notice?"
 msgstr ""
 
 msgid "Repeat this notice?"
 msgstr ""
 

-#: lib/repeatform.php:132
-msgid "Yes"
-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:1016

 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 ""
 
 msgid "Sandbox this user"
 msgstr ""
 


@@ -8343,105 +10144,340 @@ msgctxt "BUTTON"
 msgid "Search"
 msgstr ""
 
 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:143
+msgid ""
+"* Make sure all words are spelled correctly.\n"
+"* Try different keywords.\n"
+"* Try more general keywords.\n"
+"* Try fewer keywords.\n"

 msgstr ""
 
 msgstr ""
 

-#: lib/searchgroupnav.php:80
+#. TRANS: Standard search suggestions shown when a search does not give any results.
+#: lib/searchaction.php:152
+#, php-format
+msgid ""
+"\n"
+"You can also try your search on other engines:\n"
+"\n"
+"* [Twingly](http://www.twingly.com/search?q=%s&content=microblog&site=%%%%"
+"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)\n"
+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 help on StatusNet.
+#: lib/secondarynav.php:56
+msgctxt "MENU"
+msgid "Help"
+msgstr ""
+
+#. TRANS: Secondary navigation menu item leading to text about StatusNet site.
+#: lib/secondarynav.php:59
+msgctxt "MENU"
+msgid "About"
+msgstr ""
+
+#. TRANS: Secondary navigation menu item leading to Frequently Asked Questions.
+#: lib/secondarynav.php:62
+msgctxt "MENU"
+msgid "FAQ"
+msgstr ""
+
+#. TRANS: Secondary navigation menu item leading to Terms of Service.
+#: lib/secondarynav.php:67
+msgctxt "MENU"
+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: Secondary navigation menu item leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+#: lib/secondarynav.php:81
+msgctxt "MENU"
+msgid "Contact"
+msgstr ""
+
+#. TRANS: Secondary navigation menu item. Leads to information about embedding a timeline widget.
+#: lib/secondarynav.php:84
+msgctxt "MENU"
+msgid "Badge"
+msgstr ""
+
+#. TRANS: Default title for section/sidebar widget.
+#: lib/section.php:88

 msgid "Untitled section"
 msgstr ""
 
 msgid "Untitled section"
 msgstr ""
 

-#: lib/section.php:106
+#. TRANS: Default "More..." title for section/sidebar widget.
+#: lib/section.php:107

 msgid "More..."
 msgstr ""
 
 msgid "More..."
 msgstr ""
 

-#: lib/silenceform.php:67
+#. TRANS: Header in settings navigation panel.
+#: lib/settingsnav.php:81
+msgctxt "HEADER"
+msgid "Settings"
+msgstr ""
+
+#. TRANS: Menu item title in settings navigation panel.
+#: lib/settingsnav.php:89
+msgid "Change your profile settings"
+msgstr ""
+
+#. TRANS: Menu item in settings navigation panel.
+#: lib/settingsnav.php:94
+msgctxt "MENU"
+msgid "Avatar"
+msgstr ""
+
+#. TRANS: Menu item title in settings navigation panel.
+#: lib/settingsnav.php:96
+msgid "Upload an avatar"
+msgstr ""
+
+#. TRANS: Menu item in settings navigation panel.
+#: lib/settingsnav.php:101
+msgctxt "MENU"
+msgid "Password"
+msgstr ""
+
+#. TRANS: Menu item title in settings navigation panel.
+#: lib/settingsnav.php:103
+msgid "Change your password"
+msgstr ""
+
+#. TRANS: Menu item in settings navigation panel.
+#: lib/settingsnav.php:108
+msgctxt "MENU"
+msgid "Email"
+msgstr ""
+
+#. TRANS: Menu item title in settings navigation panel.
+#: lib/settingsnav.php:110
+msgid "Change email handling"
+msgstr ""
+
+#. TRANS: Menu item title in settings navigation panel.
+#: lib/settingsnav.php:117
+msgid "Design your profile"
+msgstr ""
+
+#. TRANS: Menu item in settings navigation panel.
+#: lib/settingsnav.php:122
+msgctxt "MENU"
+msgid "URL"
+msgstr ""
+
+#. TRANS: Menu item title in settings navigation panel.
+#: lib/settingsnav.php:124
+msgid "URL shorteners"
+msgstr ""
+
+#. TRANS: Menu item in settings navigation panel.
+#: lib/settingsnav.php:132
+msgctxt "MENU"
+msgid "IM"
+msgstr ""
+
+#. TRANS: Menu item title in settings navigation panel.
+#: lib/settingsnav.php:134
+msgid "Updates by instant messenger (IM)"
+msgstr ""
+
+#. TRANS: Menu item in settings navigation panel.
+#: lib/settingsnav.php:141
+msgctxt "MENU"
+msgid "SMS"
+msgstr ""
+
+#. TRANS: Menu item title in settings navigation panel.
+#: lib/settingsnav.php:143
+msgid "Updates by SMS"
+msgstr ""
+
+#. TRANS: Menu item in settings navigation panel.
+#: lib/settingsnav.php:149
+msgctxt "MENU"
+msgid "Connections"
+msgstr ""
+
+#. TRANS: Menu item title in settings navigation panel.
+#: lib/settingsnav.php:151
+msgid "Authorized connected applications"
+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: Menu item in local navigation menu.
+#: lib/subgroupnav.php:85
+msgctxt "MENU"
+msgid "Subscriptions"

 msgstr ""
 
 msgstr ""
 

-#: lib/subgroupnav.php:91
+#. 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 in local navigation menu.
+#: lib/subgroupnav.php:96
+msgctxt "MENU"
+msgid "Subscribers"
+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 ""
 
 msgstr ""
 

-#: lib/subgroupnav.php:105
+#. 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 ""
+
+#. 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 in local navigation menu.
+#: lib/subgroupnav.php:134
+msgctxt "MENU"

 msgid "Invite"
 msgstr ""
 
 msgid "Invite"
 msgstr ""
 

-#: lib/subgroupnav.php:106
+#. TRANS: Menu item title in local navigation menu.
+#. TRANS: %s is a user nickname.
+#: lib/subgroupnav.php:137

 #, 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 ""
+
+#. TRANS: Form of form to subscribe to a user.
+#: lib/subscribeform.php:107
+msgid "Subscribe to this user"

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

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


@@ -8449,128 +10485,186 @@ 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"
-msgstr ""
+#. TRANS: Link to show replies for a notice.
+#. TRANS: %d is the number of replies to a notice and used for plural.
+#: lib/threadednoticelist.php:292
+#, php-format
+msgid "Show reply"
+msgid_plural "Show all %d replies"
+msgstr[0] ""
+msgstr[1] ""

 
 

-#. TRANS: Title for the form to unblock a user.
-#: lib/unblockform.php:67
-msgctxt "TITLE"
-msgid "Unblock"
+#. TRANS: Reference to the logged in user in favourite list.
+#: lib/threadednoticelist.php:358
+msgctxt "FAVELIST"
+msgid "You"

 msgstr ""
 
 msgstr ""
 

-#: lib/unsandboxform.php:69
-msgid "Unsandbox"
+#. TRANS: Separator in list of user names like "You, Bob, Mary".
+#: lib/threadednoticelist.php:394
+msgid ", "

 msgstr ""
 
 msgstr ""
 

-#: lib/unsandboxform.php:80
-msgid "Unsandbox this user"
+#. TRANS: For building a list such as "You, bob, mary and 5 others have favored this notice".
+#. 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:397
+#, php-format
+msgctxt "FAVELIST"
+msgid "%1$s and %2$s"

 msgstr ""
 
 msgstr ""
 

-#: lib/unsilenceform.php:67
-msgid "Unsilence"
+#. TRANS: List message for notice favoured by logged in user.
+#: lib/threadednoticelist.php:422
+msgctxt "FAVELIST"
+msgid "You have favored this notice."

 msgstr ""
 
 msgstr ""
 

-#: lib/unsilenceform.php:78
-msgid "Unsilence this user"
+#. TRANS: List message for favoured notices.
+#. TRANS: %d is the number of users that have favoured a notice.
+#: lib/threadednoticelist.php:426
+#, php-format
+msgid "One person has favored this notice."
+msgid_plural "%d people have favored this notice."
+msgstr[0] ""
+msgstr[1] ""
+
+#. TRANS: List message for notice repeated by logged in user.
+#: lib/threadednoticelist.php:480
+msgctxt "REPEATLIST"
+msgid "You have repeated this notice."

 msgstr ""
 
 msgstr ""
 

-#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
-msgid "Unsubscribe from this user"
+#. TRANS: List message for repeated notices.
+#. TRANS: %d is the number of users that have repeated a notice.
+#: lib/threadednoticelist.php:484
+#, php-format
+msgid "One person has repeated this notice."
+msgid_plural "%d people have repeated this notice."
+msgstr[0] ""
+msgstr[1] ""
+
+#. TRANS: Title for top posters section.
+#: lib/topposterssection.php:74
+msgid "Top posters"

 msgstr ""
 
 msgstr ""
 

-#: lib/unsubscribeform.php:137
-msgid "Unsubscribe"
+#. TRANS: Option in drop-down of potential addressees.
+#: lib/toselector.php:87
+msgctxt "SENDTO"
+msgid "Everyone"

 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: Option in drop-down of potential addressees.
+#. TRANS: %s is a StatusNet sitename.
+#: lib/toselector.php:93

 #, php-format
 #, php-format

-msgid "User %1$s (%2$d) has no profile record."
+msgid "My colleagues at %s"

 msgstr ""
 
 msgstr ""
 

-#: lib/userprofile.php:119
-msgid "Edit Avatar"
+#. TRANS: Label for drop-down of potential addressees.
+#: lib/toselector.php:115
+msgctxt "LABEL"
+msgid "To:"

 msgstr ""
 
 msgstr ""
 

-#: lib/userprofile.php:236 lib/userprofile.php:250
-msgid "User actions"
+#. TRANS: Client exception thrown in widget for selecting potential addressees when an invalid fill option was received.
+#: lib/toselector.php:157
+#, php-format
+msgid "Unknown to value: \"%s\"."

 msgstr ""
 
 msgstr ""
 

-#: lib/userprofile.php:239
-msgid "User deletion in progress..."
+#. TRANS: Title for the form to unblock a user.
+#: lib/unblockform.php:67
+msgctxt "TITLE"
+msgid "Unblock"

 msgstr ""
 
 msgstr ""
 

-#: lib/userprofile.php:265
-msgid "Edit profile settings"
+#. TRANS: Title for unsandbox form.
+#: lib/unsandboxform.php:67
+msgctxt "TITLE"
+msgid "Unsandbox"

 msgstr ""
 
 msgstr ""
 

-#: lib/userprofile.php:266
-msgid "Edit"
+#. TRANS: Description for unsandbox form.
+#: lib/unsandboxform.php:78
+msgid "Unsandbox this user"

 msgstr ""
 
 msgstr ""
 

-#: lib/userprofile.php:289
-msgid "Send a direct message to this user"
+#. TRANS: Title for unsilence form.
+#: lib/unsilenceform.php:65
+msgid "Unsilence"

 msgstr ""
 
 msgstr ""
 

-#: lib/userprofile.php:290
-msgid "Message"
+#. TRANS: Form description for unsilence form.
+#: lib/unsilenceform.php:76
+msgid "Unsilence this user"

 msgstr ""
 
 msgstr ""
 

-#: lib/userprofile.php:331
-msgid "Moderate"
+#. TRANS: Form legend on unsubscribe form.
+#. TRANS: Button title on unsubscribe form.
+#: lib/unsubscribeform.php:109 lib/unsubscribeform.php:134
+msgid "Unsubscribe from this user"

 msgstr ""
 
 msgstr ""
 

-#: lib/userprofile.php:369
-msgid "User role"
+#. TRANS: Button text on unsubscribe form.
+#: lib/unsubscribeform.php:132
+msgctxt "BUTTON"
+msgid "Unsubscribe"

 msgstr ""
 
 msgstr ""
 

-#: lib/userprofile.php:371
-msgctxt "role"
-msgid "Administrator"
+#. 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 ""
 
 msgstr ""
 

-#: lib/userprofile.php:372
-msgctxt "role"
-msgid "Moderator"
+#. TRANS: Authorisation exception thrown when a user a not allowed to login.
+#: lib/util.php:322
+msgid "Not allowed to log in."

 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.

-#: lib/util.php:1306
+#: lib/util.php:1332

 msgid "a few seconds ago"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 msgid "a few seconds ago"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.

-#: lib/util.php:1309
+#: lib/util.php:1335

 msgid "about a minute ago"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 msgid "about a minute ago"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.

-#: lib/util.php:1313
+#: lib/util.php:1339

 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"


@@ -8578,12 +10672,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:1316
+#: lib/util.php:1342

 msgid "about an hour ago"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 msgid "about an hour ago"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.

-#: lib/util.php:1320
+#: lib/util.php:1346

 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"


@@ -8591,12 +10685,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:1323
+#: lib/util.php:1349

 msgid "about a day ago"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 msgid "about a day ago"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.

-#: lib/util.php:1327
+#: lib/util.php:1353

 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"


@@ -8604,12 +10698,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:1330
+#: lib/util.php:1356

 msgid "about a month ago"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 msgid "about a month ago"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.

-#: lib/util.php:1334
+#: lib/util.php:1360

 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"


@@ -8617,44 +10711,24 @@ 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:1337
+#: lib/util.php:1363

 msgid "about a year ago"
 msgstr ""
 
 msgid "about a year ago"
 msgstr ""
 

-#: lib/webcolor.php:80
-#, php-format
-msgid "%s is not a valid color!"
-msgstr ""
-
-#. TRANS: Validation error for a web colour.
-#. TRANS: %s is the provided (invalid) text for colour.
-#: lib/webcolor.php:120
+#. TRANS: Web color exception thrown when a hexadecimal color code does not validate.
+#. TRANS: %s is the provided (invalid) color code.
+#: lib/webcolor.php:81 lib/webcolor.php:121

 #, php-format
 msgid "%s is not a valid color! Use 3 or 6 hex characters."
 msgstr ""
 
 #, php-format
 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.
 #. TRANS: Exception.

-#: lib/xrd.php:64
+#: lib/xrd.php:63

 msgid "Invalid XML."
 msgstr ""
 
 #. TRANS: Exception.
 msgid "Invalid XML."
 msgstr ""
 
 #. TRANS: Exception.

-#: lib/xrd.php:69
+#: lib/xrd.php:68

 msgid "Invalid XML, missing XRD root."
 msgstr ""
 
 msgid "Invalid XML, missing XRD root."
 msgstr ""