Merge branch '2828' into 0.9.x

[quix0rs-gnu-social.git] / locale / en_GB / LC_MESSAGES / statusnet.po

diff --git a/locale/en_GB/LC_MESSAGES/statusnet.po b/locale/en_GB/LC_MESSAGES/statusnet.po
index d98905db6b12f053ba5e88f57c5010c4547b964e..ab2386b1980d5087e1df0dc101c112b45349f6e6 100644 (file)
--- a/locale/en_GB/LC_MESSAGES/statusnet.po
+++ b/locale/en_GB/LC_MESSAGES/statusnet.po
@@ -1,30 +1,32 @@
-# Translation of StatusNet to British English
+# Translation of StatusNet - Core to British English (British English)
+# Expored from translatewiki.net

 #
 #

-# Author@translatewiki.net: Brion
-# Author@translatewiki.net: Bruce89
-# Author@translatewiki.net: CiaranG
-# Author@translatewiki.net: Reedy
+# Author: Brion
+# Author: Bruce89
+# Author: CiaranG
+# Author: Reedy

 # --
 # This file is distributed under the same license as the StatusNet package.
 #
 msgid ""
 msgstr ""
 # --
 # This file is distributed under the same license as the StatusNet package.
 #
 msgid ""
 msgstr ""

-"Project-Id-Version: StatusNet\n"
+"Project-Id-Version: StatusNet - Core\n"

 "Report-Msgid-Bugs-To: \n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2010-07-29 18:20+0000\n"
-"PO-Revision-Date: 2010-07-29 18:21:07+0000\n"
-"Language-Team: British English\n"
+"POT-Creation-Date: 2010-10-09 14:04+0000\n"
+"PO-Revision-Date: 2010-10-09 14:06:28+0000\n"
+"Language-Team: British English <http://translatewiki.net/wiki/Portal:en-gb>\n"

 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

-"X-Generator: MediaWiki 1.17alpha (r70152); Translate extension (2010-07-21)\n"
+"X-Generator: MediaWiki 1.17alpha (r74529); Translate extension (2010-09-17)\n"

 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: en-gb\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: en-gb\n"

-"X-Message-Group: out-statusnet\n"
+"X-Message-Group: #out-statusnet-core\n"

 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"

+"X-POT-Import-Date: 2010-10-04 23:06:40+0000\n"

 
 #. 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:376
+#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:363

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


@@ -77,10 +79,10 @@ msgstr "Save access settings"
 #. 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 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
+#. TRANS: Button label in the "Edit application" form.
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:228
+#: actions/imsettings.php:187 actions/smssettings.php:209
+#: lib/applicationeditform.php:355

 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Save"
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Save"


@@ -91,16 +93,17 @@ msgstr "Save"
 msgid "No such page."
 msgstr "No such page."
 
 msgid "No such page."
 msgstr "No such page."
 

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

 #: actions/all.php:79 actions/allrss.php:68
 #: 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/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:228 actions/apisubscriptions.php:87
+#: actions/apiaccountupdatedeliverydevice.php:115
+#: actions/apiaccountupdateprofile.php:106
+#: actions/apiaccountupdateprofilebackgroundimage.php:117
+#: actions/apiaccountupdateprofileimage.php:106 actions/apiblockcreate.php:98
+#: actions/apiblockdestroy.php:97 actions/apidirectmessage.php:77
+#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:114
+#: actions/apigroupismember.php:91 actions/apigroupjoin.php:101
+#: actions/apigroupleave.php:101 actions/apigrouplist.php:73
+#: actions/apistatusesupdate.php:230 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/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174
 #: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80
 #: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75


@@ -110,7 +113,7 @@ msgstr "No such page."
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40

-#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:495 lib/galleryaction.php:59

 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "No such user."
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "No such user."


@@ -168,22 +171,22 @@ msgstr ""
 
 #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@"
 #: actions/all.php:146
 
 #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@"
 #: actions/all.php:146

-#, fuzzy, php-format
+#, php-format

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

-"to their attention](%%%%action.newnotice%%%%?status_textarea=%3$s)."
+"to them](%%%%action.newnotice%%%%?status_textarea=%3$s)."

 msgstr ""
 msgstr ""

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

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

-#, fuzzy, php-format
+#, php-format

 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "

-"post a notice to their attention."
+"post a notice to them."

 msgstr ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
 msgstr ""
 "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."

 
 #. TRANS: H1 text
 #: actions/all.php:182
 
 #. TRANS: H1 text
 #: actions/all.php:182


@@ -199,23 +202,23 @@ msgid "Updates from %1$s and friends on %2$s!"
 msgstr "Updates from %1$s and friends on %2$s!"
 
 #: actions/apiaccountratelimitstatus.php:72
 msgstr "Updates from %1$s and friends on %2$s!"
 
 #: actions/apiaccountratelimitstatus.php:72

-#: actions/apiaccountupdatedeliverydevice.php:94
-#: actions/apiaccountupdateprofile.php:97
-#: actions/apiaccountupdateprofilebackgroundimage.php:94
-#: actions/apiaccountupdateprofilecolors.php:118
+#: actions/apiaccountupdatedeliverydevice.php:95
+#: actions/apiaccountupdateprofile.php:98
+#: actions/apiaccountupdateprofilebackgroundimage.php:95
+#: actions/apiaccountupdateprofilecolors.php:119

 #: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
 #: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156

-#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101
-#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
-#: 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/apifavoritecreate.php:101 actions/apifavoritedestroy.php:102
+#: actions/apifriendshipscreate.php:101 actions/apifriendshipsdestroy.php:101
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:140
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:157
+#: actions/apigroupleave.php:143 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/apitimelinefavorites.php:174 actions/apitimelinefriends.php:271
 #: 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/apitimelinefavorites.php:174 actions/apitimelinefriends.php:271

-#: actions/apitimelinegroup.php:152 actions/apitimelinehome.php:175
+#: actions/apitimelinegroup.php:154 actions/apitimelinehome.php:175

 #: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:241
 #: actions/apitimelineretweetedtome.php:121
 #: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:161
 #: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:241
 #: actions/apitimelineretweetedtome.php:121
 #: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:161


@@ -223,21 +226,23 @@ msgstr "Updates from %1$s and friends on %2$s!"
 msgid "API method not found."
 msgstr "API method not found."
 
 msgid "API method not found."
 msgstr "API method not found."
 

-#: 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/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109
-#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92
-#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
-#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92
-#: actions/apigroupleave.php:92 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198
+#. TRANS: Client error message. POST is a HTTP command. It should not be translated.
+#. TRANS: Client error. POST is a HTTP command. It should not be translated.
+#: actions/apiaccountupdatedeliverydevice.php:87
+#: actions/apiaccountupdateprofile.php:90
+#: actions/apiaccountupdateprofilebackgroundimage.php:87
+#: actions/apiaccountupdateprofilecolors.php:111
+#: actions/apiaccountupdateprofileimage.php:85 actions/apiblockcreate.php:90
+#: actions/apiblockdestroy.php:89 actions/apidirectmessagenew.php:110
+#: actions/apifavoritecreate.php:92 actions/apifavoritedestroy.php:93
+#: actions/apifriendshipscreate.php:92 actions/apifriendshipsdestroy.php:92
+#: actions/apigroupcreate.php:106 actions/apigroupjoin.php:93
+#: actions/apigroupleave.php:93 actions/apimediaupload.php:68
+#: actions/apistatusesretweet.php:66 actions/apistatusesupdate.php:199

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

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

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


@@ -245,29 +250,29 @@ msgstr ""
 "You must specify a parameter named 'device' with a value of one of: sms, im, "
 "none."
 
 "You must specify a parameter named 'device' with a value of one of: sms, im, "
 "none."
 

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

 #, fuzzy
 msgid "Could not update user."
 msgstr "Couldn't update user."
 
 #, fuzzy
 msgid "Could not update user."
 msgstr "Couldn't update user."
 

-#: actions/apiaccountupdateprofile.php:112
-#: actions/apiaccountupdateprofilebackgroundimage.php:194
-#: actions/apiaccountupdateprofilecolors.php:185
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofile.php:113
+#: actions/apiaccountupdateprofilebackgroundimage.php:195
+#: actions/apiaccountupdateprofilecolors.php:186
+#: actions/apiaccountupdateprofileimage.php:131 actions/apiusershow.php:108

 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
 #: lib/profileaction.php:84
 msgid "User has no profile."
 msgstr "User has no profile."
 
 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
 #: lib/profileaction.php:84
 msgid "User has no profile."
 msgstr "User has no profile."
 

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

 #, fuzzy
 msgid "Could not save profile."
 msgstr "Couldn't save profile."
 
 #, fuzzy
 msgid "Could not save profile."
 msgstr "Couldn't save profile."
 

-#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:211 actions/avatarsettings.php:257
+#: actions/apiaccountupdateprofilebackgroundimage.php:109
+#: actions/apiaccountupdateprofileimage.php:98 actions/apimediaupload.php:81
+#: actions/apistatusesupdate.php:213 actions/avatarsettings.php:257

 #: actions/designadminpanel.php:123 actions/editapplication.php:118
 #: actions/newapplication.php:101 actions/newnotice.php:94
 #: lib/designsettings.php:283
 #: actions/designadminpanel.php:123 actions/editapplication.php:118
 #: actions/newapplication.php:101 actions/newnotice.php:94
 #: lib/designsettings.php:283


@@ -279,30 +284,30 @@ msgstr ""
 "The server was unable to handle that much POST data (%s bytes) due to its "
 "current configuration."
 
 "The server was unable to handle that much POST data (%s bytes) due to its "
 "current configuration."
 

-#: actions/apiaccountupdateprofilebackgroundimage.php:136
-#: actions/apiaccountupdateprofilebackgroundimage.php:146
-#: actions/apiaccountupdateprofilecolors.php:164
-#: actions/apiaccountupdateprofilecolors.php:174
+#: actions/apiaccountupdateprofilebackgroundimage.php:137
+#: actions/apiaccountupdateprofilebackgroundimage.php:147
+#: actions/apiaccountupdateprofilecolors.php:165
+#: actions/apiaccountupdateprofilecolors.php:175

 #: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300
 #: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
 #: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
 msgid "Unable to save your design settings."
 msgstr "Unable to save your design settings!"
 
 #: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300
 #: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
 #: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
 msgid "Unable to save your design settings."
 msgstr "Unable to save your design settings!"
 

-#: actions/apiaccountupdateprofilebackgroundimage.php:187
-#: actions/apiaccountupdateprofilecolors.php:142
+#: actions/apiaccountupdateprofilebackgroundimage.php:188
+#: actions/apiaccountupdateprofilecolors.php:143

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

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

 msgid "You cannot block yourself!"
 msgstr "You cannot block yourself!"
 
 msgid "You cannot block yourself!"
 msgstr "You cannot block yourself!"
 

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

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

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

 msgid "Unblock user failed."
 msgstr "Unblock user failed."
 
 msgid "Unblock user failed."
 msgstr "Unblock user failed."
 


@@ -326,66 +331,65 @@ msgstr "Direct messages to %s"
 msgid "All the direct messages sent to %s"
 msgstr "All the direct messages sent to %s"
 
 msgid "All the direct messages sent to %s"
 msgstr "All the direct messages sent to %s"
 

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

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

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

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

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

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

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

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

-#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110
+#: actions/apifavoritecreate.php:110 actions/apifavoritedestroy.php:111

 #: actions/apistatusesdestroy.php:121
 msgid "No status found with that ID."
 msgstr "No status found with that ID."
 
 #: actions/apistatusesdestroy.php:121
 msgid "No status found with that ID."
 msgstr "No status found with that ID."
 

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

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

-#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285
+#. TRANS: Error message text shown when a favorite could not be set.
+#: actions/apifavoritecreate.php:132 actions/favor.php:84 lib/command.php:294

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

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

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

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

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

-#: actions/apifriendshipscreate.php:109
-#, fuzzy
+#: actions/apifriendshipscreate.php:110

 msgid "Could not follow user: profile not found."
 msgid "Could not follow user: profile not found."

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

 
 

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

 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr "Could not follow user: %s is already on your list."
 
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr "Could not follow user: %s is already on your list."
 

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

 msgid "Could not unfollow user: User not found."
 msgstr "Could not unfollow user: User not found."
 
 msgid "Could not unfollow user: User not found."
 msgstr "Could not unfollow user: User not found."
 

-#: actions/apifriendshipsdestroy.php:120
+#: actions/apifriendshipsdestroy.php:121

 msgid "You cannot unfollow yourself."
 msgstr "You cannot unfollow yourself."
 
 #: actions/apifriendshipsexists.php:91
 msgid "You cannot unfollow yourself."
 msgstr "You cannot unfollow yourself."
 
 #: actions/apifriendshipsexists.php:91

-#, fuzzy

 msgid "Two valid IDs or screen_names must be supplied."
 msgid "Two valid IDs or screen_names must be supplied."

-msgstr "Two user ids or screen_names must be supplied."
+msgstr "Two valid IDs or screen_names must be supplied."

 
 #: actions/apifriendshipsshow.php:134
 msgid "Could not determine source user."
 
 #: actions/apifriendshipsshow.php:134
 msgid "Could not determine source user."


@@ -395,95 +399,102 @@ msgstr "Could not determine source user."
 msgid "Could not find target user."
 msgstr "Could not find target user."
 
 msgid "Could not find target user."
 msgstr "Could not find target user."
 

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

 #: actions/newgroup.php:126 actions/profilesettings.php:215
 #: actions/register.php:212
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr "Nickname must have only lowercase letters and numbers, and no spaces."
 
 #: actions/newgroup.php:126 actions/profilesettings.php:215
 #: actions/register.php:212
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr "Nickname must have only lowercase letters and numbers, and no spaces."
 

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

 #: actions/newgroup.php:130 actions/profilesettings.php:238
 #: actions/register.php:215
 msgid "Nickname already in use. Try another one."
 msgstr "Nickname already in use. Try another one."
 
 #: actions/newgroup.php:130 actions/profilesettings.php:238
 #: actions/register.php:215
 msgid "Nickname already in use. Try another one."
 msgstr "Nickname already in use. Try another one."
 

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

 #: actions/newgroup.php:133 actions/profilesettings.php:218
 #: actions/register.php:217
 msgid "Not a valid nickname."
 msgstr "Not a valid nickname."
 
 #: actions/newgroup.php:133 actions/profilesettings.php:218
 #: actions/register.php:217
 msgid "Not a valid nickname."
 msgstr "Not a valid nickname."
 

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

 #: actions/editgroup.php:199 actions/newapplication.php:203
 #: actions/newgroup.php:139 actions/profilesettings.php:222
 #: actions/register.php:224
 msgid "Homepage is not a valid URL."
 msgstr "Homepage is not a valid URL."
 
 #: actions/editgroup.php:199 actions/newapplication.php:203
 #: actions/newgroup.php:139 actions/profilesettings.php:222
 #: actions/register.php:224
 msgid "Homepage is not a valid URL."
 msgstr "Homepage is not a valid URL."
 

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

 #: actions/newgroup.php:142 actions/profilesettings.php:225
 #: actions/register.php:227
 msgid "Full name is too long (max 255 chars)."
 msgstr "Full name is too long (max 255 chars)."
 
 #: actions/newgroup.php:142 actions/profilesettings.php:225
 #: actions/register.php:227
 msgid "Full name is too long (max 255 chars)."
 msgstr "Full name is too long (max 255 chars)."
 

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

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

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

 #: actions/newgroup.php:148 actions/profilesettings.php:232
 #: actions/register.php:234
 msgid "Location is too long (max 255 chars)."
 msgstr "Location is too long (max 255 chars)."
 
 #: actions/newgroup.php:148 actions/profilesettings.php:232
 #: actions/register.php:234
 msgid "Location is too long (max 255 chars)."
 msgstr "Location is too long (max 255 chars)."
 

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

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

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

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

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

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

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

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

-#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105
-#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92
+#: actions/apigroupismember.php:96 actions/apigroupjoin.php:106
+#: actions/apigroupleave.php:106 actions/apigroupmembership.php:92

 #: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92
 msgid "Group not found."
 msgstr "Group not found."
 
 #: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92
 msgid "Group not found."
 msgstr "Group not found."
 

-#: actions/apigroupjoin.php:111 actions/joingroup.php:100
+#. TRANS: Error text shown a user tries to join a group they already are a member of.
+#: actions/apigroupjoin.php:112 actions/joingroup.php:100 lib/command.php:333

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

-#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327
+#. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
+#: actions/apigroupjoin.php:121 actions/joingroup.php:105 lib/command.php:338

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

-#: actions/apigroupjoin.php:139 actions/joingroup.php:134
+#. TRANS: Message given having failed to add a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/apigroupjoin.php:140 actions/joingroup.php:134 lib/command.php:350

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

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

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

-#: actions/apigroupleave.php:125 actions/leavegroup.php:129
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/apigroupleave.php:126 actions/leavegroup.php:129
+#: lib/command.php:398

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


@@ -512,6 +523,11 @@ msgstr "%s groups"
 msgid "groups on %s"
 msgstr "groups on %s"
 
 msgid "groups on %s"
 msgstr "groups on %s"
 

+#: actions/apimediaupload.php:100
+#, fuzzy
+msgid "Upload failed."
+msgstr "Upload file"
+

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


@@ -521,10 +537,10 @@ msgid "Invalid token."
 msgstr "Invalid token."
 
 #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
 msgstr "Invalid token."
 
 #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268

-#: actions/deletenotice.php:169 actions/disfavor.php:74
-#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55
+#: actions/deletenotice.php:172 actions/disfavor.php:74
+#: actions/emailsettings.php:271 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:227
+#: actions/groupunblock.php:66 actions/imsettings.php:230

 #: 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/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


@@ -569,8 +585,8 @@ msgstr "The request token %s has been denied and revoked."
 #. TRANS: Message given submitting a form with an unknown action in SMS settings.
 #: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
 #: actions/designadminpanel.php:104 actions/editapplication.php:139
 #. TRANS: Message given submitting a form with an unknown action in SMS settings.
 #: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
 #: 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/emailsettings.php:290 actions/grouplogo.php:322
+#: actions/imsettings.php:245 actions/newapplication.php:121

 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
 #: actions/smssettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
 #: actions/smssettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."


@@ -596,7 +612,7 @@ msgstr ""
 "give access to your %4$s account to third parties you trust."
 
 #. TRANS: Main menu option when logged in for access to user settings
 "give access to your %4$s account to third parties you trust."
 
 #. TRANS: Main menu option when logged in for access to user settings

-#: actions/apioauthauthorize.php:310 lib/action.php:450
+#: actions/apioauthauthorize.php:310 lib/action.php:462

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


@@ -610,7 +626,7 @@ msgstr "Nickname"
 
 #. TRANS: Link description in user account settings menu.
 #: actions/apioauthauthorize.php:316 actions/login.php:255
 
 #. TRANS: Link description in user account settings menu.
 #: actions/apioauthauthorize.php:316 actions/login.php:255

-#: actions/register.php:436 lib/accountsettingsaction.php:125
+#: actions/register.php:436 lib/accountsettingsaction.php:120

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


@@ -634,16 +650,18 @@ msgstr "This method requires a POST or DELETE."
 msgid "You may not delete another user's status."
 msgstr "You may not delete another user's status."
 
 msgid "You may not delete another user's status."
 msgstr "You may not delete another user's status."
 

-#: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72
-#: actions/deletenotice.php:52 actions/shownotice.php:92
+#: actions/apistatusesretweet.php:76 actions/apistatusesretweets.php:72
+#: actions/deletenotice.php:58 actions/shownotice.php:92

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

-#: actions/apistatusesretweet.php:83
+#. TRANS: Error text shown when trying to repeat an own notice.
+#: actions/apistatusesretweet.php:84 lib/command.php:535

 msgid "Cannot repeat your own notice."
 msgstr "Cannot repeat your own notice."
 
 msgid "Cannot repeat your own notice."
 msgstr "Cannot repeat your own notice."
 

-#: actions/apistatusesretweet.php:91
+#. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
+#: actions/apistatusesretweet.php:92 lib/command.php:541

 msgid "Already repeated that notice."
 msgstr "Already repeated that notice."
 
 msgid "Already repeated that notice."
 msgstr "Already repeated that notice."
 


@@ -655,22 +673,26 @@ msgstr "Status deleted."
 msgid "No status with that ID found."
 msgstr "No status with that ID found."
 
 msgid "No status with that ID found."
 msgstr "No status with that ID found."
 

-#: actions/apistatusesupdate.php:241 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:222
+msgid "Client must provide a 'status' parameter with a value."
+msgstr ""
+
+#: actions/apistatusesupdate.php:243 actions/newnotice.php:157

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

-#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:284 actions/apiusershow.php:96

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

-#: actions/apistatusesupdate.php:305 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:307 actions/newnotice.php:181

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

-#: actions/apisubscriptions.php:232 actions/apisubscriptions.php:262
+#: actions/apisubscriptions.php:233 actions/apisubscriptions.php:263

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


@@ -749,7 +771,7 @@ msgstr "Invalid size."
 
 #. TRANS: Link description in user account settings menu.
 #: actions/avatarsettings.php:67 actions/showgroup.php:230
 
 #. TRANS: Link description in user account settings menu.
 #: actions/avatarsettings.php:67 actions/showgroup.php:230

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

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


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

-#: lib/deleteuserform.php:66 lib/noticelist.php:656
+#: lib/deleteuserform.php:66 lib/noticelist.php:667

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


@@ -840,7 +862,7 @@ msgstr ""
 #. 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
 #. 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/deletenotice.php:150 actions/deleteuser.php:152

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


@@ -858,14 +880,15 @@ msgstr "Do not block this user"
 #. 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
 #. 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/deletenotice.php:157 actions/deleteuser.php:159

 #: actions/groupblock.php:185
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "Yes"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
 #: actions/groupblock.php:185
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "Yes"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.

-#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Description of the form to block a user.
+#: actions/block.php:164 lib/blockform.php:79

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


@@ -873,6 +896,8 @@ msgstr "Block this user"
 msgid "Failed to save block information."
 msgstr "Failed to save block information."
 
 msgid "Failed to save block information."
 msgstr "Failed to save block information."
 

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

 #: actions/blockedfromgroup.php:80 actions/blockedfromgroup.php:87
 #: actions/editgroup.php:100 actions/foafgroup.php:44 actions/foafgroup.php:62
 #: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
 #: actions/blockedfromgroup.php:80 actions/blockedfromgroup.php:87
 #: actions/editgroup.php:100 actions/foafgroup.php:44 actions/foafgroup.php:62
 #: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83


@@ -882,8 +907,8 @@ msgstr "Failed to save block information."
 #: 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:166
-#: lib/command.php:368
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:168
+#: lib/command.php:380

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


@@ -905,11 +930,13 @@ msgstr "A list of the users blocked from joining this group."
 msgid "Unblock user from group"
 msgstr "Unblock user from group"
 
 msgid "Unblock user from group"
 msgstr "Unblock user from group"
 

-#: actions/blockedfromgroup.php:320 lib/unblockform.php:69
+#. TRANS: Title for the form to unblock a user.
+#: actions/blockedfromgroup.php:320 lib/unblockform.php:70

 msgid "Unblock"
 msgstr "Unblock"
 
 msgid "Unblock"
 msgstr "Unblock"
 

-#: actions/blockedfromgroup.php:320 lib/unblockform.php:80
+#. TRANS: Description of the form to unblock a user.
+#: actions/blockedfromgroup.php:320 lib/unblockform.php:82

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


@@ -948,9 +975,9 @@ msgstr "That address has already been confirmed."
 #. 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.
 #. 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/confirmaddress.php:116 actions/emailsettings.php:331
+#: actions/emailsettings.php:477 actions/imsettings.php:283
+#: actions/imsettings.php:442 actions/othersettings.php:174

 #: actions/profilesettings.php:283 actions/smssettings.php:308
 #: actions/smssettings.php:464
 msgid "Couldn't update user."
 #: actions/profilesettings.php:283 actions/smssettings.php:308
 #: actions/smssettings.php:464
 msgid "Couldn't update user."


@@ -958,7 +985,7 @@ msgstr "Couldn't update user."
 
 #. TRANS: Server error thrown on database error canceling e-mail address confirmation.
 #. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
 
 #. 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/confirmaddress.php:128 actions/emailsettings.php:437

 #: actions/smssettings.php:422
 msgid "Couldn't delete email confirmation."
 msgstr "Couldn't delete e-mail confirmation."
 #: actions/smssettings.php:422
 msgid "Couldn't delete email confirmation."
 msgstr "Couldn't delete e-mail confirmation."


@@ -994,9 +1021,10 @@ msgstr "Application not found."
 msgid "You are not the owner of this application."
 msgstr "You are not the owner of this application."
 
 msgid "You are not the owner of this application."
 msgstr "You are not the owner of this application."
 

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

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

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


@@ -1025,21 +1053,21 @@ msgid "Delete this application"
 msgstr "Delete this application"
 
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 msgstr "Delete this application"
 
 #. 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/deletenotice.php:50 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/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:64
+#: lib/adminpanelaction.php:71 lib/profileformaction.php:64

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

-#: actions/deletenotice.php:71
+#: actions/deletenotice.php:74

 msgid "Can't delete this notice."
 msgstr "Can't delete this notice."
 
 msgid "Can't delete this notice."
 msgstr "Can't delete this notice."
 

-#: actions/deletenotice.php:103
+#: actions/deletenotice.php:106

 msgid ""
 "You are about to permanently delete a notice. Once this is done, it cannot "
 "be undone."
 msgid ""
 "You are about to permanently delete a notice. Once this is done, it cannot "
 "be undone."


@@ -1047,21 +1075,21 @@ msgstr ""
 "You are about to permanently delete a notice.  Once this is done, it cannot "
 "be undone."
 
 "You are about to permanently delete a notice.  Once this is done, it cannot "
 "be undone."
 

-#: actions/deletenotice.php:109 actions/deletenotice.php:141
+#: actions/deletenotice.php:112 actions/deletenotice.php:144

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

-#: actions/deletenotice.php:144
+#: actions/deletenotice.php:147

 msgid "Are you sure you want to delete this notice?"
 msgstr "Are you sure you want to delete this notice?"
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
 msgid "Are you sure you want to delete this notice?"
 msgstr "Are you sure you want to delete this notice?"
 
 #. TRANS: Submit button title for 'No' when deleting a notice.

-#: actions/deletenotice.php:151
+#: actions/deletenotice.php:154

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

-#: actions/deletenotice.php:158 lib/noticelist.php:656
+#: actions/deletenotice.php:161 lib/noticelist.php:667

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


@@ -1092,63 +1120,62 @@ msgstr "Delete this user"
 
 #. TRANS: Message used as title for design settings for the site.
 #. TRANS: Link description in user account settings menu.
 
 #. 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
+#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:134

 msgid "Design"
 msgstr "Design"
 
 #: actions/designadminpanel.php:74
 msgid "Design"
 msgstr "Design"
 
 #: actions/designadminpanel.php:74

-msgid "Design settings for this StatusNet site."
-msgstr "Design settings for this StausNet site."
+msgid "Design settings for this StatusNet site"
+msgstr ""

 
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-#: actions/designadminpanel.php:467
+#: actions/designadminpanel.php:480

 #, fuzzy
 msgid "Custom theme"
 msgstr "Site theme"
 
 #, fuzzy
 msgid "Custom theme"
 msgstr "Site theme"
 

-#: actions/designadminpanel.php:471
+#: actions/designadminpanel.php:484

 msgid "You can upload a custom StatusNet theme as a .ZIP archive."
 msgstr ""
 
 msgid "You can upload a custom StatusNet theme as a .ZIP archive."
 msgstr ""
 

-#: actions/designadminpanel.php:486 lib/designsettings.php:101
+#: actions/designadminpanel.php:499 lib/designsettings.php:101

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

-#: actions/designadminpanel.php:491 actions/designadminpanel.php:574
+#: actions/designadminpanel.php:504 actions/designadminpanel.php:587

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

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

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


@@ -1158,75 +1185,76 @@ msgstr ""
 "$s."
 
 #. TRANS: Used as radio button label to add a background image.
 "$s."
 
 #. TRANS: Used as radio button label to add a background image.

-#: actions/designadminpanel.php:527 lib/designsettings.php:139
+#: actions/designadminpanel.php:540 lib/designsettings.php:139

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

-#: actions/designadminpanel.php:544 lib/designsettings.php:155
+#: actions/designadminpanel.php:557 lib/designsettings.php:155

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-#: actions/designadminpanel.php:651
+#: actions/designadminpanel.php:664

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

-#: actions/designadminpanel.php:655
+#: actions/designadminpanel.php:668

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

-#: actions/designadminpanel.php:676 lib/designsettings.php:247
+#: actions/designadminpanel.php:689 lib/designsettings.php:247

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

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

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

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

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

-#. 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/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
+#. TRANS: Submit button title.
+#: actions/designadminpanel.php:698 actions/licenseadminpanel.php:319
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
+#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
+#: actions/tagother.php:154 actions/useradminpanel.php:295
+#: lib/applicationeditform.php:357 lib/designsettings.php:256
+#: lib/groupeditform.php:202

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

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

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


@@ -1304,7 +1332,7 @@ msgstr "Callback is too long."
 msgid "Callback URL is not valid."
 msgstr "Callback URL is not valid."
 
 msgid "Callback URL is not valid."
 msgstr "Callback URL is not valid."
 

-#: actions/editapplication.php:258
+#: actions/editapplication.php:261

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


@@ -1341,7 +1369,7 @@ msgid "Could not update group."
 msgstr "Could not update group."
 
 #. TRANS: Server exception thrown when creating group aliases failed.
 msgstr "Could not update group."
 
 #. TRANS: Server exception thrown when creating group aliases failed.

-#: actions/editgroup.php:264 classes/User_group.php:514
+#: actions/editgroup.php:264 classes/User_group.php:513

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


@@ -1377,7 +1405,7 @@ msgstr "Current confirmed e-mail address."
 #. TRANS: Button label to remove a confirmed IM address.
 #. TRANS: Button label to remove a confirmed SMS address.
 #. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
 #. TRANS: Button label to remove a confirmed 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/emailsettings.php:115 actions/emailsettings.php:162

 #: actions/imsettings.php:116 actions/smssettings.php:124
 #: actions/smssettings.php:180
 msgctxt "BUTTON"
 #: actions/imsettings.php:116 actions/smssettings.php:124
 #: actions/smssettings.php:180
 msgctxt "BUTTON"


@@ -1395,22 +1423,26 @@ msgstr ""
 #. 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 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
+#. TRANS: Button label in the "Edit application" form.

 #: actions/emailsettings.php:127 actions/imsettings.php:131
 #: actions/emailsettings.php:127 actions/imsettings.php:131

-#: actions/smssettings.php:137 lib/applicationeditform.php:357
+#: actions/smssettings.php:137 lib/applicationeditform.php:351

 msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "Cancel"
 
 msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "Cancel"
 

-#. TRANS: Instructions for e-mail address input form.
-#: actions/emailsettings.php:135
+#. TRANS: Instructions for e-mail address input form. Do not translate
+#. TRANS: "example.org". It is one of the domain names reserved for
+#. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
+#. TRANS: Any other domain may be owned by a legitimate person or
+#. TRANS: organization.
+#: actions/emailsettings.php:139

 msgid "Email address, like \"UserName@example.org\""
 msgstr "E-mail address, like \"UserName@example.org\""
 
 #. TRANS: Button label for adding an e-mail address in e-mail settings form.
 #. TRANS: Button label for adding an IM address in IM settings form.
 #. TRANS: Button label for adding a SMS phone number in SMS settings form.
 msgid "Email address, like \"UserName@example.org\""
 msgstr "E-mail address, like \"UserName@example.org\""
 
 #. 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/emailsettings.php:143 actions/imsettings.php:151

 #: actions/smssettings.php:162
 msgctxt "BUTTON"
 msgid "Add"
 #: actions/smssettings.php:162
 msgctxt "BUTTON"
 msgid "Add"


@@ -1418,110 +1450,110 @@ msgstr "Add"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
 
 #. 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
+#: actions/emailsettings.php:151 actions/smssettings.php:171

 msgid "Incoming email"
 msgstr "Incoming e-mail"
 
 #. TRANS: Form instructions for incoming e-mail form in e-mail settings.
 #. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
 msgid "Incoming email"
 msgstr "Incoming e-mail"
 
 #. 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
+#: actions/emailsettings.php:159 actions/smssettings.php:178

 msgid "Send email to this address to post new notices."
 msgstr "Send e-mail to this address to post new notices."
 
 #. TRANS: Instructions for incoming e-mail address input form.
 #. TRANS: Instructions for incoming SMS e-mail address input form.
 msgid "Send email to this address to post new notices."
 msgstr "Send e-mail to this address to post new notices."
 
 #. 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
+#: actions/emailsettings.php:168 actions/smssettings.php:186

 msgid "Make a new email address for posting to; cancels the old one."
 msgstr "Make a new e-mail address for posting to - cancels the old one."
 
 #. 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.
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr "Make a new e-mail address for posting to - cancels the old one."
 
 #. 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
+#: actions/emailsettings.php:172 actions/smssettings.php:189

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

-#: actions/emailsettings.php:174
+#: actions/emailsettings.php:178

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

-#: actions/emailsettings.php:180
+#: actions/emailsettings.php:184

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

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

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

-#: actions/emailsettings.php:193
+#: actions/emailsettings.php:197

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

-#: actions/emailsettings.php:199
+#: actions/emailsettings.php:203

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

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

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

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

 msgid "I want to post notices by email."
 msgstr "I want to post notices by e-mail."
 
 #. TRANS: Checkbox label in e-mail preferences form.
 msgid "I want to post notices by email."
 msgstr "I want to post notices by e-mail."
 
 #. TRANS: Checkbox label in e-mail preferences form.

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

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

-#: actions/emailsettings.php:334
+#: actions/emailsettings.php:338

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

-#: actions/emailsettings.php:353
+#: actions/emailsettings.php:357

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

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

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

-#: actions/emailsettings.php:366 actions/register.php:208
+#: actions/emailsettings.php:370 actions/register.php:208

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

-#: actions/emailsettings.php:370
+#: actions/emailsettings.php:374

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

-#: actions/emailsettings.php:374
+#: actions/emailsettings.php:378

 msgid "That email address already belongs to another user."
 msgstr "That e-mail address already belongs to another user."
 
 #. 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.
 msgid "That email address already belongs to another user."
 msgstr "That e-mail address already belongs to another user."
 
 #. 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/emailsettings.php:395 actions/imsettings.php:351

 #: actions/smssettings.php:373
 msgid "Couldn't insert confirmation code."
 msgstr "Couldn't insert confirmation code."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
 #: actions/smssettings.php:373
 msgid "Couldn't insert confirmation code."
 msgstr "Couldn't insert confirmation code."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.

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

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


@@ -1532,50 +1564,50 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling IM address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
 #. 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/emailsettings.php:423 actions/imsettings.php:386

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

-#: actions/emailsettings.php:424
+#: actions/emailsettings.php:428

 msgid "That is the wrong email address."
 msgstr "That is the wrong email address."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
 msgid "That is the wrong email address."
 msgstr "That is the wrong email address."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.

-#: actions/emailsettings.php:438
+#: actions/emailsettings.php:442

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

-#: actions/emailsettings.php:458
+#: actions/emailsettings.php:462

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

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

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

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

 msgid "No incoming email address."
 msgstr "No incoming e-mail address."
 
 #. TRANS: Server error thrown on database error removing incoming e-mail address.
 #. TRANS: Server error thrown on database error adding incoming e-mail address.
 msgid "No incoming email address."
 msgstr "No incoming e-mail address."
 
 #. 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/emailsettings.php:508 actions/emailsettings.php:532

 #: actions/smssettings.php:578 actions/smssettings.php:602
 msgid "Couldn't update user record."
 msgstr "Couldn't update user record."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
 #: actions/smssettings.php:578 actions/smssettings.php:602
 msgid "Couldn't update user record."
 msgstr "Couldn't update user record."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.

-#: actions/emailsettings.php:508 actions/smssettings.php:581
+#: actions/emailsettings.php:512 actions/smssettings.php:581

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

-#: actions/emailsettings.php:532 actions/smssettings.php:605
+#: actions/emailsettings.php:536 actions/smssettings.php:605

 msgid "New incoming email address added."
 msgstr "New incoming e-mail address added."
 
 msgid "New incoming email address added."
 msgstr "New incoming e-mail address added."
 


@@ -1583,7 +1615,7 @@ msgstr "New incoming e-mail address added."
 msgid "This notice is already a favorite!"
 msgstr "This notice is already a favourite!"
 
 msgid "This notice is already a favorite!"
 msgstr "This notice is already a favourite!"
 

-#: actions/favor.php:92 lib/disfavorform.php:140
+#: actions/favor.php:92 lib/disfavorform.php:144

 msgid "Disfavor favorite"
 msgstr "Disfavor favourite"
 
 msgid "Disfavor favorite"
 msgstr "Disfavor favourite"
 


@@ -1693,7 +1725,7 @@ msgstr "Couldn't convert request tokens to access tokens."
 msgid "Remote service uses unknown version of OMB protocol."
 msgstr "Remote service uses unknown version of OMB protocol."
 
 msgid "Remote service uses unknown version of OMB protocol."
 msgstr "Remote service uses unknown version of OMB protocol."
 

-#: actions/finishremotesubscribe.php:138
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306

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


@@ -1750,7 +1782,7 @@ msgstr "User is already blocked from group."
 msgid "User is not a member of group."
 msgstr "User is not a member of group."
 
 msgid "User is not a member of group."
 msgstr "User is not a member of group."
 

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

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


@@ -1831,45 +1863,61 @@ msgstr "Logo updated."
 msgid "Failed updating logo."
 msgstr "Failed updating logo."
 
 msgid "Failed updating logo."
 msgstr "Failed updating logo."
 

-#: actions/groupmembers.php:100 lib/groupnav.php:92
+#. TRANS: Title of the page showing group members.
+#. TRANS: %s is the name of the group.
+#: actions/groupmembers.php:102

 #, php-format
 msgid "%s group members"
 msgstr "%s group members"
 
 #, php-format
 msgid "%s group members"
 msgstr "%s group members"
 

-#: actions/groupmembers.php:103
+#. TRANS: Title of the page showing group members.
+#. TRANS: %1$s is the name of the group, %2$d is the page number of the members list.
+#: actions/groupmembers.php:107

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

-#: actions/groupmembers.php:118
+#: actions/groupmembers.php:122

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

-#: actions/groupmembers.php:182 lib/groupnav.php:107
+#: actions/groupmembers.php:186

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

-#: actions/groupmembers.php:392 lib/blockform.php:69
+#. TRANS: Button text for the form that will block a user from a group.
+#: actions/groupmembers.php:399
+msgctxt "BUTTON"

 msgid "Block"
 msgid "Block"

-msgstr "Block"
+msgstr ""
+
+#. TRANS: Submit button title.
+#: actions/groupmembers.php:403
+msgctxt "TOOLTIP"
+msgid "Block this user"
+msgstr ""

 
 

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

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

-#: actions/groupmembers.php:519
+#. TRANS: Button text for the form that will make a user administrator.
+#: actions/groupmembers.php:533
+msgctxt "BUTTON"

 msgid "Make Admin"
 msgid "Make Admin"

-msgstr "Make admin"
+msgstr ""

 
 

-#: actions/groupmembers.php:519
+#. TRANS: Submit button title.
+#: actions/groupmembers.php:537
+msgctxt "TOOLTIP"

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

-msgstr "Make this user an admin"
+msgstr ""

 
 #. 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
 
 #. 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
+#: lib/atomgroupnoticefeed.php:63 lib/atomusernoticefeed.php:68

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


@@ -2002,7 +2050,10 @@ msgstr ""
 
 #. TRANS: IM address input field instructions in IM settings form.
 #. TRANS: %s is the IM address set for the site.
 
 #. TRANS: IM address input field instructions in IM settings form.
 #. TRANS: %s is the IM address set for the site.

-#: actions/imsettings.php:140
+#. TRANS: Do not translate "example.org". It is one of the domain names reserved for use in examples by
+#. TRANS: http://www.rfc-editor.org/rfc/rfc2606.txt. Any other domain may be owned by a legitimate
+#. TRANS: person or organization.
+#: actions/imsettings.php:143

 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "


@@ -2012,64 +2063,64 @@ msgstr ""
 "add %s to your buddy list in your IM client or on GTalk."
 
 #. TRANS: Form legend for IM preferences form.
 "add %s to your buddy list in your IM client or on GTalk."
 
 #. TRANS: Form legend for IM preferences form.

-#: actions/imsettings.php:155
+#: actions/imsettings.php:158

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

-#: actions/imsettings.php:160
+#: actions/imsettings.php:163

 msgid "Send me notices through Jabber/GTalk."
 msgstr "Send me notices through Jabber/GTalk."
 
 #. TRANS: Checkbox label in IM preferences form.
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Send me notices through Jabber/GTalk."
 
 #. TRANS: Checkbox label in IM preferences form.

-#: actions/imsettings.php:166
+#: actions/imsettings.php:169

 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "Post a notice when my Jabber/GTalk status changes."
 
 #. TRANS: Checkbox label in IM preferences form.
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "Post a notice when my Jabber/GTalk status changes."
 
 #. TRANS: Checkbox label in IM preferences form.

-#: actions/imsettings.php:172
+#: actions/imsettings.php:175

 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 
 #. TRANS: Checkbox label in IM preferences form.
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 
 #. TRANS: Checkbox label in IM preferences form.

-#: actions/imsettings.php:179
+#: actions/imsettings.php:182

 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Publish a MicroID for my Jabber/GTalk address."
 
 #. TRANS: Confirmation message for successful IM preferences save.
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Publish a MicroID for my Jabber/GTalk address."
 
 #. TRANS: Confirmation message for successful IM preferences save.

-#: actions/imsettings.php:287 actions/othersettings.php:180
+#: actions/imsettings.php:290 actions/othersettings.php:180

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

-#: actions/imsettings.php:309
+#: actions/imsettings.php:312

 msgid "No Jabber ID."
 msgstr "No Jabber ID."
 
 #. TRANS: Message given saving IM address that cannot be normalised.
 msgid "No Jabber ID."
 msgstr "No Jabber ID."
 
 #. TRANS: Message given saving IM address that cannot be normalised.

-#: actions/imsettings.php:317
+#: actions/imsettings.php:320

 msgid "Cannot normalize that Jabber ID"
 msgstr "Cannot normalise Jabber ID"
 
 #. TRANS: Message given saving IM address that not valid.
 msgid "Cannot normalize that Jabber ID"
 msgstr "Cannot normalise Jabber ID"
 
 #. TRANS: Message given saving IM address that not valid.

-#: actions/imsettings.php:322
+#: actions/imsettings.php:325

 msgid "Not a valid Jabber ID"
 msgstr "Not a valid Jabber ID"
 
 #. TRANS: Message given saving IM address that is already set.
 msgid "Not a valid Jabber ID"
 msgstr "Not a valid Jabber ID"
 
 #. TRANS: Message given saving IM address that is already set.

-#: actions/imsettings.php:326
+#: actions/imsettings.php:329

 msgid "That is already your Jabber ID."
 msgstr "That is already your Jabber ID."
 
 #. TRANS: Message given saving IM address that is already set for another user.
 msgid "That is already your Jabber ID."
 msgstr "That is already your Jabber ID."
 
 #. TRANS: Message given saving IM address that is already set for another user.

-#: actions/imsettings.php:330
+#: actions/imsettings.php:333

 msgid "Jabber ID already belongs to another user."
 msgstr "Jabber ID already belongs to another user."
 
 #. TRANS: Message given saving valid IM address that is to be confirmed.
 #. TRANS: %s is the IM address set for the site.
 msgid "Jabber ID already belongs to another user."
 msgstr "Jabber ID already belongs to another user."
 
 #. 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
+#: actions/imsettings.php:361

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


@@ -2079,28 +2130,28 @@ msgstr ""
 "s for sending messages to you."
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
 "s for sending messages to you."
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.

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

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

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

 msgid "Couldn't delete IM confirmation."
 msgstr "Couldn't delete IM confirmation."
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
 msgid "Couldn't delete IM confirmation."
 msgstr "Couldn't delete IM confirmation."
 
 #. TRANS: Message given after successfully canceling IM address confirmation.

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

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

-#: actions/imsettings.php:424
+#: actions/imsettings.php:427

 msgid "That is not your Jabber ID."
 msgstr "That is not your Jabber ID."
 
 #. TRANS: Message given after successfully removing a registered IM address.
 msgid "That is not your Jabber ID."
 msgstr "That is not your Jabber ID."
 
 #. TRANS: Message given after successfully removing a registered IM address.

-#: actions/imsettings.php:447
+#: actions/imsettings.php:450

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


@@ -2119,8 +2170,9 @@ msgid "This is your inbox, which lists your incoming private messages."
 msgstr "This is your inbox, which lists your incoming private messages."
 
 #: actions/invite.php:39
 msgstr "This is your inbox, which lists your incoming private messages."
 
 #: actions/invite.php:39

+#, fuzzy

 msgid "Invites have been disabled."
 msgid "Invites have been disabled."

-msgstr ""
+msgstr "Invitations enabled"

 
 #: actions/invite.php:41
 #, php-format
 
 #: actions/invite.php:41
 #, php-format


@@ -2146,7 +2198,7 @@ msgstr "You are already subscribed to these users:"
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.

-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:426

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


@@ -2269,9 +2321,7 @@ msgstr "You must be logged in to join a group."
 msgid "No nickname or ID."
 msgstr "No nickname or ID."
 
 msgid "No nickname or ID."
 msgstr "No nickname or ID."
 

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

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


@@ -2280,17 +2330,120 @@ msgstr "%1$s joined group %2$s"
 msgid "You must be logged in to leave a group."
 msgstr "You must be logged in to leave a group."
 
 msgid "You must be logged in to leave a group."
 msgstr "You must be logged in to leave a group."
 

-#: actions/leavegroup.php:100 lib/command.php:373
+#. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
+#: actions/leavegroup.php:100 lib/command.php:386

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

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

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

+#. TRANS: User admin panel title
+#: actions/licenseadminpanel.php:56
+msgctxt "TITLE"
+msgid "License"
+msgstr ""
+
+#: actions/licenseadminpanel.php:67
+msgid "License for this StatusNet site"
+msgstr ""
+
+#: actions/licenseadminpanel.php:139
+msgid "Invalid license selection."
+msgstr ""
+
+#: actions/licenseadminpanel.php:149
+msgid ""
+"You must specify the owner of the content when using the All Rights Reserved "
+"license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:156
+msgid "Invalid license title. Max length is 255 characters."
+msgstr ""
+
+#: actions/licenseadminpanel.php:168
+msgid "Invalid license URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:171
+msgid "Invalid license image URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:179
+msgid "License URL must be blank or a valid URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:187
+msgid "License image must be blank or valid URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:239
+msgid "License selection"
+msgstr ""
+
+#: actions/licenseadminpanel.php:245
+msgid "Private"
+msgstr "Private"
+
+#: actions/licenseadminpanel.php:246
+msgid "All Rights Reserved"
+msgstr ""
+
+#: actions/licenseadminpanel.php:247
+msgid "Creative Commons"
+msgstr ""
+
+#: actions/licenseadminpanel.php:252
+msgid "Type"
+msgstr ""
+
+#: actions/licenseadminpanel.php:254
+msgid "Select license"
+msgstr ""
+
+#: actions/licenseadminpanel.php:268
+msgid "License details"
+msgstr ""
+
+#: actions/licenseadminpanel.php:274
+msgid "Owner"
+msgstr ""
+
+#: actions/licenseadminpanel.php:275
+msgid "Name of the owner of the site's content (if applicable)."
+msgstr ""
+
+#: actions/licenseadminpanel.php:283
+msgid "License Title"
+msgstr ""
+
+#: actions/licenseadminpanel.php:284
+msgid "The title of the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:292
+msgid "License URL"
+msgstr ""
+
+#: actions/licenseadminpanel.php:293
+msgid "URL for more information about the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:300
+msgid "License Image URL"
+msgstr ""
+
+#: actions/licenseadminpanel.php:301
+msgid "URL for an image to display with the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:319
+msgid "Save license settings"
+msgstr ""
+

 #: actions/login.php:102 actions/otp.php:62 actions/register.php:144
 msgid "Already logged in."
 msgstr "Already logged in."
 #: actions/login.php:102 actions/otp.php:62 actions/register.php:144
 msgid "Already logged in."
 msgstr "Already logged in."


@@ -2397,12 +2550,15 @@ msgstr "Use this form to create a new group."
 msgid "New message"
 msgstr "New message"
 
 msgid "New message"
 msgstr "New message"
 

-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
+#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:499

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

-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
-#: lib/command.php:555
+#. TRANS: Command exception text shown when trying to send a direct message to another user without content.
+#. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
+#: actions/newmessage.php:144 actions/newnotice.php:138 lib/command.php:478
+#: lib/command.php:579

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


@@ -2410,7 +2566,8 @@ msgstr "No content!"
 msgid "No recipient specified."
 msgstr "No recipient specified."
 
 msgid "No recipient specified."
 msgstr "No recipient specified."
 

-#: actions/newmessage.php:164 lib/command.php:484
+#. TRANS: Error text shown when trying to send a direct message to self.
+#: actions/newmessage.php:164 lib/command.php:503

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


@@ -2420,12 +2577,14 @@ msgstr ""
 msgid "Message sent"
 msgstr "Message sent"
 
 msgid "Message sent"
 msgstr "Message sent"
 

-#: actions/newmessage.php:185
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: actions/newmessage.php:185 lib/command.php:511

 #, php-format
 msgid "Direct message to %s sent."
 msgstr "Could not create application."
 
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "Could not create application."
 

-#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189
+#: actions/newmessage.php:210 actions/newnotice.php:261

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


@@ -2433,7 +2592,7 @@ msgstr "Ajax Error"
 msgid "New notice"
 msgstr "New notice"
 
 msgid "New notice"
 msgstr "New notice"
 

-#: actions/newnotice.php:217
+#: actions/newnotice.php:227

 msgid "Notice posted"
 msgstr "Notice posted"
 
 msgid "Notice posted"
 msgstr "Notice posted"
 


@@ -2484,11 +2643,11 @@ msgid "Updates matching search term \"%1$s\" on %2$s!"
 msgstr "Updates matching search term \"%1$s\" on %2$s!"
 
 #: actions/nudge.php:85
 msgstr "Updates matching search term \"%1$s\" on %2$s!"
 
 #: actions/nudge.php:85

-#, fuzzy

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

-"This user doesn't allow nudges or hasn't confirmed or set his e-mail yet."
+"This user does not allow nudges or has not confirmed or set their email "
+"address yet."

 
 #: actions/nudge.php:94
 msgid "Nudge sent"
 
 #: actions/nudge.php:94
 msgid "Nudge sent"


@@ -2520,7 +2679,7 @@ msgid "Connected applications"
 msgstr "Connected applications"
 
 #: actions/oauthconnectionssettings.php:83
 msgstr "Connected applications"
 
 #: actions/oauthconnectionssettings.php:83

-msgid "You have allowed the following applications to access you account."
+msgid "You have allowed the following applications to access your account."

 msgstr ""
 
 #: actions/oauthconnectionssettings.php:175
 msgstr ""
 
 #: actions/oauthconnectionssettings.php:175


@@ -2544,7 +2703,7 @@ msgstr ""
 msgid "Notice has no profile."
 msgstr "Notice has no profile."
 
 msgid "Notice has no profile."
 msgstr "Notice has no profile."
 

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

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


@@ -2562,8 +2721,8 @@ msgid "Only %s URLs over plain HTTP please."
 msgstr ""
 
 #. TRANS: Client error on an API request with an unsupported data format.
 msgstr ""
 
 #. 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
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1200
+#: lib/apiaction.php:1227 lib/apiaction.php:1350

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


@@ -2600,8 +2759,9 @@ msgid "View profile designs"
 msgstr "View profile designs"
 
 #: actions/othersettings.php:123
 msgstr "View profile designs"
 
 #: actions/othersettings.php:123

+#, fuzzy

 msgid "Show or hide profile designs."
 msgid "Show or hide profile designs."

-msgstr ""
+msgstr "View profile designs"

 
 #: actions/othersettings.php:153
 msgid "URL shortening service is too long (max 50 chars)."
 
 #: actions/othersettings.php:153
 msgid "URL shortening service is too long (max 50 chars)."


@@ -2703,12 +2863,12 @@ msgid "Password saved."
 msgstr "Password saved."
 
 #. TRANS: Menu item for site administration
 msgstr "Password saved."
 
 #. TRANS: Menu item for site administration

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

 msgid "Paths"
 msgstr ""
 
 #: actions/pathsadminpanel.php:70
 msgid "Paths"
 msgstr ""
 
 #: actions/pathsadminpanel.php:70

-msgid "Path and server settings for this StatusNet site."
+msgid "Path and server settings for this StatusNet site"

 msgstr ""
 
 #: actions/pathsadminpanel.php:157
 msgstr ""
 
 #: actions/pathsadminpanel.php:157


@@ -2776,16 +2936,19 @@ msgid "Theme"
 msgstr ""
 
 #: actions/pathsadminpanel.php:264
 msgstr ""
 
 #: actions/pathsadminpanel.php:264

+#, fuzzy

 msgid "Theme server"
 msgid "Theme server"

-msgstr ""
+msgstr "SSL server"

 
 #: actions/pathsadminpanel.php:268
 
 #: actions/pathsadminpanel.php:268

+#, fuzzy

 msgid "Theme path"
 msgid "Theme path"

-msgstr ""
+msgstr "Site path"

 
 #: actions/pathsadminpanel.php:272
 
 #: actions/pathsadminpanel.php:272

+#, fuzzy

 msgid "Theme directory"
 msgid "Theme directory"

-msgstr ""
+msgstr "Avatar directory"

 
 #: actions/pathsadminpanel.php:279
 msgid "Avatars"
 
 #: actions/pathsadminpanel.php:279
 msgid "Avatars"


@@ -2804,20 +2967,24 @@ msgid "Avatar directory"
 msgstr "Avatar directory"
 
 #: actions/pathsadminpanel.php:301
 msgstr "Avatar directory"
 
 #: actions/pathsadminpanel.php:301

+#, fuzzy

 msgid "Backgrounds"
 msgid "Backgrounds"

-msgstr ""
+msgstr "Background"

 
 #: actions/pathsadminpanel.php:305
 
 #: actions/pathsadminpanel.php:305

+#, fuzzy

 msgid "Background server"
 msgid "Background server"

-msgstr ""
+msgstr "Background"

 
 #: actions/pathsadminpanel.php:309
 
 #: actions/pathsadminpanel.php:309

+#, fuzzy

 msgid "Background path"
 msgid "Background path"

-msgstr ""
+msgstr "Background"

 
 #: actions/pathsadminpanel.php:313
 
 #: actions/pathsadminpanel.php:313

+#, fuzzy

 msgid "Background directory"
 msgid "Background directory"

-msgstr ""
+msgstr "Background directory not writable: %s."

 
 #: actions/pathsadminpanel.php:320
 msgid "SSL"
 
 #: actions/pathsadminpanel.php:320
 msgid "SSL"


@@ -2836,8 +3003,9 @@ msgid "Always"
 msgstr ""
 
 #: actions/pathsadminpanel.php:329
 msgstr ""
 
 #: actions/pathsadminpanel.php:329

+#, fuzzy

 msgid "Use SSL"
 msgid "Use SSL"

-msgstr ""
+msgstr "SSL"

 
 #: actions/pathsadminpanel.php:330
 msgid "When to use SSL"
 
 #: actions/pathsadminpanel.php:330
 msgid "When to use SSL"


@@ -2913,7 +3081,7 @@ msgstr "Full name"
 
 #. TRANS: Form input field label.
 #: actions/profilesettings.php:115 actions/register.php:460
 
 #. TRANS: Form input field label.
 #: actions/profilesettings.php:115 actions/register.php:460

-#: lib/applicationeditform.php:244 lib/groupeditform.php:161
+#: lib/applicationeditform.php:236 lib/groupeditform.php:161

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


@@ -3018,7 +3186,7 @@ msgid "Couldn't save tags."
 msgstr "Couldn't save tags."
 
 #. TRANS: Message after successful saving of administrative settings.
 msgstr "Couldn't save tags."
 
 #. TRANS: Message after successful saving of administrative settings.

-#: actions/profilesettings.php:391 lib/adminpanelaction.php:141
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:138

 msgid "Settings saved."
 msgstr "Settings saved."
 
 msgid "Settings saved."
 msgstr "Settings saved."
 


@@ -3053,21 +3221,24 @@ msgid "Public Stream Feed (Atom)"
 msgstr "Public Stream Feed (Atom)"
 
 #: actions/public.php:188
 msgstr "Public Stream Feed (Atom)"
 
 #: actions/public.php:188

-#, php-format
+#, fuzzy, php-format

 msgid ""
 "This is the public timeline for %%site.name%% but no one has posted anything "
 "yet."
 msgstr ""
 msgid ""
 "This is the public timeline for %%site.name%% but no one has posted anything "
 "yet."
 msgstr ""

+"This is the timeline for %s and friends but no one has posted anything yet."

 
 #: actions/public.php:191
 msgid "Be the first to post!"
 msgstr ""
 
 #: actions/public.php:195
 
 #: actions/public.php:191
 msgid "Be the first to post!"
 msgstr ""
 
 #: actions/public.php:195

-#, php-format
+#, fuzzy, php-format

 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post!"
 msgstr ""
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post!"
 msgstr ""

+"Why not [register an account](%%action.register%%) and be the first to add a "
+"notice to your favourites!"

 
 #: actions/public.php:242
 #, php-format
 
 #: actions/public.php:242
 #, php-format


@@ -3112,11 +3283,13 @@ msgid "Be the first to post one!"
 msgstr ""
 
 #: actions/publictagcloud.php:75
 msgstr ""
 
 #: actions/publictagcloud.php:75

-#, php-format
+#, fuzzy, php-format

 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post "
 "one!"
 msgstr ""
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post "
 "one!"
 msgstr ""

+"Why not [register an account](%%action.register%%) and be the first to add a "
+"notice to your favourites!"

 
 #: actions/publictagcloud.php:134
 msgid "Tag cloud"
 
 #: actions/publictagcloud.php:134
 msgid "Tag cloud"


@@ -3163,8 +3336,9 @@ msgid "You have been identified. Enter a new password below. "
 msgstr ""
 
 #: actions/recoverpassword.php:188
 msgstr ""
 
 #: actions/recoverpassword.php:188

+#, fuzzy

 msgid "Password recovery"
 msgid "Password recovery"

-msgstr ""
+msgstr "Password recovery requested"

 
 #: actions/recoverpassword.php:191
 msgid "Nickname or email address"
 
 #: actions/recoverpassword.php:191
 msgid "Nickname or email address"


@@ -3298,7 +3472,7 @@ msgstr "Same as password above. Required."
 
 #. TRANS: Link description in user account settings menu.
 #: actions/register.php:445 actions/register.php:449
 
 #. TRANS: Link description in user account settings menu.
 #: actions/register.php:445 actions/register.php:449

-#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
+#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127

 msgid "Email"
 msgstr "E-mail"
 
 msgid "Email"
 msgstr "E-mail"
 


@@ -3454,7 +3628,7 @@ msgstr "You can't repeat your own notice."
 msgid "You already repeated that notice."
 msgstr "You already repeated that notice."
 
 msgid "You already repeated that notice."
 msgstr "You already repeated that notice."
 

-#: actions/repeat.php:114 lib/noticelist.php:675
+#: actions/repeat.php:114 lib/noticelist.php:686

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


@@ -3489,13 +3663,13 @@ msgid "Replies feed for %s (Atom)"
 msgstr "Notice feed for %s"
 
 #: actions/replies.php:199
 msgstr "Notice feed for %s"
 
 #: actions/replies.php:199

-#, fuzzy, php-format
+#, php-format

 msgid ""
 "This is the timeline showing replies to %1$s but %2$s hasn't received a "
 msgid ""
 "This is the timeline showing replies to %1$s but %2$s hasn't received a "

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

 msgstr ""
 msgstr ""

-"This is the timeline showing replies to %1$s but %2$s hasn't received a "
-"notice to his attention yet."
+"This is the timeline showing replies to %1$s but %2$s has not received a "
+"notice to them yet."

 
 #: actions/replies.php:204
 #, php-format
 
 #: actions/replies.php:204
 #, php-format


@@ -3505,13 +3679,13 @@ msgid ""
 msgstr ""
 
 #: actions/replies.php:206
 msgstr ""
 
 #: actions/replies.php:206

-#, fuzzy, php-format
+#, php-format

 msgid ""
 msgid ""

-"You can try to [nudge %1$s](../%2$s) or [post something to their 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 ""
 msgstr ""

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

 
 #: actions/repliesrss.php:72
 #, php-format
 
 #: actions/repliesrss.php:72
 #, php-format


@@ -3540,13 +3714,14 @@ msgstr "User is already sandboxed."
 
 #. 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:392
+#: lib/adminpanelaction.php:379
+#, fuzzy

 msgid "Sessions"
 msgid "Sessions"

-msgstr ""
+msgstr "Version"

 
 #: actions/sessionsadminpanel.php:65
 
 #: actions/sessionsadminpanel.php:65

-msgid "Session settings for this StatusNet site."
-msgstr "Session settings for this StatusNet site."
+msgid "Session settings for this StatusNet site"
+msgstr ""

 
 #: actions/sessionsadminpanel.php:175
 msgid "Handle sessions"
 
 #: actions/sessionsadminpanel.php:175
 msgid "Handle sessions"


@@ -3565,7 +3740,6 @@ msgid "Turn on debugging output for sessions."
 msgstr ""
 
 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
 msgstr ""
 
 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292

-#: actions/useradminpanel.php:294

 msgid "Save site settings"
 msgstr "Save site settings"
 
 msgid "Save site settings"
 msgstr "Save site settings"
 


@@ -3578,24 +3752,24 @@ msgid "Application profile"
 msgstr "Application profile"
 
 #. TRANS: Form input field label for application icon.
 msgstr "Application profile"
 
 #. TRANS: Form input field label for application icon.

-#: actions/showapplication.php:159 lib/applicationeditform.php:182
+#: actions/showapplication.php:159 lib/applicationeditform.php:173

 msgid "Icon"
 msgstr ""
 
 #. TRANS: Form input field label for application name.
 #: actions/showapplication.php:169 actions/version.php:197
 msgid "Icon"
 msgstr ""
 
 #. TRANS: Form input field label for application name.
 #: actions/showapplication.php:169 actions/version.php:197

-#: lib/applicationeditform.php:199
+#: lib/applicationeditform.php:190

 msgid "Name"
 msgstr "Name"
 
 #. TRANS: Form input field label.
 msgid "Name"
 msgstr "Name"
 
 #. TRANS: Form input field label.

-#: actions/showapplication.php:178 lib/applicationeditform.php:235
+#: actions/showapplication.php:178 lib/applicationeditform.php:227

 msgid "Organization"
 msgstr "Organization"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
 msgid "Organization"
 msgstr "Organization"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200

-#: lib/applicationeditform.php:216 lib/groupeditform.php:172
+#: lib/applicationeditform.php:208 lib/groupeditform.php:172

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


@@ -3610,16 +3784,18 @@ msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr ""
 
 #: actions/showapplication.php:213
 msgstr ""
 
 #: actions/showapplication.php:213

+#, fuzzy

 msgid "Application actions"
 msgid "Application actions"

-msgstr ""
+msgstr "Application not found."

 
 #: actions/showapplication.php:236
 msgid "Reset key & secret"
 msgstr ""
 
 #: actions/showapplication.php:261
 
 #: actions/showapplication.php:236
 msgid "Reset key & secret"
 msgstr ""
 
 #: actions/showapplication.php:261

+#, fuzzy

 msgid "Application info"
 msgid "Application info"

-msgstr ""
+msgstr "Application not found."

 
 #: actions/showapplication.php:263
 msgid "Consumer key"
 
 #: actions/showapplication.php:263
 msgid "Consumer key"


@@ -3684,30 +3860,30 @@ msgstr ""
 "notices you like to bookmark them for later or shed a spotlight on them."
 
 #: actions/showfavorites.php:208
 "notices you like to bookmark them for later or shed a spotlight on them."
 
 #: actions/showfavorites.php:208

-#, fuzzy, php-format
+#, php-format

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

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

 
 #: actions/showfavorites.php:212
 
 #: actions/showfavorites.php:212

-#, fuzzy, php-format
+#, php-format

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

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

 
 #: actions/showfavorites.php:243
 msgid "This is a way to share what you like."
 msgstr ""
 
 
 #: actions/showfavorites.php:243
 msgid "This is a way to share what you like."
 msgstr ""
 

-#: actions/showgroup.php:82 lib/groupnav.php:86
+#: actions/showgroup.php:82

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


@@ -3759,7 +3935,7 @@ msgstr "Notice feed for %s group (Atom)"
 msgid "FOAF for %s group"
 msgstr "Outbox for %s"
 
 msgid "FOAF for %s group"
 msgstr "Outbox for %s"
 

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

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


@@ -3878,24 +4054,28 @@ msgid ""
 msgstr ""
 
 #: actions/showstream.php:207
 msgstr ""
 
 #: actions/showstream.php:207

-#, fuzzy, php-format
+#, php-format

 msgid ""
 msgid ""

-"You can try to nudge %1$s or [post something to their 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 ""
 msgstr ""

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

 
 

-#: actions/showstream.php:243
-#, php-format
+#: actions/showstream.php:246
+#, fuzzy, php-format

 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
 "[StatusNet](http://status.net/) tool. [Join now](%%%%action.register%%%%) to "
 "follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
 msgstr ""
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
 "[StatusNet](http://status.net/) tool. [Join now](%%%%action.register%%%%) to "
 "follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
 msgstr ""

+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service based on the Free Software [StatusNet](http://status.net/) "
+"tool. [Join now](%%action.register%%) to share notices about yourself with "
+"friends, family, and colleagues! ([Read more](%%doc.help%%))"

 
 

-#: actions/showstream.php:248
+#: actions/showstream.php:251

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


@@ -3906,7 +4086,7 @@ msgstr ""
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
 "[StatusNet](http://status.net/) tool. "
 
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
 "[StatusNet](http://status.net/) tool. "
 

-#: actions/showstream.php:305
+#: actions/showstream.php:308

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


@@ -3981,8 +4161,9 @@ msgid "Local"
 msgstr "Local"
 
 #: actions/siteadminpanel.php:256
 msgstr "Local"
 
 #: actions/siteadminpanel.php:256

+#, fuzzy

 msgid "Default timezone"
 msgid "Default timezone"

-msgstr ""
+msgstr "Default subscription"

 
 #: actions/siteadminpanel.php:257
 msgid "Default timezone for the site; usually UTC."
 
 #: actions/siteadminpanel.php:257
 msgid "Default timezone for the site; usually UTC."


@@ -4199,7 +4380,7 @@ msgstr "No code entered"
 
 #. TRANS: Menu item for site administration
 #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
 
 #. TRANS: Menu item for site administration
 #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196

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

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


@@ -4208,16 +4389,18 @@ msgid "Manage snapshot configuration"
 msgstr "Manage snapshot configuration"
 
 #: actions/snapshotadminpanel.php:127
 msgstr "Manage snapshot configuration"
 
 #: actions/snapshotadminpanel.php:127

+#, fuzzy

 msgid "Invalid snapshot run value."
 msgid "Invalid snapshot run value."

-msgstr ""
+msgstr "Invalid role."

 
 #: actions/snapshotadminpanel.php:133
 msgid "Snapshot frequency must be a number."
 msgstr ""
 
 #: actions/snapshotadminpanel.php:144
 
 #: actions/snapshotadminpanel.php:133
 msgid "Snapshot frequency must be a number."
 msgstr ""
 
 #: actions/snapshotadminpanel.php:144

+#, fuzzy

 msgid "Invalid snapshot report URL."
 msgid "Invalid snapshot report URL."

-msgstr ""
+msgstr "nvalid logo URL."

 
 #: actions/snapshotadminpanel.php:200
 msgid "Randomly during web hit"
 
 #: actions/snapshotadminpanel.php:200
 msgid "Randomly during web hit"


@@ -4228,8 +4411,9 @@ msgid "In a scheduled job"
 msgstr ""
 
 #: actions/snapshotadminpanel.php:206
 msgstr ""
 
 #: actions/snapshotadminpanel.php:206

+#, fuzzy

 msgid "Data snapshots"
 msgid "Data snapshots"

-msgstr ""
+msgstr "Save snapshot settings"

 
 #: actions/snapshotadminpanel.php:208
 msgid "When to send statistical data to status.net servers"
 
 #: actions/snapshotadminpanel.php:208
 msgid "When to send statistical data to status.net servers"


@@ -4244,8 +4428,9 @@ msgid "Snapshots will be sent once every N web hits"
 msgstr ""
 
 #: actions/snapshotadminpanel.php:226
 msgstr ""
 
 #: actions/snapshotadminpanel.php:226

+#, fuzzy

 msgid "Report URL"
 msgid "Report URL"

-msgstr ""
+msgstr "Source URL"

 
 #: actions/snapshotadminpanel.php:227
 msgid "Snapshots will be sent to this URL"
 
 #: actions/snapshotadminpanel.php:227
 msgid "Snapshots will be sent to this URL"


@@ -4318,6 +4503,8 @@ msgid ""
 "%s has no subscribers. Why not [register an account](%%%%action.register%%%"
 "%) and be the first?"
 msgstr ""
 "%s has no subscribers. Why not [register an account](%%%%action.register%%%"
 "%) and be the first?"
 msgstr ""

+"%s has no subscribers. Why not [register an account](%%%%action.register%%%"
+"%) and be the first?"

 
 #: actions/subscriptions.php:52
 #, php-format
 
 #: actions/subscriptions.php:52
 #, php-format


@@ -4357,7 +4544,7 @@ msgstr "%s is not listening to anyone."
 msgid "Jabber"
 msgstr "Jabber"
 
 msgid "Jabber"
 msgstr "Jabber"
 

-#: actions/subscriptions.php:222 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:222

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


@@ -4457,74 +4644,80 @@ msgstr ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
 
 #. TRANS: User admin panel title
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
 
 #. TRANS: User admin panel title

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

 msgctxt "TITLE"
 msgid "User"
 msgstr "User"
 
 msgctxt "TITLE"
 msgid "User"
 msgstr "User"
 

-#: actions/useradminpanel.php:70
-msgid "User settings for this StatusNet site."
+#: actions/useradminpanel.php:71
+msgid "User settings for this StatusNet site"

 msgstr ""
 
 msgstr ""
 

-#: actions/useradminpanel.php:149
+#: actions/useradminpanel.php:150

 msgid "Invalid bio limit. Must be numeric."
 msgstr ""
 
 msgid "Invalid bio limit. Must be numeric."
 msgstr ""
 

-#: actions/useradminpanel.php:155
+#: actions/useradminpanel.php:156

 msgid "Invalid welcome text. Max length is 255 characters."
 msgstr ""
 
 msgid "Invalid welcome text. Max length is 255 characters."
 msgstr ""
 

-#: actions/useradminpanel.php:165
+#: actions/useradminpanel.php:166

 #, php-format
 msgid "Invalid default subscripton: '%1$s' is not user."
 msgstr ""
 
 #. TRANS: Link description in user account settings menu.
 #, php-format
 msgid "Invalid default subscripton: '%1$s' is not user."
 msgstr ""
 
 #. TRANS: Link description in user account settings menu.

-#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:111
+#: actions/useradminpanel.php:219 lib/accountsettingsaction.php:106

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

-#: actions/useradminpanel.php:222
+#: actions/useradminpanel.php:223

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

-#: actions/useradminpanel.php:223
+#: actions/useradminpanel.php:224

 msgid "Maximum length of a profile bio in characters."
 msgstr ""
 
 msgid "Maximum length of a profile bio in characters."
 msgstr ""
 

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

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

-#: actions/useradminpanel.php:235
+#: actions/useradminpanel.php:236
+#, fuzzy

 msgid "New user welcome"
 msgid "New user welcome"

-msgstr ""
+msgstr "New users"

 
 

-#: actions/useradminpanel.php:236
+#: actions/useradminpanel.php:237
+#, fuzzy

 msgid "Welcome text for new users (Max 255 chars)."
 msgid "Welcome text for new users (Max 255 chars)."

-msgstr ""
+msgstr "Name is too long (max 255 chars)."

 
 

-#: actions/useradminpanel.php:241
+#: actions/useradminpanel.php:242

 msgid "Default subscription"
 msgstr "Default subscription"
 
 msgid "Default subscription"
 msgstr "Default subscription"
 

-#: actions/useradminpanel.php:242
+#: actions/useradminpanel.php:243

 msgid "Automatically subscribe new users to this user."
 msgstr "Automatically subscribe new users to this user."
 
 msgid "Automatically subscribe new users to this user."
 msgstr "Automatically subscribe new users to this user."
 

-#: actions/useradminpanel.php:251
+#: actions/useradminpanel.php:252

 msgid "Invitations"
 msgstr "Invitations"
 
 msgid "Invitations"
 msgstr "Invitations"
 

-#: actions/useradminpanel.php:256
+#: actions/useradminpanel.php:257

 msgid "Invitations enabled"
 msgstr "Invitations enabled"
 
 msgid "Invitations enabled"
 msgstr "Invitations enabled"
 

-#: actions/useradminpanel.php:258
+#: actions/useradminpanel.php:259

 msgid "Whether to allow users to invite new users."
 msgstr ""
 
 msgid "Whether to allow users to invite new users."
 msgstr ""
 

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

 #: actions/userauthorization.php:105
 msgid "Authorize subscription"
 msgstr "Authorise subscription"
 #: actions/userauthorization.php:105
 msgid "Authorize subscription"
 msgstr "Authorise subscription"


@@ -4539,7 +4732,9 @@ msgstr ""
 "user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
 "click “Reject”."
 
 "user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
 "click “Reject”."
 

+#. TRANS: Menu item for site administration

 #: actions/userauthorization.php:196 actions/version.php:167
 #: actions/userauthorization.php:196 actions/version.php:167

+#: lib/adminpanelaction.php:403

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


@@ -4613,9 +4808,9 @@ msgid "Profile URL ‘%s’ is for a local user."
 msgstr ""
 
 #: actions/userauthorization.php:345
 msgstr ""
 
 #: actions/userauthorization.php:345

-#, php-format
+#, fuzzy, php-format

 msgid "Avatar URL ‘%s’ is not valid."
 msgid "Avatar URL ‘%s’ is not valid."

-msgstr ""
+msgstr "Callback URL is not valid."

 
 #: actions/userauthorization.php:350
 #, php-format
 
 #: actions/userauthorization.php:350
 #, php-format


@@ -4669,7 +4864,7 @@ msgstr ""
 #. 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
 #. 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
+#: lib/atomusernoticefeed.php:75

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


@@ -4687,8 +4882,9 @@ msgid ""
 msgstr ""
 
 #: actions/version.php:163
 msgstr ""
 
 #: actions/version.php:163

+#, fuzzy

 msgid "Contributors"
 msgid "Contributors"

-msgstr ""
+msgstr "Connections"

 
 #: actions/version.php:170
 msgid ""
 
 #: actions/version.php:170
 msgid ""


@@ -4728,7 +4924,7 @@ msgid "Plugins"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.

-#: actions/version.php:198 lib/action.php:789
+#: actions/version.php:198 lib/action.php:802

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


@@ -4736,14 +4932,32 @@ msgstr "Version"
 msgid "Author(s)"
 msgstr ""
 
 msgid "Author(s)"
 msgstr ""
 

+#. TRANS: Activity title when marking a notice as favorite.
+#: classes/Fave.php:148 lib/favorform.php:143
+msgid "Favor"
+msgstr "Favour"
+
+#. TRANS: Ntofication given when a user marks a notice as favorite.
+#. TRANS: %1$s is a user nickname or full name, %2$s is a notice URI.
+#: classes/Fave.php:151
+#, fuzzy, php-format
+msgid "%1$s marked notice %2$s as a favorite."
+msgstr "%s (@%s) added your notice as a favorite"
+
+#. TRANS: Server exception thrown when a URL cannot be processed.
+#: classes/File.php:142
+#, php-format
+msgid "Cannot process URL '%s'"
+msgstr ""
+

 #. TRANS: Server exception thrown when... Robin thinks something is impossible!
 #. TRANS: Server exception thrown when... Robin thinks something is impossible!

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

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

 #, php-format
 msgid ""
 "No file may be larger than %1$d bytes and the file you sent was %2$d bytes. "
 #, php-format
 msgid ""
 "No file may be larger than %1$d bytes and the file you sent was %2$d bytes. "


@@ -4752,20 +4966,20 @@ msgstr ""
 
 #. TRANS: Message given if an upload would exceed user quota.
 #. TRANS: %d (number) is the user quota in bytes.
 
 #. TRANS: Message given if an upload would exceed user quota.
 #. TRANS: %d (number) is the user quota in bytes.

-#: classes/File.php:202
+#: classes/File.php:201

 #, php-format
 msgid "A file this large would exceed your user quota of %d bytes."
 msgstr ""
 
 #. TRANS: Message given id an upload would exceed a user's monthly quota.
 #. TRANS: $d (number) is the monthly user quota in bytes.
 #, php-format
 msgid "A file this large would exceed your user quota of %d bytes."
 msgstr ""
 
 #. 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
+#: classes/File.php:210

 #, php-format
 msgid "A file this large would exceed your monthly quota of %d bytes."
 msgstr ""
 
 #. TRANS: Client exception thrown if a file upload does not have a valid name.
 #, php-format
 msgid "A file this large would exceed your monthly quota of %d bytes."
 msgstr ""
 
 #. TRANS: Client exception thrown if a file upload does not have a valid name.

-#: classes/File.php:248 classes/File.php:263
+#: classes/File.php:247 classes/File.php:262

 #, fuzzy
 msgid "Invalid filename."
 msgstr "Invalid size."
 #, fuzzy
 msgid "Invalid filename."
 msgstr "Invalid size."


@@ -4785,6 +4999,32 @@ msgstr "Not part of group."
 msgid "Group leave failed."
 msgstr "Group leave failed."
 
 msgid "Group leave failed."
 msgstr "Group leave failed."
 

+#. TRANS: Exception thrown providing an invalid profile ID.
+#. TRANS: %s is the invalid profile ID.
+#: classes/Group_member.php:76
+#, php-format
+msgid "Profile ID %s is invalid."
+msgstr ""
+
+#. TRANS: Exception thrown providing an invalid group ID.
+#. TRANS: %s is the invalid group ID.
+#: classes/Group_member.php:89
+#, fuzzy, php-format
+msgid "Group ID %s is invalid."
+msgstr "Error saving user; invalid."
+
+#. TRANS: Activity title.
+#: classes/Group_member.php:113 lib/joinform.php:114
+msgid "Join"
+msgstr "Join"
+
+#. TRANS: Success message for subscribe to group attempt through OStatus.
+#. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
+#: classes/Group_member.php:117
+#, php-format
+msgid "%1$s has joined group %2$s."
+msgstr ""
+

 #. TRANS: Server exception thrown when updating a local group fails.
 #: classes/Local_group.php:42
 msgid "Could not update local group."
 #. TRANS: Server exception thrown when updating a local group fails.
 #: classes/Local_group.php:42
 msgid "Could not update local group."


@@ -4799,21 +5039,21 @@ msgstr "Could not create login token for %s"
 
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
 #: classes/Memcached_DataObject.php:533
 
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
 #: classes/Memcached_DataObject.php:533

-msgid "No database name / DSN found anywhere"
+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.
 msgstr ""
 
 #. TRANS: Client exception thrown when a user tries to send a direct message while being banned from sending them.

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

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

-#: classes/Message.php:63
+#: classes/Message.php:62

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

-#: classes/Message.php:74
+#: classes/Message.php:73

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


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

-#: classes/Notice.php:190
+#: classes/Notice.php:193

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

-#: classes/Notice.php:260
+#: classes/Notice.php:265

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

-#: classes/Notice.php:265
+#: classes/Notice.php:270

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

-#: classes/Notice.php:271
+#: classes/Notice.php:276

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

-#: classes/Notice.php:278
+#: classes/Notice.php:283

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


@@ -4857,45 +5097,52 @@ msgstr ""
 "few minutes."
 
 #. TRANS: Client exception thrown when a user tries to post while being banned.
 "few minutes."
 
 #. TRANS: Client exception thrown when a user tries to post while being banned.

-#: classes/Notice.php:285
+#: classes/Notice.php:291

 msgid "You are banned from posting notices on this site."
 msgstr "You are banned from posting notices on this site."
 
 #. TRANS: Server exception thrown when a notice cannot be saved.
 #. TRANS: Server exception thrown when a notice cannot be updated.
 msgid "You are banned from posting notices on this site."
 msgstr "You are banned from posting notices on this site."
 
 #. TRANS: Server exception thrown when a notice cannot be saved.
 #. TRANS: Server exception thrown when a notice cannot be updated.

-#: classes/Notice.php:352 classes/Notice.php:379
+#: classes/Notice.php:358 classes/Notice.php:385

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

-#: classes/Notice.php:891
+#: classes/Notice.php:907

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

-#: classes/Notice.php:990
+#: classes/Notice.php:1006

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

+#. TRANS: Server exception thrown when a reply cannot be saved.
+#. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
+#: classes/Notice.php:1120
+#, fuzzy, php-format
+msgid "Could not save reply for %1$d, %2$d."
+msgstr "Could not save local group info."
+

 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.

-#: classes/Notice.php:1599
+#: classes/Notice.php:1822

 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
 
 #. 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.
-#: classes/Profile.php:740
+#. TRANS: %1$s is the role name, %2$s is the user ID (number).
+#: classes/Profile.php:785

 #, php-format
 #, php-format

-msgid "Cannot revoke role \"%s\" for user #%2$s; does not exist."
+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.
 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.
-#: classes/Profile.php:749
+#. TRANS: %1$s is the role name, %2$s is the user ID (number).
+#: classes/Profile.php:794

 #, php-format
 #, php-format

-msgid "Cannot revoke role \"%1$s\" for user #%2$s; database error."
+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.
 msgstr ""
 
 #. TRANS: Exception thrown when a right for a non-existing user profile is checked.


@@ -4905,20 +5152,21 @@ msgid "Missing profile."
 msgstr "User has no profile."
 
 #. TRANS: Exception thrown when a tag cannot be saved.
 msgstr "User has no profile."
 
 #. TRANS: Exception thrown when a tag cannot be saved.

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

 #, fuzzy
 msgid "Unable to save tag."
 msgstr "Unable to save site notice."
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
 #, fuzzy
 msgid "Unable to save tag."
 msgstr "Unable to save site notice."
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.

-#: classes/Subscription.php:75 lib/oauthstore.php:465
+#: classes/Subscription.php:75 lib/oauthstore.php:466

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

+#, fuzzy

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

-msgstr ""
+msgstr "Not subscribed!"

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


@@ -4933,278 +5181,292 @@ msgstr "Not subscribed!"
 
 #. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
 #: classes/Subscription.php:178
 
 #. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
 #: classes/Subscription.php:178

-#, fuzzy

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

-msgstr "Couldn't delete self-subscription."
+msgstr "Could not delete self-subscription."

 
 #. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
 #: classes/Subscription.php:206
 
 #. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
 #: classes/Subscription.php:206

-#, fuzzy

 msgid "Could not delete subscription OMB token."
 msgid "Could not delete subscription OMB token."

-msgstr "Couldn't delete subscription OMB token."
+msgstr "Could not delete subscription OMB token."

 
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.
 #: classes/Subscription.php:218
 
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.
 #: classes/Subscription.php:218

-#, fuzzy

 msgid "Could not delete subscription."
 msgid "Could not delete subscription."

-msgstr "Couldn't delete subscription."
+msgstr "Could not delete subscription."
+
+#. TRANS: Activity tile when subscribing to another person.
+#: classes/Subscription.php:255
+msgid "Follow"
+msgstr ""
+
+#. TRANS: Notification given when one person starts following another.
+#. TRANS: %1$s is the subscriber, %2$s is the subscribed.
+#: classes/Subscription.php:258
+#, fuzzy, php-format
+msgid "%1$s is now following %2$s."
+msgstr "%1$s is now listening to your notices on %2$s."

 
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
 
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.

-#: classes/User.php:365
+#: classes/User.php:384

 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr "Welcome to %1$s, @%2$s!"
 
 #. TRANS: Server exception thrown when creating a group failed.
 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr "Welcome to %1$s, @%2$s!"
 
 #. TRANS: Server exception thrown when creating a group failed.

-#: classes/User_group.php:496
+#: classes/User_group.php:495

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

-#: classes/User_group.php:506
+#: classes/User_group.php:505

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

-#: classes/User_group.php:529
+#: classes/User_group.php:528

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

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

 msgid "Could not save local group info."
 msgstr "Could not save local group info."
 
 #. TRANS: Link title attribute in user account settings menu.
 msgid "Could not save local group info."
 msgstr "Could not save local group info."
 
 #. TRANS: Link title attribute in user account settings menu.

-#: lib/accountsettingsaction.php:109
+#: lib/accountsettingsaction.php:104

 msgid "Change your profile settings"
 msgstr "Change your profile settings"
 
 #. TRANS: Link title attribute in user account settings menu.
 msgid "Change your profile settings"
 msgstr "Change your profile settings"
 
 #. TRANS: Link title attribute in user account settings menu.

-#: lib/accountsettingsaction.php:116
+#: lib/accountsettingsaction.php:111

 msgid "Upload an avatar"
 msgstr "Upload an avatar"
 
 #. TRANS: Link title attribute in user account settings menu.
 msgid "Upload an avatar"
 msgstr "Upload an avatar"
 
 #. TRANS: Link title attribute in user account settings menu.

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

 msgid "Change your password"
 msgstr "Change your password"
 
 #. TRANS: Link title attribute in user account settings menu.
 msgid "Change your password"
 msgstr "Change your password"
 
 #. TRANS: Link title attribute in user account settings menu.

-#: lib/accountsettingsaction.php:130
+#: lib/accountsettingsaction.php:125

 msgid "Change email handling"
 msgstr "Change e-mail handling"
 
 #. TRANS: Link title attribute in user account settings menu.
 msgid "Change email handling"
 msgstr "Change e-mail handling"
 
 #. TRANS: Link title attribute in user account settings menu.

-#: lib/accountsettingsaction.php:137
+#: lib/accountsettingsaction.php:132

 msgid "Design your profile"
 msgstr "Design your profile"
 
 #. TRANS: Link title attribute in user account settings menu.
 msgid "Design your profile"
 msgstr "Design your profile"
 
 #. TRANS: Link title attribute in user account settings menu.

-#: lib/accountsettingsaction.php:144
+#: lib/accountsettingsaction.php:139

 msgid "Other options"
 msgstr "Other options"
 
 #. TRANS: Link description in user account settings menu.
 msgid "Other options"
 msgstr "Other options"
 
 #. TRANS: Link description in user account settings menu.

-#: lib/accountsettingsaction.php:146
+#: lib/accountsettingsaction.php:141

 msgid "Other"
 msgstr "Other"
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 msgid "Other"
 msgstr "Other"
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.

-#: lib/action.php:145
+#: lib/action.php:148

 #, php-format
 msgid "%1$s - %2$s"
 msgstr "%1$s - %2$s"
 
 #. TRANS: Page title for a page without a title set.
 #, php-format
 msgid "%1$s - %2$s"
 msgstr "%1$s - %2$s"
 
 #. TRANS: Page title for a page without a title set.

-#: lib/action.php:161
+#: lib/action.php:164

 msgid "Untitled page"
 msgstr "Untitled page"
 
 #. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
 msgid "Untitled page"
 msgstr "Untitled page"
 
 #. TRANS: DT element for primary navigation menu. String is hidden in default CSS.

-#: lib/action.php:436
+#: lib/action.php:448

 msgid "Primary site navigation"
 msgstr "Primary site navigation"
 
 #. TRANS: Tooltip for main menu option "Personal"
 msgid "Primary site navigation"
 msgstr "Primary site navigation"
 
 #. TRANS: Tooltip for main menu option "Personal"

-#: lib/action.php:442
+#: lib/action.php:454

 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr "Personal profile and friends timeline"
 
 #. TRANS: Main menu option when logged in for access to personal profile and friends timeline
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr "Personal profile and friends timeline"
 
 #. TRANS: Main menu option when logged in for access to personal profile and friends timeline

-#: lib/action.php:445
+#: lib/action.php:457

 msgctxt "MENU"
 msgid "Personal"
 msgstr "Personal"
 
 #. TRANS: Tooltip for main menu option "Account"
 msgctxt "MENU"
 msgid "Personal"
 msgstr "Personal"
 
 #. TRANS: Tooltip for main menu option "Account"

-#: lib/action.php:447
+#: lib/action.php:459

 msgctxt "TOOLTIP"
 msgid "Change your email, avatar, password, profile"
 msgstr "Change your email, avatar, password, profile"
 
 #. TRANS: Tooltip for main menu option "Services"
 msgctxt "TOOLTIP"
 msgid "Change your email, avatar, password, profile"
 msgstr "Change your email, avatar, password, profile"
 
 #. TRANS: Tooltip for main menu option "Services"

-#: lib/action.php:452
+#: lib/action.php:464

 msgctxt "TOOLTIP"
 msgid "Connect to services"
 msgstr "Connect to services"
 
 #. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
 msgctxt "TOOLTIP"
 msgid "Connect to services"
 msgstr "Connect to services"
 
 #. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services

-#: lib/action.php:455
+#: lib/action.php:467

 msgid "Connect"
 msgstr "Connect"
 
 #. TRANS: Tooltip for menu option "Admin"
 msgid "Connect"
 msgstr "Connect"
 
 #. TRANS: Tooltip for menu option "Admin"

-#: lib/action.php:458
+#: lib/action.php:470

 msgctxt "TOOLTIP"
 msgid "Change site configuration"
 msgstr "Change site configuration"
 
 #. TRANS: Main menu option when logged in and site admin for access to site configuration
 msgctxt "TOOLTIP"
 msgid "Change site configuration"
 msgstr "Change site configuration"
 
 #. TRANS: Main menu option when logged in and site admin for access to site configuration

-#: lib/action.php:461
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/action.php:473 lib/groupnav.php:117

 msgctxt "MENU"
 msgid "Admin"
 msgstr "Admin"
 
 #. TRANS: Tooltip for main menu option "Invite"
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Admin"
 
 #. TRANS: Tooltip for main menu option "Invite"

-#: lib/action.php:465
+#: lib/action.php:477

 #, php-format
 msgctxt "TOOLTIP"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Invite friends and colleagues to join you on %s"
 
 #. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Invite friends and colleagues to join you on %s"
 
 #. TRANS: Main menu option when logged in and invitations are allowed for inviting new users

-#: lib/action.php:468
+#: lib/action.php:480

 msgctxt "MENU"
 msgid "Invite"
 msgstr "Invite"
 
 #. TRANS: Tooltip for main menu option "Logout"
 msgctxt "MENU"
 msgid "Invite"
 msgstr "Invite"
 
 #. TRANS: Tooltip for main menu option "Logout"

-#: lib/action.php:474
+#: lib/action.php:486

 msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr "Logout from the site"
 
 #. TRANS: Main menu option when logged in to log out the current user
 msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr "Logout from the site"
 
 #. TRANS: Main menu option when logged in to log out the current user

-#: lib/action.php:477
+#: lib/action.php:489

 msgctxt "MENU"
 msgid "Logout"
 msgstr "Logout"
 
 #. TRANS: Tooltip for main menu option "Register"
 msgctxt "MENU"
 msgid "Logout"
 msgstr "Logout"
 
 #. TRANS: Tooltip for main menu option "Register"

-#: lib/action.php:482
+#: lib/action.php:494

 msgctxt "TOOLTIP"
 msgid "Create an account"
 msgstr "Create an account"
 
 #. TRANS: Main menu option when not logged in to register a new account
 msgctxt "TOOLTIP"
 msgid "Create an account"
 msgstr "Create an account"
 
 #. TRANS: Main menu option when not logged in to register a new account

-#: lib/action.php:485
+#: lib/action.php:497

 msgctxt "MENU"
 msgid "Register"
 msgstr "Register"
 
 #. TRANS: Tooltip for main menu option "Login"
 msgctxt "MENU"
 msgid "Register"
 msgstr "Register"
 
 #. TRANS: Tooltip for main menu option "Login"

-#: lib/action.php:488
+#: lib/action.php:500

 msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr "Login to the site"
 
 msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr "Login to the site"
 

-#: lib/action.php:491
+#: lib/action.php:503

 msgctxt "MENU"
 msgid "Login"
 msgstr "Login"
 
 #. TRANS: Tooltip for main menu option "Help"
 msgctxt "MENU"
 msgid "Login"
 msgstr "Login"
 
 #. TRANS: Tooltip for main menu option "Help"

-#: lib/action.php:494
+#: lib/action.php:506

 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "Help me!"
 
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "Help me!"
 

-#: lib/action.php:497
+#: lib/action.php:509

 msgctxt "MENU"
 msgid "Help"
 msgstr "Help"
 
 #. TRANS: Tooltip for main menu option "Search"
 msgctxt "MENU"
 msgid "Help"
 msgstr "Help"
 
 #. TRANS: Tooltip for main menu option "Search"

-#: lib/action.php:500
+#: lib/action.php:512

 msgctxt "TOOLTIP"
 msgid "Search for people or text"
 msgstr "Search for people or text"
 
 msgctxt "TOOLTIP"
 msgid "Search for people or text"
 msgstr "Search for people or text"
 

-#: lib/action.php:503
+#: lib/action.php:515

 msgctxt "MENU"
 msgid "Search"
 msgstr "Search"
 
 #. TRANS: DT element for site notice. String is hidden in default CSS.
 #. TRANS: Menu item for site administration
 msgctxt "MENU"
 msgid "Search"
 msgstr "Search"
 
 #. TRANS: DT element for site notice. String is hidden in default CSS.
 #. TRANS: Menu item for site administration

-#: lib/action.php:525 lib/adminpanelaction.php:400
+#: lib/action.php:537 lib/adminpanelaction.php:387

 msgid "Site notice"
 msgstr "Site notice"
 
 #. TRANS: DT element for local views block. String is hidden in default CSS.
 msgid "Site notice"
 msgstr "Site notice"
 
 #. TRANS: DT element for local views block. String is hidden in default CSS.

-#: lib/action.php:592
+#: lib/action.php:604

 msgid "Local views"
 msgstr "Local views"
 
 #. TRANS: DT element for page notice. String is hidden in default CSS.
 msgid "Local views"
 msgstr "Local views"
 
 #. TRANS: DT element for page notice. String is hidden in default CSS.

-#: lib/action.php:659
+#: lib/action.php:674

 msgid "Page notice"
 msgstr "Page notice"
 
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
 msgid "Page notice"
 msgstr "Page notice"
 
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.

-#: lib/action.php:762
+#: lib/action.php:775

 msgid "Secondary site navigation"
 msgstr "Secondary site navigation"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
 msgid "Secondary site navigation"
 msgstr "Secondary site navigation"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.

-#: lib/action.php:768
+#: lib/action.php:781

 msgid "Help"
 msgstr "Help"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
 msgid "Help"
 msgstr "Help"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.

-#: lib/action.php:771
+#: lib/action.php:784

 msgid "About"
 msgstr "About"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
 msgid "About"
 msgstr "About"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.

-#: lib/action.php:774
+#: lib/action.php:787

 msgid "FAQ"
 msgstr "F.A.Q."
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
 msgid "FAQ"
 msgstr "F.A.Q."
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.

-#: lib/action.php:779
+#: lib/action.php:792

 msgid "TOS"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
 msgid "TOS"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.

-#: lib/action.php:783
+#: lib/action.php:796

 msgid "Privacy"
 msgstr "Privacy"
 
 #. TRANS: Secondary navigation menu option.
 msgid "Privacy"
 msgstr "Privacy"
 
 #. TRANS: Secondary navigation menu option.

-#: lib/action.php:786
+#: lib/action.php:799

 msgid "Source"
 msgstr "Source"
 
 #. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
 msgid "Source"
 msgstr "Source"
 
 #. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.

-#: lib/action.php:792
+#: lib/action.php:805

 msgid "Contact"
 msgstr "Contact"
 
 msgid "Contact"
 msgstr "Contact"
 

-#: lib/action.php:794
+#. TRANS: Secondary navigation menu option.
+#: lib/action.php:808

 msgid "Badge"
 msgstr "Badge"
 
 #. TRANS: DT element for StatusNet software license.
 msgid "Badge"
 msgstr "Badge"
 
 #. TRANS: DT element for StatusNet software license.

-#: lib/action.php:823
+#: lib/action.php:837

 msgid "StatusNet software license"
 msgstr "StatusNet software licence"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 msgid "StatusNet software license"
 msgstr "StatusNet software licence"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.

-#: lib/action.php:827
+#. TRANS: Text between [] is a link description, text between () is the link itself.
+#. TRANS: Make sure there is no whitespace between "]" and "(".
+#. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
+#: lib/action.php:844

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


@@ -5214,13 +5476,16 @@ msgstr ""
 "broughtby%%](%%site.broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
 "broughtby%%](%%site.broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.

-#: lib/action.php:830
+#: lib/action.php:847

 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** is a microblogging service."
 
 #. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** is a microblogging service."
 
 #. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.

-#: lib/action.php:834
+#. TRANS: Make sure there is no whitespace between "]" and "(".
+#. TRANS: Text between [] is a link description, text between () is the link itself.
+#. TRANS: %s is the version of StatusNet that is being used.
+#: lib/action.php:854

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


@@ -5232,341 +5497,425 @@ msgstr ""
 "org/licensing/licenses/agpl-3.0.html)."
 
 #. TRANS: DT element for StatusNet site content license.
 "org/licensing/licenses/agpl-3.0.html)."
 
 #. TRANS: DT element for StatusNet site content license.

-#: lib/action.php:850
+#: lib/action.php:870

 msgid "Site content license"
 msgstr "Site content license"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
 msgid "Site content license"
 msgstr "Site content license"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.

-#: lib/action.php:857
+#: lib/action.php:877

 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.

-#: lib/action.php:864
+#: lib/action.php:884

 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.

-#: lib/action.php:868
+#: lib/action.php:888

 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 
 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:881
+#. TRANS: license message in footer.
+#. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
+#: lib/action.php:902

 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr "All %1$s content and data are available under the %2$s licence."
 
 #. TRANS: DT element for pagination (previous/next, etc.).
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr "All %1$s content and data are available under the %2$s licence."
 
 #. TRANS: DT element for pagination (previous/next, etc.).

-#: lib/action.php:1192
+#: lib/action.php:1238

 msgid "Pagination"
 msgstr "Pagination"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
 msgid "Pagination"
 msgstr "Pagination"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.

-#: lib/action.php:1203
+#: lib/action.php:1249

 msgid "After"
 msgstr "After"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
 msgid "After"
 msgstr "After"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.

-#: lib/action.php:1213
+#: lib/action.php:1259

 msgid "Before"
 msgstr "Before"
 
 #. TRANS: Client exception thrown when a feed instance is a DOMDocument.
 msgid "Before"
 msgstr "Before"
 
 #. TRANS: Client exception thrown when a feed instance is a DOMDocument.

-#: lib/activity.php:122
+#: lib/activity.php:120

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

-#: lib/activityutils.php:208
+#. TRANS: Client exception thrown when there is no source attribute.
+#: lib/activityutils.php:200

 msgid "Can't handle remote content yet."
 msgstr ""
 
 msgid "Can't handle remote content yet."
 msgstr ""
 

-#: lib/activityutils.php:244
+#. TRANS: Client exception thrown when there embedded XML content is found that cannot be processed yet.
+#: lib/activityutils.php:237

 msgid "Can't handle embedded XML content yet."
 msgstr ""
 
 msgid "Can't handle embedded XML content yet."
 msgstr ""
 

-#: lib/activityutils.php:248
+#. TRANS: Client exception thrown when base64 encoded content is found that cannot be processed yet.
+#: lib/activityutils.php:242

 msgid "Can't handle embedded Base64 content yet."
 msgstr ""
 
 #. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.
 msgid "Can't handle embedded Base64 content yet."
 msgstr ""
 
 #. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.

-#: lib/adminpanelaction.php:98
+#: lib/adminpanelaction.php:96

 msgid "You cannot make changes to this site."
 msgstr "You cannot make changes to this site."
 
 #. TRANS: Client error message throw when a certain panel's settings cannot be changed.
 msgid "You cannot make changes to this site."
 msgstr "You cannot make changes to this site."
 
 #. TRANS: Client error message throw when a certain panel's settings cannot be changed.

-#: lib/adminpanelaction.php:110
+#: lib/adminpanelaction.php:108

 msgid "Changes to that panel are not allowed."
 msgstr "Changes to that panel are not allowed."
 
 #. TRANS: Client error message.
 msgid "Changes to that panel are not allowed."
 msgstr "Changes to that panel are not allowed."
 
 #. TRANS: Client error message.

-#: lib/adminpanelaction.php:229
+#: lib/adminpanelaction.php:222

 msgid "showForm() not implemented."
 msgstr "showForm() not implemented."
 
 #. TRANS: Client error message
 msgid "showForm() not implemented."
 msgstr "showForm() not implemented."
 
 #. TRANS: Client error message

-#: lib/adminpanelaction.php:259
+#: lib/adminpanelaction.php:250

 msgid "saveSettings() not implemented."
 msgstr "saveSettings() not implemented."
 
 #. TRANS: Client error message thrown if design settings could not be deleted in
 #. TRANS: the admin panel Design.
 msgid "saveSettings() not implemented."
 msgstr "saveSettings() not implemented."
 
 #. TRANS: Client error message thrown if design settings could not be deleted in
 #. TRANS: the admin panel Design.

-#: lib/adminpanelaction.php:284
+#: lib/adminpanelaction.php:274

 msgid "Unable to delete design setting."
 msgstr "Unable to delete design setting."
 
 #. TRANS: Menu item title/tooltip
 msgid "Unable to delete design setting."
 msgstr "Unable to delete design setting."
 
 #. TRANS: Menu item title/tooltip

-#: lib/adminpanelaction.php:350
+#: lib/adminpanelaction.php:337

 msgid "Basic site configuration"
 msgstr "Basic site configuration"
 
 #. TRANS: Menu item for site administration
 msgid "Basic site configuration"
 msgstr "Basic site configuration"
 
 #. TRANS: Menu item for site administration

-#: lib/adminpanelaction.php:352
+#: lib/adminpanelaction.php:339

 msgctxt "MENU"
 msgid "Site"
 msgstr "Site"
 
 #. TRANS: Menu item title/tooltip
 msgctxt "MENU"
 msgid "Site"
 msgstr "Site"
 
 #. TRANS: Menu item title/tooltip

-#: lib/adminpanelaction.php:358
+#: lib/adminpanelaction.php:345

 msgid "Design configuration"
 msgstr "Design configuration"
 
 #. TRANS: Menu item for site administration
 msgid "Design configuration"
 msgstr "Design configuration"
 
 #. TRANS: Menu item for site administration

-#: lib/adminpanelaction.php:360
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/adminpanelaction.php:347 lib/groupnav.php:135

 msgctxt "MENU"
 msgid "Design"
 msgstr "Design"
 
 #. TRANS: Menu item title/tooltip
 msgctxt "MENU"
 msgid "Design"
 msgstr "Design"
 
 #. TRANS: Menu item title/tooltip

-#: lib/adminpanelaction.php:366
+#: lib/adminpanelaction.php:353

 msgid "User configuration"
 msgstr "User configuration"
 
 #. TRANS: Menu item for site administration
 msgid "User configuration"
 msgstr "User configuration"
 
 #. TRANS: Menu item for site administration

-#: lib/adminpanelaction.php:368 lib/personalgroupnav.php:115
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:115

 msgid "User"
 msgstr "User"
 
 #. TRANS: Menu item title/tooltip
 msgid "User"
 msgstr "User"
 
 #. TRANS: Menu item title/tooltip

-#: lib/adminpanelaction.php:374
+#: lib/adminpanelaction.php:361

 msgid "Access configuration"
 msgstr "Access configuration"
 
 #. TRANS: Menu item title/tooltip
 msgid "Access configuration"
 msgstr "Access configuration"
 
 #. TRANS: Menu item title/tooltip

-#: lib/adminpanelaction.php:382
+#: lib/adminpanelaction.php:369

 msgid "Paths configuration"
 msgstr "Paths configuration"
 
 #. TRANS: Menu item title/tooltip
 msgid "Paths configuration"
 msgstr "Paths configuration"
 
 #. TRANS: Menu item title/tooltip

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

 msgid "Sessions configuration"
 msgstr "Sessions configuration"
 
 #. TRANS: Menu item title/tooltip
 msgid "Sessions configuration"
 msgstr "Sessions configuration"
 
 #. TRANS: Menu item title/tooltip

-#: lib/adminpanelaction.php:398
+#: lib/adminpanelaction.php:385

 msgid "Edit site notice"
 msgstr "Edit site notice"
 
 #. TRANS: Menu item title/tooltip
 msgid "Edit site notice"
 msgstr "Edit site notice"
 
 #. TRANS: Menu item title/tooltip

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

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

+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:401
+msgid "Set site license"
+msgstr ""
+

 #. TRANS: Client error 401.
 #. TRANS: Client error 401.

-#: lib/apiauth.php:113
+#: lib/apiauth.php:111

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

+#. TRANS: OAuth exception thrown when no application is found for a given consumer key.
+#: lib/apiauth.php:175
+msgid "No application for that consumer key."
+msgstr ""
+
+#. TRANS: OAuth exception given when an incorrect access token was given for a user.
+#: lib/apiauth.php:212
+msgid "Bad access token."
+msgstr ""
+
+#. TRANS: OAuth exception given when no user was found for a given token (no token was found).
+#: lib/apiauth.php:217
+msgid "No user for that token."
+msgstr ""
+
+#. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
+#. TRANS: Client error thrown when authentication fails.
+#: lib/apiauth.php:258 lib/apiauth.php:290
+msgid "Could not authenticate you."
+msgstr ""
+
+#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
+#: lib/apioauthstore.php:178
+msgid "Tried to revoke unknown token."
+msgstr ""
+
+#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
+#: lib/apioauthstore.php:183
+msgid "Failed to delete revoked token."
+msgstr ""
+

 #. TRANS: Form legend.
 #. TRANS: Form legend.

-#: lib/applicationeditform.php:137
+#: lib/applicationeditform.php:129
+#, fuzzy

 msgid "Edit application"
 msgid "Edit application"

-msgstr ""
+msgstr "Edit Application"

 
 #. TRANS: Form guide.
 
 #. TRANS: Form guide.

-#: lib/applicationeditform.php:187
+#: lib/applicationeditform.php:178
+#, fuzzy

 msgid "Icon for this application"
 msgid "Icon for this application"

-msgstr ""
+msgstr "Do not delete this application"

 
 #. TRANS: Form input field instructions.
 
 #. TRANS: Form input field instructions.

-#: lib/applicationeditform.php:209
-#, php-format
-msgid "Describe your application in %d characters"
-msgstr "Describe your application in %d characters"
+#. TRANS: %d is the number of available characters for the description.
+#: lib/applicationeditform.php:201
+#, fuzzy, php-format
+msgid "Describe your application in %d character"
+msgid_plural "Describe your application in %d characters"
+msgstr[0] "Describe your application in %d characters"
+msgstr[1] "Describe your application in %d characters"

 
 #. TRANS: Form input field instructions.
 
 #. TRANS: Form input field instructions.

-#: lib/applicationeditform.php:213
+#: lib/applicationeditform.php:205

 msgid "Describe your application"
 msgstr "Describe your application"
 
 #. TRANS: Form input field instructions.
 msgid "Describe your application"
 msgstr "Describe your application"
 
 #. TRANS: Form input field instructions.

-#: lib/applicationeditform.php:224
+#: lib/applicationeditform.php:216

 msgid "URL of the homepage of this application"
 msgstr "URL of the homepage of this application"
 
 #. TRANS: Form input field label.
 msgid "URL of the homepage of this application"
 msgstr "URL of the homepage of this application"
 
 #. TRANS: Form input field label.

-#: lib/applicationeditform.php:226
+#: lib/applicationeditform.php:218

 msgid "Source URL"
 msgstr "Source URL"
 
 #. TRANS: Form input field instructions.
 msgid "Source URL"
 msgstr "Source URL"
 
 #. TRANS: Form input field instructions.

-#: lib/applicationeditform.php:233
+#: lib/applicationeditform.php:225

 msgid "Organization responsible for this application"
 msgstr "Organisation responsible for this application"
 
 #. TRANS: Form input field instructions.
 msgid "Organization responsible for this application"
 msgstr "Organisation responsible for this application"
 
 #. TRANS: Form input field instructions.

-#: lib/applicationeditform.php:242
+#: lib/applicationeditform.php:234

 msgid "URL for the homepage of the organization"
 msgstr "URL for the homepage of the organisation"
 
 #. TRANS: Form input field instructions.
 msgid "URL for the homepage of the organization"
 msgstr "URL for the homepage of the organisation"
 
 #. TRANS: Form input field instructions.

-#: lib/applicationeditform.php:251
+#: lib/applicationeditform.php:243

 msgid "URL to redirect to after authentication"
 msgstr ""
 
 #. TRANS: Radio button label for application type
 msgid "URL to redirect to after authentication"
 msgstr ""
 
 #. TRANS: Radio button label for application type

-#: lib/applicationeditform.php:278
+#: lib/applicationeditform.php:271

 msgid "Browser"
 msgstr ""
 
 #. TRANS: Radio button label for application type
 msgid "Browser"
 msgstr ""
 
 #. TRANS: Radio button label for application type

-#: lib/applicationeditform.php:295
+#: lib/applicationeditform.php:288

 msgid "Desktop"
 msgstr ""
 
 #. TRANS: Form guide.
 msgid "Desktop"
 msgstr ""
 
 #. TRANS: Form guide.

-#: lib/applicationeditform.php:297
+#: lib/applicationeditform.php:290

 msgid "Type of application, browser or desktop"
 msgstr ""
 
 #. TRANS: Radio button label for access type.
 msgid "Type of application, browser or desktop"
 msgstr ""
 
 #. TRANS: Radio button label for access type.

-#: lib/applicationeditform.php:320
+#: lib/applicationeditform.php:314

 msgid "Read-only"
 msgstr ""
 
 #. TRANS: Radio button label for access type.
 msgid "Read-only"
 msgstr ""
 
 #. TRANS: Radio button label for access type.

-#: lib/applicationeditform.php:339
+#: lib/applicationeditform.php:334

 msgid "Read-write"
 msgstr ""
 
 #. TRANS: Form guide.
 msgid "Read-write"
 msgstr ""
 
 #. TRANS: Form guide.

-#: lib/applicationeditform.php:341
+#: lib/applicationeditform.php:336

 msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 
 msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 

-#. TRANS: Submit button title
-#: lib/applicationeditform.php:359
+#. TRANS: Submit button title.
+#: lib/applicationeditform.php:353

 msgid "Cancel"
 msgstr "Cancel"
 
 #. TRANS: Application access type
 msgid "Cancel"
 msgstr "Cancel"
 
 #. TRANS: Application access type

-#: lib/applicationlist.php:136
+#: lib/applicationlist.php:134

 msgid "read-write"
 msgstr ""
 
 #. TRANS: Application access type
 msgid "read-write"
 msgstr ""
 
 #. TRANS: Application access type

-#: lib/applicationlist.php:138
+#: lib/applicationlist.php:136

 msgid "read-only"
 msgstr ""
 
 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
+#. TRANS: Used in application list. %1$s is a modified date, %2$s is access type ("read-write" or "read-only")
+#: lib/applicationlist.php:142

 #, php-format
 msgid "Approved %1$s - \"%2$s\" access."
 msgstr ""
 
 #. TRANS: Button label
 #, php-format
 msgid "Approved %1$s - \"%2$s\" access."
 msgstr ""
 
 #. TRANS: Button label

-#: lib/applicationlist.php:159
+#: lib/applicationlist.php:157

 msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "Revoke"
 
 msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "Revoke"
 

+#: lib/atom10feed.php:112
+msgid "author element must contain a name element."
+msgstr ""
+

 #. TRANS: DT element label in attachment list.
 #. TRANS: DT element label in attachment list.

-#: lib/attachmentlist.php:88
+#: lib/attachmentlist.php:85
+#, fuzzy

 msgid "Attachments"
 msgid "Attachments"

-msgstr ""
+msgstr "No attachments."

 
 #. TRANS: DT element label in attachment list item.
 
 #. TRANS: DT element label in attachment list item.

-#: lib/attachmentlist.php:265
+#: lib/attachmentlist.php:256
+#, fuzzy

 msgid "Author"
 msgid "Author"

-msgstr ""
+msgstr "Authorise URL"

 
 #. TRANS: DT element label in attachment list item.
 
 #. TRANS: DT element label in attachment list item.

-#: lib/attachmentlist.php:279
+#: lib/attachmentlist.php:270

 msgid "Provider"
 msgstr "Provider"
 
 msgid "Provider"
 msgstr "Provider"
 

+#. TRANS: Title.

 #: lib/attachmentnoticesection.php:67
 msgid "Notices where this attachment appears"
 msgstr ""
 
 #: lib/attachmentnoticesection.php:67
 msgid "Notices where this attachment appears"
 msgstr ""
 

+#. TRANS: Title.

 #: lib/attachmenttagcloudsection.php:48
 #: lib/attachmenttagcloudsection.php:48

+#, fuzzy

 msgid "Tags for this attachment"
 msgid "Tags for this attachment"

-msgstr ""
+msgstr "No such attachment."

 
 

-#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:226
-msgid "Password changing failed"
+#. TRANS: Exception thrown when a password change fails.
+#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:227
+#, fuzzy
+msgid "Password changing failed."

 msgstr "Password changing failed"
 
 msgstr "Password changing failed"
 

-#: lib/authenticationplugin.php:236
-msgid "Password changing is not allowed"
+#. TRANS: Exception thrown when a password change attempt fails because it is not allowed.
+#: lib/authenticationplugin.php:238
+#, fuzzy
+msgid "Password changing is not allowed."

 msgstr "Password changing is not allowed"
 
 msgstr "Password changing is not allowed"
 

-#: lib/channel.php:157 lib/channel.php:177
+#. TRANS: Title for the form to block a user.
+#: lib/blockform.php:68
+msgid "Block"
+msgstr "Block"
+
+#. TRANS: Title for command results.
+#: lib/channel.php:160 lib/channel.php:181

 msgid "Command results"
 msgstr "Command results"
 
 msgid "Command results"
 msgstr "Command results"
 

-#: lib/channel.php:229 lib/mailhandler.php:142
+#. TRANS: Title for command results.
+#: lib/channel.php:194
+#, fuzzy
+msgid "AJAX error"
+msgstr "Ajax Error"
+
+#. TRANS: E-mail subject when a command has completed.
+#: lib/channel.php:233 lib/mailhandler.php:142

 msgid "Command complete"
 msgstr "Command complete"
 
 msgid "Command complete"
 msgstr "Command complete"
 

-#: lib/channel.php:240
+#. TRANS: E-mail subject when a command has failed.
+#: lib/channel.php:244

 msgid "Command failed"
 msgstr "Command failed"
 
 msgid "Command failed"
 msgstr "Command failed"
 

-#: lib/command.php:83 lib/command.php:105
-msgid "Notice with that id does not exist"
-msgstr "Notice with that id does not exist"
+#. TRANS: Command exception text shown when a notice ID is requested that does not exist.
+#: lib/command.php:82 lib/command.php:106
+#, fuzzy
+msgid "Notice with that id does not exist."
+msgstr "No profile with that id."

 
 

-#: lib/command.php:99 lib/command.php:596
-msgid "User has no last notice"
+#. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
+#. TRANS: Error text shown when a last user notice is requested and it does not exist.
+#: lib/command.php:99 lib/command.php:626
+#, fuzzy
+msgid "User has no last notice."

 msgstr "User has no last notice"
 
 #. 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.
 msgstr "User has no last notice"
 
 #. 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"
+#: lib/command.php:128
+#, fuzzy, php-format
+msgid "Could not find a user with nickname %s."

 msgstr "Could not find a user with nickname %s"
 
 #. TRANS: Message given getting a non-existing user.
 #. TRANS: %s is the nickname of the user that could not be found.
 msgstr "Could not find a user with nickname %s"
 
 #. 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
+#: lib/command.php:148

 #, php-format
 #, php-format

-msgid "Could not find a local user with nickname %s"
-msgstr "Could not find a local user with nickname %s"
+msgid "Could not find a local user with nickname %s."
+msgstr ""

 
 

-#: lib/command.php:180
+#. TRANS: Error text shown when an unimplemented command is given.
+#: lib/command.php:183

 msgid "Sorry, this command is not yet implemented."
 msgstr "Sorry, this command is not yet implemented."
 
 msgid "Sorry, this command is not yet implemented."
 msgstr "Sorry, this command is not yet implemented."
 

-#: lib/command.php:225
+#. TRANS: Command exception text shown when a user tries to nudge themselves.
+#: lib/command.php:229

 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr ""
 
 #. TRANS: Message given having nudged another user.
 #. TRANS: %s is the nickname of the user that was nudged.
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr ""
 
 #. 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"
+#: lib/command.php:238
+#, fuzzy, php-format
+msgid "Nudge sent to %s."

 msgstr "Nudge sent to %s"
 
 msgstr "Nudge sent to %s"
 

-#: lib/command.php:260
+#. TRANS: User statistics text.
+#. TRANS: %1$s is the number of other user the user is subscribed to.
+#. TRANS: %2$s is the number of users that are subscribed to the user.
+#. TRANS: %3$s is the number of notices the user has sent.
+#: lib/command.php:268

 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"


@@ -5574,55 +5923,54 @@ msgid ""
 "Notices: %3$s"
 msgstr ""
 
 "Notices: %3$s"
 msgstr ""
 

-#: lib/command.php:302
+#. TRANS: Text shown when a notice has been marked as favourite successfully.
+#: lib/command.php:312

 msgid "Notice marked as fave."
 msgstr "Notice marked as fave."
 
 msgid "Notice marked as fave."
 msgstr "Notice marked as fave."
 

-#: lib/command.php:323
-msgid "You are already a member of that group"
-msgstr "You are already a member of that group."
-
-#. TRANS: Message given having failed to add a user to a group.
+#. 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.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.

-#: lib/command.php:339
+#: lib/command.php:357

 #, php-format
 #, php-format

-msgid "Could not join user %1$s to group %2$s"
-msgstr "Could not join user %1$s to group %2$s."
+msgid "%1$s joined group %2$s."
+msgstr ""

 
 

-#. TRANS: Message given having failed to remove a user from a group.
+#. 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.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.

-#: lib/command.php:385
+#: lib/command.php:405

 #, php-format
 #, php-format

-msgid "Could not remove user %1$s from group %2$s"
-msgstr "Could not remove user %1$s to group %2$s"
+msgid "%1$s left group %2$s."
+msgstr ""

 
 #. TRANS: Whois output. %s is the full name of the queried user.
 
 #. TRANS: Whois output. %s is the full name of the queried user.

-#: lib/command.php:418
+#: lib/command.php:430

 #, php-format
 msgid "Fullname: %s"
 msgstr "Fullname: %s"
 
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
 #, php-format
 msgid "Fullname: %s"
 msgstr "Fullname: %s"
 
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail

-#: lib/command.php:422 lib/mail.php:268
+#: lib/command.php:434 lib/mail.php:268

 #, php-format
 msgid "Location: %s"
 msgstr "Location: %s"
 
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
 #, php-format
 msgid "Location: %s"
 msgstr "Location: %s"
 
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail

-#: lib/command.php:426 lib/mail.php:271
+#: lib/command.php:438 lib/mail.php:271

 #, php-format
 msgid "Homepage: %s"
 msgstr "Homepage: %s"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
 #, php-format
 msgid "Homepage: %s"
 msgstr "Homepage: %s"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.

-#: lib/command.php:430
+#: lib/command.php:442

 #, php-format
 msgid "About: %s"
 msgstr "About: %s"
 
 #, php-format
 msgid "About: %s"
 msgstr "About: %s"
 

-#: lib/command.php:457
+#. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
+#. TRANS: %s is a remote profile.
+#: lib/command.php:471

 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "


@@ -5631,142 +5979,170 @@ msgstr ""
 
 #. 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.
 
 #. 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
+#: lib/command.php:488 lib/xmppmanager.php:403

 #, php-format
 #, php-format

-msgid "Message too long - maximum is %1$d characters, you sent %2$d"
-msgstr "Message too long - maximum is %1$d characters, you sent %2$d"
-
-#. 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 "Direct message to %s sent"
+msgid "Message too long - maximum is %1$d characters, you sent %2$d."
+msgstr "Message too long - maximum is %1$d characters, you sent %2$d."

 
 

-#: lib/command.php:494
+#. TRANS: Error text shown sending a direct message fails with an unknown reason.
+#: lib/command.php:514

 msgid "Error sending direct message."
 msgstr "Error sending direct message."
 
 msgid "Error sending direct message."
 msgstr "Error sending direct message."
 

-#: lib/command.php:514
-msgid "Cannot repeat your own notice"
-msgstr "Cannot repeat your own notice."
-
-#: lib/command.php:519
-msgid "Already repeated that notice"
-msgstr "Already repeated that notice."
-

 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
 #. 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 "Notice from %s repeated"
+#: lib/command.php:551
+#, fuzzy, php-format
+msgid "Notice from %s repeated."
+msgstr "Notice posted"

 
 

-#: lib/command.php:531
+#. TRANS: Error text shown when repeating a notice fails with an unknown reason.
+#: lib/command.php:554

 msgid "Error repeating notice."
 msgstr "Error repeating notice."
 
 msgid "Error repeating notice."
 msgstr "Error repeating notice."
 

-#: lib/command.php:562
-#, php-format
-msgid "Notice too long - maximum is %d characters, you sent %d"
+#. TRANS: Message given if content of a notice for a reply is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:589
+#, fuzzy, php-format
+msgid "Notice too long - maximum is %1$d characters, you sent %2$d."

 msgstr "Notice too long - maximum is %d characters, you sent %d"
 
 msgstr "Notice too long - maximum is %d characters, you sent %d"
 

-#: lib/command.php:571
-#, php-format
-msgid "Reply to %s sent"
+#. TRANS: Text shown having sent a reply to a notice successfully.
+#. TRANS: %s is the nickname of the user of the notice the reply was sent to.
+#: lib/command.php:600
+#, fuzzy, php-format
+msgid "Reply to %s sent."

 msgstr "Reply to %s sent"
 
 msgstr "Reply to %s sent"
 

-#: lib/command.php:573
+#. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
+#: lib/command.php:603

 msgid "Error saving notice."
 msgstr "Error saving notice."
 
 msgid "Error saving notice."
 msgstr "Error saving notice."
 

-#: lib/command.php:620
-msgid "Specify the name of the user to subscribe to"
+#. TRANS: Error text shown when no username was provided when issuing a subscribe command.
+#: lib/command.php:650
+#, fuzzy
+msgid "Specify the name of the user to subscribe to."

 msgstr "Specify the name of the user to subscribe to"
 
 msgstr "Specify the name of the user to subscribe to"
 

-#: lib/command.php:628
+#. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
+#: lib/command.php:659

 msgid "Can't subscribe to OMB profiles by command."
 msgstr "Can't subscribe to OMB profiles by command."
 
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "Can't subscribe to OMB profiles by command."
 

-#: lib/command.php:634
+#. TRANS: Text shown after having subscribed to another user successfully.
+#. TRANS: %s is the name of the user the subscription was requested for.
+#: lib/command.php:667

 #, php-format
 #, php-format

-msgid "Subscribed to %s"
-msgstr "Subscribed to %s"
+msgid "Subscribed to %s."
+msgstr ""

 
 

-#: lib/command.php:655 lib/command.php:754
-msgid "Specify the name of the user to unsubscribe from"
+#. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
+#. TRANS: Error text shown when no username was provided when issuing the command.
+#: lib/command.php:688 lib/command.php:799
+#, fuzzy
+msgid "Specify the name of the user to unsubscribe from."

 msgstr "Specify the name of the user to unsubscribe from"
 
 msgstr "Specify the name of the user to unsubscribe from"
 

-#: lib/command.php:664
+#. TRANS: Text shown after having unsubscribed from another user successfully.
+#. TRANS: %s is the name of the user the unsubscription was requested for.
+#: lib/command.php:699

 #, php-format
 #, php-format

-msgid "Unsubscribed from %s"
-msgstr "Unsubscribed from %s"
+msgid "Unsubscribed from %s."
+msgstr ""

 
 

-#: lib/command.php:682 lib/command.php:705
+#. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
+#. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
+#: lib/command.php:719 lib/command.php:745

 msgid "Command not yet implemented."
 msgstr "Command not yet implemented."
 
 msgid "Command not yet implemented."
 msgstr "Command not yet implemented."
 

-#: lib/command.php:685
+#. TRANS: Text shown when issuing the command "off" successfully.
+#: lib/command.php:723

 msgid "Notification off."
 msgstr "Notification off."
 
 msgid "Notification off."
 msgstr "Notification off."
 

-#: lib/command.php:687
+#. TRANS: Error text shown when the command "off" fails for an unknown reason.
+#: lib/command.php:726

 msgid "Can't turn off notification."
 msgstr "Can't turn off notification."
 
 msgid "Can't turn off notification."
 msgstr "Can't turn off notification."
 

-#: lib/command.php:708
+#. TRANS: Text shown when issuing the command "on" successfully.
+#: lib/command.php:749

 msgid "Notification on."
 msgstr "Notification on."
 
 msgid "Notification on."
 msgstr "Notification on."
 

-#: lib/command.php:710
+#. TRANS: Error text shown when the command "on" fails for an unknown reason.
+#: lib/command.php:752

 msgid "Can't turn on notification."
 msgstr "Can't turn on notification."
 
 msgid "Can't turn on notification."
 msgstr "Can't turn on notification."
 

-#: lib/command.php:723
-msgid "Login command is disabled"
+#. TRANS: Error text shown when issuing the login command while login is disabled.
+#: lib/command.php:766
+msgid "Login command is disabled."

 msgstr ""
 
 msgstr ""
 

-#: lib/command.php:734
+#. TRANS: Text shown after issuing the login command successfully.
+#. TRANS: %s is a logon link..
+#: lib/command.php:779

 #, php-format
 #, php-format

-msgid "This link is useable only once, and is good for only 2 minutes: %s"
+msgid "This link is useable only once and is valid for only 2 minutes: %s."

 msgstr ""
 
 msgstr ""
 

-#: lib/command.php:761
+#. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
+#. TRANS: %s is the name of the user the unsubscription was requested for.
+#: lib/command.php:808

 #, php-format
 #, php-format

-msgid "Unsubscribed  %s"
-msgstr "Unsubscribed  %s"
+msgid "Unsubscribed %s."
+msgstr ""

 
 

-#: lib/command.php:778
+#. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
+#: lib/command.php:826

 msgid "You are not subscribed to anyone."
 msgstr "You are not subscribed to anyone."
 
 msgid "You are not subscribed to anyone."
 msgstr "You are not subscribed to anyone."
 

-#: lib/command.php:780
+#. TRANS: Text shown after requesting other users a user is subscribed to.
+#. TRANS: This message supports plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribed users.
+#: lib/command.php:831

 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "You are already subscribed to these users:"
 msgstr[1] "You are already subscribed to these users:"
 
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "You are already subscribed to these users:"
 msgstr[1] "You are already subscribed to these users:"
 

-#: lib/command.php:800
+#. TRANS: Text shown after requesting other users that are subscribed to a user
+#. TRANS: (followers) without having any subscribers.
+#: lib/command.php:853

 msgid "No one is subscribed to you."
 msgstr "No one is subscribed to you."
 
 msgid "No one is subscribed to you."
 msgstr "No one is subscribed to you."
 

-#: lib/command.php:802
+#. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
+#. TRANS: This message supports plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribing users.
+#: lib/command.php:858

 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Could not subscribe other to you."
 msgstr[1] "Could not subscribe other to you."
 
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Could not subscribe other to you."
 msgstr[1] "Could not subscribe other to you."
 

-#: lib/command.php:822
+#. TRANS: Text shown after requesting groups a user is subscribed to without having
+#. TRANS: any group subscriptions.
+#: lib/command.php:880

 msgid "You are not a member of any groups."
 msgstr "You are not a member of any groups."
 
 msgid "You are not a member of any groups."
 msgstr "You are not a member of any groups."
 

-#: lib/command.php:824
+#. TRANS: Text shown after requesting groups a user is subscribed to.
+#. TRANS: This message supports plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribed groups.
+#: lib/command.php:885

 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "You are not a member of that group."
 msgstr[1] "You are not a member of that group."
 
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "You are not a member of that group."
 msgstr[1] "You are not a member of that group."
 

-#: lib/command.php:838
+#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
+#: lib/command.php:900

 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"


@@ -5846,39 +6222,61 @@ msgstr ""
 "tracks - not yet implemented.\n"
 "tracking - not yet implemented.\n"
 
 "tracks - not yet implemented.\n"
 "tracking - not yet implemented.\n"
 

-#: lib/common.php:135
+#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
+#: lib/common.php:136

 msgid "No configuration file found. "
 msgstr "No configuration file found"
 
 msgid "No configuration file found. "
 msgstr "No configuration file found"
 

-#: lib/common.php:136
+#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
+#. TRANS: Is followed by a list of directories (separated by HTML breaks).
+#: lib/common.php:139

 msgid "I looked for configuration files in the following places: "
 msgstr ""
 
 msgid "I looked for configuration files in the following places: "
 msgstr ""
 

-#: lib/common.php:138
+#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
+#: lib/common.php:142

 msgid "You may wish to run the installer to fix this."
 msgstr ""
 
 msgid "You may wish to run the installer to fix this."
 msgstr ""
 

-#: lib/common.php:139
+#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
+#. TRANS: The text is link text that leads to the installer page.
+#: lib/common.php:146

 msgid "Go to the installer."
 msgstr "Go to the installer."
 
 msgid "Go to the installer."
 msgstr "Go to the installer."
 

-#: lib/connectsettingsaction.php:110
+#. TRANS: Menu item for Instant Messaging settings.
+#: lib/connectsettingsaction.php:106
+#, fuzzy
+msgctxt "MENU"

 msgid "IM"
 msgstr "I.M."
 
 msgid "IM"
 msgstr "I.M."
 

-#: lib/connectsettingsaction.php:111
+#. TRANS: Tooltip for Instant Messaging menu item.
+#: lib/connectsettingsaction.php:108

 msgid "Updates by instant messenger (IM)"
 msgstr "Updates by instant messenger (I.M.)"
 
 msgid "Updates by instant messenger (IM)"
 msgstr "Updates by instant messenger (I.M.)"
 

-#: lib/connectsettingsaction.php:116
+#. TRANS: Menu item for Short Message Service settings.
+#: lib/connectsettingsaction.php:113
+#, fuzzy
+msgctxt "MENU"
+msgid "SMS"
+msgstr "SMS"
+
+#. TRANS: Tooltip for Short Message Service menu item.
+#: lib/connectsettingsaction.php:115

 msgid "Updates by SMS"
 msgstr "Updates by SMS"
 
 msgid "Updates by SMS"
 msgstr "Updates by SMS"
 

+#. TRANS: Menu item for OAth connection settings.

 #: lib/connectsettingsaction.php:120
 #: lib/connectsettingsaction.php:120

+#, fuzzy
+msgctxt "MENU"

 msgid "Connections"
 msgstr "Connections"
 
 msgid "Connections"
 msgstr "Connections"
 

-#: lib/connectsettingsaction.php:121
+#. TRANS: Tooltip for connected applications (Connections through OAth) menu item.
+#: lib/connectsettingsaction.php:122

 msgid "Authorized connected applications"
 msgstr "Authorised connected applications"
 
 msgid "Authorized connected applications"
 msgstr "Authorised connected applications"
 


@@ -5897,21 +6295,18 @@ msgstr ""
 "You can upload your personal background image. The maximum file size is 2MB."
 
 #: lib/designsettings.php:418
 "You can upload your personal background image. The maximum file size is 2MB."
 
 #: lib/designsettings.php:418

+#, fuzzy

 msgid "Design defaults restored."
 msgid "Design defaults restored."

-msgstr ""
+msgstr "Design preferences saved."

 
 

-#: lib/disfavorform.php:114 lib/disfavorform.php:140
+#: lib/disfavorform.php:114 lib/disfavorform.php:144

 msgid "Disfavor this notice"
 msgstr "Disfavour this notice"
 
 msgid "Disfavor this notice"
 msgstr "Disfavour this notice"
 

-#: lib/favorform.php:114 lib/favorform.php:140
+#: lib/favorform.php:114 lib/favorform.php:143

 msgid "Favor this notice"
 msgstr "Favour this notice"
 
 msgid "Favor this notice"
 msgstr "Favour this notice"
 

-#: lib/favorform.php:140
-msgid "Favor"
-msgstr "Favour"
-

 #: lib/feed.php:85
 msgid "RSS 1.0"
 msgstr ""
 #: lib/feed.php:85
 msgid "RSS 1.0"
 msgstr ""


@@ -5928,9 +6323,9 @@ msgstr ""
 msgid "FOAF"
 msgstr ""
 
 msgid "FOAF"
 msgstr ""
 

-#: lib/feedlist.php:64
-msgid "Export data"
-msgstr "Export data"
+#: lib/feedlist.php:66
+msgid "Feeds"
+msgstr ""

 
 #: lib/galleryaction.php:121
 msgid "Filter tags"
 
 #: lib/galleryaction.php:121
 msgid "Filter tags"


@@ -5985,37 +6380,77 @@ msgstr ""
 msgid "Extra nicknames for the group, comma- or space- separated, max %d"
 msgstr ""
 
 msgid "Extra nicknames for the group, comma- or space- separated, max %d"
 msgstr ""
 

-#: lib/groupnav.php:85
+#. TRANS: Menu item in the group navigation page.
+#: lib/groupnav.php:86
+msgctxt "MENU"

 msgid "Group"
 msgid "Group"

-msgstr "Group"
+msgstr ""
+
+#. TRANS: Tooltip for menu item in the group navigation page.
+#. TRANS: %s is the nickname of the group.
+#: lib/groupnav.php:89
+#, php-format
+msgctxt "TOOLTIP"
+msgid "%s group"
+msgstr ""

 
 

-#: lib/groupnav.php:101
+#. TRANS: Menu item in the group navigation page.
+#: lib/groupnav.php:95
+msgctxt "MENU"
+msgid "Members"
+msgstr ""
+
+#. TRANS: Tooltip for menu item in the group navigation page.
+#. TRANS: %s is the nickname of the group.
+#: lib/groupnav.php:98
+#, php-format
+msgctxt "TOOLTIP"
+msgid "%s group members"
+msgstr ""
+
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/groupnav.php:108
+msgctxt "MENU"

 msgid "Blocked"
 msgid "Blocked"

-msgstr "Blocked"
+msgstr ""

 
 

-#: lib/groupnav.php:102
+#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
+#. TRANS: %s is the nickname of the group.
+#: lib/groupnav.php:111

 #, php-format
 #, php-format

+msgctxt "TOOLTIP"

 msgid "%s blocked users"
 msgid "%s blocked users"

-msgstr "%s blocked users"
+msgstr ""

 
 

-#: lib/groupnav.php:108
+#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
+#. TRANS: %s is the nickname of the group.
+#: lib/groupnav.php:120

 #, php-format
 #, php-format

+msgctxt "TOOLTIP"

 msgid "Edit %s group properties"
 msgid "Edit %s group properties"

-msgstr "Edit %s group properties"
+msgstr ""

 
 

-#: lib/groupnav.php:113
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/groupnav.php:126
+msgctxt "MENU"

 msgid "Logo"
 msgid "Logo"

-msgstr "Logo"
+msgstr ""

 
 

-#: lib/groupnav.php:114
+#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
+#. TRANS: %s is the nickname of the group.
+#: lib/groupnav.php:129

 #, php-format
 #, php-format

+msgctxt "TOOLTIP"

 msgid "Add or edit %s logo"
 msgid "Add or edit %s logo"

-msgstr "Add or edit %s logo"
+msgstr ""

 
 

-#: lib/groupnav.php:120
+#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
+#. TRANS: %s is the nickname of the group.
+#: lib/groupnav.php:138

 #, php-format
 #, php-format

+msgctxt "TOOLTIP"

 msgid "Add or edit %s design"
 msgid "Add or edit %s design"

-msgstr "Add or edit %s design"
+msgstr ""

 
 #: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
 
 #: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"


@@ -6048,7 +6483,8 @@ msgstr "That file is too big. The maximum file size is %s."
 msgid "Partial upload."
 msgstr "Partial upload."
 
 msgid "Partial upload."
 msgstr "Partial upload."
 

-#: lib/imagefile.php:101 lib/mediafile.php:170
+#. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
+#: lib/imagefile.php:101 lib/mediafile.php:179

 msgid "System error uploading file."
 msgstr "System error uploading file."
 
 msgid "System error uploading file."
 msgstr "System error uploading file."
 


@@ -6082,10 +6518,6 @@ msgstr ""
 msgid "Unknown inbox source %d."
 msgstr ""
 
 msgid "Unknown inbox source %d."
 msgstr ""
 

-#: lib/joinform.php:114
-msgid "Join"
-msgstr "Join"
-

 #: lib/leaveform.php:114
 msgid "Leave"
 msgstr "Leave"
 #: lib/leaveform.php:114
 msgid "Leave"
 msgstr "Leave"


@@ -6298,9 +6730,9 @@ msgid ""
 msgstr ""
 
 #: lib/mail.php:657
 msgstr ""
 
 #: lib/mail.php:657

-#, php-format
+#, fuzzy, php-format

 msgid "%s (@%s) sent a notice to your attention"
 msgid "%s (@%s) sent a notice to your attention"

-msgstr ""
+msgstr "%s (@%s) added your notice as a favorite"

 
 #. TRANS: Body of @-reply notification e-mail.
 #: lib/mail.php:660
 
 #. TRANS: Body of @-reply notification e-mail.
 #: lib/mail.php:660


@@ -6340,7 +6772,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:505
+#: lib/mailbox.php:228 lib/noticelist.php:516

 msgid "from"
 msgstr "from"
 
 msgid "from"
 msgstr "from"
 


@@ -6365,56 +6797,75 @@ msgstr "Sorry, no incoming e-mail allowed."
 msgid "Unsupported message type: %s"
 msgstr "Unsupported message type: %s"
 
 msgid "Unsupported message type: %s"
 msgstr "Unsupported message type: %s"
 

-#: lib/mediafile.php:98 lib/mediafile.php:123
+#. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
+#: lib/mediafile.php:99 lib/mediafile.php:125

 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
 
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
 

-#: lib/mediafile.php:142
+#. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
+#: lib/mediafile.php:145

 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
 msgstr ""
 
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
 msgstr ""
 

-#: lib/mediafile.php:147
+#. TRANS: Client exception.
+#: lib/mediafile.php:151

 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form."
 msgstr ""
 
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form."
 msgstr ""
 

-#: lib/mediafile.php:152
+#. TRANS: Client exception.
+#: lib/mediafile.php:157

 msgid "The uploaded file was only partially uploaded."
 msgstr ""
 
 msgid "The uploaded file was only partially uploaded."
 msgstr ""
 

-#: lib/mediafile.php:159
+#. TRANS: Client exception thrown when a temporary folder is not present to store a file upload.
+#: lib/mediafile.php:165

 msgid "Missing a temporary folder."
 msgstr ""
 
 msgid "Missing a temporary folder."
 msgstr ""
 

-#: lib/mediafile.php:162
+#. TRANS: Client exception thrown when writing to disk is not possible during a file upload operation.
+#: lib/mediafile.php:169

 msgid "Failed to write file to disk."
 msgstr ""
 
 msgid "Failed to write file to disk."
 msgstr ""
 

-#: lib/mediafile.php:165
+#. TRANS: Client exception thrown when a file upload operation has been stopped by an extension.
+#: lib/mediafile.php:173

 msgid "File upload stopped by extension."
 msgstr ""
 
 msgid "File upload stopped by extension."
 msgstr ""
 

-#: lib/mediafile.php:179 lib/mediafile.php:217
+#. TRANS: Client exception thrown when a file upload operation would cause a user to exceed a set quota.
+#: lib/mediafile.php:189 lib/mediafile.php:232

 msgid "File exceeds user's quota."
 msgstr ""
 
 msgid "File exceeds user's quota."
 msgstr ""
 

-#: lib/mediafile.php:197 lib/mediafile.php:234
+#. TRANS: Client exception thrown when a file upload operation fails because the file could
+#. TRANS: not be moved from the temporary folder to the permanent file location.
+#: lib/mediafile.php:209 lib/mediafile.php:251

 msgid "File could not be moved to destination directory."
 msgstr ""
 
 msgid "File could not be moved to destination directory."
 msgstr ""
 

-#: lib/mediafile.php:202 lib/mediafile.php:238
+#. TRANS: Client exception thrown when a file upload operation has been stopped because the MIME
+#. TRANS: type of the uploaded file could not be determined.
+#: lib/mediafile.php:216 lib/mediafile.php:257

 msgid "Could not determine file's MIME type."
 msgstr "Could not determine file's MIME type."
 
 msgid "Could not determine file's MIME type."
 msgstr "Could not determine file's MIME type."
 

-#: lib/mediafile.php:318
+#. TRANS: Client exception thrown trying to upload a forbidden MIME type.
+#. TRANS: %1$s is the file type that was denied, %2$s is the application part of
+#. TRANS: the MIME type that was denied.
+#: lib/mediafile.php:340

 #, php-format
 #, php-format

-msgid " Try using another %s format."
+msgid ""
+"\"%1$s\" is not a supported file type on this server. Try using another %2$s "
+"format."

 msgstr ""
 
 msgstr ""
 

-#: lib/mediafile.php:323
+#. TRANS: Client exception thrown trying to upload a forbidden MIME type.
+#. TRANS: %s is the file type that was denied.
+#: lib/mediafile.php:345

 #, php-format
 #, php-format

-msgid "%s is not a supported file type on this server."
+msgid "\"%s\" is not a supported file type on this server."

 msgstr ""
 
 #: lib/messageform.php:120
 msgstr ""
 
 #: lib/messageform.php:120


@@ -6425,11 +6876,11 @@ msgstr "Send a direct notice"
 msgid "To"
 msgstr "To"
 
 msgid "To"
 msgstr "To"
 

-#: lib/messageform.php:159 lib/noticeform.php:185
+#: lib/messageform.php:159 lib/noticeform.php:186

 msgid "Available characters"
 msgstr "Available characters"
 
 msgid "Available characters"
 msgstr "Available characters"
 

-#: lib/messageform.php:178 lib/noticeform.php:236
+#: lib/messageform.php:178 lib/noticeform.php:237

 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "Send"
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "Send"


@@ -6438,79 +6889,83 @@ msgstr "Send"
 msgid "Send a notice"
 msgstr "Send a notice"
 
 msgid "Send a notice"
 msgstr "Send a notice"
 

-#: lib/noticeform.php:173
+#: lib/noticeform.php:174

 #, php-format
 msgid "What's up, %s?"
 msgstr "What's up, %s?"
 
 #, php-format
 msgid "What's up, %s?"
 msgstr "What's up, %s?"
 

-#: lib/noticeform.php:192
+#: lib/noticeform.php:193

 msgid "Attach"
 msgstr ""
 
 msgid "Attach"
 msgstr ""
 

-#: lib/noticeform.php:196
+#: lib/noticeform.php:197

 msgid "Attach a file"
 msgstr ""
 
 msgid "Attach a file"
 msgstr ""
 

-#: lib/noticeform.php:212
+#: lib/noticeform.php:213

 msgid "Share my location"
 msgstr "Share my location"
 
 msgid "Share my location"
 msgstr "Share my location"
 

-#: lib/noticeform.php:215
+#: lib/noticeform.php:216

 msgid "Do not share my location"
 msgstr "Do not share my location"
 
 msgid "Do not share my location"
 msgstr "Do not share my location"
 

-#: lib/noticeform.php:216
+#: lib/noticeform.php:217

 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of north
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of north

-#: lib/noticelist.php:436
+#: lib/noticelist.php:446

 msgid "N"
 msgstr "N"
 
 #. TRANS: Used in coordinates as abbreviation of south
 msgid "N"
 msgstr "N"
 
 #. TRANS: Used in coordinates as abbreviation of south

-#: lib/noticelist.php:438
+#: lib/noticelist.php:448

 msgid "S"
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of east
 msgid "S"
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of east

-#: lib/noticelist.php:440
+#: lib/noticelist.php:450

 msgid "E"
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of west
 msgid "E"
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of west

-#: lib/noticelist.php:442
+#: lib/noticelist.php:452

 msgid "W"
 msgstr ""
 
 msgid "W"
 msgstr ""
 

-#: lib/noticelist.php:444
+#: lib/noticelist.php:454

 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr ""
 
 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr ""
 

-#: lib/noticelist.php:453
+#: lib/noticelist.php:463

 msgid "at"
 msgstr ""
 
 msgid "at"
 msgstr ""
 

-#: lib/noticelist.php:567
+#: lib/noticelist.php:512
+msgid "web"
+msgstr ""
+
+#: lib/noticelist.php:578

 msgid "in context"
 msgstr "in context"
 
 msgid "in context"
 msgstr "in context"
 

-#: lib/noticelist.php:602
+#: lib/noticelist.php:613

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

-#: lib/noticelist.php:629
+#: lib/noticelist.php:640

 msgid "Reply to this notice"
 msgstr "Reply to this notice"
 
 msgid "Reply to this notice"
 msgstr "Reply to this notice"
 

-#: lib/noticelist.php:630
+#: lib/noticelist.php:641

 msgid "Reply"
 msgstr "Reply"
 
 msgid "Reply"
 msgstr "Reply"
 

-#: lib/noticelist.php:674
+#: lib/noticelist.php:685

 msgid "Notice repeated"
 msgstr "Notice repeated"
 
 msgid "Notice repeated"
 msgstr "Notice repeated"
 


@@ -6527,26 +6982,23 @@ msgid "Send a nudge to this user"
 msgstr "Send a nudge to this user"
 
 #: lib/oauthstore.php:283
 msgstr "Send a nudge to this user"
 
 #: lib/oauthstore.php:283

-msgid "Error inserting new profile"
-msgstr "Error inserting new profile."
+msgid "Error inserting new profile."
+msgstr ""

 
 #: lib/oauthstore.php:291
 
 #: lib/oauthstore.php:291

-msgid "Error inserting avatar"
-msgstr "Error inserting avatar."
-
-#: lib/oauthstore.php:306
-msgid "Error updating remote profile"
-msgstr "Error updating remote profile."
+msgid "Error inserting avatar."
+msgstr ""

 
 #: lib/oauthstore.php:311
 
 #: lib/oauthstore.php:311

-msgid "Error inserting remote profile"
-msgstr "Error inserting remote profile."
+msgid "Error inserting remote profile."
+msgstr ""

 
 

-#: lib/oauthstore.php:345
-msgid "Duplicate notice"
-msgstr "Duplicate notice"
+#. TRANS: Exception thrown when a notice is denied because it has been sent before.
+#: lib/oauthstore.php:346
+msgid "Duplicate notice."
+msgstr ""

 
 

-#: lib/oauthstore.php:490
+#: lib/oauthstore.php:491

 msgid "Couldn't insert new subscription."
 msgstr "Couldn't insert new subscription."
 
 msgid "Couldn't insert new subscription."
 msgstr "Couldn't insert new subscription."
 


@@ -6583,7 +7035,8 @@ msgstr "Your sent messages"
 msgid "Tags in %s's notices"
 msgstr "Tags in %s's notices"
 
 msgid "Tags in %s's notices"
 msgstr "Tags in %s's notices"
 

-#: lib/plugin.php:115
+#. TRANS: Displayed as version information for a plugin if no version information was found.
+#: lib/plugin.php:121

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


@@ -6665,7 +7118,7 @@ msgstr "Repeat this notice"
 msgid "Revoke the \"%s\" role from this user"
 msgstr "Revoke the \"%s\" role from this user"
 
 msgid "Revoke the \"%s\" role from this user"
 msgstr "Revoke the \"%s\" role from this user"
 

-#: lib/router.php:709
+#: lib/router.php:711

 msgid "No single user defined for single-user mode."
 msgstr ""
 
 msgid "No single user defined for single-user mode."
 msgstr ""
 


@@ -6677,19 +7130,24 @@ msgstr "Sandbox"
 msgid "Sandbox this user"
 msgstr "Sandbox this user"
 
 msgid "Sandbox this user"
 msgstr "Sandbox this user"
 

-#: lib/searchaction.php:120
+#. TRANS: Fieldset legend for the search form.
+#: lib/searchaction.php:121

 msgid "Search site"
 msgstr "Search site"
 
 msgid "Search site"
 msgstr "Search site"
 

-#: lib/searchaction.php:126
+#. TRANS: Used as a field label for the field where one or more keywords
+#. TRANS: for searching can be entered.
+#: lib/searchaction.php:129

 msgid "Keyword(s)"
 msgstr ""
 
 msgid "Keyword(s)"
 msgstr ""
 

-#: lib/searchaction.php:127
+#: lib/searchaction.php:130
+msgctxt "BUTTON"

 msgid "Search"
 msgid "Search"

-msgstr "Search"
+msgstr ""

 
 

-#: lib/searchaction.php:162
+#. TRANS: Definition list item with instructions on how to get (better) search results.
+#: lib/searchaction.php:170

 msgid "Search help"
 msgstr "Search help"
 
 msgid "Search help"
 msgstr "Search help"
 


@@ -6772,13 +7230,13 @@ msgid "The theme file is missing or the upload failed."
 msgstr ""
 
 #: lib/themeuploader.php:91 lib/themeuploader.php:102
 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
+#: lib/themeuploader.php:278 lib/themeuploader.php:282
+#: lib/themeuploader.php:290 lib/themeuploader.php:297

 #, fuzzy
 msgid "Failed saving theme."
 msgstr "Failed updating avatar."
 
 #, fuzzy
 msgid "Failed saving theme."
 msgstr "Failed updating avatar."
 

-#: lib/themeuploader.php:139
+#: lib/themeuploader.php:147

 msgid "Invalid theme: bad directory structure."
 msgstr ""
 
 msgid "Invalid theme: bad directory structure."
 msgstr ""
 


@@ -6791,18 +7249,22 @@ msgstr ""
 msgid "Invalid theme archive: missing file css/display.css"
 msgstr ""
 
 msgid "Invalid theme archive: missing file css/display.css"
 msgstr ""
 

-#: lib/themeuploader.php:205
+#: lib/themeuploader.php:218

 msgid ""
 "Theme contains invalid file or folder name. Stick with ASCII letters, "
 "digits, underscore, and minus sign."
 msgstr ""
 
 msgid ""
 "Theme contains invalid file or folder name. Stick with ASCII letters, "
 "digits, underscore, and minus sign."
 msgstr ""
 

-#: lib/themeuploader.php:216
+#: lib/themeuploader.php:224
+msgid "Theme contains unsafe file extension names; may be unsafe."
+msgstr ""
+
+#: lib/themeuploader.php:241

 #, php-format
 msgid "Theme contains file of type '.%s', which is not allowed."
 msgstr ""
 
 #, php-format
 msgid "Theme contains file of type '.%s', which is not allowed."
 msgstr ""
 

-#: lib/themeuploader.php:234
+#: lib/themeuploader.php:259

 #, fuzzy
 msgid "Error opening theme archive."
 msgstr "Error updating remote profile."
 #, fuzzy
 msgid "Error opening theme archive."
 msgstr "Error updating remote profile."


@@ -6812,16 +7274,18 @@ msgid "Top posters"
 msgstr "Top posters"
 
 #: lib/unsandboxform.php:69
 msgstr "Top posters"
 
 #: lib/unsandboxform.php:69

+#, fuzzy

 msgid "Unsandbox"
 msgid "Unsandbox"

-msgstr ""
+msgstr "Sandbox"

 
 #: lib/unsandboxform.php:80
 msgid "Unsandbox this user"
 msgstr "Unsandbox this user"
 
 #: lib/unsilenceform.php:67
 
 #: lib/unsandboxform.php:80
 msgid "Unsandbox this user"
 msgstr "Unsandbox this user"
 
 #: lib/unsilenceform.php:67

+#, fuzzy

 msgid "Unsilence"
 msgid "Unsilence"

-msgstr ""
+msgstr "Silence"

 
 #: lib/unsilenceform.php:78
 msgid "Unsilence this user"
 
 #: lib/unsilenceform.php:78
 msgid "Unsilence this user"


@@ -6835,10 +7299,12 @@ msgstr "Unsubscribe from this user"
 msgid "Unsubscribe"
 msgstr "Unsubscribe"
 
 msgid "Unsubscribe"
 msgstr "Unsubscribe"
 

-#: lib/usernoprofileexception.php:58
-#, php-format
-msgid "User %s (%d) has no profile record."
-msgstr "User %s (%d) has no profile record."
+#. TRANS: Exception text shown when no profile can be found for a user.
+#. TRANS: %1$s is a user nickname, $2$d is a user ID (number).
+#: lib/usernoprofileexception.php:60
+#, fuzzy, php-format
+msgid "User %1$s (%2$d) has no profile record."
+msgstr "User has no profile."

 
 #: lib/userprofile.php:117
 msgid "Edit Avatar"
 
 #: lib/userprofile.php:117
 msgid "Edit Avatar"


@@ -6887,56 +7353,64 @@ msgid "Moderator"
 msgstr "Moderator"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 msgstr "Moderator"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.

-#: lib/util.php:1100
+#: lib/util.php:1153

 msgid "a few seconds ago"
 msgstr "a few seconds ago"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 msgid "a few seconds ago"
 msgstr "a few seconds ago"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.

-#: lib/util.php:1103
+#: lib/util.php:1156

 msgid "about a minute ago"
 msgstr "about a minute ago"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 msgid "about a minute ago"
 msgstr "about a minute ago"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.

-#: lib/util.php:1107
+#: lib/util.php:1160

 #, php-format
 #, php-format

-msgid "about %d minutes ago"
-msgstr "about %d minutes ago"
+msgid "about one minute ago"
+msgid_plural "about %d minutes ago"
+msgstr[0] ""
+msgstr[1] ""

 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.

-#: lib/util.php:1110
+#: lib/util.php:1163

 msgid "about an hour ago"
 msgstr "about an hour ago"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 msgid "about an hour ago"
 msgstr "about an hour ago"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.

-#: lib/util.php:1114
+#: lib/util.php:1167

 #, php-format
 #, php-format

-msgid "about %d hours ago"
-msgstr "about %d hours ago"
+msgid "about one hour ago"
+msgid_plural "about %d hours ago"
+msgstr[0] ""
+msgstr[1] ""

 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.

-#: lib/util.php:1117
+#: lib/util.php:1170

 msgid "about a day ago"
 msgstr "about a day ago"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 msgid "about a day ago"
 msgstr "about a day ago"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.

-#: lib/util.php:1121
+#: lib/util.php:1174

 #, php-format
 #, php-format

-msgid "about %d days ago"
-msgstr "about %d days ago"
+msgid "about one day ago"
+msgid_plural "about %d days ago"
+msgstr[0] ""
+msgstr[1] ""

 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.

-#: lib/util.php:1124
+#: lib/util.php:1177

 msgid "about a month ago"
 msgstr "about a month ago"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 msgid "about a month ago"
 msgstr "about a month ago"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.

-#: lib/util.php:1128
+#: lib/util.php:1181

 #, php-format
 #, php-format

-msgid "about %d months ago"
-msgstr "about %d months ago"
+msgid "about one month ago"
+msgid_plural "about %d months ago"
+msgstr[0] ""
+msgstr[1] ""

 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.

-#: lib/util.php:1131
+#: lib/util.php:1184

 msgid "about a year ago"
 msgstr "about a year ago"
 
 msgid "about a year ago"
 msgstr "about a year ago"
 


@@ -6950,7 +7424,17 @@ msgstr "%s is not a valid colour!"
 msgid "%s is not a valid color! Use 3 or 6 hex chars."
 msgstr "%s is not a valid colour! Use 3 or 6 hex chars."
 
 msgid "%s is not a valid color! Use 3 or 6 hex chars."
 msgstr "%s is not a valid colour! Use 3 or 6 hex chars."
 

-#: lib/xmppmanager.php:403
+#: scripts/restoreuser.php:82

 #, php-format
 #, php-format

-msgid "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr "Message too long - maximum is %1$d characters, you sent %2$d."
+msgid "Backup file for user %s (%s)"
+msgstr ""
+
+#: scripts/restoreuser.php:88
+#, fuzzy
+msgid "No user specified; using backup user."
+msgstr "No user ID specified."
+
+#: scripts/restoreuser.php:94
+#, php-format
+msgid "%d entries in backup."
+msgstr ""