Merge branch '0.9.x' of git@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 c65fc1c73cc63cc97a90261ea2e8c649d64200ab..407007fbf9b5e35d92a46d6b2a57a287cc1f4693 100644 (file)
--- a/locale/en_GB/LC_MESSAGES/statusnet.po
+++ b/locale/en_GB/LC_MESSAGES/statusnet.po
@@ -1,26 +1,25 @@
 # Translation of StatusNet to British English
 #
 # Translation of StatusNet to British English
 #

+# Author@translatewiki.net: Bruce89

 # Author@translatewiki.net: CiaranG
 # Author@translatewiki.net: CiaranG

+# Author@translatewiki.net: Lockal

 # --
 # --

-# #-#-#-#-#  statusnet.new.pot (PACKAGE VERSION)  #-#-#-#-#
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# This file is distributed under the same license as the StatusNet package.

 #
 msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2009-11-16 19:42+0000\n"
-"PO-Revision-Date: 2009-11-16 19:43:18+0000\n"
+"POT-Creation-Date: 2010-01-13 22:04+0000\n"
+"PO-Revision-Date: 2010-01-13 22:05:04+0000\n"

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

-"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n"
+"X-Generator: MediaWiki 1.16alpha (r61027); Translate extension (2010-01-04)\n"

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

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

 
 #: actions/all.php:63 actions/public.php:97 actions/replies.php:92
 #: actions/showfavorites.php:137 actions/tag.php:51
 
 #: actions/all.php:63 actions/public.php:97 actions/replies.php:92
 #: actions/showfavorites.php:137 actions/tag.php:51


@@ -29,36 +28,33 @@ msgstr "No such page"
 
 #: actions/all.php:74 actions/allrss.php:68
 #: actions/apiaccountupdatedeliverydevice.php:113
 
 #: actions/all.php:74 actions/allrss.php:68
 #: actions/apiaccountupdatedeliverydevice.php:113

+#: actions/apiaccountupdateprofile.php:105

 #: actions/apiaccountupdateprofilebackgroundimage.php:116
 #: actions/apiaccountupdateprofilebackgroundimage.php:116

-#: actions/apiaccountupdateprofileimage.php:105
-#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97
-#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75
-#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112
+#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
+#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
+#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112

 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90
 #: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90
 #: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79

-#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
-#: actions/avatarbynickname.php:75 actions/favoritesrss.php:74
-#: actions/foaf.php:40 actions/foaf.php:58 actions/microsummary.php:62
-#: actions/newmessage.php:116 actions/remotesubscribe.php:145
-#: actions/remotesubscribe.php:154 actions/replies.php:73
-#: actions/repliesrss.php:38 actions/showfavorites.php:105
-#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38
-#: actions/xrds.php:71 lib/command.php:163 lib/command.php:311
-#: lib/command.php:364 lib/command.php:411 lib/command.php:466
+#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
+#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
+#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
+#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
+#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154
+#: actions/replies.php:73 actions/repliesrss.php:38
+#: actions/showfavorites.php:105 actions/userbyid.php:74
+#: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71
+#: lib/command.php:163 lib/command.php:302 lib/command.php:355
+#: lib/command.php:401 lib/command.php:462 lib/command.php:518

 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77

-#: lib/subs.php:34 lib/subs.php:112
+#: lib/subs.php:34 lib/subs.php:125

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

-#: actions/all.php:84
-#, php-format
-msgid "%s and friends, page %d"
-msgstr "%s and friends, page %d"
-

 #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
 #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115

-#: actions/apitimelinefriends.php:114 lib/personalgroupnav.php:100
+#: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115
+#: lib/personalgroupnav.php:100

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


@@ -83,6 +79,7 @@ msgstr "Feed for friends of %s (Atom)"
 msgid ""
 "This is the timeline for %s and friends but no one has posted anything yet."
 msgstr ""
 msgid ""
 "This is the timeline for %s and friends but no one has posted anything yet."
 msgstr ""

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

 
 #: actions/all.php:132
 #, php-format
 
 #: actions/all.php:132
 #, php-format


@@ -90,13 +87,17 @@ msgid ""
 "Try subscribing to more people, [join a group](%%action.groups%%) or post "
 "something yourself."
 msgstr ""
 "Try subscribing to more people, [join a group](%%action.groups%%) or post "
 "something yourself."
 msgstr ""

+"Try subscribing to more people, [join a group](%%action.groups%%) or post "
+"something yourself."

 
 #: actions/all.php:134
 
 #: actions/all.php:134

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

 msgid ""
 msgid ""

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

 "You can try to [nudge %s](../%s) from his profile or [post something to his "
 "or her attention](%%%%action.newnotice%%%%?status_textarea=%s)."
 "You can try to [nudge %s](../%s) from his profile or [post something to his "
 "or her attention](%%%%action.newnotice%%%%?status_textarea=%s)."

-msgstr ""

 
 #: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202
 #, php-format
 
 #: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202
 #, php-format


@@ -104,34 +105,55 @@ msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
 "post a notice to his or her attention."
 msgstr ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
 "post a notice to his or her attention."
 msgstr ""

+"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
+"post a notice to his or her attention."

 
 #: actions/all.php:165
 msgid "You and friends"
 msgstr "You and friends"
 
 
 #: actions/all.php:165
 msgid "You and friends"
 msgstr "You and friends"
 

-#: actions/allrss.php:119 actions/apitimelinefriends.php:121
+#: actions/allrss.php:119 actions/apitimelinefriends.php:122
+#: actions/apitimelinehome.php:122

 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr "Updates from %1$s and friends on %2$s!"
 
 #: actions/apiaccountratelimitstatus.php:70
 #: actions/apiaccountupdatedeliverydevice.php:93
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr "Updates from %1$s and friends on %2$s!"
 
 #: actions/apiaccountratelimitstatus.php:70
 #: actions/apiaccountupdatedeliverydevice.php:93

+#: actions/apiaccountupdateprofile.php:97

 #: actions/apiaccountupdateprofilebackgroundimage.php:94
 #: actions/apiaccountupdateprofilecolors.php:118
 #: actions/apiaccountupdateprofilebackgroundimage.php:94
 #: actions/apiaccountupdateprofilecolors.php:118

-#: actions/apiaccountupdateprofile.php:97
+#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
+#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
+#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
+#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
+#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
+#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
+#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
+#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
+#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108
+#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93
+#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146
+#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150
+#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151
+#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122
+#: actions/apitimelineretweetedtome.php:121
+#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141
+#: actions/apitimelineuser.php:165 actions/apiusershow.php:101

 msgid "API method not found."
 msgstr "API method not found."
 
 #: actions/apiaccountupdatedeliverydevice.php:85
 msgid "API method not found."
 msgstr "API method not found."
 
 #: actions/apiaccountupdatedeliverydevice.php:85

+#: actions/apiaccountupdateprofile.php:89

 #: actions/apiaccountupdateprofilebackgroundimage.php:86
 #: actions/apiaccountupdateprofilecolors.php:110
 #: actions/apiaccountupdateprofilebackgroundimage.php:86
 #: actions/apiaccountupdateprofilecolors.php:110

-#: actions/apiaccountupdateprofileimage.php:84
-#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89
+#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89

 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117
 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117
 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91

-#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114
+#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65
+#: actions/apistatusesupdate.php:114

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


@@ -140,26 +162,48 @@ msgid ""
 "You must specify a parameter named 'device' with a value of one of: sms, im, "
 "none"
 msgstr ""
 "You must specify a parameter named 'device' with a value of one of: sms, im, "
 "none"
 msgstr ""

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

 
 #: actions/apiaccountupdatedeliverydevice.php:132
 #, fuzzy
 msgid "Could not update user."
 msgstr "Couldn't update user."
 
 
 #: actions/apiaccountupdatedeliverydevice.php:132
 #, fuzzy
 msgid "Could not update user."
 msgstr "Couldn't update user."
 

+#: actions/apiaccountupdateprofile.php:112
+#: actions/apiaccountupdateprofilebackgroundimage.php:194
+#: actions/apiaccountupdateprofilecolors.php:185
+#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
+#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
+msgid "User has no profile."
+msgstr "User has no profile."
+
+#: actions/apiaccountupdateprofile.php:147
+#, fuzzy
+msgid "Could not save profile."
+msgstr "Couldn't save profile."
+

 #: actions/apiaccountupdateprofilebackgroundimage.php:108
 #: actions/apiaccountupdateprofileimage.php:97
 #: actions/apiaccountupdateprofilebackgroundimage.php:108
 #: actions/apiaccountupdateprofileimage.php:97

-#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
-#: actions/newnotice.php:94 lib/designsettings.php:283
+#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257
+#: actions/designadminpanel.php:122 actions/newnotice.php:94
+#: lib/designsettings.php:283

 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s bytes) due to its "
 "current configuration."
 msgstr ""
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s bytes) due to its "
 "current configuration."
 msgstr ""

+"The server was unable to handle that much POST data (%s bytes) due to its "
+"current configuration."

 
 #: actions/apiaccountupdateprofilebackgroundimage.php:136
 #: actions/apiaccountupdateprofilebackgroundimage.php:146
 #: actions/apiaccountupdateprofilecolors.php:164
 #: actions/apiaccountupdateprofilecolors.php:174
 
 #: actions/apiaccountupdateprofilebackgroundimage.php:136
 #: actions/apiaccountupdateprofilebackgroundimage.php:146
 #: actions/apiaccountupdateprofilecolors.php:164
 #: actions/apiaccountupdateprofilecolors.php:174

+#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297
+#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
+#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273

 msgid "Unable to save your design settings."
 msgstr "Unable to save your design settings!"
 
 msgid "Unable to save your design settings."
 msgstr "Unable to save your design settings!"
 


@@ -168,45 +212,18 @@ msgstr "Unable to save your design settings!"
 msgid "Could not update your design."
 msgstr "Could not update your design."
 
 msgid "Could not update your design."
 msgstr "Could not update your design."
 

-#: actions/apiaccountupdateprofilebackgroundimage.php:194
-#: actions/apiaccountupdateprofilecolors.php:185
-#: actions/apiaccountupdateprofileimage.php:130
-#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108
-#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
-#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
-msgid "User has no profile."
-msgstr "User has no profile."
-
-#: actions/apiaccountupdateprofile.php:147
-#, fuzzy
-msgid "Could not save profile."
-msgstr "Couldn't save profile."
+#: actions/apiblockcreate.php:105
+msgid "You cannot block yourself!"
+msgstr "You cannot block yourself!"

 
 

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

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

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

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

-#: actions/apidirectmessagenew.php:126
-msgid "No message text!"
-msgstr "No message text!"
-
-#: actions/apidirectmessagenew.php:135 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:146
-msgid "Recipient user not found."
-msgstr "Recipient user not found."
-
-#: actions/apidirectmessagenew.php:150
-msgid "Can't send direct messages to users who aren't your friend."
-msgstr "Can't send direct messages to users who aren't your friend."
-

 #: actions/apidirectmessage.php:89
 #, php-format
 msgid "Direct messages from %s"
 #: actions/apidirectmessage.php:89
 #, php-format
 msgid "Direct messages from %s"


@@ -227,22 +244,22 @@ msgstr "Direct messages to %s"
 msgid "All the direct messages sent to %s"
 msgstr "All the direct messages sent to %s"
 
 msgid "All the direct messages sent to %s"
 msgstr "All the direct messages sent to %s"
 

-#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
-#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
-#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
-#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114
-#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
-#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
-#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
-#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
-#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
-#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
-#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
-#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
-#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
-msgid "API method not found!"
-msgstr "API method not found!"
+#: actions/apidirectmessagenew.php:126
+msgid "No message text!"
+msgstr "No message text!"
+
+#: actions/apidirectmessagenew.php:135 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:146
+msgid "Recipient user not found."
+msgstr "Recipient user not found."
+
+#: actions/apidirectmessagenew.php:150
+msgid "Can't send direct messages to users who aren't your friend."
+msgstr "Can't send direct messages to users who aren't your friend."

 
 #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
 #: actions/apistatusesdestroy.php:113
 
 #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
 #: actions/apistatusesdestroy.php:113


@@ -250,7 +267,8 @@ msgid "No status found with that ID."
 msgstr "No status found with that ID."
 
 #: actions/apifavoritecreate.php:119
 msgstr "No status found with that ID."
 
 #: actions/apifavoritecreate.php:119

-msgid "This status is already a favorite!"
+#, fuzzy
+msgid "This status is already a favorite."

 msgstr "This status is already a favourite!"
 
 #: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176
 msgstr "This status is already a favourite!"
 
 #: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176


@@ -258,7 +276,8 @@ msgid "Could not create favorite."
 msgstr "Could not create favourite."
 
 #: actions/apifavoritedestroy.php:122
 msgstr "Could not create favourite."
 
 #: actions/apifavoritedestroy.php:122

-msgid "That status is not a favorite!"
+#, fuzzy
+msgid "That status is not a favorite."

 msgstr "That status is not a favourite!"
 
 #: actions/apifavoritedestroy.php:134 actions/disfavor.php:87
 msgstr "That status is not a favourite!"
 
 #: actions/apifavoritedestroy.php:134 actions/disfavor.php:87


@@ -279,122 +298,118 @@ msgid "Could not unfollow user: User not found."
 msgstr "Could not unfollow user: User not found."
 
 #: actions/apifriendshipsdestroy.php:120
 msgstr "Could not unfollow user: User not found."
 
 #: actions/apifriendshipsdestroy.php:120

-msgid "You cannot unfollow yourself!"
-msgstr ""
+#, fuzzy
+msgid "You cannot unfollow yourself."
+msgstr "You cannot unfollow yourself!"

 
 #: actions/apifriendshipsexists.php:94
 msgid "Two user ids or screen_names must be supplied."
 msgstr "Two user ids or screen_names must be supplied."
 
 #: actions/apifriendshipsshow.php:135
 
 #: actions/apifriendshipsexists.php:94
 msgid "Two user ids or screen_names must be supplied."
 msgstr "Two user ids or screen_names must be supplied."
 
 #: actions/apifriendshipsshow.php:135

-#, fuzzy

 msgid "Could not determine source user."
 msgid "Could not determine source user."

-msgstr "Could not retrieve public stream."
+msgstr "Could not determine source user."

 
 #: actions/apifriendshipsshow.php:143
 
 #: actions/apifriendshipsshow.php:143

-#, fuzzy

 msgid "Could not find target user."
 msgid "Could not find target user."

-msgstr "Couldn't find any statuses."
-
-#: actions/apigroupcreate.php:136 actions/newgroup.php:204
-msgid "Could not create group."
-msgstr "Could not create group."
-
-#: actions/apigroupcreate.php:147 actions/editgroup.php:259
-#: actions/newgroup.php:210
-msgid "Could not create aliases."
-msgstr "Could not create aliases"
-
-#: actions/apigroupcreate.php:166 actions/newgroup.php:224
-msgid "Could not set group membership."
-msgstr "Could not set group membership."
+msgstr "Could not find target user."

 
 

-#: actions/apigroupcreate.php:212 actions/editgroup.php:182
-#: actions/newgroup.php:126 actions/profilesettings.php:208
+#: actions/apigroupcreate.php:164 actions/editgroup.php:182
+#: actions/newgroup.php:126 actions/profilesettings.php:215

 #: actions/register.php:205
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr "Nickname must have only lowercase letters and numbers, and no spaces."
 
 #: actions/register.php:205
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr "Nickname must have only lowercase letters and numbers, and no spaces."
 

-#: actions/apigroupcreate.php:221 actions/editgroup.php:186
-#: actions/newgroup.php:130 actions/profilesettings.php:231
+#: actions/apigroupcreate.php:173 actions/editgroup.php:186
+#: actions/newgroup.php:130 actions/profilesettings.php:238

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

-#: actions/apigroupcreate.php:228 actions/editgroup.php:189
-#: actions/newgroup.php:133 actions/profilesettings.php:211
+#: actions/apigroupcreate.php:180 actions/editgroup.php:189
+#: actions/newgroup.php:133 actions/profilesettings.php:218

 #: actions/register.php:210
 msgid "Not a valid nickname."
 msgstr "Not a valid nickname."
 
 #: actions/register.php:210
 msgid "Not a valid nickname."
 msgstr "Not a valid nickname."
 

-#: actions/apigroupcreate.php:244 actions/editgroup.php:195
-#: actions/newgroup.php:139 actions/profilesettings.php:215
+#: actions/apigroupcreate.php:196 actions/editgroup.php:195
+#: actions/newgroup.php:139 actions/profilesettings.php:222

 #: actions/register.php:217
 msgid "Homepage is not a valid URL."
 msgstr "Homepage is not a valid URL."
 
 #: actions/register.php:217
 msgid "Homepage is not a valid URL."
 msgstr "Homepage is not a valid URL."
 

-#: actions/apigroupcreate.php:253 actions/editgroup.php:198
-#: actions/newgroup.php:142 actions/profilesettings.php:218
+#: actions/apigroupcreate.php:205 actions/editgroup.php:198
+#: actions/newgroup.php:142 actions/profilesettings.php:225

 #: actions/register.php:220
 msgid "Full name is too long (max 255 chars)."
 msgstr "Full name is too long (max 255 chars)."
 
 #: actions/register.php:220
 msgid "Full name is too long (max 255 chars)."
 msgstr "Full name is too long (max 255 chars)."
 

-#: actions/apigroupcreate.php:261
-#, fuzzy, php-format
+#: actions/apigroupcreate.php:213
+#, php-format

 msgid "Description is too long (max %d chars)."
 msgid "Description is too long (max %d chars)."

-msgstr "description is too long (max 140 chars)."
+msgstr "Description is too long (max %d chars)"

 
 

-#: actions/apigroupcreate.php:272 actions/editgroup.php:204
-#: actions/newgroup.php:148 actions/profilesettings.php:225
+#: actions/apigroupcreate.php:224 actions/editgroup.php:204
+#: actions/newgroup.php:148 actions/profilesettings.php:232

 #: actions/register.php:227
 msgid "Location is too long (max 255 chars)."
 msgstr "Location is too long (max 255 chars)."
 
 #: actions/register.php:227
 msgid "Location is too long (max 255 chars)."
 msgstr "Location is too long (max 255 chars)."
 

-#: actions/apigroupcreate.php:291 actions/editgroup.php:215
+#: actions/apigroupcreate.php:243 actions/editgroup.php:215

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

-msgstr ""
+msgstr "Too many aliases! Maximum %d."

 
 

-#: actions/apigroupcreate.php:312 actions/editgroup.php:224
+#: actions/apigroupcreate.php:264 actions/editgroup.php:224

 #: actions/newgroup.php:168
 #: actions/newgroup.php:168

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

 msgid "Invalid alias: \"%s\""
 msgid "Invalid alias: \"%s\""

-msgstr "Invalid tag: \"%s\""
+msgstr "Invalid alias: \"%s\""

 
 

-#: actions/apigroupcreate.php:321 actions/editgroup.php:228
+#: actions/apigroupcreate.php:273 actions/editgroup.php:228

 #: actions/newgroup.php:172
 #: actions/newgroup.php:172

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

 msgid "Alias \"%s\" already in use. Try another one."
 msgid "Alias \"%s\" already in use. Try another one."

-msgstr "Nickname already in use. Try another one."
+msgstr "Alias \"%s\" already in use. Try another one."

 
 

-#: actions/apigroupcreate.php:334 actions/editgroup.php:234
+#: actions/apigroupcreate.php:286 actions/editgroup.php:234

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

-msgstr ""
+msgstr "Alias can't be the same as nickname."
+
+#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
+#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
+#: actions/apigroupshow.php:90 actions/apitimelinegroup.php:91
+msgid "Group not found!"
+msgstr "Group not found!"

 
 

-#: actions/apigroupjoin.php:110
+#: actions/apigroupjoin.php:110 actions/joingroup.php:90

 msgid "You are already a member of that group."
 msgstr "You are already a member of that group."
 
 #: actions/apigroupjoin.php:119 actions/joingroup.php:95 lib/command.php:221
 msgid "You have been blocked from that group by the admin."
 msgid "You are already a member of that group."
 msgstr "You are already a member of that group."
 
 #: actions/apigroupjoin.php:119 actions/joingroup.php:95 lib/command.php:221
 msgid "You have been blocked from that group by the admin."

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

 
 

-#: actions/apigroupjoin.php:138
+#: actions/apigroupjoin.php:138 actions/joingroup.php:124

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

-msgid "Could not join user %s to group %s."
-msgstr "Could not join user %s to group %s"
+msgid "Could not join user %1$s to group %2$s."
+msgstr "Could not join user %s to group %s."

 
 #: actions/apigroupleave.php:114
 
 #: actions/apigroupleave.php:114

-#, fuzzy

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

-msgstr "You are not a member of that group."
+msgstr "You are not a member of this group."

 
 

-#: actions/apigroupleave.php:124
+#: actions/apigroupleave.php:124 actions/leavegroup.php:119

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

-msgid "Could not remove user %s to group %s."
-msgstr "Could not remove user %s to group %s"
+msgid "Could not remove user %1$s from group %2$s."
+msgstr "Could not remove user %s to group %s."
+
+#: actions/apigrouplist.php:95
+#, php-format
+msgid "%s's groups"
+msgstr "%s's groups"

 
 #: actions/apigrouplistall.php:90 actions/usergroups.php:62
 #, php-format
 
 #: actions/apigrouplistall.php:90 actions/usergroups.php:62
 #, php-format


@@ -402,19 +417,9 @@ msgid "%s groups"
 msgstr "%s groups"
 
 #: actions/apigrouplistall.php:94
 msgstr "%s groups"
 
 #: actions/apigrouplistall.php:94

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

 msgid "groups on %s"
 msgid "groups on %s"

-msgstr "Group actions"
-
-#: actions/apigrouplist.php:95
-#, fuzzy, php-format
-msgid "%s's groups"
-msgstr "%s groups"
-
-#: actions/apigrouplist.php:103
-#, fuzzy, php-format
-msgid "Groups %s is a member of on %s."
-msgstr "Groups %s is a member of"
+msgstr "groups on %s"

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


@@ -424,17 +429,29 @@ msgstr "This method requires a POST or DELETE."
 msgid "You may not delete another user's status."
 msgstr "You may not delete another user's status."
 
 msgid "You may not delete another user's status."
 msgstr "You may not delete another user's status."
 

+#: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72
+#: actions/deletenotice.php:52 actions/shownotice.php:92
+msgid "No such notice."
+msgstr "No such notice."
+
+#: actions/apistatusesretweet.php:83
+msgid "Cannot repeat your own notice."
+msgstr "Cannot repeat your own notice."
+
+#: actions/apistatusesretweet.php:91
+msgid "Already repeated that notice."
+msgstr "Already repeated that notice."
+

 #: actions/apistatusesshow.php:138
 #: actions/apistatusesshow.php:138

-#, fuzzy

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

-msgstr "Avatar updated."
+msgstr "Status deleted."

 
 #: actions/apistatusesshow.php:144
 msgid "No status with that ID found."
 msgstr "No status with that ID found."
 
 #: actions/apistatusesupdate.php:157 actions/newnotice.php:155
 
 #: actions/apistatusesshow.php:144
 msgid "No status with that ID found."
 msgstr "No status with that ID found."
 
 #: actions/apistatusesupdate.php:157 actions/newnotice.php:155

-#: scripts/maildaemon.php:71
+#: lib/mailhandler.php:60

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


@@ -443,78 +460,95 @@ msgstr "That's too long. Max notice size is %d chars."
 msgid "Not found"
 msgstr "Not found"
 
 msgid "Not found"
 msgstr "Not found"
 

-#: actions/apistatusesupdate.php:227 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:221 actions/newnotice.php:178

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

-msgstr ""
+msgstr "Max notice size is %d chars, including attachment URL."

 
 #: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261
 
 #: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261

-#, fuzzy

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

-msgstr "Unsupported image file format."
+msgstr "Unsupported format."

 
 

-#: actions/apitimelinefavorites.php:107
-#, php-format
-msgid "%s / Favorites from %s"
+#: actions/apitimelinefavorites.php:108
+#, fuzzy, php-format
+msgid "%1$s / Favorites from %2$s"

 msgstr "%s / Favourites from %s"
 
 msgstr "%s / Favourites from %s"
 

-#: actions/apitimelinefavorites.php:119
-#, php-format
-msgid "%s updates favorited by %s / %s."
+#: actions/apitimelinefavorites.php:120
+#, fuzzy, php-format
+msgid "%1$s updates favorited by %2$s / %2$s."

 msgstr "%s updates favourited by %s / %s."
 
 msgstr "%s updates favourited by %s / %s."
 

-#: actions/apitimelinegroup.php:102 actions/apitimelineuser.php:117
+#: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118

 #: actions/grouprss.php:131 actions/userrss.php:90
 #, php-format
 msgid "%s timeline"
 msgstr "%s timeline"
 
 #: actions/grouprss.php:131 actions/userrss.php:90
 #, php-format
 msgid "%s timeline"
 msgstr "%s timeline"
 

-#: actions/apitimelinegroup.php:110 actions/apitimelineuser.php:125
+#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126

 #: actions/userrss.php:92
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "Updates from %1$s on %2$s!"
 
 #: actions/userrss.php:92
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "Updates from %1$s on %2$s!"
 

-#: actions/apitimelinementions.php:116
-#, fuzzy, php-format
+#: actions/apitimelinementions.php:117
+#, php-format

 msgid "%1$s / Updates mentioning %2$s"
 msgid "%1$s / Updates mentioning %2$s"

-msgstr "%1$s / Updates replying to %2$s"
+msgstr "%1$s / Updates mentioning %2$s"

 
 

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

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

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

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

-#: actions/apitimelinepublic.php:110 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:111 actions/publicrss.php:105

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

-#: actions/apitimelinetag.php:101 actions/tag.php:66
+#: actions/apitimelineretweetedbyme.php:112
+#, php-format
+msgid "Repeated by %s"
+msgstr "Repeated by %s"
+
+#: actions/apitimelineretweetedtome.php:111
+#, php-format
+msgid "Repeated to %s"
+msgstr "Repeated to %s"
+
+#: actions/apitimelineretweetsofme.php:112
+#, php-format
+msgid "Repeats of %s"
+msgstr "Repeats of %s"
+
+#: actions/apitimelinetag.php:102 actions/tag.php:66

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

-#: actions/apitimelinetag.php:107 actions/tagrss.php:64
-#, fuzzy, php-format
+#: actions/apitimelinetag.php:108 actions/tagrss.php:64
+#, php-format

 msgid "Updates tagged with %1$s on %2$s!"
 msgid "Updates tagged with %1$s on %2$s!"

-msgstr "Updates from %1$s on %2$s!"
+msgstr "Updates tagged with %1$s on %2$s!"

 
 #: actions/apiusershow.php:96
 msgid "Not found."
 msgstr "Not found."
 
 #: actions/attachment.php:73
 
 #: actions/apiusershow.php:96
 msgid "Not found."
 msgstr "Not found."
 
 #: actions/attachment.php:73

-#, fuzzy

 msgid "No such attachment."
 msgid "No such attachment."

-msgstr "No such document."
+msgstr "No such attachment."

 
 

-#: actions/avatarbynickname.php:59 actions/leavegroup.php:76
+#: actions/avatarbynickname.php:59 actions/blockedfromgroup.php:73
+#: actions/editgroup.php:84 actions/groupdesignsettings.php:84
+#: actions/grouplogo.php:86 actions/groupmembers.php:76
+#: actions/grouprss.php:91 actions/joingroup.php:76 actions/leavegroup.php:76
+#: actions/showgroup.php:121

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


@@ -532,188 +566,164 @@ msgid "Avatar"
 msgstr "Avatar"
 
 #: actions/avatarsettings.php:78
 msgstr "Avatar"
 
 #: actions/avatarsettings.php:78

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

 msgid "You can upload your personal avatar. The maximum file size is %s."
 msgid "You can upload your personal avatar. The maximum file size is %s."

-msgstr "You can upload your personal avatar."
+msgstr "You can upload your personal avatar. The maximum file size is %s."

 
 

-#: actions/avatarsettings.php:106 actions/avatarsettings.php:182
-#: actions/grouplogo.php:178 actions/remotesubscribe.php:191
-#: actions/userauthorization.php:72 actions/userrss.php:103
+#: actions/avatarsettings.php:106 actions/avatarsettings.php:185
+#: actions/remotesubscribe.php:191 actions/userauthorization.php:72
+#: actions/userrss.php:103

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

-#: actions/avatarsettings.php:119 actions/avatarsettings.php:194
+#: actions/avatarsettings.php:119 actions/avatarsettings.php:197

 #: actions/grouplogo.php:251
 msgid "Avatar settings"
 msgstr "Avatar settings"
 
 #: actions/grouplogo.php:251
 msgid "Avatar settings"
 msgstr "Avatar settings"
 

-#: actions/avatarsettings.php:126 actions/avatarsettings.php:202
+#: actions/avatarsettings.php:127 actions/avatarsettings.php:205

 #: actions/grouplogo.php:199 actions/grouplogo.php:259
 msgid "Original"
 msgstr "Original"
 
 #: actions/grouplogo.php:199 actions/grouplogo.php:259
 msgid "Original"
 msgstr "Original"
 

-#: actions/avatarsettings.php:141 actions/avatarsettings.php:214
+#: actions/avatarsettings.php:142 actions/avatarsettings.php:217

 #: actions/grouplogo.php:210 actions/grouplogo.php:271
 msgid "Preview"
 msgstr "Preview"
 
 #: actions/grouplogo.php:210 actions/grouplogo.php:271
 msgid "Preview"
 msgstr "Preview"
 

-#: actions/avatarsettings.php:148 lib/noticelist.php:522
+#: actions/avatarsettings.php:149 lib/deleteuserform.php:66
+#: lib/noticelist.php:611

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

-#: actions/avatarsettings.php:165 actions/grouplogo.php:233
+#: actions/avatarsettings.php:166 actions/grouplogo.php:233

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

-#: actions/avatarsettings.php:228 actions/grouplogo.php:286
+#: actions/avatarsettings.php:231 actions/grouplogo.php:286

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

-#: actions/avatarsettings.php:265 actions/block.php:64 actions/disfavor.php:74
-#: actions/emailsettings.php:237 actions/favor.php:75
-#: actions/groupblock.php:66 actions/grouplogo.php:309
+#: actions/avatarsettings.php:268 actions/deletenotice.php:157
+#: actions/disfavor.php:74 actions/emailsettings.php:238 actions/favor.php:75
+#: actions/geocode.php:50 actions/groupblock.php:66 actions/grouplogo.php:309

 #: actions/groupunblock.php:66 actions/imsettings.php:206
 #: actions/groupunblock.php:66 actions/imsettings.php:206

-#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66

 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/othersettings.php:145 actions/passwordsettings.php:138
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/othersettings.php:145 actions/passwordsettings.php:138

-#: actions/profilesettings.php:187 actions/recoverpassword.php:337
+#: actions/profilesettings.php:194 actions/recoverpassword.php:337

 #: actions/register.php:165 actions/remotesubscribe.php:77
 #: actions/register.php:165 actions/remotesubscribe.php:77

-#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46
-#: actions/tagother.php:166 actions/unblock.php:65 actions/unsubscribe.php:69
-#: actions/userauthorization.php:52 lib/designsettings.php:294
+#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/subscribe.php:46 actions/tagother.php:166
+#: actions/unsubscribe.php:69 actions/userauthorization.php:52
+#: lib/designsettings.php:294

 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/avatarsettings.php:277 actions/emailsettings.php:255
-#: actions/grouplogo.php:319 actions/imsettings.php:220
-#: actions/recoverpassword.php:44 actions/smssettings.php:248
-#: lib/designsettings.php:304
+#: actions/avatarsettings.php:281 actions/designadminpanel.php:103
+#: actions/emailsettings.php:256 actions/grouplogo.php:319
+#: actions/imsettings.php:220 actions/recoverpassword.php:44
+#: actions/smssettings.php:248 lib/designsettings.php:304

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

-#: actions/avatarsettings.php:322
+#: actions/avatarsettings.php:328

 msgid "Pick a square area of the image to be your avatar"
 msgstr "Pick a square area of the image to be your avatar"
 
 msgid "Pick a square area of the image to be your avatar"
 msgstr "Pick a square area of the image to be your avatar"
 

-#: actions/avatarsettings.php:337 actions/grouplogo.php:377
+#: actions/avatarsettings.php:343 actions/grouplogo.php:377

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

-#: actions/avatarsettings.php:360
+#: actions/avatarsettings.php:366

 msgid "Avatar updated."
 msgstr "Avatar updated."
 
 msgid "Avatar updated."
 msgstr "Avatar updated."
 

-#: actions/avatarsettings.php:363
+#: actions/avatarsettings.php:369

 msgid "Failed updating avatar."
 msgstr "Failed updating avatar."
 
 msgid "Failed updating avatar."
 msgstr "Failed updating avatar."
 

-#: actions/avatarsettings.php:387
-#, fuzzy
+#: actions/avatarsettings.php:393

 msgid "Avatar deleted."
 msgid "Avatar deleted."

-msgstr "Avatar updated."
-
-#: actions/blockedfromgroup.php:73 actions/editgroup.php:84
-#: actions/groupdesignsettings.php:84 actions/grouplogo.php:86
-#: actions/groupmembers.php:76 actions/grouprss.php:91
-#: actions/joingroup.php:76 actions/showgroup.php:121
-msgid "No nickname"
-msgstr "No nickname"
-
-#: actions/blockedfromgroup.php:80 actions/editgroup.php:96
-#: actions/groupbyid.php:83 actions/groupdesignsettings.php:97
-#: actions/grouplogo.php:99 actions/groupmembers.php:83
-#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137
-msgid "No such group"
-msgstr "No such group"
-
-#: actions/blockedfromgroup.php:90
-#, fuzzy, php-format
-msgid "%s blocked profiles"
-msgstr "User profile"
-
-#: actions/blockedfromgroup.php:93
-#, fuzzy, php-format
-msgid "%s blocked profiles, page %d"
-msgstr "%s and friends, page %d"
-
-#: actions/blockedfromgroup.php:108
-#, fuzzy
-msgid "A list of the users blocked from joining this group."
-msgstr "A list of the users in this group."
-
-#: actions/blockedfromgroup.php:281
-#, fuzzy
-msgid "Unblock user from group"
-msgstr "Unblock user failed."
-
-#: actions/blockedfromgroup.php:313 lib/unblockform.php:150
-msgid "Unblock"
-msgstr "Unblock"
+msgstr "Avatar deleted."

 
 

-#: actions/blockedfromgroup.php:313 lib/unblockform.php:120
-#: lib/unblockform.php:150
-msgid "Unblock this user"
-msgstr "Unblock this user"
-
-#: actions/block.php:59 actions/deletenotice.php:67 actions/disfavor.php:61
-#: actions/favor.php:62 actions/groupblock.php:61 actions/groupunblock.php:61
-#: actions/logout.php:69 actions/makeadmin.php:61 actions/newmessage.php:87
-#: actions/newnotice.php:89 actions/nudge.php:63 actions/subedit.php:31
-#: actions/subscribe.php:30 actions/unblock.php:60 actions/unsubscribe.php:52
-#: lib/settingsaction.php:72
-msgid "Not logged in."
-msgstr "Not logged in."
+#: actions/block.php:69
+msgid "You already blocked that user."
+msgstr "You already blocked that user."

 
 

-#: actions/block.php:69 actions/groupblock.php:71 actions/groupunblock.php:71
-#: actions/makeadmin.php:71 actions/subedit.php:46 actions/unblock.php:70
-msgid "No profile specified."
-msgstr "No profile specified."
-
-#: actions/block.php:74 actions/groupblock.php:76 actions/groupunblock.php:76
-#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unblock.php:75
-msgid "No profile with that ID."
-msgstr "No profile with that ID."
-
-#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160
+#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160

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

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

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

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

 
 

-#: actions/block.php:149 actions/deletenotice.php:145
-#: actions/groupblock.php:178
+#: actions/block.php:143 actions/deletenotice.php:145
+#: actions/deleteuser.php:147 actions/groupblock.php:178

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

-#: actions/block.php:149
-#, fuzzy
+#: actions/block.php:143 actions/deleteuser.php:147

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

-msgstr "Unblock this user"
+msgstr "Do not block this user"

 
 

-#: actions/block.php:150 actions/deletenotice.php:146
-#: actions/groupblock.php:179
+#: actions/block.php:144 actions/deletenotice.php:146
+#: actions/deleteuser.php:148 actions/groupblock.php:179
+#: lib/repeatform.php:132

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

-#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123
-#: lib/blockform.php:153
+#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80

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

-#: actions/block.php:165
-msgid "You have already blocked this user."
-msgstr "You have already blocked this user."
-
-#: actions/block.php:170
+#: actions/block.php:167

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

+#: actions/blockedfromgroup.php:80 actions/editgroup.php:96
+#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86
+#: actions/groupbyid.php:83 actions/groupdesignsettings.php:97
+#: actions/grouplogo.php:99 actions/groupmembers.php:83
+#: actions/grouprss.php:98 actions/groupunblock.php:86
+#: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86
+#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:260
+msgid "No such group."
+msgstr "No such group."
+
+#: actions/blockedfromgroup.php:90
+#, php-format
+msgid "%s blocked profiles"
+msgstr "%s blocked profiles"
+
+#: actions/blockedfromgroup.php:93
+#, fuzzy, php-format
+msgid "%1$s blocked profiles, page %2$d"
+msgstr "%s blocked profiles, page %d"
+
+#: actions/blockedfromgroup.php:108
+msgid "A list of the users blocked from joining this group."
+msgstr "A list of the users blocked from joining this group."
+
+#: actions/blockedfromgroup.php:281
+msgid "Unblock user from group"
+msgstr "Unblock user from group"
+
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:69
+msgid "Unblock"
+msgstr "Unblock"
+
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:80
+msgid "Unblock this user"
+msgstr "Unblock this user"
+

 #: actions/bookmarklet.php:50
 msgid "Post to "
 msgstr "Post to "
 #: actions/bookmarklet.php:50
 msgid "Post to "
 msgstr "Post to "


@@ -739,15 +749,15 @@ msgstr "Unrecognised address type %s"
 msgid "That address has already been confirmed."
 msgstr "That address has already been confirmed."
 
 msgid "That address has already been confirmed."
 msgstr "That address has already been confirmed."
 

-#: actions/confirmaddress.php:114 actions/emailsettings.php:295
-#: actions/emailsettings.php:426 actions/imsettings.php:258
+#: actions/confirmaddress.php:114 actions/emailsettings.php:296
+#: actions/emailsettings.php:427 actions/imsettings.php:258

 #: actions/imsettings.php:401 actions/othersettings.php:174
 #: actions/imsettings.php:401 actions/othersettings.php:174

-#: actions/profilesettings.php:276 actions/smssettings.php:278
+#: actions/profilesettings.php:283 actions/smssettings.php:278

 #: actions/smssettings.php:420
 msgid "Couldn't update user."
 msgstr "Couldn't update user."
 
 #: actions/smssettings.php:420
 msgid "Couldn't update user."
 msgstr "Couldn't update user."
 

-#: actions/confirmaddress.php:126 actions/emailsettings.php:390
+#: actions/confirmaddress.php:126 actions/emailsettings.php:391

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


@@ -766,20 +776,25 @@ msgid "Conversation"
 msgstr "Conversation"
 
 #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
 msgstr "Conversation"
 
 #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87

-#: lib/profileaction.php:206
+#: lib/profileaction.php:216 lib/searchgroupnav.php:82

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

-#: actions/deletenotice.php:52 actions/shownotice.php:92
-msgid "No such notice."
-msgstr "No such notice."
+#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
+#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
+#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
+#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30
+#: actions/tagother.php:33 actions/unsubscribe.php:52
+#: lib/adminpanelaction.php:72 lib/profileformaction.php:63
+#: lib/settingsaction.php:72
+msgid "Not logged in."
+msgstr "Not logged in."

 
 #: actions/deletenotice.php:71
 msgid "Can't delete this notice."
 msgstr "Can't delete this notice."
 
 #: actions/deletenotice.php:103
 
 #: actions/deletenotice.php:71
 msgid "Can't delete this notice."
 msgstr "Can't delete this notice."
 
 #: actions/deletenotice.php:103

-#, fuzzy

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


@@ -799,14 +814,153 @@ msgstr "Are you sure you want to delete this notice?"
 msgid "Do not delete this notice"
 msgstr "Do not delete this notice"
 
 msgid "Do not delete this notice"
 msgstr "Do not delete this notice"
 

-#: actions/deletenotice.php:146 lib/noticelist.php:522
+#: actions/deletenotice.php:146 lib/noticelist.php:611

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

-#: actions/deletenotice.php:157
+#: actions/deleteuser.php:67
+msgid "You cannot delete users."
+msgstr "You cannot delete users."
+
+#: actions/deleteuser.php:74
+msgid "You can only delete local users."
+msgstr "You can only delete local users."
+
+#: actions/deleteuser.php:110 actions/deleteuser.php:133
+msgid "Delete user"
+msgstr "Delete user"
+
+#: actions/deleteuser.php:135
+msgid ""
+"Are you sure you want to delete this user? This will clear all data about "
+"the user from the database, without a backup."
+msgstr ""
+"Are you sure you want to delete this user? This will clear all data about "
+"the user from the database, without a backup."
+
+#: actions/deleteuser.php:148 lib/deleteuserform.php:77
+msgid "Delete this user"
+msgstr "Delete this user"
+
+#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124
+#: lib/adminpanelaction.php:316 lib/groupnav.php:119
+msgid "Design"
+msgstr "Design"
+
+#: actions/designadminpanel.php:73
+msgid "Design settings for this StatusNet site."
+msgstr "Design settings for this StausNet site."
+
+#: actions/designadminpanel.php:275
+msgid "Invalid logo URL."
+msgstr "nvalid logo URL."
+
+#: actions/designadminpanel.php:279
+#, php-format
+msgid "Theme not available: %s"
+msgstr "Theme not available: %s"
+
+#: actions/designadminpanel.php:375
+msgid "Change logo"
+msgstr "Change logo"
+
+#: actions/designadminpanel.php:380
+msgid "Site logo"
+msgstr "Site logo"
+
+#: actions/designadminpanel.php:387

 #, fuzzy
 #, fuzzy

-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 "Change theme"
+msgstr "Change"
+
+#: actions/designadminpanel.php:404
+msgid "Site theme"
+msgstr "Site theme"
+
+#: actions/designadminpanel.php:405
+#, fuzzy
+msgid "Theme for the site."
+msgstr "Logout from the site"
+
+#: actions/designadminpanel.php:417 lib/designsettings.php:101
+msgid "Change background image"
+msgstr "Change background image"
+
+#: actions/designadminpanel.php:422 actions/designadminpanel.php:497
+#: lib/designsettings.php:178
+msgid "Background"
+msgstr "Background"
+
+#: actions/designadminpanel.php:427
+#, fuzzy, php-format
+msgid ""
+"You can upload a background image for the site. The maximum file size is %1"
+"$s."
+msgstr "You can upload a logo image for your group."
+
+#: actions/designadminpanel.php:457 lib/designsettings.php:139
+msgid "On"
+msgstr "On"
+
+#: actions/designadminpanel.php:473 lib/designsettings.php:155
+msgid "Off"
+msgstr "Off"
+
+#: actions/designadminpanel.php:474 lib/designsettings.php:156
+msgid "Turn background image on or off."
+msgstr "Turn background image on or off."
+
+#: actions/designadminpanel.php:479 lib/designsettings.php:161
+msgid "Tile background image"
+msgstr "Tile background image"
+
+#: actions/designadminpanel.php:488 lib/designsettings.php:170
+msgid "Change colours"
+msgstr "Change colours"
+
+#: actions/designadminpanel.php:510 lib/designsettings.php:191
+#, fuzzy
+msgid "Content"
+msgstr "Connect"
+
+#: actions/designadminpanel.php:523 lib/designsettings.php:204
+#, fuzzy
+msgid "Sidebar"
+msgstr "Search"
+
+#: actions/designadminpanel.php:536 lib/designsettings.php:217
+msgid "Text"
+msgstr "Text"
+
+#: actions/designadminpanel.php:549 lib/designsettings.php:230
+msgid "Links"
+msgstr "Links"
+
+#: actions/designadminpanel.php:577 lib/designsettings.php:247
+msgid "Use defaults"
+msgstr "Use defaults"
+
+#: actions/designadminpanel.php:578 lib/designsettings.php:248
+msgid "Restore default designs"
+msgstr "Restore default designs"
+
+#: actions/designadminpanel.php:584 lib/designsettings.php:254
+msgid "Reset back to default"
+msgstr "Reset back to default"
+
+#: actions/designadminpanel.php:586 actions/emailsettings.php:195
+#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/pathsadminpanel.php:324 actions/profilesettings.php:174
+#: actions/siteadminpanel.php:388 actions/smssettings.php:181
+#: actions/subscriptions.php:203 actions/tagother.php:154
+#: actions/useradminpanel.php:313 lib/designsettings.php:256
+#: lib/groupeditform.php:202
+msgid "Save"
+msgstr "Save"
+
+#: actions/designadminpanel.php:587 lib/designsettings.php:257
+msgid "Save design"
+msgstr "Save design"

 
 #: actions/disfavor.php:81
 msgid "This notice is not a favorite!"
 
 #: actions/disfavor.php:81
 msgid "This notice is not a favorite!"


@@ -831,7 +985,8 @@ msgstr "You must be logged in to create a group."
 
 #: actions/editgroup.php:103 actions/editgroup.php:168
 #: actions/groupdesignsettings.php:104 actions/grouplogo.php:106
 
 #: actions/editgroup.php:103 actions/editgroup.php:168
 #: actions/groupdesignsettings.php:104 actions/grouplogo.php:106

-msgid "You must be an admin to edit the group"
+#, fuzzy
+msgid "You must be an admin to edit the group."

 msgstr "You must be an admin to edit the group"
 
 #: actions/editgroup.php:154
 msgstr "You must be an admin to edit the group"
 
 #: actions/editgroup.php:154


@@ -839,20 +994,25 @@ msgid "Use this form to edit the group."
 msgstr "Use this form to edit the group."
 
 #: actions/editgroup.php:201 actions/newgroup.php:145
 msgstr "Use this form to edit the group."
 
 #: actions/editgroup.php:201 actions/newgroup.php:145

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

 msgid "description is too long (max %d chars)."
 msgid "description is too long (max %d chars)."

-msgstr "description is too long (max 140 chars)."
+msgstr "description is too long (max %d chars)."

 
 #: actions/editgroup.php:253
 msgid "Could not update group."
 msgstr "Could not update group."
 
 
 #: actions/editgroup.php:253
 msgid "Could not update group."
 msgstr "Could not update group."
 

+#: actions/editgroup.php:259 classes/User_group.php:390
+msgid "Could not create aliases."
+msgstr "Could not create aliases"
+

 #: actions/editgroup.php:269
 msgid "Options saved."
 msgstr "Options saved."
 
 #: actions/emailsettings.php:60
 #: actions/editgroup.php:269
 msgid "Options saved."
 msgstr "Options saved."
 
 #: actions/emailsettings.php:60

-msgid "Email Settings"
+#, fuzzy
+msgid "Email settings"

 msgstr "E-mail Settings"
 
 #: actions/emailsettings.php:71
 msgstr "E-mail Settings"
 
 #: actions/emailsettings.php:71


@@ -889,8 +1049,9 @@ msgid "Cancel"
 msgstr "Cancel"
 
 #: actions/emailsettings.php:121
 msgstr "Cancel"
 
 #: actions/emailsettings.php:121

-msgid "Email Address"
-msgstr "E-mail Address"
+#, fuzzy
+msgid "Email address"
+msgstr "E-mail addresses"

 
 #: actions/emailsettings.php:123
 msgid "Email address, like \"UserName@example.org\""
 
 #: actions/emailsettings.php:123
 msgid "Email address, like \"UserName@example.org\""


@@ -950,45 +1111,38 @@ msgstr "I want to post notices by e-mail."
 msgid "Publish a MicroID for my email address."
 msgstr "Publish a MicroID for my e-mail address."
 
 msgid "Publish a MicroID for my email address."
 msgstr "Publish a MicroID for my e-mail address."
 

-#: actions/emailsettings.php:195 actions/imsettings.php:163
-#: actions/othersettings.php:126 actions/profilesettings.php:167
-#: actions/smssettings.php:181 actions/subscriptions.php:203
-#: actions/tagother.php:154 lib/designsettings.php:256
-#: lib/groupeditform.php:202
-msgid "Save"
-msgstr "Save"
-
-#: actions/emailsettings.php:301 actions/imsettings.php:264
+#: actions/emailsettings.php:302 actions/imsettings.php:264

 #: actions/othersettings.php:180 actions/smssettings.php:284
 msgid "Preferences saved."
 msgstr "Preferences saved."
 
 #: actions/othersettings.php:180 actions/smssettings.php:284
 msgid "Preferences saved."
 msgstr "Preferences saved."
 

-#: actions/emailsettings.php:319
+#: actions/emailsettings.php:320

 msgid "No email address."
 msgstr "No e-mail address."
 
 msgid "No email address."
 msgstr "No e-mail address."
 

-#: actions/emailsettings.php:326
+#: actions/emailsettings.php:327

 msgid "Cannot normalize that email address"
 msgstr "Cannot normalise that e-mail address"
 
 msgid "Cannot normalize that email address"
 msgstr "Cannot normalise that e-mail address"
 

-#: actions/emailsettings.php:330
-msgid "Not a valid email address"
+#: actions/emailsettings.php:331 actions/register.php:201
+#: actions/siteadminpanel.php:157
+msgid "Not a valid email address."

 msgstr "Not a valid e-mail address."
 
 msgstr "Not a valid e-mail address."
 

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

 msgid "That is already your email address."
 msgstr "That is already your e-mail address."
 
 msgid "That is already your email address."
 msgstr "That is already your e-mail address."
 

-#: actions/emailsettings.php:336
+#: actions/emailsettings.php:337

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

-#: actions/emailsettings.php:352 actions/imsettings.php:317
+#: actions/emailsettings.php:353 actions/imsettings.php:317

 #: actions/smssettings.php:337
 msgid "Couldn't insert confirmation code."
 msgstr "Couldn't insert confirmation code."
 
 #: actions/smssettings.php:337
 msgid "Couldn't insert confirmation code."
 msgstr "Couldn't insert confirmation code."
 

-#: actions/emailsettings.php:358
+#: actions/emailsettings.php:359

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


@@ -996,47 +1150,55 @@ msgstr ""
 "A confirmation code was sent to the e-mail address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
 
 "A confirmation code was sent to the e-mail address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
 

-#: actions/emailsettings.php:378 actions/imsettings.php:351
+#: actions/emailsettings.php:379 actions/imsettings.php:351

 #: actions/smssettings.php:370
 msgid "No pending confirmation to cancel."
 msgstr "No pending confirmation to cancel."
 
 #: actions/smssettings.php:370
 msgid "No pending confirmation to cancel."
 msgstr "No pending confirmation to cancel."
 

-#: actions/emailsettings.php:382 actions/imsettings.php:355
+#: actions/emailsettings.php:383 actions/imsettings.php:355

 msgid "That is the wrong IM address."
 msgstr "That is the wrong IM address."
 
 msgid "That is the wrong IM address."
 msgstr "That is the wrong IM address."
 

-#: actions/emailsettings.php:394 actions/imsettings.php:367
+#: actions/emailsettings.php:395 actions/imsettings.php:367

 #: actions/smssettings.php:386
 msgid "Confirmation cancelled."
 msgstr "Confirmation cancelled."
 
 #: actions/smssettings.php:386
 msgid "Confirmation cancelled."
 msgstr "Confirmation cancelled."
 

-#: actions/emailsettings.php:412
+#: actions/emailsettings.php:413

 msgid "That is not your email address."
 msgstr "That is not your e-mail address."
 
 msgid "That is not your email address."
 msgstr "That is not your e-mail address."
 

-#: actions/emailsettings.php:431 actions/imsettings.php:408
+#: actions/emailsettings.php:432 actions/imsettings.php:408

 #: actions/smssettings.php:425
 msgid "The address was removed."
 msgstr "The address was removed."
 
 #: actions/smssettings.php:425
 msgid "The address was removed."
 msgstr "The address was removed."
 

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

 msgid "No incoming email address."
 msgstr "No incoming e-mail address."
 
 msgid "No incoming email address."
 msgstr "No incoming e-mail address."
 

-#: actions/emailsettings.php:455 actions/emailsettings.php:477
+#: actions/emailsettings.php:456 actions/emailsettings.php:478

 #: actions/smssettings.php:528 actions/smssettings.php:552
 msgid "Couldn't update user record."
 msgstr "Couldn't update user record."
 
 #: actions/smssettings.php:528 actions/smssettings.php:552
 msgid "Couldn't update user record."
 msgstr "Couldn't update user record."
 

-#: actions/emailsettings.php:458 actions/smssettings.php:531
+#: actions/emailsettings.php:459 actions/smssettings.php:531

 msgid "Incoming email address removed."
 msgstr "Incoming e-mail address removed."
 
 msgid "Incoming email address removed."
 msgstr "Incoming e-mail address removed."
 

-#: actions/emailsettings.php:480 actions/smssettings.php:555
+#: actions/emailsettings.php:481 actions/smssettings.php:555

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

-#: actions/favorited.php:65 lib/popularnoticesection.php:87
+#: actions/favor.php:79
+msgid "This notice is already a favorite!"
+msgstr "This notice is already a favourite!"
+
+#: actions/favor.php:92 lib/disfavorform.php:140
+msgid "Disfavor favorite"
+msgstr "Disfavor favourite"
+
+#: actions/favorited.php:65 lib/popularnoticesection.php:88

 #: lib/publicgroupnav.php:93
 msgid "Popular notices"
 msgstr "Popular notices"
 #: lib/publicgroupnav.php:93
 msgid "Popular notices"
 msgstr "Popular notices"


@@ -1083,14 +1245,6 @@ msgstr "%s's favourite notices"
 msgid "Updates favored by %1$s on %2$s!"
 msgstr "Updates favoured by %1$s on %2$s!"
 
 msgid "Updates favored by %1$s on %2$s!"
 msgstr "Updates favoured by %1$s on %2$s!"
 

-#: actions/favor.php:79
-msgid "This notice is already a favorite!"
-msgstr "This notice is already a favourite!"
-
-#: actions/favor.php:92 lib/disfavorform.php:140
-msgid "Disfavor favorite"
-msgstr "Disfavor favourite"
-

 #: actions/featured.php:69 lib/featureduserssection.php:87
 #: lib/publicgroupnav.php:89
 msgid "Featured users"
 #: actions/featured.php:69 lib/featureduserssection.php:87
 #: lib/publicgroupnav.php:89
 msgid "Featured users"


@@ -1102,32 +1256,35 @@ msgid "Featured users, page %d"
 msgstr "Featured users, page %d"
 
 #: actions/featured.php:99
 msgstr "Featured users, page %d"
 
 #: actions/featured.php:99

-#, php-format
-msgid "A selection of some of the great users on %s"
+#, fuzzy, php-format
+msgid "A selection of some great users on %s"

 msgstr "A selection of some of the great users on %s"
 
 #: actions/file.php:34
 msgstr "A selection of some of the great users on %s"
 
 #: actions/file.php:34

-msgid "No notice id"
-msgstr "No notice id"
+#, fuzzy
+msgid "No notice ID."
+msgstr "No notice."

 
 #: actions/file.php:38
 
 #: actions/file.php:38

-msgid "No notice"
+#, fuzzy
+msgid "No notice."

 msgstr "No notice."
 
 #: actions/file.php:42
 msgstr "No notice."
 
 #: actions/file.php:42

-msgid "No attachments"
-msgstr ""
+#, fuzzy
+msgid "No attachments."
+msgstr "No such document."

 
 #: actions/file.php:51
 
 #: actions/file.php:51

-msgid "No uploaded attachments"
-msgstr ""
+#, fuzzy
+msgid "No uploaded attachments."
+msgstr "No such document."

 
 #: actions/finishremotesubscribe.php:69
 msgid "Not expecting this response!"
 msgstr "Not expecting this response!"
 
 #: actions/finishremotesubscribe.php:80
 
 #: actions/finishremotesubscribe.php:69
 msgid "Not expecting this response!"
 msgstr "Not expecting this response!"
 
 #: actions/finishremotesubscribe.php:80

-#, fuzzy

 msgid "User being listened to does not exist."
 msgstr "User being listened to doesn't exist."
 
 msgid "User being listened to does not exist."
 msgstr "User being listened to doesn't exist."
 


@@ -1135,44 +1292,49 @@ msgstr "User being listened to doesn't exist."
 msgid "You can use the local subscription!"
 msgstr "You can use the local subscription!"
 
 msgid "You can use the local subscription!"
 msgstr "You can use the local subscription!"
 

-#: actions/finishremotesubscribe.php:96
+#: actions/finishremotesubscribe.php:99

 msgid "That user has blocked you from subscribing."
 msgstr "That user has blocked you from subscribing."
 
 msgid "That user has blocked you from subscribing."
 msgstr "That user has blocked you from subscribing."
 

-#: actions/finishremotesubscribe.php:106
+#: actions/finishremotesubscribe.php:110

 msgid "You are not authorized."
 msgstr "You are not authorised."
 
 msgid "You are not authorized."
 msgstr "You are not authorised."
 

-#: actions/finishremotesubscribe.php:109
-#, fuzzy
+#: actions/finishremotesubscribe.php:113

 msgid "Could not convert request token to access token."
 msgstr "Couldn't convert request tokens to access tokens."
 
 msgid "Could not convert request token to access token."
 msgstr "Couldn't convert request tokens to access tokens."
 

-#: actions/finishremotesubscribe.php:114
+#: actions/finishremotesubscribe.php:118

 #, fuzzy
 msgid "Remote service uses unknown version of OMB protocol."
 msgstr "Unknown version of OMB protocol."
 
 #, fuzzy
 msgid "Remote service uses unknown version of OMB protocol."
 msgstr "Unknown version of OMB protocol."
 

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

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

-#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86
-#: actions/groupunblock.php:86 actions/leavegroup.php:83
-#: actions/makeadmin.php:86 lib/command.php:212 lib/command.php:263
-msgid "No such group."
-msgstr "No such group."
-
-#: actions/getfile.php:75
+#: actions/getfile.php:79

 #, fuzzy
 msgid "No such file."
 msgstr "No such notice."
 
 #, fuzzy
 msgid "No such file."
 msgstr "No such notice."
 

-#: actions/getfile.php:79
+#: actions/getfile.php:83

 #, fuzzy
 msgid "Cannot read file."
 msgstr "Lost our file."
 
 #, fuzzy
 msgid "Cannot read file."
 msgstr "Lost our file."
 

+#: actions/groupblock.php:71 actions/groupunblock.php:71
+#: actions/makeadmin.php:71 actions/subedit.php:46
+#: lib/profileformaction.php:70
+msgid "No profile specified."
+msgstr "No profile specified."
+
+#: actions/groupblock.php:76 actions/groupunblock.php:76
+#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
+#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+msgid "No profile with that ID."
+msgstr "No profile with that ID."
+

 #: actions/groupblock.php:81 actions/groupunblock.php:81
 #: actions/makeadmin.php:81
 #, fuzzy
 #: actions/groupblock.php:81 actions/groupunblock.php:81
 #: actions/makeadmin.php:81
 #, fuzzy


@@ -1181,7 +1343,7 @@ msgstr "No profile specified."
 
 #: actions/groupblock.php:91
 msgid "Only an admin can block group members."
 
 #: actions/groupblock.php:91
 msgid "Only an admin can block group members."

-msgstr ""
+msgstr "Only an admin can block group members."

 
 #: actions/groupblock.php:95
 msgid "User is already blocked from group."
 
 #: actions/groupblock.php:95
 msgid "User is already blocked from group."


@@ -1197,28 +1359,31 @@ msgid "Block user from group"
 msgstr "Block user"
 
 #: actions/groupblock.php:162
 msgstr "Block user"
 
 #: actions/groupblock.php:162

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

 msgid ""
 msgid ""

+"Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They "
+"will be removed from the group, unable to post, and unable to subscribe to "
+"the group in the future."
+msgstr ""

 "Are you sure you want to block user \"%s\" from the group \"%s\"? They will "
 "be removed from the group, unable to post, and unable to subscribe to the "
 "group in the future."
 "Are you sure you want to block user \"%s\" from the group \"%s\"? They will "
 "be removed from the group, unable to post, and unable to subscribe to the "
 "group in the future."

-msgstr ""

 
 #: actions/groupblock.php:178
 msgid "Do not block this user from this group"
 msgstr "Do not block this user from this group"
 
 #: actions/groupblock.php:179
 
 #: actions/groupblock.php:178
 msgid "Do not block this user from this group"
 msgstr "Do not block this user from this group"
 
 #: actions/groupblock.php:179

-#, fuzzy

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

-msgstr "A list of the users in this group."
+msgstr "Block this user from this group"

 
 #: actions/groupblock.php:196
 msgid "Database error blocking user from group."
 
 #: actions/groupblock.php:196
 msgid "Database error blocking user from group."

-msgstr ""
+msgstr "Database error blocking user from group."

 
 

-#: actions/groupbyid.php:74
-msgid "No ID"
+#: actions/groupbyid.php:74 actions/userbyid.php:70
+#, fuzzy
+msgid "No ID."

 msgstr "No ID"
 
 #: actions/groupdesignsettings.php:68
 msgstr "No ID"
 
 #: actions/groupdesignsettings.php:68


@@ -1236,21 +1401,16 @@ msgid ""
 "Customize the way your group looks with a background image and a colour "
 "palette of your choice."
 msgstr ""
 "Customize the way your group looks with a background image and a colour "
 "palette of your choice."
 msgstr ""

+"Customise the way your group looks with a background image and a colour "
+"palette of your choice."

 
 

-#: actions/groupdesignsettings.php:262 actions/userdesignsettings.php:186
-#: lib/designsettings.php:434 lib/designsettings.php:464
+#: actions/groupdesignsettings.php:263 actions/userdesignsettings.php:186
+#: lib/designsettings.php:391 lib/designsettings.php:413

 #, fuzzy
 msgid "Couldn't update your design."
 msgstr "Couldn't update user."
 
 #, fuzzy
 msgid "Couldn't update your design."
 msgstr "Couldn't update user."
 

-#: actions/groupdesignsettings.php:286 actions/groupdesignsettings.php:296
-#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
-#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
-#, fuzzy
-msgid "Unable to save your design settings!"
-msgstr "Unable to save your Twitter settings!"
-
-#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:231
+#: actions/groupdesignsettings.php:308 actions/userdesignsettings.php:231

 #, fuzzy
 msgid "Design preferences saved."
 msgstr "Sync preferences saved."
 #, fuzzy
 msgid "Design preferences saved."
 msgstr "Sync preferences saved."


@@ -1265,6 +1425,11 @@ msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
 msgstr "You can upload a logo image for your group."
 
 "You can upload a logo image for your group. The maximum file size is %s."
 msgstr "You can upload a logo image for your group."
 

+#: actions/grouplogo.php:178
+#, fuzzy
+msgid "User without matching profile."
+msgstr "User without matching profile"
+

 #: actions/grouplogo.php:362
 #, fuzzy
 msgid "Pick a square area of the image to be the logo."
 #: actions/grouplogo.php:362
 #, fuzzy
 msgid "Pick a square area of the image to be the logo."


@@ -1284,19 +1449,19 @@ msgid "%s group members"
 msgstr "%s group members"
 
 #: actions/groupmembers.php:96
 msgstr "%s group members"
 
 #: actions/groupmembers.php:96

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

 msgstr "%s group members, page %d"
 
 #: actions/groupmembers.php:111
 msgid "A list of the users in this group."
 msgstr "A list of the users in this group."
 
 msgstr "%s group members, page %d"
 
 #: actions/groupmembers.php:111
 msgid "A list of the users in this group."
 msgstr "A list of the users in this group."
 

-#: actions/groupmembers.php:175 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:442 lib/groupnav.php:107

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

-#: actions/groupmembers.php:346 lib/blockform.php:153
+#: actions/groupmembers.php:346 lib/blockform.php:69

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


@@ -1319,6 +1484,30 @@ msgstr ""
 msgid "Updates from members of %1$s on %2$s!"
 msgstr "Updates from %1$s on %2$s!"
 
 msgid "Updates from members of %1$s on %2$s!"
 msgstr "Updates from %1$s on %2$s!"
 

+#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+msgid "Groups"
+msgstr "Groups"
+
+#: actions/groups.php:64
+#, php-format
+msgid "Groups, page %d"
+msgstr "Groups, page %d"
+
+#: actions/groups.php:90
+#, php-format
+msgid ""
+"%%%%site.name%%%% groups let you find and talk with people of similar "
+"interests. After you join a group you can send messages to all other members "
+"using the syntax \"!groupname\". Don't see a group you like? Try [searching "
+"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
+"%%%%)"
+msgstr ""
+
+#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
+msgid "Create a new group"
+msgstr "Create a new group"
+

 #: actions/groupsearch.php:52
 #, fuzzy, php-format
 msgid ""
 #: actions/groupsearch.php:52
 #, fuzzy, php-format
 msgid ""


@@ -1352,45 +1541,21 @@ msgid ""
 "action.newgroup%%) yourself!"
 msgstr ""
 
 "action.newgroup%%) yourself!"
 msgstr ""
 

-#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
-#: lib/subgroupnav.php:98
-msgid "Groups"
-msgstr "Groups"
-
-#: actions/groups.php:64
-#, php-format
-msgid "Groups, page %d"
-msgstr "Groups, page %d"
-
-#: actions/groups.php:90
-#, php-format
-msgid ""
-"%%%%site.name%%%% groups let you find and talk with people of similar "
-"interests. After you join a group you can send messages to all other members "
-"using the syntax \"!groupname\". Don't see a group you like? Try [searching "
-"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
-"%%%%)"
-msgstr ""
-
-#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
-msgid "Create a new group"
-msgstr "Create a new group"
-

 #: actions/groupunblock.php:91
 msgid "Only an admin can unblock group members."
 msgstr ""
 
 #: actions/groupunblock.php:95
 #: actions/groupunblock.php:91
 msgid "Only an admin can unblock group members."
 msgstr ""
 
 #: actions/groupunblock.php:95

-#, fuzzy

 msgid "User is not blocked from group."
 msgid "User is not blocked from group."

-msgstr "User has blocked you."
+msgstr "User is not blocked from group."

 
 

-#: actions/groupunblock.php:128 actions/unblock.php:108
+#: actions/groupunblock.php:128 actions/unblock.php:86

 msgid "Error removing the block."
 msgstr "Error removing the block."
 
 #: actions/imsettings.php:59
 msgid "Error removing the block."
 msgstr "Error removing the block."
 
 #: actions/imsettings.php:59

-msgid "IM Settings"
+#, fuzzy
+msgid "IM settings"

 msgstr "I.M. Settings"
 
 #: actions/imsettings.php:70
 msgstr "I.M. Settings"
 
 #: actions/imsettings.php:70


@@ -1403,16 +1568,15 @@ msgstr ""
 "doc.im%%). Configure your address and settings below."
 
 #: actions/imsettings.php:89
 "doc.im%%). Configure your address and settings below."
 
 #: actions/imsettings.php:89

-#, fuzzy

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

-msgstr "This page is not available in a "
+msgstr "IM is not available."

 
 #: actions/imsettings.php:106
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "Current confirmed Jabber/GTalk address."
 
 #: actions/imsettings.php:114
 
 #: actions/imsettings.php:106
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "Current confirmed Jabber/GTalk address."
 
 #: actions/imsettings.php:114

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

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


@@ -1421,7 +1585,8 @@ msgstr ""
 "message with further instructions. (Did you add %s to your buddy list?)"
 
 #: actions/imsettings.php:124
 "message with further instructions. (Did you add %s to your buddy list?)"
 
 #: actions/imsettings.php:124

-msgid "IM Address"
+#, fuzzy
+msgid "IM address"

 msgstr "I.M. Address"
 
 #: actions/imsettings.php:126
 msgstr "I.M. Address"
 
 #: actions/imsettings.php:126


@@ -1483,11 +1648,6 @@ msgstr ""
 msgid "That is not your Jabber ID."
 msgstr "That is not your Jabber ID."
 
 msgid "That is not your Jabber ID."
 msgstr "That is not your Jabber ID."
 

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

 #: actions/inbox.php:62
 #, php-format
 msgid "Inbox for %s"
 #: actions/inbox.php:62
 #, php-format
 msgid "Inbox for %s"


@@ -1523,10 +1683,10 @@ msgstr "Invite new users"
 msgid "You are already subscribed to these users:"
 msgstr "You are already subscribed to these users:"
 
 msgid "You are already subscribed to these users:"
 msgstr "You are already subscribed to these users:"
 

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

 #, php-format
 #, php-format

-msgid "%s (%s)"
-msgstr "%s (%s)"
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"

 
 #: actions/invite.php:136
 msgid ""
 
 #: actions/invite.php:136
 msgid ""


@@ -1568,7 +1728,7 @@ msgstr "Personal message"
 msgid "Optionally add a personal message to the invitation."
 msgstr "Optionally add a personal message to the invitation."
 
 msgid "Optionally add a personal message to the invitation."
 msgstr "Optionally add a personal message to the invitation."
 

-#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:208
+#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:237

 msgid "Send"
 msgstr "Send"
 
 msgid "Send"
 msgstr "Send"
 


@@ -1638,93 +1798,70 @@ 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:90 lib/command.php:217
-msgid "You are already a member of that group"
-msgstr "You are already a member of that group"
-
-#: actions/joingroup.php:128 lib/command.php:234
-#, php-format
-msgid "Could not join user %s to group %s"
-msgstr "Could not join user %s to group %s"
-
-#: actions/joingroup.php:135 lib/command.php:239
-#, php-format
-msgid "%s joined group %s"
+#: actions/joingroup.php:131
+#, fuzzy, php-format
+msgid "%1$s joined group %2$s"

 msgstr "%s joined group %s"
 
 #: actions/leavegroup.php:60
 msgid "You must be logged in to leave a group."
 msgstr "You must be logged in to leave a group."
 
 msgstr "%s joined group %s"
 
 #: actions/leavegroup.php:60
 msgid "You must be logged in to leave a group."
 msgstr "You must be logged in to leave a group."
 

-#: actions/leavegroup.php:90 lib/command.php:268
+#: actions/leavegroup.php:90 lib/command.php:265

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

-#: actions/leavegroup.php:119 lib/command.php:278
-msgid "Could not find membership record."
-msgstr "Could not find membership record."
-
-#: actions/leavegroup.php:127 lib/command.php:284
-#, php-format
-msgid "Could not remove user %s to group %s"
-msgstr "Could not remove user %s to group %s"
-
-#: actions/leavegroup.php:134 lib/command.php:289
-#, php-format
-msgid "%s left group %s"
+#: actions/leavegroup.php:127
+#, fuzzy, php-format
+msgid "%1$s left group %2$s"

 msgstr "%s left group %s"
 
 msgstr "%s left group %s"
 

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

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

-#: actions/login.php:110 actions/login.php:120
-#, fuzzy
-msgid "Invalid or expired token."
-msgstr "Invalid notice content"
-
-#: actions/login.php:143
+#: actions/login.php:126

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

-#: actions/login.php:149 actions/recoverpassword.php:375
-#: actions/register.php:248
-msgid "Error setting user."
-msgstr "Error setting user."
+#: actions/login.php:132 actions/otp.php:120
+#, fuzzy
+msgid "Error setting user. You are probably not authorized."
+msgstr "You are not authorised."

 
 

-#: actions/login.php:204 actions/login.php:257 lib/action.php:453
+#: actions/login.php:188 actions/login.php:241 lib/action.php:460

 #: lib/logingroupnav.php:79
 msgid "Login"
 msgstr "Login"
 
 #: lib/logingroupnav.php:79
 msgid "Login"
 msgstr "Login"
 

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

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

-#: actions/login.php:246 actions/profilesettings.php:106
-#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
+#: actions/login.php:230 actions/profilesettings.php:106
+#: actions/register.php:424 actions/showgroup.php:236 actions/tagother.php:94

 #: lib/groupeditform.php:152 lib/userprofile.php:131
 msgid "Nickname"
 msgstr "Nickname"
 
 #: lib/groupeditform.php:152 lib/userprofile.php:131
 msgid "Nickname"
 msgstr "Nickname"
 

-#: actions/login.php:249 actions/register.php:428
+#: actions/login.php:233 actions/register.php:429

 #: lib/accountsettingsaction.php:116
 msgid "Password"
 msgstr "Password"
 
 #: lib/accountsettingsaction.php:116
 msgid "Password"
 msgstr "Password"
 

-#: actions/login.php:252 actions/register.php:477
+#: actions/login.php:236 actions/register.php:478

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

-#: actions/login.php:253 actions/register.php:479
+#: actions/login.php:237 actions/register.php:480

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

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

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

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

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


@@ -1732,7 +1869,7 @@ msgstr ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
 
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
 

-#: actions/login.php:286
+#: actions/login.php:270

 #, php-format
 msgid ""
 "Login with your username and password. Don't have a username yet? [Register]"
 #, php-format
 msgid ""
 "Login with your username and password. Don't have a username yet? [Register]"


@@ -1746,19 +1883,19 @@ msgid "Only an admin can make another user an admin."
 msgstr ""
 
 #: actions/makeadmin.php:95
 msgstr ""
 
 #: actions/makeadmin.php:95

-#, php-format
-msgid "%s is already an admin for group \"%s\"."
-msgstr ""
+#, fuzzy, php-format
+msgid "%1$s is already an admin for group \"%2$s\"."
+msgstr "User is already blocked from group."

 
 #: actions/makeadmin.php:132
 
 #: actions/makeadmin.php:132

-#, php-format
-msgid "Can't get membership record for %s in group %s"
-msgstr ""
+#, fuzzy, php-format
+msgid "Can't get membership record for %1$s in group %2$s."
+msgstr "Could not remove user %s to group %s"

 
 #: actions/makeadmin.php:145
 
 #: actions/makeadmin.php:145

-#, php-format
-msgid "Can't make %s an admin for group %s"
-msgstr ""
+#, fuzzy, php-format
+msgid "Can't make %1$s an admin for group %2$s."
+msgstr "You must be an admin to edit the group"

 
 #: actions/microsummary.php:69
 msgid "No current status"
 
 #: actions/microsummary.php:69
 msgid "No current status"


@@ -1776,12 +1913,12 @@ msgstr "Use this form to create a new group."
 msgid "New message"
 msgstr "New message"
 
 msgid "New message"
 msgstr "New message"
 

-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:367
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358

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

-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351
-#: lib/command.php:424
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342
+#: lib/command.php:475

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


@@ -1789,23 +1926,22 @@ msgstr "No content!"
 msgid "No recipient specified."
 msgstr "No recipient specified."
 
 msgid "No recipient specified."
 msgstr "No recipient specified."
 

-#: actions/newmessage.php:164 lib/command.php:370
+#: actions/newmessage.php:164 lib/command.php:361

 msgid ""
 "Don't 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/newmessage.php:181
 msgid ""
 "Don't 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/newmessage.php:181

-#, fuzzy

 msgid "Message sent"
 msgid "Message sent"

-msgstr "Message"
+msgstr "Message sent"

 
 

-#: actions/newmessage.php:185 lib/command.php:375
-#, php-format
-msgid "Direct message to %s sent"
+#: actions/newmessage.php:185
+#, fuzzy, php-format
+msgid "Direct message to %s sent."

 msgstr "Direct message to %s sent"
 
 msgstr "Direct message to %s sent"
 

-#: actions/newmessage.php:210 actions/newnotice.php:233 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170

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


@@ -1813,7 +1949,7 @@ msgstr "Ajax Error"
 msgid "New notice"
 msgstr "New notice"
 
 msgid "New notice"
 msgstr "New notice"
 

-#: actions/newnotice.php:199
+#: actions/newnotice.php:211

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


@@ -1832,8 +1968,8 @@ msgstr "Text search"
 
 #: actions/noticesearch.php:91
 #, fuzzy, php-format
 
 #: actions/noticesearch.php:91
 #, fuzzy, php-format

-msgid "Search results for \"%s\" on %s"
-msgstr " Search Stream for \"%s\""
+msgid "Search results for \"%1$s\" on %2$s"
+msgstr "Search results for \"%s\" on %s"

 
 #: actions/noticesearch.php:121
 #, php-format
 
 #: actions/noticesearch.php:121
 #, php-format


@@ -1849,15 +1985,15 @@ msgid ""
 "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
 msgstr ""
 
 "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
 msgstr ""
 

-#: actions/noticesearchrss.php:89
-#, fuzzy, php-format
+#: actions/noticesearchrss.php:96
+#, php-format

 msgid "Updates with \"%s\""
 msgid "Updates with \"%s\""

-msgstr "Updates from %1$s on %2$s!"
+msgstr "Updates with \"%s\""

 
 

-#: actions/noticesearchrss.php:91
-#, fuzzy, php-format
+#: actions/noticesearchrss.php:98
+#, php-format

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

-msgstr "All updates matching search term \"%s\""
+msgstr "Updates matching search term \"%1$s\" on %2$s!"

 
 #: actions/nudge.php:85
 msgid ""
 
 #: actions/nudge.php:85
 msgid ""


@@ -1891,8 +2027,8 @@ msgstr "Connect"
 msgid "Only "
 msgstr ""
 
 msgid "Only "
 msgstr ""
 

-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999
-#: lib/api.php:1027 lib/api.php:1137
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1033
+#: lib/api.php:1061 lib/api.php:1171

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


@@ -1937,10 +2073,30 @@ msgstr ""
 msgid "URL shortening service is too long (max 50 chars)."
 msgstr "URL shortening service is too long (max 50 chars)."
 
 msgid "URL shortening service is too long (max 50 chars)."
 msgstr "URL shortening service is too long (max 50 chars)."
 

-#: actions/outbox.php:58
-#, php-format
-msgid "Outbox for %s - page %d"
-msgstr "Outbox for %s - page %d"
+#: actions/otp.php:69
+#, fuzzy
+msgid "No user ID specified."
+msgstr "No profile specified."
+
+#: actions/otp.php:83
+#, fuzzy
+msgid "No login token specified."
+msgstr "No profile specified."
+
+#: actions/otp.php:90
+#, fuzzy
+msgid "No login token requested."
+msgstr "No profile id in request."
+
+#: actions/otp.php:95
+#, fuzzy
+msgid "Invalid login token specified."
+msgstr "Invalid notice content"
+
+#: actions/otp.php:104
+#, fuzzy
+msgid "Login token expired."
+msgstr "Login to site"

 
 #: actions/outbox.php:61
 #, php-format
 
 #: actions/outbox.php:61
 #, php-format


@@ -1976,13 +2132,13 @@ msgid "6 or more characters"
 msgstr "6 or more characters"
 
 #: actions/passwordsettings.php:112 actions/recoverpassword.php:239
 msgstr "6 or more characters"
 
 #: actions/passwordsettings.php:112 actions/recoverpassword.php:239

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

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

-#: actions/passwordsettings.php:113
-msgid "same as password above"
-msgstr "same as password above"
+#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+msgid "Same as password above"
+msgstr "Same as password above"

 
 #: actions/passwordsettings.php:117
 msgid "Change"
 
 #: actions/passwordsettings.php:117
 msgid "Change"


@@ -2004,13 +2160,156 @@ msgstr "Incorrect old password"
 msgid "Error saving user; invalid."
 msgstr "Error saving user; invalid."
 
 msgid "Error saving user; invalid."
 msgstr "Error saving user; invalid."
 

-#: actions/passwordsettings.php:186 actions/recoverpassword.php:368
-msgid "Can't save new password."
-msgstr "Can't save new password."
+#: actions/passwordsettings.php:186 actions/recoverpassword.php:368
+msgid "Can't save new password."
+msgstr "Can't save new password."
+
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+msgid "Password saved."
+msgstr "Password saved."
+
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:326
+msgid "Paths"
+msgstr ""
+
+#: actions/pathsadminpanel.php:70
+msgid "Path and server settings for this StatusNet site."
+msgstr ""
+
+#: actions/pathsadminpanel.php:140
+#, php-format
+msgid "Theme directory not readable: %s"
+msgstr "Theme directory not readable: %s"
+
+#: actions/pathsadminpanel.php:146
+#, php-format
+msgid "Avatar directory not writable: %s"
+msgstr ""
+
+#: actions/pathsadminpanel.php:152
+#, php-format
+msgid "Background directory not writable: %s"
+msgstr ""
+
+#: actions/pathsadminpanel.php:160
+#, php-format
+msgid "Locales directory not readable: %s"
+msgstr ""
+
+#: actions/pathsadminpanel.php:166
+msgid "Invalid SSL server. The maximum length is 255 characters."
+msgstr ""
+
+#: actions/pathsadminpanel.php:217 actions/siteadminpanel.php:58
+#: lib/adminpanelaction.php:311
+#, fuzzy
+msgid "Site"
+msgstr "Invite"
+
+#: actions/pathsadminpanel.php:221
+msgid "Path"
+msgstr ""
+
+#: actions/pathsadminpanel.php:221
+msgid "Site path"
+msgstr "Site path"
+
+#: actions/pathsadminpanel.php:225
+msgid "Path to locales"
+msgstr ""
+
+#: actions/pathsadminpanel.php:225
+msgid "Directory path to locales"
+msgstr ""
+
+#: actions/pathsadminpanel.php:232
+msgid "Theme"
+msgstr ""
+
+#: actions/pathsadminpanel.php:237
+msgid "Theme server"
+msgstr ""
+
+#: actions/pathsadminpanel.php:241
+msgid "Theme path"
+msgstr ""
+
+#: actions/pathsadminpanel.php:245
+msgid "Theme directory"
+msgstr ""
+
+#: actions/pathsadminpanel.php:252
+#, fuzzy
+msgid "Avatars"
+msgstr "Avatar"
+
+#: actions/pathsadminpanel.php:257
+#, fuzzy
+msgid "Avatar server"
+msgstr "Avatar settings"
+
+#: actions/pathsadminpanel.php:261
+#, fuzzy
+msgid "Avatar path"
+msgstr "Avatar updated."
+
+#: actions/pathsadminpanel.php:265
+#, fuzzy
+msgid "Avatar directory"
+msgstr "Avatar updated."
+
+#: actions/pathsadminpanel.php:274
+msgid "Backgrounds"
+msgstr ""
+
+#: actions/pathsadminpanel.php:278
+msgid "Background server"
+msgstr ""
+
+#: actions/pathsadminpanel.php:282
+msgid "Background path"
+msgstr ""
+
+#: actions/pathsadminpanel.php:286
+msgid "Background directory"
+msgstr ""
+
+#: actions/pathsadminpanel.php:293
+msgid "SSL"
+msgstr "SSL"
+
+#: actions/pathsadminpanel.php:296 actions/siteadminpanel.php:346
+msgid "Never"
+msgstr "Never"
+
+#: actions/pathsadminpanel.php:297
+msgid "Sometimes"
+msgstr "Sometimes"
+
+#: actions/pathsadminpanel.php:298
+msgid "Always"
+msgstr ""
+
+#: actions/pathsadminpanel.php:302
+msgid "Use SSL"
+msgstr ""
+
+#: actions/pathsadminpanel.php:303
+msgid "When to use SSL"
+msgstr ""
+
+#: actions/pathsadminpanel.php:308
+#, fuzzy
+msgid "SSL server"
+msgstr "Server"

 
 

-#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
-msgid "Password saved."
-msgstr "Password saved."
+#: actions/pathsadminpanel.php:309
+msgid "Server to direct SSL requests to"
+msgstr ""
+
+#: actions/pathsadminpanel.php:325
+msgid "Save paths"
+msgstr "Save paths"

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


@@ -2031,8 +2330,8 @@ msgid "Not a valid people tag: %s"
 msgstr "Not a valid people tag: %s"
 
 #: actions/peopletag.php:144
 msgstr "Not a valid people tag: %s"
 
 #: actions/peopletag.php:144

-#, php-format
-msgid "Users self-tagged with %s - page %d"
+#, fuzzy, php-format
+msgid "Users self-tagged with %1$s - page %2$d"

 msgstr "Users self-tagged with %s - page %d"
 
 #: actions/postnotice.php:84
 msgstr "Users self-tagged with %s - page %d"
 
 #: actions/postnotice.php:84


@@ -2040,9 +2339,9 @@ msgid "Invalid notice content"
 msgstr "Invalid notice content"
 
 #: actions/postnotice.php:90
 msgstr "Invalid notice content"
 
 #: actions/postnotice.php:90

-#, php-format
-msgid "Notice license ‘%s’ is not compatible with site license ‘%s’."
-msgstr ""
+#, fuzzy, php-format
+msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
+msgstr "Notice licence ‘%s’ is not compatible with site licence ‘%s’."

 
 #: actions/profilesettings.php:60
 msgid "Profile settings"
 
 #: actions/profilesettings.php:60
 msgid "Profile settings"


@@ -2062,111 +2361,119 @@ msgstr "Profile information"
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1-64 lowercase letters or numbers, no punctuation or spaces"
 
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1-64 lowercase letters or numbers, no punctuation or spaces"
 

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

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

-#: actions/profilesettings.php:115 actions/register.php:452
+#: actions/profilesettings.php:115 actions/register.php:453

 #: lib/groupeditform.php:161
 msgid "Homepage"
 msgstr "Homepage"
 
 #: lib/groupeditform.php:161
 msgid "Homepage"
 msgstr "Homepage"
 

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

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

-#: actions/profilesettings.php:122 actions/register.php:460
-#, fuzzy, php-format
+#: actions/profilesettings.php:122 actions/register.php:461
+#, php-format

 msgid "Describe yourself and your interests in %d chars"
 msgid "Describe yourself and your interests in %d chars"

-msgstr "Describe yourself and your interests in 140 chars"
+msgstr "Describe yourself and your interests in %d chars"

 
 

-#: actions/profilesettings.php:125 actions/register.php:463
-#, fuzzy
+#: actions/profilesettings.php:125 actions/register.php:464

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

-msgstr "Describe yourself and your "
+msgstr "Describe yourself and your interests"

 
 

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

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

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

 #: actions/showgroup.php:256 actions/tagother.php:112
 #: actions/userauthorization.php:158 lib/groupeditform.php:177
 #: lib/userprofile.php:164
 msgid "Location"
 msgstr "Location"
 
 #: actions/showgroup.php:256 actions/tagother.php:112
 #: actions/userauthorization.php:158 lib/groupeditform.php:177
 #: lib/userprofile.php:164
 msgid "Location"
 msgstr "Location"
 

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

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

-#: actions/profilesettings.php:138 actions/tagother.php:149
+#: actions/profilesettings.php:138
+msgid "Share my current location when posting notices"
+msgstr ""
+
+#: actions/profilesettings.php:145 actions/tagother.php:149

 #: actions/tagother.php:209 lib/subscriptionlist.php:106
 #: lib/subscriptionlist.php:108 lib/userprofile.php:209
 msgid "Tags"
 msgstr "Tags"
 
 #: actions/tagother.php:209 lib/subscriptionlist.php:106
 #: lib/subscriptionlist.php:108 lib/userprofile.php:209
 msgid "Tags"
 msgstr "Tags"
 

-#: actions/profilesettings.php:140
+#: actions/profilesettings.php:147

 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 

-#: actions/profilesettings.php:144
+#: actions/profilesettings.php:151 actions/siteadminpanel.php:294

 msgid "Language"
 msgstr "Language"
 
 msgid "Language"
 msgstr "Language"
 

-#: actions/profilesettings.php:145
+#: actions/profilesettings.php:152

 msgid "Preferred language"
 msgstr "Preferred language"
 
 msgid "Preferred language"
 msgstr "Preferred language"
 

-#: actions/profilesettings.php:154
+#: actions/profilesettings.php:161

 msgid "Timezone"
 msgstr "Timezone"
 
 msgid "Timezone"
 msgstr "Timezone"
 

-#: actions/profilesettings.php:155
+#: actions/profilesettings.php:162

 msgid "What timezone are you normally in?"
 msgstr "In which timezone are you?"
 
 msgid "What timezone are you normally in?"
 msgstr "In which timezone are you?"
 

-#: actions/profilesettings.php:160
+#: actions/profilesettings.php:167

 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)"
 
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)"
 

-#: actions/profilesettings.php:221 actions/register.php:223
-#, fuzzy, php-format
+#: actions/profilesettings.php:228 actions/register.php:223
+#, php-format

 msgid "Bio is too long (max %d chars)."
 msgid "Bio is too long (max %d chars)."

-msgstr "Bio is too long (max 140 chars)."
+msgstr "Bio is too long (max %d chars)."

 
 

-#: actions/profilesettings.php:228
+#: actions/profilesettings.php:235 actions/siteadminpanel.php:164

 msgid "Timezone not selected."
 msgstr "Timezone not selected."
 
 msgid "Timezone not selected."
 msgstr "Timezone not selected."
 

-#: actions/profilesettings.php:234
+#: actions/profilesettings.php:241

 msgid "Language is too long (max 50 chars)."
 msgstr "Language is too long (max 50 chars)."
 
 msgid "Language is too long (max 50 chars)."
 msgstr "Language is too long (max 50 chars)."
 

-#: actions/profilesettings.php:246 actions/tagother.php:178
+#: actions/profilesettings.php:253 actions/tagother.php:178

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

-#: actions/profilesettings.php:295
+#: actions/profilesettings.php:302

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

-#: actions/profilesettings.php:328
+#: actions/profilesettings.php:359
+#, fuzzy
+msgid "Couldn't save location prefs."
+msgstr "Couldn't save tags."
+
+#: actions/profilesettings.php:371

 msgid "Couldn't save profile."
 msgstr "Couldn't save profile."
 
 msgid "Couldn't save profile."
 msgstr "Couldn't save profile."
 

-#: actions/profilesettings.php:336
+#: actions/profilesettings.php:379

 msgid "Couldn't save tags."
 msgstr "Couldn't save tags."
 
 msgid "Couldn't save tags."
 msgstr "Couldn't save tags."
 

-#: actions/profilesettings.php:344
+#: actions/profilesettings.php:387 lib/adminpanelaction.php:137

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


@@ -2228,16 +2535,21 @@ msgid ""
 "tool. [Join now](%%action.register%%) to share notices about yourself with "
 "friends, family, and colleagues! ([Read more](%%doc.help%%))"
 msgstr ""
 "tool. [Join now](%%action.register%%) to share notices about yourself with "
 "friends, family, and colleagues! ([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/public.php:238
 
 #: actions/public.php:238

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

 msgid ""
 "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."
 msgstr ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
 msgid ""
 "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."
 msgstr ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"

-"blogging) service "
+"blogging) service based on the Free Software [StatusNet](http://status.net/) "
+"tool."

 
 #: actions/publictagcloud.php:57
 msgid "Public tag cloud"
 
 #: actions/publictagcloud.php:57
 msgid "Public tag cloud"


@@ -2264,7 +2576,7 @@ msgid ""
 "one!"
 msgstr ""
 
 "one!"
 msgstr ""
 

-#: actions/publictagcloud.php:135
+#: actions/publictagcloud.php:131

 msgid "Tag cloud"
 msgstr "Tag cloud"
 
 msgid "Tag cloud"
 msgstr "Tag cloud"
 


@@ -2342,10 +2654,6 @@ msgstr "Unknown action"
 msgid "6 or more characters, and don't forget it!"
 msgstr "6 or more characters, and don't forget it!"
 
 msgid "6 or more characters, and don't forget it!"
 msgstr "6 or more characters, and don't forget it!"
 

-#: actions/recoverpassword.php:240
-msgid "Same as password above"
-msgstr "Same as password above"
-

 #: actions/recoverpassword.php:243
 msgid "Reset"
 msgstr "Reset"
 #: actions/recoverpassword.php:243
 msgid "Reset"
 msgstr "Reset"


@@ -2386,11 +2694,15 @@ msgstr "Password must be 6 chars or more."
 msgid "Password and confirmation do not match."
 msgstr "Password and confirmation do not match."
 
 msgid "Password and confirmation do not match."
 msgstr "Password and confirmation do not match."
 

+#: actions/recoverpassword.php:375 actions/register.php:248
+msgid "Error setting user."
+msgstr "Error setting user."
+

 #: actions/recoverpassword.php:382
 msgid "New password successfully saved. You are now logged in."
 msgstr "New password successfully saved. You are now logged in."
 
 #: actions/recoverpassword.php:382
 msgid "New password successfully saved. You are now logged in."
 msgstr "New password successfully saved. You are now logged in."
 

-#: actions/register.php:85 actions/register.php:189 actions/register.php:404
+#: actions/register.php:85 actions/register.php:189 actions/register.php:405

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


@@ -2403,7 +2715,7 @@ msgstr "Error with confirmation code."
 msgid "Registration successful"
 msgstr "Registration successful"
 
 msgid "Registration successful"
 msgstr "Registration successful"
 

-#: actions/register.php:114 actions/register.php:502 lib/action.php:450
+#: actions/register.php:114 actions/register.php:503 lib/action.php:457

 #: lib/logingroupnav.php:85
 msgid "Register"
 msgstr "Register"
 #: lib/logingroupnav.php:85
 msgid "Register"
 msgstr "Register"


@@ -2416,58 +2728,54 @@ msgstr "Registration not allowed."
 msgid "You can't register if you don't agree to the license."
 msgstr "You can't register if you don't agree to the licence."
 
 msgid "You can't register if you don't agree to the license."
 msgstr "You can't register if you don't agree to the licence."
 

-#: actions/register.php:201
-msgid "Not a valid email address."
-msgstr "Not a valid e-mail address."
-

 #: actions/register.php:212
 msgid "Email address already exists."
 msgstr "E-mail address already exists."
 
 #: actions/register.php:212
 msgid "Email address already exists."
 msgstr "E-mail address already exists."
 

-#: actions/register.php:243 actions/register.php:264
+#: actions/register.php:243 actions/register.php:265

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

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

 msgid ""
 "With this form you can create  a new account. You can then post notices and "
 "link up to friends and colleagues. "
 msgstr ""
 
 msgid ""
 "With this form you can create  a new account. You can then post notices and "
 "link up to friends and colleagues. "
 msgstr ""
 

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

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

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

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

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

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

-#: actions/register.php:437 actions/register.php:441
-#: lib/accountsettingsaction.php:120
+#: actions/register.php:438 actions/register.php:442
+#: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120

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

-#: actions/register.php:438 actions/register.php:442
+#: actions/register.php:439 actions/register.php:443

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

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

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

-#: actions/register.php:493
+#: actions/register.php:494

 msgid "My text and files are available under "
 msgstr "My text and files are available under "
 
 msgid "My text and files are available under "
 msgstr "My text and files are available under "
 

-#: actions/register.php:495
+#: actions/register.php:496

 msgid "Creative Commons Attribution 3.0"
 msgstr ""
 
 msgid "Creative Commons Attribution 3.0"
 msgstr ""
 

-#: actions/register.php:496
+#: actions/register.php:497

 #, fuzzy
 msgid ""
 " except this private data: password, email address, IM address, and phone "
 #, fuzzy
 msgid ""
 " except this private data: password, email address, IM address, and phone "


@@ -2476,13 +2784,13 @@ msgstr ""
 " except this private data: password, e-mail address, IM address, phone "
 "number."
 
 " except this private data: password, e-mail address, IM address, phone "
 "number."
 

-#: actions/register.php:537
-#, php-format
+#: actions/register.php:538
+#, fuzzy, php-format

 msgid ""
 msgid ""

-"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
+"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "

 "want to...\n"
 "\n"
 "want to...\n"
 "\n"

-"* Go to [your profile](%s) and post your first message.\n"
+"* Go to [your profile](%2$s) and post your first message.\n"

 "* Add a [Jabber/GTalk address](%%%%action.imsettings%%%%) so you can send "
 "notices through instant messages.\n"
 "* [Search for people](%%%%action.peoplesearch%%%%) that you may know or that "
 "* Add a [Jabber/GTalk address](%%%%action.imsettings%%%%) so you can send "
 "notices through instant messages.\n"
 "* [Search for people](%%%%action.peoplesearch%%%%) that you may know or that "


@@ -2509,7 +2817,7 @@ msgstr ""
 "\n"
 "Thanks for signing up and we hope you enjoy using this service."
 
 "\n"
 "Thanks for signing up and we hope you enjoy using this service."
 

-#: actions/register.php:561
+#: actions/register.php:562

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


@@ -2554,7 +2862,7 @@ msgid "URL of your profile on another compatible microblogging service"
 msgstr "URL of your profile on another compatible microblogging service"
 
 #: actions/remotesubscribe.php:137 lib/subscribeform.php:139
 msgstr "URL of your profile on another compatible microblogging service"
 
 #: actions/remotesubscribe.php:137 lib/subscribeform.php:139

-#: lib/userprofile.php:321
+#: lib/userprofile.php:365

 msgid "Subscribe"
 msgstr "Subscribe"
 
 msgid "Subscribe"
 msgstr "Subscribe"
 


@@ -2564,8 +2872,7 @@ msgstr "Invalid profile URL (bad format)"
 
 #: actions/remotesubscribe.php:168
 #, fuzzy
 
 #: actions/remotesubscribe.php:168
 #, fuzzy

-msgid ""
-"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
+msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."

 msgstr "Not a valid profile URL (no YADIS document)."
 
 #: actions/remotesubscribe.php:176
 msgstr "Not a valid profile URL (no YADIS document)."
 
 #: actions/remotesubscribe.php:176


@@ -2578,26 +2885,50 @@ msgstr "That's a local profile! Login to subscribe."
 msgid "Couldn’t get a request token."
 msgstr "Couldn't get a request token."
 
 msgid "Couldn’t get a request token."
 msgstr "Couldn't get a request token."
 

+#: actions/repeat.php:57
+#, fuzzy
+msgid "Only logged-in users can repeat notices."
+msgstr "Only the user can read their own mailboxes."
+
+#: actions/repeat.php:64 actions/repeat.php:71
+#, fuzzy
+msgid "No notice specified."
+msgstr "No profile specified."
+
+#: actions/repeat.php:76
+msgid "You can't repeat your own notice."
+msgstr "You can't repeat your own notice."
+
+#: actions/repeat.php:90
+#, fuzzy
+msgid "You already repeated that notice."
+msgstr "You have already blocked this user."
+
+#: actions/repeat.php:114 lib/noticelist.php:629
+#, fuzzy
+msgid "Repeated"
+msgstr "Created"
+
+#: actions/repeat.php:119
+#, fuzzy
+msgid "Repeated!"
+msgstr "Created"
+

 #: actions/replies.php:125 actions/repliesrss.php:68
 #: lib/personalgroupnav.php:105
 #, php-format
 msgid "Replies to %s"
 msgstr "Replies to %s"
 
 #: actions/replies.php:125 actions/repliesrss.php:68
 #: lib/personalgroupnav.php:105
 #, php-format
 msgid "Replies to %s"
 msgstr "Replies to %s"
 

-#: actions/replies.php:127
-#, php-format
-msgid "Replies to %s, page %d"
-msgstr "Replies to %s, page %d"
-

 #: actions/replies.php:144
 #: actions/replies.php:144

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

 msgid "Replies feed for %s (RSS 1.0)"
 msgid "Replies feed for %s (RSS 1.0)"

-msgstr "Notice feed for %s"
+msgstr "Replies feed for %s (RSS 1.0)"

 
 #: actions/replies.php:151
 
 #: actions/replies.php:151

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

 msgid "Replies feed for %s (RSS 2.0)"
 msgid "Replies feed for %s (RSS 2.0)"

-msgstr "Notice feed for %s"
+msgstr "Replies feed for %s (RSS 2.0)"

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


@@ -2605,11 +2936,12 @@ msgid "Replies feed for %s (Atom)"
 msgstr "Notice feed for %s"
 
 #: actions/replies.php:198
 msgstr "Notice feed for %s"
 
 #: actions/replies.php:198

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

 msgid ""
 msgid ""

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

 msgstr ""
 msgstr ""

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

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


@@ -2619,21 +2951,26 @@ msgid ""
 msgstr ""
 
 #: actions/replies.php:205
 msgstr ""
 
 #: actions/replies.php:205

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

 msgid ""
 msgid ""

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

 msgstr ""
 msgstr ""

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

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

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

 msgid "Replies to %1$s on %2$s!"
 msgid "Replies to %1$s on %2$s!"

-msgstr "Message to %1$s on %2$s"
+msgstr "Replies to %1$s on %2$s!"

 
 

-#: actions/showfavorites.php:79
-#, fuzzy, php-format
-msgid "%s's favorite notices, page %d"
-msgstr "%s favourite notices, page %d"
+#: actions/sandbox.php:65 actions/unsandbox.php:65
+msgid "You cannot sandbox users on this site."
+msgstr "You cannot sandbox users on this site."
+
+#: actions/sandbox.php:72
+msgid "User is already sandboxed."
+msgstr "User is already sandboxed."

 
 #: actions/showfavorites.php:132
 msgid "Could not retrieve favorite notices."
 
 #: actions/showfavorites.php:132
 msgid "Could not retrieve favorite notices."


@@ -2684,11 +3021,6 @@ msgstr ""
 msgid "%s group"
 msgstr "%s group"
 
 msgid "%s group"
 msgstr "%s group"
 

-#: actions/showgroup.php:84
-#, php-format
-msgid "%s group, page %d"
-msgstr "%s group, page %d"
-

 #: actions/showgroup.php:218
 msgid "Group profile"
 msgstr "Group profile"
 #: actions/showgroup.php:218
 msgid "Group profile"
 msgstr "Group profile"


@@ -2736,8 +3068,8 @@ msgid "Members"
 msgstr "Members"
 
 #: actions/showgroup.php:386 lib/profileaction.php:117
 msgstr "Members"
 
 #: actions/showgroup.php:386 lib/profileaction.php:117

-#: lib/profileaction.php:148 lib/profileaction.php:226 lib/section.php:95
-#: lib/tagcloudsection.php:71
+#: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95
+#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71

 msgid "(None)"
 msgstr "(None)"
 
 msgid "(None)"
 msgstr "(None)"
 


@@ -2745,14 +3077,13 @@ msgstr "(None)"
 msgid "All members"
 msgstr "All members"
 
 msgid "All members"
 msgstr "All members"
 

-#: actions/showgroup.php:429 lib/profileaction.php:173
+#: actions/showgroup.php:429 lib/profileaction.php:174

 msgid "Statistics"
 msgstr "Statistics"
 
 #: actions/showgroup.php:432
 msgid "Statistics"
 msgstr "Statistics"
 
 #: actions/showgroup.php:432

-#, fuzzy

 msgid "Created"
 msgid "Created"

-msgstr "Create"
+msgstr "Created"

 
 #: actions/showgroup.php:448
 #, php-format
 
 #: actions/showgroup.php:448
 #, php-format


@@ -2799,24 +3130,18 @@ msgid "Message from %1$s on %2$s"
 msgstr "Message from %1$s on %2$s"
 
 #: actions/shownotice.php:90
 msgstr "Message from %1$s on %2$s"
 
 #: actions/shownotice.php:90

-#, fuzzy

 msgid "Notice deleted."
 msgid "Notice deleted."

-msgstr "Notice posted"
+msgstr "Notice deleted."

 
 #: actions/showstream.php:73
 
 #: actions/showstream.php:73

-#, fuzzy, php-format
-msgid " tagged %s"
-msgstr "Notices tagged with %s"
-
-#: actions/showstream.php:79

 #, php-format
 #, php-format

-msgid "%s, page %d"
-msgstr "%s, page %d"
+msgid " tagged %s"
+msgstr "  tagged %s"

 
 #: actions/showstream.php:122
 #, fuzzy, php-format
 
 #: actions/showstream.php:122
 #, fuzzy, php-format

-msgid "Notice feed for %s tagged %s (RSS 1.0)"
-msgstr "Notice feed for %s group"
+msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
+msgstr "Notice feed for %s tagged %s (RSS 1.0)"

 
 #: actions/showstream.php:129
 #, fuzzy, php-format
 
 #: actions/showstream.php:129
 #, fuzzy, php-format


@@ -2834,14 +3159,15 @@ msgid "Notice feed for %s (Atom)"
 msgstr "Notice feed for %s"
 
 #: actions/showstream.php:148
 msgstr "Notice feed for %s"
 
 #: actions/showstream.php:148

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

 msgid "FOAF for %s"
 msgid "FOAF for %s"

-msgstr "Outbox for %s"
+msgstr "FOAF for %s"

 
 #: actions/showstream.php:191
 
 #: actions/showstream.php:191

-#, php-format
-msgid "This is the timeline for %s but %s hasn't posted anything yet."
+#, fuzzy, php-format
+msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet."

 msgstr ""
 msgstr ""

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

 
 #: actions/showstream.php:196
 msgid ""
 
 #: actions/showstream.php:196
 msgid ""


@@ -2850,11 +3176,13 @@ msgid ""
 msgstr ""
 
 #: actions/showstream.php:198
 msgstr ""
 
 #: actions/showstream.php:198

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

 msgid ""
 msgid ""

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

 msgstr ""
 msgstr ""

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

 
 #: actions/showstream.php:234
 #, php-format
 
 #: actions/showstream.php:234
 #, php-format


@@ -2866,17 +3194,230 @@ msgid ""
 msgstr ""
 
 #: actions/showstream.php:239
 msgstr ""
 
 #: actions/showstream.php:239

-#, fuzzy, php-format
+#, 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. "
 msgstr ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
 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. "
 msgstr ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."

-"wikipedia.org/wiki/Micro-blogging) service "
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. "
+
+#: actions/showstream.php:313
+#, fuzzy, php-format
+msgid "Repeat of %s"
+msgstr "Replies to %s"
+
+#: actions/silence.php:65 actions/unsilence.php:65
+#, fuzzy
+msgid "You cannot silence users on this site."
+msgstr "You can't send a message to this user."
+
+#: actions/silence.php:72
+#, fuzzy
+msgid "User is already silenced."
+msgstr "User is already blocked from group."
+
+#: actions/siteadminpanel.php:69
+msgid "Basic settings for this StatusNet site."
+msgstr ""
+
+#: actions/siteadminpanel.php:146
+msgid "Site name must have non-zero length."
+msgstr ""
+
+#: actions/siteadminpanel.php:154
+#, fuzzy
+msgid "You must have a valid contact email address."
+msgstr "Not a valid e-mail address."
+
+#: actions/siteadminpanel.php:172
+#, php-format
+msgid "Unknown language \"%s\"."
+msgstr ""
+
+#: actions/siteadminpanel.php:179
+msgid "Invalid snapshot report URL."
+msgstr ""
+
+#: actions/siteadminpanel.php:185
+msgid "Invalid snapshot run value."
+msgstr ""
+
+#: actions/siteadminpanel.php:191
+msgid "Snapshot frequency must be a number."
+msgstr ""
+
+#: actions/siteadminpanel.php:197
+msgid "Minimum text limit is 140 characters."
+msgstr ""
+
+#: actions/siteadminpanel.php:203
+msgid "Dupe limit must 1 or more seconds."
+msgstr ""
+
+#: actions/siteadminpanel.php:253
+msgid "General"
+msgstr ""
+
+#: actions/siteadminpanel.php:256
+msgid "Site name"
+msgstr "Site name"
+
+#: actions/siteadminpanel.php:257
+msgid "The name of your site, like \"Yourcompany Microblog\""
+msgstr ""
+
+#: actions/siteadminpanel.php:261
+msgid "Brought by"
+msgstr ""
+
+#: actions/siteadminpanel.php:262
+msgid "Text used for credits link in footer of each page"
+msgstr ""
+
+#: actions/siteadminpanel.php:266
+msgid "Brought by URL"
+msgstr ""
+
+#: actions/siteadminpanel.php:267
+msgid "URL used for credits link in footer of each page"
+msgstr ""
+
+#: actions/siteadminpanel.php:271
+#, fuzzy
+msgid "Contact email address for your site"
+msgstr "New e-mail address for posting to %s"
+
+#: actions/siteadminpanel.php:277
+#, fuzzy
+msgid "Local"
+msgstr "Local views"
+
+#: actions/siteadminpanel.php:288
+msgid "Default timezone"
+msgstr ""
+
+#: actions/siteadminpanel.php:289
+msgid "Default timezone for the site; usually UTC."
+msgstr ""
+
+#: actions/siteadminpanel.php:295
+msgid "Default site language"
+msgstr "Default site language"
+
+#: actions/siteadminpanel.php:303
+msgid "URLs"
+msgstr "URLs"
+
+#: actions/siteadminpanel.php:306
+msgid "Server"
+msgstr "Server"
+
+#: actions/siteadminpanel.php:306
+msgid "Site's server hostname."
+msgstr ""
+
+#: actions/siteadminpanel.php:310
+msgid "Fancy URLs"
+msgstr ""
+
+#: actions/siteadminpanel.php:312
+msgid "Use fancy (more readable and memorable) URLs?"
+msgstr ""
+
+#: actions/siteadminpanel.php:318
+msgid "Access"
+msgstr "Access"
+
+#: actions/siteadminpanel.php:321
+msgid "Private"
+msgstr "Private"
+
+#: actions/siteadminpanel.php:323
+msgid "Prohibit anonymous users (not logged in) from viewing site?"
+msgstr ""
+
+#: actions/siteadminpanel.php:327
+msgid "Invite only"
+msgstr "Invite only"
+
+#: actions/siteadminpanel.php:329
+msgid "Make registration invitation only."
+msgstr ""
+
+#: actions/siteadminpanel.php:333
+msgid "Closed"
+msgstr "Closed"
+
+#: actions/siteadminpanel.php:335
+msgid "Disable new registrations."
+msgstr ""
+
+#: actions/siteadminpanel.php:341
+msgid "Snapshots"
+msgstr ""
+
+#: actions/siteadminpanel.php:344
+msgid "Randomly during Web hit"
+msgstr ""
+
+#: actions/siteadminpanel.php:345
+msgid "In a scheduled job"
+msgstr ""
+
+#: actions/siteadminpanel.php:347
+msgid "Data snapshots"
+msgstr ""
+
+#: actions/siteadminpanel.php:348
+msgid "When to send statistical data to status.net servers"
+msgstr ""
+
+#: actions/siteadminpanel.php:353
+msgid "Frequency"
+msgstr ""
+
+#: actions/siteadminpanel.php:354
+msgid "Snapshots will be sent once every N web hits"
+msgstr ""
+
+#: actions/siteadminpanel.php:359
+msgid "Report URL"
+msgstr ""
+
+#: actions/siteadminpanel.php:360
+msgid "Snapshots will be sent to this URL"
+msgstr ""
+
+#: actions/siteadminpanel.php:367
+msgid "Limits"
+msgstr ""
+
+#: actions/siteadminpanel.php:370
+msgid "Text limit"
+msgstr ""
+
+#: actions/siteadminpanel.php:370
+msgid "Maximum number of characters for notices."
+msgstr ""
+
+#: actions/siteadminpanel.php:374
+msgid "Dupe limit"
+msgstr ""
+
+#: actions/siteadminpanel.php:374
+msgid "How long users must wait (in seconds) to post the same thing again."
+msgstr ""
+
+#: actions/siteadminpanel.php:388 actions/useradminpanel.php:313
+msgid "Save site settings"
+msgstr "Save site settings"

 
 #: actions/smssettings.php:58
 
 #: actions/smssettings.php:58

-msgid "SMS Settings"
+#, fuzzy
+msgid "SMS settings"

 msgstr "SMS Settings"
 
 #: actions/smssettings.php:69
 msgstr "SMS Settings"
 
 #: actions/smssettings.php:69


@@ -2906,7 +3447,8 @@ msgid "Enter the code you received on your phone."
 msgstr "Enter the code you received on your phone."
 
 #: actions/smssettings.php:138
 msgstr "Enter the code you received on your phone."
 
 #: actions/smssettings.php:138

-msgid "SMS Phone number"
+#, fuzzy
+msgid "SMS phone number"

 msgstr "SMS Phone number"
 
 #: actions/smssettings.php:140
 msgstr "SMS Phone number"
 
 #: actions/smssettings.php:140


@@ -3001,8 +3543,8 @@ msgid "%s subscribers"
 msgstr "%s subscribers"
 
 #: actions/subscribers.php:52
 msgstr "%s subscribers"
 
 #: actions/subscribers.php:52

-#, php-format
-msgid "%s subscribers, page %d"
+#, fuzzy, php-format
+msgid "%1$s subscribers, page %2$d"

 msgstr "%s subscribers, page %d"
 
 #: actions/subscribers.php:63
 msgstr "%s subscribers, page %d"
 
 #: actions/subscribers.php:63


@@ -3038,8 +3580,8 @@ msgid "%s subscriptions"
 msgstr "%s subscriptions"
 
 #: actions/subscriptions.php:54
 msgstr "%s subscriptions"
 
 #: actions/subscriptions.php:54

-#, php-format
-msgid "%s subscriptions, page %d"
+#, fuzzy, php-format
+msgid "%1$s subscriptions, page %2$d"

 msgstr "%s subscriptions, page %d"
 
 #: actions/subscriptions.php:65
 msgstr "%s subscriptions, page %d"
 
 #: actions/subscriptions.php:65


@@ -3062,9 +3604,9 @@ msgid ""
 msgstr ""
 
 #: actions/subscriptions.php:123 actions/subscriptions.php:127
 msgstr ""
 
 #: actions/subscriptions.php:123 actions/subscriptions.php:127

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

 msgid "%s is not listening to anyone."
 msgid "%s is not listening to anyone."

-msgstr "%1$s is now listening to "
+msgstr "%s is not listening to anyone."

 
 #: actions/subscriptions.php:194
 msgid "Jabber"
 
 #: actions/subscriptions.php:194
 msgid "Jabber"


@@ -3074,12 +3616,24 @@ msgstr "Jabber"
 msgid "SMS"
 msgstr "SMS"
 
 msgid "SMS"
 msgstr "SMS"
 

-#: actions/tagother.php:33
-msgid "Not logged in"
-msgstr "Not logged in"
+#: actions/tag.php:86
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 1.0)"
+msgstr "Notice feed for %s"
+
+#: actions/tag.php:92
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 2.0)"
+msgstr "Notice feed for %s"
+
+#: actions/tag.php:98
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (Atom)"
+msgstr "Notice feed for %s"

 
 #: actions/tagother.php:39
 
 #: actions/tagother.php:39

-msgid "No id argument."
+#, fuzzy
+msgid "No ID argument."

 msgstr "No id argument."
 
 #: actions/tagother.php:65
 msgstr "No id argument."
 
 #: actions/tagother.php:65


@@ -3111,35 +3665,15 @@ msgstr ""
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""

-"You can only tag people you are subscribed to or who are subscribed to you."
-
-#: actions/tagother.php:200
-msgid "Could not save tags."
-msgstr "Could not save tags."
-
-#: actions/tagother.php:236
-msgid "Use this form to add tags to your subscribers or subscriptions."
-msgstr "Use this form to add tags to your subscribers or subscriptions."
-
-#: actions/tag.php:68
-#, php-format
-msgid "Notices tagged with %s, page %d"
-msgstr "Notices tagged with %s, page %d"
-
-#: actions/tag.php:86
-#, fuzzy, php-format
-msgid "Notice feed for tag %s (RSS 1.0)"
-msgstr "Notice feed for %s"
-
-#: actions/tag.php:92
-#, fuzzy, php-format
-msgid "Notice feed for tag %s (RSS 2.0)"
-msgstr "Notice feed for %s"
+"You can only tag people you are subscribed to or who are subscribed to you."

 
 

-#: actions/tag.php:98
-#, fuzzy, php-format
-msgid "Notice feed for tag %s (Atom)"
-msgstr "Notice feed for %s"
+#: actions/tagother.php:200
+msgid "Could not save tags."
+msgstr "Could not save tags."
+
+#: actions/tagother.php:236
+msgid "Use this form to add tags to your subscribers or subscriptions."
+msgstr "Use this form to add tags to your subscribers or subscriptions."

 
 #: actions/tagrss.php:35
 msgid "No such tag."
 
 #: actions/tagrss.php:35
 msgid "No such tag."


@@ -3149,21 +3683,124 @@ msgstr "No such tag."
 msgid "API method under construction."
 msgstr "API method under construction."
 
 msgid "API method under construction."
 msgstr "API method under construction."
 

+#: actions/unblock.php:59
+#, fuzzy
+msgid "You haven't blocked that user."
+msgstr "You have already blocked this user."
+
+#: actions/unsandbox.php:72
+#, fuzzy
+msgid "User is not sandboxed."
+msgstr "User has blocked you."
+
+#: actions/unsilence.php:72
+#, fuzzy
+msgid "User is not silenced."
+msgstr "User has no profile."
+

 #: actions/unsubscribe.php:77
 msgid "No profile id in request."
 msgstr "No profile id in request."
 
 #: actions/unsubscribe.php:77
 msgid "No profile id in request."
 msgstr "No profile id in request."
 

-#: actions/unsubscribe.php:84
-msgid "No profile with that id."
-msgstr "No profile with that id."
-

 #: actions/unsubscribe.php:98
 msgid "Unsubscribed"
 msgstr "Unsubscribed"
 
 #: actions/updateprofile.php:62 actions/userauthorization.php:330
 #: actions/unsubscribe.php:98
 msgid "Unsubscribed"
 msgstr "Unsubscribed"
 
 #: actions/updateprofile.php:62 actions/userauthorization.php:330

+#, fuzzy, php-format
+msgid ""
+"Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
+msgstr "Notice licence ‘%s’ is not compatible with site licence ‘%s’."
+
+#: actions/useradminpanel.php:58 lib/adminpanelaction.php:321
+#: lib/personalgroupnav.php:115
+msgid "User"
+msgstr "User"
+
+#: actions/useradminpanel.php:69
+msgid "User settings for this StatusNet site."
+msgstr ""
+
+#: actions/useradminpanel.php:149
+msgid "Invalid bio limit. Must be numeric."
+msgstr ""
+
+#: actions/useradminpanel.php:155
+msgid "Invalid welcome text. Max length is 255 characters."
+msgstr ""
+
+#: actions/useradminpanel.php:165

 #, php-format
 #, php-format

-msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
+msgid "Invalid default subscripton: '%1$s' is not user."
+msgstr ""
+
+#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108
+#: lib/personalgroupnav.php:109
+msgid "Profile"
+msgstr "Profile"
+
+#: actions/useradminpanel.php:222
+msgid "Bio Limit"
+msgstr ""
+
+#: actions/useradminpanel.php:223
+msgid "Maximum length of a profile bio in characters."
+msgstr ""
+
+#: actions/useradminpanel.php:231
+msgid "New users"
+msgstr "New users"
+
+#: actions/useradminpanel.php:235
+msgid "New user welcome"
+msgstr ""
+
+#: actions/useradminpanel.php:236
+msgid "Welcome text for new users (Max 255 chars)."
+msgstr ""
+
+#: actions/useradminpanel.php:241
+msgid "Default subscription"
+msgstr "Default subscription"
+
+#: actions/useradminpanel.php:242
+#, fuzzy
+msgid "Automatically subscribe new users to this user."
+msgstr ""
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+
+#: actions/useradminpanel.php:251
+#, fuzzy
+msgid "Invitations"
+msgstr "Invitation(s) sent"
+
+#: actions/useradminpanel.php:256
+#, fuzzy
+msgid "Invitations enabled"
+msgstr "Invitation(s) sent"
+
+#: actions/useradminpanel.php:258
+msgid "Whether to allow users to invite new users."
+msgstr ""
+
+#: actions/useradminpanel.php:265
+msgid "Sessions"
+msgstr ""
+
+#: actions/useradminpanel.php:270
+msgid "Handle sessions"
+msgstr ""
+
+#: actions/useradminpanel.php:272
+msgid "Whether to handle sessions ourselves."
+msgstr ""
+
+#: actions/useradminpanel.php:276
+msgid "Session debugging"
+msgstr ""
+
+#: actions/useradminpanel.php:278
+msgid "Turn on debugging output for sessions."

 msgstr ""
 
 #: actions/userauthorization.php:105
 msgstr ""
 
 #: actions/userauthorization.php:105


@@ -3181,10 +3818,9 @@ msgstr ""
 "user's notices. If you didn't just ask to subscribe to someone's notices, "
 "click \"Cancel\"."
 
 "user's notices. If you didn't just ask to subscribe to someone's notices, "
 "click \"Cancel\"."
 

-#: actions/userauthorization.php:188
-#, fuzzy
+#: actions/userauthorization.php:188 actions/version.php:165

 msgid "License"
 msgid "License"

-msgstr "licence."
+msgstr "License"

 
 #: actions/userauthorization.php:209
 msgid "Accept"
 
 #: actions/userauthorization.php:209
 msgid "Accept"


@@ -3200,9 +3836,8 @@ msgid "Reject"
 msgstr "Reject"
 
 #: actions/userauthorization.php:212
 msgstr "Reject"
 
 #: actions/userauthorization.php:212

-#, fuzzy

 msgid "Reject this subscription"
 msgid "Reject this subscription"

-msgstr "%s subscriptions"
+msgstr "Reject this subscription"

 
 #: actions/userauthorization.php:225
 msgid "No authorization request!"
 
 #: actions/userauthorization.php:225
 msgid "No authorization request!"


@@ -3240,7 +3875,7 @@ msgstr ""
 
 #: actions/userauthorization.php:296
 #, php-format
 
 #: actions/userauthorization.php:296
 #, php-format

-msgid "Listener URI ‘%s’ not found here"
+msgid "Listener URI ‘%s’ not found here."

 msgstr ""
 
 #: actions/userauthorization.php:301
 msgstr ""
 
 #: actions/userauthorization.php:301


@@ -3273,10 +3908,6 @@ msgstr "Can't read avatar URL '%s'"
 msgid "Wrong image type for avatar URL ‘%s’."
 msgstr "Wrong image type for '%s'"
 
 msgid "Wrong image type for avatar URL ‘%s’."
 msgstr "Wrong image type for '%s'"
 

-#: actions/userbyid.php:70
-msgid "No id."
-msgstr "No id."
-

 #: actions/userdesignsettings.php:76 lib/designsettings.php:65
 #, fuzzy
 msgid "Profile design"
 #: actions/userdesignsettings.php:76 lib/designsettings.php:65
 #, fuzzy
 msgid "Profile design"


@@ -3292,11 +3923,6 @@ msgstr ""
 msgid "Enjoy your hotdog!"
 msgstr ""
 
 msgid "Enjoy your hotdog!"
 msgstr ""
 

-#: actions/usergroups.php:64
-#, php-format
-msgid "%s groups, page %d"
-msgstr "%s groups, page %d"
-

 #: actions/usergroups.php:130
 #, fuzzy
 msgid "Search for more groups"
 #: actions/usergroups.php:130
 #, fuzzy
 msgid "Search for more groups"


@@ -3312,52 +3938,143 @@ msgstr "You are not a member of that group."
 msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
 msgstr ""
 
 msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
 msgstr ""
 

-#: classes/File.php:137
+#: actions/version.php:73
+#, fuzzy, php-format
+msgid "StatusNet %s"
+msgstr "Statistics"
+
+#: actions/version.php:153
+#, php-format
+msgid ""
+"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
+"Inc. and contributors."
+msgstr ""
+
+#: actions/version.php:157
+#, fuzzy
+msgid "StatusNet"
+msgstr "Status deleted."
+
+#: actions/version.php:161
+msgid "Contributors"
+msgstr ""
+
+#: actions/version.php:168
+msgid ""
+"StatusNet is free software: you can redistribute it and/or modify it under "
+"the terms of the GNU Affero General Public License as published by the Free "
+"Software Foundation, either version 3 of the License, or (at your option) "
+"any later version. "
+msgstr ""
+
+#: actions/version.php:174
+msgid ""
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License "
+"for more details. "
+msgstr ""
+
+#: actions/version.php:180
+#, php-format
+msgid ""
+"You should have received a copy of the GNU Affero General Public License "
+"along with this program.  If not, see %s."
+msgstr ""
+
+#: actions/version.php:189
+msgid "Plugins"
+msgstr ""
+
+#: actions/version.php:195
+#, fuzzy
+msgid "Name"
+msgstr "Nickname"
+
+#: actions/version.php:196 lib/action.php:741
+#, fuzzy
+msgid "Version"
+msgstr "Personal"
+
+#: actions/version.php:197
+msgid "Author(s)"
+msgstr ""
+
+#: actions/version.php:198 lib/groupeditform.php:172
+msgid "Description"
+msgstr "Description"
+
+#: classes/File.php:144

 #, php-format
 msgid ""
 "No file may be larger than %d bytes and the file you sent was %d bytes. Try "
 "to upload a smaller version."
 msgstr ""
 
 #, php-format
 msgid ""
 "No file may be larger than %d bytes and the file you sent was %d bytes. Try "
 "to upload a smaller version."
 msgstr ""
 

-#: classes/File.php:147
+#: classes/File.php:154

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

-#: classes/File.php:154
+#: classes/File.php:161

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

-#: classes/Message.php:55
+#: classes/Group_member.php:41
+#, fuzzy
+msgid "Group join failed."
+msgstr "Group profile"
+
+#: classes/Group_member.php:53
+#, fuzzy
+msgid "Not part of group."
+msgstr "Could not update group."
+
+#: classes/Group_member.php:60
+#, fuzzy
+msgid "Group leave failed."
+msgstr "Group profile"
+
+#: classes/Login_token.php:76
+#, fuzzy, php-format
+msgid "Could not create login token for %s"
+msgstr "Could not create aliases"
+
+#: classes/Message.php:45
+#, fuzzy
+msgid "You are banned from sending direct messages."
+msgstr "Error sending direct message."
+
+#: classes/Message.php:61

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

-#: classes/Message.php:65
+#: classes/Message.php:71

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

-#: classes/Notice.php:164
+#: classes/Notice.php:171

 #, php-format
 msgid "DB error inserting hashtag: %s"
 msgstr "DB error inserting hashtag: %s"
 
 #, php-format
 msgid "DB error inserting hashtag: %s"
 msgstr "DB error inserting hashtag: %s"
 

-#: classes/Notice.php:179
+#: classes/Notice.php:225

 #, fuzzy
 msgid "Problem saving notice. Too long."
 msgstr "Problem saving notice."
 
 #, fuzzy
 msgid "Problem saving notice. Too long."
 msgstr "Problem saving notice."
 

-#: classes/Notice.php:183
+#: classes/Notice.php:229

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

-#: classes/Notice.php:188
+#: classes/Notice.php:234

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

-#: classes/Notice.php:194
+#: classes/Notice.php:240

 #, fuzzy
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 #, fuzzy
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "


@@ -3365,27 +4082,36 @@ msgid ""
 msgstr ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 
 msgstr ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 

-#: classes/Notice.php:202
+#: classes/Notice.php:246

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

-#: classes/Notice.php:268 classes/Notice.php:293
+#: classes/Notice.php:305 classes/Notice.php:330

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

-#: classes/Notice.php:1120
+#: classes/Notice.php:1052

 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "DB error inserting reply: %s"
 
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "DB error inserting reply: %s"
 

-#: classes/User.php:347
+#: classes/Notice.php:1423

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

+msgid "RT @%1$s %2$s"
+msgstr "%1$s (%2$s)"
+
+#: classes/User.php:382
+#, php-format

 msgid "Welcome to %1$s, @%2$s!"
 msgid "Welcome to %1$s, @%2$s!"

-msgstr "Message to %1$s on %2$s"
+msgstr "Welcome to %1$s, @%2$s!"

 
 

-#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109
-msgid "Profile"
-msgstr "Profile"
+#: classes/User_group.php:380
+msgid "Could not create group."
+msgstr "Could not create group."
+
+#: classes/User_group.php:409
+msgid "Could not set group membership."
+msgstr "Could not set group membership."

 
 #: lib/accountsettingsaction.php:108
 msgid "Change your profile settings"
 
 #: lib/accountsettingsaction.php:108
 msgid "Change your profile settings"


@@ -3403,14 +4129,9 @@ msgstr "Change your password"
 msgid "Change email handling"
 msgstr "Change e-mail handling"
 
 msgid "Change email handling"
 msgstr "Change e-mail handling"
 

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

 #: lib/accountsettingsaction.php:124
 #: lib/accountsettingsaction.php:124

-#, fuzzy

 msgid "Design your profile"
 msgid "Design your profile"

-msgstr "User profile"
+msgstr "Design your profile"

 
 #: lib/accountsettingsaction.php:128
 msgid "Other"
 
 #: lib/accountsettingsaction.php:128
 msgid "Other"


@@ -3421,134 +4142,138 @@ msgid "Other options"
 msgstr "Other options"
 
 #: lib/action.php:144
 msgstr "Other options"
 
 #: lib/action.php:144

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

 
 #: lib/action.php:159
 msgid "Untitled page"
 msgstr "Untitled page"
 
 
 #: lib/action.php:159
 msgid "Untitled page"
 msgstr "Untitled page"
 

-#: lib/action.php:424
+#: lib/action.php:427

 msgid "Primary site navigation"
 msgstr "Primary site navigation"
 
 msgid "Primary site navigation"
 msgstr "Primary site navigation"
 

-#: lib/action.php:430
+#: lib/action.php:433

 msgid "Home"
 msgstr "Home"
 
 msgid "Home"
 msgstr "Home"
 

-#: lib/action.php:430
+#: lib/action.php:433

 msgid "Personal profile and friends timeline"
 msgstr "Personal profile and friends timeline"
 
 msgid "Personal profile and friends timeline"
 msgstr "Personal profile and friends timeline"
 

-#: lib/action.php:432
+#: lib/action.php:435

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

-#: lib/action.php:432
+#: lib/action.php:435

 msgid "Change your email, avatar, password, profile"
 msgstr "Change your e-mail, avatar, password, profile"
 
 msgid "Change your email, avatar, password, profile"
 msgstr "Change your e-mail, avatar, password, profile"
 

-#: lib/action.php:435
+#: lib/action.php:438

 msgid "Connect"
 msgstr "Connect"
 
 msgid "Connect"
 msgstr "Connect"
 

-#: lib/action.php:435
+#: lib/action.php:438

 #, fuzzy
 msgid "Connect to services"
 msgstr "Could not redirect to server: %s"
 
 #, fuzzy
 msgid "Connect to services"
 msgstr "Could not redirect to server: %s"
 

-#: lib/action.php:439 lib/subgroupnav.php:105
+#: lib/action.php:442
+#, fuzzy
+msgid "Change site configuration"
+msgstr "Primary site navigation"
+
+#: lib/action.php:446 lib/subgroupnav.php:105

 msgid "Invite"
 msgstr "Invite"
 
 msgid "Invite"
 msgstr "Invite"
 

-#: lib/action.php:440 lib/subgroupnav.php:106
+#: lib/action.php:447 lib/subgroupnav.php:106

 #, php-format
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Invite friends and colleagues to join you on %s"
 
 #, php-format
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Invite friends and colleagues to join you on %s"
 

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

 msgid "Logout"
 msgstr "Logout"
 
 msgid "Logout"
 msgstr "Logout"
 

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

 msgid "Logout from the site"
 msgstr "Logout from the site"
 
 msgid "Logout from the site"
 msgstr "Logout from the site"
 

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

 msgid "Create an account"
 msgstr "Create an account"
 
 msgid "Create an account"
 msgstr "Create an account"
 

-#: lib/action.php:453
+#: lib/action.php:460

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

-#: lib/action.php:456 lib/action.php:719
+#: lib/action.php:463 lib/action.php:726

 msgid "Help"
 msgstr "Help"
 
 msgid "Help"
 msgstr "Help"
 

-#: lib/action.php:456
+#: lib/action.php:463

 msgid "Help me!"
 msgstr "Help me!"
 
 msgid "Help me!"
 msgstr "Help me!"
 

-#: lib/action.php:459
+#: lib/action.php:466 lib/searchaction.php:127

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

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

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

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

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

-#: lib/action.php:546
+#: lib/action.php:553

 msgid "Local views"
 msgstr "Local views"
 
 msgid "Local views"
 msgstr "Local views"
 

-#: lib/action.php:612
+#: lib/action.php:619

 msgid "Page notice"
 msgstr "Page notice"
 
 msgid "Page notice"
 msgstr "Page notice"
 

-#: lib/action.php:714
+#: lib/action.php:721

 msgid "Secondary site navigation"
 msgstr "Secondary site navigation"
 
 msgid "Secondary site navigation"
 msgstr "Secondary site navigation"
 

-#: lib/action.php:721
+#: lib/action.php:728

 msgid "About"
 msgstr "About"
 
 msgid "About"
 msgstr "About"
 

-#: lib/action.php:723
+#: lib/action.php:730

 msgid "FAQ"
 msgstr "F.A.Q."
 
 msgid "FAQ"
 msgstr "F.A.Q."
 

-#: lib/action.php:727
+#: lib/action.php:734

 msgid "TOS"
 msgstr ""
 
 msgid "TOS"
 msgstr ""
 

-#: lib/action.php:730
+#: lib/action.php:737

 msgid "Privacy"
 msgstr "Privacy"
 
 msgid "Privacy"
 msgstr "Privacy"
 

-#: lib/action.php:732
+#: lib/action.php:739

 msgid "Source"
 msgstr "Source"
 
 msgid "Source"
 msgstr "Source"
 

-#: lib/action.php:734
+#: lib/action.php:743

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

-#: lib/action.php:736
-#, fuzzy
+#: lib/action.php:745

 msgid "Badge"
 msgid "Badge"

-msgstr "Nudge"
+msgstr "Badge"

 
 

-#: lib/action.php:764
+#: lib/action.php:773

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

-#: lib/action.php:767
+#: lib/action.php:776

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


@@ -3557,12 +4282,12 @@ msgstr ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
 "broughtby%%](%%site.broughtbyurl%%)."
 
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
 "broughtby%%](%%site.broughtbyurl%%)."
 

-#: lib/action.php:769
+#: lib/action.php:778

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

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

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


@@ -3573,35 +4298,73 @@ msgstr ""
 "s, available under the [GNU Affero General Public Licence](http://www.fsf."
 "org/licensing/licenses/agpl-3.0.html)."
 
 "s, available under the [GNU Affero General Public Licence](http://www.fsf."
 "org/licensing/licenses/agpl-3.0.html)."
 

-#: lib/action.php:785
-#, fuzzy
+#: lib/action.php:794

 msgid "Site content license"
 msgid "Site content license"

-msgstr "StatusNet software licence"
+msgstr "Site content license"

 
 

-#: lib/action.php:794
+#: lib/action.php:803

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

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

 msgid "license."
 msgstr "licence."
 
 msgid "license."
 msgstr "licence."
 

-#: lib/action.php:1052
+#: lib/action.php:1102

 msgid "Pagination"
 msgstr "Pagination"
 
 msgid "Pagination"
 msgstr "Pagination"
 

-#: lib/action.php:1061
+#: lib/action.php:1111

 msgid "After"
 msgstr "After"
 
 msgid "After"
 msgstr "After"
 

-#: lib/action.php:1069
+#: lib/action.php:1119

 msgid "Before"
 msgstr "Before"
 
 msgid "Before"
 msgstr "Before"
 

-#: lib/action.php:1117
+#: lib/action.php:1167

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

+#: lib/adminpanelaction.php:96
+#, fuzzy
+msgid "You cannot make changes to this site."
+msgstr "You can't send a message to this user."
+
+#: lib/adminpanelaction.php:107
+#, fuzzy
+msgid "Changes to that panel are not allowed."
+msgstr "Registration not allowed."
+
+#: lib/adminpanelaction.php:206
+#, fuzzy
+msgid "showForm() not implemented."
+msgstr "Command not yet implemented."
+
+#: lib/adminpanelaction.php:235
+#, fuzzy
+msgid "saveSettings() not implemented."
+msgstr "Command not yet implemented."
+
+#: lib/adminpanelaction.php:258
+#, fuzzy
+msgid "Unable to delete design setting."
+msgstr "Unable to save your design settings!"
+
+#: lib/adminpanelaction.php:312
+#, fuzzy
+msgid "Basic site configuration"
+msgstr "E-mail address confirmation"
+
+#: lib/adminpanelaction.php:317
+msgid "Design configuration"
+msgstr "Design configuration"
+
+#: lib/adminpanelaction.php:322 lib/adminpanelaction.php:327
+#, fuzzy
+msgid "Paths configuration"
+msgstr "SMS confirmation"
+

 #: lib/attachmentlist.php:87
 msgid "Attachments"
 msgstr ""
 #: lib/attachmentlist.php:87
 msgid "Attachments"
 msgstr ""


@@ -3623,11 +4386,21 @@ msgstr ""
 msgid "Tags for this attachment"
 msgstr ""
 
 msgid "Tags for this attachment"
 msgstr ""
 

+#: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187
+#, fuzzy
+msgid "Password changing failed"
+msgstr "Password change"
+
+#: lib/authenticationplugin.php:197
+#, fuzzy
+msgid "Password changing is not allowed"
+msgstr "Password change"
+

 #: lib/channel.php:138 lib/channel.php:158
 msgid "Command results"
 msgstr "Command results"
 
 #: lib/channel.php:138 lib/channel.php:158
 msgid "Command results"
 msgstr "Command results"
 

-#: lib/channel.php:210
+#: lib/channel.php:210 lib/mailhandler.php:142

 msgid "Command complete"
 msgstr "Command complete"
 
 msgid "Command complete"
 msgstr "Command complete"
 


@@ -3640,18 +4413,18 @@ msgid "Sorry, this command is not yet implemented."
 msgstr "Sorry, this command is not yet implemented."
 
 #: lib/command.php:88
 msgstr "Sorry, this command is not yet implemented."
 
 #: lib/command.php:88

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

 msgid "Could not find a user with nickname %s"
 msgid "Could not find a user with nickname %s"

-msgstr "Couldn't update user with confirmed e-mail address."
+msgstr "Could not find a user with nickname %s"

 
 #: lib/command.php:92
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr ""
 
 #: lib/command.php:99
 
 #: lib/command.php:92
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr ""
 
 #: lib/command.php:99

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

 msgid "Nudge sent to %s"
 msgid "Nudge sent to %s"

-msgstr "Nudge sent"
+msgstr "Nudge sent to %s"

 
 #: lib/command.php:126
 #, php-format
 
 #: lib/command.php:126
 #, php-format


@@ -3661,11 +4434,13 @@ msgid ""
 "Notices: %3$s"
 msgstr ""
 
 "Notices: %3$s"
 msgstr ""
 

-#: lib/command.php:152 lib/command.php:400
+#: lib/command.php:152 lib/command.php:390 lib/command.php:451
+#, fuzzy

 msgid "Notice with that id does not exist"
 msgid "Notice with that id does not exist"

-msgstr ""
+msgstr "No profile with that id."

 
 

-#: lib/command.php:168 lib/command.php:416 lib/command.php:471
+#: lib/command.php:168 lib/command.php:406 lib/command.php:467
+#: lib/command.php:523

 msgid "User has no last notice"
 msgstr "User has no last notice"
 
 msgid "User has no last notice"
 msgstr "User has no last notice"
 


@@ -3673,134 +4448,177 @@ msgstr "User has no last notice"
 msgid "Notice marked as fave."
 msgstr "Notice marked as fave."
 
 msgid "Notice marked as fave."
 msgstr "Notice marked as fave."
 

-#: lib/command.php:315
+#: lib/command.php:217
+msgid "You are already a member of that group"
+msgstr "You are already a member of that group."
+
+#: lib/command.php:231

 #, php-format
 #, php-format

-msgid "%1$s (%2$s)"
-msgstr "%1$s (%2$s)"
+msgid "Could not join user %s to group %s"
+msgstr "Could not join user %s to group %s."

 
 

-#: lib/command.php:318
+#: lib/command.php:236
+#, php-format
+msgid "%s joined group %s"
+msgstr "%s joined group %s"
+
+#: lib/command.php:275
+#, php-format
+msgid "Could not remove user %s to group %s"
+msgstr "Could not remove user %s to group %s"
+
+#: lib/command.php:280
+#, php-format
+msgid "%s left group %s"
+msgstr "%s left group %s"
+
+#: lib/command.php:309

 #, php-format
 msgid "Fullname: %s"
 msgstr "Fullname: %s"
 
 #, php-format
 msgid "Fullname: %s"
 msgstr "Fullname: %s"
 

-#: lib/command.php:321
+#: lib/command.php:312 lib/mail.php:254

 #, php-format
 msgid "Location: %s"
 msgstr "Location: %s"
 
 #, php-format
 msgid "Location: %s"
 msgstr "Location: %s"
 

-#: lib/command.php:324
+#: lib/command.php:315 lib/mail.php:256

 #, php-format
 msgid "Homepage: %s"
 msgstr "Homepage: %s"
 
 #, php-format
 msgid "Homepage: %s"
 msgstr "Homepage: %s"
 

-#: lib/command.php:327
+#: lib/command.php:318

 #, php-format
 msgid "About: %s"
 msgstr "About: %s"
 
 #, php-format
 msgid "About: %s"
 msgstr "About: %s"
 

-#: lib/command.php:358 scripts/xmppdaemon.php:321
-#, fuzzy, php-format
+#: lib/command.php:349
+#, php-format

 msgid "Message too long - maximum is %d characters, you sent %d"
 msgid "Message too long - maximum is %d characters, you sent %d"

-msgstr "Message too long - maximum is 140 characters, you sent %d"
+msgstr "Message too long - maximum is %d characters, you sent %d"
+
+#: lib/command.php:367
+#, php-format
+msgid "Direct message to %s sent"
+msgstr "Direct message to %s sent"

 
 

-#: lib/command.php:377
+#: lib/command.php:369

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

-#: lib/command.php:431
+#: lib/command.php:413
+msgid "Cannot repeat your own notice"
+msgstr "Cannot repeat your own notice."
+
+#: lib/command.php:418
+msgid "Already repeated that notice"
+msgstr "Already repeated that notice."
+
+#: lib/command.php:426

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

+msgid "Notice from %s repeated"
+msgstr "Notice posted"
+
+#: lib/command.php:428
+#, fuzzy
+msgid "Error repeating notice."
+msgstr "Error saving notice."
+
+#: lib/command.php:482
+#, php-format

 msgid "Notice too long - maximum is %d characters, you sent %d"
 msgid "Notice too long - maximum is %d characters, you sent %d"

-msgstr "Message too long - maximum is 140 characters, you sent %d"
+msgstr "Notice too long - maximum is %d characters, you sent %d"

 
 

-#: lib/command.php:439
-#, fuzzy, php-format
+#: lib/command.php:491
+#, php-format

 msgid "Reply to %s sent"
 msgid "Reply to %s sent"

-msgstr "Reply to this notice"
+msgstr "Reply to %s sent"

 
 

-#: lib/command.php:441
-#, fuzzy
+#: lib/command.php:493

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

-msgstr "Problem saving notice."
+msgstr "Error saving notice."

 
 

-#: lib/command.php:495
+#: lib/command.php:547

 msgid "Specify the name of the user to subscribe to"
 msgstr "Specify the name of the user to subscribe to"
 
 msgid "Specify the name of the user to subscribe to"
 msgstr "Specify the name of the user to subscribe to"
 

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

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

-#: lib/command.php:523
+#: lib/command.php:575

 msgid "Specify the name of the user to unsubscribe from"
 msgstr "Specify the name of the user to unsubscribe from"
 
 msgid "Specify the name of the user to unsubscribe from"
 msgstr "Specify the name of the user to unsubscribe from"
 

-#: lib/command.php:530
+#: lib/command.php:582

 #, php-format
 msgid "Unsubscribed from %s"
 msgstr "Unsubscribed from %s"
 
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr "Unsubscribed from %s"
 

-#: lib/command.php:548 lib/command.php:571
+#: lib/command.php:600 lib/command.php:623

 msgid "Command not yet implemented."
 msgstr "Command not yet implemented."
 
 msgid "Command not yet implemented."
 msgstr "Command not yet implemented."
 

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

 msgid "Notification off."
 msgstr "Notification off."
 
 msgid "Notification off."
 msgstr "Notification off."
 

-#: lib/command.php:553
+#: lib/command.php:605

 msgid "Can't turn off notification."
 msgstr "Can't turn off notification."
 
 msgid "Can't turn off notification."
 msgstr "Can't turn off notification."
 

-#: lib/command.php:574
+#: lib/command.php:626

 msgid "Notification on."
 msgstr "Notification on."
 
 msgid "Notification on."
 msgstr "Notification on."
 

-#: lib/command.php:576
+#: lib/command.php:628

 msgid "Can't turn on notification."
 msgstr "Can't turn on notification."
 
 msgid "Can't turn on notification."
 msgstr "Can't turn on notification."
 

-#: lib/command.php:597
-#, fuzzy, php-format
-msgid "Could not create login token for %s"
-msgstr "Could not create OpenID from: %s"
+#: lib/command.php:641
+msgid "Login command is disabled"
+msgstr ""

 
 

-#: lib/command.php:602
+#: lib/command.php:652

 #, php-format
 msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
 
 #, php-format
 msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
 

-#: lib/command.php:618
+#: lib/command.php:668

 #, fuzzy
 msgid "You are not subscribed to anyone."
 msgstr "You are not subscribed to that profile."
 
 #, fuzzy
 msgid "You are not subscribed to anyone."
 msgstr "You are not subscribed to that profile."
 

-#: lib/command.php:620
-#, fuzzy
-msgid "You are subscribed to these people: "
-msgstr "You are not subscribed to that profile."
+#: lib/command.php:670
+msgid "You are subscribed to this person:"
+msgid_plural "You are subscribed to these people:"
+msgstr[0] "You are already subscribed to these users:"
+msgstr[1] "You are already subscribed to these users:"

 
 

-#: lib/command.php:637
+#: lib/command.php:690

 #, fuzzy
 msgid "No one is subscribed to you."
 msgstr "Could not subscribe other to you."
 
 #, fuzzy
 msgid "No one is subscribed to you."
 msgstr "Could not subscribe other to you."
 

-#: lib/command.php:639
-#, fuzzy
-msgid "These people are subscribed to you: "
-msgstr "People subscribed to %s"
+#: lib/command.php:692
+msgid "This person is subscribed to you:"
+msgid_plural "These people are subscribed to you:"
+msgstr[0] "Could not subscribe other to you."
+msgstr[1] "Could not subscribe other to you."

 
 

-#: lib/command.php:656
+#: lib/command.php:712

 #, fuzzy
 msgid "You are not a member of any groups."
 msgstr "You are not a member of that group."
 
 #, fuzzy
 msgid "You are not a member of any groups."
 msgstr "You are not a member of that group."
 

-#: lib/command.php:658
-#, fuzzy
-msgid "You are a member of these groups: "
-msgstr "You are not a member of that group."
-
-#: lib/command.php:670
+#: lib/command.php:714
+msgid "You are a member of this group:"
+msgid_plural "You are a member of these groups:"
+msgstr[0] "You are not a member of that group."
+msgstr[1] "You are not a member of that group."
+
+#: lib/command.php:728

 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"


@@ -3816,6 +4634,8 @@ msgid ""
 "whois <nickname> - get profile info on user\n"
 "fav <nickname> - add user's last notice as a 'fave'\n"
 "fav #<notice_id> - add notice with the given id as a 'fave'\n"
 "whois <nickname> - get profile info on user\n"
 "fav <nickname> - add user's last notice as a 'fave'\n"
 "fav #<notice_id> - add notice with the given id as a 'fave'\n"

+"repeat #<notice_id> - repeat a notice with a given id\n"
+"repeat <nickname> - repeat the last notice from user\n"

 "reply #<notice_id> - reply to notice with a given id\n"
 "reply <nickname> - reply to the last notice from user\n"
 "join <group> - join group\n"
 "reply #<notice_id> - reply to notice with a given id\n"
 "reply <nickname> - reply to the last notice from user\n"
 "join <group> - join group\n"


@@ -3839,22 +4659,21 @@ msgid ""
 "tracking - not yet implemented.\n"
 msgstr ""
 
 "tracking - not yet implemented.\n"
 msgstr ""
 

-#: lib/common.php:192
+#: lib/common.php:131

 msgid "No configuration file found. "
 msgstr "No configuration file found"
 
 msgid "No configuration file found. "
 msgstr "No configuration file found"
 

-#: lib/common.php:193
+#: lib/common.php:132

 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:194
+#: lib/common.php:134

 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:195
-#, fuzzy
+#: lib/common.php:135

 msgid "Go to the installer."
 msgid "Go to the installer."

-msgstr "Login to the site"
+msgstr "Go to the installer."

 
 #: lib/connectsettingsaction.php:110
 msgid "IM"
 
 #: lib/connectsettingsaction.php:110
 msgid "IM"


@@ -3872,84 +4691,18 @@ msgstr "Updates by SMS"
 msgid "Database error"
 msgstr ""
 
 msgid "Database error"
 msgstr ""
 

-#: lib/designsettings.php:101
-msgid "Change background image"
-msgstr ""
-

 #: lib/designsettings.php:105
 #, fuzzy
 msgid "Upload file"
 msgstr "Upload"
 
 #: lib/designsettings.php:109
 #: lib/designsettings.php:105
 #, fuzzy
 msgid "Upload file"
 msgstr "Upload"
 
 #: lib/designsettings.php:109

-msgid ""
-"You can upload your personal background image. The maximum file size is 2Mb."
-msgstr ""
-
-#: lib/designsettings.php:139
-msgid "On"
-msgstr ""
-
-#: lib/designsettings.php:155
-msgid "Off"
-msgstr ""
-
-#: lib/designsettings.php:156
-msgid "Turn background image on or off."
-msgstr ""
-
-#: lib/designsettings.php:161
-msgid "Tile background image"
-msgstr ""
-
-#: lib/designsettings.php:170
-msgid "Change colours"
-msgstr "Change colours"
-
-#: lib/designsettings.php:178
-msgid "Background"
-msgstr ""
-
-#: lib/designsettings.php:191
-#, fuzzy
-msgid "Content"
-msgstr "Connect"
-
-#: lib/designsettings.php:204
-#, fuzzy
-msgid "Sidebar"
-msgstr "Search"
-
-#: lib/designsettings.php:217
-msgid "Text"
-msgstr "Text"
-
-#: lib/designsettings.php:230

 #, fuzzy
 #, fuzzy

-msgid "Links"
-msgstr "Login"
-
-#: lib/designsettings.php:247
-msgid "Use defaults"
-msgstr ""
-
-#: lib/designsettings.php:248
-msgid "Restore default designs"
-msgstr ""
-
-#: lib/designsettings.php:254
-msgid "Reset back to default"
-msgstr ""
-
-#: lib/designsettings.php:257
-msgid "Save design"
-msgstr ""
-
-#: lib/designsettings.php:372
-msgid "Bad default color settings: "
-msgstr "Bad default colour settings: "
+msgid ""
+"You can upload your personal background image. The maximum file size is 2MB."
+msgstr "You can upload your personal avatar. The maximum file size is %s."

 
 

-#: lib/designsettings.php:468
+#: lib/designsettings.php:418

 msgid "Design defaults restored."
 msgstr ""
 
 msgid "Design defaults restored."
 msgstr ""
 


@@ -3965,10 +4718,6 @@ msgstr "Favour this notice"
 msgid "Favor"
 msgstr "Favour"
 
 msgid "Favor"
 msgstr "Favour"
 

-#: lib/feedlist.php:64
-msgid "Export data"
-msgstr "Export data"
-

 #: lib/feed.php:85
 msgid "RSS 1.0"
 msgstr ""
 #: lib/feed.php:85
 msgid "RSS 1.0"
 msgstr ""


@@ -3985,6 +4734,10 @@ msgstr ""
 msgid "FOAF"
 msgstr ""
 
 msgid "FOAF"
 msgstr ""
 

+#: lib/feedlist.php:64
+msgid "Export data"
+msgstr "Export data"
+

 #: lib/galleryaction.php:121
 msgid "Filter tags"
 msgstr "Filter tags"
 #: lib/galleryaction.php:121
 msgid "Filter tags"
 msgstr "Filter tags"


@@ -4022,10 +4775,6 @@ msgstr "Describe the group or topic"
 msgid "Describe the group or topic in %d characters"
 msgstr "Describe the group or topic in %d characters"
 
 msgid "Describe the group or topic in %d characters"
 msgstr "Describe the group or topic in %d characters"
 

-#: lib/groupeditform.php:172
-msgid "Description"
-msgstr "Description"
-

 #: lib/groupeditform.php:179
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\""
 #: lib/groupeditform.php:179
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\""


@@ -4037,19 +4786,18 @@ msgstr ""
 msgid "Extra nicknames for the group, comma- or space- separated, max %d"
 msgstr ""
 
 msgid "Extra nicknames for the group, comma- or space- separated, max %d"
 msgstr ""
 

-#: lib/groupnav.php:85 lib/searchgroupnav.php:84
+#: lib/groupnav.php:85

 msgid "Group"
 msgstr "Group"
 
 #: lib/groupnav.php:101
 msgid "Group"
 msgstr "Group"
 
 #: lib/groupnav.php:101

-#, fuzzy

 msgid "Blocked"
 msgid "Blocked"

-msgstr "Block"
+msgstr "Blocked"

 
 #: lib/groupnav.php:102
 
 #: lib/groupnav.php:102

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

 msgid "%s blocked users"
 msgid "%s blocked users"

-msgstr "Block user"
+msgstr "%s blocked users"

 
 #: lib/groupnav.php:108
 #, php-format
 
 #: lib/groupnav.php:108
 #, php-format


@@ -4066,9 +4814,9 @@ msgid "Add or edit %s logo"
 msgstr "Add or edit %s logo"
 
 #: lib/groupnav.php:120
 msgstr "Add or edit %s logo"
 
 #: lib/groupnav.php:120

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

 msgid "Add or edit %s design"
 msgid "Add or edit %s design"

-msgstr "Add or edit %s logo"
+msgstr "Add or edit %s design"

 
 #: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
 
 #: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"


@@ -4083,7 +4831,7 @@ msgstr "Groups with most posts"
 msgid "Tags in %s group's notices"
 msgstr "Tags in %s group's notices"
 
 msgid "Tags in %s group's notices"
 msgstr "Tags in %s group's notices"
 

-#: lib/htmloutputter.php:104
+#: lib/htmloutputter.php:103

 msgid "This page is not available in a media type you accept"
 msgstr "This page is not available in a media type you accept"
 
 msgid "This page is not available in a media type you accept"
 msgstr "This page is not available in a media type you accept"
 


@@ -4116,11 +4864,24 @@ msgstr "Lost our file."
 msgid "Unknown file type"
 msgstr "Unknown file type"
 
 msgid "Unknown file type"
 msgstr "Unknown file type"
 

-#: lib/jabber.php:192
+#: lib/imagefile.php:217
+msgid "MB"
+msgstr ""
+
+#: lib/imagefile.php:219
+msgid "kB"
+msgstr ""
+
+#: lib/jabber.php:202

 #, php-format
 msgid "[%s]"
 msgstr ""
 
 #, php-format
 msgid "[%s]"
 msgstr ""
 

+#: lib/jabber.php:385
+#, php-format
+msgid "Unknown inbox source %d."
+msgstr ""
+

 #: lib/joinform.php:114
 msgid "Join"
 msgstr "Join"
 #: lib/joinform.php:114
 msgid "Join"
 msgstr "Join"


@@ -4137,21 +4898,6 @@ msgstr "Login with a username and password"
 msgid "Sign up for a new account"
 msgstr "Sign up for a new account"
 
 msgid "Sign up for a new account"
 msgstr "Sign up for a new account"
 

-#: lib/mailbox.php:89
-msgid "Only the user can read their own mailboxes."
-msgstr "Only the user can read their own mailboxes."
-
-#: lib/mailbox.php:139
-msgid ""
-"You have no private messages. You can send private message to engage other "
-"users in conversation. People can send you messages for your eyes only."
-msgstr ""
-
-#: lib/mailbox.php:227 lib/noticelist.php:424
-#, fuzzy
-msgid "from"
-msgstr "from"
-

 #: lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "E-mail address confirmation"
 #: lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "E-mail address confirmation"


@@ -4173,13 +4919,13 @@ msgid ""
 "%s\n"
 msgstr ""
 
 "%s\n"
 msgstr ""
 

-#: lib/mail.php:235
+#: lib/mail.php:236

 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s is now listening to your notices on %2$s."
 
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s is now listening to your notices on %2$s."
 

-#: lib/mail.php:240
-#, fuzzy, php-format
+#: lib/mail.php:241
+#, php-format

 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
 "\n"
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
 "\n"


@@ -4194,36 +4940,28 @@ msgid ""
 msgstr ""
 "%1$s is now listening to your notices on %2$s.\n"
 "\n"
 msgstr ""
 "%1$s is now listening to your notices on %2$s.\n"
 "\n"

-"\t%3$s\n"
+"%3$s\n"

 "\n"
 "\n"

+"%4$s%5$s%6$s\n"

 "Faithfully yours,\n"
 "Faithfully yours,\n"

-"%4$s.\n"
-
-#: lib/mail.php:253
-#, php-format
-msgid "Location: %s\n"
-msgstr "Location: %s\n"
-
-#: lib/mail.php:255
-#, php-format
-msgid "Homepage: %s\n"
-msgstr "Homepage: %s\n"
-
-#: lib/mail.php:257
-#, php-format
-msgid ""
-"Bio: %s\n"
+"%7$s.\n"

 "\n"
 "\n"

+"----\n"
+"Change your email address or notification options at %8$s\n"
+
+#: lib/mail.php:258
+#, fuzzy, php-format
+msgid "Bio: %s"

 msgstr ""
 "Bio: %s\n"
 "\n"
 
 msgstr ""
 "Bio: %s\n"
 "\n"
 

-#: lib/mail.php:285
+#: lib/mail.php:286

 #, php-format
 msgid "New email address for posting to %s"
 msgstr "New e-mail address for posting to %s"
 
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "New e-mail address for posting to %s"
 

-#: lib/mail.php:288
+#: lib/mail.php:289

 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"


@@ -4244,21 +4982,21 @@ msgstr ""
 "Faithfully yours,\n"
 "%4$s"
 
 "Faithfully yours,\n"
 "%4$s"
 

-#: lib/mail.php:412
+#: lib/mail.php:413

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

-#: lib/mail.php:438
+#: lib/mail.php:439

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

-#: lib/mail.php:462
+#: lib/mail.php:463

 #, php-format
 msgid "You've been nudged by %s"
 msgstr "You've been nudged by %s"
 
 #, php-format
 msgid "You've been nudged by %s"
 msgstr "You've been nudged by %s"
 

-#: lib/mail.php:466
+#: lib/mail.php:467

 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "


@@ -4274,12 +5012,12 @@ msgid ""
 "%4$s\n"
 msgstr ""
 
 "%4$s\n"
 msgstr ""
 

-#: lib/mail.php:509
+#: lib/mail.php:510

 #, php-format
 msgid "New private message from %s"
 msgstr "New private message from %s"
 
 #, php-format
 msgid "New private message from %s"
 msgstr "New private message from %s"
 

-#: lib/mail.php:513
+#: lib/mail.php:514

 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"


@@ -4298,12 +5036,12 @@ msgid ""
 "%5$s\n"
 msgstr ""
 
 "%5$s\n"
 msgstr ""
 

-#: lib/mail.php:554
-#, fuzzy, php-format
+#: lib/mail.php:559
+#, php-format

 msgid "%s (@%s) added your notice as a favorite"
 msgid "%s (@%s) added your notice as a favorite"

-msgstr "%s added your notice as a favourite"
+msgstr "%s (@%s) added your notice as a favorite"

 
 

-#: lib/mail.php:556
+#: lib/mail.php:561

 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"


@@ -4324,12 +5062,12 @@ msgid ""
 "%6$s\n"
 msgstr ""
 
 "%6$s\n"
 msgstr ""
 

-#: lib/mail.php:611
+#: lib/mail.php:624

 #, php-format
 msgid "%s (@%s) sent a notice to your attention"
 msgstr ""
 
 #, php-format
 msgid "%s (@%s) sent a notice to your attention"
 msgstr ""
 

-#: lib/mail.php:613
+#: lib/mail.php:626

 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"


@@ -4344,6 +5082,42 @@ msgid ""
 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

+#: lib/mailbox.php:89
+msgid "Only the user can read their own mailboxes."
+msgstr "Only the user can read their own mailboxes."
+
+#: lib/mailbox.php:139
+msgid ""
+"You have no private messages. You can send private message to engage other "
+"users in conversation. People can send you messages for your eyes only."
+msgstr ""
+
+#: lib/mailbox.php:227 lib/noticelist.php:477
+#, fuzzy
+msgid "from"
+msgstr "from"
+
+#: lib/mailhandler.php:37
+msgid "Could not parse message."
+msgstr "Could not parse message."
+
+#: lib/mailhandler.php:42
+msgid "Not a registered user."
+msgstr "Not a registered user."
+
+#: lib/mailhandler.php:46
+msgid "Sorry, that is not your incoming email address."
+msgstr "Sorry, that is not your incoming e-mail address."
+
+#: lib/mailhandler.php:50
+msgid "Sorry, no incoming email allowed."
+msgstr "Sorry, no incoming e-mail allowed."
+
+#: lib/mailhandler.php:228
+#, fuzzy, php-format
+msgid "Unsupported message type: %s"
+msgstr "Unsupported image file format."
+

 #: lib/mediafile.php:98 lib/mediafile.php:123
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
 #: lib/mediafile.php:98 lib/mediafile.php:123
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""


@@ -4375,7 +5149,7 @@ msgid "File upload stopped by extension."
 msgstr ""
 
 #: lib/mediafile.php:179 lib/mediafile.php:216
 msgstr ""
 
 #: lib/mediafile.php:179 lib/mediafile.php:216

-msgid "File exceeds user's quota!"
+msgid "File exceeds user's quota."

 msgstr ""
 
 #: lib/mediafile.php:196 lib/mediafile.php:233
 msgstr ""
 
 #: lib/mediafile.php:196 lib/mediafile.php:233


@@ -4383,7 +5157,8 @@ msgid "File could not be moved to destination directory."
 msgstr ""
 
 #: lib/mediafile.php:201 lib/mediafile.php:237
 msgstr ""
 
 #: lib/mediafile.php:201 lib/mediafile.php:237

-msgid "Could not determine file's mime-type!"
+#, fuzzy
+msgid "Could not determine file's MIME type."

 msgstr "Could not retrieve public stream."
 
 #: lib/mediafile.php:270
 msgstr "Could not retrieve public stream."
 
 #: lib/mediafile.php:270


@@ -4393,7 +5168,7 @@ msgstr ""
 
 #: lib/mediafile.php:275
 #, php-format
 
 #: lib/mediafile.php:275
 #, php-format

-msgid "%s is not a supported filetype on this server."
+msgid "%s is not a supported file type on this server."

 msgstr ""
 
 #: lib/messageform.php:120
 msgstr ""
 
 #: lib/messageform.php:120


@@ -4404,39 +5179,95 @@ msgstr "Send a direct notice"
 msgid "To"
 msgstr "To"
 
 msgid "To"
 msgstr "To"
 

-#: lib/messageform.php:162 lib/noticeform.php:173
+#: lib/messageform.php:159 lib/noticeform.php:185

 msgid "Available characters"
 msgstr "Available characters"
 
 msgid "Available characters"
 msgstr "Available characters"
 

-#: lib/noticeform.php:145
+#: lib/noticeform.php:160

 msgid "Send a notice"
 msgstr "Send a notice"
 
 msgid "Send a notice"
 msgstr "Send a notice"
 

-#: lib/noticeform.php:158
+#: lib/noticeform.php:173

 #, php-format
 msgid "What's up, %s?"
 msgstr "What's up, %s?"
 
 #, php-format
 msgid "What's up, %s?"
 msgstr "What's up, %s?"
 

-#: lib/noticeform.php:180
+#: lib/noticeform.php:192

 msgid "Attach"
 msgstr ""
 
 msgid "Attach"
 msgstr ""
 

-#: lib/noticeform.php:184
+#: lib/noticeform.php:196

 msgid "Attach a file"
 msgstr ""
 
 msgid "Attach a file"
 msgstr ""
 

-#: lib/noticelist.php:478
+#: lib/noticeform.php:212
+#, fuzzy
+msgid "Share my location"
+msgstr "Couldn't save tags."
+
+#: lib/noticeform.php:215
+#, fuzzy
+msgid "Do not share my location"
+msgstr "Couldn't save tags."
+
+#: lib/noticeform.php:216
+msgid "Hide this info"
+msgstr ""
+
+#: lib/noticeform.php:217
+msgid ""
+"Sorry, retrieving your geo location is taking longer than expected, please "
+"try again later"
+msgstr ""
+
+#: lib/noticelist.php:428
+#, php-format
+msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
+msgstr ""
+
+#: lib/noticelist.php:429
+#, fuzzy
+msgid "N"
+msgstr "No"
+
+#: lib/noticelist.php:429
+msgid "S"
+msgstr ""
+
+#: lib/noticelist.php:430
+msgid "E"
+msgstr ""
+
+#: lib/noticelist.php:430
+msgid "W"
+msgstr ""
+
+#: lib/noticelist.php:436
+msgid "at"
+msgstr ""
+
+#: lib/noticelist.php:531

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

-#: lib/noticelist.php:498
+#: lib/noticelist.php:556
+#, fuzzy
+msgid "Repeated by"
+msgstr "Created"
+
+#: lib/noticelist.php:585

 msgid "Reply to this notice"
 msgstr "Reply to this notice"
 
 msgid "Reply to this notice"
 msgstr "Reply to this notice"
 

-#: lib/noticelist.php:499
+#: lib/noticelist.php:586

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

+#: lib/noticelist.php:628
+#, fuzzy
+msgid "Notice repeated"
+msgstr "Notice deleted."
+

 #: lib/nudgeform.php:116
 msgid "Nudge this user"
 msgstr "Nudge this user"
 #: lib/nudgeform.php:116
 msgid "Nudge this user"
 msgstr "Nudge this user"


@@ -4462,11 +5293,14 @@ msgid "Error inserting remote profile"
 msgstr "Error inserting remote profile."
 
 #: lib/oauthstore.php:345
 msgstr "Error inserting remote profile."
 
 #: lib/oauthstore.php:345

-#, fuzzy

 msgid "Duplicate notice"
 msgid "Duplicate notice"

-msgstr "Delete notice"
+msgstr "Duplicate notice"
+
+#: lib/oauthstore.php:466 lib/subs.php:48
+msgid "You have been banned from subscribing."
+msgstr "You have been banned from subscribing."

 
 

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

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


@@ -4482,10 +5316,6 @@ msgstr "Replies"
 msgid "Favorites"
 msgstr "Favourites"
 
 msgid "Favorites"
 msgstr "Favourites"
 

-#: lib/personalgroupnav.php:115
-msgid "User"
-msgstr "User"
-

 #: lib/personalgroupnav.php:124
 msgid "Inbox"
 msgstr "Inbox"
 #: lib/personalgroupnav.php:124
 msgid "Inbox"
 msgstr "Inbox"


@@ -4507,7 +5337,12 @@ msgstr "Your sent messages"
 msgid "Tags in %s's notices"
 msgstr "Tags in %s's notices"
 
 msgid "Tags in %s's notices"
 msgstr "Tags in %s's notices"
 

-#: lib/profileaction.php:109 lib/profileaction.php:191 lib/subgroupnav.php:82
+#: lib/plugin.php:114
+#, fuzzy
+msgid "Unknown"
+msgstr "Unknown action"
+
+#: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82

 msgid "Subscriptions"
 msgstr "Subscriptions"
 
 msgid "Subscriptions"
 msgstr "Subscriptions"
 


@@ -4515,7 +5350,7 @@ msgstr "Subscriptions"
 msgid "All subscriptions"
 msgstr "All subscriptions"
 
 msgid "All subscriptions"
 msgstr "All subscriptions"
 

-#: lib/profileaction.php:140 lib/profileaction.php:200 lib/subgroupnav.php:90
+#: lib/profileaction.php:140 lib/profileaction.php:201 lib/subgroupnav.php:90

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


@@ -4523,19 +5358,27 @@ msgstr "Subscribers"
 msgid "All subscribers"
 msgstr "All subscribers"
 
 msgid "All subscribers"
 msgstr "All subscribers"
 

-#: lib/profileaction.php:177
-#, fuzzy
+#: lib/profileaction.php:178

 msgid "User ID"
 msgid "User ID"

-msgstr "User"
+msgstr "User ID"

 
 

-#: lib/profileaction.php:182
+#: lib/profileaction.php:183

 msgid "Member since"
 msgstr "Member since"
 
 msgid "Member since"
 msgstr "Member since"
 

-#: lib/profileaction.php:235
+#: lib/profileaction.php:245

 msgid "All groups"
 msgstr "All groups"
 
 msgid "All groups"
 msgstr "All groups"
 

+#: lib/profileformaction.php:123
+#, fuzzy
+msgid "No return-to arguments."
+msgstr "No id argument."
+
+#: lib/profileformaction.php:137
+msgid "Unimplemented method."
+msgstr ""
+

 #: lib/publicgroupnav.php:78
 msgid "Public"
 msgstr "Public"
 #: lib/publicgroupnav.php:78
 msgid "Public"
 msgstr "Public"


@@ -4556,15 +5399,36 @@ msgstr "Featured"
 msgid "Popular"
 msgstr "Popular"
 
 msgid "Popular"
 msgstr "Popular"
 

+#: lib/repeatform.php:107
+#, fuzzy
+msgid "Repeat this notice?"
+msgstr "Reply to this notice"
+
+#: lib/repeatform.php:132
+#, fuzzy
+msgid "Repeat this notice"
+msgstr "Reply to this notice"
+
+#: lib/sandboxform.php:67
+msgid "Sandbox"
+msgstr "Sandbox"
+
+#: lib/sandboxform.php:78
+msgid "Sandbox this user"
+msgstr "Sandbox this user"
+

 #: lib/searchaction.php:120
 #, fuzzy
 msgid "Search site"
 msgstr "Search"
 
 #: lib/searchaction.php:120
 #, fuzzy
 msgid "Search site"
 msgstr "Search"
 

+#: lib/searchaction.php:126
+msgid "Keyword(s)"
+msgstr ""
+

 #: lib/searchaction.php:162
 #: lib/searchaction.php:162

-#, fuzzy

 msgid "Search help"
 msgid "Search help"

-msgstr "Search"
+msgstr "Search help"

 
 #: lib/searchgroupnav.php:80
 msgid "People"
 
 #: lib/searchgroupnav.php:80
 msgid "People"


@@ -4574,10 +5438,6 @@ msgstr "People"
 msgid "Find people on this site"
 msgstr "Find people on this site"
 
 msgid "Find people on this site"
 msgstr "Find people on this site"
 

-#: lib/searchgroupnav.php:82
-msgid "Notice"
-msgstr "Notice"
-

 #: lib/searchgroupnav.php:83
 msgid "Find content of notices"
 msgstr "Find content of notices"
 #: lib/searchgroupnav.php:83
 msgid "Find content of notices"
 msgstr "Find content of notices"


@@ -4594,6 +5454,14 @@ msgstr "Untitled section"
 msgid "More..."
 msgstr ""
 
 msgid "More..."
 msgstr ""
 

+#: lib/silenceform.php:67
+msgid "Silence"
+msgstr "Silence"
+
+#: lib/silenceform.php:78
+msgid "Silence this user"
+msgstr "Silence this user"
+

 #: lib/subgroupnav.php:83
 #, php-format
 msgid "People %s subscribes to"
 #: lib/subgroupnav.php:83
 #, php-format
 msgid "People %s subscribes to"


@@ -4609,45 +5477,46 @@ msgstr "People subscribed to %s"
 msgid "Groups %s is a member of"
 msgstr "Groups %s is a member of"
 
 msgid "Groups %s is a member of"
 msgstr "Groups %s is a member of"
 

-#: lib/subscriberspeopleselftagcloudsection.php:48
-#: lib/subscriptionspeopleselftagcloudsection.php:48
-msgid "People Tagcloud as self-tagged"
-msgstr ""
-
-#: lib/subscriberspeopletagcloudsection.php:48
-#: lib/subscriptionspeopletagcloudsection.php:48
-msgid "People Tagcloud as tagged"
-msgstr ""
-
-#: lib/subscriptionlist.php:126
-msgid "(none)"
-msgstr "(none)"
-
-#: lib/subs.php:48
+#: lib/subs.php:52

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

-#: lib/subs.php:52
+#: lib/subs.php:56

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

-#: lib/subs.php:56
+#: lib/subs.php:63

 msgid "Could not subscribe."
 msgstr "Could not subscribe."
 
 msgid "Could not subscribe."
 msgstr "Could not subscribe."
 

-#: lib/subs.php:75
+#: lib/subs.php:82

 msgid "Could not subscribe other to you."
 msgstr "Could not subscribe other to you."
 
 msgid "Could not subscribe other to you."
 msgstr "Could not subscribe other to you."
 

-#: lib/subs.php:124
+#: lib/subs.php:137

 #, fuzzy
 msgid "Not subscribed!"
 msgstr "Not subscribed!"
 
 #, fuzzy
 msgid "Not subscribed!"
 msgstr "Not subscribed!"
 

-#: lib/subs.php:136
+#: lib/subs.php:142
+#, fuzzy
+msgid "Couldn't delete self-subscription."
+msgstr "Couldn't delete subscription."
+
+#: lib/subs.php:158

 msgid "Couldn't delete subscription."
 msgstr "Couldn't delete subscription."
 
 msgid "Couldn't delete subscription."
 msgstr "Couldn't delete subscription."
 

+#: lib/subscriberspeopleselftagcloudsection.php:48
+#: lib/subscriptionspeopleselftagcloudsection.php:48
+msgid "People Tagcloud as self-tagged"
+msgstr ""
+
+#: lib/subscriberspeopletagcloudsection.php:48
+#: lib/subscriptionspeopletagcloudsection.php:48
+msgid "People Tagcloud as tagged"
+msgstr ""
+

 #: lib/tagcloudsection.php:56
 msgid "None"
 msgstr "None"
 #: lib/tagcloudsection.php:56
 msgid "None"
 msgstr "None"


@@ -4656,6 +5525,22 @@ msgstr "None"
 msgid "Top posters"
 msgstr "Top posters"
 
 msgid "Top posters"
 msgstr "Top posters"
 

+#: lib/unsandboxform.php:69
+msgid "Unsandbox"
+msgstr ""
+
+#: lib/unsandboxform.php:80
+msgid "Unsandbox this user"
+msgstr "Unsandbox this user"
+
+#: lib/unsilenceform.php:67
+msgid "Unsilence"
+msgstr ""
+
+#: lib/unsilenceform.php:78
+msgid "Unsilence this user"
+msgstr "Unsilence this user"
+

 #: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
 msgid "Unsubscribe from this user"
 msgstr "Unsubscribe from this user"
 #: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
 msgid "Unsubscribe from this user"
 msgstr "Unsubscribe from this user"


@@ -4688,47 +5573,51 @@ msgstr "Send a direct message to this user"
 msgid "Message"
 msgstr "Message"
 
 msgid "Message"
 msgstr "Message"
 

-#: lib/util.php:821
+#: lib/userprofile.php:311
+msgid "Moderate"
+msgstr ""
+
+#: lib/util.php:877

 msgid "a few seconds ago"
 msgstr "a few seconds ago"
 
 msgid "a few seconds ago"
 msgstr "a few seconds ago"
 

-#: lib/util.php:823
+#: lib/util.php:879

 msgid "about a minute ago"
 msgstr "about a minute ago"
 
 msgid "about a minute ago"
 msgstr "about a minute ago"
 

-#: lib/util.php:825
+#: lib/util.php:881

 #, php-format
 msgid "about %d minutes ago"
 msgstr "about %d minutes ago"
 
 #, php-format
 msgid "about %d minutes ago"
 msgstr "about %d minutes ago"
 

-#: lib/util.php:827
+#: lib/util.php:883

 msgid "about an hour ago"
 msgstr "about an hour ago"
 
 msgid "about an hour ago"
 msgstr "about an hour ago"
 

-#: lib/util.php:829
+#: lib/util.php:885

 #, php-format
 msgid "about %d hours ago"
 msgstr "about %d hours ago"
 
 #, php-format
 msgid "about %d hours ago"
 msgstr "about %d hours ago"
 

-#: lib/util.php:831
+#: lib/util.php:887

 msgid "about a day ago"
 msgstr "about a day ago"
 
 msgid "about a day ago"
 msgstr "about a day ago"
 

-#: lib/util.php:833
+#: lib/util.php:889

 #, php-format
 msgid "about %d days ago"
 msgstr "about %d days ago"
 
 #, php-format
 msgid "about %d days ago"
 msgstr "about %d days ago"
 

-#: lib/util.php:835
+#: lib/util.php:891

 msgid "about a month ago"
 msgstr "about a month ago"
 
 msgid "about a month ago"
 msgstr "about a month ago"
 

-#: lib/util.php:837
+#: lib/util.php:893

 #, php-format
 msgid "about %d months ago"
 msgstr "about %d months ago"
 
 #, php-format
 msgid "about %d months ago"
 msgstr "about %d months ago"
 

-#: lib/util.php:839
+#: lib/util.php:895

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


@@ -4740,20 +5629,9 @@ msgstr "%s is not a valid colour!"
 #: lib/webcolor.php:123
 #, php-format
 msgid "%s is not a valid color! Use 3 or 6 hex chars."
 #: lib/webcolor.php:123
 #, php-format
 msgid "%s is not a valid color! Use 3 or 6 hex chars."

-msgstr ""
-
-#: scripts/maildaemon.php:48
-msgid "Could not parse message."
-msgstr "Could not parse message."
-
-#: scripts/maildaemon.php:53
-msgid "Not a registered user."
-msgstr "Not a registered user."
-
-#: scripts/maildaemon.php:57
-msgid "Sorry, that is not your incoming email address."
-msgstr "Sorry, that is not your incoming e-mail address."
+msgstr "%s is not a valid colour! Use 3 or 6 hex chars."

 
 

-#: scripts/maildaemon.php:61
-msgid "Sorry, no incoming email allowed."
-msgstr "Sorry, no incoming e-mail allowed."
+#: scripts/xmppdaemon.php:301
+#, fuzzy, php-format
+msgid "Message too long - maximum is %1$d characters, you sent %2$d."
+msgstr "Message too long - maximum is %d characters, you sent %d"