Fixes for Mac metadata files mucking up theme zip files

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

diff --git a/locale/statusnet.pot b/locale/statusnet.pot
index 5ced0617fb230fb937d22117a29096aa37bea2df..822d4fcf88877919a8957492692d35087e1d2d18 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: 2010-04-09 22:59+0000\n"
+"POT-Creation-Date: 2010-08-11 10:48+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"


@@ -19,7 +19,7 @@ msgstr ""
 
 #. TRANS: Page title
 #. TRANS: Menu item for site administration
 
 #. TRANS: Page title
 #. TRANS: Menu item for site administration

-#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:374
+#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:376

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


@@ -69,82 +69,89 @@ msgstr ""
 msgid "Save access settings"
 msgstr ""
 
 msgid "Save access settings"
 msgstr ""
 

-#: actions/accessadminpanel.php:203
+#. TRANS: Button label to save e-mail preferences.
+#. TRANS: Button label to save IM preferences.
+#. TRANS: Button label to save SMS preferences.
+#. TRANS: Button label
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:224
+#: actions/imsettings.php:184 actions/smssettings.php:209
+#: lib/applicationeditform.php:361

 msgctxt "BUTTON"
 msgid "Save"
 msgstr ""
 
 #. TRANS: Server error when page not found (404)
 msgctxt "BUTTON"
 msgid "Save"
 msgstr ""
 
 #. TRANS: Server error when page not found (404)

-#: actions/all.php:64 actions/public.php:98 actions/replies.php:93
+#: actions/all.php:68 actions/public.php:98 actions/replies.php:93

 #: actions/showfavorites.php:138 actions/tag.php:52
 msgid "No such page."
 msgstr ""
 
 #: actions/showfavorites.php:138 actions/tag.php:52
 msgid "No such page."
 msgstr ""
 

-#: actions/all.php:75 actions/allrss.php:68
-#: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/all.php:79 actions/allrss.php:68
+#: actions/apiaccountupdatedeliverydevice.php:114

 #: actions/apiaccountupdateprofile.php:105
 #: actions/apiaccountupdateprofilebackgroundimage.php:116
 #: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
 #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
 #: actions/apiaccountupdateprofile.php:105
 #: actions/apiaccountupdateprofilebackgroundimage.php:116
 #: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
 #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77

-#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
-#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
-#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
-#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
-#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
-#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
+#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113
+#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100
+#: actions/apigroupleave.php:100 actions/apigrouplist.php:73
+#: actions/apistatusesupdate.php:229 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174
+#: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80
+#: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75

 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
 #: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
 #: actions/otp.php:76 actions/remotesubscribe.php:145
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
 #: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
 #: actions/otp.php:76 actions/remotesubscribe.php:145
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105

-#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
+#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59

 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr ""
 
 #. TRANS: Page title. %1$s is user nickname, %2$d is page number
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr ""
 
 #. TRANS: Page title. %1$s is user nickname, %2$d is page number

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

 #, php-format
 msgid "%1$s and friends, page %2$d"
 msgstr ""
 
 #. TRANS: Page title. %1$s is user nickname
 #. TRANS: H1 text. %1$s is user nickname
 #, php-format
 msgid "%1$s and friends, page %2$d"
 msgstr ""
 
 #. TRANS: Page title. %1$s is user nickname
 #. TRANS: H1 text. %1$s is user nickname

-#: actions/all.php:89 actions/all.php:181 actions/allrss.php:115
-#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
+#. TRANS: Message is used as link title. %s is a user nickname.
+#: actions/all.php:93 actions/all.php:185 actions/allrss.php:116
+#: actions/apitimelinefriends.php:210 actions/apitimelinehome.php:116

 #: lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr ""
 
 #. TRANS: %1$s is user nickname
 #: lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr ""
 
 #. TRANS: %1$s is user nickname

-#: actions/all.php:103
+#: actions/all.php:107

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

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

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

-#: actions/all.php:121
+#: actions/all.php:125

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

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

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

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

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


@@ -152,77 +159,79 @@ msgid ""
 msgstr ""
 
 #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@"
 msgstr ""
 
 #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@"

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

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

-"You can try to [nudge %1$s](../%2$s) from his profile or [post something to "
-"his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)."
+"You can try to [nudge %1$s](../%2$s) from their profile or [post something "
+"to them](%%%%action.newnotice%%%%?status_textarea=%3$s)."

 msgstr ""
 
 msgstr ""
 

-#: actions/all.php:145 actions/replies.php:210 actions/showstream.php:211
+#: actions/all.php:149 actions/replies.php:210 actions/showstream.php:211

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

-"post a notice to his or her attention."
+"post a notice to them."

 msgstr ""
 
 #. TRANS: H1 text
 msgstr ""
 
 #. TRANS: H1 text

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

 msgid "You and friends"
 msgstr ""
 
 msgid "You and friends"
 msgstr ""
 

-#: actions/allrss.php:119 actions/apitimelinefriends.php:119
-#: actions/apitimelinehome.php:120
+#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
+#. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name.
+#: actions/allrss.php:121 actions/apitimelinefriends.php:216
+#: actions/apitimelinehome.php:122

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

-#: actions/apiaccountratelimitstatus.php:70
-#: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountratelimitstatus.php:72
+#: actions/apiaccountupdatedeliverydevice.php:94

 #: actions/apiaccountupdateprofile.php:97
 #: actions/apiaccountupdateprofilebackgroundimage.php:94
 #: actions/apiaccountupdateprofilecolors.php:118
 #: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
 #: actions/apiaccountupdateprofile.php:97
 #: actions/apiaccountupdateprofilebackgroundimage.php:94
 #: actions/apiaccountupdateprofilecolors.php:118
 #: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156

-#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100
+#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101

 #: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
 #: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100

-#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155
-#: actions/apigroupleave.php:141 actions/apigrouplist.php:136
-#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:106
-#: actions/apigroupshow.php:115 actions/apihelptest.php:88
-#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
-#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156
+#: actions/apigroupleave.php:142 actions/apigrouplist.php:137
+#: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107
+#: actions/apigroupshow.php:116 actions/apihelptest.php:88
+#: actions/apistatusesdestroy.php:104 actions/apistatusesretweets.php:112
+#: actions/apistatusesshow.php:109 actions/apistatusnetconfig.php:141

 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111

-#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:174
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
+#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:271
+#: actions/apitimelinegroup.php:154 actions/apitimelinehome.php:175
+#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:241

 #: actions/apitimelineretweetedtome.php:121
 #: actions/apitimelineretweetedtome.php:121

-#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
-#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:161
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101

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

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

 #: actions/apiaccountupdateprofile.php:89
 #: actions/apiaccountupdateprofilebackgroundimage.php:86
 #: actions/apiaccountupdateprofilecolors.php:110
 #: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
 #: actions/apiaccountupdateprofile.php:89
 #: actions/apiaccountupdateprofilebackgroundimage.php:86
 #: actions/apiaccountupdateprofilecolors.php:110
 #: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89

-#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117
-#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
+#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109
+#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92

 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91

-#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
-#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
+#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92
+#: actions/apigroupleave.php:92 actions/apimediaupload.php:67
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198

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

-#: actions/apiaccountupdatedeliverydevice.php:105
+#: actions/apiaccountupdatedeliverydevice.php:106

 msgid ""
 "You must specify a parameter named 'device' with a value of one of: sms, im, "
 "none."
 msgstr ""
 
 msgid ""
 "You must specify a parameter named 'device' with a value of one of: sms, im, "
 "none."
 msgstr ""
 

-#: actions/apiaccountupdatedeliverydevice.php:132
+#: actions/apiaccountupdatedeliverydevice.php:133

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


@@ -231,7 +240,7 @@ msgstr ""
 #: actions/apiaccountupdateprofilecolors.php:185
 #: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/hcard.php:74
 #: actions/apiaccountupdateprofilecolors.php:185
 #: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/hcard.php:74

-#: actions/replies.php:80 actions/usergroups.php:98 lib/galleryaction.php:66
+#: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66

 #: lib/profileaction.php:84
 msgid "User has no profile."
 msgstr ""
 #: lib/profileaction.php:84
 msgid "User has no profile."
 msgstr ""


@@ -242,8 +251,8 @@ msgstr ""
 
 #: actions/apiaccountupdateprofilebackgroundimage.php:108
 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
 
 #: actions/apiaccountupdateprofilebackgroundimage.php:108
 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80

-#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
-#: actions/designadminpanel.php:122 actions/editapplication.php:118
+#: actions/apistatusesupdate.php:212 actions/avatarsettings.php:257
+#: actions/designadminpanel.php:123 actions/editapplication.php:118

 #: actions/newapplication.php:101 actions/newnotice.php:94
 #: lib/designsettings.php:283
 #, php-format
 #: actions/newapplication.php:101 actions/newnotice.php:94
 #: lib/designsettings.php:283
 #, php-format


@@ -299,46 +308,46 @@ msgstr ""
 msgid "All the direct messages sent to %s"
 msgstr ""
 
 msgid "All the direct messages sent to %s"
 msgstr ""
 

-#: actions/apidirectmessagenew.php:126
+#: actions/apidirectmessagenew.php:118

 msgid "No message text!"
 msgstr ""
 
 msgid "No message text!"
 msgstr ""
 

-#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150

 #, php-format
 msgid "That's too long. Max message size is %d chars."
 msgstr ""
 
 #, php-format
 msgid "That's too long. Max message size is %d chars."
 msgstr ""
 

-#: actions/apidirectmessagenew.php:146
+#: actions/apidirectmessagenew.php:138

 msgid "Recipient user not found."
 msgstr ""
 
 msgid "Recipient user not found."
 msgstr ""
 

-#: actions/apidirectmessagenew.php:150
+#: actions/apidirectmessagenew.php:142

 msgid "Can't send direct messages to users who aren't your friend."
 msgstr ""
 
 msgid "Can't send direct messages to users who aren't your friend."
 msgstr ""
 

-#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
-#: actions/apistatusesdestroy.php:113
+#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110
+#: actions/apistatusesdestroy.php:121

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

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

 msgid "This status is already a favorite."
 msgstr ""
 
 msgid "This status is already a favorite."
 msgstr ""
 

-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
+#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285

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

-#: actions/apifavoritedestroy.php:122
+#: actions/apifavoritedestroy.php:123

 msgid "That status is not a favorite."
 msgstr ""
 
 msgid "That status is not a favorite."
 msgstr ""
 

-#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87

 msgid "Could not delete favorite."
 msgstr ""
 
 #: actions/apifriendshipscreate.php:109
 msgid "Could not delete favorite."
 msgstr ""
 
 #: actions/apifriendshipscreate.php:109

-msgid "Could not follow user: User not found."
+msgid "Could not follow user: profile not found."

 msgstr ""
 
 #: actions/apifriendshipscreate.php:118
 msgstr ""
 
 #: actions/apifriendshipscreate.php:118


@@ -354,8 +363,8 @@ msgstr ""
 msgid "You cannot unfollow yourself."
 msgstr ""
 
 msgid "You cannot unfollow yourself."
 msgstr ""
 

-#: actions/apifriendshipsexists.php:94
-msgid "Two user ids or screen_names must be supplied."
+#: actions/apifriendshipsexists.php:91
+msgid "Two valid IDs or screen_names must be supplied."

 msgstr ""
 
 #: actions/apifriendshipsshow.php:134
 msgstr ""
 
 #: actions/apifriendshipsshow.php:134


@@ -366,121 +375,127 @@ msgstr ""
 msgid "Could not find target user."
 msgstr ""
 
 msgid "Could not find target user."
 msgstr ""
 

-#: actions/apigroupcreate.php:166 actions/editgroup.php:186
+#: actions/apigroupcreate.php:167 actions/editgroup.php:186

 #: actions/newgroup.php:126 actions/profilesettings.php:215
 #: actions/newgroup.php:126 actions/profilesettings.php:215

-#: actions/register.php:205
+#: actions/register.php:212

 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr ""
 
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr ""
 

-#: actions/apigroupcreate.php:175 actions/editgroup.php:190
+#: actions/apigroupcreate.php:176 actions/editgroup.php:190

 #: actions/newgroup.php:130 actions/profilesettings.php:238
 #: actions/newgroup.php:130 actions/profilesettings.php:238

-#: actions/register.php:208
+#: actions/register.php:215

 msgid "Nickname already in use. Try another one."
 msgstr ""
 
 msgid "Nickname already in use. Try another one."
 msgstr ""
 

-#: actions/apigroupcreate.php:182 actions/editgroup.php:193
+#: actions/apigroupcreate.php:183 actions/editgroup.php:193

 #: actions/newgroup.php:133 actions/profilesettings.php:218
 #: actions/newgroup.php:133 actions/profilesettings.php:218

-#: actions/register.php:210
+#: actions/register.php:217

 msgid "Not a valid nickname."
 msgstr ""
 
 msgid "Not a valid nickname."
 msgstr ""
 

-#: actions/apigroupcreate.php:198 actions/editapplication.php:215
+#: actions/apigroupcreate.php:199 actions/editapplication.php:215

 #: actions/editgroup.php:199 actions/newapplication.php:203
 #: actions/newgroup.php:139 actions/profilesettings.php:222
 #: actions/editgroup.php:199 actions/newapplication.php:203
 #: actions/newgroup.php:139 actions/profilesettings.php:222

-#: actions/register.php:217
+#: actions/register.php:224

 msgid "Homepage is not a valid URL."
 msgstr ""
 
 msgid "Homepage is not a valid URL."
 msgstr ""
 

-#: actions/apigroupcreate.php:207 actions/editgroup.php:202
+#: actions/apigroupcreate.php:208 actions/editgroup.php:202

 #: actions/newgroup.php:142 actions/profilesettings.php:225
 #: actions/newgroup.php:142 actions/profilesettings.php:225

-#: actions/register.php:220
+#: actions/register.php:227

 msgid "Full name is too long (max 255 chars)."
 msgstr ""
 
 msgid "Full name is too long (max 255 chars)."
 msgstr ""
 

-#: actions/apigroupcreate.php:215 actions/editapplication.php:190
+#: actions/apigroupcreate.php:216 actions/editapplication.php:190

 #: actions/newapplication.php:172
 #, php-format
 msgid "Description is too long (max %d chars)."
 msgstr ""
 
 #: actions/newapplication.php:172
 #, php-format
 msgid "Description is too long (max %d chars)."
 msgstr ""
 

-#: actions/apigroupcreate.php:226 actions/editgroup.php:208
+#: actions/apigroupcreate.php:227 actions/editgroup.php:208

 #: actions/newgroup.php:148 actions/profilesettings.php:232
 #: actions/newgroup.php:148 actions/profilesettings.php:232

-#: actions/register.php:227
+#: actions/register.php:234

 msgid "Location is too long (max 255 chars)."
 msgstr ""
 
 msgid "Location is too long (max 255 chars)."
 msgstr ""
 

-#: actions/apigroupcreate.php:245 actions/editgroup.php:219
+#: actions/apigroupcreate.php:246 actions/editgroup.php:219

 #: actions/newgroup.php:159
 #, php-format
 msgid "Too many aliases! Maximum %d."
 msgstr ""
 
 #: actions/newgroup.php:159
 #, php-format
 msgid "Too many aliases! Maximum %d."
 msgstr ""
 

-#: actions/apigroupcreate.php:266
+#: actions/apigroupcreate.php:267

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

-#: actions/apigroupcreate.php:275 actions/editgroup.php:232
+#: actions/apigroupcreate.php:276 actions/editgroup.php:232

 #: actions/newgroup.php:172
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr ""
 
 #: actions/newgroup.php:172
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr ""
 

-#: actions/apigroupcreate.php:288 actions/editgroup.php:238
+#: actions/apigroupcreate.php:289 actions/editgroup.php:238

 #: actions/newgroup.php:178
 msgid "Alias can't be the same as nickname."
 msgstr ""
 
 #: actions/newgroup.php:178
 msgid "Alias can't be the same as nickname."
 msgstr ""
 

-#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
-#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
-#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
+#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105
+#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92
+#: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92

 msgid "Group not found."
 msgstr ""
 
 msgid "Group not found."
 msgstr ""
 

-#: actions/apigroupjoin.php:110 actions/joingroup.php:100
+#: actions/apigroupjoin.php:111 actions/joingroup.php:100

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

-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
+#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327

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

-#: actions/apigroupjoin.php:138 actions/joingroup.php:134
+#: actions/apigroupjoin.php:139 actions/joingroup.php:134

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

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

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

-#: actions/apigroupleave.php:124 actions/leavegroup.php:129
+#: actions/apigroupleave.php:125 actions/leavegroup.php:129

 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 msgstr ""
 
 #. TRANS: %s is a user name
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 msgstr ""
 
 #. TRANS: %s is a user name

-#: actions/apigrouplist.php:97
+#: actions/apigrouplist.php:98

 #, php-format
 msgid "%s's groups"
 msgstr ""
 
 #. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s
 #, php-format
 msgid "%s's groups"
 msgstr ""
 
 #. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s

-#: actions/apigrouplist.php:107
+#: actions/apigrouplist.php:108

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

-#: actions/apigrouplistall.php:90 actions/usergroups.php:62
+#. TRANS: Message is used as a title. %s is a site name.
+#. TRANS: Message is used as a page title. %s is a nick name.
+#: actions/apigrouplistall.php:92 actions/usergroups.php:63

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

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

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

+#: actions/apimediaupload.php:99
+msgid "Upload failed."
+msgstr ""
+

 #: actions/apioauthauthorize.php:101
 msgid "No oauth_token parameter provided."
 msgstr ""
 #: actions/apioauthauthorize.php:101
 msgid "No oauth_token parameter provided."
 msgstr ""


@@ -490,17 +505,17 @@ msgid "Invalid token."
 msgstr ""
 
 #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
 msgstr ""
 
 #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268

-#: actions/deletenotice.php:157 actions/disfavor.php:74
-#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54
+#: actions/deletenotice.php:169 actions/disfavor.php:74
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55

 #: actions/groupblock.php:66 actions/grouplogo.php:312
 #: actions/groupblock.php:66 actions/grouplogo.php:312

-#: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/groupunblock.php:66 actions/imsettings.php:227
+#: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66

 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
 #: actions/othersettings.php:145 actions/passwordsettings.php:138
 #: actions/profilesettings.php:194 actions/recoverpassword.php:350
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
 #: actions/othersettings.php:145 actions/passwordsettings.php:138
 #: actions/profilesettings.php:194 actions/recoverpassword.php:350

-#: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/register.php:172 actions/remotesubscribe.php:77
+#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38

 #: actions/subscribe.php:86 actions/tagother.php:166
 #: actions/unsubscribe.php:69 actions/userauthorization.php:52
 #: lib/designsettings.php:294
 #: actions/subscribe.php:86 actions/tagother.php:166
 #: actions/unsubscribe.php:69 actions/userauthorization.php:52
 #: lib/designsettings.php:294


@@ -531,12 +546,15 @@ msgstr ""
 msgid "The request token %s has been denied and revoked."
 msgstr ""
 
 msgid "The request token %s has been denied and revoked."
 msgstr ""
 

+#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in SMS settings.

 #: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
 #: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281

-#: actions/designadminpanel.php:103 actions/editapplication.php:139
-#: actions/emailsettings.php:256 actions/grouplogo.php:322
-#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/designadminpanel.php:104 actions/editapplication.php:139
+#: actions/emailsettings.php:286 actions/grouplogo.php:322
+#: actions/imsettings.php:242 actions/newapplication.php:121

 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44

-#: actions/smssettings.php:248 lib/designsettings.php:304
+#: actions/smssettings.php:277 lib/designsettings.php:304

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


@@ -556,20 +574,22 @@ msgid ""
 "give access to your %4$s account to third parties you trust."
 msgstr ""
 
 "give access to your %4$s account to third parties you trust."
 msgstr ""
 

-#: actions/apioauthauthorize.php:310 lib/action.php:437
+#. TRANS: Main menu option when logged in for access to user settings
+#: actions/apioauthauthorize.php:310 lib/action.php:450

 msgid "Account"
 msgstr ""
 
 msgid "Account"
 msgstr ""
 

-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431

 #: actions/showgroup.php:245 actions/tagother.php:94
 #: actions/userauthorization.php:145 lib/groupeditform.php:152
 #: lib/userprofile.php:132
 msgid "Nickname"
 msgstr ""
 
 #: actions/showgroup.php:245 actions/tagother.php:94
 #: actions/userauthorization.php:145 lib/groupeditform.php:152
 #: lib/userprofile.php:132
 msgid "Nickname"
 msgstr ""
 

-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:116
+#. TRANS: Link description in user account settings menu.
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125

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


@@ -585,11 +605,11 @@ msgstr ""
 msgid "Allow or deny access to your account information."
 msgstr ""
 
 msgid "Allow or deny access to your account information."
 msgstr ""
 

-#: actions/apistatusesdestroy.php:107
+#: actions/apistatusesdestroy.php:112

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

-#: actions/apistatusesdestroy.php:130
+#: actions/apistatusesdestroy.php:135

 msgid "You may not delete another user's status."
 msgstr ""
 
 msgid "You may not delete another user's status."
 msgstr ""
 


@@ -606,59 +626,63 @@ msgstr ""
 msgid "Already repeated that notice."
 msgstr ""
 
 msgid "Already repeated that notice."
 msgstr ""
 

-#: actions/apistatusesshow.php:138
+#: actions/apistatusesshow.php:139

 msgid "Status deleted."
 msgstr ""
 
 msgid "Status deleted."
 msgstr ""
 

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

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

-#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:221
+msgid "Client must provide a 'status' parameter with a value."
+msgstr ""
+
+#: actions/apistatusesupdate.php:242 actions/newnotice.php:155

 #: lib/mailhandler.php:60
 #, php-format
 msgid "That's too long. Max notice size is %d chars."
 msgstr ""
 
 #: lib/mailhandler.php:60
 #, php-format
 msgid "That's too long. Max notice size is %d chars."
 msgstr ""
 

-#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:283 actions/apiusershow.php:96

 msgid "Not found."
 msgstr ""
 
 msgid "Not found."
 msgstr ""
 

-#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:306 actions/newnotice.php:178

 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr ""
 
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr ""
 

-#: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261
+#: actions/apisubscriptions.php:232 actions/apisubscriptions.php:262

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

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

 #, php-format
 msgid "%1$s / Favorites from %2$s"
 msgstr ""
 
 #, php-format
 msgid "%1$s / Favorites from %2$s"
 msgstr ""
 

-#: actions/apitimelinefavorites.php:118
+#: actions/apitimelinefavorites.php:119

 #, php-format
 msgid "%1$s updates favorited by %2$s / %2$s."
 msgstr ""
 
 #, php-format
 msgid "%1$s updates favorited by %2$s / %2$s."
 msgstr ""
 

-#: actions/apitimelinementions.php:117
+#: actions/apitimelinementions.php:118

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

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

 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr ""
 
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr ""
 

-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:197 actions/publicrss.php:103

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

-#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:202 actions/publicrss.php:105

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


@@ -673,16 +697,20 @@ msgstr ""
 msgid "Repeats of %s"
 msgstr ""
 
 msgid "Repeats of %s"
 msgstr ""
 

-#: actions/apitimelinetag.php:104 actions/tag.php:67
+#: actions/apitimelinetag.php:105 actions/tag.php:67

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

-#: actions/apitimelinetag.php:106 actions/tagrss.php:65
+#: actions/apitimelinetag.php:107 actions/tagrss.php:65

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

+#: actions/apitrends.php:87
+msgid "API method under construction."
+msgstr ""
+

 #: actions/attachment.php:73
 msgid "No such attachment."
 msgstr ""
 #: actions/attachment.php:73
 msgid "No such attachment."
 msgstr ""


@@ -702,8 +730,9 @@ msgstr ""
 msgid "Invalid size."
 msgstr ""
 
 msgid "Invalid size."
 msgstr ""
 

+#. TRANS: Link description in user account settings menu.

 #: actions/avatarsettings.php:67 actions/showgroup.php:230
 #: actions/avatarsettings.php:67 actions/showgroup.php:230

-#: lib/accountsettingsaction.php:112
+#: lib/accountsettingsaction.php:118

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


@@ -714,7 +743,7 @@ msgstr ""
 
 #: actions/avatarsettings.php:106 actions/avatarsettings.php:185
 #: actions/grouplogo.php:181 actions/remotesubscribe.php:191
 
 #: actions/avatarsettings.php:106 actions/avatarsettings.php:185
 #: actions/grouplogo.php:181 actions/remotesubscribe.php:191

-#: actions/userauthorization.php:72 actions/userrss.php:106
+#: actions/userauthorization.php:72 actions/userrss.php:108

 msgid "User without matching profile."
 msgstr ""
 
 msgid "User without matching profile."
 msgstr ""
 


@@ -734,7 +763,7 @@ msgid "Preview"
 msgstr ""
 
 #: actions/avatarsettings.php:149 actions/showapplication.php:252
 msgstr ""
 
 #: actions/avatarsettings.php:149 actions/showapplication.php:252

-#: lib/deleteuserform.php:66 lib/noticelist.php:648
+#: lib/deleteuserform.php:66 lib/noticelist.php:657

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


@@ -774,38 +803,53 @@ msgstr ""
 msgid "You already blocked that user."
 msgstr ""
 
 msgid "You already blocked that user."
 msgstr ""
 

-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
+#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158

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

-#: actions/block.php:130
+#: actions/block.php:138

 msgid ""
 "Are you sure you want to block this user? Afterwards, they will be "
 "unsubscribed from you, unable to subscribe to you in the future, and you "
 "will not be notified of any @-replies from them."
 msgstr ""
 
 msgid ""
 "Are you sure you want to block this user? Afterwards, they will be "
 "unsubscribed from you, unable to subscribe to you in the future, and you "
 "will not be notified of any @-replies from them."
 msgstr ""
 

-#: actions/block.php:143 actions/deleteapplication.php:153
-#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:176
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:153 actions/deleteapplication.php:154
+#: actions/deletenotice.php:147 actions/deleteuser.php:152
+#: actions/groupblock.php:178
+msgctxt "BUTTON"

 msgid "No"
 msgstr ""
 
 msgid "No"
 msgstr ""
 

-#: actions/block.php:143 actions/deleteuser.php:150
+#. TRANS: Submit button title for 'No' when blocking a user.
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/block.php:157 actions/deleteuser.php:156

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

-#: actions/block.php:144 actions/deleteapplication.php:158
-#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:177 lib/repeatform.php:132
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:160 actions/deleteapplication.php:161
+#: actions/deletenotice.php:154 actions/deleteuser.php:159
+#: actions/groupblock.php:185
+msgctxt "BUTTON"

 msgid "Yes"
 msgstr ""
 
 msgid "Yes"
 msgstr ""
 

-#: actions/block.php:144 actions/groupmembers.php:388 lib/blockform.php:80
+#. TRANS: Submit button title for 'Yes' when blocking a user.
+#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80

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

-#: actions/block.php:167
+#: actions/block.php:187

 msgid "Failed to save block information."
 msgstr ""
 
 msgid "Failed to save block information."
 msgstr ""
 


@@ -818,8 +862,8 @@ msgstr ""
 #: actions/groupunblock.php:86 actions/joingroup.php:82
 #: actions/joingroup.php:93 actions/leavegroup.php:82
 #: actions/leavegroup.php:93 actions/makeadmin.php:86
 #: actions/groupunblock.php:86 actions/joingroup.php:82
 #: actions/joingroup.php:93 actions/leavegroup.php:82
 #: actions/leavegroup.php:93 actions/makeadmin.php:86

-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162
-#: lib/command.php:358
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
+#: lib/command.php:368

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


@@ -867,33 +911,43 @@ msgstr ""
 msgid "That confirmation code is not for you!"
 msgstr ""
 
 msgid "That confirmation code is not for you!"
 msgstr ""
 

-#: actions/confirmaddress.php:90
+#. TRANS: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'.
+#: actions/confirmaddress.php:91

 #, php-format
 msgid "Unrecognized address type %s."
 msgstr ""
 
 #, php-format
 msgid "Unrecognized address type %s."
 msgstr ""
 

-#: actions/confirmaddress.php:94
+#. TRANS: Client error for an already confirmed email/jabbel/sms address.
+#: actions/confirmaddress.php:96

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

-#: actions/confirmaddress.php:114 actions/emailsettings.php:296
-#: actions/emailsettings.php:427 actions/imsettings.php:258
-#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:283 actions/smssettings.php:278
-#: actions/smssettings.php:420
+#. TRANS: Server error thrown on database error updating e-mail preferences.
+#. TRANS: Server error thrown on database error removing a registered e-mail address.
+#. TRANS: Server error thrown on database error updating IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
+#: actions/confirmaddress.php:116 actions/emailsettings.php:327
+#: actions/emailsettings.php:473 actions/imsettings.php:280
+#: actions/imsettings.php:439 actions/othersettings.php:174
+#: actions/profilesettings.php:283 actions/smssettings.php:308
+#: actions/smssettings.php:464

 msgid "Couldn't update user."
 msgstr ""
 
 msgid "Couldn't update user."
 msgstr ""
 

-#: actions/confirmaddress.php:126 actions/emailsettings.php:391
-#: actions/imsettings.php:363 actions/smssettings.php:382
+#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
+#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
+#: actions/confirmaddress.php:128 actions/emailsettings.php:433
+#: actions/smssettings.php:422

 msgid "Couldn't delete email confirmation."
 msgstr ""
 
 msgid "Couldn't delete email confirmation."
 msgstr ""
 

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

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

-#: actions/confirmaddress.php:159
+#: actions/confirmaddress.php:161

 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr ""
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr ""


@@ -922,7 +976,7 @@ msgstr ""
 
 #: actions/deleteapplication.php:102 actions/editapplication.php:127
 #: actions/newapplication.php:110 actions/showapplication.php:118
 
 #: actions/deleteapplication.php:102 actions/editapplication.php:127
 #: actions/newapplication.php:110 actions/showapplication.php:118

-#: lib/action.php:1221
+#: lib/action.php:1263

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


@@ -937,21 +991,23 @@ msgid ""
 "connections."
 msgstr ""
 
 "connections."
 msgstr ""
 

-#: actions/deleteapplication.php:156
+#. TRANS: Submit button title for 'No' when deleting an application.
+#: actions/deleteapplication.php:158

 msgid "Do not delete this application"
 msgstr ""
 
 msgid "Do not delete this application"
 msgstr ""
 

-#: actions/deleteapplication.php:160
+#. TRANS: Submit button title for 'Yes' when deleting an application.
+#: actions/deleteapplication.php:164

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

-#. TRANS: Client error message
+#. TRANS: Client error message thrown when trying to access the admin panel while not logged in.

 #: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
 #: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
 #: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
 #: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52

-#: lib/adminpanelaction.php:73 lib/profileformaction.php:63
+#: lib/adminpanelaction.php:73 lib/profileformaction.php:64

 #: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr ""
 #: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr ""


@@ -974,11 +1030,13 @@ msgstr ""
 msgid "Are you sure you want to delete this notice?"
 msgstr ""
 
 msgid "Are you sure you want to delete this notice?"
 msgstr ""
 

-#: actions/deletenotice.php:145
+#. TRANS: Submit button title for 'No' when deleting a notice.
+#: actions/deletenotice.php:151

 msgid "Do not delete this notice"
 msgstr ""
 
 msgid "Do not delete this notice"
 msgstr ""
 

-#: actions/deletenotice.php:146 lib/noticelist.php:648
+#. TRANS: Submit button title for 'Yes' when deleting a notice.
+#: actions/deletenotice.php:158 lib/noticelist.php:657

 msgid "Delete this notice"
 msgstr ""
 
 msgid "Delete this notice"
 msgstr ""
 


@@ -1000,125 +1058,145 @@ msgid ""
 "the user from the database, without a backup."
 msgstr ""
 
 "the user from the database, without a backup."
 msgstr ""
 

-#: actions/deleteuser.php:151 lib/deleteuserform.php:77
+#. TRANS: Submit button title for 'Yes' when deleting a user.
+#: actions/deleteuser.php:163 lib/deleteuserform.php:77

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

-#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124
+#. TRANS: Message used as title for design settings for the site.
+#. TRANS: Link description in user account settings menu.
+#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:139

 #: lib/groupnav.php:119
 msgid "Design"
 msgstr ""
 
 #: lib/groupnav.php:119
 msgid "Design"
 msgstr ""
 

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

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

-#: actions/designadminpanel.php:275
+#: actions/designadminpanel.php:318

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

-#: actions/designadminpanel.php:279
+#: actions/designadminpanel.php:322

 #, php-format
 msgid "Theme not available: %s."
 msgstr ""
 
 #, php-format
 msgid "Theme not available: %s."
 msgstr ""
 

-#: actions/designadminpanel.php:375
+#: actions/designadminpanel.php:426

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

-#: actions/designadminpanel.php:380
+#: actions/designadminpanel.php:431

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

-#: actions/designadminpanel.php:387
+#: actions/designadminpanel.php:443

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

-#: actions/designadminpanel.php:404
+#: actions/designadminpanel.php:460

 msgid "Site theme"
 msgstr ""
 
 msgid "Site theme"
 msgstr ""
 

-#: actions/designadminpanel.php:405
+#: actions/designadminpanel.php:461

 msgid "Theme for the site."
 msgstr ""
 
 msgid "Theme for the site."
 msgstr ""
 

-#: actions/designadminpanel.php:417 lib/designsettings.php:101
+#: actions/designadminpanel.php:467
+msgid "Custom theme"
+msgstr ""
+
+#: actions/designadminpanel.php:471
+msgid "You can upload a custom StatusNet theme as a .ZIP archive."
+msgstr ""
+
+#: actions/designadminpanel.php:486 lib/designsettings.php:101

 msgid "Change background image"
 msgstr ""
 
 msgid "Change background image"
 msgstr ""
 

-#: actions/designadminpanel.php:422 actions/designadminpanel.php:497
+#: actions/designadminpanel.php:491 actions/designadminpanel.php:574

 #: lib/designsettings.php:178
 msgid "Background"
 msgstr ""
 
 #: lib/designsettings.php:178
 msgid "Background"
 msgstr ""
 

-#: actions/designadminpanel.php:427
+#: actions/designadminpanel.php:496

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

-#: actions/designadminpanel.php:457 lib/designsettings.php:139
+#. TRANS: Used as radio button label to add a background image.
+#: actions/designadminpanel.php:527 lib/designsettings.php:139

 msgid "On"
 msgstr ""
 
 msgid "On"
 msgstr ""
 

-#: actions/designadminpanel.php:473 lib/designsettings.php:155
+#. TRANS: Used as radio button label to not add a background image.
+#: actions/designadminpanel.php:544 lib/designsettings.php:155

 msgid "Off"
 msgstr ""
 
 msgid "Off"
 msgstr ""
 

-#: actions/designadminpanel.php:474 lib/designsettings.php:156
+#: actions/designadminpanel.php:545 lib/designsettings.php:156

 msgid "Turn background image on or off."
 msgstr ""
 
 msgid "Turn background image on or off."
 msgstr ""
 

-#: actions/designadminpanel.php:479 lib/designsettings.php:161
+#: actions/designadminpanel.php:550 lib/designsettings.php:161

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

-#: actions/designadminpanel.php:488 lib/designsettings.php:170
+#: actions/designadminpanel.php:564 lib/designsettings.php:170

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

-#: actions/designadminpanel.php:510 lib/designsettings.php:191
+#: actions/designadminpanel.php:587 lib/designsettings.php:191

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

-#: actions/designadminpanel.php:523 lib/designsettings.php:204
+#: actions/designadminpanel.php:600 lib/designsettings.php:204

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

-#: actions/designadminpanel.php:536 lib/designsettings.php:217
+#: actions/designadminpanel.php:613 lib/designsettings.php:217

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

-#: actions/designadminpanel.php:549 lib/designsettings.php:230
+#: actions/designadminpanel.php:626 lib/designsettings.php:230

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

-#: actions/designadminpanel.php:577 lib/designsettings.php:247
+#: actions/designadminpanel.php:651
+msgid "Advanced"
+msgstr ""
+
+#: actions/designadminpanel.php:655
+msgid "Custom CSS"
+msgstr ""
+
+#: actions/designadminpanel.php:676 lib/designsettings.php:247

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

-#: actions/designadminpanel.php:578 lib/designsettings.php:248
+#: actions/designadminpanel.php:677 lib/designsettings.php:248

 msgid "Restore default designs"
 msgstr ""
 
 msgid "Restore default designs"
 msgstr ""
 

-#: actions/designadminpanel.php:584 lib/designsettings.php:254
+#: actions/designadminpanel.php:683 lib/designsettings.php:254

 msgid "Reset back to default"
 msgstr ""
 
 msgid "Reset back to default"
 msgstr ""
 

-#: actions/designadminpanel.php:586 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
+#. TRANS: Submit button title
+#: actions/designadminpanel.php:685 actions/othersettings.php:126

 #: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
 #: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292

-#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
-#: actions/tagother.php:154 actions/useradminpanel.php:294
-#: lib/applicationeditform.php:333 lib/applicationeditform.php:334
+#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
+#: actions/subscriptions.php:226 actions/tagother.php:154
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:363

 #: lib/designsettings.php:256 lib/groupeditform.php:202
 msgid "Save"
 msgstr ""
 
 #: lib/designsettings.php:256 lib/groupeditform.php:202
 msgid "Save"
 msgstr ""
 

-#: actions/designadminpanel.php:587 lib/designsettings.php:257
+#: actions/designadminpanel.php:686 lib/designsettings.php:257

 msgid "Save design"
 msgstr ""
 
 msgid "Save design"
 msgstr ""
 


@@ -1232,7 +1310,8 @@ msgstr ""
 msgid "Could not update group."
 msgstr ""
 
 msgid "Could not update group."
 msgstr ""
 

-#: actions/editgroup.php:264 classes/User_group.php:496
+#. TRANS: Server exception thrown when creating group aliases failed.
+#: actions/editgroup.php:264 classes/User_group.php:514

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


@@ -1240,178 +1319,229 @@ msgstr ""
 msgid "Options saved."
 msgstr ""
 
 msgid "Options saved."
 msgstr ""
 

-#: actions/emailsettings.php:60
+#. TRANS: Title for e-mail settings.
+#: actions/emailsettings.php:61

 msgid "Email settings"
 msgstr ""
 
 msgid "Email settings"
 msgstr ""
 

-#: actions/emailsettings.php:71
+#. TRANS: E-mail settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/emailsettings.php:76

 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr ""
 
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr ""
 

-#: actions/emailsettings.php:100 actions/imsettings.php:100
-#: actions/smssettings.php:104
-msgid "Address"
+#. TRANS: Form legend for e-mail settings form.
+#. TRANS: Field label for e-mail address input in e-mail settings form.
+#: actions/emailsettings.php:106 actions/emailsettings.php:132
+msgid "Email address"

 msgstr ""
 
 msgstr ""
 

-#: actions/emailsettings.php:105
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:112

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

-#: actions/emailsettings.php:107 actions/emailsettings.php:140
-#: actions/imsettings.php:108 actions/smssettings.php:115
-#: actions/smssettings.php:158
+#. TRANS: Button label to remove a confirmed e-mail address.
+#. TRANS: Button label for removing a set sender e-mail address to post notices from.
+#. TRANS: Button label to remove a confirmed IM address.
+#. TRANS: Button label to remove a confirmed SMS address.
+#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
+#: actions/emailsettings.php:115 actions/emailsettings.php:158
+#: actions/imsettings.php:116 actions/smssettings.php:124
+#: actions/smssettings.php:180
+msgctxt "BUTTON"

 msgid "Remove"
 msgstr ""
 
 msgid "Remove"
 msgstr ""
 

-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:122

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

-#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126 lib/applicationeditform.php:331
-#: lib/applicationeditform.php:332
+#. TRANS: Button label to cancel an e-mail address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
+#. TRANS: Button label to cancel a SMS address confirmation procedure.
+#. TRANS: Button label
+#: actions/emailsettings.php:127 actions/imsettings.php:131
+#: actions/smssettings.php:137 lib/applicationeditform.php:357
+msgctxt "BUTTON"

 msgid "Cancel"
 msgstr ""
 
 msgid "Cancel"
 msgstr ""
 

-#: actions/emailsettings.php:121
-msgid "Email address"
-msgstr ""
-
-#: actions/emailsettings.php:123
+#. TRANS: Instructions for e-mail address input form.
+#: actions/emailsettings.php:135

 msgid "Email address, like \"UserName@example.org\""
 msgstr ""
 
 msgid "Email address, like \"UserName@example.org\""
 msgstr ""
 

-#: actions/emailsettings.php:126 actions/imsettings.php:133
-#: actions/smssettings.php:145
+#. TRANS: Button label for adding an e-mail address in e-mail settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
+#. TRANS: Button label for adding a SMS phone number in SMS settings form.
+#: actions/emailsettings.php:139 actions/imsettings.php:148
+#: actions/smssettings.php:162
+msgctxt "BUTTON"

 msgid "Add"
 msgstr ""
 
 msgid "Add"
 msgstr ""
 

-#: actions/emailsettings.php:133 actions/smssettings.php:152
+#. TRANS: Form legend for incoming e-mail settings form.
+#. TRANS: Form legend for incoming SMS settings form.
+#: actions/emailsettings.php:147 actions/smssettings.php:171

 msgid "Incoming email"
 msgstr ""
 
 msgid "Incoming email"
 msgstr ""
 

-#: actions/emailsettings.php:138 actions/smssettings.php:157
+#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
+#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
+#: actions/emailsettings.php:155 actions/smssettings.php:178

 msgid "Send email to this address to post new notices."
 msgstr ""
 
 msgid "Send email to this address to post new notices."
 msgstr ""
 

-#: actions/emailsettings.php:145 actions/smssettings.php:162
+#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming SMS e-mail address input form.
+#: actions/emailsettings.php:164 actions/smssettings.php:186

 msgid "Make a new email address for posting to; cancels the old one."
 msgstr ""
 
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr ""
 

-#: actions/emailsettings.php:148 actions/smssettings.php:164
+#. TRANS: Button label for adding an e-mail address to send notices from.
+#. TRANS: Button label for adding an SMS e-mail address to send notices from.
+#: actions/emailsettings.php:168 actions/smssettings.php:189
+msgctxt "BUTTON"

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

-#: actions/emailsettings.php:153 actions/imsettings.php:139
-#: actions/smssettings.php:169
-msgid "Preferences"
+#. TRANS: Form legend for e-mail preferences form.
+#: actions/emailsettings.php:174
+msgid "Email preferences"

 msgstr ""
 
 msgstr ""
 

-#: actions/emailsettings.php:158
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:180

 msgid "Send me notices of new subscriptions through email."
 msgstr ""
 
 msgid "Send me notices of new subscriptions through email."
 msgstr ""
 

-#: actions/emailsettings.php:163
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:186

 msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 

-#: actions/emailsettings.php:169
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:193

 msgid "Send me email when someone sends me a private message."
 msgstr ""
 
 msgid "Send me email when someone sends me a private message."
 msgstr ""
 

-#: actions/emailsettings.php:174
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:199

 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr ""
 
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr ""
 

-#: actions/emailsettings.php:179
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:205

 msgid "Allow friends to nudge me and send me an email."
 msgstr ""
 
 msgid "Allow friends to nudge me and send me an email."
 msgstr ""
 

-#: actions/emailsettings.php:185
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:212

 msgid "I want to post notices by email."
 msgstr ""
 
 msgid "I want to post notices by email."
 msgstr ""
 

-#: actions/emailsettings.php:191
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:219

 msgid "Publish a MicroID for my email address."
 msgstr ""
 
 msgid "Publish a MicroID for my email address."
 msgstr ""
 

-#: actions/emailsettings.php:302 actions/imsettings.php:264
-#: actions/othersettings.php:180 actions/smssettings.php:284
-msgid "Preferences saved."
+#. TRANS: Confirmation message for successful e-mail preferences save.
+#: actions/emailsettings.php:334
+msgid "Email preferences saved."

 msgstr ""
 
 msgstr ""
 

-#: actions/emailsettings.php:320
+#. TRANS: Message given saving e-mail address without having provided one.
+#: actions/emailsettings.php:353

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

-#: actions/emailsettings.php:327
+#. TRANS: Message given saving e-mail address that cannot be normalised.
+#: actions/emailsettings.php:361

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

-#: actions/emailsettings.php:331 actions/register.php:201
+#. TRANS: Message given saving e-mail address that not valid.
+#: actions/emailsettings.php:366 actions/register.php:208

 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr ""
 
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr ""
 

-#: actions/emailsettings.php:334
+#. TRANS: Message given saving e-mail address that is already set.
+#: actions/emailsettings.php:370

 msgid "That is already your email address."
 msgstr ""
 
 msgid "That is already your email address."
 msgstr ""
 

-#: actions/emailsettings.php:337
+#. TRANS: Message given saving e-mail address that is already set for another user.
+#: actions/emailsettings.php:374

 msgid "That email address already belongs to another user."
 msgstr ""
 
 msgid "That email address already belongs to another user."
 msgstr ""
 

-#: actions/emailsettings.php:353 actions/imsettings.php:319
-#: actions/smssettings.php:337
+#. TRANS: Server error thrown on database error adding e-mail confirmation code.
+#. TRANS: Server error thrown on database error adding IM confirmation code.
+#. TRANS: Server error thrown on database error adding SMS confirmation code.
+#: actions/emailsettings.php:391 actions/imsettings.php:348
+#: actions/smssettings.php:373

 msgid "Couldn't insert confirmation code."
 msgstr ""
 
 msgid "Couldn't insert confirmation code."
 msgstr ""
 

-#: actions/emailsettings.php:359
+#. TRANS: Message given saving valid e-mail address that is to be confirmed.
+#: actions/emailsettings.php:398

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

-#: actions/emailsettings.php:379 actions/imsettings.php:351
-#: actions/smssettings.php:370
+#. TRANS: Message given canceling e-mail address confirmation that is not pending.
+#. TRANS: Message given canceling IM address confirmation that is not pending.
+#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
+#: actions/emailsettings.php:419 actions/imsettings.php:383
+#: actions/smssettings.php:408

 msgid "No pending confirmation to cancel."
 msgstr ""
 
 msgid "No pending confirmation to cancel."
 msgstr ""
 

-#: actions/emailsettings.php:383 actions/imsettings.php:355
-msgid "That is the wrong IM address."
+#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
+#: actions/emailsettings.php:424
+msgid "That is the wrong email address."

 msgstr ""
 
 msgstr ""
 

-#: actions/emailsettings.php:395 actions/imsettings.php:367
-#: actions/smssettings.php:386
-msgid "Confirmation cancelled."
+#. TRANS: Message given after successfully canceling e-mail address confirmation.
+#: actions/emailsettings.php:438
+msgid "Email confirmation cancelled."

 msgstr ""
 
 msgstr ""
 

-#: actions/emailsettings.php:413
+#. TRANS: Message given trying to remove an e-mail address that is not
+#. TRANS: registered for the active user.
+#: actions/emailsettings.php:458

 msgid "That is not your email address."
 msgstr ""
 
 msgid "That is not your email address."
 msgstr ""
 

-#: actions/emailsettings.php:432 actions/imsettings.php:408
-#: actions/smssettings.php:425
-msgid "The address was removed."
+#. TRANS: Message given after successfully removing a registered e-mail address.
+#: actions/emailsettings.php:479
+msgid "The email address was removed."

 msgstr ""
 
 msgstr ""
 

-#: actions/emailsettings.php:446 actions/smssettings.php:518
+#: actions/emailsettings.php:493 actions/smssettings.php:568

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

-#: actions/emailsettings.php:456 actions/emailsettings.php:478
-#: actions/smssettings.php:528 actions/smssettings.php:552
+#. TRANS: Server error thrown on database error removing incoming e-mail address.
+#. TRANS: Server error thrown on database error adding incoming e-mail address.
+#: actions/emailsettings.php:504 actions/emailsettings.php:528
+#: actions/smssettings.php:578 actions/smssettings.php:602

 msgid "Couldn't update user record."
 msgstr ""
 
 msgid "Couldn't update user record."
 msgstr ""
 

-#: actions/emailsettings.php:459 actions/smssettings.php:531
+#. TRANS: Message given after successfully removing an incoming e-mail address.
+#: actions/emailsettings.php:508 actions/smssettings.php:581

 msgid "Incoming email address removed."
 msgstr ""
 
 msgid "Incoming email address removed."
 msgstr ""
 

-#: actions/emailsettings.php:481 actions/smssettings.php:555
+#. TRANS: Message given after successfully adding an incoming e-mail address.
+#: actions/emailsettings.php:532 actions/smssettings.php:605

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


@@ -1554,13 +1684,13 @@ msgstr ""
 
 #: actions/groupblock.php:71 actions/groupunblock.php:71
 #: actions/makeadmin.php:71 actions/subedit.php:46
 
 #: actions/groupblock.php:71 actions/groupunblock.php:71
 #: actions/makeadmin.php:71 actions/subedit.php:46

-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79

 msgid "No profile specified."
 msgstr ""
 
 #: actions/groupblock.php:76 actions/groupunblock.php:76
 #: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
 msgid "No profile specified."
 msgstr ""
 
 #: actions/groupblock.php:76 actions/groupunblock.php:76
 #: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46

-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86

 msgid "No profile with that ID."
 msgstr ""
 
 msgid "No profile with that ID."
 msgstr ""
 


@@ -1581,7 +1711,7 @@ msgstr ""
 msgid "User is not a member of group."
 msgstr ""
 
 msgid "User is not a member of group."
 msgstr ""
 

-#: actions/groupblock.php:134 actions/groupmembers.php:356
+#: actions/groupblock.php:134 actions/groupmembers.php:360

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


@@ -1593,15 +1723,17 @@ msgid ""
 "the group in the future."
 msgstr ""
 
 "the group in the future."
 msgstr ""
 

-#: actions/groupblock.php:176
+#. TRANS: Submit button title for 'No' when blocking a user from a group.
+#: actions/groupblock.php:182

 msgid "Do not block this user from this group"
 msgstr ""
 
 msgid "Do not block this user from this group"
 msgstr ""
 

-#: actions/groupblock.php:177
+#. TRANS: Submit button title for 'Yes' when blocking a user from a group.
+#: actions/groupblock.php:189

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

-#: actions/groupblock.php:194
+#: actions/groupblock.php:206

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


@@ -1672,29 +1804,33 @@ msgstr ""
 msgid "Admin"
 msgstr ""
 
 msgid "Admin"
 msgstr ""
 

-#: actions/groupmembers.php:388 lib/blockform.php:69
+#: actions/groupmembers.php:392 lib/blockform.php:69

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

-#: actions/groupmembers.php:483
+#: actions/groupmembers.php:487

 msgid "Make user an admin of the group"
 msgstr ""
 
 msgid "Make user an admin of the group"
 msgstr ""
 

-#: actions/groupmembers.php:515
+#: actions/groupmembers.php:519

 msgid "Make Admin"
 msgstr ""
 
 msgid "Make Admin"
 msgstr ""
 

-#: actions/groupmembers.php:515
+#: actions/groupmembers.php:519

 msgid "Make this user an admin"
 msgstr ""
 
 msgid "Make this user an admin"
 msgstr ""
 

-#: actions/grouprss.php:138 actions/userrss.php:93
-#: lib/atomgroupnoticefeed.php:61 lib/atomusernoticefeed.php:67
+#. TRANS: Message is used as link title. %s is a user nickname.
+#. TRANS: Title in atom group notice feed. %s is a group name.
+#. TRANS: Title in atom user notice feed. %s is a user name.
+#: actions/grouprss.php:139 actions/userrss.php:94
+#: lib/atomgroupnoticefeed.php:63 lib/atomusernoticefeed.php:69

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

-#: actions/grouprss.php:140
+#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
+#: actions/grouprss.php:142

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


@@ -1719,7 +1855,7 @@ msgid ""
 "%%%%)"
 msgstr ""
 
 "%%%%)"
 msgstr ""
 

-#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
+#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122

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


@@ -1765,90 +1901,144 @@ msgstr ""
 msgid "Error removing the block."
 msgstr ""
 
 msgid "Error removing the block."
 msgstr ""
 

-#: actions/imsettings.php:59
+#. TRANS: Title for instance messaging settings.
+#: actions/imsettings.php:60

 msgid "IM settings"
 msgstr ""
 
 msgid "IM settings"
 msgstr ""
 

-#: actions/imsettings.php:70
+#. TRANS: Instant messaging settings page instructions.
+#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
+#. TRANS: the order and formatting of link text and link should remain unchanged.
+#: actions/imsettings.php:74

 #, php-format
 msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
 "doc.im%%). Configure your address and settings below."
 msgstr ""
 
 #, php-format
 msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
 "doc.im%%). Configure your address and settings below."
 msgstr ""
 

-#: actions/imsettings.php:89
+#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
+#: actions/imsettings.php:94

 msgid "IM is not available."
 msgstr ""
 
 msgid "IM is not available."
 msgstr ""
 

-#: actions/imsettings.php:106
+#. TRANS: Form legend for IM settings form.
+#. TRANS: Field label for IM address input in IM settings form.
+#: actions/imsettings.php:106 actions/imsettings.php:136
+msgid "IM address"
+msgstr ""
+
+#: actions/imsettings.php:113

 msgid "Current confirmed Jabber/GTalk address."
 msgstr ""
 
 msgid "Current confirmed Jabber/GTalk address."
 msgstr ""
 

-#: actions/imsettings.php:114
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:124

 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
 "message with further instructions. (Did you add %s to your buddy list?)"
 msgstr ""
 
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
 "message with further instructions. (Did you add %s to your buddy list?)"
 msgstr ""
 

-#: actions/imsettings.php:124
-msgid "IM address"
-msgstr ""
-
-#: actions/imsettings.php:126
+#. TRANS: IM address input field instructions in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:140

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

-#: actions/imsettings.php:143
+#. TRANS: Form legend for IM preferences form.
+#: actions/imsettings.php:155
+msgid "IM preferences"
+msgstr ""
+
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:160

 msgid "Send me notices through Jabber/GTalk."
 msgstr ""
 
 msgid "Send me notices through Jabber/GTalk."
 msgstr ""
 

-#: actions/imsettings.php:148
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:166

 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr ""
 
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr ""
 

-#: actions/imsettings.php:153
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:172

 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 

-#: actions/imsettings.php:159
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:179

 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr ""
 
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr ""
 

-#: actions/imsettings.php:285
+#. TRANS: Confirmation message for successful IM preferences save.
+#: actions/imsettings.php:287 actions/othersettings.php:180
+msgid "Preferences saved."
+msgstr ""
+
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:309

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

-#: actions/imsettings.php:292
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:317

 msgid "Cannot normalize that Jabber ID"
 msgstr ""
 
 msgid "Cannot normalize that Jabber ID"
 msgstr ""
 

-#: actions/imsettings.php:296
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:322

 msgid "Not a valid Jabber ID"
 msgstr ""
 
 msgid "Not a valid Jabber ID"
 msgstr ""
 

-#: actions/imsettings.php:299
+#. TRANS: Message given saving IM address that is already set.
+#: actions/imsettings.php:326

 msgid "That is already your Jabber ID."
 msgstr ""
 
 msgid "That is already your Jabber ID."
 msgstr ""
 

-#: actions/imsettings.php:302
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:330

 msgid "Jabber ID already belongs to another user."
 msgstr ""
 
 msgid "Jabber ID already belongs to another user."
 msgstr ""
 

-#: actions/imsettings.php:327
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:358

 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
 "s for sending messages to you."
 msgstr ""
 
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
 "s for sending messages to you."
 msgstr ""
 

-#: actions/imsettings.php:387
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:388
+msgid "That is the wrong IM address."
+msgstr ""
+
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:397
+msgid "Couldn't delete IM confirmation."
+msgstr ""
+
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:402
+msgid "IM confirmation cancelled."
+msgstr ""
+
+#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: registered for the active user.
+#: actions/imsettings.php:424

 msgid "That is not your Jabber ID."
 msgstr ""
 
 msgid "That is not your Jabber ID."
 msgstr ""
 

+#. TRANS: Message given after successfully removing a registered IM address.
+#: actions/imsettings.php:447
+msgid "The IM address was removed."
+msgstr ""
+

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


@@ -1889,7 +2079,9 @@ msgstr ""
 msgid "You are already subscribed to these users:"
 msgstr ""
 
 msgid "You are already subscribed to these users:"
 msgstr ""
 

-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414

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


@@ -1982,7 +2174,9 @@ msgstr ""
 msgid "No nickname or ID."
 msgstr ""
 
 msgid "No nickname or ID."
 msgstr ""
 

-#: actions/joingroup.php:141
+#. TRANS: Message given having added a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/joingroup.php:141 lib/command.php:346

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


@@ -1991,58 +2185,63 @@ msgstr ""
 msgid "You must be logged in to leave a group."
 msgstr ""
 
 msgid "You must be logged in to leave a group."
 msgstr ""
 

-#: actions/leavegroup.php:100 lib/command.php:363
+#: actions/leavegroup.php:100 lib/command.php:373

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

-#: actions/leavegroup.php:137
+#. TRANS: Message given having removed a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/leavegroup.php:137 lib/command.php:392

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

-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144

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

-#: actions/login.php:126
+#: actions/login.php:148

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

-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120

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

-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79

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

-#: actions/login.php:227
+#: actions/login.php:249

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

-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485

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

-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487

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

-#: actions/login.php:247
+#: actions/login.php:269

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

-#: actions/login.php:266
+#: actions/login.php:288

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

-#: actions/login.php:270
+#: actions/login.php:292
+msgid "Login with your username and password."
+msgstr ""
+
+#: actions/login.php:295

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

-"Login with your username and password. Don't have a username yet? [Register]"
-"(%%action.register%%) a new account."
+"Don't have a username yet? [Register](%%action.register%%) a new account."

 msgstr ""
 
 #: actions/makeadmin.php:92
 msgstr ""
 
 #: actions/makeadmin.php:92


@@ -2100,12 +2299,12 @@ msgstr ""
 msgid "New message"
 msgstr ""
 
 msgid "New message"
 msgstr ""
 

-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481

 msgid "You can't send a message to this user."
 msgstr ""
 
 msgid "You can't send a message to this user."
 msgstr ""
 

-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
-#: lib/command.php:529
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
+#: lib/command.php:555

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


@@ -2113,7 +2312,7 @@ msgstr ""
 msgid "No recipient specified."
 msgstr ""
 
 msgid "No recipient specified."
 msgstr ""
 

-#: actions/newmessage.php:164 lib/command.php:462
+#: actions/newmessage.php:164 lib/command.php:484

 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""


@@ -2181,7 +2380,7 @@ msgstr ""
 
 #: actions/nudge.php:85
 msgid ""
 
 #: actions/nudge.php:85
 msgid ""

-"This user doesn't allow nudges or hasn't confirmed or set his email yet."
+"This user doesn't allow nudges or hasn't confirmed or set their email yet."

 msgstr ""
 
 #: actions/nudge.php:94
 msgstr ""
 
 #: actions/nudge.php:94


@@ -2234,29 +2433,30 @@ msgstr ""
 msgid "Developers can edit the registration settings for their applications "
 msgstr ""
 
 msgid "Developers can edit the registration settings for their applications "
 msgstr ""
 

-#: actions/oembed.php:79 actions/shownotice.php:100
+#: actions/oembed.php:80 actions/shownotice.php:100

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

-#: actions/oembed.php:86 actions/shownotice.php:175
+#: actions/oembed.php:87 actions/shownotice.php:175

 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr ""
 
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr ""
 
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')

-#: actions/oembed.php:158
+#: actions/oembed.php:159

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

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

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

-#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1068
-#: lib/apiaction.php:1096 lib/apiaction.php:1212
+#. TRANS: Client error on an API request with an unsupported data format.
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1204
+#: lib/apiaction.php:1232 lib/apiaction.php:1355

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


@@ -2359,7 +2559,7 @@ msgid "6 or more characters"
 msgstr ""
 
 #: actions/passwordsettings.php:112 actions/recoverpassword.php:239
 msgstr ""
 
 #: actions/passwordsettings.php:112 actions/recoverpassword.php:239

-#: actions/register.php:433 actions/smssettings.php:134
+#: actions/register.php:440

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


@@ -2371,11 +2571,11 @@ msgstr ""
 msgid "Change"
 msgstr ""
 
 msgid "Change"
 msgstr ""
 

-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237

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

-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240

 msgid "Passwords don't match."
 msgstr ""
 
 msgid "Passwords don't match."
 msgstr ""
 


@@ -2396,7 +2596,7 @@ msgid "Password saved."
 msgstr ""
 
 #. TRANS: Menu item for site administration
 msgstr ""
 
 #. TRANS: Menu item for site administration

-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:382
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:384

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


@@ -2595,42 +2795,43 @@ msgstr ""
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr ""
 
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr ""
 

-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455

 #: actions/showgroup.php:256 actions/tagother.php:104
 #: lib/groupeditform.php:157 lib/userprofile.php:150
 msgid "Full name"
 msgstr ""
 
 #: actions/showgroup.php:256 actions/tagother.php:104
 #: lib/groupeditform.php:157 lib/userprofile.php:150
 msgid "Full name"
 msgstr ""
 

-#: actions/profilesettings.php:115 actions/register.php:453
-#: lib/applicationeditform.php:228 lib/groupeditform.php:161
+#. TRANS: Form input field label.
+#: actions/profilesettings.php:115 actions/register.php:460
+#: lib/applicationeditform.php:244 lib/groupeditform.php:161

 msgid "Homepage"
 msgstr ""
 
 msgid "Homepage"
 msgstr ""
 

-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462

 msgid "URL of your homepage, blog, or profile on another site"
 msgstr ""
 
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr ""
 

-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468

 #, php-format
 msgid "Describe yourself and your interests in %d chars"
 msgstr ""
 
 #, php-format
 msgid "Describe yourself and your interests in %d chars"
 msgstr ""
 

-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471

 msgid "Describe yourself and your interests"
 msgstr ""
 
 msgid "Describe yourself and your interests"
 msgstr ""
 

-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473

 msgid "Bio"
 msgstr ""
 
 msgid "Bio"
 msgstr ""
 

-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478

 #: actions/showgroup.php:265 actions/tagother.php:112
 #: actions/userauthorization.php:166 lib/groupeditform.php:177
 #: lib/userprofile.php:165
 msgid "Location"
 msgstr ""
 
 #: actions/showgroup.php:265 actions/tagother.php:112
 #: actions/userauthorization.php:166 lib/groupeditform.php:177
 #: lib/userprofile.php:165
 msgid "Location"
 msgstr ""
 

-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480

 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr ""
 
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr ""
 


@@ -2670,7 +2871,7 @@ msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
 
 "Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
 

-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230

 #, php-format
 msgid "Bio is too long (max %d chars)."
 msgstr ""
 #, php-format
 msgid "Bio is too long (max %d chars)."
 msgstr ""


@@ -2914,7 +3115,7 @@ msgstr ""
 msgid "Password and confirmation do not match."
 msgstr ""
 
 msgid "Password and confirmation do not match."
 msgstr ""
 

-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255

 msgid "Error setting user."
 msgstr ""
 
 msgid "Error setting user."
 msgstr ""
 


@@ -2922,77 +3123,100 @@ msgstr ""
 msgid "New password successfully saved. You are now logged in."
 msgstr ""
 
 msgid "New password successfully saved. You are now logged in."
 msgstr ""
 

-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412

 msgid "Sorry, only invited people can register."
 msgstr ""
 
 msgid "Sorry, only invited people can register."
 msgstr ""
 

-#: actions/register.php:92
+#: actions/register.php:99

 msgid "Sorry, invalid invitation code."
 msgstr ""
 
 msgid "Sorry, invalid invitation code."
 msgstr ""
 

-#: actions/register.php:112
+#: actions/register.php:119

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

-#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85

 msgid "Register"
 msgstr ""
 
 msgid "Register"
 msgstr ""
 

-#: actions/register.php:135
+#: actions/register.php:142

 msgid "Registration not allowed."
 msgstr ""
 
 msgid "Registration not allowed."
 msgstr ""
 

-#: actions/register.php:198
+#: actions/register.php:205

 msgid "You can't register if you don't agree to the license."
 msgstr ""
 
 msgid "You can't register if you don't agree to the license."
 msgstr ""
 

-#: actions/register.php:212
+#: actions/register.php:219

 msgid "Email address already exists."
 msgstr ""
 
 msgid "Email address already exists."
 msgstr ""
 

-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:250 actions/register.php:272

 msgid "Invalid username or password."
 msgstr ""
 
 msgid "Invalid username or password."
 msgstr ""
 

-#: actions/register.php:343
+#: actions/register.php:350

 msgid ""
 msgid ""

-"With this form you can create  a new account. You can then post notices and "
+"With this form you can create a new account. You can then post notices and "

 "link up to friends and colleagues. "
 msgstr ""
 
 "link up to friends and colleagues. "
 msgstr ""
 

-#: actions/register.php:425
+#: actions/register.php:432

 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
 msgstr ""
 
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
 msgstr ""
 

-#: actions/register.php:430
+#: actions/register.php:437

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

-#: actions/register.php:434
+#: actions/register.php:441

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

-#: actions/register.php:438 actions/register.php:442
-#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:120
+#. TRANS: Link description in user account settings menu.
+#: actions/register.php:445 actions/register.php:449
+#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132

 msgid "Email"
 msgstr ""
 
 msgid "Email"
 msgstr ""
 

-#: actions/register.php:439 actions/register.php:443
+#: actions/register.php:446 actions/register.php:450

 msgid "Used only for updates, announcements, and password recovery"
 msgstr ""
 
 msgid "Used only for updates, announcements, and password recovery"
 msgstr ""
 

-#: actions/register.php:450
+#: actions/register.php:457

 msgid "Longer name, preferably your \"real\" name"
 msgstr ""
 
 msgid "Longer name, preferably your \"real\" name"
 msgstr ""
 

-#: actions/register.php:494
+#: actions/register.php:518
+#, php-format
+msgid ""
+"I understand that content and data of %1$s are private and confidential."
+msgstr ""
+
+#: actions/register.php:528
+#, php-format
+msgid "My text and files are copyright by %1$s."
+msgstr ""
+
+#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
+#: actions/register.php:532
+msgid "My text and files remain under my own copyright."
+msgstr ""
+
+#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
+#: actions/register.php:535
+msgid "All rights reserved."
+msgstr ""
+
+#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
+#: actions/register.php:540

 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
 "email address, IM address, and phone number."
 msgstr ""
 
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
 "email address, IM address, and phone number."
 msgstr ""
 

-#: actions/register.php:542
+#: actions/register.php:583

 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "


@@ -3011,7 +3235,7 @@ msgid ""
 "Thanks for signing up and we hope you enjoy using this service."
 msgstr ""
 
 "Thanks for signing up and we hope you enjoy using this service."
 msgstr ""
 

-#: actions/register.php:566
+#: actions/register.php:607

 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"


@@ -3086,7 +3310,7 @@ msgstr ""
 msgid "You already repeated that notice."
 msgstr ""
 
 msgid "You already repeated that notice."
 msgstr ""
 

-#: actions/repeat.php:114 lib/noticelist.php:667
+#: actions/repeat.php:114 lib/noticelist.php:676

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


@@ -3124,7 +3348,7 @@ msgstr ""
 #, php-format
 msgid ""
 "This is the timeline showing replies to %1$s but %2$s hasn't received a "
 #, php-format
 msgid ""
 "This is the timeline showing replies to %1$s but %2$s hasn't received a "

-"notice to his attention yet."
+"notice to them yet."

 msgstr ""
 
 #: actions/replies.php:204
 msgstr ""
 
 #: actions/replies.php:204


@@ -3137,8 +3361,8 @@ msgstr ""
 #: actions/replies.php:206
 #, php-format
 msgid ""
 #: actions/replies.php:206
 #, php-format
 msgid ""

-"You can try to [nudge %1$s](../%2$s) or [post something to his or her "
-"attention](%%%%action.newnotice%%%%?status_textarea=%3$s)."
+"You can try to [nudge %1$s](../%2$s) or [post something to them](%%%%action."
+"newnotice%%%%?status_textarea=%3$s)."

 msgstr ""
 
 #: actions/repliesrss.php:72
 msgstr ""
 
 #: actions/repliesrss.php:72


@@ -3154,7 +3378,7 @@ msgstr ""
 msgid "User doesn't have this role."
 msgstr ""
 
 msgid "User doesn't have this role."
 msgstr ""
 

-#: actions/rsd.php:146 actions/version.php:157
+#: actions/rsd.php:146 actions/version.php:159

 msgid "StatusNet"
 msgstr ""
 
 msgid "StatusNet"
 msgstr ""
 


@@ -3168,7 +3392,7 @@ msgstr ""
 
 #. TRANS: Menu item for site administration
 #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
 
 #. TRANS: Menu item for site administration
 #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170

-#: lib/adminpanelaction.php:390
+#: lib/adminpanelaction.php:392

 msgid "Sessions"
 msgstr ""
 
 msgid "Sessions"
 msgstr ""
 


@@ -3205,25 +3429,29 @@ msgstr ""
 msgid "Application profile"
 msgstr ""
 
 msgid "Application profile"
 msgstr ""
 

-#: actions/showapplication.php:159 lib/applicationeditform.php:180
+#. TRANS: Form input field label for application icon.
+#: actions/showapplication.php:159 lib/applicationeditform.php:182

 msgid "Icon"
 msgstr ""
 
 msgid "Icon"
 msgstr ""
 

-#: actions/showapplication.php:169 actions/version.php:195
-#: lib/applicationeditform.php:195
+#. TRANS: Form input field label for application name.
+#: actions/showapplication.php:169 actions/version.php:197
+#: lib/applicationeditform.php:199

 msgid "Name"
 msgstr ""
 
 msgid "Name"
 msgstr ""
 

-#: actions/showapplication.php:178 lib/applicationeditform.php:222
+#. TRANS: Form input field label.
+#: actions/showapplication.php:178 lib/applicationeditform.php:235

 msgid "Organization"
 msgstr ""
 
 msgid "Organization"
 msgstr ""
 

-#: actions/showapplication.php:187 actions/version.php:198
-#: lib/applicationeditform.php:209 lib/groupeditform.php:172
+#. TRANS: Form input field label.
+#: actions/showapplication.php:187 actions/version.php:200
+#: lib/applicationeditform.php:216 lib/groupeditform.php:172

 msgid "Description"
 msgstr ""
 
 msgid "Description"
 msgstr ""
 

-#: actions/showapplication.php:192 actions/showgroup.php:444
+#: actions/showapplication.php:192 actions/showgroup.php:436

 #: lib/profileaction.php:187
 msgid "Statistics"
 msgstr ""
 #: lib/profileaction.php:187
 msgid "Statistics"
 msgstr ""


@@ -3308,16 +3536,16 @@ msgstr ""
 #: actions/showfavorites.php:208
 #, php-format
 msgid ""
 #: actions/showfavorites.php:208
 #, php-format
 msgid ""

-"%s hasn't added any notices to his favorites yet. Post something interesting "
-"they would add to their favorites :)"
+"%s hasn't added any favorite notices yet. Post something interesting they "
+"would add to their favorites :)"

 msgstr ""
 
 #: actions/showfavorites.php:212
 #, php-format
 msgid ""
 msgstr ""
 
 #: actions/showfavorites.php:212
 #, php-format
 msgid ""

-"%s hasn't added any notices to his favorites yet. Why not [register an "
-"account](%%%%action.register%%%%) and then post something interesting they "
-"would add to their favorites :)"
+"%s hasn't added any favorite notices yet. Why not [register an account](%%%%"
+"action.register%%%%) and then post something interesting they would add to "
+"their favorites :)"

 msgstr ""
 
 #: actions/showfavorites.php:243
 msgstr ""
 
 #: actions/showfavorites.php:243


@@ -3376,7 +3604,7 @@ msgstr ""
 msgid "FOAF for %s group"
 msgstr ""
 
 msgid "FOAF for %s group"
 msgstr ""
 

-#: actions/showgroup.php:393 actions/showgroup.php:453 lib/groupnav.php:91
+#: actions/showgroup.php:393 actions/showgroup.php:445 lib/groupnav.php:91

 msgid "Members"
 msgstr ""
 
 msgid "Members"
 msgstr ""
 


@@ -3390,11 +3618,11 @@ msgstr ""
 msgid "All members"
 msgstr ""
 
 msgid "All members"
 msgstr ""
 

-#: actions/showgroup.php:447
+#: actions/showgroup.php:439

 msgid "Created"
 msgstr ""
 
 msgid "Created"
 msgstr ""
 

-#: actions/showgroup.php:463
+#: actions/showgroup.php:455

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


@@ -3404,7 +3632,7 @@ msgid ""
 "of this group and many more! ([Read more](%%%%doc.help%%%%))"
 msgstr ""
 
 "of this group and many more! ([Read more](%%%%doc.help%%%%))"
 msgstr ""
 

-#: actions/showgroup.php:469
+#: actions/showgroup.php:461

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


@@ -3413,7 +3641,7 @@ msgid ""
 "their life and interests. "
 msgstr ""
 
 "their life and interests. "
 msgstr ""
 

-#: actions/showgroup.php:497
+#: actions/showgroup.php:489

 msgid "Admins"
 msgstr ""
 
 msgid "Admins"
 msgstr ""
 


@@ -3488,8 +3716,8 @@ msgstr ""
 #: actions/showstream.php:207
 #, php-format
 msgid ""
 #: actions/showstream.php:207
 #, php-format
 msgid ""

-"You can try to nudge %1$s or [post something to his or her attention](%%%%"
-"action.newnotice%%%%?status_textarea=%2$s)."
+"You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
+"%?status_textarea=%2$s)."

 msgstr ""
 
 #: actions/showstream.php:243
 msgstr ""
 
 #: actions/showstream.php:243


@@ -3647,101 +3875,156 @@ msgstr ""
 msgid "Save site notice"
 msgstr ""
 
 msgid "Save site notice"
 msgstr ""
 

-#: actions/smssettings.php:58
+#. TRANS: Title for SMS settings.
+#: actions/smssettings.php:59

 msgid "SMS settings"
 msgstr ""
 
 msgid "SMS settings"
 msgstr ""
 

-#: actions/smssettings.php:69
+#. TRANS: SMS settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/smssettings.php:74

 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr ""
 
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr ""
 

-#: actions/smssettings.php:91
+#. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
+#: actions/smssettings.php:97

 msgid "SMS is not available."
 msgstr ""
 
 msgid "SMS is not available."
 msgstr ""
 

-#: actions/smssettings.php:112
+#. TRANS: Form legend for SMS settings form.
+#: actions/smssettings.php:111
+msgid "SMS address"
+msgstr ""
+
+#. TRANS: Form guide in SMS settings form.
+#: actions/smssettings.php:120

 msgid "Current confirmed SMS-enabled phone number."
 msgstr ""
 
 msgid "Current confirmed SMS-enabled phone number."
 msgstr ""
 

-#: actions/smssettings.php:123
+#. TRANS: Form guide in IM settings form.
+#: actions/smssettings.php:133

 msgid "Awaiting confirmation on this phone number."
 msgstr ""
 
 msgid "Awaiting confirmation on this phone number."
 msgstr ""
 

-#: actions/smssettings.php:130
+#. TRANS: Field label for SMS address input in SMS settings form.
+#: actions/smssettings.php:142

 msgid "Confirmation code"
 msgstr ""
 
 msgid "Confirmation code"
 msgstr ""
 

-#: actions/smssettings.php:131
+#. TRANS: Form field instructions in SMS settings form.
+#: actions/smssettings.php:144

 msgid "Enter the code you received on your phone."
 msgstr ""
 
 msgid "Enter the code you received on your phone."
 msgstr ""
 

-#: actions/smssettings.php:138
+#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
+#: actions/smssettings.php:148
+msgctxt "BUTTON"
+msgid "Confirm"
+msgstr ""
+
+#. TRANS: Field label for SMS phone number input in SMS settings form.
+#: actions/smssettings.php:153

 msgid "SMS phone number"
 msgstr ""
 
 msgid "SMS phone number"
 msgstr ""
 

-#: actions/smssettings.php:140
+#. TRANS: SMS phone number input field instructions in SMS settings form.
+#: actions/smssettings.php:156

 msgid "Phone number, no punctuation or spaces, with area code"
 msgstr ""
 
 msgid "Phone number, no punctuation or spaces, with area code"
 msgstr ""
 

-#: actions/smssettings.php:174
+#. TRANS: Form legend for SMS preferences form.
+#: actions/smssettings.php:195
+msgid "SMS preferences"
+msgstr ""
+
+#. TRANS: Checkbox label in SMS preferences form.
+#: actions/smssettings.php:201

 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
 msgstr ""
 
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
 msgstr ""
 

-#: actions/smssettings.php:306
+#. TRANS: Confirmation message for successful SMS preferences save.
+#: actions/smssettings.php:315
+msgid "SMS preferences saved."
+msgstr ""
+
+#. TRANS: Message given saving SMS phone number without having provided one.
+#: actions/smssettings.php:338

 msgid "No phone number."
 msgstr ""
 
 msgid "No phone number."
 msgstr ""
 

-#: actions/smssettings.php:311
+#. TRANS: Message given saving SMS phone number without having selected a carrier.
+#: actions/smssettings.php:344

 msgid "No carrier selected."
 msgstr ""
 
 msgid "No carrier selected."
 msgstr ""
 

-#: actions/smssettings.php:318
+#. TRANS: Message given saving SMS phone number that is already set.
+#: actions/smssettings.php:352

 msgid "That is already your phone number."
 msgstr ""
 
 msgid "That is already your phone number."
 msgstr ""
 

-#: actions/smssettings.php:321
+#. TRANS: Message given saving SMS phone number that is already set for another user.
+#: actions/smssettings.php:356

 msgid "That phone number already belongs to another user."
 msgstr ""
 
 msgid "That phone number already belongs to another user."
 msgstr ""
 

-#: actions/smssettings.php:347
+#. TRANS: Message given saving valid SMS phone number that is to be confirmed.
+#: actions/smssettings.php:384

 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
 msgstr ""
 
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
 msgstr ""
 

-#: actions/smssettings.php:374
+#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
+#: actions/smssettings.php:413

 msgid "That is the wrong confirmation number."
 msgstr ""
 
 msgid "That is the wrong confirmation number."
 msgstr ""
 

-#: actions/smssettings.php:405
+#. TRANS: Message given after successfully canceling SMS phone number confirmation.
+#: actions/smssettings.php:427
+msgid "SMS confirmation cancelled."
+msgstr ""
+
+#. TRANS: Message given trying to remove an SMS phone number that is not
+#. TRANS: registered for the active user.
+#: actions/smssettings.php:448

 msgid "That is not your phone number."
 msgstr ""
 
 msgid "That is not your phone number."
 msgstr ""
 

-#: actions/smssettings.php:465
+#. TRANS: Message given after successfully removing a registered SMS phone number.
+#: actions/smssettings.php:470
+msgid "The SMS phone number was removed."
+msgstr ""
+
+#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:511

 msgid "Mobile carrier"
 msgstr ""
 
 msgid "Mobile carrier"
 msgstr ""
 

-#: actions/smssettings.php:469
+#. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:516

 msgid "Select a carrier"
 msgstr ""
 
 msgid "Select a carrier"
 msgstr ""
 

-#: actions/smssettings.php:476
+#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
+#. TRANS: %s is an administrative contact's e-mail address.
+#: actions/smssettings.php:525

 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
 "email but isn't listed here, send email to let us know at %s."
 msgstr ""
 
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
 "email but isn't listed here, send email to let us know at %s."
 msgstr ""
 

-#: actions/smssettings.php:498
+#. TRANS: Message given saving SMS phone number confirmation code without having provided one.
+#: actions/smssettings.php:548

 msgid "No code entered"
 msgstr ""
 
 #. TRANS: Menu item for site administration
 #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
 msgid "No code entered"
 msgstr ""
 
 #. TRANS: Menu item for site administration
 #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196

-#: lib/adminpanelaction.php:406
+#: lib/adminpanelaction.php:408

 msgid "Snapshots"
 msgstr ""
 
 msgid "Snapshots"
 msgstr ""
 


@@ -3762,7 +4045,7 @@ msgid "Invalid snapshot report URL."
 msgstr ""
 
 #: actions/snapshotadminpanel.php:200
 msgstr ""
 
 #: actions/snapshotadminpanel.php:200

-msgid "Randomly during Web hit"
+msgid "Randomly during web hit"

 msgstr ""
 
 #: actions/snapshotadminpanel.php:201
 msgstr ""
 
 #: actions/snapshotadminpanel.php:201


@@ -3801,7 +4084,8 @@ msgstr ""
 msgid "You are not subscribed to that profile."
 msgstr ""
 
 msgid "You are not subscribed to that profile."
 msgstr ""
 

-#: actions/subedit.php:83 classes/Subscription.php:132
+#. TRANS: Exception thrown when a subscription could not be stored on the server.
+#: actions/subedit.php:83 classes/Subscription.php:136

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


@@ -3965,10 +4249,6 @@ msgstr ""
 msgid "No such tag."
 msgstr ""
 
 msgid "No such tag."
 msgstr ""
 

-#: actions/twitapitrends.php:85
-msgid "API method under construction."
-msgstr ""
-

 #: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr ""
 #: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr ""


@@ -4018,7 +4298,8 @@ msgstr ""
 msgid "Invalid default subscripton: '%1$s' is not user."
 msgstr ""
 
 msgid "Invalid default subscripton: '%1$s' is not user."
 msgstr ""
 

-#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108
+#. TRANS: Link description in user account settings menu.
+#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:111

 #: lib/personalgroupnav.php:109
 msgid "Profile"
 msgstr ""
 #: lib/personalgroupnav.php:109
 msgid "Profile"
 msgstr ""


@@ -4074,7 +4355,7 @@ msgid ""
 "click “Reject”."
 msgstr ""
 
 "click “Reject”."
 msgstr ""
 

-#: actions/userauthorization.php:196 actions/version.php:165
+#: actions/userauthorization.php:196 actions/version.php:167

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


@@ -4170,48 +4451,54 @@ msgstr ""
 msgid "Enjoy your hotdog!"
 msgstr ""
 
 msgid "Enjoy your hotdog!"
 msgstr ""
 

-#: actions/usergroups.php:64
+#. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
+#: actions/usergroups.php:66

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

-#: actions/usergroups.php:130
+#: actions/usergroups.php:132

 msgid "Search for more groups"
 msgstr ""
 
 msgid "Search for more groups"
 msgstr ""
 

-#: actions/usergroups.php:157
+#: actions/usergroups.php:159

 #, php-format
 msgid "%s is not a member of any group."
 msgstr ""
 
 #, php-format
 msgid "%s is not a member of any group."
 msgstr ""
 

-#: actions/usergroups.php:162
+#: actions/usergroups.php:164

 #, php-format
 msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
 msgstr ""
 
 #, php-format
 msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
 msgstr ""
 

-#: actions/userrss.php:95 lib/atomgroupnoticefeed.php:66
-#: lib/atomusernoticefeed.php:72
+#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
+#. TRANS: Message is used as a subtitle in atom group notice feed.
+#. TRANS: %1$s is a group name, %2$s is a site name.
+#. TRANS: Message is used as a subtitle in atom user notice feed.
+#. TRANS: %1$s is a user name, %2$s is a site name.
+#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70
+#: lib/atomusernoticefeed.php:76

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

-#: actions/version.php:73
+#: actions/version.php:75

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

-#: actions/version.php:153
+#: actions/version.php:155

 #, php-format
 msgid ""
 "This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
 "Inc. and contributors."
 msgstr ""
 
 #, php-format
 msgid ""
 "This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
 "Inc. and contributors."
 msgstr ""
 

-#: actions/version.php:161
+#: actions/version.php:163

 msgid "Contributors"
 msgstr ""
 
 msgid "Contributors"
 msgstr ""
 

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

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


@@ -4219,7 +4506,7 @@ msgid ""
 "any later version. "
 msgstr ""
 
 "any later version. "
 msgstr ""
 

-#: actions/version.php:174
+#: actions/version.php:176

 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "


@@ -4227,378 +4514,505 @@ msgid ""
 "for more details. "
 msgstr ""
 
 "for more details. "
 msgstr ""
 

-#: actions/version.php:180
+#: actions/version.php:182

 #, php-format
 msgid ""
 "You should have received a copy of the GNU Affero General Public License "
 "along with this program.  If not, see %s."
 msgstr ""
 
 #, php-format
 msgid ""
 "You should have received a copy of the GNU Affero General Public License "
 "along with this program.  If not, see %s."
 msgstr ""
 

-#: actions/version.php:189
+#: actions/version.php:191

 msgid "Plugins"
 msgstr ""
 
 msgid "Plugins"
 msgstr ""
 

-#: actions/version.php:196 lib/action.php:766
+#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
+#: actions/version.php:198 lib/action.php:789

 msgid "Version"
 msgstr ""
 
 msgid "Version"
 msgstr ""
 

-#: actions/version.php:197
+#: actions/version.php:199

 msgid "Author(s)"
 msgstr ""
 
 msgid "Author(s)"
 msgstr ""
 

-#: classes/File.php:169
+#. TRANS: Server exception thrown when a URL cannot be processed.
+#: classes/File.php:143
+#, php-format
+msgid "Cannot process URL '%s'"
+msgstr ""
+
+#. TRANS: Server exception thrown when... Robin thinks something is impossible!
+#: classes/File.php:175
+msgid "Robin thinks something is impossible."
+msgstr ""
+
+#. TRANS: Message given if an upload is larger than the configured maximum.
+#. TRANS: %1$d is the byte limit for uploads, %2$d is the byte count for the uploaded file.
+#: classes/File.php:190

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

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

 msgstr ""
 
 msgstr ""
 

-#: classes/File.php:179
+#. TRANS: Message given if an upload would exceed user quota.
+#. TRANS: %d (number) is the user quota in bytes.
+#: classes/File.php:202

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

-#: classes/File.php:186
+#. TRANS: Message given id an upload would exceed a user's monthly quota.
+#. TRANS: $d (number) is the monthly user quota in bytes.
+#: classes/File.php:211

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

-#: classes/Group_member.php:41
+#. TRANS: Client exception thrown if a file upload does not have a valid name.
+#: classes/File.php:248 classes/File.php:263
+msgid "Invalid filename."
+msgstr ""
+
+#. TRANS: Exception thrown when joining a group fails.
+#: classes/Group_member.php:42

 msgid "Group join failed."
 msgstr ""
 
 msgid "Group join failed."
 msgstr ""
 

-#: classes/Group_member.php:53
+#. TRANS: Exception thrown when trying to leave a group the user is not a member of.
+#: classes/Group_member.php:55

 msgid "Not part of group."
 msgstr ""
 
 msgid "Not part of group."
 msgstr ""
 

-#: classes/Group_member.php:60
+#. TRANS: Exception thrown when trying to leave a group fails.
+#: classes/Group_member.php:63

 msgid "Group leave failed."
 msgstr ""
 
 msgid "Group leave failed."
 msgstr ""
 

-#: classes/Local_group.php:41
+#. TRANS: Server exception thrown when updating a local group fails.
+#: classes/Local_group.php:42

 msgid "Could not update local group."
 msgstr ""
 
 msgid "Could not update local group."
 msgstr ""
 

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

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

-#: classes/Message.php:45
+#. TRANS: Exception thrown when database name or Data Source Name could not be found.
+#: classes/Memcached_DataObject.php:533
+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:46

 msgid "You are banned from sending direct messages."
 msgstr ""
 
 msgid "You are banned from sending direct messages."
 msgstr ""
 

-#: classes/Message.php:61
+#. TRANS: Message given when a message could not be stored on the server.
+#: classes/Message.php:63

 msgid "Could not insert message."
 msgstr ""
 
 msgid "Could not insert message."
 msgstr ""
 

-#: classes/Message.php:71
+#. TRANS: Message given when a message could not be updated on the server.
+#: classes/Message.php:74

 msgid "Could not update message with new URI."
 msgstr ""
 
 msgid "Could not update message with new URI."
 msgstr ""
 

-#: classes/Notice.php:175
+#. TRANS: Server exception thrown when a user profile for a notice cannot be found.
+#. TRANS: %1$d is a profile ID (number), %2$d is a notice ID (number).
+#: classes/Notice.php:98

 #, php-format
 #, php-format

-msgid "DB error inserting hashtag: %s"
+msgid "No such profile (%1$d) for notice (%2$d)."

 msgstr ""
 
 msgstr ""
 

-#: classes/Notice.php:244
+#. TRANS: Server exception. %s are the error details.
+#: classes/Notice.php:190
+#, php-format
+msgid "Database error inserting hashtag: %s"
+msgstr ""
+
+#. TRANS: Client exception thrown if a notice contains too many characters.
+#: classes/Notice.php:260

 msgid "Problem saving notice. Too long."
 msgstr ""
 
 msgid "Problem saving notice. Too long."
 msgstr ""
 

-#: classes/Notice.php:248
+#. TRANS: Client exception thrown when trying to save a notice for an unknown user.
+#: classes/Notice.php:265

 msgid "Problem saving notice. Unknown user."
 msgstr ""
 
 msgid "Problem saving notice. Unknown user."
 msgstr ""
 

-#: classes/Notice.php:253
+#. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
+#: classes/Notice.php:271

 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 

-#: classes/Notice.php:259
+#. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
+#: classes/Notice.php:278

 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
 msgstr ""
 
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
 msgstr ""
 

-#: classes/Notice.php:265
+#. TRANS: Client exception thrown when a user tries to post while being banned.
+#: classes/Notice.php:286

 msgid "You are banned from posting notices on this site."
 msgstr ""
 
 msgid "You are banned from posting notices on this site."
 msgstr ""
 

-#: classes/Notice.php:331 classes/Notice.php:357
+#. TRANS: Server exception thrown when a notice cannot be saved.
+#. TRANS: Server exception thrown when a notice cannot be updated.
+#: classes/Notice.php:353 classes/Notice.php:380

 msgid "Problem saving notice."
 msgstr ""
 
 msgid "Problem saving notice."
 msgstr ""
 

-#: classes/Notice.php:964
+#. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
+#: classes/Notice.php:892
+msgid "Bad type provided to saveKnownGroups"
+msgstr ""
+
+#. TRANS: Server exception thrown when an update for a group inbox fails.
+#: classes/Notice.php:991

 msgid "Problem saving group inbox."
 msgstr ""
 
 msgid "Problem saving group inbox."
 msgstr ""
 

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

 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr ""
 
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr ""
 

-#: classes/Subscription.php:74 lib/oauthstore.php:465
+#. 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:737
+#, 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:746
+#, php-format
+msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
+msgstr ""
+
+#. TRANS: Exception thrown when a right for a non-existing user profile is checked.
+#: classes/Remote_profile.php:54
+msgid "Missing profile."
+msgstr ""
+
+#. TRANS: Exception thrown when a tag cannot be saved.
+#: classes/Status_network.php:346
+msgid "Unable to save tag."
+msgstr ""
+
+#. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
+#: classes/Subscription.php:75 lib/oauthstore.php:465

 msgid "You have been banned from subscribing."
 msgstr ""
 
 msgid "You have been banned from subscribing."
 msgstr ""
 

-#: classes/Subscription.php:78
+#. TRANS: Exception thrown when trying to subscribe while already subscribed.
+#: classes/Subscription.php:80

 msgid "Already subscribed!"
 msgstr ""
 
 msgid "Already subscribed!"
 msgstr ""
 

-#: classes/Subscription.php:82
+#. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
+#: classes/Subscription.php:85

 msgid "User has blocked you."
 msgstr ""
 
 msgid "User has blocked you."
 msgstr ""
 

-#: classes/Subscription.php:167
+#. TRANS: Exception thrown when trying to unsibscribe without a subscription.
+#: classes/Subscription.php:171

 msgid "Not subscribed!"
 msgstr ""
 
 msgid "Not subscribed!"
 msgstr ""
 

-#: classes/Subscription.php:173
-msgid "Couldn't delete self-subscription."
+#. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
+#: classes/Subscription.php:178
+msgid "Could not delete self-subscription."

 msgstr ""
 
 msgstr ""
 

-#: classes/Subscription.php:200
-msgid "Couldn't delete subscription OMB token."
+#. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
+#: classes/Subscription.php:206
+msgid "Could not delete subscription OMB token."

 msgstr ""
 
 msgstr ""
 

-#: classes/Subscription.php:211
-msgid "Couldn't delete subscription."
+#. TRANS: Exception thrown when a subscription could not be deleted on the server.
+#: classes/Subscription.php:218
+msgid "Could not delete subscription."

 msgstr ""
 
 msgstr ""
 

-#: classes/User.php:363
+#. TRANS: Notice given on user registration.
+#. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
+#: classes/User.php:365

 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr ""
 
 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr ""
 

-#: classes/User_group.php:480
+#. TRANS: Server exception thrown when creating a group failed.
+#: classes/User_group.php:496

 msgid "Could not create group."
 msgstr ""
 
 msgid "Could not create group."
 msgstr ""
 

-#: classes/User_group.php:489
+#. TRANS: Server exception thrown when updating a group URI failed.
+#: classes/User_group.php:506

 msgid "Could not set group URI."
 msgstr ""
 
 msgid "Could not set group URI."
 msgstr ""
 

-#: classes/User_group.php:510
+#. TRANS: Server exception thrown when setting group membership failed.
+#: classes/User_group.php:529

 msgid "Could not set group membership."
 msgstr ""
 
 msgid "Could not set group membership."
 msgstr ""
 

-#: classes/User_group.php:524
+#. TRANS: Server exception thrown when saving local group information failed.
+#: classes/User_group.php:544

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

-#: lib/accountsettingsaction.php:108
+#. TRANS: Link title attribute in user account settings menu.
+#: lib/accountsettingsaction.php:109

 msgid "Change your profile settings"
 msgstr ""
 
 msgid "Change your profile settings"
 msgstr ""
 

-#: lib/accountsettingsaction.php:112
+#. TRANS: Link title attribute in user account settings menu.
+#: lib/accountsettingsaction.php:116

 msgid "Upload an avatar"
 msgstr ""
 
 msgid "Upload an avatar"
 msgstr ""
 

-#: lib/accountsettingsaction.php:116
+#. TRANS: Link title attribute in user account settings menu.
+#: lib/accountsettingsaction.php:123

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

-#: lib/accountsettingsaction.php:120
+#. TRANS: Link title attribute in user account settings menu.
+#: lib/accountsettingsaction.php:130

 msgid "Change email handling"
 msgstr ""
 
 msgid "Change email handling"
 msgstr ""
 

-#: lib/accountsettingsaction.php:124
+#. TRANS: Link title attribute in user account settings menu.
+#: lib/accountsettingsaction.php:137

 msgid "Design your profile"
 msgstr ""
 
 msgid "Design your profile"
 msgstr ""
 

-#: lib/accountsettingsaction.php:128
-msgid "Other"
+#. TRANS: Link title attribute in user account settings menu.
+#: lib/accountsettingsaction.php:144
+msgid "Other options"

 msgstr ""
 
 msgstr ""
 

-#: lib/accountsettingsaction.php:128
-msgid "Other options"
+#. TRANS: Link description in user account settings menu.
+#: lib/accountsettingsaction.php:146
+msgid "Other"

 msgstr ""
 
 msgstr ""
 

-#: lib/action.php:144
+#. TRANS: Page title. %1$s is the title, %2$s is the site name.
+#: lib/action.php:145

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

-#: lib/action.php:159
+#. TRANS: Page title for a page without a title set.
+#: lib/action.php:161

 msgid "Untitled page"
 msgstr ""
 
 msgid "Untitled page"
 msgstr ""
 

-#: lib/action.php:423
+#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
+#: lib/action.php:436

 msgid "Primary site navigation"
 msgstr ""
 
 #. TRANS: Tooltip for main menu option "Personal"
 msgid "Primary site navigation"
 msgstr ""
 
 #. TRANS: Tooltip for main menu option "Personal"

-#: lib/action.php:429
+#: lib/action.php:442

 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr ""
 
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr ""
 

-#: lib/action.php:432
+#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
+#: lib/action.php:445

 msgctxt "MENU"
 msgid "Personal"
 msgstr ""
 
 #. TRANS: Tooltip for main menu option "Account"
 msgctxt "MENU"
 msgid "Personal"
 msgstr ""
 
 #. TRANS: Tooltip for main menu option "Account"

-#: lib/action.php:434
+#: lib/action.php:447

 msgctxt "TOOLTIP"
 msgid "Change your email, avatar, password, profile"
 msgstr ""
 
 #. TRANS: Tooltip for main menu option "Services"
 msgctxt "TOOLTIP"
 msgid "Change your email, avatar, password, profile"
 msgstr ""
 
 #. TRANS: Tooltip for main menu option "Services"

-#: lib/action.php:439
+#: lib/action.php:452

 msgctxt "TOOLTIP"
 msgid "Connect to services"
 msgstr ""
 
 msgctxt "TOOLTIP"
 msgid "Connect to services"
 msgstr ""
 

-#: lib/action.php:442
+#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
+#: lib/action.php:455

 msgid "Connect"
 msgstr ""
 
 #. TRANS: Tooltip for menu option "Admin"
 msgid "Connect"
 msgstr ""
 
 #. TRANS: Tooltip for menu option "Admin"

-#: lib/action.php:445
+#: lib/action.php:458

 msgctxt "TOOLTIP"
 msgid "Change site configuration"
 msgstr ""
 
 msgctxt "TOOLTIP"
 msgid "Change site configuration"
 msgstr ""
 

-#: lib/action.php:448
+#. TRANS: Main menu option when logged in and site admin for access to site configuration
+#: lib/action.php:461

 msgctxt "MENU"
 msgid "Admin"
 msgstr ""
 
 #. TRANS: Tooltip for main menu option "Invite"
 msgctxt "MENU"
 msgid "Admin"
 msgstr ""
 
 #. TRANS: Tooltip for main menu option "Invite"

-#: lib/action.php:452
+#: lib/action.php:465

 #, php-format
 msgctxt "TOOLTIP"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr ""
 
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr ""
 

-#: lib/action.php:455
+#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
+#: lib/action.php:468

 msgctxt "MENU"
 msgid "Invite"
 msgstr ""
 
 #. TRANS: Tooltip for main menu option "Logout"
 msgctxt "MENU"
 msgid "Invite"
 msgstr ""
 
 #. TRANS: Tooltip for main menu option "Logout"

-#: lib/action.php:461
+#: lib/action.php:474

 msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr ""
 
 msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr ""
 

-#: lib/action.php:464
+#. TRANS: Main menu option when logged in to log out the current user
+#: lib/action.php:477

 msgctxt "MENU"
 msgid "Logout"
 msgstr ""
 
 #. TRANS: Tooltip for main menu option "Register"
 msgctxt "MENU"
 msgid "Logout"
 msgstr ""
 
 #. TRANS: Tooltip for main menu option "Register"

-#: lib/action.php:469
+#: lib/action.php:482

 msgctxt "TOOLTIP"
 msgid "Create an account"
 msgstr ""
 
 msgctxt "TOOLTIP"
 msgid "Create an account"
 msgstr ""
 

-#: lib/action.php:472
+#. TRANS: Main menu option when not logged in to register a new account
+#: lib/action.php:485

 msgctxt "MENU"
 msgid "Register"
 msgstr ""
 
 #. TRANS: Tooltip for main menu option "Login"
 msgctxt "MENU"
 msgid "Register"
 msgstr ""
 
 #. TRANS: Tooltip for main menu option "Login"

-#: lib/action.php:475
+#: lib/action.php:488

 msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr ""
 
 msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr ""
 

-#: lib/action.php:478
+#: lib/action.php:491

 msgctxt "MENU"
 msgid "Login"
 msgstr ""
 
 #. TRANS: Tooltip for main menu option "Help"
 msgctxt "MENU"
 msgid "Login"
 msgstr ""
 
 #. TRANS: Tooltip for main menu option "Help"

-#: lib/action.php:481
+#: lib/action.php:494

 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr ""
 
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr ""
 

-#: lib/action.php:484
+#: lib/action.php:497

 msgctxt "MENU"
 msgid "Help"
 msgstr ""
 
 #. TRANS: Tooltip for main menu option "Search"
 msgctxt "MENU"
 msgid "Help"
 msgstr ""
 
 #. TRANS: Tooltip for main menu option "Search"

-#: lib/action.php:487
+#: lib/action.php:500

 msgctxt "TOOLTIP"
 msgid "Search for people or text"
 msgstr ""
 
 msgctxt "TOOLTIP"
 msgid "Search for people or text"
 msgstr ""
 

-#: lib/action.php:490
+#: lib/action.php:503

 msgctxt "MENU"
 msgid "Search"
 msgstr ""
 
 #. TRANS: DT element for site notice. String is hidden in default CSS.
 #. TRANS: Menu item for site administration
 msgctxt "MENU"
 msgid "Search"
 msgstr ""
 
 #. TRANS: DT element for site notice. String is hidden in default CSS.
 #. TRANS: Menu item for site administration

-#: lib/action.php:512 lib/adminpanelaction.php:398
+#: lib/action.php:525 lib/adminpanelaction.php:400

 msgid "Site notice"
 msgstr ""
 
 msgid "Site notice"
 msgstr ""
 

-#: lib/action.php:578
+#. TRANS: DT element for local views block. String is hidden in default CSS.
+#: lib/action.php:592

 msgid "Local views"
 msgstr ""
 
 msgid "Local views"
 msgstr ""
 

-#: lib/action.php:644
+#. TRANS: DT element for page notice. String is hidden in default CSS.
+#: lib/action.php:659

 msgid "Page notice"
 msgstr ""
 
 msgid "Page notice"
 msgstr ""
 

-#: lib/action.php:746
+#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
+#: lib/action.php:762

 msgid "Secondary site navigation"
 msgstr ""
 
 msgid "Secondary site navigation"
 msgstr ""
 

-#: lib/action.php:751
+#. TRANS: Secondary navigation menu option leading to help on StatusNet.
+#: lib/action.php:768

 msgid "Help"
 msgstr ""
 
 msgid "Help"
 msgstr ""
 

-#: lib/action.php:753
+#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
+#: lib/action.php:771

 msgid "About"
 msgstr ""
 
 msgid "About"
 msgstr ""
 

-#: lib/action.php:755
+#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
+#: lib/action.php:774

 msgid "FAQ"
 msgstr ""
 
 msgid "FAQ"
 msgstr ""
 

-#: lib/action.php:759
+#. TRANS: Secondary navigation menu option leading to Terms of Service.
+#: lib/action.php:779

 msgid "TOS"
 msgstr ""
 
 msgid "TOS"
 msgstr ""
 

-#: lib/action.php:762
+#. TRANS: Secondary navigation menu option leading to privacy policy.
+#: lib/action.php:783

 msgid "Privacy"
 msgstr ""
 
 msgid "Privacy"
 msgstr ""
 

-#: lib/action.php:764
+#. TRANS: Secondary navigation menu option.
+#: lib/action.php:786

 msgid "Source"
 msgstr ""
 
 msgid "Source"
 msgstr ""
 

-#: lib/action.php:768
+#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
+#: lib/action.php:792

 msgid "Contact"
 msgstr ""
 
 msgid "Contact"
 msgstr ""
 

-#: lib/action.php:770
+#: lib/action.php:794

 msgid "Badge"
 msgstr ""
 
 msgid "Badge"
 msgstr ""
 

-#: lib/action.php:798
+#. TRANS: DT element for StatusNet software license.
+#: lib/action.php:823

 msgid "StatusNet software license"
 msgstr ""
 
 msgid "StatusNet software license"
 msgstr ""
 

-#: lib/action.php:803
+#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
+#: lib/action.php:827

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

-"broughtby%%](%%site.broughtbyurl%%). "
+"broughtby%%](%%site.broughtbyurl%%)."

 msgstr ""
 
 msgstr ""
 

-#: lib/action.php:805
+#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
+#: lib/action.php:830

 #, php-format
 #, php-format

-msgid "**%%site.name%%** is a microblogging service. "
+msgid "**%%site.name%%** is a microblogging service."

 msgstr ""
 
 msgstr ""
 

-#: lib/action.php:808
+#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
+#: lib/action.php:834

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


@@ -4606,43 +5020,55 @@ msgid ""
 "org/licensing/licenses/agpl-3.0.html)."
 msgstr ""
 
 "org/licensing/licenses/agpl-3.0.html)."
 msgstr ""
 

-#: lib/action.php:823
+#. TRANS: DT element for StatusNet site content license.
+#: lib/action.php:850

 msgid "Site content license"
 msgstr ""
 
 msgid "Site content license"
 msgstr ""
 

-#: lib/action.php:828
+#. TRANS: Content license displayed when license is set to 'private'.
+#. TRANS: %1$s is the site name.
+#: lib/action.php:857

 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr ""
 
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr ""
 

-#: lib/action.php:833
+#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
+#. TRANS: %1$s is the copyright owner.
+#: lib/action.php:864

 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 

-#: lib/action.php:836
+#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
+#: lib/action.php:868

 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 
 #. TRANS: license message in footer. %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. %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:849
+#: lib/action.php:881

 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 

-#: lib/action.php:1156
+#. TRANS: DT element for pagination (previous/next, etc.).
+#: lib/action.php:1192

 msgid "Pagination"
 msgstr ""
 
 msgid "Pagination"
 msgstr ""
 

-#: lib/action.php:1165
+#. TRANS: Pagination message to go to a page displaying information more in the
+#. TRANS: present than the currently displayed information.
+#: lib/action.php:1203

 msgid "After"
 msgstr ""
 
 msgid "After"
 msgstr ""
 

-#: lib/action.php:1173
+#. TRANS: Pagination message to go to a page displaying information more in the
+#. TRANS: past than the currently displayed information.
+#: lib/action.php:1213

 msgid "Before"
 msgstr ""
 
 msgid "Before"
 msgstr ""
 

-#: lib/activity.php:120
+#. TRANS: Client exception thrown when a feed instance is a DOMDocument.
+#: lib/activity.php:122

 msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 


@@ -4650,25 +5076,25 @@ msgstr ""
 msgid "Can't handle remote content yet."
 msgstr ""
 
 msgid "Can't handle remote content yet."
 msgstr ""
 

-#: lib/activityutils.php:236
+#: lib/activityutils.php:244

 msgid "Can't handle embedded XML content yet."
 msgstr ""
 
 msgid "Can't handle embedded XML content yet."
 msgstr ""
 

-#: lib/activityutils.php:240
+#: lib/activityutils.php:248

 msgid "Can't handle embedded Base64 content yet."
 msgstr ""
 
 msgid "Can't handle embedded Base64 content yet."
 msgstr ""
 

-#. TRANS: Client error message
+#. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.

 #: lib/adminpanelaction.php:98
 msgid "You cannot make changes to this site."
 msgstr ""
 
 #: lib/adminpanelaction.php:98
 msgid "You cannot make changes to this site."
 msgstr ""
 

-#. TRANS: Client error message
+#. TRANS: Client error message throw when a certain panel's settings cannot be changed.

 #: lib/adminpanelaction.php:110
 msgid "Changes to that panel are not allowed."
 msgstr ""
 
 #: lib/adminpanelaction.php:110
 msgid "Changes to that panel are not allowed."
 msgstr ""
 

-#. TRANS: Client error message
+#. TRANS: Client error message.

 #: lib/adminpanelaction.php:229
 msgid "showForm() not implemented."
 msgstr ""
 #: lib/adminpanelaction.php:229
 msgid "showForm() not implemented."
 msgstr ""


@@ -4678,151 +5104,189 @@ msgstr ""
 msgid "saveSettings() not implemented."
 msgstr ""
 
 msgid "saveSettings() not implemented."
 msgstr ""
 

-#. TRANS: Client error message
-#: lib/adminpanelaction.php:283
+#. TRANS: Client error message thrown if design settings could not be deleted in
+#. TRANS: the admin panel Design.
+#: lib/adminpanelaction.php:284

 msgid "Unable to delete design setting."
 msgstr ""
 
 #. TRANS: Menu item title/tooltip
 msgid "Unable to delete design setting."
 msgstr ""
 
 #. TRANS: Menu item title/tooltip

-#: lib/adminpanelaction.php:348
+#: lib/adminpanelaction.php:350

 msgid "Basic site configuration"
 msgstr ""
 
 #. TRANS: Menu item for site administration
 msgid "Basic site configuration"
 msgstr ""
 
 #. TRANS: Menu item for site administration

-#: lib/adminpanelaction.php:350
+#: lib/adminpanelaction.php:352

 msgctxt "MENU"
 msgid "Site"
 msgstr ""
 
 #. TRANS: Menu item title/tooltip
 msgctxt "MENU"
 msgid "Site"
 msgstr ""
 
 #. TRANS: Menu item title/tooltip

-#: lib/adminpanelaction.php:356
+#: lib/adminpanelaction.php:358

 msgid "Design configuration"
 msgstr ""
 
 #. TRANS: Menu item for site administration
 msgid "Design configuration"
 msgstr ""
 
 #. TRANS: Menu item for site administration

-#: lib/adminpanelaction.php:358
+#: lib/adminpanelaction.php:360

 msgctxt "MENU"
 msgid "Design"
 msgstr ""
 
 #. TRANS: Menu item title/tooltip
 msgctxt "MENU"
 msgid "Design"
 msgstr ""
 
 #. TRANS: Menu item title/tooltip

-#: lib/adminpanelaction.php:364
+#: lib/adminpanelaction.php:366

 msgid "User configuration"
 msgstr ""
 
 #. TRANS: Menu item for site administration
 msgid "User configuration"
 msgstr ""
 
 #. TRANS: Menu item for site administration

-#: lib/adminpanelaction.php:366 lib/personalgroupnav.php:115
+#: lib/adminpanelaction.php:368 lib/personalgroupnav.php:115

 msgid "User"
 msgstr ""
 
 #. TRANS: Menu item title/tooltip
 msgid "User"
 msgstr ""
 
 #. TRANS: Menu item title/tooltip

-#: lib/adminpanelaction.php:372
+#: lib/adminpanelaction.php:374

 msgid "Access configuration"
 msgstr ""
 
 #. TRANS: Menu item title/tooltip
 msgid "Access configuration"
 msgstr ""
 
 #. TRANS: Menu item title/tooltip

-#: lib/adminpanelaction.php:380
+#: lib/adminpanelaction.php:382

 msgid "Paths configuration"
 msgstr ""
 
 #. TRANS: Menu item title/tooltip
 msgid "Paths configuration"
 msgstr ""
 
 #. TRANS: Menu item title/tooltip

-#: lib/adminpanelaction.php:388
+#: lib/adminpanelaction.php:390

 msgid "Sessions configuration"
 msgstr ""
 
 #. TRANS: Menu item title/tooltip
 msgid "Sessions configuration"
 msgstr ""
 
 #. TRANS: Menu item title/tooltip

-#: lib/adminpanelaction.php:396
+#: lib/adminpanelaction.php:398

 msgid "Edit site notice"
 msgstr ""
 
 #. TRANS: Menu item title/tooltip
 msgid "Edit site notice"
 msgstr ""
 
 #. TRANS: Menu item title/tooltip

-#: lib/adminpanelaction.php:404
+#: lib/adminpanelaction.php:406

 msgid "Snapshots configuration"
 msgstr ""
 
 msgid "Snapshots configuration"
 msgstr ""
 

-#: lib/apiauth.php:94
+#. TRANS: Client error 401.
+#: lib/apiauth.php:113

 msgid "API resource requires read-write access, but you only have read access."
 msgstr ""
 
 msgid "API resource requires read-write access, but you only have read access."
 msgstr ""
 

-#: lib/apiauth.php:276
-#, php-format
-msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s"
-msgstr ""
-
-#: lib/applicationeditform.php:136
+#. TRANS: Form legend.
+#: lib/applicationeditform.php:137

 msgid "Edit application"
 msgstr ""
 
 msgid "Edit application"
 msgstr ""
 

-#: lib/applicationeditform.php:184
+#. TRANS: Form guide.
+#: lib/applicationeditform.php:187

 msgid "Icon for this application"
 msgstr ""
 
 msgid "Icon for this application"
 msgstr ""
 

-#: lib/applicationeditform.php:204
+#. TRANS: Form input field instructions.
+#: lib/applicationeditform.php:209

 #, php-format
 msgid "Describe your application in %d characters"
 msgstr ""
 
 #, php-format
 msgid "Describe your application in %d characters"
 msgstr ""
 

-#: lib/applicationeditform.php:207
+#. TRANS: Form input field instructions.
+#: lib/applicationeditform.php:213

 msgid "Describe your application"
 msgstr ""
 
 msgid "Describe your application"
 msgstr ""
 

-#: lib/applicationeditform.php:216
-msgid "Source URL"
+#. TRANS: Form input field instructions.
+#: lib/applicationeditform.php:224
+msgid "URL of the homepage of this application"

 msgstr ""
 
 msgstr ""
 

-#: lib/applicationeditform.php:218
-msgid "URL of the homepage of this application"
+#. TRANS: Form input field label.
+#: lib/applicationeditform.php:226
+msgid "Source URL"

 msgstr ""
 
 msgstr ""
 

-#: lib/applicationeditform.php:224
+#. TRANS: Form input field instructions.
+#: lib/applicationeditform.php:233

 msgid "Organization responsible for this application"
 msgstr ""
 
 msgid "Organization responsible for this application"
 msgstr ""
 

-#: lib/applicationeditform.php:230
+#. TRANS: Form input field instructions.
+#: lib/applicationeditform.php:242

 msgid "URL for the homepage of the organization"
 msgstr ""
 
 msgid "URL for the homepage of the organization"
 msgstr ""
 

-#: lib/applicationeditform.php:236
+#. TRANS: Form input field instructions.
+#: lib/applicationeditform.php:251

 msgid "URL to redirect to after authentication"
 msgstr ""
 
 msgid "URL to redirect to after authentication"
 msgstr ""
 

-#: lib/applicationeditform.php:258
+#. TRANS: Radio button label for application type
+#: lib/applicationeditform.php:278

 msgid "Browser"
 msgstr ""
 
 msgid "Browser"
 msgstr ""
 

-#: lib/applicationeditform.php:274
+#. TRANS: Radio button label for application type
+#: lib/applicationeditform.php:295

 msgid "Desktop"
 msgstr ""
 
 msgid "Desktop"
 msgstr ""
 

-#: lib/applicationeditform.php:275
+#. TRANS: Form guide.
+#: lib/applicationeditform.php:297

 msgid "Type of application, browser or desktop"
 msgstr ""
 
 msgid "Type of application, browser or desktop"
 msgstr ""
 

-#: lib/applicationeditform.php:297
+#. TRANS: Radio button label for access type.
+#: lib/applicationeditform.php:320

 msgid "Read-only"
 msgstr ""
 
 msgid "Read-only"
 msgstr ""
 

-#: lib/applicationeditform.php:315
+#. TRANS: Radio button label for access type.
+#: lib/applicationeditform.php:339

 msgid "Read-write"
 msgstr ""
 
 msgid "Read-write"
 msgstr ""
 

-#: lib/applicationeditform.php:316
+#. TRANS: Form guide.
+#: lib/applicationeditform.php:341

 msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 
 msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 

-#: lib/applicationlist.php:154
+#. TRANS: Submit button title
+#: lib/applicationeditform.php:359
+msgid "Cancel"
+msgstr ""
+
+#. TRANS: Application access type
+#: lib/applicationlist.php:136
+msgid "read-write"
+msgstr ""
+
+#. TRANS: Application access type
+#: lib/applicationlist.php:138
+msgid "read-only"
+msgstr ""
+
+#. TRANS: Used in application list. %1$s is a modified date, %2$s is access type (read-write or read-only)
+#: lib/applicationlist.php:144
+#, php-format
+msgid "Approved %1$s - \"%2$s\" access."
+msgstr ""
+
+#. TRANS: Button label
+#: lib/applicationlist.php:159
+msgctxt "BUTTON"

 msgid "Revoke"
 msgstr ""
 
 msgid "Revoke"
 msgstr ""
 

-#: lib/attachmentlist.php:87
+#. TRANS: DT element label in attachment list.
+#: lib/attachmentlist.php:88

 msgid "Attachments"
 msgstr ""
 
 msgid "Attachments"
 msgstr ""
 

-#: lib/attachmentlist.php:263
+#. TRANS: DT element label in attachment list item.
+#: lib/attachmentlist.php:265

 msgid "Author"
 msgstr ""
 
 msgid "Author"
 msgstr ""
 

-#: lib/attachmentlist.php:276
+#. TRANS: DT element label in attachment list item.
+#: lib/attachmentlist.php:279

 msgid "Provider"
 msgstr ""
 
 msgid "Provider"
 msgstr ""
 


@@ -4834,11 +5298,11 @@ msgstr ""
 msgid "Tags for this attachment"
 msgstr ""
 
 msgid "Tags for this attachment"
 msgstr ""
 

-#: lib/authenticationplugin.php:220 lib/authenticationplugin.php:225
+#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:226

 msgid "Password changing failed"
 msgstr ""
 
 msgid "Password changing failed"
 msgstr ""
 

-#: lib/authenticationplugin.php:235
+#: lib/authenticationplugin.php:236

 msgid "Password changing is not allowed"
 msgstr ""
 
 msgid "Password changing is not allowed"
 msgstr ""
 


@@ -4858,34 +5322,40 @@ msgstr ""
 msgid "Notice with that id does not exist"
 msgstr ""
 
 msgid "Notice with that id does not exist"
 msgstr ""
 

-#: lib/command.php:99 lib/command.php:570
+#: lib/command.php:99 lib/command.php:596

 msgid "User has no last notice"
 msgstr ""
 
 msgid "User has no last notice"
 msgstr ""
 

-#: lib/command.php:125
+#. TRANS: Message given requesting a profile for a non-existing user.
+#. TRANS: %s is the nickname of the user for which the profile could not be found.
+#: lib/command.php:127

 #, php-format
 msgid "Could not find a user with nickname %s"
 msgstr ""
 
 #, php-format
 msgid "Could not find a user with nickname %s"
 msgstr ""
 

-#: lib/command.php:143
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:147

 #, php-format
 msgid "Could not find a local user with nickname %s"
 msgstr ""
 
 #, php-format
 msgid "Could not find a local user with nickname %s"
 msgstr ""
 

-#: lib/command.php:176
+#: lib/command.php:180

 msgid "Sorry, this command is not yet implemented."
 msgstr ""
 
 msgid "Sorry, this command is not yet implemented."
 msgstr ""
 

-#: lib/command.php:221
+#: lib/command.php:225

 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr ""
 
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr ""
 

-#: lib/command.php:228
+#. TRANS: Message given having nudged another user.
+#. TRANS: %s is the nickname of the user that was nudged.
+#: lib/command.php:234

 #, php-format
 msgid "Nudge sent to %s"
 msgstr ""
 
 #, php-format
 msgid "Nudge sent to %s"
 msgstr ""
 

-#: lib/command.php:254
+#: lib/command.php:260

 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"


@@ -4893,195 +5363,199 @@ msgid ""
 "Notices: %3$s"
 msgstr ""
 
 "Notices: %3$s"
 msgstr ""
 

-#: lib/command.php:296
+#: lib/command.php:302

 msgid "Notice marked as fave."
 msgstr ""
 
 msgid "Notice marked as fave."
 msgstr ""
 

-#: lib/command.php:317
+#: lib/command.php:323

 msgid "You are already a member of that group"
 msgstr ""
 
 msgid "You are already a member of that group"
 msgstr ""
 

-#: lib/command.php:331
-#, php-format
-msgid "Could not join user %s to group %s"
-msgstr ""
-
-#: lib/command.php:336
-#, php-format
-msgid "%s joined group %s"
-msgstr ""
-
-#: lib/command.php:373
+#. 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.
+#: lib/command.php:339

 #, php-format
 #, php-format

-msgid "Could not remove user %s to group %s"
+msgid "Could not join user %1$s to group %2$s"

 msgstr ""
 
 msgstr ""
 

-#: lib/command.php:378
+#. 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.
+#: lib/command.php:385

 #, php-format
 #, php-format

-msgid "%s left group %s"
+msgid "Could not remove user %1$s from group %2$s"

 msgstr ""
 
 msgstr ""
 

-#: lib/command.php:401
+#. TRANS: Whois output. %s is the full name of the queried user.
+#: lib/command.php:418

 #, php-format
 msgid "Fullname: %s"
 msgstr ""
 
 #, php-format
 msgid "Fullname: %s"
 msgstr ""
 

+#. TRANS: Whois output. %s is the location of the queried user.

 #. TRANS: Profile info line in new-subscriber notification e-mail
 #. TRANS: Profile info line in new-subscriber notification e-mail

-#: lib/command.php:404 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:268

 #, php-format
 msgid "Location: %s"
 msgstr ""
 
 #, php-format
 msgid "Location: %s"
 msgstr ""
 

+#. TRANS: Whois output. %s is the homepage of the queried user.

 #. TRANS: Profile info line in new-subscriber notification e-mail
 #. TRANS: Profile info line in new-subscriber notification e-mail

-#: lib/command.php:407 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:271

 #, php-format
 msgid "Homepage: %s"
 msgstr ""
 
 #, php-format
 msgid "Homepage: %s"
 msgstr ""
 

-#: lib/command.php:410
+#. TRANS: Whois output. %s is the bio information of the queried user.
+#: lib/command.php:430

 #, php-format
 msgid "About: %s"
 msgstr ""
 
 #, php-format
 msgid "About: %s"
 msgstr ""
 

-#: lib/command.php:437
+#: lib/command.php:457

 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
 "same server."
 msgstr ""
 
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
 "same server."
 msgstr ""
 

-#: lib/command.php:450
+#. TRANS: Message given if content is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:472

 #, php-format
 #, php-format

-msgid "Message too long - maximum is %d characters, you sent %d"
+msgid "Message too long - maximum is %1$d characters, you sent %2$d"

 msgstr ""
 
 msgstr ""
 

-#: lib/command.php:468
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: lib/command.php:492

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

-#: lib/command.php:470
+#: lib/command.php:494

 msgid "Error sending direct message."
 msgstr ""
 
 msgid "Error sending direct message."
 msgstr ""
 

-#: lib/command.php:490
+#: lib/command.php:514

 msgid "Cannot repeat your own notice"
 msgstr ""
 
 msgid "Cannot repeat your own notice"
 msgstr ""
 

-#: lib/command.php:495
+#: lib/command.php:519

 msgid "Already repeated that notice"
 msgstr ""
 
 msgid "Already repeated that notice"
 msgstr ""
 

-#: lib/command.php:503
+#. TRANS: Message given having repeated a notice from another user.
+#. TRANS: %s is the name of the user for which the notice was repeated.
+#: lib/command.php:529

 #, php-format
 msgid "Notice from %s repeated"
 msgstr ""
 
 #, php-format
 msgid "Notice from %s repeated"
 msgstr ""
 

-#: lib/command.php:505
+#: lib/command.php:531

 msgid "Error repeating notice."
 msgstr ""
 
 msgid "Error repeating notice."
 msgstr ""
 

-#: lib/command.php:536
+#: lib/command.php:562

 #, php-format
 msgid "Notice too long - maximum is %d characters, you sent %d"
 msgstr ""
 
 #, php-format
 msgid "Notice too long - maximum is %d characters, you sent %d"
 msgstr ""
 

-#: lib/command.php:545
+#: lib/command.php:571

 #, php-format
 msgid "Reply to %s sent"
 msgstr ""
 
 #, php-format
 msgid "Reply to %s sent"
 msgstr ""
 

-#: lib/command.php:547
+#: lib/command.php:573

 msgid "Error saving notice."
 msgstr ""
 
 msgid "Error saving notice."
 msgstr ""
 

-#: lib/command.php:594
+#: lib/command.php:620

 msgid "Specify the name of the user to subscribe to"
 msgstr ""
 
 msgid "Specify the name of the user to subscribe to"
 msgstr ""
 

-#: lib/command.php:602
+#: lib/command.php:628

 msgid "Can't subscribe to OMB profiles by command."
 msgstr ""
 
 msgid "Can't subscribe to OMB profiles by command."
 msgstr ""
 

-#: lib/command.php:608
+#: lib/command.php:634

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

-#: lib/command.php:629 lib/command.php:728
+#: lib/command.php:655 lib/command.php:754

 msgid "Specify the name of the user to unsubscribe from"
 msgstr ""
 
 msgid "Specify the name of the user to unsubscribe from"
 msgstr ""
 

-#: lib/command.php:638
+#: lib/command.php:664

 #, php-format
 msgid "Unsubscribed from %s"
 msgstr ""
 
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr ""
 

-#: lib/command.php:656 lib/command.php:679
+#: lib/command.php:682 lib/command.php:705

 msgid "Command not yet implemented."
 msgstr ""
 
 msgid "Command not yet implemented."
 msgstr ""
 

-#: lib/command.php:659
+#: lib/command.php:685

 msgid "Notification off."
 msgstr ""
 
 msgid "Notification off."
 msgstr ""
 

-#: lib/command.php:661
+#: lib/command.php:687

 msgid "Can't turn off notification."
 msgstr ""
 
 msgid "Can't turn off notification."
 msgstr ""
 

-#: lib/command.php:682
+#: lib/command.php:708

 msgid "Notification on."
 msgstr ""
 
 msgid "Notification on."
 msgstr ""
 

-#: lib/command.php:684
+#: lib/command.php:710

 msgid "Can't turn on notification."
 msgstr ""
 
 msgid "Can't turn on notification."
 msgstr ""
 

-#: lib/command.php:697
+#: lib/command.php:723

 msgid "Login command is disabled"
 msgstr ""
 
 msgid "Login command is disabled"
 msgstr ""
 

-#: lib/command.php:708
+#: lib/command.php:734

 #, php-format
 msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
 
 #, php-format
 msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
 

-#: lib/command.php:735
+#: lib/command.php:761

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

-#: lib/command.php:752
+#: lib/command.php:778

 msgid "You are not subscribed to anyone."
 msgstr ""
 
 msgid "You are not subscribed to anyone."
 msgstr ""
 

-#: lib/command.php:754
+#: lib/command.php:780

 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] ""
 msgstr[1] ""
 
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] ""
 msgstr[1] ""
 

-#: lib/command.php:774
+#: lib/command.php:800

 msgid "No one is subscribed to you."
 msgstr ""
 
 msgid "No one is subscribed to you."
 msgstr ""
 

-#: lib/command.php:776
+#: lib/command.php:802

 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] ""
 msgstr[1] ""
 
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] ""
 msgstr[1] ""
 

-#: lib/command.php:796
+#: lib/command.php:822

 msgid "You are not a member of any groups."
 msgstr ""
 
 msgid "You are not a member of any groups."
 msgstr ""
 

-#: lib/command.php:798
+#: lib/command.php:824

 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] ""
 msgstr[1] ""
 
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] ""
 msgstr[1] ""
 

-#: lib/command.php:812
+#: lib/command.php:838

 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"


@@ -5305,7 +5779,8 @@ msgstr ""
 msgid "Tags in %s group's notices"
 msgstr ""
 
 msgid "Tags in %s group's notices"
 msgstr ""
 

-#: lib/htmloutputter.php:103
+#. TRANS: Client exception 406
+#: lib/htmloutputter.php:104

 msgid "This page is not available in a media type you accept"
 msgstr ""
 
 msgid "This page is not available in a media type you accept"
 msgstr ""
 


@@ -5401,8 +5876,15 @@ msgstr ""
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr ""
 
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr ""
 

+#: lib/mail.php:248
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s"
+msgstr ""
+

 #. TRANS: Main body of new-subscriber notification e-mail
 #. TRANS: Main body of new-subscriber notification e-mail

-#: lib/mail.php:249
+#: lib/mail.php:254

 #, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
 #, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"


@@ -5418,19 +5900,19 @@ msgid ""
 msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail
 msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail

-#: lib/mail.php:269
+#: lib/mail.php:274

 #, php-format
 msgid "Bio: %s"
 msgstr ""
 
 #. TRANS: Subject of notification mail for new posting email address
 #, php-format
 msgid "Bio: %s"
 msgstr ""
 
 #. TRANS: Subject of notification mail for new posting email address

-#: lib/mail.php:298
+#: lib/mail.php:304

 #, php-format
 msgid "New email address for posting to %s"
 msgstr ""
 
 #. TRANS: Body of notification mail for new posting email address
 #, php-format
 msgid "New email address for posting to %s"
 msgstr ""
 
 #. TRANS: Body of notification mail for new posting email address

-#: lib/mail.php:302
+#: lib/mail.php:308

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


@@ -5444,30 +5926,30 @@ msgid ""
 msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages
 msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages

-#: lib/mail.php:427
+#: lib/mail.php:433

 #, 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:454
+#: lib/mail.php:460

 msgid "SMS confirmation"
 msgstr ""
 
 #. TRANS: Main body heading for SMS-by-email address confirmation message
 msgid "SMS confirmation"
 msgstr ""
 
 #. TRANS: Main body heading for SMS-by-email address confirmation message

-#: lib/mail.php:457
+#: lib/mail.php:463

 #, php-format
 msgid "%s: confirm you own this phone number with this code:"
 msgstr ""
 
 #. TRANS: Subject for 'nudge' notification email
 #, php-format
 msgid "%s: confirm you own this phone number with this code:"
 msgstr ""
 
 #. TRANS: Subject for 'nudge' notification email

-#: lib/mail.php:478
+#: lib/mail.php:484

 #, php-format
 msgid "You've been nudged by %s"
 msgstr ""
 
 #. TRANS: Body for 'nudge' notification email
 #, php-format
 msgid "You've been nudged by %s"
 msgstr ""
 
 #. TRANS: Body for 'nudge' notification email

-#: lib/mail.php:483
+#: lib/mail.php:489

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


@@ -5484,13 +5966,13 @@ msgid ""
 msgstr ""
 
 #. TRANS: Subject for direct-message notification email
 msgstr ""
 
 #. TRANS: Subject for direct-message notification email

-#: lib/mail.php:530
+#: lib/mail.php:536

 #, php-format
 msgid "New private message from %s"
 msgstr ""
 
 #. TRANS: Body for direct-message notification email
 #, php-format
 msgid "New private message from %s"
 msgstr ""
 
 #. TRANS: Body for direct-message notification email

-#: lib/mail.php:535
+#: lib/mail.php:541

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


@@ -5510,13 +5992,13 @@ msgid ""
 msgstr ""
 
 #. TRANS: Subject for favorite notification email
 msgstr ""
 
 #. TRANS: Subject for favorite notification email

-#: lib/mail.php:583
+#: lib/mail.php:589

 #, php-format
 msgid "%s (@%s) added your notice as a favorite"
 msgstr ""
 
 #. TRANS: Body for favorite notification email
 #, php-format
 msgid "%s (@%s) added your notice as a favorite"
 msgstr ""
 
 #. TRANS: Body for favorite notification email

-#: lib/mail.php:586
+#: lib/mail.php:592

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


@@ -5538,7 +6020,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:645
+#: lib/mail.php:651

 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"


@@ -5546,13 +6028,13 @@ msgid ""
 "\t%s"
 msgstr ""
 
 "\t%s"
 msgstr ""
 

-#: lib/mail.php:651
+#: lib/mail.php:657

 #, php-format
 msgid "%s (@%s) sent a notice to your attention"
 msgstr ""
 
 #. TRANS: Body of @-reply notification e-mail.
 #, php-format
 msgid "%s (@%s) sent a notice to your attention"
 msgstr ""
 
 #. TRANS: Body of @-reply notification e-mail.

-#: lib/mail.php:654
+#: lib/mail.php:660

 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"


@@ -5589,7 +6071,7 @@ msgid ""
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 

-#: lib/mailbox.php:227 lib/noticelist.php:486
+#: lib/mailbox.php:228 lib/noticelist.php:506

 msgid "from"
 msgstr ""
 
 msgid "from"
 msgstr ""
 


@@ -5644,24 +6126,24 @@ msgstr ""
 msgid "File upload stopped by extension."
 msgstr ""
 
 msgid "File upload stopped by extension."
 msgstr ""
 

-#: lib/mediafile.php:179 lib/mediafile.php:216
+#: lib/mediafile.php:179 lib/mediafile.php:217

 msgid "File exceeds user's quota."
 msgstr ""
 
 msgid "File exceeds user's quota."
 msgstr ""
 

-#: lib/mediafile.php:196 lib/mediafile.php:233
+#: lib/mediafile.php:197 lib/mediafile.php:234

 msgid "File could not be moved to destination directory."
 msgstr ""
 
 msgid "File could not be moved to destination directory."
 msgstr ""
 

-#: lib/mediafile.php:201 lib/mediafile.php:237
+#: lib/mediafile.php:202 lib/mediafile.php:238

 msgid "Could not determine file's MIME type."
 msgstr ""
 
 msgid "Could not determine file's MIME type."
 msgstr ""
 

-#: lib/mediafile.php:270
+#: lib/mediafile.php:318

 #, php-format
 msgid " Try using another %s format."
 msgstr ""
 
 #, php-format
 msgid " Try using another %s format."
 msgstr ""
 

-#: lib/mediafile.php:275
+#: lib/mediafile.php:323

 #, php-format
 msgid "%s is not a supported file type on this server."
 msgstr ""
 #, php-format
 msgid "%s is not a supported file type on this server."
 msgstr ""


@@ -5714,48 +6196,52 @@ msgid ""
 "try again later"
 msgstr ""
 
 "try again later"
 msgstr ""
 

-#: lib/noticelist.php:430
-#, php-format
-msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
-msgstr ""
-
-#: lib/noticelist.php:431
+#. TRANS: Used in coordinates as abbreviation of north
+#: lib/noticelist.php:436

 msgid "N"
 msgstr ""
 
 msgid "N"
 msgstr ""
 

-#: lib/noticelist.php:431
+#. TRANS: Used in coordinates as abbreviation of south
+#: lib/noticelist.php:438

 msgid "S"
 msgstr ""
 
 msgid "S"
 msgstr ""
 

-#: lib/noticelist.php:432
+#. TRANS: Used in coordinates as abbreviation of east
+#: lib/noticelist.php:440

 msgid "E"
 msgstr ""
 
 msgid "E"
 msgstr ""
 

-#: lib/noticelist.php:432
+#. TRANS: Used in coordinates as abbreviation of west
+#: lib/noticelist.php:442

 msgid "W"
 msgstr ""
 
 msgid "W"
 msgstr ""
 

-#: lib/noticelist.php:439
+#: lib/noticelist.php:444
+#, php-format
+msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
+msgstr ""
+
+#: lib/noticelist.php:453

 msgid "at"
 msgstr ""
 
 msgid "at"
 msgstr ""
 

-#: lib/noticelist.php:559
+#: lib/noticelist.php:568

 msgid "in context"
 msgstr ""
 
 msgid "in context"
 msgstr ""
 

-#: lib/noticelist.php:594
+#: lib/noticelist.php:603

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

-#: lib/noticelist.php:621
+#: lib/noticelist.php:630

 msgid "Reply to this notice"
 msgstr ""
 
 msgid "Reply to this notice"
 msgstr ""
 

-#: lib/noticelist.php:622
+#: lib/noticelist.php:631

 msgid "Reply"
 msgstr ""
 
 msgid "Reply"
 msgstr ""
 

-#: lib/noticelist.php:666
+#: lib/noticelist.php:675

 msgid "Notice repeated"
 msgstr ""
 
 msgid "Notice repeated"
 msgstr ""
 


@@ -5828,7 +6314,7 @@ msgstr ""
 msgid "Tags in %s's notices"
 msgstr ""
 
 msgid "Tags in %s's notices"
 msgstr ""
 

-#: lib/plugin.php:114
+#: lib/plugin.php:115

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


@@ -5865,7 +6351,7 @@ msgstr ""
 msgid "All groups"
 msgstr ""
 
 msgid "All groups"
 msgstr ""
 

-#: lib/profileformaction.php:114
+#: lib/profileformaction.php:123

 msgid "Unimplemented method."
 msgstr ""
 
 msgid "Unimplemented method."
 msgstr ""
 


@@ -5889,7 +6375,7 @@ msgstr ""
 msgid "Popular"
 msgstr ""
 
 msgid "Popular"
 msgstr ""
 

-#: lib/redirectingaction.php:94
+#: lib/redirectingaction.php:95

 msgid "No return-to arguments."
 msgstr ""
 
 msgid "No return-to arguments."
 msgstr ""
 


@@ -5897,6 +6383,10 @@ msgstr ""
 msgid "Repeat this notice?"
 msgstr ""
 
 msgid "Repeat this notice?"
 msgstr ""
 

+#: lib/repeatform.php:132
+msgid "Yes"
+msgstr ""
+

 #: lib/repeatform.php:132
 msgid "Repeat this notice"
 msgstr ""
 #: lib/repeatform.php:132
 msgid "Repeat this notice"
 msgstr ""


@@ -5906,7 +6396,7 @@ msgstr ""
 msgid "Revoke the \"%s\" role from this user"
 msgstr ""
 
 msgid "Revoke the \"%s\" role from this user"
 msgstr ""
 

-#: lib/router.php:704
+#: lib/router.php:709

 msgid "No single user defined for single-user mode."
 msgstr ""
 
 msgid "No single user defined for single-user mode."
 msgstr ""
 


@@ -6004,6 +6494,48 @@ msgstr ""
 msgid "None"
 msgstr ""
 
 msgid "None"
 msgstr ""
 

+#: lib/themeuploader.php:50
+msgid "This server cannot handle theme uploads without ZIP support."
+msgstr ""
+
+#: lib/themeuploader.php:58 lib/themeuploader.php:61
+msgid "The theme file is missing or the upload failed."
+msgstr ""
+
+#: lib/themeuploader.php:91 lib/themeuploader.php:102
+#: lib/themeuploader.php:253 lib/themeuploader.php:257
+#: lib/themeuploader.php:265 lib/themeuploader.php:272
+msgid "Failed saving theme."
+msgstr ""
+
+#: lib/themeuploader.php:139
+msgid "Invalid theme: bad directory structure."
+msgstr ""
+
+#: lib/themeuploader.php:166
+#, php-format
+msgid "Uploaded theme is too large; must be less than %d bytes uncompressed."
+msgstr ""
+
+#: lib/themeuploader.php:178
+msgid "Invalid theme archive: missing file css/display.css"
+msgstr ""
+
+#: lib/themeuploader.php:205
+msgid ""
+"Theme contains invalid file or folder name. Stick with ASCII letters, "
+"digits, underscore, and minus sign."
+msgstr ""
+
+#: lib/themeuploader.php:216
+#, php-format
+msgid "Theme contains file of type '.%s', which is not allowed."
+msgstr ""
+
+#: lib/themeuploader.php:234
+msgid "Error opening theme archive."
+msgstr ""
+

 #: lib/topposterssection.php:74
 msgid "Top posters"
 msgstr ""
 #: lib/topposterssection.php:74
 msgid "Top posters"
 msgstr ""


@@ -6083,47 +6615,57 @@ msgctxt "role"
 msgid "Moderator"
 msgstr ""
 
 msgid "Moderator"
 msgstr ""
 

-#: lib/util.php:1053
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1100

 msgid "a few seconds ago"
 msgstr ""
 
 msgid "a few seconds ago"
 msgstr ""
 

-#: lib/util.php:1055
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1103

 msgid "about a minute ago"
 msgstr ""
 
 msgid "about a minute ago"
 msgstr ""
 

-#: lib/util.php:1057
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1107

 #, php-format
 msgid "about %d minutes ago"
 msgstr ""
 
 #, php-format
 msgid "about %d minutes ago"
 msgstr ""
 

-#: lib/util.php:1059
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1110

 msgid "about an hour ago"
 msgstr ""
 
 msgid "about an hour ago"
 msgstr ""
 

-#: lib/util.php:1061
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1114

 #, php-format
 msgid "about %d hours ago"
 msgstr ""
 
 #, php-format
 msgid "about %d hours ago"
 msgstr ""
 

-#: lib/util.php:1063
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1117

 msgid "about a day ago"
 msgstr ""
 
 msgid "about a day ago"
 msgstr ""
 

-#: lib/util.php:1065
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1121

 #, php-format
 msgid "about %d days ago"
 msgstr ""
 
 #, php-format
 msgid "about %d days ago"
 msgstr ""
 

-#: lib/util.php:1067
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1124

 msgid "about a month ago"
 msgstr ""
 
 msgid "about a month ago"
 msgstr ""
 

-#: lib/util.php:1069
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1128

 #, php-format
 msgid "about %d months ago"
 msgstr ""
 
 #, php-format
 msgid "about %d months ago"
 msgstr ""
 

-#: lib/util.php:1071
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1131

 msgid "about a year ago"
 msgstr ""
 
 msgid "about a year ago"
 msgstr ""