Merge branch '0.9.x' of gitorious.org:statusnet/mainline 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 e04b249f18fef0e7b3e21cd9fc9af4b32ff38686..88421ca45534f0034782593f1d936c9381a5f1e2 100644 (file)
--- a/locale/en_GB/LC_MESSAGES/statusnet.po
+++ b/locale/en_GB/LC_MESSAGES/statusnet.po
@@ -1,28 +1,29 @@
-# Translation of StatusNet to British English (British English)
+# Translation of StatusNet - Core to British English (British English)

 # Expored from translatewiki.net
 #
 # Author: Brion
 # Author: Bruce89
 # Author: CiaranG
 # Expored from translatewiki.net
 #
 # Author: Brion
 # Author: Bruce89
 # Author: CiaranG

+# Author: Lcawte

 # Author: Reedy
 # --
 # This file is distributed under the same license as the StatusNet package.
 #
 msgid ""
 msgstr ""
 # Author: Reedy
 # --
 # 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-09-16 23:15+0000\n"
-"PO-Revision-Date: 2010-09-16 23:15:44+0000\n"
+"POT-Creation-Date: 2010-10-18 20:49+0000\n"
+"PO-Revision-Date: 2010-10-18 20:50:36+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"
 "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"

-"X-Generator: MediaWiki 1.17alpha (r73168); Translate extension (2010-08-20)\n"
+"X-Generator: MediaWiki 1.17alpha (r74965); 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: 1284-49-48 10::+0000\n"
+"X-POT-Import-Date: 2010-10-18 20:28:37+0000\n"

 
 #. TRANS: Page title
 #. TRANS: Menu item for site administration
 
 #. TRANS: Page title
 #. TRANS: Menu item for site administration


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

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


@@ -93,14 +94,15 @@ msgstr "Save"
 msgid "No such page."
 msgstr "No such page."
 
 msgid "No such page."
 msgstr "No such page."
 

+#. TRANS: Client error given when a user was not found (404).

 #. 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/apiaccountupdatedeliverydevice.php:115
 #: actions/apiaccountupdateprofile.php:106
 #: actions/apiaccountupdateprofilebackgroundimage.php:117
 #: actions/apiaccountupdateprofileimage.php:106 actions/apiblockcreate.php:98
 #. 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/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/apiblockdestroy.php:97 actions/apidirectmessage.php:78
+#: actions/apidirectmessagenew.php:72 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/apigroupismember.php:91 actions/apigroupjoin.php:101
 #: actions/apigroupleave.php:101 actions/apigrouplist.php:73
 #: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:87


@@ -113,7 +115,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:498 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."


@@ -201,12 +203,13 @@ msgstr "You and friends"
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr "Updates from %1$s and friends on %2$s!"
 
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr "Updates from %1$s and friends on %2$s!"
 

+#. TRANS: Client error given when an API method was not found (404).

 #: actions/apiaccountratelimitstatus.php:72
 #: actions/apiaccountupdatedeliverydevice.php:95
 #: actions/apiaccountupdateprofile.php:98
 #: actions/apiaccountupdateprofilebackgroundimage.php:95
 #: actions/apiaccountupdateprofilecolors.php:119
 #: actions/apiaccountratelimitstatus.php:72
 #: 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:162

 #: 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/apifavoritecreate.php:101 actions/apifavoritedestroy.php:102
 #: actions/apifriendshipscreate.php:101 actions/apifriendshipsdestroy.php:101
 #: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:140


@@ -233,7 +236,7 @@ msgstr "API method not found."
 #: actions/apiaccountupdateprofilebackgroundimage.php:87
 #: actions/apiaccountupdateprofilecolors.php:111
 #: actions/apiaccountupdateprofileimage.php:85 actions/apiblockcreate.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/apiblockdestroy.php:89 actions/apidirectmessagenew.php:107

 #: 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/apifavoritecreate.php:92 actions/apifavoritedestroy.php:93
 #: actions/apifriendshipscreate.php:92 actions/apifriendshipsdestroy.php:92
 #: actions/apigroupcreate.php:106 actions/apigroupjoin.php:93


@@ -250,6 +253,11 @@ 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:134
+#, fuzzy
+msgid "Could not update user."
+msgstr "Couldn't update user."
+

 #: actions/apiaccountupdateprofile.php:113
 #: actions/apiaccountupdateprofilebackgroundimage.php:195
 #: actions/apiaccountupdateprofilecolors.php:186
 #: actions/apiaccountupdateprofile.php:113
 #: actions/apiaccountupdateprofilebackgroundimage.php:195
 #: actions/apiaccountupdateprofilecolors.php:186


@@ -260,6 +268,11 @@ msgstr ""
 msgid "User has no profile."
 msgstr "User has no profile."
 
 msgid "User has no profile."
 msgstr "User has no profile."
 

+#: actions/apiaccountupdateprofile.php:148
+#, fuzzy
+msgid "Could not save profile."
+msgstr "Couldn't save profile."
+

 #: actions/apiaccountupdateprofilebackgroundimage.php:109
 #: actions/apiaccountupdateprofileimage.php:98 actions/apimediaupload.php:81
 #: actions/apistatusesupdate.php:213 actions/avatarsettings.php:257
 #: actions/apiaccountupdateprofilebackgroundimage.php:109
 #: actions/apiaccountupdateprofileimage.php:98 actions/apimediaupload.php:81
 #: actions/apistatusesupdate.php:213 actions/avatarsettings.php:257


@@ -301,43 +314,60 @@ msgstr "Block user failed."
 msgid "Unblock user failed."
 msgstr "Unblock user failed."
 
 msgid "Unblock user failed."
 msgstr "Unblock user failed."
 

-#: actions/apidirectmessage.php:89
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:91

 #, php-format
 msgid "Direct messages from %s"
 msgstr "Direct messages from %s"
 
 #, php-format
 msgid "Direct messages from %s"
 msgstr "Direct messages from %s"
 

-#: actions/apidirectmessage.php:93
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:96

 #, php-format
 msgid "All the direct messages sent from %s"
 msgstr "All the direct messages sent from %s"
 
 #, php-format
 msgid "All the direct messages sent from %s"
 msgstr "All the direct messages sent from %s"
 

-#: actions/apidirectmessage.php:101
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:105

 #, php-format
 msgid "Direct messages to %s"
 msgstr "Direct messages to %s"
 
 #, php-format
 msgid "Direct messages to %s"
 msgstr "Direct messages to %s"
 

-#: actions/apidirectmessage.php:105
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:110

 #, php-format
 msgid "All the direct messages sent to %s"
 msgstr "All the direct messages sent to %s"
 
 #, php-format
 msgid "All the direct messages sent to %s"
 msgstr "All the direct messages sent to %s"
 

-#: actions/apidirectmessagenew.php:119
+#. TRANS: Client error (406).
+#: actions/apidirectmessagenew.php:117

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

-#: 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."
+#: actions/apidirectmessagenew.php:127
+#, fuzzy, php-format
+msgid "That's too long. Maximum message size is %d character."
+msgid_plural "That's too long. Maximum message size is %d characters."
+msgstr[0] "That's too long. Max message size is %d chars."
+msgstr[1] "That's too long. Max message size is %d chars."

 
 

+#. TRANS: Client error displayed if a recipient user could not be found (403).

 #: actions/apidirectmessagenew.php:139
 msgid "Recipient user not found."
 msgstr "Recipient user not found."
 
 #: actions/apidirectmessagenew.php:139
 msgid "Recipient user not found."
 msgstr "Recipient user not found."
 

-#: actions/apidirectmessagenew.php:143
+#. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
+#: actions/apidirectmessagenew.php:144

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

+#. TRANS: Client error displayed trying to direct message self (403).
+#: actions/apidirectmessagenew.php:154
+#, fuzzy
+msgid ""
+"Do not send a message to yourself; just say it to yourself quietly instead."
+msgstr ""
+"Don't send a message to yourself; just say it to yourself quietly instead."
+

 #: actions/apifavoritecreate.php:110 actions/apifavoritedestroy.php:111
 #: actions/apistatusesdestroy.php:121
 msgid "No status found with that ID."
 #: actions/apifavoritecreate.php:110 actions/apifavoritedestroy.php:111
 #: actions/apistatusesdestroy.php:121
 msgid "No status found with that ID."


@@ -348,7 +378,7 @@ msgid "This status is already a favorite."
 msgstr "This status is already a favourite."
 
 #. TRANS: Error message text shown when a favorite could not be set.
 msgstr "This status is already a favourite."
 
 #. TRANS: Error message text shown when a favorite could not be set.

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


@@ -461,18 +491,18 @@ msgid "Group not found."
 msgstr "Group not found."
 
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
 msgstr "Group not found."
 
 #. 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:336
+#: 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."
 
 #. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
 msgid "You are already a member of that group."
 msgstr "You are already a member of that group."
 
 #. 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:341
+#: 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."
 
 #. 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.
 msgid "You have been blocked from that group by the admin."
 msgstr "You have been blocked from that group by the admin."
 
 #. 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:353
+#: 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."


@@ -484,7 +514,7 @@ msgstr "You are not a member of this group."
 #. TRANS: Message given having failed to remove a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
 #: actions/apigroupleave.php:126 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:401
+#: 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."


@@ -513,16 +543,26 @@ msgstr "%s groups"
 msgid "groups on %s"
 msgstr "groups on %s"
 
 msgid "groups on %s"
 msgstr "groups on %s"
 

-#: actions/apioauthauthorize.php:101
+#: actions/apimediaupload.php:100
+msgid "Upload failed."
+msgstr "Upload failed."
+
+#: actions/apioauthaccesstoken.php:108
+#, fuzzy
+msgid "Invalid request token or verifier."
+msgstr "Invalid login token specified."
+
+#: actions/apioauthauthorize.php:109

 msgid "No oauth_token parameter provided."
 msgstr "No oauth_token parameter provided."
 
 msgid "No oauth_token parameter provided."
 msgstr "No oauth_token parameter provided."
 

-#: actions/apioauthauthorize.php:106
-msgid "Invalid token."
+#: actions/apioauthauthorize.php:117 actions/apioauthauthorize.php:130
+#, fuzzy
+msgid "Invalid request token."

 msgstr "Invalid token."
 
 msgstr "Invalid token."
 

-#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
-#: actions/deletenotice.php:169 actions/disfavor.php:74
+#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:268
+#: 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/groupunblock.php:66 actions/imsettings.php:230
 #: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:312
 #: actions/groupunblock.php:66 actions/imsettings.php:230


@@ -539,36 +579,22 @@ msgstr "Invalid token."
 msgid "There was a problem with your session token. Try again, please."
 msgstr "There was a problem with your session token. Try again, please."
 
 msgid "There was a problem with your session token. Try again, please."
 msgstr "There was a problem with your session token. Try again, please."
 

-#: actions/apioauthauthorize.php:135
+#: actions/apioauthauthorize.php:163

 msgid "Invalid nickname / password!"
 msgstr "Invalid nickname / password!"
 
 msgid "Invalid nickname / password!"
 msgstr "Invalid nickname / password!"
 

-#: actions/apioauthauthorize.php:159
+#: actions/apioauthauthorize.php:193

 msgid "Database error deleting OAuth application user."
 msgstr "Database error deleting OAuth application user."
 
 msgid "Database error deleting OAuth application user."
 msgstr "Database error deleting OAuth application user."
 

-#: actions/apioauthauthorize.php:185
+#: actions/apioauthauthorize.php:218

 msgid "Database error inserting OAuth application user."
 msgstr "Database error inserting OAuth application user."
 
 msgid "Database error inserting OAuth application user."
 msgstr "Database error inserting OAuth application user."
 

-#: actions/apioauthauthorize.php:214
-#, php-format
-msgid ""
-"The request token %s has been authorized. Please exchange it for an access "
-"token."
-msgstr ""
-"The request token %s has been authorised. Please exchange it for an access "
-"token."
-
-#: actions/apioauthauthorize.php:227
-#, php-format
-msgid "The request token %s has been denied and revoked."
-msgstr "The request token %s has been denied and revoked."
-

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

-#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
+#: actions/apioauthauthorize.php:265 actions/avatarsettings.php:281

 #: actions/designadminpanel.php:104 actions/editapplication.php:139
 #: actions/emailsettings.php:290 actions/grouplogo.php:322
 #: actions/imsettings.php:245 actions/newapplication.php:121
 #: actions/designadminpanel.php:104 actions/editapplication.php:139
 #: actions/emailsettings.php:290 actions/grouplogo.php:322
 #: actions/imsettings.php:245 actions/newapplication.php:121


@@ -577,15 +603,15 @@ msgstr "The request token %s has been denied and revoked."
 msgid "Unexpected form submission."
 msgstr "Unexpected form submission."
 
 msgid "Unexpected form submission."
 msgstr "Unexpected form submission."
 

-#: actions/apioauthauthorize.php:259
+#: actions/apioauthauthorize.php:291

 msgid "An application would like to connect to your account"
 msgstr "An application would like to connect to your account"
 
 msgid "An application would like to connect to your account"
 msgstr "An application would like to connect to your account"
 

-#: actions/apioauthauthorize.php:276
+#: actions/apioauthauthorize.php:308

 msgid "Allow or deny access"
 msgstr "Allow or deny access"
 
 msgid "Allow or deny access"
 msgstr "Allow or deny access"
 

-#: actions/apioauthauthorize.php:292
+#: actions/apioauthauthorize.php:324

 #, php-format
 msgid ""
 "The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
 #, php-format
 msgid ""
 "The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "


@@ -597,11 +623,11 @@ 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:463
+#: actions/apioauthauthorize.php:342 lib/action.php:490

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

-#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/apioauthauthorize.php:345 actions/login.php:252

 #: actions/profilesettings.php:106 actions/register.php:431
 #: actions/showgroup.php:245 actions/tagother.php:94
 #: actions/userauthorization.php:145 lib/groupeditform.php:152
 #: actions/profilesettings.php:106 actions/register.php:431
 #: actions/showgroup.php:245 actions/tagother.php:94
 #: actions/userauthorization.php:145 lib/groupeditform.php:152


@@ -610,23 +636,47 @@ msgid "Nickname"
 msgstr "Nickname"
 
 #. TRANS: Link description in user account settings menu.
 msgstr "Nickname"
 
 #. 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/apioauthauthorize.php:348 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:120

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

-#: actions/apioauthauthorize.php:328
-msgid "Deny"
-msgstr "Deny"
+#. TRANS: Submit button title.
+#: actions/apioauthauthorize.php:360 lib/applicationeditform.php:353
+msgid "Cancel"
+msgstr "Cancel"

 
 

-#: actions/apioauthauthorize.php:334
+#: actions/apioauthauthorize.php:366

 msgid "Allow"
 msgstr "Allow"
 
 msgid "Allow"
 msgstr "Allow"
 

-#: actions/apioauthauthorize.php:351
-msgid "Allow or deny access to your account information."
+#: actions/apioauthauthorize.php:383
+#, fuzzy
+msgid "Authorize access to your account information."

 msgstr "Allow or deny access to your account information."
 
 msgstr "Allow or deny access to your account information."
 

+#: actions/apioauthauthorize.php:433
+#, fuzzy
+msgid "Authorization canceled."
+msgstr "IM confirmation cancelled."
+
+#: actions/apioauthauthorize.php:435
+#, fuzzy, php-format
+msgid "The request token %s has been revoked."
+msgstr "The request token %s has been denied and revoked."
+
+#: actions/apioauthauthorize.php:453
+#, fuzzy, php-format
+msgid "You have successfully authorized %s."
+msgstr "You are not authorised."
+
+#: actions/apioauthauthorize.php:458
+#, php-format
+msgid ""
+"Please return to %s and enter the following security code to complete the "
+"process."
+msgstr ""
+

 #: actions/apistatusesdestroy.php:112
 msgid "This method requires a POST or DELETE."
 msgstr "This method requires a POST or DELETE."
 #: actions/apistatusesdestroy.php:112
 msgid "This method requires a POST or DELETE."
 msgstr "This method requires a POST or DELETE."


@@ -636,17 +686,17 @@ msgid "You may not delete another user's status."
 msgstr "You may not delete another user's status."
 
 #: actions/apistatusesretweet.php:76 actions/apistatusesretweets.php:72
 msgstr "You may not delete another user's status."
 
 #: actions/apistatusesretweet.php:76 actions/apistatusesretweets.php:72

-#: actions/deletenotice.php:52 actions/shownotice.php:92
+#: actions/deletenotice.php:58 actions/shownotice.php:92

 msgid "No such notice."
 msgstr "No such notice."
 
 #. TRANS: Error text shown when trying to repeat an own notice.
 msgid "No such notice."
 msgstr "No such notice."
 
 #. TRANS: Error text shown when trying to repeat an own notice.

-#: actions/apistatusesretweet.php:84 lib/command.php:538
+#: actions/apistatusesretweet.php:84 lib/command.php:535

 msgid "Cannot repeat your own notice."
 msgstr "Cannot repeat your own notice."
 
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
 msgid "Cannot repeat your own notice."
 msgstr "Cannot repeat your own notice."
 
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.

-#: actions/apistatusesretweet.php:92 lib/command.php:544
+#: 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."
 


@@ -677,7 +727,7 @@ msgstr "Not found."
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr "Max notice size is %d chars, including attachment URL."
 
 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."
 


@@ -756,7 +806,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"
 


@@ -787,7 +837,8 @@ 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:657
+#: lib/deletegroupform.php:121 lib/deleteuserform.php:66
+#: lib/noticelist.php:667

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


@@ -843,12 +894,13 @@ msgstr ""
 
 #. TRANS: Button label on the user block form.
 #. TRANS: Button label on the delete application form.
 
 #. TRANS: Button label on the user block form.
 #. TRANS: Button label on the delete application form.

+#. TRANS: Button label on the delete group form.

 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
 #: actions/block.php:153 actions/deleteapplication.php:154
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
 #: actions/block.php:153 actions/deleteapplication.php:154

-#: actions/deletenotice.php:147 actions/deleteuser.php:152
-#: actions/groupblock.php:178
+#: actions/deletegroup.php:220 actions/deletenotice.php:150
+#: actions/deleteuser.php:152 actions/groupblock.php:178

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


@@ -861,20 +913,20 @@ msgstr "Do not block this user"
 
 #. TRANS: Button label on the user block form.
 #. TRANS: Button label on the delete application form.
 
 #. TRANS: Button label on the user block form.
 #. TRANS: Button label on the delete application form.

+#. TRANS: Button label on the delete group form.

 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
 #: actions/block.php:160 actions/deleteapplication.php:161
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
 #: actions/block.php:160 actions/deleteapplication.php:161

-#: actions/deletenotice.php:154 actions/deleteuser.php:159
-#: actions/groupblock.php:185
+#: actions/deletegroup.php:227 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.
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "Yes"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.

-#. TRANS: Submit button title.

 #. TRANS: Description of the form to block a user.
 #. TRANS: Description of the form to block a user.

-#: actions/block.php:164 actions/groupmembers.php:403 lib/blockform.php:82
+#: actions/block.php:164 lib/blockform.php:79

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


@@ -882,9 +934,12 @@ 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: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.

 #. 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
 #. 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/deletegroup.php:87 actions/deletegroup.php:100

 #: 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/groupdesignsettings.php:100 actions/grouplogo.php:102
 #: 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/groupdesignsettings.php:100 actions/grouplogo.php:102


@@ -893,8 +948,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:170
-#: lib/command.php:383
+#: 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."
 


@@ -1010,7 +1065,7 @@ 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
 #. 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

-#: lib/action.php:1315
+#: lib/action.php:1353

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


@@ -1038,8 +1093,69 @@ msgstr "Do not delete this application"
 msgid "Delete this application"
 msgstr "Delete this application"
 
 msgid "Delete this application"
 msgstr "Delete this application"
 

+#. TRANS: Client error when trying to delete group while not logged in.
+#: actions/deletegroup.php:64
+#, fuzzy
+msgid "You must be logged in to delete a group."
+msgstr "You must be logged in to leave a group."
+
+#. TRANS: Client error when trying to delete a group without providing a nickname or ID for the group.
+#: actions/deletegroup.php:94 actions/joingroup.php:88
+#: actions/leavegroup.php:88
+msgid "No nickname or ID."
+msgstr "No nickname or ID."
+
+#. TRANS: Client error when trying to delete a group without having the rights to delete it.
+#: actions/deletegroup.php:107
+#, fuzzy
+msgid "You are not allowed to delete this group."
+msgstr "You are not a member of this group."
+
+#. TRANS: Server error displayed if a group could not be deleted.
+#. TRANS: %s is the name of the group that could not be deleted.
+#: actions/deletegroup.php:150
+#, fuzzy, php-format
+msgid "Could not delete group %s."
+msgstr "Could not update group."
+
+#. TRANS: Message given after deleting a group.
+#. TRANS: %s is the deleted group's name.
+#: actions/deletegroup.php:159
+#, fuzzy, php-format
+msgid "Deleted group %s"
+msgstr "%1$s left group %2$s"
+
+#. TRANS: Title.
+#. TRANS: Form legend for deleting a group.
+#: actions/deletegroup.php:176 actions/deletegroup.php:202
+#, fuzzy
+msgid "Delete group"
+msgstr "Delete user"
+
+#: actions/deletegroup.php:206
+#, fuzzy
+msgid ""
+"Are you sure you want to delete this group? This will clear all data about "
+"the group from the database, without a backup. Public posts to this group "
+"will still appear in individual timelines."
+msgstr ""
+"Are you sure you want to delete this user? This will clear all data about "
+"the user from the database, without a backup."
+
+#. TRANS: Submit button title for 'No' when deleting a group.
+#: actions/deletegroup.php:224
+#, fuzzy
+msgid "Do not delete this group"
+msgstr "Do not delete this notice"
+
+#. TRANS: Submit button title for 'Yes' when deleting a group.
+#: actions/deletegroup.php:231
+#, fuzzy
+msgid "Delete this group"
+msgstr "Delete this user"
+

 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. 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/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


@@ -1049,11 +1165,11 @@ msgstr "Delete this application"
 msgid "Not logged in."
 msgstr "Not logged in."
 
 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."


@@ -1061,21 +1177,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:657
+#: actions/deletenotice.php:161 lib/noticelist.php:667

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


@@ -1106,57 +1222,71 @@ 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
+#: 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:332

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

-#: actions/designadminpanel.php:322
+#: actions/designadminpanel.php:337
+#, fuzzy
+msgid "Invalid SSL logo URL."
+msgstr "nvalid logo URL."
+
+#: actions/designadminpanel.php:341

 #, 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:445

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

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

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

-#: actions/designadminpanel.php:443
+#: actions/designadminpanel.php:454
+#, fuzzy
+msgid "SSL logo"
+msgstr "Site logo"
+
+#: actions/designadminpanel.php:466

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

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

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

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

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

-#: actions/designadminpanel.php:471
+#: actions/designadminpanel.php:490
+msgid "Custom theme"
+msgstr "Custom theme"
+
+#: actions/designadminpanel.php:494

 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:509 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:514 actions/designadminpanel.php:597

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

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

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


@@ -1166,75 +1296,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:550 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:567 lib/designsettings.php:155

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

-#: actions/designadminpanel.php:545 lib/designsettings.php:156
+#: actions/designadminpanel.php:568 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:573 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:587 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:610 lib/designsettings.php:191

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

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

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

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

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

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

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

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

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

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

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

-#: actions/designadminpanel.php:676 lib/designsettings.php:247
+#: actions/designadminpanel.php:699 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:700 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:706 lib/designsettings.php:254

 msgid "Reset back to default"
 msgstr "Reset back to default"
 
 #. TRANS: Submit button title.
 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:353
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#: actions/designadminpanel.php:708 actions/licenseadminpanel.php:319
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:396
+#: 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:709 lib/designsettings.php:257

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


@@ -1312,7 +1443,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."
 


@@ -1349,7 +1480,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"
 


@@ -1405,7 +1536,7 @@ msgstr ""
 #. TRANS: Button label to cancel a SMS address confirmation procedure.
 #. TRANS: Button label in the "Edit application" form.
 #: actions/emailsettings.php:127 actions/imsettings.php:131
 #. TRANS: Button label to cancel a SMS address confirmation procedure.
 #. TRANS: Button label in the "Edit application" form.
 #: actions/emailsettings.php:127 actions/imsettings.php:131

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

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


@@ -1595,7 +1726,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"
 


@@ -1705,7 +1836,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 lib/oauthstore.php:306
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:317

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


@@ -1871,6 +2002,12 @@ msgctxt "BUTTON"
 msgid "Block"
 msgstr ""
 
 msgid "Block"
 msgstr ""
 

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

 #: actions/groupmembers.php:498
 msgid "Make user an admin of the group"
 msgstr "Make user an admin of the group"
 #: actions/groupmembers.php:498
 msgid "Make user an admin of the group"
 msgstr "Make user an admin of the group"


@@ -1891,7 +2028,7 @@ msgstr ""
 #. TRANS: Title in atom group notice feed. %s is a group name.
 #. TRANS: Title in atom user notice feed. %s is a user name.
 #: actions/grouprss.php:139 actions/userrss.php:94
 #. 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"


@@ -2143,6 +2280,10 @@ msgstr "Inbox for %s"
 msgid "This is your inbox, which lists your incoming private messages."
 msgstr "This is your inbox, which lists your incoming private messages."
 
 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
+msgid "Invites have been disabled."
+msgstr "Invites have been disabled."
+

 #: actions/invite.php:41
 #, php-format
 msgid "You must be logged in to invite other users to use %s."
 #: actions/invite.php:41
 #, php-format
 msgid "You must be logged in to invite other users to use %s."


@@ -2167,7 +2308,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:430
+#: 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)"


@@ -2286,10 +2427,6 @@ msgstr ""
 msgid "You must be logged in to join a group."
 msgstr "You must be logged in to join a group."
 
 msgid "You must be logged in to join a group."
 msgstr "You must be logged in to join a group."
 

-#: actions/joingroup.php:88 actions/leavegroup.php:88
-msgid "No nickname or ID."
-msgstr "No nickname or ID."
-

 #: actions/joingroup.php:141
 #, php-format
 msgid "%1$s joined group %2$s"
 #: actions/joingroup.php:141
 #, php-format
 msgid "%1$s joined group %2$s"


@@ -2300,7 +2437,7 @@ msgid "You must be logged in to leave a group."
 msgstr "You must be logged in to leave a group."
 
 #. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
 msgstr "You must be logged in to leave a group."
 
 #. 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:389
+#: 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."
 


@@ -2309,6 +2446,110 @@ msgstr "You are not a member of that group."
 msgid "%1$s left group %2$s"
 msgstr "%1$s left group %2$s"
 
 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."


@@ -2416,23 +2657,28 @@ msgid "New message"
 msgstr "New message"
 
 #. 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).
 msgstr "New message"
 
 #. 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:502
+#: 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."
 
 #. 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.
 msgid "You can't send a message to this user."
 msgstr "You can't send a message to this user."
 
 #. 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:481
-#: lib/command.php:582
+#: 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!"
 

+#: 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."
+

 #: actions/newmessage.php:158
 msgid "No recipient specified."
 msgstr "No recipient specified."
 
 #. TRANS: Error text shown when trying to send a direct message to self.
 #: actions/newmessage.php:158
 msgid "No recipient specified."
 msgstr "No recipient specified."
 
 #. TRANS: Error text shown when trying to send a direct message to self.

-#: actions/newmessage.php:164 lib/command.php:506
+#: 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 ""


@@ -2444,12 +2690,12 @@ msgstr "Message sent"
 
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
 
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.

-#: actions/newmessage.php:185 lib/command.php:514
+#: 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:261 lib/channel.php:189
+#: actions/newmessage.php:210 actions/newnotice.php:261

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


@@ -2543,6 +2789,10 @@ msgstr "You have not registered any applications yet."
 msgid "Connected applications"
 msgstr "Connected applications"
 
 msgid "Connected applications"
 msgstr "Connected applications"
 

+#: actions/oauthconnectionssettings.php:83
+msgid "You have allowed the following applications to access your account."
+msgstr ""
+

 #: actions/oauthconnectionssettings.php:175
 msgid "You are not a user of that application."
 msgstr "You are not a user of that application."
 #: actions/oauthconnectionssettings.php:175
 msgid "You are not a user of that application."
 msgstr "You are not a user of that application."


@@ -2564,7 +2814,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"


@@ -2582,8 +2832,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:1206
-#: lib/apiaction.php:1233 lib/apiaction.php:1356
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1200
+#: lib/apiaction.php:1227 lib/apiaction.php:1356

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


@@ -2619,6 +2869,10 @@ msgstr "Automatic shortening service to use."
 msgid "View profile designs"
 msgstr "View profile designs"
 
 msgid "View profile designs"
 msgstr "View profile designs"
 

+#: actions/othersettings.php:123
+msgid "Show or hide profile designs."
+msgstr "Show or hide profile designs."
+

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


@@ -2723,115 +2977,170 @@ msgstr "Password saved."
 msgid "Paths"
 msgstr ""
 
 msgid "Paths"
 msgstr ""
 

-#: actions/pathsadminpanel.php:157
+#: actions/pathsadminpanel.php:70
+msgid "Path and server settings for this StatusNet site"
+msgstr ""
+
+#: actions/pathsadminpanel.php:158

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

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

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

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

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

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

 #, php-format
 msgid "Locales directory not readable: %s."
 msgstr "Locales directory not readable: %s."
 
 #, php-format
 msgid "Locales directory not readable: %s."
 msgstr "Locales directory not readable: %s."
 

-#: actions/pathsadminpanel.php:183
+#: actions/pathsadminpanel.php:184

 msgid "Invalid SSL server. The maximum length is 255 characters."
 msgstr ""
 
 msgid "Invalid SSL server. The maximum length is 255 characters."
 msgstr ""
 

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

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

-#: actions/pathsadminpanel.php:238
+#: actions/pathsadminpanel.php:239 actions/pathsadminpanel.php:265
+#: actions/pathsadminpanel.php:314 actions/pathsadminpanel.php:343

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

-#: actions/pathsadminpanel.php:238
+#: actions/pathsadminpanel.php:239

 msgid "Site's server hostname."
 msgstr ""
 
 msgid "Site's server hostname."
 msgstr ""
 

-#: actions/pathsadminpanel.php:242
+#: actions/pathsadminpanel.php:243 actions/pathsadminpanel.php:269
+#: actions/pathsadminpanel.php:318 actions/pathsadminpanel.php:347

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

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

 msgid "Site path"
 msgstr "Site path"
 
 msgid "Site path"
 msgstr "Site path"
 

-#: actions/pathsadminpanel.php:246
-msgid "Path to locales"
-msgstr ""
+#: actions/pathsadminpanel.php:247
+#, fuzzy
+msgid "Locale Directory"
+msgstr "Theme directory"

 
 

-#: actions/pathsadminpanel.php:246
+#: actions/pathsadminpanel.php:247

 msgid "Directory path to locales"
 msgstr ""
 
 msgid "Directory path to locales"
 msgstr ""
 

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

 msgid "Fancy URLs"
 msgstr ""
 
 msgid "Fancy URLs"
 msgstr ""
 

-#: actions/pathsadminpanel.php:252
+#: actions/pathsadminpanel.php:253

 msgid "Use fancy (more readable and memorable) URLs?"
 msgstr ""
 
 msgid "Use fancy (more readable and memorable) URLs?"
 msgstr ""
 

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

 msgid "Theme"
 msgstr ""
 
 msgid "Theme"
 msgstr ""
 

-#: actions/pathsadminpanel.php:279
+#: actions/pathsadminpanel.php:265
+#, fuzzy
+msgid "Server for themes"
+msgstr "Theme for the site."
+
+#: actions/pathsadminpanel.php:269
+msgid "Web path to themes"
+msgstr ""
+
+#: actions/pathsadminpanel.php:273 actions/pathsadminpanel.php:322
+#: actions/pathsadminpanel.php:351 actions/pathsadminpanel.php:380
+msgid "SSL server"
+msgstr "SSL server"
+
+#: actions/pathsadminpanel.php:273
+msgid "SSL server for themes (default: SSL server)"
+msgstr ""
+
+#: actions/pathsadminpanel.php:277 actions/pathsadminpanel.php:326
+#: actions/pathsadminpanel.php:355
+#, fuzzy
+msgid "SSL path"
+msgstr "Site path"
+
+#: actions/pathsadminpanel.php:277
+msgid "SSL path to themes (default: /theme/)"
+msgstr ""
+
+#: actions/pathsadminpanel.php:281 actions/pathsadminpanel.php:330
+#: actions/pathsadminpanel.php:359
+#, fuzzy
+msgid "Directory"
+msgstr "Theme directory"
+
+#: actions/pathsadminpanel.php:281
+msgid "Directory where themes are located"
+msgstr ""
+
+#: actions/pathsadminpanel.php:288

 msgid "Avatars"
 msgstr "Avatars"
 
 msgid "Avatars"
 msgstr "Avatars"
 

-#: actions/pathsadminpanel.php:284
+#: actions/pathsadminpanel.php:293

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

-#: actions/pathsadminpanel.php:288
+#: actions/pathsadminpanel.php:297

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

-#: actions/pathsadminpanel.php:292
+#: actions/pathsadminpanel.php:301

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

-#: actions/pathsadminpanel.php:320
+#: actions/pathsadminpanel.php:310
+msgid "Backgrounds"
+msgstr "Backgrounds"
+
+#. TRANS: DT element label in attachment list.
+#: actions/pathsadminpanel.php:339 lib/attachmentlist.php:85
+#, fuzzy
+msgid "Attachments"
+msgstr "No attachments."
+
+#: actions/pathsadminpanel.php:366

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

-#: actions/pathsadminpanel.php:323 actions/snapshotadminpanel.php:202
+#: actions/pathsadminpanel.php:370 actions/snapshotadminpanel.php:202

 msgid "Never"
 msgstr "Never"
 
 msgid "Never"
 msgstr "Never"
 

-#: actions/pathsadminpanel.php:324
+#: actions/pathsadminpanel.php:371

 msgid "Sometimes"
 msgstr "Sometimes"
 
 msgid "Sometimes"
 msgstr "Sometimes"
 

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

 msgid "Always"
 msgstr ""
 
 msgid "Always"
 msgstr ""
 

-#: actions/pathsadminpanel.php:330
+#: actions/pathsadminpanel.php:374
+msgid "Use SSL"
+msgstr "Use SSL"
+
+#: actions/pathsadminpanel.php:375

 msgid "When to use SSL"
 msgstr ""
 
 msgid "When to use SSL"
 msgstr ""
 

-#: actions/pathsadminpanel.php:335
-msgid "SSL server"
-msgstr "SSL server"
-
-#: actions/pathsadminpanel.php:336
+#: actions/pathsadminpanel.php:381

 msgid "Server to direct SSL requests to"
 msgstr ""
 
 msgid "Server to direct SSL requests to"
 msgstr ""
 

-#: actions/pathsadminpanel.php:352
+#: actions/pathsadminpanel.php:397

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


@@ -2893,7 +3202,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:235 lib/groupeditform.php:161
+#: lib/applicationeditform.php:236 lib/groupeditform.php:161

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


@@ -3032,10 +3341,26 @@ msgstr "Public Stream Feed (RSS 2.0)"
 msgid "Public Stream Feed (Atom)"
 msgstr "Public Stream Feed (Atom)"
 
 msgid "Public Stream Feed (Atom)"
 msgstr "Public Stream Feed (Atom)"
 

+#: actions/public.php:188
+#, php-format
+msgid ""
+"This is the public timeline for %%site.name%% but no one has posted anything "
+"yet."
+msgstr ""
+"This is the public timeline for %%site.name%% but no one has posted anything "
+"yet."
+

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

+#: actions/public.php:195
+#, php-format
+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 post!"
+

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


@@ -3078,6 +3403,15 @@ msgstr ""
 msgid "Be the first to post one!"
 msgstr ""
 
 msgid "Be the first to post one!"
 msgstr ""
 

+#: actions/publictagcloud.php:75
+#, php-format
+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 post "
+"one!"
+

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


@@ -3122,6 +3456,10 @@ msgstr ""
 msgid "You have been identified. Enter a new password below. "
 msgstr ""
 
 msgid "You have been identified. Enter a new password below. "
 msgstr ""
 

+#: actions/recoverpassword.php:188
+msgid "Password recovery"
+msgstr "Password recovery"
+

 #: actions/recoverpassword.php:191
 msgid "Nickname or email address"
 msgstr "Nickname or e-mail address"
 #: actions/recoverpassword.php:191
 msgid "Nickname or email address"
 msgstr "Nickname or e-mail address"


@@ -3254,7 +3592,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"
 


@@ -3410,7 +3748,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:676
+#: actions/repeat.php:114 lib/noticelist.php:686

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


@@ -3494,9 +3832,16 @@ msgstr "You cannot sandbox users on this site."
 msgid "User is already sandboxed."
 msgstr "User is already sandboxed."
 
 msgid "User is already sandboxed."
 msgstr "User is already sandboxed."
 

+#. TRANS: Menu item for site administration
+#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
+#: lib/adminpanelaction.php:379
+#, fuzzy
+msgid "Sessions"
+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"


@@ -3515,7 +3860,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"
 


@@ -3539,17 +3883,17 @@ msgid "Name"
 msgstr "Name"
 
 #. TRANS: Form input field label.
 msgstr "Name"
 
 #. TRANS: Form input field label.

-#: actions/showapplication.php:178 lib/applicationeditform.php:226
+#: 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:207 lib/groupeditform.php:172
+#: lib/applicationeditform.php:208 lib/groupeditform.php:172

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

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

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


@@ -3559,10 +3903,20 @@ msgstr "Statistics"
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr ""
 
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr ""
 

+#: actions/showapplication.php:213
+#, fuzzy
+msgid "Application actions"
+msgstr "Application not found."
+

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

+#: actions/showapplication.php:261
+#, fuzzy
+msgid "Application info"
+msgstr "Application not found."
+

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


@@ -3681,45 +4035,45 @@ msgstr ""
 msgid "Group actions"
 msgstr "Group actions"
 
 msgid "Group actions"
 msgstr "Group actions"
 

-#: actions/showgroup.php:338
+#: actions/showgroup.php:344

 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
 msgstr "Notice feed for %s group (RSS 1.0)"
 
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
 msgstr "Notice feed for %s group (RSS 1.0)"
 

-#: actions/showgroup.php:344
+#: actions/showgroup.php:350

 #, php-format
 msgid "Notice feed for %s group (RSS 2.0)"
 msgstr "Notice feed for %s group (RSS 2.0)"
 
 #, php-format
 msgid "Notice feed for %s group (RSS 2.0)"
 msgstr "Notice feed for %s group (RSS 2.0)"
 

-#: actions/showgroup.php:350
+#: actions/showgroup.php:356

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

-#: actions/showgroup.php:355
+#: actions/showgroup.php:361

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

-#: actions/showgroup.php:393 actions/showgroup.php:445
+#: actions/showgroup.php:399 actions/showgroup.php:451

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

-#: actions/showgroup.php:398 lib/profileaction.php:117
+#: actions/showgroup.php:404 lib/profileaction.php:117

 #: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95
 #: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "(None)"
 
 #: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95
 #: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "(None)"
 

-#: actions/showgroup.php:404
+#: actions/showgroup.php:410

 msgid "All members"
 msgstr "All members"
 
 msgid "All members"
 msgstr "All members"
 

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

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

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

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


@@ -3734,7 +4088,7 @@ msgstr ""
 "their life and interests. [Join now](%%%%action.register%%%%) to become part "
 "of this group and many more! ([Read more](%%%%doc.help%%%%))"
 
 "their life and interests. [Join now](%%%%action.register%%%%) to become part "
 "of this group and many more! ([Read more](%%%%doc.help%%%%))"
 

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

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


@@ -3747,7 +4101,7 @@ msgstr ""
 "[StatusNet](http://status.net/) tool. Its members share short messages about "
 "their life and interests. "
 
 "[StatusNet](http://status.net/) tool. Its members share short messages about "
 "their life and interests. "
 

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

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


@@ -3828,7 +4182,20 @@ msgstr ""
 "You can try to nudge %1$s or [post something to them](%%%%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:248
+#: 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 ""
+"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: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."


@@ -3839,7 +4206,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"


@@ -3913,6 +4280,11 @@ msgstr "Contact e-mail address for your site"
 msgid "Local"
 msgstr "Local"
 
 msgid "Local"
 msgstr "Local"
 

+#: actions/siteadminpanel.php:256
+#, fuzzy
+msgid "Default timezone"
+msgstr "Default subscription"
+

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


@@ -4136,10 +4508,20 @@ msgstr ""
 msgid "Manage snapshot configuration"
 msgstr "Manage snapshot configuration"
 
 msgid "Manage snapshot configuration"
 msgstr "Manage snapshot configuration"
 

+#: actions/snapshotadminpanel.php:127
+#, fuzzy
+msgid "Invalid snapshot run value."
+msgstr "Invalid role."
+

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

+#: actions/snapshotadminpanel.php:144
+#, fuzzy
+msgid "Invalid snapshot report URL."
+msgstr "nvalid logo URL."
+

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


@@ -4148,6 +4530,11 @@ msgstr ""
 msgid "In a scheduled job"
 msgstr ""
 
 msgid "In a scheduled job"
 msgstr ""
 

+#: actions/snapshotadminpanel.php:206
+#, fuzzy
+msgid "Data snapshots"
+msgstr "Save snapshot settings"
+

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


@@ -4160,6 +4547,11 @@ msgstr ""
 msgid "Snapshots will be sent once every N web hits"
 msgstr ""
 
 msgid "Snapshots will be sent once every N web hits"
 msgstr ""
 

+#: actions/snapshotadminpanel.php:226
+#, fuzzy
+msgid "Report URL"
+msgstr "Source URL"
+

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


@@ -4272,7 +4664,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"
 


@@ -4372,62 +4764,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:149
+#: actions/useradminpanel.php:71
+msgid "User settings for this StatusNet site"
+msgstr ""
+
+#: 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:241
+#: actions/useradminpanel.php:236
+#, fuzzy
+msgid "New user welcome"
+msgstr "New users"
+
+#: actions/useradminpanel.php:237
+#, fuzzy
+msgid "Welcome text for new users (Max 255 chars)."
+msgstr "Name is too long (max 255 chars)."
+
+#: 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"


@@ -4442,7 +4852,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"
 


@@ -4515,6 +4927,11 @@ msgstr ""
 msgid "Profile URL ‘%s’ is for a local user."
 msgstr ""
 
 msgid "Profile URL ‘%s’ is for a local user."
 msgstr ""
 

+#: actions/userauthorization.php:345
+#, fuzzy, php-format
+msgid "Avatar URL ‘%s’ is not valid."
+msgstr "Callback URL is not valid."
+

 #: actions/userauthorization.php:350
 #, php-format
 msgid "Can’t read avatar URL ‘%s’."
 #: actions/userauthorization.php:350
 #, php-format
 msgid "Can’t read avatar URL ‘%s’."


@@ -4567,7 +4984,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!"


@@ -4584,6 +5001,11 @@ msgid ""
 "Inc. and contributors."
 msgstr ""
 
 "Inc. and contributors."
 msgstr ""
 

+#: actions/version.php:163
+#, fuzzy
+msgid "Contributors"
+msgstr "Connections"
+

 #: actions/version.php:170
 msgid ""
 "StatusNet is free software: you can redistribute it and/or modify it under "
 #: actions/version.php:170
 msgid ""
 "StatusNet is free software: you can redistribute it and/or modify it under "


@@ -4622,7 +5044,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:805
+#: actions/version.php:198 lib/action.php:830

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


@@ -4630,20 +5052,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.
 #. TRANS: Server exception thrown when a URL cannot be processed.

-#: classes/File.php:143
+#: classes/File.php:142

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

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


@@ -4652,18 +5086,24 @@ 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 ""
 
 #, 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:247 classes/File.php:262
+#, fuzzy
+msgid "Invalid filename."
+msgstr "Invalid size."
+

 #. TRANS: Exception thrown when joining a group fails.
 #: classes/Group_member.php:42
 msgid "Group join failed."
 #. TRANS: Exception thrown when joining a group fails.
 #: classes/Group_member.php:42
 msgid "Group join failed."


@@ -4679,6 +5119,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."


@@ -4697,17 +5163,17 @@ 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."
 


@@ -4762,46 +5228,77 @@ msgid "Problem saving notice."
 msgstr "Problem saving notice."
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
 msgstr "Problem saving notice."
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().

-#: classes/Notice.php:899
+#: 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:998
+#: 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:1759
+#: 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.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
 #, 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 (number).

-#: classes/Profile.php:737
+#: classes/Profile.php:785

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

-#: classes/Profile.php:746
+#: classes/Profile.php:794

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

+#. TRANS: Exception thrown when a right for a non-existing user profile is checked.
+#: classes/Remote_profile.php:54
+#, fuzzy
+msgid "Missing profile."
+msgstr "User has no profile."
+
+#. TRANS: Exception thrown when a tag cannot be saved.
+#: 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.
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.

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

 msgid "You have been banned from subscribing."
 msgstr "You have been banned from subscribing."
 
 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!"
+msgstr "Not subscribed!"
+

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

+#. TRANS: Exception thrown when trying to unsibscribe without a subscription.
+#: classes/Subscription.php:171
+#, fuzzy
+msgid "Not subscribed!"
+msgstr "Not subscribed!"
+

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


@@ -4817,65 +5314,77 @@ msgstr "Could not delete subscription OMB token."
 msgid "Could not delete subscription."
 msgstr "Could not delete subscription."
 
 msgid "Could not 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"
 
 msgid "Other"
 msgstr "Other"
 


@@ -4891,184 +5400,185 @@ msgid "Untitled page"
 msgstr "Untitled page"
 
 #. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
 msgstr "Untitled page"
 
 #. TRANS: DT element for primary navigation menu. String is hidden in default CSS.

-#: lib/action.php:449
+#: lib/action.php:476

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

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

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

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

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

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

-#: lib/action.php:471
+#: lib/action.php:498

 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
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
 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
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.

-#: lib/action.php:474 lib/groupnav.php:117
+#: lib/action.php:501 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:478
+#: lib/action.php:505

 #, 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:481
+#: lib/action.php:508

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

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

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

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

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

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

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

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

-#: lib/action.php:510
+#: lib/action.php:537

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

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

 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:538 lib/adminpanelaction.php:387
+#: lib/action.php:565 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:605
+#: lib/action.php:632

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

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

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

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

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

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

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

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

-#: lib/action.php:802
+#: lib/action.php:827

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

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

-#: lib/action.php:810
+#. TRANS: Secondary navigation menu option.
+#: lib/action.php:836

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

 msgid "StatusNet software license"
 msgstr "StatusNet software licence"
 
 msgid "StatusNet software license"
 msgstr "StatusNet software licence"
 


@@ -5076,7 +5586,7 @@ msgstr "StatusNet software licence"
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby

-#: lib/action.php:846
+#: lib/action.php:872

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


@@ -5086,7 +5596,7 @@ 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:849
+#: lib/action.php:875

 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** is a microblogging service."
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** is a microblogging service."


@@ -5095,7 +5605,7 @@ msgstr "**%%site.name%%** is a microblogging service."
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.

-#: lib/action.php:856
+#: lib/action.php:882

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


@@ -5107,70 +5617,70 @@ 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:872
+#: lib/action.php:898

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

 #, 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:886
+#: lib/action.php:912

 #, 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:890
+#: lib/action.php:916

 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.

-#: lib/action.php:904
+#: lib/action.php:948

 #, 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:1243
+#: lib/action.php:1284

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

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

 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 ""
 
 #. TRANS: Client exception thrown when there is no source attribute.
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 
 #. TRANS: Client exception thrown when there is no source attribute.

-#: lib/activityutils.php:203
+#: lib/activityutils.php:200

 msgid "Can't handle remote content yet."
 msgstr ""
 
 #. TRANS: Client exception thrown when there embedded XML content is found that cannot be processed yet.
 msgid "Can't handle remote content yet."
 msgstr ""
 
 #. TRANS: Client exception thrown when there embedded XML content is found that cannot be processed yet.

-#: lib/activityutils.php:240
+#: lib/activityutils.php:237

 msgid "Can't handle embedded XML content yet."
 msgstr ""
 
 #. TRANS: Client exception thrown when base64 encoded content is found that cannot be processed yet.
 msgid "Can't handle embedded XML content yet."
 msgstr ""
 
 #. TRANS: Client exception thrown when base64 encoded content is found that cannot be processed yet.

-#: lib/activityutils.php:245
+#: lib/activityutils.php:242

 msgid "Can't handle embedded Base64 content yet."
 msgstr ""
 
 msgid "Can't handle embedded Base64 content yet."
 msgstr ""
 


@@ -5258,6 +5768,11 @@ msgstr "Edit site notice"
 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.
 #: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
 #. TRANS: Client error 401.
 #: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."


@@ -5285,160 +5800,231 @@ msgid "Could not authenticate you."
 msgstr ""
 
 #. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
 msgstr ""
 
 #. TRANS: Exception thrown when an attempt is made to revoke an unknown token.

-#: lib/apioauthstore.php:178
+#: lib/apioauthstore.php:184

 msgid "Tried to revoke unknown token."
 msgstr ""
 
 msgid "Tried to revoke unknown token."
 msgstr ""
 

+#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
+#: lib/apioauthstore.php:189
+msgid "Failed to delete revoked token."
+msgstr ""
+
+#. TRANS: Form legend.
+#: lib/applicationeditform.php:129
+#, fuzzy
+msgid "Edit application"
+msgstr "Edit Application"
+
+#. TRANS: Form guide.
+#: lib/applicationeditform.php:178
+#, fuzzy
+msgid "Icon for this application"
+msgstr "Do not delete this application"
+

 #. TRANS: Form input field instructions.
 #. TRANS: Form input field instructions.

-#: lib/applicationeditform.php:200
-#, 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:204
+#: 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:215
+#: 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:217
+#: 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:224
+#: 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:233
+#: 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:242
+#: 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:269
+#: 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:286
+#: lib/applicationeditform.php:288

 msgid "Desktop"
 msgstr ""
 
 #. TRANS: Form guide.
 msgid "Desktop"
 msgstr ""
 
 #. TRANS: Form guide.

-#: lib/applicationeditform.php:288
+#: 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:311
+#: 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:330
+#: lib/applicationeditform.php:334

 msgid "Read-write"
 msgstr ""
 
 #. TRANS: Form guide.
 msgid "Read-write"
 msgstr ""
 
 #. TRANS: Form guide.

-#: lib/applicationeditform.php:332
+#: 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:349
-msgid "Cancel"
-msgstr "Cancel"
-

 #. TRANS: Application access type
 #. TRANS: Application access type

-#: lib/applicationlist.php:135
+#: lib/applicationlist.php:134

 msgid "read-write"
 msgstr ""
 
 #. TRANS: Application access type
 msgid "read-write"
 msgstr ""
 
 #. TRANS: Application access type

-#: lib/applicationlist.php:137
+#: 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:143
+#. 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:158
+#: 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 item.
 #. TRANS: DT element label in attachment list item.

-#: lib/attachmentlist.php:279
+#: lib/attachmentlist.php:256
+#, fuzzy
+msgid "Author"
+msgstr "Authorise URL"
+
+#. TRANS: DT element label in attachment list item.
+#: lib/attachmentlist.php:270

 msgid "Provider"
 msgstr "Provider"
 
 #. TRANS: Title.
 msgid "Provider"
 msgstr "Provider"
 
 #. TRANS: Title.

-#: lib/attachmentnoticesection.php:68
+#: lib/attachmentnoticesection.php:67

 msgid "Notices where this attachment appears"
 msgstr ""
 
 msgid "Notices where this attachment appears"
 msgstr ""
 

-#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:226
-msgid "Password changing failed"
+#. TRANS: Title.
+#: lib/attachmenttagcloudsection.php:48
+#, fuzzy
+msgid "Tags for this attachment"
+msgstr "No such attachment."
+
+#. 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"
 
 #. TRANS: Title for the form to block a user.
 msgstr "Password changing is not allowed"
 
 #. TRANS: Title for the form to block a user.

-#: lib/blockform.php:70
+#: lib/blockform.php:68

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

-#: lib/channel.php:157 lib/channel.php:177
+#. 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"
 

+#. 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."
+
+#. 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.
+#: 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.
 #. TRANS: Message given getting a non-existing user.
 #. TRANS: %s is the nickname of the user that could not be found.

-#: lib/command.php:150
+#: lib/command.php:148

 #, php-format
 msgid "Could not find a local user with nickname %s."
 msgstr ""
 
 #. TRANS: Error text shown when an unimplemented command is given.
 #, php-format
 msgid "Could not find a local user with nickname %s."
 msgstr ""
 
 #. TRANS: Error text shown when an unimplemented command is given.

-#: lib/command.php:185
+#: lib/command.php:183

 msgid "Sorry, this command is not yet implemented."
 msgstr "Sorry, this command is not yet implemented."
 
 #. TRANS: Command exception text shown when a user tries to nudge themselves.
 msgid "Sorry, this command is not yet implemented."
 msgstr "Sorry, this command is not yet implemented."
 
 #. TRANS: Command exception text shown when a user tries to nudge themselves.

-#: lib/command.php:231
+#: lib/command.php:229

 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr ""
 
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr ""
 

+#. TRANS: Message given having nudged another user.
+#. TRANS: %s is the nickname of the user that was nudged.
+#: lib/command.php:238
+#, fuzzy, php-format
+msgid "Nudge sent to %s."
+msgstr "Nudge sent to %s"
+

 #. 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.
 #. 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:270
+#: lib/command.php:268

 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"


@@ -5447,52 +6033,53 @@ msgid ""
 msgstr ""
 
 #. TRANS: Text shown when a notice has been marked as favourite successfully.
 msgstr ""
 
 #. TRANS: Text shown when a notice has been marked as favourite successfully.

-#: lib/command.php:314
+#: lib/command.php:312

 msgid "Notice marked as fave."
 msgstr "Notice marked as fave."
 
 #. TRANS: Message given having added a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
 msgid "Notice marked as fave."
 msgstr "Notice marked as fave."
 
 #. TRANS: Message given having added a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.

-#: lib/command.php:360
+#: lib/command.php:357

 #, php-format
 msgid "%1$s joined group %2$s."
 msgstr ""
 
 #. TRANS: Message given having removed a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
 #, php-format
 msgid "%1$s joined group %2$s."
 msgstr ""
 
 #. TRANS: Message given having removed a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.

-#: lib/command.php:408
+#: lib/command.php:405

 #, php-format
 msgid "%1$s left group %2$s."
 msgstr ""
 
 #. TRANS: Whois output. %s is the full name of the queried user.
 #, php-format
 msgid "%1$s left group %2$s."
 msgstr ""
 
 #. TRANS: Whois output. %s is the full name of the queried user.

-#: lib/command.php:434
+#: 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:438 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:442 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:446
+#: lib/command.php:442

 #, php-format
 msgid "About: %s"
 msgstr "About: %s"
 
 #. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
 #, php-format
 msgid "About: %s"
 msgstr "About: %s"
 
 #. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).

-#: lib/command.php:474
+#. 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 "


@@ -5501,99 +6088,133 @@ 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:491 lib/xmppmanager.php:403
+#: lib/command.php:488 lib/xmppmanager.php:403

 #, 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: Error text shown sending a direct message fails with an unknown reason.
 #, 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: Error text shown sending a direct message fails with an unknown reason.

-#: lib/command.php:517
+#: lib/command.php:514

 msgid "Error sending direct message."
 msgstr "Error sending direct message."
 
 msgid "Error sending direct message."
 msgstr "Error sending direct message."
 

+#. 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:551
+#, fuzzy, php-format
+msgid "Notice from %s repeated."
+msgstr "Notice posted"
+

 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.

-#: lib/command.php:557
+#: lib/command.php:554

 msgid "Error repeating notice."
 msgstr "Error repeating notice."
 
 msgid "Error repeating notice."
 msgstr "Error repeating notice."
 

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

 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.

-#: lib/command.php:606
+#: lib/command.php:603

 msgid "Error saving notice."
 msgstr "Error saving notice."
 
 msgid "Error saving notice."
 msgstr "Error saving notice."
 

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

 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.

-#: lib/command.php:664
+#: lib/command.php:659

 msgid "Can't subscribe to OMB profiles by command."
 msgstr "Can't subscribe to OMB profiles by command."
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "Can't subscribe to OMB profiles by command."
 
 #. 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:672
+#: lib/command.php:667

 #, php-format
 msgid "Subscribed to %s."
 msgstr ""
 
 #, php-format
 msgid "Subscribed to %s."
 msgstr ""
 

+#. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
+#. TRANS: Error text shown when no username was provided when issuing the command.
+#: lib/command.php: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"
+

 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
 #. 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:705
+#: lib/command.php:699

 #, php-format
 msgid "Unsubscribed from %s."
 msgstr ""
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr ""
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.

-#: lib/command.php:724 lib/command.php:750
+#: lib/command.php:719 lib/command.php:745

 msgid "Command not yet implemented."
 msgstr "Command not yet implemented."
 
 #. TRANS: Text shown when issuing the command "off" successfully.
 msgid "Command not yet implemented."
 msgstr "Command not yet implemented."
 
 #. TRANS: Text shown when issuing the command "off" successfully.

-#: lib/command.php:728
+#: lib/command.php:723

 msgid "Notification off."
 msgstr "Notification off."
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
 msgid "Notification off."
 msgstr "Notification off."
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.

-#: lib/command.php:731
+#: lib/command.php:726

 msgid "Can't turn off notification."
 msgstr "Can't turn off notification."
 
 #. TRANS: Text shown when issuing the command "on" successfully.
 msgid "Can't turn off notification."
 msgstr "Can't turn off notification."
 
 #. TRANS: Text shown when issuing the command "on" successfully.

-#: lib/command.php:754
+#: lib/command.php:749

 msgid "Notification on."
 msgstr "Notification on."
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
 msgid "Notification on."
 msgstr "Notification on."
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.

-#: lib/command.php:757
+#: lib/command.php:752

 msgid "Can't turn on notification."
 msgstr "Can't turn on notification."
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
 msgid "Can't turn on notification."
 msgstr "Can't turn on notification."
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.

-#: lib/command.php:771
+#: lib/command.php:766

 msgid "Login command is disabled."
 msgstr ""
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
 msgid "Login command is disabled."
 msgstr ""
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..

-#: lib/command.php:784
+#: lib/command.php:779

 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.

-#: lib/command.php:813
+#: lib/command.php:808

 #, php-format
 msgid "Unsubscribed %s."
 msgstr ""
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
 #, php-format
 msgid "Unsubscribed %s."
 msgstr ""
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.

-#: lib/command.php:831
+#: lib/command.php:826

 msgid "You are not subscribed to anyone."
 msgstr "You are not subscribed to anyone."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
 msgid "You are not subscribed to anyone."
 msgstr "You are not subscribed to anyone."
 
 #. 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:836
+#: 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:"
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "You are already subscribed to these users:"


@@ -5601,14 +6222,14 @@ msgstr[1] "You are already subscribed to these users:"
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.

-#: lib/command.php:858
+#: lib/command.php:853

 msgid "No one is subscribed to you."
 msgstr "No one is subscribed to you."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
 msgid "No one is subscribed to you."
 msgstr "No one is subscribed to you."
 
 #. 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:863
+#: 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."
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Could not subscribe other to you."


@@ -5616,21 +6237,21 @@ msgstr[1] "Could not subscribe other to you."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.

-#: lib/command.php:885
+#: lib/command.php:880

 msgid "You are not a member of any groups."
 msgstr "You are not a member of any groups."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
 msgid "You are not a member of any groups."
 msgstr "You are not a member of any groups."
 
 #. 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:890
+#: 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."
 

-#. TRANS: Help text for commands.
-#: lib/command.php:905
+#. 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"


@@ -5710,39 +6331,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 OuAth 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 OAuth) menu item.
+#: lib/connectsettingsaction.php:122

 msgid "Authorized connected applications"
 msgstr "Authorised connected applications"
 
 msgid "Authorized connected applications"
 msgstr "Authorised connected applications"
 


@@ -5760,18 +6403,19 @@ msgid ""
 msgstr ""
 "You can upload your personal background image. The maximum file size is 2MB."
 
 msgstr ""
 "You can upload your personal background image. The maximum file size is 2MB."
 

-#: lib/disfavorform.php:114 lib/disfavorform.php:140
+#: lib/designsettings.php:418
+#, fuzzy
+msgid "Design defaults restored."
+msgstr "Design preferences saved."
+
+#: 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 ""


@@ -5788,9 +6432,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"


@@ -5983,10 +6627,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"


@@ -6198,6 +6838,11 @@ msgid ""
 "\t%s"
 msgstr ""
 
 "\t%s"
 msgstr ""
 

+#: lib/mail.php:657
+#, fuzzy, php-format
+msgid "%s (@%s) sent a notice to your attention"
+msgstr "%s (@%s) added your notice as a favorite"
+

 #. TRANS: Body of @-reply notification e-mail.
 #: lib/mail.php:660
 #, php-format
 #. TRANS: Body of @-reply notification e-mail.
 #: lib/mail.php:660
 #, php-format


@@ -6236,7 +6881,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:228 lib/noticelist.php:506
+#: lib/mailbox.php:228 lib/noticelist.php:516

 msgid "from"
 msgstr "from"
 
 msgid "from"
 msgstr "from"
 


@@ -6381,55 +7026,55 @@ msgid ""
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of north
 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:502
+#: lib/noticelist.php:512

 msgid "web"
 msgstr ""
 
 msgid "web"
 msgstr ""
 

-#: lib/noticelist.php:568
+#: lib/noticelist.php:578

 msgid "in context"
 msgstr "in context"
 
 msgid "in context"
 msgstr "in context"
 

-#: lib/noticelist.php:603
+#: lib/noticelist.php:613

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

-#: lib/noticelist.php:630
+#: 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:631
+#: lib/noticelist.php:641

 msgid "Reply"
 msgstr "Reply"
 
 msgid "Reply"
 msgstr "Reply"
 

-#: lib/noticelist.php:675
+#: lib/noticelist.php:685

 msgid "Notice repeated"
 msgstr "Notice repeated"
 
 msgid "Notice repeated"
 msgstr "Notice repeated"
 


@@ -6445,24 +7090,24 @@ msgstr "Nudge"
 msgid "Send a nudge to this user"
 msgstr "Send a nudge to this user"
 
 msgid "Send a nudge to this user"
 msgstr "Send a nudge to this user"
 

-#: lib/oauthstore.php:283
+#: lib/oauthstore.php:294

 msgid "Error inserting new profile."
 msgstr ""
 
 msgid "Error inserting new profile."
 msgstr ""
 

-#: lib/oauthstore.php:291
+#: lib/oauthstore.php:302

 msgid "Error inserting avatar."
 msgstr ""
 
 msgid "Error inserting avatar."
 msgstr ""
 

-#: lib/oauthstore.php:311
+#: lib/oauthstore.php:322

 msgid "Error inserting remote profile."
 msgstr ""
 
 #. TRANS: Exception thrown when a notice is denied because it has been sent before.
 msgid "Error inserting remote profile."
 msgstr ""
 
 #. TRANS: Exception thrown when a notice is denied because it has been sent before.

-#: lib/oauthstore.php:346
+#: lib/oauthstore.php:362

 msgid "Duplicate notice."
 msgstr ""
 
 msgid "Duplicate notice."
 msgstr ""
 

-#: lib/oauthstore.php:491
+#: lib/oauthstore.php:507

 msgid "Couldn't insert new subscription."
 msgstr "Couldn't insert new subscription."
 
 msgid "Couldn't insert new subscription."
 msgstr "Couldn't insert new subscription."
 


@@ -6500,7 +7145,7 @@ msgid "Tags in %s's notices"
 msgstr "Tags in %s's notices"
 
 #. TRANS: Displayed as version information for a plugin if no version information was found.
 msgstr "Tags in %s's notices"
 
 #. TRANS: Displayed as version information for a plugin if no version information was found.

-#: lib/plugin.php:116
+#: lib/plugin.php:121

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


@@ -6582,7 +7227,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 ""
 


@@ -6693,6 +7338,13 @@ msgstr ""
 msgid "The theme file is missing or the upload failed."
 msgstr ""
 
 msgid "The theme file is missing or the upload failed."
 msgstr ""
 

+#: lib/themeuploader.php:91 lib/themeuploader.php:102
+#: lib/themeuploader.php:278 lib/themeuploader.php:282
+#: lib/themeuploader.php:290 lib/themeuploader.php:297
+#, fuzzy
+msgid "Failed saving theme."
+msgstr "Failed updating avatar."
+

 #: lib/themeuploader.php:147
 msgid "Invalid theme: bad directory structure."
 msgstr ""
 #: lib/themeuploader.php:147
 msgid "Invalid theme: bad directory structure."
 msgstr ""


@@ -6721,14 +7373,29 @@ msgstr ""
 msgid "Theme contains file of type '.%s', which is not allowed."
 msgstr ""
 
 msgid "Theme contains file of type '.%s', which is not allowed."
 msgstr ""
 

+#: lib/themeuploader.php:259
+#, fuzzy
+msgid "Error opening theme archive."
+msgstr "Error updating remote profile."
+

 #: lib/topposterssection.php:74
 msgid "Top posters"
 msgstr "Top posters"
 
 #: lib/topposterssection.php:74
 msgid "Top posters"
 msgstr "Top posters"
 

+#: lib/unsandboxform.php:69
+#, fuzzy
+msgid "Unsandbox"
+msgstr "Sandbox"
+

 #: lib/unsandboxform.php:80
 msgid "Unsandbox this user"
 msgstr "Unsandbox this user"
 
 #: lib/unsandboxform.php:80
 msgid "Unsandbox this user"
 msgstr "Unsandbox this user"
 

+#: lib/unsilenceform.php:67
+#, fuzzy
+msgid "Unsilence"
+msgstr "Silence"
+

 #: lib/unsilenceform.php:78
 msgid "Unsilence this user"
 msgstr "Unsilence this user"
 #: lib/unsilenceform.php:78
 msgid "Unsilence this user"
 msgstr "Unsilence this user"


@@ -6741,6 +7408,13 @@ msgstr "Unsubscribe from this user"
 msgid "Unsubscribe"
 msgstr "Unsubscribe"
 
 msgid "Unsubscribe"
 msgstr "Unsubscribe"
 

+#. 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"
 msgstr "Edit Avatar"
 #: lib/userprofile.php:117
 msgid "Edit Avatar"
 msgstr "Edit Avatar"


@@ -6788,17 +7462,17 @@ 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:1103
+#: lib/util.php:1163

 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:1106
+#: lib/util.php:1166

 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:1109
+#: lib/util.php:1170

 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"


@@ -6806,12 +7480,12 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.

-#: lib/util.php:1112
+#: lib/util.php:1173

 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:1115
+#: lib/util.php:1177

 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"


@@ -6819,12 +7493,12 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.

-#: lib/util.php:1118
+#: lib/util.php:1180

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

 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"


@@ -6832,12 +7506,12 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.

-#: lib/util.php:1124
+#: lib/util.php:1187

 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:1127
+#: lib/util.php:1191

 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"


@@ -6845,7 +7519,7 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.

-#: lib/util.php:1130
+#: lib/util.php:1194

 msgid "about a year ago"
 msgstr "about a year ago"
 
 msgid "about a year ago"
 msgstr "about a year ago"
 


@@ -6858,3 +7532,18 @@ msgstr "%s is not a valid colour!"
 #, php-format
 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."
 #, php-format
 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."

+
+#: scripts/restoreuser.php:82
+#, php-format
+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 ""