Twitter Import + avatar fixes (cleaning up + fixing)

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

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

-"POT-Creation-Date: 2011-07-21 12:19+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"

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


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

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

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


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

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

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

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

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

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

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

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

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


@@ -80,7 +73,7 @@ msgstr ""
 #. TRANS: Checkbox label for prohibiting anonymous users from viewing site.
 #. TRANS: Checkbox label to show private tags.
 #. TRANS: Checkbox field label on group edit form to mark a group private.
 #. TRANS: Checkbox label for prohibiting anonymous users from viewing site.
 #. TRANS: Checkbox label to show private tags.
 #. TRANS: Checkbox field label on group edit form to mark a group private.

-#: actions/accessadminpanel.php:157 actions/peopletagsbyuser.php:185
+#: actions/accessadminpanel.php:157 actions/peopletagsbyuser.php:190

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


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

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

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

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

 msgstr ""
 
 msgstr ""
 

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

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


@@ -131,10 +124,10 @@ msgstr ""
 #. TRANS: Button text to save tags for a profile.
 #: actions/accessadminpanel.php:193 actions/emailsettings.php:251
 #: actions/imsettings.php:201 actions/licenseadminpanel.php:335
 #. TRANS: Button text to save tags for a profile.
 #: actions/accessadminpanel.php:193 actions/emailsettings.php:251
 #: actions/imsettings.php:201 actions/licenseadminpanel.php:335

-#: actions/pathsadminpanel.php:463 actions/profilesettings.php:215
+#: actions/pathsadminpanel.php:454 actions/profilesettings.php:215

 #: actions/sessionsadminpanel.php:202 actions/siteadminpanel.php:373
 #: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:204
 #: actions/sessionsadminpanel.php:202 actions/siteadminpanel.php:373
 #: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:204

-#: actions/snapshotadminpanel.php:252 actions/subscriptions.php:251
+#: actions/snapshotadminpanel.php:252 actions/subscriptions.php:249

 #: actions/tagprofile.php:169 actions/urlsettings.php:152
 #: actions/useradminpanel.php:300 lib/applicationeditform.php:355
 #: lib/groupeditform.php:225 lib/peopletags.php:146
 #: actions/tagprofile.php:169 actions/urlsettings.php:152
 #: actions/useradminpanel.php:300 lib/applicationeditform.php:355
 #: lib/groupeditform.php:225 lib/peopletags.php:146


@@ -163,7 +156,7 @@ msgstr ""
 #: actions/oauthappssettings.php:162 actions/oauthconnectionssettings.php:136
 #: actions/passwordsettings.php:147 actions/peopletagautocomplete.php:67
 #: actions/pluginenable.php:88 actions/profilecompletion.php:81
 #: actions/oauthappssettings.php:162 actions/oauthconnectionssettings.php:136
 #: actions/passwordsettings.php:147 actions/peopletagautocomplete.php:67
 #: actions/pluginenable.php:88 actions/profilecompletion.php:81

-#: actions/profilesettings.php:235 actions/recoverpassword.php:303
+#: actions/profilesettings.php:235 actions/recoverpassword.php:304

 #: actions/register.php:164 actions/removepeopletag.php:79
 #: actions/repeat.php:80 actions/smssettings.php:250 actions/subedit.php:41
 #: actions/subscribe.php:87 actions/subscribepeopletag.php:76
 #: actions/register.php:164 actions/removepeopletag.php:79
 #: actions/repeat.php:80 actions/smssettings.php:250 actions/subedit.php:41
 #: actions/subscribe.php:87 actions/subscribepeopletag.php:76


@@ -178,7 +171,7 @@ msgstr ""
 #: actions/editpeopletag.php:69 actions/favor.php:62 actions/groupblock.php:60
 #: actions/groupunblock.php:60 actions/logout.php:69 actions/makeadmin.php:62
 #: actions/newmessage.php:89 actions/newnotice.php:87 actions/nudge.php:64
 #: actions/editpeopletag.php:69 actions/favor.php:62 actions/groupblock.php:60
 #: actions/groupunblock.php:60 actions/logout.php:69 actions/makeadmin.php:62
 #: actions/newmessage.php:89 actions/newnotice.php:87 actions/nudge.php:64

-#: actions/peopletagautocomplete.php:57 actions/peopletagsbyuser.php:121
+#: actions/peopletagautocomplete.php:57 actions/peopletagsbyuser.php:126

 #: actions/pluginenable.php:99 actions/profilecompletion.php:92
 #: actions/removepeopletag.php:90 actions/subedit.php:33
 #: actions/subscribe.php:98 actions/unsubscribe.php:52
 #: actions/pluginenable.php:99 actions/profilecompletion.php:92
 #: actions/removepeopletag.php:90 actions/subedit.php:33
 #: actions/subscribe.php:98 actions/unsubscribe.php:52


@@ -203,10 +196,10 @@ msgstr ""
 #. TRANS: Client error displayed trying to reference a non-existing list.
 #. TRANS: Client error displayed when referring to a non-existing list.
 #. TRANS: Client error displayed trying to reference a non-existing list.
 #. TRANS: Client error displayed trying to reference a non-existing list.
 #. TRANS: Client error displayed when referring to a non-existing list.
 #. TRANS: Client error displayed trying to reference a non-existing list.

-#: actions/addpeopletag.php:110 actions/editpeopletag.php:109
-#: actions/peopletagged.php:96 actions/peopletagsubscribers.php:96
+#: actions/addpeopletag.php:110 actions/editpeopletag.php:113
+#: actions/peopletagged.php:101 actions/peopletagsubscribers.php:101

 #: actions/profilecompletion.php:101 actions/profiletagbyid.php:67
 #: actions/profilecompletion.php:101 actions/profiletagbyid.php:67

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

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


@@ -236,9 +229,9 @@ msgstr ""
 #. TRANS: Server error when page not found (404).
 #. TRANS: Server error when page not found (404)
 #. TRANS: Server error when page not found (404).
 #. TRANS: Server error when page not found (404).
 #. TRANS: Server error when page not found (404)
 #. TRANS: Server error when page not found (404).

-#: actions/all.php:66 actions/public.php:104 actions/replies.php:96
-#: actions/showfavorites.php:140 actions/showprofiletag.php:100
-#: actions/tag.php:52
+#: actions/all.php:72 actions/public.php:110 actions/replies.php:96
+#: actions/showfavorites.php:140 actions/showprofiletag.php:104
+#: actions/tag.php:54

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


@@ -271,7 +264,6 @@ msgstr ""
 #. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
 #. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a user nickname.
 #. TRANS: Client error displayed when requesting Friends of a Friend feed for an object that is not a user.
 #. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
 #. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a user nickname.
 #. TRANS: Client error displayed when requesting Friends of a Friend feed for an object that is not a user.

-#. TRANS: Client error displayed when trying to get a user hCard for a non-existing user.

 #. TRANS: Client error displayed trying to make a micro summary without providing a valid user.
 #. TRANS: Client error displayed trying to send a direct message to a non-existing user.
 #. TRANS: Client error displayed trying to use "one time password login" without using an existing user.
 #. TRANS: Client error displayed trying to 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.


@@ -289,7 +281,7 @@ msgstr ""
 #. TRANS: Client error displayed when trying to perform a gallery action with an unknown user.
 #. TRANS: Client error displayed when trying to access a mailbox without providing a user.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
 #. TRANS: Client error displayed when trying to perform a gallery action with an unknown user.
 #. TRANS: Client error displayed when trying to access a mailbox without providing a user.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.

-#: actions/all.php:78 actions/allrss.php:69
+#: actions/all.php:84 actions/allrss.php:69

 #: actions/apiaccountupdatedeliverydevice.php:110
 #: actions/apiaccountupdateprofile.php:103
 #: actions/apiaccountupdateprofileimage.php:104 actions/apiatomservice.php:59
 #: actions/apiaccountupdatedeliverydevice.php:110
 #: actions/apiaccountupdateprofile.php:103
 #: actions/apiaccountupdateprofileimage.php:104 actions/apiatomservice.php:59


@@ -305,27 +297,27 @@ msgstr ""
 #: actions/apitimelinefriends.php:173 actions/apitimelinehome.php:78
 #: actions/apitimelinementions.php:77 actions/apitimelineuser.php:79
 #: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
 #: actions/apitimelinefriends.php:173 actions/apitimelinehome.php:78
 #: actions/apitimelinementions.php:77 actions/apitimelineuser.php:79
 #: actions/avatarbynickname.php:79 actions/favoritesrss.php:72

-#: actions/foaf.php:42 actions/foaf.php:61 actions/hcard.php:67
-#: actions/microsummary.php:63 actions/newmessage.php:119 actions/otp.php:78
-#: actions/peopletagged.php:87 actions/peopletagsbyuser.php:97
-#: actions/peopletagsforuser.php:79 actions/peopletagsubscribers.php:87
-#: actions/peopletagsubscriptions.php:81 actions/replies.php:72
-#: actions/repliesrss.php:38 actions/rsd.php:114 actions/showfavorites.php:106
-#: actions/showprofiletag.php:73 actions/showprofiletag.php:112
-#: actions/userbyid.php:75 actions/usergroups.php:95 actions/userrss.php:41
-#: actions/userxrd.php:61 lib/command.php:624 lib/galleryaction.php:61
-#: lib/mailbox.php:79 lib/profileaction.php:77
+#: actions/foaf.php:42 actions/foaf.php:61 actions/microsummary.php:63
+#: actions/newmessage.php:119 actions/otp.php:78 actions/peopletagged.php:92
+#: actions/peopletagsbyuser.php:102 actions/peopletagsforuser.php:84
+#: actions/peopletagsubscribers.php:92 actions/peopletagsubscriptions.php:86
+#: actions/replies.php:72 actions/repliesrss.php:38 actions/rsd.php:114
+#: actions/showfavorites.php:106 actions/showprofiletag.php:77
+#: actions/showprofiletag.php:116 actions/userbyid.php:75
+#: actions/usergroups.php:95 actions/userrss.php:39 actions/userxrd.php:61
+#: lib/command.php:624 lib/galleryaction.php:61 lib/mailbox.php:79
+#: lib/profileaction.php:77

 msgid "No such user."
 msgstr ""
 
 #. TRANS: Title of a user's own start page.
 msgid "No such user."
 msgstr ""
 
 #. TRANS: Title of a user's own start page.

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

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

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

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


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

-#: actions/all.php:110 actions/showprofiletag.php:182
+#: actions/all.php:116 actions/showprofiletag.php:186

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

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

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


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

-#: actions/all.php:127 actions/showprofiletag.php:193
+#: actions/all.php:133 actions/showprofiletag.php:197

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

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

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

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

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


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

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

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


@@ -376,7 +368,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:154
+#: actions/all.php:160

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


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

-#: actions/all.php:159 actions/replies.php:226 actions/showstream.php:225
+#: actions/all.php:165 actions/replies.php:226 actions/showstream.php:241

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


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

-#: actions/all.php:206 actions/public.php:238
+#: actions/all.php:216 actions/public.php:255

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


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

-#. TRANS: Menu item title in settings navigation panel.
-#. TRANS: %s is a username.

 #: actions/allrss.php:110 actions/apitimelinefriends.php:209
 #: actions/apitimelinehome.php:113 lib/adminpanelnav.php:74
 #: actions/allrss.php:110 actions/apitimelinefriends.php:209
 #: actions/apitimelinehome.php:113 lib/adminpanelnav.php:74

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

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


@@ -434,7 +424,7 @@ msgstr ""
 #: actions/apiaccountratelimitstatus.php:70
 #: actions/apiaccountupdatedeliverydevice.php:92
 #: actions/apiaccountupdateprofile.php:94
 #: actions/apiaccountratelimitstatus.php:70
 #: actions/apiaccountupdatedeliverydevice.php:92
 #: actions/apiaccountupdateprofile.php:94

-#: actions/apiaccountverifycredentials.php:68 actions/apiconversation.php:157
+#: actions/apiaccountverifycredentials.php:68 actions/apiconversation.php:156

 #: actions/apidirectmessage.php:157 actions/apifavoritecreate.php:98
 #: actions/apifavoritedestroy.php:98 actions/apifriendshipscreate.php:99
 #: actions/apifriendshipsdestroy.php:99 actions/apifriendshipsshow.php:124
 #: actions/apidirectmessage.php:157 actions/apifavoritecreate.php:98
 #: actions/apifavoritedestroy.php:98 actions/apifriendshipscreate.php:99
 #: actions/apifriendshipsdestroy.php:99 actions/apifriendshipsshow.php:124


@@ -453,11 +443,11 @@ msgstr ""
 #: actions/apistatusesretweets.php:110 actions/apistatusesshow.php:105
 #: actions/apistatusnetconfig.php:139 actions/apistatusnetversion.php:91
 #: actions/apisubscriptions.php:109 actions/apitimelinefavorites.php:182
 #: actions/apistatusesretweets.php:110 actions/apistatusesshow.php:105
 #: actions/apistatusnetconfig.php:139 actions/apistatusnetversion.php:91
 #: actions/apisubscriptions.php:109 actions/apitimelinefavorites.php:182

-#: actions/apitimelinefriends.php:278 actions/apitimelinegroup.php:148
+#: actions/apitimelinefriends.php:277 actions/apitimelinegroup.php:146

 #: actions/apitimelinehome.php:181 actions/apitimelinelist.php:182
 #: actions/apitimelinementions.php:182 actions/apitimelinepublic.php:247
 #: actions/apitimelineretweetedtome.php:150
 #: actions/apitimelinehome.php:181 actions/apitimelinelist.php:182
 #: actions/apitimelinementions.php:182 actions/apitimelinepublic.php:247
 #: actions/apitimelineretweetedtome.php:150

-#: actions/apitimelineretweetsofme.php:149 actions/apitimelinetag.php:165
+#: actions/apitimelineretweetsofme.php:157 actions/apitimelinetag.php:165

 #: actions/apitimelineuser.php:217 actions/apiusershow.php:100
 #: lib/apilistusers.php:149
 msgid "API method not found."
 #: actions/apitimelineuser.php:217 actions/apiusershow.php:100
 #: lib/apilistusers.php:149
 msgid "API method not found."


@@ -509,11 +499,10 @@ msgstr ""
 #: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:85 actions/avatarsettings.php:108
 #: actions/avatarsettings.php:194 actions/foaf.php:69
 #: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:85 actions/avatarsettings.php:108
 #: actions/avatarsettings.php:194 actions/foaf.php:69

-#: actions/grouplogo.php:184 actions/hcard.php:75
-#: actions/peopletagsbyuser.php:105 actions/peopletagsforuser.php:87
-#: actions/peopletagsubscriptions.php:89 actions/replies.php:80
-#: actions/usergroups.php:103 actions/userrss.php:110 lib/galleryaction.php:69
-#: lib/profileaction.php:85
+#: actions/grouplogo.php:184 actions/peopletagsbyuser.php:110
+#: actions/peopletagsforuser.php:92 actions/peopletagsubscriptions.php:94
+#: actions/replies.php:80 actions/usergroups.php:103 actions/userrss.php:108
+#: lib/galleryaction.php:69 lib/profileaction.php:85

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


@@ -550,7 +539,7 @@ msgstr ""
 #. TRANS: Title in atom group notice feed. %s is a group name.
 #. TRANS: Title in atom user notice feed. %s is a user name.
 #: actions/apiatomservice.php:93 actions/grouprss.php:138
 #. TRANS: Title in atom group notice feed. %s is a group name.
 #. TRANS: Title in atom user notice feed. %s is a user name.
 #: actions/apiatomservice.php:93 actions/grouprss.php:138

-#: actions/userrss.php:95 lib/atomgroupnoticefeed.php:63
+#: actions/userrss.php:93 lib/atomgroupnoticefeed.php:63

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


@@ -596,18 +585,20 @@ msgstr ""
 msgid "Unblock user failed."
 msgstr ""
 
 msgid "Unblock user failed."
 msgstr ""
 

-#: actions/apiconversation.php:70
-msgid "no conversation id"
+#. TRANS: Client exception thrown when no conversation ID is given.
+#: actions/apiconversation.php:69
+msgid "No conversation ID."

 msgstr ""
 
 msgstr ""
 

+#. TRANS: Client exception thrown when referring to a non-existing conversation ID (%d).

 #: actions/apiconversation.php:76
 #, php-format
 #: actions/apiconversation.php:76
 #, php-format

-msgid "No conversation with id %d"
+msgid "No conversation with ID %d."

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Timeline title for user and friends. %s is a user nickname.
-#. TRANS: Title for page with a conversion (multiple notices in context).
-#: actions/apiconversation.php:106 actions/conversation.php:113
+#. TRANS: Title for conversion timeline.
+#: actions/apiconversation.php:105
+msgctxt "TITLE"

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


@@ -745,7 +736,7 @@ msgstr ""
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Form validation error displayed when trying to register with an existing nickname.
 #: actions/apigroupcreate.php:156 actions/apigroupprofileupdate.php:257
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Form validation error displayed when trying to register with an existing nickname.
 #: actions/apigroupcreate.php:156 actions/apigroupprofileupdate.php:257

-#: actions/editgroup.php:200 actions/newgroup.php:138
+#: actions/editgroup.php:194 actions/newgroup.php:138

 #: actions/profilesettings.php:293 actions/register.php:210
 msgid "Nickname already in use. Try another one."
 msgstr ""
 #: actions/profilesettings.php:293 actions/register.php:210
 msgid "Nickname already in use. Try another one."
 msgstr ""


@@ -757,7 +748,7 @@ msgstr ""
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Form validation error displayed when trying to register with an invalid nickname.
 #: actions/apigroupcreate.php:164 actions/apigroupprofileupdate.php:262
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Form validation error displayed when trying to register with an invalid nickname.
 #: actions/apigroupcreate.php:164 actions/apigroupprofileupdate.php:262

-#: actions/editgroup.php:204 actions/newgroup.php:142
+#: actions/editgroup.php:198 actions/newgroup.php:142

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


@@ -771,7 +762,7 @@ msgstr ""
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Form validation error displayed when trying to register with an invalid homepage URL.
 #: actions/apigroupcreate.php:181 actions/apigroupprofileupdate.php:281
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Form validation error displayed when trying to register with an invalid homepage URL.
 #: actions/apigroupcreate.php:181 actions/apigroupprofileupdate.php:281

-#: actions/editapplication.php:236 actions/editgroup.php:211
+#: actions/editapplication.php:236 actions/editgroup.php:205

 #: actions/newapplication.php:222 actions/newgroup.php:149
 #: actions/profilesettings.php:268 actions/register.php:222
 msgid "Homepage is not a valid URL."
 #: actions/newapplication.php:222 actions/newgroup.php:149
 #: actions/profilesettings.php:268 actions/register.php:222
 msgid "Homepage is not a valid URL."


@@ -784,7 +775,7 @@ msgstr ""
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Form validation error displayed when trying to register with a too long full name.
 #: actions/apigroupcreate.php:191 actions/apigroupprofileupdate.php:291
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Form validation error displayed when trying to register with a too long full name.
 #: actions/apigroupcreate.php:191 actions/apigroupprofileupdate.php:291

-#: actions/editgroup.php:215 actions/newgroup.php:153
+#: actions/editgroup.php:209 actions/newgroup.php:153

 #: actions/profilesettings.php:272 actions/register.php:226
 msgid "Full name is too long (maximum 255 characters)."
 msgstr ""
 #: actions/profilesettings.php:272 actions/register.php:226
 msgid "Full name is too long (maximum 255 characters)."
 msgstr ""


@@ -803,8 +794,8 @@ msgstr ""
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed characters.
 #: actions/apigroupcreate.php:201 actions/apigroupprofileupdate.php:301
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed characters.
 #: actions/apigroupcreate.php:201 actions/apigroupprofileupdate.php:301

-#: actions/editapplication.php:203 actions/editgroup.php:220
-#: actions/editpeopletag.php:265 actions/newapplication.php:183
+#: actions/editapplication.php:203 actions/editgroup.php:214
+#: actions/editpeopletag.php:269 actions/newapplication.php:183

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


@@ -819,7 +810,7 @@ msgstr[1] ""
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Form validation error displayed when trying to register with a too long location.
 #: actions/apigroupcreate.php:215 actions/apigroupprofileupdate.php:313
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Form validation error displayed when trying to register with a too long location.
 #: actions/apigroupcreate.php:215 actions/apigroupprofileupdate.php:313

-#: actions/editgroup.php:227 actions/newgroup.php:165
+#: actions/editgroup.php:221 actions/newgroup.php:165

 #: actions/profilesettings.php:285 actions/register.php:238
 msgid "Location is too long (maximum 255 characters)."
 msgstr ""
 #: actions/profilesettings.php:285 actions/register.php:238
 msgid "Location is too long (maximum 255 characters)."
 msgstr ""


@@ -833,7 +824,7 @@ msgstr ""
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
 #: actions/apigroupcreate.php:236 actions/apigroupprofileupdate.php:332
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
 #: actions/apigroupcreate.php:236 actions/apigroupprofileupdate.php:332

-#: actions/editgroup.php:240 actions/newgroup.php:178
+#: actions/editgroup.php:234 actions/newgroup.php:178

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


@@ -856,14 +847,14 @@ msgstr ""
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error. %s is the already used alias.
 #: actions/apigroupcreate.php:264 actions/apigroupprofileupdate.php:361
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error. %s is the already used alias.
 #: actions/apigroupcreate.php:264 actions/apigroupprofileupdate.php:361

-#: actions/editgroup.php:255 actions/newgroup.php:194
+#: actions/editgroup.php:249 actions/newgroup.php:194

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

-#: actions/apigroupcreate.php:278 actions/editgroup.php:262
+#: actions/apigroupcreate.php:278 actions/editgroup.php:256

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


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

-#: actions/apigroupjoin.php:133 actions/joingroup.php:136 lib/command.php:359
+#: actions/apigroupjoin.php:133 actions/joingroup.php:140 lib/command.php:359

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


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

-#: actions/apigroupleave.php:124 actions/leavegroup.php:130
+#: actions/apigroupleave.php:124 actions/leavegroup.php:131

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


@@ -949,21 +940,21 @@ msgstr ""
 #. TRANS: Client error displayed trying to edit a group while not being a group admin.
 #. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
 #: actions/apigroupprofileupdate.php:119 actions/editgroup.php:110
 #. TRANS: Client error displayed trying to edit a group while not being a group admin.
 #. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
 #: actions/apigroupprofileupdate.php:119 actions/editgroup.php:110

-#: actions/editgroup.php:176 actions/grouplogo.php:111
+#: actions/editgroup.php:170 actions/grouplogo.php:111

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

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

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

-#: actions/apigroupprofileupdate.php:196 actions/editgroup.php:292
-#: classes/User_group.php:552
+#: actions/apigroupprofileupdate.php:196 actions/editgroup.php:286
+#: classes/User_group.php:624

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


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

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

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


@@ -1518,8 +1509,6 @@ msgstr ""
 #. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
 #. TRANS: Client error displayed when trying to view group members for a non-existing group.
 #. TRANS: Client error displayed when trying to view group members for an object that is not a group.
 #. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
 #. TRANS: Client error displayed when trying to view group members for a non-existing group.
 #. TRANS: Client error displayed when trying to view group members for an object that is not a group.

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

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


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

-#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
-#. TRANS: Client error displayed if no local group with a given name was found requesting group page.

 #. TRANS: Command exception text shown when a group is requested that does not exist.
 #. TRANS: Error text shown when trying to leave a group that does not exist.
 #. TRANS: Command exception text shown when a group is requested that does not exist.
 #. TRANS: Error text shown when trying to leave a group that does not exist.

+#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
+#. TRANS: Client error displayed if no local group with a given name was found requesting group page.

 #: actions/approvegroup.php:82 actions/approvegroup.php:95
 #: actions/atompubshowmembership.php:81 actions/blockedfromgroup.php:81
 #: actions/blockedfromgroup.php:89 actions/cancelgroup.php:81
 #: actions/approvegroup.php:82 actions/approvegroup.php:95
 #: actions/atompubshowmembership.php:81 actions/blockedfromgroup.php:81
 #: actions/blockedfromgroup.php:89 actions/cancelgroup.php:81


@@ -1539,14 +1528,12 @@ msgstr ""
 #: actions/deletegroup.php:100 actions/editgroup.php:102
 #: actions/foafgroup.php:46 actions/foafgroup.php:65 actions/foafgroup.php:73
 #: actions/groupblock.php:90 actions/groupbyid.php:83
 #: actions/deletegroup.php:100 actions/editgroup.php:102
 #: actions/foafgroup.php:46 actions/foafgroup.php:65 actions/foafgroup.php:73
 #: actions/groupblock.php:90 actions/groupbyid.php:83

-#: actions/grouplogo.php:103 actions/groupmembers.php:84
-#: actions/groupmembers.php:92 actions/groupqueue.php:85
+#: actions/grouplogo.php:103 actions/groupqueue.php:85

 #: actions/groupqueue.php:93 actions/grouprss.php:97 actions/grouprss.php:105
 #: actions/groupunblock.php:90 actions/joingroup.php:82
 #: actions/joingroup.php:95 actions/leavegroup.php:82
 #: actions/groupqueue.php:93 actions/grouprss.php:97 actions/grouprss.php:105
 #: actions/groupunblock.php:90 actions/joingroup.php:82
 #: actions/joingroup.php:95 actions/leavegroup.php:82

-#: actions/leavegroup.php:95 actions/makeadmin.php:92
-#: actions/showgroup.php:136 actions/showgroup.php:145 lib/command.php:168
-#: lib/command.php:389
+#: actions/leavegroup.php:95 actions/makeadmin.php:92 lib/command.php:168
+#: lib/command.php:389 lib/groupaction.php:87 lib/groupaction.php:96

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


@@ -1816,9 +1803,8 @@ msgstr ""
 #. TRANS: Client error displayed when requesting a group RSS feed without providing a group nickname.
 #. TRANS: Client error displayed if no nickname argument was given requesting a group page.
 #: actions/avatarbynickname.php:60 actions/blockedfromgroup.php:73
 #. TRANS: Client error displayed when requesting a group RSS feed without providing a group nickname.
 #. TRANS: Client error displayed if no nickname argument was given requesting a group page.
 #: actions/avatarbynickname.php:60 actions/blockedfromgroup.php:73

-#: actions/editgroup.php:85 actions/grouplogo.php:86
-#: actions/groupmembers.php:76 actions/groupqueue.php:77
-#: actions/grouprss.php:89 actions/showgroup.php:118
+#: actions/editgroup.php:85 actions/grouplogo.php:86 actions/groupqueue.php:77
+#: actions/grouprss.php:89 lib/groupaction.php:69

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


@@ -1991,7 +1977,7 @@ msgstr ""
 #. TRANS: Button label on the form to block a user from a group.
 #: actions/block.php:154 actions/deleteapplication.php:158
 #: actions/deletegroup.php:220 actions/deletenotice.php:155
 #. TRANS: Button label on the form to block a user from a group.
 #: actions/block.php:154 actions/deleteapplication.php:158
 #: actions/deletegroup.php:220 actions/deletenotice.php:155

-#: actions/deleteuser.php:154 actions/editpeopletag.php:174
+#: actions/deleteuser.php:154 actions/editpeopletag.php:178

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


@@ -2011,7 +1997,7 @@ msgstr ""
 #. TRANS: Button text to repeat a notice on notice repeat form.
 #: actions/block.php:161 actions/deleteapplication.php:165
 #: actions/deletegroup.php:227 actions/deletenotice.php:162
 #. TRANS: Button text to repeat a notice on notice repeat form.
 #: actions/block.php:161 actions/deleteapplication.php:165
 #: actions/deletegroup.php:227 actions/deletenotice.php:162

-#: actions/deleteuser.php:161 actions/editpeopletag.php:178
+#: actions/deleteuser.php:161 actions/editpeopletag.php:182

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


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

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

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

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

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

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

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


@@ -2073,7 +2059,7 @@ msgstr ""
 #. TRANS: Title for leave group page after leaving.
 #. TRANS: %s$s is the leaving user's name, %2$s is the group name.
 #. TRANS: Title for leave group page after leaving.
 #. TRANS: Title for leave group page after leaving.
 #. TRANS: %s$s is the leaving user's name, %2$s is the group name.
 #. TRANS: Title for leave group page after leaving.

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

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


@@ -2162,15 +2148,20 @@ msgstr ""
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr ""
 
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr ""
 

+#. TRANS: Title for page with a conversion (multiple notices in context).
+#: actions/conversation.php:113
+msgid "Conversation"
+msgstr ""
+

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

-#: actions/conversation.php:146 actions/conversation.php:162
+#: actions/conversation.php:152 actions/conversation.php:168

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

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

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


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

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

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


@@ -2270,7 +2261,7 @@ msgstr ""
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:103 actions/editapplication.php:132
 #: actions/newapplication.php:113 actions/showapplication.php:117
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:103 actions/editapplication.php:132
 #: actions/newapplication.php:113 actions/showapplication.php:117

-#: lib/action.php:1454
+#: lib/action.php:1473

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


@@ -2429,6 +2420,92 @@ msgstr ""
 msgid "No such document \"%s\"."
 msgstr ""
 
 msgid "No such document \"%s\"."
 msgstr ""
 

+#. TRANS: Menu item in administrator navigation panel.
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item in personal group navigation menu.
+#: actions/doc.php:178 lib/adminpanelnav.php:71 lib/defaultlocalnav.php:60
+#: lib/homestubnav.php:55 lib/personalgroupnav.php:74 lib/settingsnav.php:63
+msgctxt "MENU"
+msgid "Home"
+msgstr ""
+
+#: actions/doc.php:181
+msgctxt "MENU"
+msgid "Docs"
+msgstr ""
+
+#. TRANS: Secondary navigation menu item leading to help on StatusNet.
+#: actions/doc.php:195 lib/secondarynav.php:56
+msgctxt "MENU"
+msgid "Help"
+msgstr ""
+
+#: actions/doc.php:196
+msgid "Getting started"
+msgstr ""
+
+#. TRANS: Secondary navigation menu item leading to text about StatusNet site.
+#: actions/doc.php:200 lib/secondarynav.php:59
+msgctxt "MENU"
+msgid "About"
+msgstr ""
+
+#: actions/doc.php:201
+msgid "About this site"
+msgstr ""
+
+#. TRANS: Secondary navigation menu item leading to Frequently Asked Questions.
+#: actions/doc.php:205 lib/secondarynav.php:62
+msgctxt "MENU"
+msgid "FAQ"
+msgstr ""
+
+#: actions/doc.php:206
+msgid "Frequently asked questions"
+msgstr ""
+
+#. TRANS: Secondary navigation menu item leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+#: actions/doc.php:210 lib/secondarynav.php:81
+msgctxt "MENU"
+msgid "Contact"
+msgstr ""
+
+#: actions/doc.php:211
+msgid "Contact info"
+msgstr ""
+
+#: actions/doc.php:215
+msgctxt "MENU"
+msgid "Tags"
+msgstr ""
+
+#: actions/doc.php:216
+msgid "Using tags"
+msgstr ""
+
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item in search group navigation panel.
+#. TRANS: Menu item in local navigation menu.
+#: actions/doc.php:220 lib/defaultlocalnav.php:71 lib/publicgroupnav.php:73
+#: lib/searchgroupnav.php:82 lib/subgroupnav.php:124
+msgctxt "MENU"
+msgid "Groups"
+msgstr ""
+
+#: actions/doc.php:221
+msgid "Using groups"
+msgstr ""
+
+#: actions/doc.php:225
+msgctxt "MENU"
+msgid "API"
+msgstr ""
+
+#: actions/doc.php:226
+msgid "RESTful API"
+msgstr ""
+

 #. TRANS: Title for "Edit application" form.
 #. TRANS: Form legend.
 #: actions/editapplication.php:54 lib/applicationeditform.php:129
 #. TRANS: Title for "Edit application" form.
 #. TRANS: Form legend.
 #: actions/editapplication.php:54 lib/applicationeditform.php:129


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

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

 msgid "Use this form to edit the group."
 msgstr ""
 
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: %s is the invalid alias.
 msgid "Use this form to edit the group."
 msgstr ""
 
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: %s is the invalid alias.

-#: actions/editgroup.php:250 actions/newgroup.php:189
+#: actions/editgroup.php:244 actions/newgroup.php:189

 #, php-format
 msgid "Invalid alias: \"%s\""
 msgstr ""
 
 #. TRANS: Group edit form success message.
 #. TRANS: Edit list form success message.
 #, php-format
 msgid "Invalid alias: \"%s\""
 msgstr ""
 
 #. TRANS: Group edit form success message.
 #. TRANS: Edit list form success message.

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

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


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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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


@@ -2878,8 +2955,8 @@ msgstr ""
 #. TRANS: Page title for first page of favorited notices.
 #. TRANS: Title for favourited notices section.
 #. TRANS: Menu item title in search group navigation panel.
 #. TRANS: Page title for first page of favorited notices.
 #. TRANS: Title for favourited notices section.
 #. TRANS: Menu item title in search group navigation panel.

-#: actions/favorited.php:65 lib/popularnoticesection.php:62
-#: lib/publicgroupnav.php:90
+#: actions/favorited.php:65 lib/popularnoticesection.php:65
+#: lib/publicgroupnav.php:95

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


@@ -2939,7 +3016,7 @@ msgstr ""
 #. TRANS: Title for featured users section.
 #. TRANS: Menu item title in search group navigation panel.
 #: actions/featured.php:69 lib/featureduserssection.php:96
 #. TRANS: Title for featured users section.
 #. TRANS: Menu item title in search group navigation panel.
 #: actions/featured.php:69 lib/featureduserssection.php:96

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

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


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

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

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

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

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

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

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


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

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

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


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

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

 #, php-format
 msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
 msgstr ""
 
 #. TRANS: Exception thrown when there is an unknown error joining a group.
 #, php-format
 msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
 msgstr ""
 
 #. TRANS: Exception thrown when there is an unknown error joining a group.

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

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


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

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

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


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

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

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


@@ -4061,11 +4131,45 @@ msgstr ""
 
 #. TRANS: Server error displayed in oEmbed action when request specifies an unsupported data format.
 #. TRANS: Client error on an API request with an unsupported data format.
 
 #. TRANS: Server error displayed in oEmbed action when request specifies an unsupported data format.
 #. TRANS: Client error on an API request with an unsupported data format.

-#: actions/oembed.php:204 actions/oembed.php:224 lib/apiaction.php:1292
-#: lib/apiaction.php:1319 lib/apiaction.php:1454
+#: actions/oembed.php:204 actions/oembed.php:224 lib/apiaction.php:1293
+#: lib/apiaction.php:1320 lib/apiaction.php:1455

 msgid "Not a supported data format."
 msgstr ""
 
 msgid "Not a supported data format."
 msgstr ""
 

+#. TRANS: Page title for profile settings.
+#: actions/oldschoolsettings.php:58
+msgid "Old school UI settings"
+msgstr ""
+
+#. TRANS: Usage instructions for profile settings.
+#: actions/oldschoolsettings.php:69
+msgid "If you like it \"the old way\", you can set that here."
+msgstr ""
+
+#. TRANS: Confirmation shown when user profile settings are saved.
+#. TRANS: Message after successful saving of administrative settings.
+#: actions/oldschoolsettings.php:124 actions/profilesettings.php:466
+#: lib/adminpanelaction.php:138
+msgid "Settings saved."
+msgstr ""
+
+#: actions/oldschoolsettings.php:161
+msgid "Only stream mode (no conversations) in timelines"
+msgstr ""
+
+#: actions/oldschoolsettings.php:165
+msgid "Show conversation page as hierarchical trees"
+msgstr ""
+
+#: actions/oldschoolsettings.php:169
+msgid "Show nicknames (not full names) in timelines"
+msgstr ""
+
+#. TRANS: Button text to save a list.
+#: actions/oldschoolsettings.php:187 lib/peopletageditform.php:168
+msgid "Save"
+msgstr ""
+

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


@@ -4076,6 +4180,12 @@ msgstr ""
 msgid "Notice Search"
 msgstr ""
 
 msgid "Notice Search"
 msgstr ""
 

+#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
+#. TRANS: Client error displayed when trying to register while already logged in.
+#: actions/otp.php:62 actions/register.php:136
+msgid "Already logged in."
+msgstr ""
+

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


@@ -4198,7 +4308,7 @@ msgstr ""
 #. TRANS: Server error displayed on page where to change password when password change
 #. TRANS: could not be made because of a server error.
 #. TRANS: Reset password form validation error message.
 #. TRANS: Server error displayed on page where to change password when password change
 #. TRANS: could not be made because of a server error.
 #. TRANS: Reset password form validation error message.

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

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


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

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

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

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

 #, php-format
 msgid "Avatar directory not writable: %s."
 msgstr ""
 
 #, php-format
 msgid "Avatar directory not writable: %s."
 msgstr ""
 

-#. TRANS: Client error in Paths admin panel.
-#. TRANS: %s is the background directory that could not be written to.
-#: actions/pathsadminpanel.php:171
-#, php-format
-msgid "Background directory not writable: %s."
-msgstr ""
-

 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the locales directory that could not be read from.
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the locales directory that could not be read from.

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

 #, php-format
 msgid "Locales directory not readable: %s."
 msgstr ""
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the SSL server URL that is too long.
 #, php-format
 msgid "Locales directory not readable: %s."
 msgstr ""
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the SSL server URL that is too long.

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-#: actions/pathsadminpanel.php:302 actions/pathsadminpanel.php:394
-#: actions/pathsadminpanel.php:446
+#: actions/pathsadminpanel.php:293 actions/pathsadminpanel.php:385
+#: actions/pathsadminpanel.php:437

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 msgctxt "LEGEND"
 msgid "SSL"
 msgstr ""
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
 #. TRANS: Option in dropdown for snapshot method in admin panel for snapshots.
 msgctxt "LEGEND"
 msgid "SSL"
 msgstr ""
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
 #. TRANS: Option in dropdown for snapshot method in admin panel for snapshots.

-#: actions/pathsadminpanel.php:428 actions/snapshotadminpanel.php:203
+#: actions/pathsadminpanel.php:419 actions/snapshotadminpanel.php:203

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

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

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

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

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

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

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

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

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

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

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

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

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


@@ -4492,28 +4595,28 @@ msgid ""
 msgstr ""
 
 #. TRANS: Client error displayed when a tagger is expected but not provided.
 msgstr ""
 
 #. TRANS: Client error displayed when a tagger is expected but not provided.

-#: actions/peopletagged.php:79 actions/peopletagsubscribers.php:79
-#: actions/showprofiletag.php:65
+#: actions/peopletagged.php:84 actions/peopletagsubscribers.php:84
+#: actions/showprofiletag.php:69

 msgid "No tagger."
 msgstr ""
 
 #. TRANS: Title for list of people listed by the user.
 #. TRANS: %1$s is a list, %2$s is a username.
 msgid "No tagger."
 msgstr ""
 
 #. TRANS: Title for list of people listed by the user.
 #. TRANS: %1$s is a list, %2$s is a username.

-#: actions/peopletagged.php:108
+#: actions/peopletagged.php:113

 #, php-format
 msgid "People listed in %1$s by %2$s"
 msgstr ""
 
 #. TRANS: Title for list of people listed by the user.
 #. TRANS: %1$s is a list, %2$s is a username, %2$s is a page number.
 #, php-format
 msgid "People listed in %1$s by %2$s"
 msgstr ""
 
 #. TRANS: Title for list of people listed by the user.
 #. TRANS: %1$s is a list, %2$s is a username, %2$s is a page number.

-#: actions/peopletagged.php:113
+#: actions/peopletagged.php:118

 #, php-format
 msgid "People listed in %1$s by %2$s, page %3$d"
 msgstr ""
 
 #. TRANS: Addition in tag membership list for creator of a tag.
 #. TRANS: Addition in tag subscribers list for creator of a tag.
 #, php-format
 msgid "People listed in %1$s by %2$s, page %3$d"
 msgstr ""
 
 #. TRANS: Addition in tag membership list for creator of a tag.
 #. TRANS: Addition in tag subscribers list for creator of a tag.

-#: actions/peopletagged.php:192 actions/peopletagsubscribers.php:192
+#: actions/peopletagged.php:197 actions/peopletagsubscribers.php:197

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


@@ -4547,46 +4650,46 @@ msgid "Lists by %1$s, page %2$d"
 msgstr ""
 
 #. TRANS: Client error displayed when trying view another user's private lists.
 msgstr ""
 
 #. TRANS: Client error displayed when trying view another user's private lists.

-#: actions/peopletagsbyuser.php:128
+#: actions/peopletagsbyuser.php:133

 msgid "You cannot view others' private lists"
 msgstr ""
 
 #. TRANS: Mode selector label.
 msgid "You cannot view others' private lists"
 msgstr ""
 
 #. TRANS: Mode selector label.

-#: actions/peopletagsbyuser.php:154
+#: actions/peopletagsbyuser.php:159

 msgid "Mode"
 msgstr ""
 
 #. TRANS: Link text to show lists for user %s.
 msgid "Mode"
 msgstr ""
 
 #. TRANS: Link text to show lists for user %s.

-#: actions/peopletagsbyuser.php:164
+#: actions/peopletagsbyuser.php:169

 #, php-format
 msgid "Lists for %s"
 msgstr ""
 
 #. TRANS: Fieldset legend.
 #. TRANS: Fieldset legend on gallery action page.
 #, php-format
 msgid "Lists for %s"
 msgstr ""
 
 #. TRANS: Fieldset legend.
 #. TRANS: Fieldset legend on gallery action page.

-#: actions/peopletagsbyuser.php:176 lib/galleryaction.php:138
+#: actions/peopletagsbyuser.php:181 lib/galleryaction.php:138

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

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

 msgid "Show private tags."
 msgstr ""
 
 #. TRANS: Checkbox label to show public tags.
 msgid "Show private tags."
 msgstr ""
 
 #. TRANS: Checkbox label to show public tags.

-#: actions/peopletagsbyuser.php:189
+#: actions/peopletagsbyuser.php:194

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

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

 msgid "Show public tags."
 msgstr ""
 
 #. TRANS: Submit button text for tag filter form.
 #. TRANS: Submit button text on gallery action page.
 msgid "Show public tags."
 msgstr ""
 
 #. TRANS: Submit button text for tag filter form.
 #. TRANS: Submit button text on gallery action page.

-#: actions/peopletagsbyuser.php:194 lib/galleryaction.php:145
+#: actions/peopletagsbyuser.php:199 lib/galleryaction.php:145

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


@@ -4594,20 +4697,20 @@ msgstr ""
 #. TRANS: Message displayed for anonymous users on page that displays lists by a user.
 #. TRANS: This message contains Markdown links in the form [description](links).
 #. TRANS: %s is a tagger nickname.
 #. TRANS: Message displayed for anonymous users on page that displays lists by a user.
 #. TRANS: This message contains Markdown links in the form [description](links).
 #. TRANS: %s is a tagger nickname.

-#: actions/peopletagsbyuser.php:210
+#: actions/peopletagsbyuser.php:215

 #, php-format
 msgid ""
 "These are lists created by **%s**. Lists are how you sort similar people on %"
 "%%%site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
 "blogging) service based on the Free Software [StatusNet](http://status.net/) "
 "tool. You can easily keep track of what they are doing by subscribing to the "
 #, php-format
 msgid ""
 "These are lists created by **%s**. Lists are how you sort similar people on %"
 "%%%site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
 "blogging) service based on the Free Software [StatusNet](http://status.net/) "
 "tool. You can easily keep track of what they are doing by subscribing to the "

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

 msgstr ""
 
 #. TRANS: Message displayed on page that displays lists by a user when there are none.
 #. TRANS: This message contains Markdown links in the form [description](links).
 #. TRANS: %s is a tagger nickname.
 msgstr ""
 
 #. TRANS: Message displayed on page that displays lists by a user when there are none.
 #. TRANS: This message contains Markdown links in the form [description](links).
 #. TRANS: %s is a tagger nickname.

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

 #, php-format
 msgid "%s has not created any [lists](%%%%doc.lists%%%%) yet."
 msgstr ""
 #, php-format
 msgid "%s has not created any [lists](%%%%doc.lists%%%%) yet."
 msgstr ""


@@ -4627,34 +4730,34 @@ msgstr ""
 #. TRANS: Message displayed for anonymous users on page that displays lists for a user.
 #. TRANS: This message contains Markdown links in the form [description](links).
 #. TRANS: %s is a tagger nickname.
 #. TRANS: Message displayed for anonymous users on page that displays lists for a user.
 #. TRANS: This message contains Markdown links in the form [description](links).
 #. TRANS: %s is a tagger nickname.

-#: actions/peopletagsforuser.php:108
+#: actions/peopletagsforuser.php:113

 #, php-format
 msgid ""
 "These are lists for **%s**. lists are how you sort similar people on %%%%"
 "site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
 "blogging) service based on the Free Software [StatusNet](http://status.net/) "
 "tool. You can easily keep track of what they are doing by subscribing to the "
 #, php-format
 msgid ""
 "These are lists for **%s**. lists are how you sort similar people on %%%%"
 "site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
 "blogging) service based on the Free Software [StatusNet](http://status.net/) "
 "tool. You can easily keep track of what they are doing by subscribing to the "

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

 msgstr ""
 
 #. TRANS: Message displayed on page that displays lists a user was added to when there are none.
 #. TRANS: This message contains Markdown links in the form [description](links).
 #. TRANS: %s is a user nickname.
 msgstr ""
 
 #. TRANS: Message displayed on page that displays lists a user was added to when there are none.
 #. TRANS: This message contains Markdown links in the form [description](links).
 #. TRANS: %s is a user nickname.

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

 #, php-format
 msgid "%s has not been [listed](%%%%doc.lists%%%%) by anyone yet."
 msgstr ""
 
 #. TRANS: Page title for list of list subscribers.
 #. TRANS: %1$s is a list, %2$s is a user nickname.
 #, php-format
 msgid "%s has not been [listed](%%%%doc.lists%%%%) by anyone yet."
 msgstr ""
 
 #. TRANS: Page title for list of list subscribers.
 #. TRANS: %1$s is a list, %2$s is a user nickname.

-#: actions/peopletagsubscribers.php:108
+#: actions/peopletagsubscribers.php:113

 #, php-format
 msgid "Subscribers to list %1$s by %2$s"
 msgstr ""
 
 #. TRANS: Page title for list of list subscribers.
 #. TRANS: %1$s is a list, %2$s is a user nickname, %3$d is a page number.
 #, php-format
 msgid "Subscribers to list %1$s by %2$s"
 msgstr ""
 
 #. TRANS: Page title for list of list subscribers.
 #. TRANS: %1$s is a list, %2$s is a user nickname, %3$d is a page number.

-#: actions/peopletagsubscribers.php:113
+#: actions/peopletagsubscribers.php:118

 #, php-format
 msgid "Subscribers to list %1$s by %2$s, page %3$d"
 msgstr ""
 #, php-format
 msgid "Subscribers to list %1$s by %2$s, page %3$d"
 msgstr ""


@@ -4676,7 +4779,7 @@ msgstr ""
 #. TRANS: Message displayed for anonymous users on page that displays lists subscribed to by a user.
 #. TRANS: This message contains Markdown links in the form [description](links).
 #. TRANS: %s is a profile nickname.
 #. TRANS: Message displayed for anonymous users on page that displays lists subscribed to by a user.
 #. TRANS: This message contains Markdown links in the form [description](links).
 #. TRANS: %s is a profile nickname.

-#: actions/peopletagsubscriptions.php:110
+#: actions/peopletagsubscriptions.php:115

 #, php-format
 msgid ""
 "These are lists subscribed to by **%s**. Lists are how you sort similar "
 #, php-format
 msgid ""
 "These are lists subscribed to by **%s**. Lists are how you sort similar "


@@ -4855,7 +4958,10 @@ msgid "Share my current location when posting notices"
 msgstr ""
 
 #. TRANS: Field label in form for profile settings.
 msgstr ""
 
 #. TRANS: Field label in form for profile settings.

+#. TRANS: Title for group tag cloud section.
+#. TRANS: %s is a group name.

 #: actions/profilesettings.php:159 lib/galleryaction.php:118
 #: actions/profilesettings.php:159 lib/galleryaction.php:118

+#: lib/grouptagcloudsection.php:57

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


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

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

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


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

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

 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
 #: actions/profilesettings.php:513 actions/restoreaccount.php:60
 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
 #: actions/profilesettings.php:513 actions/restoreaccount.php:60


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

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

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

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

 #, php-format
 msgid "Public timeline, page %d"
 msgstr ""
 
 #. TRANS: Title for the first public timeline page.
 #. TRANS: Menu item title in search group navigation panel.
 #, php-format
 msgid "Public timeline, page %d"
 msgstr ""
 
 #. TRANS: Title for the first public timeline page.
 #. TRANS: Menu item title in search group navigation panel.

-#: actions/public.php:139 lib/publicgroupnav.php:68
+#: actions/public.php:145 lib/publicgroupnav.php:69

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

-#: actions/public.php:169
-msgid "Public Stream Feed (Activity Streams JSON)"
+#: actions/public.php:180
+msgid "Public Timeline Feed (Activity Streams JSON)"

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

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

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

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

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

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

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

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

 #, php-format
 msgid ""
 "This is the public timeline for %%site.name%% but no one has posted anything "
 #, php-format
 msgid ""
 "This is the public timeline for %%site.name%% but no one has posted anything "


@@ -5034,12 +5134,12 @@ msgid ""
 msgstr ""
 
 #. TRANS: Additional text displayed for public feed when there are no public notices for a logged in user.
 msgstr ""
 
 #. TRANS: Additional text displayed for public feed when there are no public notices for a logged in user.

-#: actions/public.php:192
+#: actions/public.php:203

 msgid "Be the first to post!"
 msgstr ""
 
 #. TRANS: Additional text displayed for public feed when there are no public notices for a not logged in user.
 msgid "Be the first to post!"
 msgstr ""
 
 #. TRANS: Additional text displayed for public feed when there are no public notices for a not logged in user.

-#: actions/public.php:197
+#: actions/public.php:208

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


@@ -5047,7 +5147,7 @@ msgstr ""
 
 #. TRANS: Message for not logged in users at an invite-only site trying to view the public feed of notices.
 #. TRANS: This message contains Markdown links. Please mind the formatting.
 
 #. TRANS: Message for not logged in users at an invite-only site trying to view the public feed of notices.
 #. TRANS: This message contains Markdown links. Please mind the formatting.

-#: actions/public.php:259
+#: actions/public.php:280

 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"


@@ -5058,7 +5158,7 @@ msgstr ""
 
 #. TRANS: Message for not logged in users at a closed site trying to view the public feed of notices.
 #. TRANS: This message contains Markdown links. Please mind the formatting.
 
 #. TRANS: Message for not logged in users at a closed site trying to view the public feed of notices.
 #. TRANS: This message contains Markdown links. Please mind the formatting.

-#: actions/public.php:266
+#: actions/public.php:287

 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"


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

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

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


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

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

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


@@ -5274,28 +5328,28 @@ msgid ""
 msgstr ""
 
 #. TRANS: Client error displayed when trying to reset as password without providing a user.
 msgstr ""
 
 #. TRANS: Client error displayed when trying to reset as password without providing a user.

-#: actions/recoverpassword.php:311
+#: actions/recoverpassword.php:312

 msgid "Unexpected password reset."
 msgstr ""
 
 #. TRANS: Reset password form validation error message.
 msgid "Unexpected password reset."
 msgstr ""
 
 #. TRANS: Reset password form validation error message.

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

 msgid "Password must be 6 characters or more."
 msgstr ""
 
 #. TRANS: Reset password form validation error message.
 msgid "Password must be 6 characters or more."
 msgstr ""
 
 #. TRANS: Reset password form validation error message.

-#: actions/recoverpassword.php:325
+#: actions/recoverpassword.php:326

 msgid "Password and confirmation do not match."
 msgstr ""
 
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
 #. TRANS: Server error displayed when saving fails during user registration.
 msgid "Password and confirmation do not match."
 msgstr ""
 
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
 #. TRANS: Server error displayed when saving fails during user registration.

-#: actions/recoverpassword.php:346 actions/register.php:263
+#: actions/recoverpassword.php:347 actions/register.php:263

 msgid "Error setting user."
 msgstr ""
 
 #. TRANS: Success message for user after password reset.
 msgid "Error setting user."
 msgstr ""
 
 #. TRANS: Success message for user after password reset.

-#: actions/recoverpassword.php:354
+#: actions/recoverpassword.php:355

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


@@ -5484,7 +5538,7 @@ msgstr ""
 
 #. TRANS: Title after repeating a notice.
 #. TRANS: Repeat form status in notice list when a notice has been repeated.
 
 #. TRANS: Title after repeating a notice.
 #. TRANS: Repeat form status in notice list when a notice has been repeated.

-#: actions/repeat.php:102 lib/noticelistitem.php:682
+#: actions/repeat.php:102 lib/noticelistitem.php:703

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


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

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

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


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

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

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

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

 msgid ""
 "Note: HMAC-SHA1 signatures are supported. The plaintext signature method is "
 "not supported."
 msgstr ""
 
 #. TRANS: Text in confirmation dialog to reset consumer key and secret for an OAuth application.
 msgid ""
 "Note: HMAC-SHA1 signatures are supported. The plaintext signature method is "
 "not supported."
 msgstr ""
 
 #. TRANS: Text in confirmation dialog to reset consumer key and secret for an OAuth application.

-#: actions/showapplication.php:293
+#: actions/showapplication.php:296

 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr ""
 
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr ""
 


@@ -5867,96 +5946,53 @@ msgid "This is a way to share what you like."
 msgstr ""
 
 #. TRANS: Page title for first group page. %s is a group name.
 msgstr ""
 
 #. TRANS: Page title for first group page. %s is a group name.

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

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

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

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

-#: actions/showgroup.php:228
+#: actions/showgroup.php:181

 #, php-format
 msgid "Notice feed for %s group (Activity Streams JSON)"
 msgstr ""
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "Notice feed for %s group (Activity Streams JSON)"
 msgstr ""
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.

-#: actions/showgroup.php:234
+#: actions/showgroup.php:187

 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
 msgstr ""
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
 msgstr ""
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.

-#: actions/showgroup.php:241
+#: actions/showgroup.php:194

 #, php-format
 msgid "Notice feed for %s group (RSS 2.0)"
 msgstr ""
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "Notice feed for %s group (RSS 2.0)"
 msgstr ""
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.

-#: actions/showgroup.php:248
+#: actions/showgroup.php:201

 #, php-format
 msgid "Notice feed for %s group (Atom)"
 msgstr ""
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "Notice feed for %s group (Atom)"
 msgstr ""
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.

-#: actions/showgroup.php:254
+#: actions/showgroup.php:207

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

-#. TRANS: Header for mini list of group members on a group page (h2).
-#: actions/showgroup.php:291
-msgid "Members"
-msgstr ""
-
-#. TRANS: Description for mini list of group members on a group page when the group has no members.
-#. TRANS: Content of "Listed" page if there are no listed users.
-#. TRANS: Content of "People following tag x" if there are no subscribed users.
-#. TRANS: Empty list message for tags.
-#. TRANS: Text for user subscription statistics if the user has no subscriptions.
-#. TRANS: Text for user subscriber statistics if user has no subscribers.
-#. TRANS: Text for user user group membership statistics if user is not a member of any group.
-#. TRANS: Default content for section/sidebar widget.
-#: actions/showgroup.php:297 actions/showprofiletag.php:311
-#: actions/showprofiletag.php:349 lib/peopletags.php:166
-#: lib/profileaction.php:140 lib/profileaction.php:172
-#: lib/profileaction.php:270 lib/section.php:117
-msgid "(None)"
-msgstr ""
-
-#. TRANS: Link to all group members from mini list of group members if group has more than n members.
-#: actions/showgroup.php:306
-msgid "All members"
-msgstr ""
-
-#. TRANS: Header for group statistics on a group page (h2).
-#. TRANS: H2 text for user statistics.
-#: actions/showgroup.php:337 lib/profileaction.php:196
-msgid "Statistics"
-msgstr ""
-
-#. TRANS: Label for group creation date.
-#: actions/showgroup.php:342
-msgctxt "LABEL"
-msgid "Created"
-msgstr ""
-
-#. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:347
-msgctxt "LABEL"
-msgid "Members"
-msgstr ""
-

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

-#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. TRANS: %s is the group name, %%%%site.name%%%% is the site name,

 #. TRANS: %%%%action.register%%%% is the URL for registration, %%%%doc.help%%%% is a URL to help.
 #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
 #. TRANS: %%%%action.register%%%% is the URL for registration, %%%%doc.help%%%% is a URL to help.
 #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).

-#: actions/showgroup.php:362
+#: actions/showgroup.php:218

 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."


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

-#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. TRANS: %s is the group name, %%%%site.name%%%% is the site name,

 #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
 #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).

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

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

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

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


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

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

 #, php-format
 msgid "Private timeline for %1$s list by you, page %2$d"
 msgstr ""
 
 #. TRANS: Title for public list timeline where the viewer is the tagger.
 #. TRANS: %1$s is a list, %2$s is a page number.
 #, php-format
 msgid "Private timeline for %1$s list by you, page %2$d"
 msgstr ""
 
 #. TRANS: Title for public list timeline where the viewer is the tagger.
 #. TRANS: %1$s is a list, %2$s is a page number.

-#: actions/showprofiletag.php:133
+#: actions/showprofiletag.php:137

 #, php-format
 msgid "Timeline for %1$s list by you, page %2$d"
 msgstr ""
 
 #. TRANS: Title for private list timeline.
 #. TRANS: %1$s is a list, %2$s is the tagger's nickname, %3$d is a page number.
 #, php-format
 msgid "Timeline for %1$s list by you, page %2$d"
 msgstr ""
 
 #. TRANS: Title for private list timeline.
 #. TRANS: %1$s is a list, %2$s is the tagger's nickname, %3$d is a page number.

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

 #, php-format
 msgid "Timeline for %1$s list by %2$s, page %3$d"
 msgstr ""
 
 #. TRANS: Title for private list timeline.
 #. TRANS: %s is a list.
 #, php-format
 msgid "Timeline for %1$s list by %2$s, page %3$d"
 msgstr ""
 
 #. TRANS: Title for private list timeline.
 #. TRANS: %s is a list.

-#: actions/showprofiletag.php:148
+#: actions/showprofiletag.php:152

 #, php-format
 msgid "Private timeline of %s list by you"
 msgstr ""
 
 #. TRANS: Title for public list timeline where the viewer is the tagger.
 #. TRANS: %s is a list.
 #, php-format
 msgid "Private timeline of %s list by you"
 msgstr ""
 
 #. TRANS: Title for public list timeline where the viewer is the tagger.
 #. TRANS: %s is a list.

-#: actions/showprofiletag.php:156
+#: actions/showprofiletag.php:160

 #, php-format
 msgid "Timeline for %s list by you"
 msgstr ""
 
 #. TRANS: Title for private list timeline.
 #. TRANS: %1$s is a list, %2$s is the tagger's nickname.
 #, php-format
 msgid "Timeline for %s list by you"
 msgstr ""
 
 #. TRANS: Title for private list timeline.
 #. TRANS: %1$s is a list, %2$s is the tagger's nickname.

-#: actions/showprofiletag.php:162
+#: actions/showprofiletag.php:166

 #, php-format
 msgid "Timeline for %1$s list by %2$s"
 msgstr ""
 
 #. TRANS: Feed title.
 #. TRANS: %1$s is a list, %2$s is tagger's nickname.
 #, php-format
 msgid "Timeline for %1$s list by %2$s"
 msgstr ""
 
 #. TRANS: Feed title.
 #. TRANS: %1$s is a list, %2$s is tagger's nickname.

-#: actions/showprofiletag.php:204
+#: actions/showprofiletag.php:208

 #, php-format
 msgid "Feed for %1$s list by %2$s (Atom)"
 msgstr ""
 
 #. TRANS: Empty list message for list timeline.
 #. TRANS: %1$s is a list, %2$s is a tagger's nickname.
 #, php-format
 msgid "Feed for %1$s list by %2$s (Atom)"
 msgstr ""
 
 #. TRANS: Empty list message for list timeline.
 #. TRANS: %1$s is a list, %2$s is a tagger's nickname.

-#: actions/showprofiletag.php:221
+#: actions/showprofiletag.php:225

 #, php-format
 msgid ""
 "This is the timeline for %1$s list by %2$s but no one has posted anything "
 #, php-format
 msgid ""
 "This is the timeline for %1$s list by %2$s but no one has posted anything "


@@ -6077,13 +6107,13 @@ msgid ""
 msgstr ""
 
 #. TRANS: Additional empty list message for list timeline for currently logged in user tagged tags.
 msgstr ""
 
 #. TRANS: Additional empty list message for list timeline for currently logged in user tagged tags.

-#: actions/showprofiletag.php:229
+#: actions/showprofiletag.php:233

 msgid "Try tagging more people."
 msgstr ""
 
 #. TRANS: Additional empty list message for list timeline.
 #. TRANS: This message contains Markdown links in the form [description](link).
 msgid "Try tagging more people."
 msgstr ""
 
 #. TRANS: Additional empty list message for list timeline.
 #. TRANS: This message contains Markdown links in the form [description](link).

-#: actions/showprofiletag.php:234
+#: actions/showprofiletag.php:238

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


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

-#: actions/showprofiletag.php:302
+#. TRANS: Link description for link to list of users tagged with a tag (so part of a list).
+#: actions/showprofiletag.php:306 lib/peopletaglist.php:173

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

+#. TRANS: Content of "Listed" page if there are no listed users.
+#. TRANS: Content of "People following tag x" if there are no subscribed users.
+#. TRANS: Description for mini list of group members on a group page when the group has no members.
+#. TRANS: Empty list message for tags.
+#. TRANS: Text for user subscription statistics if the user has no subscriptions.
+#. TRANS: Text for user subscriber statistics if user has no subscribers.
+#. TRANS: Text for user user group membership statistics if user is not a member of any group.
+#. TRANS: Default content for section/sidebar widget.
+#: actions/showprofiletag.php:315 actions/showprofiletag.php:353
+#: lib/groupaction.php:163 lib/groupaction.php:256 lib/peopletags.php:166
+#: lib/profileaction.php:147 lib/profileaction.php:179
+#: lib/profileaction.php:277 lib/section.php:117
+msgid "(None)"
+msgstr ""
+

 #. TRANS: Link for more "People in list x by a user"
 #. TRANS: if there are more than the mini list's maximum.
 #. TRANS: Link for more "People in list x by a user"
 #. TRANS: if there are more than the mini list's maximum.

-#: actions/showprofiletag.php:323
+#: actions/showprofiletag.php:327

 msgid "Show all"
 msgstr ""
 
 #. TRANS: Header for tag subscribers.
 #. TRANS: Link description for link to list of users subscribed to a tag.
 msgid "Show all"
 msgstr ""
 
 #. TRANS: Header for tag subscribers.
 #. TRANS: Link description for link to list of users subscribed to a tag.

-#: actions/showprofiletag.php:340 lib/peopletaglist.php:183
+#: actions/showprofiletag.php:344 lib/peopletaglist.php:183

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

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

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

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

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

-#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: Page title showing tagged notices in one user's timeline.

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

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

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

-#. TRANS: Extended page title showing tagged notices in one user's stream.
+#. TRANS: Extended page title showing tagged notices in one user's timeline.

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

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

 #, php-format
 msgid "Notices by %1$s, page %2$d"
 msgstr ""
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %1$s is a user nickname, %2$s is a hashtag.
 #, php-format
 msgid "Notices by %1$s, page %2$d"
 msgstr ""
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %1$s is a user nickname, %2$s is a hashtag.

-#: actions/showstream.php:126
+#: actions/showstream.php:142

 #, php-format
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr ""
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
 #, php-format
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr ""
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.

-#: actions/showstream.php:137
+#: actions/showstream.php:153

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

-#: actions/showstream.php:144
+#: actions/showstream.php:160

 #, php-format
 msgid "Notice feed for %s (RSS 1.0)"
 msgstr ""
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
 #, php-format
 msgid "Notice feed for %s (RSS 1.0)"
 msgstr ""
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.

-#: actions/showstream.php:153
+#: actions/showstream.php:169

 #, php-format
 msgid "Notice feed for %s (RSS 2.0)"
 msgstr ""
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
 #, php-format
 msgid "Notice feed for %s (RSS 2.0)"
 msgstr ""
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.

-#: actions/showstream.php:162
+#: actions/showstream.php:178

 #, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr ""
 
 #. TRANS: Title for link to notice feed. FOAF stands for Friend of a Friend.
 #. TRANS: More information at http://www.foaf-project.org. %s is a user nickname.
 #, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr ""
 
 #. TRANS: Title for link to notice feed. FOAF stands for Friend of a Friend.
 #. TRANS: More information at http://www.foaf-project.org. %s is a user nickname.

-#: actions/showstream.php:169
+#: actions/showstream.php:185

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

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

 #, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr ""
 
 #. TRANS: Second sentence of empty list message for a stream for the user themselves.
 #, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr ""
 
 #. TRANS: Second sentence of empty list message for a stream for the user themselves.

-#: actions/showstream.php:215
+#: actions/showstream.php:231

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

-#. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
+#. TRANS: Second sentence of empty  list message for a non-self timeline. %1$s is a user nickname, %2$s is a part of a URL.

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

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

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

-#. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
+#. TRANS: Announcement for anonymous users showing a timeline if site registrations are open.

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

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

 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."


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

-#. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
+#. TRANS: Announcement for anonymous users showing a timeline if site registrations are closed or invite only.

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

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

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

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

 msgstr ""
 
 #. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
 msgstr ""
 
 #. TRANS: Link to the author of a repeated notice. %s is a linked nickname.

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

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


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

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

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


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

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

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


@@ -6675,7 +6715,7 @@ msgstr ""
 
 #. TRANS: Server error displayed when updating a subscription fails with a database error.
 #. TRANS: Exception thrown when a subscription could not be stored on the server.
 
 #. TRANS: Server error displayed when updating a subscription fails with a database error.
 #. TRANS: Exception thrown when a subscription could not be stored on the server.

-#: actions/subedit.php:90 classes/Subscription.php:147
+#: actions/subedit.php:90 classes/Subscription.php:177

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


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

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

 msgstr ""
 
 #. TRANS: Subscription list text when looking at the subscriptions for a of a user other
 #. TRANS: than the logged in user that has no subscriptions. %s is the user nickname.
 #. TRANS: Subscription list text when looking at the subscriptions for a of a user that has none
 #. TRANS: as an anonymous user. %s is the user nickname.
 msgstr ""
 
 #. TRANS: Subscription list text when looking at the subscriptions for a of a user other
 #. TRANS: than the logged in user that has no subscriptions. %s is the user nickname.
 #. TRANS: Subscription list text when looking at the subscriptions for a of a user that has none
 #. TRANS: as an anonymous user. %s is the user nickname.

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

 #, php-format
 msgid "%s is not listening to anyone."
 msgstr ""
 
 #. TRANS: Atom feed title. %s is a profile nickname.
 #, php-format
 msgid "%s is not listening to anyone."
 msgstr ""
 
 #. TRANS: Atom feed title. %s is a profile nickname.

-#: actions/subscriptions.php:166
+#: actions/subscriptions.php:164

 #, php-format
 msgid "Subscription feed for %s (Atom)"
 msgstr ""
 
 #. TRANS: Checkbox label for enabling IM messages for a profile in a subscriptions list.
 #, php-format
 msgid "Subscription feed for %s (Atom)"
 msgstr ""
 
 #. TRANS: Checkbox label for enabling IM messages for a profile in a subscriptions list.

-#: actions/subscriptions.php:231
+#: actions/subscriptions.php:229

 msgctxt "LABEL"
 msgid "IM"
 msgstr ""
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
 msgctxt "LABEL"
 msgid "IM"
 msgstr ""
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.

-#: actions/subscriptions.php:246
+#: actions/subscriptions.php:244

 msgid "SMS"
 msgstr ""
 
 #. TRANS: Title for all but the first page of notices with tags.
 #. TRANS: %1$s is the tag, %2$d is the page number.
 msgid "SMS"
 msgstr ""
 
 #. TRANS: Title for all but the first page of notices with tags.
 #. TRANS: %1$s is the tag, %2$d is the page number.

-#: actions/tag.php:67
+#: actions/tag.php:69

 #, php-format
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr ""
 
 #. TRANS: Link label for feed on "notices with tag" page.
 #. TRANS: %s is the tag the feed is for.
 #, php-format
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr ""
 
 #. TRANS: Link label for feed on "notices with tag" page.
 #. TRANS: %s is the tag the feed is for.

-#: actions/tag.php:88
+#: actions/tag.php:90

 #, php-format
 msgid "Notice feed for tag %s (Activity Streams JSON)"
 msgstr ""
 
 #. TRANS: Link label for feed on "notices with tag" page.
 #. TRANS: %s is the tag the feed is for.
 #, php-format
 msgid "Notice feed for tag %s (Activity Streams JSON)"
 msgstr ""
 
 #. TRANS: Link label for feed on "notices with tag" page.
 #. TRANS: %s is the tag the feed is for.

-#: actions/tag.php:95
+#: actions/tag.php:97

 #, php-format
 msgid "Notice feed for tag %s (RSS 1.0)"
 msgstr ""
 
 #. TRANS: Link label for feed on "notices with tag" page.
 #. TRANS: %s is the tag the feed is for.
 #, php-format
 msgid "Notice feed for tag %s (RSS 1.0)"
 msgstr ""
 
 #. TRANS: Link label for feed on "notices with tag" page.
 #. TRANS: %s is the tag the feed is for.

-#: actions/tag.php:103
+#: actions/tag.php:105

 #, php-format
 msgid "Notice feed for tag %s (RSS 2.0)"
 msgstr ""
 
 #. TRANS: Link label for feed on "notices with tag" page.
 #. TRANS: %s is the tag the feed is for.
 #, php-format
 msgid "Notice feed for tag %s (RSS 2.0)"
 msgstr ""
 
 #. TRANS: Link label for feed on "notices with tag" page.
 #. TRANS: %s is the tag the feed is for.

-#: actions/tag.php:111
+#: actions/tag.php:113

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


@@ -6883,7 +6922,7 @@ msgstr ""
 #. TRANS: Client error displayed when trying to tag a user that cannot be tagged.
 #. TRANS: Client exception thrown trying to set a tag for a user that cannot be tagged.
 #. TRANS: Error displayed when trying to tag a user that cannot be tagged.
 #. TRANS: Client error displayed when trying to tag a user that cannot be tagged.
 #. TRANS: Client exception thrown trying to set a tag for a user that cannot be tagged.
 #. TRANS: Error displayed when trying to tag a user that cannot be tagged.

-#: actions/tagprofile.php:56 classes/Profile_tag.php:147 lib/command.php:440
+#: actions/tagprofile.php:56 classes/Profile_tag.php:171 lib/command.php:440

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


@@ -7140,7 +7179,7 @@ msgstr ""
 msgid "Whether to allow users to invite new users."
 msgstr ""
 
 msgid "Whether to allow users to invite new users."
 msgstr ""
 

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

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


@@ -7176,7 +7215,7 @@ msgstr ""
 #. TRANS: %1$s is a group name, %2$s is a site name.
 #. TRANS: Message is used as a subtitle in atom user notice feed.
 #. TRANS: %1$s is a user name, %2$s is a site name.
 #. TRANS: %1$s is a group name, %2$s is a site name.
 #. TRANS: Message is used as a subtitle in atom user notice feed.
 #. TRANS: %1$s is a user name, %2$s is a site name.

-#: actions/userrss.php:98 lib/atomgroupnoticefeed.php:70
+#: actions/userrss.php:96 lib/atomgroupnoticefeed.php:70

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


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

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

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


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

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

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

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

 msgid ""
 "StatusNet is free software: you can redistribute it and/or modify it under "
 "the terms of the GNU Affero General Public License as published by the Free "
 "Software Foundation, either version 3 of the License, or (at your option) "
 msgid ""
 "StatusNet is free software: you can redistribute it and/or modify it under "
 "the terms of the GNU Affero General Public License as published by the Free "
 "Software Foundation, either version 3 of the License, or (at your option) "

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

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

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

 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
 "FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License "
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
 "FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License "

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

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

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

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


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

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

 msgid "Plugins"
 msgstr ""
 
 #. TRANS: Column header for plugins table on version page.
 msgid "Plugins"
 msgstr ""
 
 #. TRANS: Column header for plugins table on version page.

-#: actions/version.php:202
+#: actions/version.php:203

 msgctxt "HEADER"
 msgid "Name"
 msgstr ""
 
 #. TRANS: Column header for plugins table on version page.
 msgctxt "HEADER"
 msgid "Name"
 msgstr ""
 
 #. TRANS: Column header for plugins table on version page.

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

 msgctxt "HEADER"
 msgid "Version"
 msgstr ""
 
 #. TRANS: Column header for plugins table on version page.
 msgctxt "HEADER"
 msgid "Version"
 msgstr ""
 
 #. TRANS: Column header for plugins table on version page.

-#: actions/version.php:206
+#: actions/version.php:207

 msgctxt "HEADER"
 msgid "Author(s)"
 msgstr ""
 
 #. TRANS: Column header for plugins table on version page.
 msgctxt "HEADER"
 msgid "Author(s)"
 msgstr ""
 
 #. TRANS: Column header for plugins table on version page.

-#: actions/version.php:208
+#: actions/version.php:209

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

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

 msgid "Favor"
 msgstr ""
 
 #. TRANS: Ntofication given when a user marks a notice as favorite.
 #. TRANS: %1$s is a user nickname or full name, %2$s is a notice URI.
 msgid "Favor"
 msgstr ""
 
 #. TRANS: Ntofication given when a user marks a notice as favorite.
 #. TRANS: %1$s is a user nickname or full name, %2$s is a notice URI.

-#: classes/Fave.php:115
+#: classes/Fave.php:143

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

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

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

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

 msgid "Robin thinks something is impossible."
 msgstr ""
 
 msgid "Robin thinks something is impossible."
 msgstr ""
 

+#. TRANS: Message used to be inserted as %2$s in  the text "No file may
+#. TRANS: be larger than %1$d byte and the file you sent was %2$s.".
+#. TRANS: %1$d is the number of bytes of an uploaded file.
+#: classes/File.php:223
+#, php-format
+msgid "%1$d byte"
+msgid_plural "%1$d bytes"
+msgstr[0] ""
+msgstr[1] ""
+

 #. TRANS: Message given if an upload is larger than the configured maximum.
 #. TRANS: Message given if an upload is larger than the configured maximum.

-#. TRANS: %1$d is the byte limit for uploads, %2$d is the byte count for the uploaded file.
-#. TRANS: %1$s is used for plural.
-#: classes/File.php:210
+#. TRANS: %1$d (used for plural) is the byte limit for uploads,
+#. TRANS: %2$s is the proper form of "n bytes". This is the only ways to have
+#. TRANS: gettext support multiple plurals in the same message, unfortunately...
+#: classes/File.php:230

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

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

 msgid_plural ""
 msgid_plural ""

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

 msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Message given if an upload would exceed user quota.
 #. TRANS: %d (number) is the user quota in bytes and is used for plural.
 msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Message given if an upload would exceed user quota.
 #. TRANS: %d (number) is the user quota in bytes and is used for plural.

-#: classes/File.php:223
+#: classes/File.php:243

 #, php-format
 msgid "A file this large would exceed your user quota of %d byte."
 msgid_plural "A file this large would exceed your user quota of %d bytes."
 #, php-format
 msgid "A file this large would exceed your user quota of %d byte."
 msgid_plural "A file this large would exceed your user quota of %d bytes."


@@ -7311,7 +7361,7 @@ msgstr[1] ""
 
 #. TRANS: Message given id an upload would exceed a user's monthly quota.
 #. TRANS: $d (number) is the monthly user quota in bytes and is used for plural.
 
 #. TRANS: Message given id an upload would exceed a user's monthly quota.
 #. TRANS: $d (number) is the monthly user quota in bytes and is used for plural.

-#: classes/File.php:235
+#: classes/File.php:255

 #, php-format
 msgid "A file this large would exceed your monthly quota of %d byte."
 msgid_plural "A file this large would exceed your monthly quota of %d bytes."
 #, php-format
 msgid "A file this large would exceed your monthly quota of %d byte."
 msgid_plural "A file this large would exceed your monthly quota of %d bytes."


@@ -7319,186 +7369,189 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Client exception thrown if a file upload does not have a valid name.
 msgstr[1] ""
 
 #. TRANS: Client exception thrown if a file upload does not have a valid name.

-#: classes/File.php:282 classes/File.php:297
+#: classes/File.php:302 classes/File.php:317

 msgid "Invalid filename."
 msgstr ""
 
 #. TRANS: Exception thrown providing an invalid profile ID.
 #. TRANS: %s is the invalid profile ID.
 msgid "Invalid filename."
 msgstr ""
 
 #. TRANS: Exception thrown providing an invalid profile ID.
 #. TRANS: %s is the invalid profile ID.

-#: classes/Group_join_queue.php:66 classes/Group_member.php:86
+#: classes/Group_join_queue.php:66 classes/Group_member.php:117

 #, php-format
 msgid "Profile ID %s is invalid."
 msgstr ""
 
 #. TRANS: Exception thrown providing an invalid group ID.
 #. TRANS: %s is the invalid group ID.
 #, php-format
 msgid "Profile ID %s is invalid."
 msgstr ""
 
 #. TRANS: Exception thrown providing an invalid group ID.
 #. TRANS: %s is the invalid group ID.

-#: classes/Group_join_queue.php:79 classes/Group_member.php:99
+#: classes/Group_join_queue.php:79 classes/Group_member.php:130

 #, php-format
 msgid "Group ID %s is invalid."
 msgstr ""
 
 #. TRANS: Exception thrown when joining a group fails.
 #, php-format
 msgid "Group ID %s is invalid."
 msgstr ""
 
 #. TRANS: Exception thrown when joining a group fails.

-#: classes/Group_member.php:52
+#: classes/Group_member.php:83

 msgid "Group join failed."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to leave a group the user is not a member of.
 msgid "Group join failed."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to leave a group the user is not a member of.

-#: classes/Group_member.php:65
+#: classes/Group_member.php:96

 msgid "Not part of group."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to leave a group fails.
 msgid "Not part of group."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to leave a group fails.

-#: classes/Group_member.php:73
+#: classes/Group_member.php:104

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

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

 msgid "Join"
 msgstr ""
 
 #. TRANS: Success message for subscribe to group attempt through OStatus.
 #. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
 msgid "Join"
 msgstr ""
 
 #. TRANS: Success message for subscribe to group attempt through OStatus.
 #. TRANS: %1$s is the member name, %2$s is the subscribed group's name.

-#: classes/Group_member.php:152
+#: classes/Group_member.php:180

 #, php-format
 msgid "%1$s has joined group %2$s."
 msgstr ""
 
 #. TRANS: Server exception thrown when updating a local group fails.
 #, php-format
 msgid "%1$s has joined group %2$s."
 msgstr ""
 
 #. TRANS: Server exception thrown when updating a local group fails.

-#: classes/Local_group.php:42
+#: classes/Local_group.php:58

 msgid "Could not update local group."
 msgstr ""
 
 #. TRANS: Exception thrown when trying creating a login token failed.
 #. TRANS: %s is the user nickname for which token creation failed.
 msgid "Could not update local group."
 msgstr ""
 
 #. TRANS: Exception thrown when trying creating a login token failed.
 #. TRANS: %s is the user nickname for which token creation failed.

-#: classes/Login_token.php:78
+#: classes/Login_token.php:81

 #, php-format
 msgid "Could not create login token for %s"
 msgstr ""
 
 #, php-format
 msgid "Could not create login token for %s"
 msgstr ""
 

-#: classes/Memcached_DataObject.php:95
-msgid "Cannot instantiate class "
+#. TRANS: Exception thrown when a program code class (%s) cannot be instantiated.
+#: classes/Memcached_DataObject.php:146 classes/Memcached_DataObject.php:254
+#: classes/Memcached_DataObject.php:311
+#, php-format
+msgid "Cannot instantiate class %s."

 msgstr ""
 
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
 msgstr ""
 
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.

-#: classes/Memcached_DataObject.php:645
+#: classes/Memcached_DataObject.php:846

 msgid "No database name or DSN found anywhere."
 msgstr ""
 
 #. TRANS: Client exception thrown when a user tries to send a direct message while being banned from sending them.
 msgid "No database name or DSN found anywhere."
 msgstr ""
 
 #. TRANS: Client exception thrown when a user tries to send a direct message while being banned from sending them.

-#: classes/Message.php:45
+#: classes/Message.php:78

 msgid "You are banned from sending direct messages."
 msgstr ""
 
 #. TRANS: Message given when a message could not be stored on the server.
 msgid "You are banned from sending direct messages."
 msgstr ""
 
 #. TRANS: Message given when a message could not be stored on the server.

-#: classes/Message.php:69
+#: classes/Message.php:102

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

-#: classes/Message.php:80
+#: classes/Message.php:113

 msgid "Could not update message with new URI."
 msgstr ""
 
 #. TRANS: Server exception thrown when a user profile for a notice cannot be found.
 #. TRANS: %1$d is a profile ID (number), %2$d is a notice ID (number).
 msgid "Could not update message with new URI."
 msgstr ""
 
 #. TRANS: Server exception thrown when a user profile for a notice cannot be found.
 #. TRANS: %1$d is a profile ID (number), %2$d is a notice ID (number).

-#: classes/Notice.php:114
+#: classes/Notice.php:167

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

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

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

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

 msgid "Problem saving notice. Too long."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to save a notice for an unknown user.
 msgid "Problem saving notice. Too long."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to save a notice for an unknown user.

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

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

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

 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 
 #. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 
 #. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.

-#: classes/Notice.php:317
+#: classes/Notice.php:378

 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
 msgstr ""
 
 #. TRANS: Client exception thrown when a user tries to post while being banned.
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
 msgstr ""
 
 #. TRANS: Client exception thrown when a user tries to post while being banned.

-#: classes/Notice.php:325
+#: classes/Notice.php:386

 msgid "You are banned from posting notices on this site."
 msgstr ""
 
 #. TRANS: Client exception thrown in notice when trying to repeat a missing or deleted notice.
 msgid "You are banned from posting notices on this site."
 msgstr ""
 
 #. TRANS: Client exception thrown in notice when trying to repeat a missing or deleted notice.

-#: classes/Notice.php:372
+#: classes/Notice.php:433

 msgid "Cannot repeat; original notice is missing or deleted."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to repeat an own notice.
 msgid "Cannot repeat; original notice is missing or deleted."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to repeat an own notice.

-#: classes/Notice.php:377
+#: classes/Notice.php:438

 msgid "You cannot repeat your own notice."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to repeat a non-public notice.
 msgid "You cannot repeat your own notice."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to repeat a non-public notice.

-#: classes/Notice.php:383
+#: classes/Notice.php:444

 msgid "Cannot repeat a private notice."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to repeat a notice you cannot access.
 msgid "Cannot repeat a private notice."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to repeat a notice you cannot access.

-#: classes/Notice.php:389
+#: classes/Notice.php:450

 msgid "Cannot repeat a notice you cannot read."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to repeat an already repeated notice.
 msgid "Cannot repeat a notice you cannot read."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to repeat an already repeated notice.

-#: classes/Notice.php:394
+#: classes/Notice.php:455

 msgid "You already repeated that notice."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to reply to a notice a the target has no access to.
 #. TRANS: %1$s is a user nickname, %2$d is a notice ID (number).
 msgid "You already repeated that notice."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to reply to a notice a the target has no access to.
 #. TRANS: %1$s is a user nickname, %2$d is a notice ID (number).

-#: classes/Notice.php:406
+#: classes/Notice.php:467

 #, php-format
 msgid "%1$s has no access to notice %2$d."
 msgstr ""
 
 #. TRANS: Server exception thrown when a notice cannot be saved.
 #. TRANS: Server exception thrown when a notice cannot be updated.
 #, php-format
 msgid "%1$s has no access to notice %2$d."
 msgstr ""
 
 #. TRANS: Server exception thrown when a notice cannot be saved.
 #. TRANS: Server exception thrown when a notice cannot be updated.

-#: classes/Notice.php:495 classes/Notice.php:522
+#: classes/Notice.php:567 classes/Notice.php:594

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

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

 msgid "Bad type provided to saveKnownGroups."
 msgstr ""
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
 msgid "Bad type provided to saveKnownGroups."
 msgstr ""
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.

-#: classes/Notice.php:1195
+#: classes/Notice.php:1235

 msgid "Problem saving group inbox."
 msgstr ""
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
 msgid "Problem saving group inbox."
 msgstr ""
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.

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

 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr ""
 
 #. TRANS: Full name of a profile or group (%1$s) followed by nickname (%2$s) in parentheses.
 #. TRANS: Full name of a profile or group followed by nickname in parens
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr ""
 
 #. TRANS: Full name of a profile or group (%1$s) followed by nickname (%2$s) in parentheses.
 #. TRANS: Full name of a profile or group followed by nickname in parens

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

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


@@ -7506,50 +7559,50 @@ msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).

-#: classes/Profile.php:1005
+#: classes/Profile.php:1097

 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).

-#: classes/Profile.php:1014
+#: classes/Profile.php:1106

 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
 
 #. TRANS: Server exception.
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
 
 #. TRANS: Server exception.

-#: classes/Profile_list.php:358
+#: classes/Profile_list.php:395

 msgid "The tag you are trying to rename to already exists."
 msgstr ""
 
 #. TRANS: Server exception saving new tag without having a tagger specified.
 msgid "The tag you are trying to rename to already exists."
 msgstr ""
 
 #. TRANS: Server exception saving new tag without having a tagger specified.

-#: classes/Profile_list.php:593
+#: classes/Profile_list.php:630

 msgid "No tagger specified."
 msgstr ""
 
 #. TRANS: Server exception saving new tag without having a tag specified.
 msgid "No tagger specified."
 msgstr ""
 
 #. TRANS: Server exception saving new tag without having a tag specified.

-#: classes/Profile_list.php:598
+#: classes/Profile_list.php:635

 msgid "No tag specified."
 msgstr ""
 
 #. TRANS: Server exception saving new tag.
 msgid "No tag specified."
 msgstr ""
 
 #. TRANS: Server exception saving new tag.

-#: classes/Profile_list.php:636
+#: classes/Profile_list.php:673

 msgid "Could not create profile tag."
 msgstr ""
 
 #. TRANS: Server exception saving new tag.
 msgid "Could not create profile tag."
 msgstr ""
 
 #. TRANS: Server exception saving new tag.

-#: classes/Profile_list.php:646
+#: classes/Profile_list.php:683

 msgid "Could not set profile tag URI."
 msgstr ""
 
 #. TRANS: Server exception saving new tag.
 msgid "Could not set profile tag URI."
 msgstr ""
 
 #. TRANS: Server exception saving new tag.

-#: classes/Profile_list.php:663
+#: classes/Profile_list.php:700

 msgid "Could not set profile tag mainpage."
 msgstr ""
 
 #. TRANS: Client exception thrown trying to set more tags than allowed.
 msgid "Could not set profile tag mainpage."
 msgstr ""
 
 #. TRANS: Client exception thrown trying to set more tags than allowed.

-#: classes/Profile_tag.php:157
+#: classes/Profile_tag.php:181

 #, php-format
 msgid ""
 "You already have created %d or more tags which is the maximum allowed number "
 #, php-format
 msgid ""
 "You already have created %d or more tags which is the maximum allowed number "


@@ -7557,20 +7610,20 @@ msgid ""
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to add more people than allowed to a list.
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to add more people than allowed to a list.

-#: classes/Profile_tag.php:171
+#: classes/Profile_tag.php:195

 #, php-format
 msgid ""
 "You already have %1$d or more people in list %2$s, which is the maximum "
 #, php-format
 msgid ""
 "You already have %1$d or more people in list %2$s, which is the maximum "

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

 msgstr ""
 
 #. TRANS: Exception thrown when inserting a list subscription in the database fails.
 msgstr ""
 
 #. TRANS: Exception thrown when inserting a list subscription in the database fails.

-#: classes/Profile_tag_subscription.php:54
+#: classes/Profile_tag_subscription.php:77

 msgid "Adding list subscription failed."
 msgstr ""
 
 #. TRANS: Exception thrown when deleting a list subscription from the database fails.
 msgid "Adding list subscription failed."
 msgstr ""
 
 #. TRANS: Exception thrown when deleting a list subscription from the database fails.

-#: classes/Profile_tag_subscription.php:81
+#: classes/Profile_tag_subscription.php:104

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


@@ -7585,102 +7638,102 @@ 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:79
+#: classes/Subscription.php:106

 msgid "You have been banned from subscribing."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to subscribe while already subscribed.
 msgid "You have been banned from subscribing."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to subscribe while already subscribed.

-#: classes/Subscription.php:84
+#: classes/Subscription.php:111

 msgid "Already subscribed!"
 msgstr ""
 
 #. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
 msgid "Already subscribed!"
 msgstr ""
 
 #. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.

-#: classes/Subscription.php:89
+#: classes/Subscription.php:116

 msgid "User has blocked you."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to unsibscribe without a subscription.
 msgid "User has blocked you."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to unsibscribe without a subscription.

-#: classes/Subscription.php:182
+#: classes/Subscription.php:212

 msgid "Not subscribed!"
 msgstr ""
 
 #. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
 msgid "Not subscribed!"
 msgstr ""
 
 #. TRANS: Exception thrown when trying to unsubscribe a user from themselves.

-#: classes/Subscription.php:189
+#: classes/Subscription.php:219

 msgid "Could not delete self-subscription."
 msgstr ""
 
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.
 msgid "Could not delete self-subscription."
 msgstr ""
 
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.

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

 msgid "Could not delete subscription."
 msgstr ""
 
 #. TRANS: Activity title when subscribing to another person.
 msgid "Could not delete subscription."
 msgstr ""
 
 #. TRANS: Activity title when subscribing to another person.

-#: classes/Subscription.php:248
+#: classes/Subscription.php:275

 msgctxt "TITLE"
 msgid "Follow"
 msgstr ""
 
 #. TRANS: Notification given when one person starts following another.
 #. TRANS: %1$s is the subscriber, %2$s is the subscribed.
 msgctxt "TITLE"
 msgid "Follow"
 msgstr ""
 
 #. TRANS: Notification given when one person starts following another.
 #. TRANS: %1$s is the subscriber, %2$s is the subscribed.

-#: classes/Subscription.php:251
+#: classes/Subscription.php:278

 #, php-format
 msgid "%1$s is now following %2$s."
 msgstr ""
 
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
 #, php-format
 msgid "%1$s is now following %2$s."
 msgstr ""
 
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.

-#: classes/User.php:414
+#: classes/User.php:466

 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr ""
 
 #. TRANS: Exception thrown when trying view "repeated to me".
 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr ""
 
 #. TRANS: Exception thrown when trying view "repeated to me".

-#: classes/User.php:813
+#: classes/User.php:865

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

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

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

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

 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Information on password recovery form if no known username or e-mail address was specified.
 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Information on password recovery form if no known username or e-mail address was specified.

-#: classes/User.php:1037
+#: classes/User.php:1089

 msgid "No user with that email address or username."
 msgstr ""
 
 #. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
 msgid "No user with that email address or username."
 msgstr ""
 
 #. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.

-#: classes/User.php:1055
+#: classes/User.php:1107

 msgid "No registered email address for that user."
 msgstr ""
 
 #. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
 msgid "No registered email address for that user."
 msgstr ""
 
 #. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.

-#: classes/User.php:1070
+#: classes/User.php:1122

 msgid "Error saving address confirmation."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
 msgid "Error saving address confirmation."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.

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

 msgid "Could not create group."
 msgstr ""
 
 #. TRANS: Server exception thrown when updating a group URI failed.
 msgid "Could not create group."
 msgstr ""
 
 #. TRANS: Server exception thrown when updating a group URI failed.

-#: classes/User_group.php:544
+#: classes/User_group.php:616

 msgid "Could not set group URI."
 msgstr ""
 
 #. TRANS: Server exception thrown when setting group membership failed.
 msgid "Could not set group URI."
 msgstr ""
 
 #. TRANS: Server exception thrown when setting group membership failed.

-#: classes/User_group.php:567
+#: classes/User_group.php:639

 msgid "Could not set group membership."
 msgstr ""
 
 #. TRANS: Server exception thrown when saving local group information failed.
 msgid "Could not set group membership."
 msgstr ""
 
 #. TRANS: Server exception thrown when saving local group information failed.

-#: classes/User_group.php:584
+#: classes/User_group.php:656

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


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

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

 msgid "Edit profile settings."
 msgstr ""
 
 #. TRANS: Link text for link on user profile.
 msgid "Edit profile settings."
 msgstr ""
 
 #. TRANS: Link text for link on user profile.

-#: lib/accountprofileblock.php:153
+#: lib/accountprofileblock.php:150 lib/groupprofileblock.php:122

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

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

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

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

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

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

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

-#: lib/accountprofileblock.php:263
+#: lib/accountprofileblock.php:260

 msgid "User role"
 msgstr ""
 
 #. TRANS: Role that can be set for a user profile.
 msgid "User role"
 msgstr ""
 
 #. TRANS: Role that can be set for a user profile.

-#: lib/accountprofileblock.php:266
+#: lib/accountprofileblock.php:263

 msgctxt "role"
 msgid "Administrator"
 msgstr ""
 
 #. TRANS: Role that can be set for a user profile.
 msgctxt "role"
 msgid "Administrator"
 msgstr ""
 
 #. TRANS: Role that can be set for a user profile.

-#: lib/accountprofileblock.php:268
+#: lib/accountprofileblock.php:265

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

-#. TRANS: Link text for link that will subscribe to a remote profile.
-#. TRANS: Button text to subscribe to a user.
-#. TRANS: Button text for subscribing to a list.
-#: lib/accountprofileblock.php:308 lib/subscribeform.php:130
-#: lib/subscribepeopletagform.php:106
-msgctxt "BUTTON"
-msgid "Subscribe"
-msgstr ""
-

 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #: lib/action.php:168
 #, php-format
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #: lib/action.php:168
 #, php-format


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

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

 msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr ""
 
 #. TRANS: Inline reply form submit button: submits a reply comment.
 msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr ""
 
 #. TRANS: Inline reply form submit button: submits a reply comment.

-#: lib/action.php:355
+#: lib/action.php:366

 msgctxt "BUTTON"
 msgid "Reply"
 msgstr ""
 
 #. TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form.
 #. TRANS: Field label for reply mini form.
 msgctxt "BUTTON"
 msgid "Reply"
 msgstr ""
 
 #. TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form.
 #. TRANS: Field label for reply mini form.

-#: lib/action.php:358 lib/threadednoticelist.php:396
+#: lib/action.php:369 lib/threadednoticelist.php:412

 msgid "Write a reply..."
 msgstr ""
 
 #. TRANS: Tab on the notice form.
 msgid "Write a reply..."
 msgstr ""
 
 #. TRANS: Tab on the notice form.

-#: lib/action.php:608
+#: lib/action.php:627

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


@@ -7808,7 +7852,7 @@ msgstr ""
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby

-#: lib/action.php:984
+#: lib/action.php:1003

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


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

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

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


@@ -7825,7 +7869,7 @@ msgstr ""
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.

-#: lib/action.php:994
+#: lib/action.php:1013

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


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

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

 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.

-#: lib/action.php:1019
+#: lib/action.php:1038

 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.

-#: lib/action.php:1023
+#: lib/action.php:1042

 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.

-#: lib/action.php:1055
+#: lib/action.php:1074

 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.

-#: lib/action.php:1408
+#: lib/action.php:1427

 msgid "After"
 msgstr ""
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
 msgid "After"
 msgstr ""
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.

-#: lib/action.php:1418
+#: lib/action.php:1437

 msgid "Before"
 msgstr ""
 
 msgid "Before"
 msgstr ""
 


@@ -7985,22 +8029,11 @@ msgid "saveSettings() not implemented."
 msgstr ""
 
 #. TRANS: Header in administrator navigation panel.
 msgstr ""
 
 #. TRANS: Header in administrator navigation panel.

-#. TRANS: Header in settings navigation panel.
-#: lib/adminpanelnav.php:66 lib/settingsnav.php:66
+#: lib/adminpanelnav.php:66

 msgctxt "HEADER"
 msgid "Home"
 msgstr ""
 
 msgctxt "HEADER"
 msgid "Home"
 msgstr ""
 

-#. TRANS: Menu item in administrator navigation panel.
-#. TRANS: Menu item in default local navigation panel.
-#. TRANS: Menu item in personal group navigation menu.
-#. TRANS: Menu item in settings navigation panel.
-#: lib/adminpanelnav.php:71 lib/defaultlocalnav.php:60
-#: lib/personalgroupnav.php:74 lib/settingsnav.php:71
-msgctxt "MENU"
-msgid "Home"
-msgstr ""
-

 #. TRANS: Header in administrator navigation panel.
 #: lib/adminpanelnav.php:84
 msgctxt "HEADER"
 #. TRANS: Header in administrator navigation panel.
 #: lib/adminpanelnav.php:84
 msgctxt "HEADER"


@@ -8237,13 +8270,12 @@ msgstr ""
 
 #. TRANS: Submit button title.
 #: lib/applicationeditform.php:353
 
 #. TRANS: Submit button title.
 #: lib/applicationeditform.php:353

-msgid "Cancel"
+msgid "Cancel application changes."

 msgstr ""
 
 #. TRANS: Submit button title.
 msgstr ""
 
 #. TRANS: Submit button title.

-#. TRANS: Button text to save a list.
-#: lib/applicationeditform.php:357 lib/peopletageditform.php:168
-msgid "Save"
+#: lib/applicationeditform.php:357
+msgid "Save application changes."

 msgstr ""
 
 #. TRANS: Name for an anonymous application in application list.
 msgstr ""
 
 #. TRANS: Name for an anonymous application in application list.


@@ -8324,7 +8356,7 @@ msgid "Updates from %1$s's list %2$s on %3$s!"
 msgstr ""
 
 #. TRANS: Title.
 msgstr ""
 
 #. TRANS: Title.

-#: lib/attachmentnoticesection.php:67
+#: lib/attachmentnoticesection.php:68

 msgid "Notices where this attachment appears"
 msgstr ""
 
 msgid "Notices where this attachment appears"
 msgstr ""
 


@@ -8483,7 +8515,7 @@ msgstr[1] ""
 
 #. TRANS: Separator for list of tags.
 #. TRANS: Separator in list of user names like "Jim, Bob, Mary".
 
 #. TRANS: Separator for list of tags.
 #. TRANS: Separator in list of user names like "Jim, Bob, Mary".

-#: lib/command.php:481 lib/command.php:534 lib/threadednoticelist.php:456
+#: lib/command.php:481 lib/command.php:534 lib/threadednoticelist.php:472

 msgid ", "
 msgstr ""
 
 msgid ", "
 msgstr ""
 


@@ -8528,7 +8560,7 @@ msgstr ""
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in notification e-mail.
 #. TRANS: %s is a location.
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in notification e-mail.
 #. TRANS: %s is a location.

-#: lib/command.php:561 lib/mail.php:338
+#: lib/command.php:561 lib/mail.php:345

 #, php-format
 msgid "Location: %s"
 msgstr ""
 #, php-format
 msgid "Location: %s"
 msgstr ""


@@ -8536,7 +8568,7 @@ msgstr ""
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in notification e-mail.
 #. TRANS: %s is a homepage.
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in notification e-mail.
 #. TRANS: %s is a homepage.

-#: lib/command.php:565 lib/mail.php:343
+#: lib/command.php:565 lib/mail.php:350

 #, php-format
 msgid "Homepage: %s"
 msgstr ""
 #, php-format
 msgid "Homepage: %s"
 msgstr ""


@@ -8560,7 +8592,7 @@ msgstr ""
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
 #. TRANS: Message given when a status is too long. %1$s is the maximum number of characters,
 #. TRANS: %2$s is the number of characters sent (used for plural).
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
 #. TRANS: Message given when a status is too long. %1$s is the maximum number of characters,
 #. TRANS: %2$s is the number of characters sent (used for plural).

-#: lib/command.php:615 lib/implugin.php:492
+#: lib/command.php:615 lib/implugin.php:491

 #, php-format
 msgid "Message too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
 #, php-format
 msgid "Message too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."


@@ -8943,6 +8975,12 @@ msgstr ""
 msgid "Go to the installer."
 msgstr ""
 
 msgid "Go to the installer."
 msgstr ""
 

+#. TRANS: Header on conversation page. Hidden by default (h2).
+#. TRANS: Label for user statistics.
+#: lib/conversationtree.php:64 lib/profileaction.php:223
+msgid "Notices"
+msgstr ""
+

 #. TRANS: Page title for when a database error occurs.
 #: lib/dberroraction.php:60
 msgid "Database error"
 #. TRANS: Page title for when a database error occurs.
 #: lib/dberroraction.php:60
 msgid "Database error"


@@ -8950,20 +8988,11 @@ msgstr ""
 
 #. TRANS: Menu item in default local navigation panel.
 #. TRANS: Menu item in search group navigation panel.
 
 #. TRANS: Menu item in default local navigation panel.
 #. TRANS: Menu item in search group navigation panel.

-#: lib/defaultlocalnav.php:65 lib/publicgroupnav.php:66
+#: lib/defaultlocalnav.php:65 lib/publicgroupnav.php:67

 msgctxt "MENU"
 msgid "Public"
 msgstr ""
 
 msgctxt "MENU"
 msgid "Public"
 msgstr ""
 

-#. TRANS: Menu item in default local navigation panel.
-#. TRANS: Menu item in search group navigation panel.
-#. TRANS: Menu item in local navigation menu.
-#: lib/defaultlocalnav.php:71 lib/publicgroupnav.php:71
-#: lib/searchgroupnav.php:82 lib/subgroupnav.php:124
-msgctxt "MENU"
-msgid "Groups"
-msgstr ""
-

 #. TRANS: Menu item in default local navigation panel.
 #. TRANS: Menu item title in local navigation menu.
 #: lib/defaultlocalnav.php:79 lib/subgroupnav.php:135
 #. TRANS: Menu item in default local navigation panel.
 #. TRANS: Menu item title in local navigation menu.
 #: lib/defaultlocalnav.php:79 lib/subgroupnav.php:135


@@ -8973,7 +9002,7 @@ msgstr ""
 
 #. TRANS: Title of form for deleting a user.
 #. TRANS: Link text in notice list item to delete a notice.
 
 #. TRANS: Title of form for deleting a user.
 #. TRANS: Link text in notice list item to delete a notice.

-#: lib/deleteuserform.php:64 lib/noticelistitem.php:659
+#: lib/deleteuserform.php:64 lib/noticelistitem.php:680

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


@@ -8989,8 +9018,7 @@ msgid "Unable to find services for %s."
 msgstr ""
 
 #. TRANS: Form legend for removing the favourite status for a favourite notice.
 msgstr ""
 
 #. TRANS: Form legend for removing the favourite status for a favourite notice.

-#. TRANS: Title for button text for removing the favourite status for a favourite notice.
-#: lib/disfavorform.php:108 lib/disfavorform.php:140
+#: lib/disfavorform.php:108

 msgid "Disfavor this notice"
 msgstr ""
 
 msgid "Disfavor this notice"
 msgstr ""
 


@@ -9000,9 +9028,13 @@ msgctxt "BUTTON"
 msgid "Disfavor favorite"
 msgstr ""
 
 msgid "Disfavor favorite"
 msgstr ""
 

+#. TRANS: Button title for removing the favourite status for a favourite notice.
+#: lib/disfavorform.php:140
+msgid "Remove this notice from your list of favorite notices."
+msgstr ""
+

 #. TRANS: Form legend for adding the favourite status to a notice.
 #. TRANS: Form legend for adding the favourite status to a notice.

-#. TRANS: Title for button text for adding the favourite status to a notice.
-#: lib/favorform.php:108 lib/favorform.php:139
+#: lib/favorform.php:108

 msgid "Favor this notice"
 msgstr ""
 
 msgid "Favor this notice"
 msgstr ""
 


@@ -9012,6 +9044,11 @@ msgctxt "BUTTON"
 msgid "Favor"
 msgstr ""
 
 msgid "Favor"
 msgstr ""
 

+#. TRANS: Button title for adding the favourite status to a notice.
+#: lib/favorform.php:139
+msgid "Add this notice to your list of favorite notices."
+msgstr ""
+

 #. TRANS: Feed type name.
 #: lib/feed.php:88
 msgid "RSS 1.0"
 #. TRANS: Feed type name.
 #: lib/feed.php:88
 msgid "RSS 1.0"


@@ -9075,6 +9112,32 @@ msgstr ""
 msgid "Grant this user the \"%s\" role"
 msgstr ""
 
 msgid "Grant this user the \"%s\" role"
 msgstr ""
 

+#. TRANS: Header for mini list of group members on a group page (h2).
+#: lib/groupaction.php:151
+msgid "Members"
+msgstr ""
+
+#. TRANS: Link to all group members from mini list of group members if group has more than n members.
+#: lib/groupaction.php:172 lib/groupaction.php:265
+msgid "All members"
+msgstr ""
+
+#. TRANS: Header for mini list of users with a pending membership request on a group page (h2).
+#: lib/groupaction.php:209
+msgid "Pending"
+msgstr ""
+
+#. TRANS: Header for mini list of users that are blocked in a group page (h2).
+#: lib/groupaction.php:244
+msgid "Blocked"
+msgstr ""
+
+#. TRANS: Title for list of group administrators on a group page.
+#: lib/groupaction.php:316
+msgctxt "TITLE"
+msgid "Admins"
+msgstr ""
+

 #. TRANS: Button text for the form that will block a user from a group.
 #: lib/groupblockform.php:124
 msgctxt "BUTTON"
 #. TRANS: Button text for the form that will block a user from a group.
 #: lib/groupblockform.php:124
 msgctxt "BUTTON"


@@ -9084,7 +9147,7 @@ msgstr ""
 #. TRANS: Submit button title.
 #: lib/groupblockform.php:128
 msgctxt "TOOLTIP"
 #. TRANS: Submit button title.
 #: lib/groupblockform.php:128
 msgctxt "TOOLTIP"

-msgid "Block this user"
+msgid "Block this user so that they can no longer post messages to it."

 msgstr ""
 
 #. TRANS: Field title on group edit form.
 msgstr ""
 
 #. TRANS: Field title on group edit form.


@@ -9142,98 +9205,31 @@ msgctxt "GROUPADMIN"
 msgid "Admin"
 msgstr ""
 
 msgid "Admin"
 msgstr ""
 

-#. TRANS: Menu item in the group navigation page.
-#: lib/groupnav.php:81
-msgctxt "MENU"
-msgid "Group"
-msgstr ""
-
-#. TRANS: Tooltip for menu item in the group navigation page.
-#. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:84
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s group"
-msgstr ""
-
-#. TRANS: Menu item in the group navigation page.
-#: lib/groupnav.php:90
-msgctxt "MENU"
-msgid "Members"
-msgstr ""
-
-#. TRANS: Tooltip for menu item in the group navigation page.
-#. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:93
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s group members"
-msgstr ""
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %d is the number of pending members.
-#: lib/groupnav.php:106
-#, php-format
-msgctxt "MENU"
-msgid "Pending members (%d)"
-msgid_plural "Pending members (%d)"
-msgstr[0] ""
-msgstr[1] ""
-
-#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:109
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s pending members"
-msgstr ""
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:116
-msgctxt "MENU"
-msgid "Blocked"
-msgstr ""
-
-#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:119
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s blocked users"
-msgstr ""
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: Menu item in primary navigation panel.
-#: lib/groupnav.php:125 lib/primarynav.php:66
-msgctxt "MENU"
-msgid "Admin"
+#. TRANS: Group actions header (h2). Text hidden by default.
+#: lib/groupprofileblock.php:93
+msgid "Group actions"

 msgstr ""
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
 msgstr ""
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.

-#: lib/groupnav.php:128
+#: lib/groupprofileblock.php:120

 #, php-format
 msgctxt "TOOLTIP"
 msgid "Edit %s group properties"
 msgstr ""
 
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Edit %s group properties"
 msgstr ""
 

-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:134
-msgctxt "MENU"
-msgid "Logo"
-msgstr ""
-

 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.

-#: lib/groupnav.php:137
+#: lib/groupprofileblock.php:129

 #, php-format
 msgctxt "TOOLTIP"
 msgid "Add or edit %s logo"
 msgstr ""
 
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Add or edit %s logo"
 msgstr ""
 

-#. TRANS: Group actions header (h2). Text hidden by default.
-#: lib/groupprofileblock.php:94
-msgid "Group actions"
+#. TRANS: Link text for link on user profile.
+#: lib/groupprofileblock.php:131
+msgctxt "MENU"
+msgid "Logo"

 msgstr ""
 
 #. TRANS: Title for groups with the most members section.
 msgstr ""
 
 #. TRANS: Title for groups with the most members section.


@@ -9246,19 +9242,21 @@ msgstr ""
 msgid "Active groups"
 msgstr ""
 
 msgid "Active groups"
 msgstr ""
 

-#: lib/groupsnav.php:87 lib/listsnav.php:87
+#. TRANS: Link description for seeing all groups.
+#. TRANS: Link description for seeing all lists.
+#: lib/groupsnav.php:89 lib/listsnav.php:88

 msgid "See all"
 msgstr ""
 
 msgid "See all"
 msgstr ""
 

-#: lib/groupsnav.php:88
-msgid "See all groups you belong to"
+#. TRANS: Link title for seeing all groups.
+#: lib/groupsnav.php:91
+msgid "See all groups you belong to."

 msgstr ""
 
 msgstr ""
 

-#. TRANS: Title for group tag cloud section.
-#. TRANS: %s is a group name.
-#: lib/grouptagcloudsection.php:57
-#, php-format
-msgid "Tags in %s group's notices"
+#. TRANS: Menu item title in personal group navigation menu.
+#. TRANS: %s is a username.
+#: lib/homestubnav.php:58
+msgid "Back to top"

 msgstr ""
 
 #. TRANS: Client exception 406
 msgstr ""
 
 #. TRANS: Client exception 406


@@ -9326,7 +9324,7 @@ msgstr[1] ""
 #. TRANS: Body text for confirmation code e-mail.
 #. TRANS: %1$s is a user nickname, %2$s is the StatusNet sitename,
 #. TRANS: %3$s is the display name of an IM plugin.
 #. TRANS: Body text for confirmation code e-mail.
 #. TRANS: %1$s is a user nickname, %2$s is the StatusNet sitename,
 #. TRANS: %3$s is the display name of an IM plugin.

-#: lib/implugin.php:265
+#: lib/implugin.php:264

 #, php-format
 msgid ""
 "User \"%1$s\" on %2$s has said that your %3$s screenname belongs to them. If "
 #, php-format
 msgid ""
 "User \"%1$s\" on %2$s has said that your %3$s screenname belongs to them. If "


@@ -9338,18 +9336,18 @@ msgstr ""
 
 #. TRANS: Exception thrown when trying to deliver a notice to an unknown inbox.
 #. TRANS: %d is the unknown inbox ID (number).
 
 #. TRANS: Exception thrown when trying to deliver a notice to an unknown inbox.
 #. TRANS: %d is the unknown inbox ID (number).

-#: lib/implugin.php:353
+#: lib/implugin.php:352

 #, php-format
 msgid "Unknown inbox source %d."
 msgstr ""
 
 #. TRANS: Server exception thrown trying to initialise an IM plugin without meeting all prerequisites.
 #, php-format
 msgid "Unknown inbox source %d."
 msgstr ""
 
 #. TRANS: Server exception thrown trying to initialise an IM plugin without meeting all prerequisites.

-#: lib/implugin.php:629
+#: lib/implugin.php:633

 msgid "Queueing must be enabled to use IM plugins."
 msgstr ""
 
 #. TRANS: Server exception thrown trying to initialise an IM plugin without a transport method.
 msgid "Queueing must be enabled to use IM plugins."
 msgstr ""
 
 #. TRANS: Server exception thrown trying to initialise an IM plugin without a transport method.

-#: lib/implugin.php:634
+#: lib/implugin.php:638

 msgid "Transport cannot be null."
 msgstr ""
 
 msgid "Transport cannot be null."
 msgstr ""
 


@@ -9414,8 +9412,9 @@ msgctxt "BUTTON"
 msgid "Leave"
 msgstr ""
 
 msgid "Leave"
 msgstr ""
 

-#: lib/listsnav.php:88
-msgid "See all lists you have created"
+#. TRANS: Link title for seeing all lists.
+#: lib/listsnav.php:90
+msgid "See all lists you have created."

 msgstr ""
 
 #. TRANS: Menu item for logging in to the StatusNet site.
 msgstr ""
 
 #. TRANS: Menu item for logging in to the StatusNet site.


@@ -9442,14 +9441,14 @@ msgid "Sign up for a new account"
 msgstr ""
 
 #. TRANS: Subject for address confirmation email.
 msgstr ""
 
 #. TRANS: Subject for address confirmation email.

-#: lib/mail.php:172
+#: lib/mail.php:179

 msgid "Email address confirmation"
 msgstr ""
 
 #. TRANS: Body for address confirmation email.
 #. TRANS: %1$s is the addressed user's nickname, %2$s is the StatusNet sitename,
 #. TRANS: %3$s is the URL to confirm at.
 msgid "Email address confirmation"
 msgstr ""
 
 #. TRANS: Body for address confirmation email.
 #. TRANS: %1$s is the addressed user's nickname, %2$s is the StatusNet sitename,
 #. TRANS: %3$s is the URL to confirm at.

-#: lib/mail.php:177
+#: lib/mail.php:184

 #, php-format
 msgid ""
 "Hey, %1$s.\n"
 #, php-format
 msgid ""
 "Hey, %1$s.\n"


@@ -9470,21 +9469,21 @@ msgstr ""
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
 #. TRANS: Main body of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the StatusNet sitename.
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
 #. TRANS: Main body of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the StatusNet sitename.

-#: lib/mail.php:243 lib/mail.php:249
+#: lib/mail.php:250 lib/mail.php:256

 #, php-format
 msgid "%1$s is now following you on %2$s."
 msgstr ""
 
 #. TRANS: Subject of pending new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
 #, php-format
 msgid "%1$s is now following you on %2$s."
 msgstr ""
 
 #. TRANS: Subject of pending new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.

-#: lib/mail.php:283
+#: lib/mail.php:290

 #, php-format
 msgid "%1$s would like to listen to your notices on %2$s."
 msgstr ""
 
 #. TRANS: Main body of pending new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the StatusNet sitename.
 #, php-format
 msgid "%1$s would like to listen to your notices on %2$s."
 msgstr ""
 
 #. TRANS: Main body of pending new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the StatusNet sitename.

-#: lib/mail.php:290
+#: lib/mail.php:297

 #, php-format
 msgid ""
 "%1$s would like to listen to your notices on %2$s. You may approve or reject "
 #, php-format
 msgid ""
 "%1$s would like to listen to your notices on %2$s. You may approve or reject "


@@ -9494,7 +9493,7 @@ msgstr ""
 #. TRANS: Common footer block for StatusNet notification emails.
 #. TRANS: %1$s is the StatusNet sitename,
 #. TRANS: %2$s is a link to the addressed user's e-mail settings.
 #. TRANS: Common footer block for StatusNet notification emails.
 #. TRANS: %1$s is the StatusNet sitename,
 #. TRANS: %2$s is a link to the addressed user's e-mail settings.

-#: lib/mail.php:309
+#: lib/mail.php:316

 #, php-format
 msgid ""
 "Faithfully yours,\n"
 #, php-format
 msgid ""
 "Faithfully yours,\n"


@@ -9506,21 +9505,21 @@ msgstr ""
 
 #. TRANS: Profile info line in notification e-mail.
 #. TRANS: %s is a URL.
 
 #. TRANS: Profile info line in notification e-mail.
 #. TRANS: %s is a URL.

-#: lib/mail.php:334
+#: lib/mail.php:341

 #, php-format
 msgid "Profile: %s"
 msgstr ""
 
 #. TRANS: Profile info line in notification e-mail.
 #. TRANS: %s is biographical information.
 #, php-format
 msgid "Profile: %s"
 msgstr ""
 
 #. TRANS: Profile info line in notification e-mail.
 #. TRANS: %s is biographical information.

-#: lib/mail.php:348
+#: lib/mail.php:355

 #, php-format
 msgid "Bio: %s"
 msgstr ""
 
 #. TRANS: This is a paragraph in a new-subscriber e-mail.
 #. TRANS: %s is a URL where the subscriber can be reported as abusive.
 #, php-format
 msgid "Bio: %s"
 msgstr ""
 
 #. TRANS: This is a paragraph in a new-subscriber e-mail.
 #. TRANS: %s is a URL where the subscriber can be reported as abusive.

-#: lib/mail.php:358
+#: lib/mail.php:365

 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "


@@ -9529,7 +9528,7 @@ msgstr ""
 
 #. TRANS: Subject of notification mail for new posting email address.
 #. TRANS: %s is the StatusNet sitename.
 
 #. TRANS: Subject of notification mail for new posting email address.
 #. TRANS: %s is the StatusNet sitename.

-#: lib/mail.php:386
+#: lib/mail.php:393

 #, php-format
 msgid "New email address for posting to %s"
 msgstr ""
 #, php-format
 msgid "New email address for posting to %s"
 msgstr ""


@@ -9537,7 +9536,7 @@ msgstr ""
 #. TRANS: Body of notification mail for new posting email address.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is the e-mail address to send
 #. TRANS: to to post by e-mail, %3$s is a URL to more instructions.
 #. TRANS: Body of notification mail for new posting email address.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is the e-mail address to send
 #. TRANS: to to post by e-mail, %3$s is a URL to more instructions.

-#: lib/mail.php:392
+#: lib/mail.php:399

 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"


@@ -9549,26 +9548,26 @@ msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.

-#: lib/mail.php:516
+#: lib/mail.php:523

 #, php-format
 msgid "%s status"
 msgstr ""
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
 #, php-format
 msgid "%s status"
 msgstr ""
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.

-#: lib/mail.php:542
+#: lib/mail.php:549

 msgid "SMS confirmation"
 msgstr ""
 
 #. TRANS: Main body heading for SMS-by-email address confirmation message.
 #. TRANS: %s is the addressed user's nickname.
 msgid "SMS confirmation"
 msgstr ""
 
 #. TRANS: Main body heading for SMS-by-email address confirmation message.
 #. TRANS: %s is the addressed user's nickname.

-#: lib/mail.php:546
+#: lib/mail.php:553

 #, php-format
 msgid "%s: confirm you own this phone number with this code:"
 msgstr ""
 
 #. TRANS: Subject for 'nudge' notification email.
 #. TRANS: %s is the nudging user.
 #, php-format
 msgid "%s: confirm you own this phone number with this code:"
 msgstr ""
 
 #. TRANS: Subject for 'nudge' notification email.
 #. TRANS: %s is the nudging user.

-#: lib/mail.php:567
+#: lib/mail.php:574

 #, php-format
 msgid "You have been nudged by %s"
 msgstr ""
 #, php-format
 msgid "You have been nudged by %s"
 msgstr ""


@@ -9576,7 +9575,7 @@ msgstr ""
 #. TRANS: Body for 'nudge' notification email.
 #. TRANS: %1$s is the nuding user's long name, $2$s is the nudging user's nickname,
 #. TRANS: %3$s is a URL to post notices at.
 #. TRANS: Body for 'nudge' notification email.
 #. TRANS: %1$s is the nuding user's long name, $2$s is the nudging user's nickname,
 #. TRANS: %3$s is a URL to post notices at.

-#: lib/mail.php:574
+#: lib/mail.php:581

 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "


@@ -9591,7 +9590,7 @@ msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.

-#: lib/mail.php:619
+#: lib/mail.php:626

 #, php-format
 msgid "New private message from %s"
 msgstr ""
 #, php-format
 msgid "New private message from %s"
 msgstr ""


@@ -9599,7 +9598,7 @@ msgstr ""
 #. TRANS: Body for direct-message notification email.
 #. TRANS: %1$s is the sending user's long name, %2$s is the sending user's nickname,
 #. TRANS: %3$s is the message content, %4$s a URL to the message,
 #. TRANS: Body for direct-message notification email.
 #. TRANS: %1$s is the sending user's long name, %2$s is the sending user's nickname,
 #. TRANS: %3$s is the message content, %4$s a URL to the message,

-#: lib/mail.php:626
+#: lib/mail.php:633

 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"


@@ -9617,7 +9616,7 @@ msgstr ""
 
 #. TRANS: Subject for favorite notification e-mail.
 #. TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.
 
 #. TRANS: Subject for favorite notification e-mail.
 #. TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.

-#: lib/mail.php:676
+#: lib/mail.php:683

 #, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
 msgstr ""
 #, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
 msgstr ""


@@ -9627,7 +9626,7 @@ msgstr ""
 #. TRANS: %3$s is a URL to the faved notice, %4$s is the faved notice text,
 #. TRANS: %5$s is a URL to all faves of the adding user, %6$s is the StatusNet sitename,
 #. TRANS: %7$s is the adding user's nickname.
 #. TRANS: %3$s is a URL to the faved notice, %4$s is the faved notice text,
 #. TRANS: %5$s is a URL to all faves of the adding user, %6$s is the StatusNet sitename,
 #. TRANS: %7$s is the adding user's nickname.

-#: lib/mail.php:683
+#: lib/mail.php:690

 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"


@@ -9646,7 +9645,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
 msgstr ""
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.

-#: lib/mail.php:740
+#: lib/mail.php:747

 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"


@@ -9656,7 +9655,7 @@ msgstr ""
 
 #. TRANS: E-mail subject for notice notification.
 #. TRANS: %1$s is the sending user's long name, %2$s is the adding user's nickname.
 
 #. TRANS: E-mail subject for notice notification.
 #. TRANS: %1$s is the sending user's long name, %2$s is the adding user's nickname.

-#: lib/mail.php:748
+#: lib/mail.php:755

 #, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
 msgstr ""
 #, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
 msgstr ""


@@ -9664,9 +9663,9 @@ msgstr ""
 #. TRANS: Body of @-reply notification e-mail.
 #. TRANS: %1$s is the sending user's name, $2$s is the StatusNet sitename,
 #. TRANS: %3$s is a URL to the notice, %4$s is the notice text,
 #. TRANS: Body of @-reply notification e-mail.
 #. TRANS: %1$s is the sending user's name, $2$s is the StatusNet sitename,
 #. TRANS: %3$s is a URL to the notice, %4$s is the notice text,

-#. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
+#. TRANS: %5$s is the text "The full conversation can be read here:" and a URL to the full conversion if it exists (otherwise empty),

 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replies for the addressed user,
 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replies for the addressed user,

-#: lib/mail.php:755
+#: lib/mail.php:762

 #, php-format
 msgid ""
 "%1$s just sent a notice to your attention (an '@-reply') on %2$s.\n"
 #, php-format
 msgid ""
 "%1$s just sent a notice to your attention (an '@-reply') on %2$s.\n"


@@ -9690,18 +9689,23 @@ msgstr ""
 
 #. TRANS: Subject of group join notification e-mail.
 #. TRANS: %1$s is the joining user's nickname, %2$s is the group name, and %3$s is the StatusNet sitename.
 
 #. TRANS: Subject of group join notification e-mail.
 #. TRANS: %1$s is the joining user's nickname, %2$s is the group name, and %3$s is the StatusNet sitename.

+#: lib/mail.php:833
+#, php-format
+msgid "%1$s has joined your group %2$s on %3$s"
+msgstr ""
+

 #. TRANS: Main body of group join notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the group name, and %3$s is the StatusNet sitename,
 #. TRANS: %4$s is a block of profile info about the subscriber.
 #. TRANS: %5$s is a link to the addressed user's e-mail settings.
 #. TRANS: Main body of group join notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the group name, and %3$s is the StatusNet sitename,
 #. TRANS: %4$s is a block of profile info about the subscriber.
 #. TRANS: %5$s is a link to the addressed user's e-mail settings.

-#: lib/mail.php:826 lib/mail.php:836
+#: lib/mail.php:843

 #, php-format
 msgid "%1$s has joined your group %2$s on %3$s."
 msgstr ""
 
 #. TRANS: Subject of pending group join request notification e-mail.
 #. TRANS: %1$s is the joining user's nickname, %2$s is the group name, and %3$s is the StatusNet sitename.
 #, php-format
 msgid "%1$s has joined your group %2$s on %3$s."
 msgstr ""
 
 #. TRANS: Subject of pending group join request notification e-mail.
 #. TRANS: %1$s is the joining user's nickname, %2$s is the group name, and %3$s is the StatusNet sitename.

-#: lib/mail.php:873
+#: lib/mail.php:880

 #, php-format
 msgid "%1$s wants to join your group %2$s on %3$s."
 msgstr ""
 #, php-format
 msgid "%1$s wants to join your group %2$s on %3$s."
 msgstr ""


@@ -9709,7 +9713,7 @@ msgstr ""
 #. TRANS: Main body of pending group join request notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the group name, and %3$s is the StatusNet sitename,
 #. TRANS: %4$s is the URL to the moderation queue page.
 #. TRANS: Main body of pending group join request notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the group name, and %3$s is the StatusNet sitename,
 #. TRANS: %4$s is the URL to the moderation queue page.

-#: lib/mail.php:881
+#: lib/mail.php:888

 #, php-format
 msgid ""
 "%1$s would like to join your group %2$s on %3$s. You may approve or reject "
 #, php-format
 msgid ""
 "%1$s would like to join your group %2$s on %3$s. You may approve or reject "


@@ -9791,7 +9795,7 @@ msgstr ""
 #. TRANS: Submit button title.
 #: lib/makeadminform.php:124
 msgctxt "TOOLTIP"
 #. TRANS: Submit button title.
 #: lib/makeadminform.php:124
 msgctxt "TOOLTIP"

-msgid "Make this user an admin"
+msgid "Make this user an admin."

 msgstr ""
 
 #. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
 msgstr ""
 
 #. TRANS: Client exception thrown when a database error was thrown during a file upload operation.


@@ -9868,12 +9872,12 @@ msgstr ""
 
 #. TRANS: Followed by notice source (usually the client used to send the notice).
 #. TRANS: Followed by notice source.
 
 #. TRANS: Followed by notice source (usually the client used to send the notice).
 #. TRANS: Followed by notice source.

-#: lib/messagelistitem.php:123 lib/noticelistitem.php:506
+#: lib/messagelistitem.php:123 lib/noticelistitem.php:526

 msgid "from"
 msgstr ""
 
 #. TRANS: A possible notice source (web interface).
 msgid "from"
 msgstr ""
 
 #. TRANS: A possible notice source (web interface).

-#: lib/messagelistitem.php:144 lib/noticelistitem.php:501
+#: lib/messagelistitem.php:144 lib/noticelistitem.php:521

 msgctxt "SOURCE"
 msgid "web"
 msgstr ""
 msgctxt "SOURCE"
 msgid "web"
 msgstr ""


@@ -9903,31 +9907,32 @@ msgid "api"
 msgstr ""
 
 #. TRANS: Client exception thrown when no author for an activity was found.
 msgstr ""
 
 #. TRANS: Client exception thrown when no author for an activity was found.

-#: lib/microappplugin.php:357
+#: lib/microappplugin.php:358

 msgid "Cannot get author for activity."
 msgstr ""
 
 #. TRANS: Client exception thrown when ...
 msgid "Cannot get author for activity."
 msgstr ""
 
 #. TRANS: Client exception thrown when ...

-#: lib/microappplugin.php:395
+#: lib/microappplugin.php:396

 msgid "Bookmark not posted to this group."
 msgstr ""
 
 #. TRANS: Client exception when ...
 msgid "Bookmark not posted to this group."
 msgstr ""
 
 #. TRANS: Client exception when ...

-#: lib/microappplugin.php:409
+#: lib/microappplugin.php:410

 msgid "Object not posted to this user."
 msgstr ""
 
 #. TRANS: Server exception thrown when a micro app plugin uses a target that cannot be handled.
 msgid "Object not posted to this user."
 msgstr ""
 
 #. TRANS: Server exception thrown when a micro app plugin uses a target that cannot be handled.

-#: lib/microappplugin.php:413
+#: lib/microappplugin.php:414

 msgid "Do not know how to handle this kind of target."
 msgstr ""
 
 #. TRANS: Server exception thrown when a micro app plugin developer has not done his job too well.
 msgid "Do not know how to handle this kind of target."
 msgstr ""
 
 #. TRANS: Server exception thrown when a micro app plugin developer has not done his job too well.

-#: lib/microappplugin.php:555
+#: lib/microappplugin.php:556

 msgid "You must implement either adaptNoticeListItem() or showNotice()."
 msgstr ""
 
 msgid "You must implement either adaptNoticeListItem() or showNotice()."
 msgstr ""
 

-#: lib/moremenu.php:96
+#. TRANS: Link description to show more items in a list.
+#: lib/moremenu.php:98

 msgid "More ▼"
 msgstr ""
 
 msgid "More ▼"
 msgstr ""
 


@@ -9983,28 +9988,28 @@ msgid ""
 msgstr ""
 
 #. TRANS: Separator in profile addressees list.
 msgstr ""
 
 #. TRANS: Separator in profile addressees list.

-#: lib/noticelistitem.php:243
+#: lib/noticelistitem.php:255

 msgctxt "SEPARATOR"
 msgid ", "
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of north.
 msgctxt "SEPARATOR"
 msgid ", "
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of north.

-#: lib/noticelistitem.php:429
+#: lib/noticelistitem.php:449

 msgid "N"
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of south.
 msgid "N"
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of south.

-#: lib/noticelistitem.php:431
+#: lib/noticelistitem.php:451

 msgid "S"
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of east.
 msgid "S"
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of east.

-#: lib/noticelistitem.php:433
+#: lib/noticelistitem.php:453

 msgid "E"
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of west.
 msgid "E"
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of west.

-#: lib/noticelistitem.php:435
+#: lib/noticelistitem.php:455

 msgid "W"
 msgstr ""
 
 msgid "W"
 msgstr ""
 


@@ -10013,43 +10018,43 @@ msgstr ""
 #. TRANS: %3$s is lattitude seconds, %4$s is N (north) or S (south) depending on lattitude,
 #. TRANS: %5$s is longitude degrees, %6$s is longitude minutes,
 #. TRANS: %7$s is longitude seconds, %8$s is E (east) or W (west) depending on longitude,
 #. TRANS: %3$s is lattitude seconds, %4$s is N (north) or S (south) depending on lattitude,
 #. TRANS: %5$s is longitude degrees, %6$s is longitude minutes,
 #. TRANS: %7$s is longitude seconds, %8$s is E (east) or W (west) depending on longitude,

-#: lib/noticelistitem.php:442
+#: lib/noticelistitem.php:462

 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr ""
 
 #. TRANS: Followed by geo location.
 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr ""
 
 #. TRANS: Followed by geo location.

-#: lib/noticelistitem.php:452
+#: lib/noticelistitem.php:472

 msgid "at"
 msgstr ""
 
 #. TRANS: Addition in notice list item if notice is part of a conversation.
 msgid "at"
 msgstr ""
 
 #. TRANS: Addition in notice list item if notice is part of a conversation.

-#: lib/noticelistitem.php:567
+#: lib/noticelistitem.php:587

 msgid "in context"
 msgstr ""
 
 #. TRANS: Addition in notice list item if notice was repeated. Followed by a span with a nickname.
 msgid "in context"
 msgstr ""
 
 #. TRANS: Addition in notice list item if notice was repeated. Followed by a span with a nickname.

-#: lib/noticelistitem.php:602
+#: lib/noticelistitem.php:622

 msgid "Repeated by"
 msgstr ""
 
 #. TRANS: Link title in notice list item to reply to a notice.
 msgid "Repeated by"
 msgstr ""
 
 #. TRANS: Link title in notice list item to reply to a notice.

-#: lib/noticelistitem.php:629
-msgid "Reply to this notice"
+#: lib/noticelistitem.php:650
+msgid "Reply to this notice."

 msgstr ""
 
 #. TRANS: Link text in notice list item to reply to a notice.
 msgstr ""
 
 #. TRANS: Link text in notice list item to reply to a notice.

-#: lib/noticelistitem.php:631
+#: lib/noticelistitem.php:652

 msgid "Reply"
 msgstr ""
 
 #. TRANS: Link title in notice list item to delete a notice.
 msgid "Reply"
 msgstr ""
 
 #. TRANS: Link title in notice list item to delete a notice.

-#: lib/noticelistitem.php:657
-msgid "Delete this notice"
+#: lib/noticelistitem.php:678
+msgid "Delete this notice from the timeline."

 msgstr ""
 
 #. TRANS: Title for repeat form status in notice list when a notice has been repeated.
 msgstr ""
 
 #. TRANS: Title for repeat form status in notice list when a notice has been repeated.

-#: lib/noticelistitem.php:680
+#: lib/noticelistitem.php:701

 msgid "Notice repeated."
 msgstr ""
 
 msgid "Notice repeated."
 msgstr ""
 


@@ -10121,56 +10126,51 @@ msgid "Search"
 msgstr ""
 
 #. TRANS: Menu item in list navigation panel.
 msgstr ""
 
 #. TRANS: Menu item in list navigation panel.

-#: lib/peopletaggroupnav.php:107
+#: lib/peopletaggroupnav.php:113

 msgctxt "MENU"
 msgid "List"
 msgstr ""
 
 #. TRANS: Menu item title in list navigation panel.
 #. TRANS: %1$s is a list, %2$s is a nickname.
 msgctxt "MENU"
 msgid "List"
 msgstr ""
 
 #. TRANS: Menu item title in list navigation panel.
 #. TRANS: %1$s is a list, %2$s is a nickname.

-#: lib/peopletaggroupnav.php:110 lib/peopletaggroupnav.php:121
+#: lib/peopletaggroupnav.php:116 lib/peopletaggroupnav.php:127

 #, php-format
 msgid "%1$s list by %2$s."
 msgstr ""
 
 #. TRANS: Menu item in list navigation panel.
 #, php-format
 msgid "%1$s list by %2$s."
 msgstr ""
 
 #. TRANS: Menu item in list navigation panel.

-#: lib/peopletaggroupnav.php:118
+#: lib/peopletaggroupnav.php:124

 msgctxt "MENU"
 msgid "Listed"
 msgstr ""
 
 #. TRANS: Menu item in list navigation panel.
 #. TRANS: Menu item in local navigation menu.
 msgctxt "MENU"
 msgid "Listed"
 msgstr ""
 
 #. TRANS: Menu item in list navigation panel.
 #. TRANS: Menu item in local navigation menu.

-#: lib/peopletaggroupnav.php:129 lib/subgroupnav.php:96
+#: lib/peopletaggroupnav.php:135 lib/subgroupnav.php:96

 msgctxt "MENU"
 msgid "Subscribers"
 msgstr ""
 
 #. TRANS: Menu item title in list navigation panel.
 #. TRANS: %1$s is a list, %2$s is a nickname.
 msgctxt "MENU"
 msgid "Subscribers"
 msgstr ""
 
 #. TRANS: Menu item title in list navigation panel.
 #. TRANS: %1$s is a list, %2$s is a nickname.

-#: lib/peopletaggroupnav.php:132
+#: lib/peopletaggroupnav.php:138

 #, php-format
 msgid "Subscribers to %1$s list by %2$s."
 msgstr ""
 
 #. TRANS: Menu item in list navigation panel.
 #, php-format
 msgid "Subscribers to %1$s list by %2$s."
 msgstr ""
 
 #. TRANS: Menu item in list navigation panel.

-#: lib/peopletaggroupnav.php:142
+#: lib/peopletaggroupnav.php:148

 msgctxt "MENU"
 msgid "Edit"
 msgstr ""
 
 #. TRANS: Menu item title in list navigation panel.
 #. TRANS: %s is a list.
 msgctxt "MENU"
 msgid "Edit"
 msgstr ""
 
 #. TRANS: Menu item title in list navigation panel.
 #. TRANS: %s is a list.

-#: lib/peopletaggroupnav.php:145
+#: lib/peopletaggroupnav.php:151

 #, php-format
 msgid "Edit %s list by you."
 msgstr ""
 
 #, php-format
 msgid "Edit %s list by you."
 msgstr ""
 

-#. TRANS: Link description for link to list of users tagged with a tag.
-#: lib/peopletaglist.php:173
-msgid "Tagged"
-msgstr ""
-

 #. TRANS: Title for link to edit list settings.
 #: lib/peopletaglist.php:196
 msgid "Edit list settings."
 #. TRANS: Title for link to edit list settings.
 #: lib/peopletaglist.php:196
 msgid "Edit list settings."


@@ -10284,7 +10284,7 @@ msgstr ""
 #. TRANS: Menu item in personal group navigation menu.
 #. TRANS: Menu item in settings navigation panel.
 #. TRANS: Menu item in local navigation menu.
 #. TRANS: Menu item in personal group navigation menu.
 #. TRANS: Menu item in settings navigation panel.
 #. TRANS: Menu item in local navigation menu.

-#: lib/personalgroupnav.php:82 lib/settingsnav.php:89 lib/subgroupnav.php:77
+#: lib/personalgroupnav.php:82 lib/settingsnav.php:74 lib/subgroupnav.php:77

 msgctxt "MENU"
 msgid "Profile"
 msgstr ""
 msgctxt "MENU"
 msgid "Profile"
 msgstr ""


@@ -10358,6 +10358,12 @@ msgstr ""
 msgid "Change your personal settings."
 msgstr ""
 
 msgid "Change your personal settings."
 msgstr ""
 

+#. TRANS: Menu item in primary navigation panel.
+#: lib/primarynav.php:66
+msgctxt "MENU"
+msgid "Admin"
+msgstr ""
+

 #. TRANS: Menu item title in primary navigation panel.
 #: lib/primarynav.php:68
 msgid "Site configuration."
 #. TRANS: Menu item title in primary navigation panel.
 #: lib/primarynav.php:68
 msgid "Site configuration."


@@ -10379,55 +10385,48 @@ msgstr ""
 msgid "Login to the site."
 msgstr ""
 
 msgid "Login to the site."
 msgstr ""
 

-#. TRANS: Menu item in primary navigation panel.
-#: lib/primarynav.php:92
-msgctxt "MENU"
-msgid "Search"
-msgstr ""
-
-#. TRANS: Menu item title in primary navigation panel.
-#: lib/primarynav.php:94
-msgid "Search the site."
+#: lib/profileaction.php:93
+msgid "This profile has been silenced by site moderators"

 msgstr ""
 
 #. TRANS: H2 text for user subscription statistics.
 msgstr ""
 
 #. TRANS: H2 text for user subscription statistics.

-#: lib/profileaction.php:128
+#: lib/profileaction.php:135

 msgid "Following"
 msgstr ""
 
 #. TRANS: H2 text for user subscriber statistics.
 msgid "Following"
 msgstr ""
 
 #. TRANS: H2 text for user subscriber statistics.

-#: lib/profileaction.php:160
+#: lib/profileaction.php:167

 msgid "Followers"
 msgstr ""
 
 msgid "Followers"
 msgstr ""
 

-#. TRANS: Label for user statistics.
-#: lib/profileaction.php:204
-msgid "User ID"
+#. TRANS: H2 text for user statistics.
+#: lib/profileaction.php:203
+msgid "Statistics"

 msgstr ""
 
 #. TRANS: Label for user statistics.
 msgstr ""
 
 #. TRANS: Label for user statistics.

-#: lib/profileaction.php:210
-msgid "Member since"
+#: lib/profileaction.php:211
+msgid "User ID"

 msgstr ""
 
 #. TRANS: Label for user statistics.
 msgstr ""
 
 #. TRANS: Label for user statistics.

-#: lib/profileaction.php:216
-msgid "Notices"
+#: lib/profileaction.php:217
+msgid "Member since"

 msgstr ""
 
 #. TRANS: Label for user statistics.
 #. TRANS: Average count of posts made per day since account registration.
 msgstr ""
 
 #. TRANS: Label for user statistics.
 #. TRANS: Average count of posts made per day since account registration.

-#: lib/profileaction.php:223
+#: lib/profileaction.php:230

 msgid "Daily average"
 msgstr ""
 
 #. TRANS: H2 text for user group membership statistics.
 msgid "Daily average"
 msgstr ""
 
 #. TRANS: H2 text for user group membership statistics.

-#: lib/profileaction.php:260
+#: lib/profileaction.php:267

 msgid "Groups"
 msgstr ""
 
 #. TRANS: H2 text for user list membership statistics.
 msgid "Groups"
 msgstr ""
 
 #. TRANS: H2 text for user list membership statistics.

-#: lib/profileaction.php:298
+#: lib/profileaction.php:305

 msgid "Lists"
 msgstr ""
 
 msgid "Lists"
 msgstr ""
 


@@ -10437,29 +10436,29 @@ msgid "Unimplemented method."
 msgstr ""
 
 #. TRANS: Menu item title in search group navigation panel.
 msgstr ""
 
 #. TRANS: Menu item title in search group navigation panel.

-#: lib/publicgroupnav.php:73
+#: lib/publicgroupnav.php:75

 msgid "User groups"
 msgstr ""
 
 #. TRANS: Menu item in search group navigation panel.
 msgid "User groups"
 msgstr ""
 
 #. TRANS: Menu item in search group navigation panel.

-#: lib/publicgroupnav.php:76
+#: lib/publicgroupnav.php:79

 msgctxt "MENU"
 msgid "Recent tags"
 msgstr ""
 
 #. TRANS: Menu item title in search group navigation panel.
 msgctxt "MENU"
 msgid "Recent tags"
 msgstr ""
 
 #. TRANS: Menu item title in search group navigation panel.

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

 msgid "Recent tags"
 msgstr ""
 
 #. TRANS: Menu item in search group navigation panel.
 msgid "Recent tags"
 msgstr ""
 
 #. TRANS: Menu item in search group navigation panel.

-#: lib/publicgroupnav.php:82
+#: lib/publicgroupnav.php:86

 msgctxt "MENU"
 msgid "Featured"
 msgstr ""
 
 #. TRANS: Menu item in search group navigation panel.
 msgctxt "MENU"
 msgid "Featured"
 msgstr ""
 
 #. TRANS: Menu item in search group navigation panel.

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

 msgctxt "MENU"
 msgid "Popular"
 msgstr ""
 msgctxt "MENU"
 msgid "Popular"
 msgstr ""


@@ -10492,7 +10491,7 @@ msgid "Revoke the \"%s\" role from this user"
 msgstr ""
 
 #. TRANS: Client error on action trying to visit a non-existing page.
 msgstr ""
 
 #. TRANS: Client error on action trying to visit a non-existing page.

-#: lib/router.php:1146
+#: lib/router.php:1140

 msgid "Page not found."
 msgstr ""
 
 msgid "Page not found."
 msgstr ""
 


@@ -10519,8 +10518,9 @@ msgid "Keyword(s)"
 msgstr ""
 
 #. TRANS: Button text for searching site.
 msgstr ""
 
 #. TRANS: Button text for searching site.

+#. TRANS: Button text for search button on search form.

 #. TRANS: Button text to search profiles.
 #. TRANS: Button text to search profiles.

-#: lib/searchaction.php:116 lib/togglepeopletag.php:134
+#: lib/searchaction.php:116 lib/searchform.php:76 lib/togglepeopletag.php:134

 msgctxt "BUTTON"
 msgid "Search"
 msgstr ""
 msgctxt "BUTTON"
 msgid "Search"
 msgstr ""


@@ -10575,24 +10575,6 @@ msgstr ""
 msgid "Find groups on this site"
 msgstr ""
 
 msgid "Find groups on this site"
 msgstr ""
 

-#. TRANS: Secondary navigation menu item leading to help on StatusNet.
-#: lib/secondarynav.php:56
-msgctxt "MENU"
-msgid "Help"
-msgstr ""
-
-#. TRANS: Secondary navigation menu item leading to text about StatusNet site.
-#: lib/secondarynav.php:59
-msgctxt "MENU"
-msgid "About"
-msgstr ""
-
-#. TRANS: Secondary navigation menu item leading to Frequently Asked Questions.
-#: lib/secondarynav.php:62
-msgctxt "MENU"
-msgid "FAQ"
-msgstr ""
-

 #. TRANS: Secondary navigation menu item leading to Terms of Service.
 #: lib/secondarynav.php:67
 msgctxt "MENU"
 #. TRANS: Secondary navigation menu item leading to Terms of Service.
 #: lib/secondarynav.php:67
 msgctxt "MENU"


@@ -10617,19 +10599,6 @@ msgctxt "MENU"
 msgid "Version"
 msgstr ""
 
 msgid "Version"
 msgstr ""
 

-#. TRANS: Secondary navigation menu item leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-#: lib/secondarynav.php:81
-msgctxt "MENU"
-msgid "Contact"
-msgstr ""
-
-#. TRANS: Secondary navigation menu item. Leads to information about embedding a timeline widget.
-#: lib/secondarynav.php:84
-msgctxt "MENU"
-msgid "Badge"
-msgstr ""
-

 #. TRANS: Default title for section/sidebar widget.
 #: lib/section.php:105
 msgid "Untitled section"
 #. TRANS: Default title for section/sidebar widget.
 #: lib/section.php:105
 msgid "Untitled section"


@@ -10641,93 +10610,104 @@ msgid "More..."
 msgstr ""
 
 #. TRANS: Header in settings navigation panel.
 msgstr ""
 
 #. TRANS: Header in settings navigation panel.

-#: lib/settingsnav.php:83
+#: lib/settingsnav.php:68

 msgctxt "HEADER"
 msgid "Settings"
 msgstr ""
 
 #. TRANS: Menu item title in settings navigation panel.
 msgctxt "HEADER"
 msgid "Settings"
 msgstr ""
 
 #. TRANS: Menu item title in settings navigation panel.

-#: lib/settingsnav.php:91
+#: lib/settingsnav.php:76

 msgid "Change your profile settings"
 msgstr ""
 
 #. TRANS: Menu item in settings navigation panel.
 msgid "Change your profile settings"
 msgstr ""
 
 #. TRANS: Menu item in settings navigation panel.

-#: lib/settingsnav.php:96
+#: lib/settingsnav.php:81

 msgctxt "MENU"
 msgid "Avatar"
 msgstr ""
 
 #. TRANS: Menu item title in settings navigation panel.
 msgctxt "MENU"
 msgid "Avatar"
 msgstr ""
 
 #. TRANS: Menu item title in settings navigation panel.

-#: lib/settingsnav.php:98
+#: lib/settingsnav.php:83

 msgid "Upload an avatar"
 msgstr ""
 
 #. TRANS: Menu item in settings navigation panel.
 msgid "Upload an avatar"
 msgstr ""
 
 #. TRANS: Menu item in settings navigation panel.

-#: lib/settingsnav.php:103
+#: lib/settingsnav.php:88

 msgctxt "MENU"
 msgid "Password"
 msgstr ""
 
 #. TRANS: Menu item title in settings navigation panel.
 msgctxt "MENU"
 msgid "Password"
 msgstr ""
 
 #. TRANS: Menu item title in settings navigation panel.

-#: lib/settingsnav.php:105
+#: lib/settingsnav.php:90

 msgid "Change your password"
 msgstr ""
 
 #. TRANS: Menu item in settings navigation panel.
 msgid "Change your password"
 msgstr ""
 
 #. TRANS: Menu item in settings navigation panel.

-#: lib/settingsnav.php:110
+#: lib/settingsnav.php:95

 msgctxt "MENU"
 msgid "Email"
 msgstr ""
 
 #. TRANS: Menu item title in settings navigation panel.
 msgctxt "MENU"
 msgid "Email"
 msgstr ""
 
 #. TRANS: Menu item title in settings navigation panel.

-#: lib/settingsnav.php:112
+#: lib/settingsnav.php:97

 msgid "Change email handling"
 msgstr ""
 
 #. TRANS: Menu item in settings navigation panel.
 msgid "Change email handling"
 msgstr ""
 
 #. TRANS: Menu item in settings navigation panel.

-#: lib/settingsnav.php:117
+#: lib/settingsnav.php:102

 msgctxt "MENU"
 msgid "URL"
 msgstr ""
 
 #. TRANS: Menu item title in settings navigation panel.
 msgctxt "MENU"
 msgid "URL"
 msgstr ""
 
 #. TRANS: Menu item title in settings navigation panel.

-#: lib/settingsnav.php:119
+#: lib/settingsnav.php:104

 msgid "URL shorteners"
 msgstr ""
 
 #. TRANS: Menu item in settings navigation panel.
 msgid "URL shorteners"
 msgstr ""
 
 #. TRANS: Menu item in settings navigation panel.

-#: lib/settingsnav.php:127
+#: lib/settingsnav.php:116

 msgctxt "MENU"
 msgid "IM"
 msgstr ""
 
 #. TRANS: Menu item title in settings navigation panel.
 msgctxt "MENU"
 msgid "IM"
 msgstr ""
 
 #. TRANS: Menu item title in settings navigation panel.

-#: lib/settingsnav.php:129
+#: lib/settingsnav.php:118

 msgid "Updates by instant messenger (IM)"
 msgstr ""
 
 #. TRANS: Menu item in settings navigation panel.
 msgid "Updates by instant messenger (IM)"
 msgstr ""
 
 #. TRANS: Menu item in settings navigation panel.

-#: lib/settingsnav.php:136
+#: lib/settingsnav.php:125

 msgctxt "MENU"
 msgid "SMS"
 msgstr ""
 
 #. TRANS: Menu item title in settings navigation panel.
 msgctxt "MENU"
 msgid "SMS"
 msgstr ""
 
 #. TRANS: Menu item title in settings navigation panel.

-#: lib/settingsnav.php:138
+#: lib/settingsnav.php:127

 msgid "Updates by SMS"
 msgstr ""
 
 #. TRANS: Menu item in settings navigation panel.
 msgid "Updates by SMS"
 msgstr ""
 
 #. TRANS: Menu item in settings navigation panel.

-#: lib/settingsnav.php:144
+#: lib/settingsnav.php:133

 msgctxt "MENU"
 msgid "Connections"
 msgstr ""
 
 #. TRANS: Menu item title in settings navigation panel.
 msgctxt "MENU"
 msgid "Connections"
 msgstr ""
 
 #. TRANS: Menu item title in settings navigation panel.

-#: lib/settingsnav.php:146
+#: lib/settingsnav.php:135

 msgid "Authorized connected applications"
 msgstr ""
 
 msgid "Authorized connected applications"
 msgstr ""
 

+#. TRANS: Menu item in settings navigation panel.
+#: lib/settingsnav.php:141
+msgctxt "MENU"
+msgid "Old school"
+msgstr ""
+
+#. TRANS: Menu item title in settings navigation panel.
+#: lib/settingsnav.php:143
+msgid "UI tweaks for old-school users"
+msgstr ""
+

 #. TRANS: Title of form to silence a user.
 #: lib/silenceform.php:65
 msgctxt "TITLE"
 #. TRANS: Title of form to silence a user.
 #: lib/silenceform.php:65
 msgctxt "TITLE"


@@ -10846,6 +10826,13 @@ msgstr ""
 msgid "Subscribe to this user"
 msgstr ""
 
 msgid "Subscribe to this user"
 msgstr ""
 

+#. TRANS: Button text to subscribe to a user.
+#. TRANS: Button text for subscribing to a list.
+#: lib/subscribeform.php:130 lib/subscribepeopletagform.php:106
+msgctxt "BUTTON"
+msgid "Subscribe"
+msgstr ""
+

 #. TRANS: Button title to subscribe to a user.
 #: lib/subscribeform.php:132
 msgid "Subscribe to this user."
 #. TRANS: Button title to subscribe to a user.
 #: lib/subscribeform.php:132
 msgid "Subscribe to this user."


@@ -10870,7 +10857,7 @@ msgid "None"
 msgstr ""
 
 #. TRANS: Server exception displayed if a theme name was invalid.
 msgstr ""
 
 #. TRANS: Server exception displayed if a theme name was invalid.

-#: lib/theme.php:77
+#: lib/theme.php:79

 msgid "Invalid theme name."
 msgstr ""
 
 msgid "Invalid theme name."
 msgstr ""
 


@@ -10944,7 +10931,7 @@ msgstr ""
 
 #. TRANS: Link to show replies for a notice.
 #. TRANS: %d is the number of replies to a notice and used for plural.
 
 #. TRANS: Link to show replies for a notice.
 #. TRANS: %d is the number of replies to a notice and used for plural.

-#: lib/threadednoticelist.php:355
+#: lib/threadednoticelist.php:371

 #, php-format
 msgid "Show reply"
 msgid_plural "Show all %d replies"
 #, php-format
 msgid "Show reply"
 msgid_plural "Show all %d replies"


@@ -10952,21 +10939,21 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Reference to the logged in user in favourite list.
 msgstr[1] ""
 
 #. TRANS: Reference to the logged in user in favourite list.

-#: lib/threadednoticelist.php:421
+#: lib/threadednoticelist.php:437

 msgctxt "FAVELIST"
 msgid "You"
 msgstr ""
 
 #. TRANS: For building a list such as "Jim, Bob, Mary and 5 others like this".
 #. TRANS: %1$s is a list of users, separated by a separator (default: ", "), %2$s is the last user in the list.
 msgctxt "FAVELIST"
 msgid "You"
 msgstr ""
 
 #. TRANS: For building a list such as "Jim, Bob, Mary and 5 others like this".
 #. TRANS: %1$s is a list of users, separated by a separator (default: ", "), %2$s is the last user in the list.

-#: lib/threadednoticelist.php:459
+#: lib/threadednoticelist.php:475

 #, php-format
 msgctxt "FAVELIST"
 msgid "%1$s and %2$s"
 msgstr ""
 
 #. TRANS: List message for notice favoured by logged in user.
 #, php-format
 msgctxt "FAVELIST"
 msgid "%1$s and %2$s"
 msgstr ""
 
 #. TRANS: List message for notice favoured by logged in user.

-#: lib/threadednoticelist.php:493
+#: lib/threadednoticelist.php:509

 msgctxt "FAVELIST"
 msgid "You like this."
 msgstr ""
 msgctxt "FAVELIST"
 msgid "You like this."
 msgstr ""


@@ -10974,7 +10961,7 @@ msgstr ""
 #. TRANS: List message for when more than 4 people like something.
 #. TRANS: %%s is a list of users liking a notice, %d is the number over 4 that like the notice.
 #. TRANS: Plural is decided on the total number of users liking the notice (count of %%s + %d).
 #. TRANS: List message for when more than 4 people like something.
 #. TRANS: %%s is a list of users liking a notice, %d is the number over 4 that like the notice.
 #. TRANS: Plural is decided on the total number of users liking the notice (count of %%s + %d).

-#: lib/threadednoticelist.php:498
+#: lib/threadednoticelist.php:514

 #, php-format
 msgid "%%s and %d others like this."
 msgid_plural "%%s and %d others like this."
 #, php-format
 msgid "%%s and %d others like this."
 msgid_plural "%%s and %d others like this."


@@ -10984,7 +10971,7 @@ msgstr[1] ""
 #. TRANS: List message for favoured notices.
 #. TRANS: %%s is a list of users liking a notice.
 #. TRANS: Plural is based on the number of of users that have favoured a notice.
 #. TRANS: List message for favoured notices.
 #. TRANS: %%s is a list of users liking a notice.
 #. TRANS: Plural is based on the number of of users that have favoured a notice.

-#: lib/threadednoticelist.php:506
+#: lib/threadednoticelist.php:522

 #, php-format
 msgid "%%s likes this."
 msgid_plural "%%s like this."
 #, php-format
 msgid "%%s likes this."
 msgid_plural "%%s like this."


@@ -10992,17 +10979,28 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: List message for notice repeated by logged in user.
 msgstr[1] ""
 
 #. TRANS: List message for notice repeated by logged in user.

-#: lib/threadednoticelist.php:559
+#: lib/threadednoticelist.php:586

 msgctxt "REPEATLIST"
 msgctxt "REPEATLIST"

-msgid "You have repeated this notice."
+msgid "You repeated this."

 msgstr ""
 
 msgstr ""
 

-#. TRANS: List message for repeated notices.
-#. TRANS: %d is the number of users that have repeated a notice.
-#: lib/threadednoticelist.php:563
+#. TRANS: List message for when more than 4 people repeat something.
+#. TRANS: %%s is a list of users liking a notice, %d is the number over 4 that like the notice.
+#. TRANS: Plural is decided on the total number of users liking the notice (count of %%s + %d).
+#: lib/threadednoticelist.php:591

 #, php-format
 #, php-format

-msgid "One person has repeated this notice."
-msgid_plural "%d people have repeated this notice."
+msgid "%%s and %d other repeated this."
+msgid_plural "%%s and %d others repeated this."
+msgstr[0] ""
+msgstr[1] ""
+
+#. TRANS: List message for favoured notices.
+#. TRANS: %%s is a list of users liking a notice.
+#. TRANS: Plural is based on the number of of users that have favoured a notice.
+#: lib/threadednoticelist.php:599
+#, php-format
+msgid "%%s repeated this."
+msgid_plural "%%s repeated this."

 msgstr[0] ""
 msgstr[1] ""
 
 msgstr[0] ""
 msgstr[1] ""
 


@@ -11115,8 +11113,7 @@ msgid "Unsilence this user"
 msgstr ""
 
 #. TRANS: Form legend on unsubscribe form.
 msgstr ""
 
 #. TRANS: Form legend on unsubscribe form.

-#. TRANS: Button title on unsubscribe form.
-#: lib/unsubscribeform.php:109 lib/unsubscribeform.php:134
+#: lib/unsubscribeform.php:109

 msgid "Unsubscribe from this user"
 msgstr ""
 
 msgid "Unsubscribe from this user"
 msgstr ""
 


@@ -11127,6 +11124,11 @@ msgctxt "BUTTON"
 msgid "Unsubscribe"
 msgstr ""
 
 msgid "Unsubscribe"
 msgstr ""
 

+#. TRANS: Button title on unsubscribe form.
+#: lib/unsubscribeform.php:134
+msgid "Unsubscribe from this user."
+msgstr ""
+

 #. TRANS: Exception text shown when no profile can be found for a user.
 #. TRANS: %1$s is a user nickname, $2$d is a user ID (number).
 #: lib/usernoprofileexception.php:60
 #. TRANS: Exception text shown when no profile can be found for a user.
 #. TRANS: %1$s is a user nickname, $2$d is a user ID (number).
 #: lib/usernoprofileexception.php:60


@@ -11140,17 +11142,17 @@ 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:1343
+#: lib/util.php:1346

 msgid "a few seconds ago"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 msgid "a few seconds ago"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.

-#: lib/util.php:1346
+#: lib/util.php:1349

 msgid "about a minute ago"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 msgid "about a minute ago"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.

-#: lib/util.php:1350
+#: lib/util.php:1353

 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"


@@ -11158,12 +11160,12 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.

-#: lib/util.php:1353
+#: lib/util.php:1356

 msgid "about an hour ago"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 msgid "about an hour ago"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.

-#: lib/util.php:1357
+#: lib/util.php:1360

 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"


@@ -11171,12 +11173,12 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.

-#: lib/util.php:1360
+#: lib/util.php:1363

 msgid "about a day ago"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 msgid "about a day ago"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.

-#: lib/util.php:1364
+#: lib/util.php:1367

 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"


@@ -11184,12 +11186,12 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.

-#: lib/util.php:1367
+#: lib/util.php:1370

 msgid "about a month ago"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 msgid "about a month ago"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.

-#: lib/util.php:1371
+#: lib/util.php:1374

 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"


@@ -11197,7 +11199,7 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.

-#: lib/util.php:1374
+#: lib/util.php:1377

 msgid "about a year ago"
 msgstr ""
 
 msgid "about a year ago"
 msgstr ""
 


@@ -11223,43 +11225,3 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""

-
-#. TRANS: Server exception. %s is a URL.
-#: scripts/update_ostatus_profiles.php:56
-#, php-format
-msgid "Invalid avatar URL %s."
-msgstr ""
-
-#. TRANS: Server exception. %s is a URI.
-#: scripts/update_ostatus_profiles.php:67
-#, php-format
-msgid "Tried to update avatar for unsaved remote profile %s."
-msgstr ""
-
-#. TRANS: Server exception. %s is a URL.
-#: scripts/update_ostatus_profiles.php:77
-#, php-format
-msgid "Unable to fetch avatar from %s."
-msgstr ""
-
-#. TRANS: Exception. %s is a profile URL.
-#: scripts/update_ostatus_profiles.php:136
-#, php-format
-msgid "Could not reach profile page %s."
-msgstr ""
-
-#. TRANS: Exception. %s is a URL.
-#: scripts/update_ostatus_profiles.php:187
-#, php-format
-msgid "Could not find a feed URL for profile page %s."
-msgstr ""
-
-#. TRANS: Exception.
-#: scripts/update_ostatus_profiles.php:212
-msgid "Not a valid webfinger address."
-msgstr ""
-
-#: scripts/update_ostatus_profiles.php:264
-#, php-format
-msgid "Could not find a valid profile for \"%s\"."
-msgstr ""