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 61660c2fd75a49733919e4f8486d82021bb5a40b..407007fbf9b5e35d92a46d6b2a57a287cc1f4693 100644 (file)
--- a/locale/en_GB/LC_MESSAGES/statusnet.po
+++ b/locale/en_GB/LC_MESSAGES/statusnet.po
@@ -10,12 +10,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2010-01-05 22:10+0000\n"
-"PO-Revision-Date: 2010-01-05 22:11:01+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 (r60693); Translate extension (2010-01-04)\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"


@@ -40,23 +40,18 @@ msgstr "No such page"
 #: 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/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/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
 #: 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:410 lib/command.php:471 lib/command.php:527
+#: 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:116
+#: 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/apitimelinefriends.php:115 actions/apitimelinehome.php:115
 #: lib/personalgroupnav.php:100
 #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
 #: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115
 #: lib/personalgroupnav.php:100


@@ -96,10 +91,10 @@ msgstr ""
 "something yourself."
 
 #: actions/all.php:134
 "something yourself."
 
 #: actions/all.php:134

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

 msgid ""
 msgid ""

-"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 %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)."
 msgstr ""
 "You can try to [nudge %s](../%s) from his profile or [post something to his "
 "or her attention](%%%%action.newnotice%%%%?status_textarea=%s)."


@@ -128,6 +123,23 @@ msgstr "Updates from %1$s and friends on %2$s!"
 #: actions/apiaccountupdateprofile.php:97
 #: actions/apiaccountupdateprofilebackgroundimage.php:94
 #: actions/apiaccountupdateprofilecolors.php:118
 #: actions/apiaccountupdateprofile.php:97
 #: actions/apiaccountupdateprofilebackgroundimage.php:94
 #: actions/apiaccountupdateprofilecolors.php:118

+#: 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."
 
 msgid "API method not found."
 msgstr "API method not found."
 


@@ -189,6 +201,9 @@ msgstr ""
 #: actions/apiaccountupdateprofilebackgroundimage.php:146
 #: actions/apiaccountupdateprofilecolors.php:164
 #: actions/apiaccountupdateprofilecolors.php:174
 #: 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!"
 


@@ -229,26 +244,6 @@ 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: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/apidirectmessagenew.php:126
 msgid "No message text!"
 msgstr "No message text!"
 #: actions/apidirectmessagenew.php:126
 msgid "No message text!"
 msgstr "No message text!"


@@ -272,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


@@ -280,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


@@ -301,7 +298,8 @@ 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!"
+#, fuzzy
+msgid "You cannot unfollow yourself."

 msgstr "You cannot unfollow yourself!"
 
 #: actions/apifriendshipsexists.php:94
 msgstr "You cannot unfollow yourself!"
 
 #: actions/apifriendshipsexists.php:94


@@ -386,7 +384,7 @@ msgstr "Alias can't be the same as nickname."
 msgid "Group not found!"
 msgstr "Group not found!"
 
 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."
 
 msgid "You are already a member of that group."
 msgstr "You are already a member of that group."
 


@@ -394,18 +392,18 @@ msgstr "You are already a member of that group."
 msgid "You have been blocked from that group by the admin."
 msgstr "You have been blocked from that group by the admin."
 
 msgid "You have been blocked from that group by the admin."
 msgstr "You have been blocked from that group by the admin."
 

-#: actions/apigroupjoin.php:138
-#, php-format
-msgid "Could not join user %s to group %s."
+#: actions/apigroupjoin.php:138 actions/joingroup.php:124
+#, fuzzy, php-format
+msgid "Could not join user %1$s to group %2$s."

 msgstr "Could not join user %s to group %s."
 
 #: actions/apigroupleave.php:114
 msgid "You are not a member of this group."
 msgstr "You are not a member of this group."
 
 msgstr "Could not join user %s to group %s."
 
 #: actions/apigroupleave.php:114
 msgid "You are not a member of this group."
 msgstr "You are not a member of this group."
 

-#: actions/apigroupleave.php:124
-#, php-format
-msgid "Could not remove user %s to group %s."
+#: actions/apigroupleave.php:124 actions/leavegroup.php:119
+#, fuzzy, php-format
+msgid "Could not remove user %1$s from group %2$s."

 msgstr "Could not remove user %s to group %s."
 
 #: actions/apigrouplist.php:95
 msgstr "Could not remove user %s to group %s."
 
 #: actions/apigrouplist.php:95


@@ -413,11 +411,6 @@ msgstr "Could not remove user %s to group %s."
 msgid "%s's groups"
 msgstr "%s's groups"
 
 msgid "%s's groups"
 msgstr "%s's groups"
 

-#: actions/apigrouplist.php:103
-#, php-format
-msgid "Groups %s is a member of on %s."
-msgstr "Groups %s is a member of on %s."
-

 #: actions/apigrouplistall.php:90 actions/usergroups.php:62
 #, php-format
 msgid "%s groups"
 #: actions/apigrouplistall.php:90 actions/usergroups.php:62
 #, php-format
 msgid "%s groups"


@@ -458,7 +451,7 @@ msgid "No status with that ID found."
 msgstr "No status with that ID found."
 
 #: actions/apistatusesupdate.php:157 actions/newnotice.php:155
 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."


@@ -477,13 +470,13 @@ msgid "Unsupported format."
 msgstr "Unsupported format."
 
 #: actions/apitimelinefavorites.php:108
 msgstr "Unsupported format."
 
 #: actions/apitimelinefavorites.php:108

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

 msgstr "%s / Favourites from %s"
 
 #: actions/apitimelinefavorites.php:120
 msgstr "%s / Favourites from %s"
 
 #: actions/apitimelinefavorites.php:120

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

 msgstr "%s updates favourited by %s / %s."
 
 #: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118
 msgstr "%s updates favourited by %s / %s."
 
 #: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118


@@ -551,8 +544,11 @@ msgstr "Not found."
 msgid "No such attachment."
 msgstr "No such attachment."
 
 msgid "No such attachment."
 msgstr "No such attachment."
 

-#: actions/avatarbynickname.php:59 actions/grouprss.php:91
-#: 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."
 


@@ -575,8 +571,8 @@ msgid "You can upload your personal avatar. The maximum file size is %s."
 msgstr "You can upload your personal avatar. The maximum file size is %s."
 
 #: actions/avatarsettings.php:106 actions/avatarsettings.php:185
 msgstr "You can upload your personal avatar. The maximum file size is %s."
 
 #: actions/avatarsettings.php:106 actions/avatarsettings.php:185

-#: actions/grouplogo.php:178 actions/remotesubscribe.php:191
-#: actions/userauthorization.php:72 actions/userrss.php:103
+#: 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"
 


@@ -608,11 +604,11 @@ msgstr "Upload"
 msgid "Crop"
 msgstr "Crop"
 
 msgid "Crop"
 msgstr "Crop"
 

-#: actions/avatarsettings.php:268 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/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:135 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/profilesettings.php:194 actions/recoverpassword.php:337
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/othersettings.php:145 actions/passwordsettings.php:138
 #: actions/profilesettings.php:194 actions/recoverpassword.php:337


@@ -692,19 +688,15 @@ msgstr "Block this user"
 msgid "Failed to save block information."
 msgstr "Failed to save block information."
 
 msgid "Failed to save block information."
 msgstr "Failed to save block information."
 

-#: actions/blockedfromgroup.php:73 actions/editgroup.php:84
-#: actions/groupdesignsettings.php:84 actions/grouplogo.php:86
-#: actions/groupmembers.php:76 actions/joingroup.php:76
-#: actions/showgroup.php:121
-msgid "No nickname"
-msgstr "No nickname"
-

 #: actions/blockedfromgroup.php:80 actions/editgroup.php:96
 #: 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/groupbyid.php:83 actions/groupdesignsettings.php:97
 #: actions/grouplogo.php:99 actions/groupmembers.php:83

-#: actions/joingroup.php:83 actions/showgroup.php:137
-msgid "No such group"
-msgstr "No such group"
+#: 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
 
 #: actions/blockedfromgroup.php:90
 #, php-format


@@ -712,8 +704,8 @@ msgid "%s blocked profiles"
 msgstr "%s blocked profiles"
 
 #: actions/blockedfromgroup.php:93
 msgstr "%s blocked profiles"
 
 #: actions/blockedfromgroup.php:93

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

 msgstr "%s blocked profiles, page %d"
 
 #: actions/blockedfromgroup.php:108
 msgstr "%s blocked profiles, page %d"
 
 #: actions/blockedfromgroup.php:108


@@ -826,10 +818,6 @@ msgstr "Do not delete this notice"
 msgid "Delete this notice"
 msgstr "Delete this notice"
 
 msgid "Delete this notice"
 msgstr "Delete this notice"
 

-#: actions/deletenotice.php:157
-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/deleteuser.php:67
 msgid "You cannot delete users."
 msgstr "You cannot delete users."
 #: actions/deleteuser.php:67
 msgid "You cannot delete users."
 msgstr "You cannot delete users."


@@ -855,7 +843,7 @@ msgid "Delete this user"
 msgstr "Delete this user"
 
 #: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124
 msgstr "Delete this user"
 
 #: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124

-#: lib/adminpanelaction.php:302 lib/groupnav.php:119
+#: lib/adminpanelaction.php:316 lib/groupnav.php:119

 msgid "Design"
 msgstr "Design"
 
 msgid "Design"
 msgstr "Design"
 


@@ -997,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


@@ -1022,7 +1011,8 @@ msgid "Options saved."
 msgstr "Options saved."
 
 #: actions/emailsettings.php:60
 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


@@ -1059,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\""


@@ -1133,8 +1124,9 @@ msgstr "No e-mail address."
 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:331 actions/siteadminpanel.php:157
-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."
 
 #: actions/emailsettings.php:334
 msgstr "Not a valid e-mail address."
 
 #: actions/emailsettings.php:334


@@ -1321,19 +1313,12 @@ msgstr "Unknown version of OMB protocol."
 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/grouprss.php:98 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."


@@ -1346,7 +1331,7 @@ 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/groupblock.php:76 actions/groupunblock.php:76
 #: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46

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

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


@@ -1374,11 +1359,11 @@ 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 \"%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 \"%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 "
 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 "


@@ -1396,8 +1381,9 @@ msgstr "Block this user from this group"
 msgid "Database error blocking user from group."
 msgstr "Database error blocking user from group."
 
 msgid "Database error blocking user from group."
 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


@@ -1424,13 +1410,6 @@ msgstr ""
 msgid "Couldn't update your design."
 msgstr "Couldn't update user."
 
 msgid "Couldn't update your design."
 msgstr "Couldn't update user."
 

-#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297
-#: 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:308 actions/userdesignsettings.php:231
 #, fuzzy
 msgid "Design preferences saved."
 #: actions/groupdesignsettings.php:308 actions/userdesignsettings.php:231
 #, fuzzy
 msgid "Design preferences saved."


@@ -1446,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."


@@ -1465,15 +1449,15 @@ 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/action.php:441 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:442 lib/groupnav.php:107

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


@@ -1570,7 +1554,8 @@ msgid "Error removing the block."
 msgstr "Error removing the block."
 
 #: actions/imsettings.php:59
 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


@@ -1600,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


@@ -1662,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"


@@ -1702,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 ""


@@ -1747,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:178 lib/noticeform.php:232
+#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:237

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


@@ -1817,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:83 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:114 actions/login.php:124
-#, fuzzy
-msgid "Invalid or expired token."
-msgstr "Invalid notice content"
-
-#: actions/login.php:147
+#: 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:153
+#: actions/login.php:132 actions/otp.php:120

 #, fuzzy
 msgid "Error setting user. You are probably not authorized."
 msgstr "You are not authorised."
 
 #, fuzzy
 msgid "Error setting user. You are probably not authorized."
 msgstr "You are not authorised."
 

-#: actions/login.php:208 actions/login.php:261 lib/action.php:459
+#: 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:247
+#: actions/login.php:227

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

-#: actions/login.php:250 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:253 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:256 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:257 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:267
+#: 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:286
+#: 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."


@@ -1911,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:290
+#: 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]"


@@ -1925,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"


@@ -1955,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:484
+#: 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!"
 


@@ -1968,7 +1926,7 @@ 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 ""
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""


@@ -1978,9 +1936,9 @@ msgstr ""
 msgid "Message sent"
 msgstr "Message sent"
 
 msgid "Message sent"
 msgstr "Message sent"
 

-#: actions/newmessage.php:185 lib/command.php:376
-#, 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"
 
 #: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170
 msgstr "Direct message to %s sent"
 
 #: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170


@@ -2009,8 +1967,8 @@ msgid "Text search"
 msgstr "Text search"
 
 #: actions/noticesearch.php:91
 msgstr "Text search"
 
 #: actions/noticesearch.php:91

-#, php-format
-msgid "Search results for \"%s\" on %s"
+#, fuzzy, php-format
+msgid "Search results for \"%1$s\" on %2$s"

 msgstr "Search results for \"%s\" on %s"
 
 #: actions/noticesearch.php:121
 msgstr "Search results for \"%s\" on %s"
 
 #: actions/noticesearch.php:121


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

-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1031
-#: lib/api.php:1059 lib/api.php:1169
+#: 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."
 


@@ -2115,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


@@ -2154,7 +2132,7 @@ 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"
 


@@ -2190,7 +2168,7 @@ msgstr "Can't save new password."
 msgid "Password saved."
 msgstr "Password saved."
 
 msgid "Password saved."
 msgstr "Password saved."
 

-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:308
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:326

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


@@ -2223,7 +2201,7 @@ msgid "Invalid SSL server. The maximum length is 255 characters."
 msgstr ""
 
 #: actions/pathsadminpanel.php:217 actions/siteadminpanel.php:58
 msgstr ""
 
 #: actions/pathsadminpanel.php:217 actions/siteadminpanel.php:58

-#: lib/adminpanelaction.php:299
+#: lib/adminpanelaction.php:311

 #, fuzzy
 msgid "Site"
 msgstr "Invite"
 #, fuzzy
 msgid "Site"
 msgstr "Invite"


@@ -2321,8 +2299,9 @@ msgid "When to use SSL"
 msgstr ""
 
 #: actions/pathsadminpanel.php:308
 msgstr ""
 
 #: actions/pathsadminpanel.php:308

-msgid "SSL Server"
-msgstr ""
+#, fuzzy
+msgid "SSL server"
+msgstr "Server"

 
 #: actions/pathsadminpanel.php:309
 msgid "Server to direct SSL requests to"
 
 #: actions/pathsadminpanel.php:309
 msgid "Server to direct SSL requests to"


@@ -2351,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


@@ -2360,8 +2339,8 @@ 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’."
+#, 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
 msgstr "Notice licence ‘%s’ is not compatible with site licence ‘%s’."
 
 #: actions/profilesettings.php:60


@@ -2382,42 +2361,42 @@ 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
+#: actions/profilesettings.php:122 actions/register.php:461

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

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

 msgid "Describe yourself and your interests"
 msgstr "Describe yourself and your interests"
 
 msgid "Describe yourself and your interests"
 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\""
 


@@ -2481,20 +2460,20 @@ msgstr "Invalid tag: \"%s\""
 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:354
+#: actions/profilesettings.php:359

 #, fuzzy
 msgid "Couldn't save location prefs."
 msgstr "Couldn't save tags."
 
 #, fuzzy
 msgid "Couldn't save location prefs."
 msgstr "Couldn't save tags."
 

-#: actions/profilesettings.php:366
+#: 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:374
+#: 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:382 lib/adminpanelaction.php:126
+#: actions/profilesettings.php:387 lib/adminpanelaction.php:137

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


@@ -2723,7 +2702,7 @@ msgstr "Error setting user."
 msgid "New password successfully saved. You are now logged in."
 msgstr "New password successfully saved. You are now logged in."
 
 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."
 


@@ -2736,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:456
+#: 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"


@@ -2749,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
+#: actions/register.php:438 actions/register.php:442

 #: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120
 msgid "Email"
 msgstr "E-mail"
 
 #: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120
 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 "


@@ -2809,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 "


@@ -2842,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.)"


@@ -2945,11 +2920,6 @@ msgstr "Created"
 msgid "Replies to %s"
 msgstr "Replies to %s"
 
 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
 #, php-format
 msgid "Replies feed for %s (RSS 1.0)"
 #: actions/replies.php:144
 #, php-format
 msgid "Replies feed for %s (RSS 1.0)"


@@ -2966,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


@@ -2980,11 +2951,13 @@ 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
 #, php-format
 
 #: actions/repliesrss.php:72
 #, php-format


@@ -2999,11 +2972,6 @@ msgstr "You cannot sandbox users on this site."
 msgid "User is already sandboxed."
 msgstr "User is already sandboxed."
 
 msgid "User is already sandboxed."
 msgstr "User is already sandboxed."
 

-#: actions/showfavorites.php:79
-#, php-format
-msgid "%s's favorite notices, page %d"
-msgstr "%s's favourite notices, page %d"
-

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


@@ -3053,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"


@@ -3106,7 +3069,7 @@ msgstr "Members"
 
 #: actions/showgroup.php:386 lib/profileaction.php:117
 #: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95
 
 #: actions/showgroup.php:386 lib/profileaction.php:117
 #: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95

-#: lib/tagcloudsection.php:71
+#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71

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


@@ -3175,14 +3138,9 @@ msgstr "Notice deleted."
 msgid " tagged %s"
 msgstr "  tagged %s"
 
 msgid " tagged %s"
 msgstr "  tagged %s"
 

-#: actions/showstream.php:79
-#, php-format
-msgid "%s, page %d"
-msgstr "%s, page %d"
-

 #: actions/showstream.php:122
 #: actions/showstream.php:122

-#, php-format
-msgid "Notice feed for %s tagged %s (RSS 1.0)"
+#, fuzzy, php-format
+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
 msgstr "Notice feed for %s tagged %s (RSS 1.0)"
 
 #: actions/showstream.php:129


@@ -3206,9 +3164,10 @@ msgid "FOAF for %s"
 msgstr "FOAF for %s"
 
 #: actions/showstream.php:191
 msgstr "FOAF for %s"
 
 #: 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 ""


@@ -3217,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


@@ -3268,12 +3229,12 @@ msgstr ""
 
 #: actions/siteadminpanel.php:154
 #, fuzzy
 
 #: actions/siteadminpanel.php:154
 #, fuzzy

-msgid "You must have a valid contact email address"
+msgid "You must have a valid contact email address."

 msgstr "Not a valid e-mail address."
 
 #: actions/siteadminpanel.php:172
 #, php-format
 msgstr "Not a valid e-mail address."
 
 #: actions/siteadminpanel.php:172
 #, php-format

-msgid "Unknown language \"%s\""
+msgid "Unknown language \"%s\"."

 msgstr ""
 
 #: actions/siteadminpanel.php:179
 msgstr ""
 
 #: actions/siteadminpanel.php:179


@@ -3455,7 +3416,8 @@ msgid "Save site settings"
 msgstr "Save site settings"
 
 #: actions/smssettings.php:58
 msgstr "Save site settings"
 
 #: 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


@@ -3485,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


@@ -3580,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


@@ -3617,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


@@ -3653,11 +3616,6 @@ msgstr "Jabber"
 msgid "SMS"
 msgstr "SMS"
 
 msgid "SMS"
 msgstr "SMS"
 

-#: 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)"
 #: actions/tag.php:86
 #, fuzzy, php-format
 msgid "Notice feed for tag %s (RSS 1.0)"


@@ -3744,20 +3702,17 @@ msgstr "User has no profile."
 msgid "No profile id in request."
 msgstr "No profile id in request."
 
 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

-#, php-format
-msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
-msgstr ""
+#, 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:305
+#: actions/useradminpanel.php:58 lib/adminpanelaction.php:321

 #: lib/personalgroupnav.php:115
 msgid "User"
 msgstr "User"
 #: lib/personalgroupnav.php:115
 msgid "User"
 msgstr "User"


@@ -3863,7 +3818,7 @@ 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
+#: actions/userauthorization.php:188 actions/version.php:165

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


@@ -3920,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


@@ -3953,11 +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
-#, fuzzy
-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"


@@ -3973,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"


@@ -3993,23 +3938,109 @@ 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/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."
 #: classes/Message.php:45
 #, fuzzy
 msgid "You are banned from sending direct messages."


@@ -4023,27 +4054,27 @@ msgstr "Could not insert message."
 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:172
+#: 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:226
+#: 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:230
+#: 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:235
+#: 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:241
+#: 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 "


@@ -4051,25 +4082,25 @@ 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:247
+#: 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:309 classes/Notice.php:334
+#: 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:1034
+#: 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/Notice.php:1361
+#: classes/Notice.php:1423

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

-#: classes/User.php:368
+#: classes/User.php:382

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


@@ -4111,138 +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:426
+#: lib/action.php:427

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

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

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

-#: lib/action.php:432
+#: 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:434
+#: lib/action.php:435

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

-#: lib/action.php:434
+#: 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:437
+#: lib/action.php:438

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

-#: lib/action.php:437
+#: 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:441
+#: lib/action.php:442

 #, fuzzy
 msgid "Change site configuration"
 msgstr "Primary site navigation"
 
 #, fuzzy
 msgid "Change site configuration"
 msgstr "Primary site navigation"
 

-#: lib/action.php:445 lib/subgroupnav.php:105
+#: lib/action.php:446 lib/subgroupnav.php:105

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

-#: lib/action.php:446 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:451
+#: lib/action.php:452

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

-#: lib/action.php:451
+#: 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:456
+#: lib/action.php:457

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

-#: lib/action.php:459
+#: 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:462 lib/action.php:725
+#: lib/action.php:463 lib/action.php:726

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-#: lib/action.php:742
+#: lib/action.php:745

 msgid "Badge"
 msgstr "Badge"
 
 msgid "Badge"
 msgstr "Badge"
 

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

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

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


@@ -4251,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:775
+#: 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:777
+#: 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 %"


@@ -4267,31 +4298,31 @@ 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:791
+#: lib/action.php:794

 msgid "Site content license"
 msgstr "Site content license"
 
 msgid "Site content license"
 msgstr "Site content license"
 

-#: lib/action.php:800
+#: lib/action.php:803

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

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

 msgid "license."
 msgstr "licence."
 
 msgid "license."
 msgstr "licence."
 

-#: lib/action.php:1099
+#: lib/action.php:1102

 msgid "Pagination"
 msgstr "Pagination"
 
 msgid "Pagination"
 msgstr "Pagination"
 

-#: lib/action.php:1108
+#: lib/action.php:1111

 msgid "After"
 msgstr "After"
 
 msgid "After"
 msgstr "After"
 

-#: lib/action.php:1116
+#: lib/action.php:1119

 msgid "Before"
 msgstr "Before"
 
 msgid "Before"
 msgstr "Before"
 

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


@@ -4300,31 +4331,36 @@ msgstr "There was a problem with your session token."
 msgid "You cannot make changes to this site."
 msgstr "You can't send a message to this user."
 
 msgid "You cannot make changes to this site."
 msgstr "You can't send a message to this user."
 

-#: lib/adminpanelaction.php:195
+#: 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."
 
 #, fuzzy
 msgid "showForm() not implemented."
 msgstr "Command not yet implemented."
 

-#: lib/adminpanelaction.php:224
+#: lib/adminpanelaction.php:235

 #, fuzzy
 msgid "saveSettings() not implemented."
 msgstr "Command not yet implemented."
 
 #, fuzzy
 msgid "saveSettings() not implemented."
 msgstr "Command not yet implemented."
 

-#: lib/adminpanelaction.php:247
+#: lib/adminpanelaction.php:258

 #, fuzzy
 msgid "Unable to delete design setting."
 msgstr "Unable to save your design settings!"
 
 #, fuzzy
 msgid "Unable to delete design setting."
 msgstr "Unable to save your design settings!"
 

-#: lib/adminpanelaction.php:300
+#: lib/adminpanelaction.php:312

 #, fuzzy
 msgid "Basic site configuration"
 msgstr "E-mail address confirmation"
 
 #, fuzzy
 msgid "Basic site configuration"
 msgstr "E-mail address confirmation"
 

-#: lib/adminpanelaction.php:303
+#: lib/adminpanelaction.php:317

 msgid "Design configuration"
 msgstr "Design configuration"
 
 msgid "Design configuration"
 msgstr "Design configuration"
 

-#: lib/adminpanelaction.php:306 lib/adminpanelaction.php:309
+#: lib/adminpanelaction.php:322 lib/adminpanelaction.php:327

 #, fuzzy
 msgid "Paths configuration"
 msgstr "SMS confirmation"
 #, fuzzy
 msgid "Paths configuration"
 msgstr "SMS confirmation"


@@ -4364,7 +4400,7 @@ msgstr "Password change"
 msgid "Command results"
 msgstr "Command results"
 
 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"
 


@@ -4398,12 +4434,13 @@ msgid ""
 "Notices: %3$s"
 msgstr ""
 
 "Notices: %3$s"
 msgstr ""
 

-#: lib/command.php:152 lib/command.php:399 lib/command.php:460
+#: 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:415 lib/command.php:476
-#: lib/command.php:532
+#: 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"
 


@@ -4411,160 +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:301
+#: lib/command.php:349

 #, php-format
 msgid "Message too long - maximum is %d characters, you sent %d"
 msgstr "Message too long - maximum is %d characters, you sent %d"
 
 #, php-format
 msgid "Message too long - maximum is %d characters, you sent %d"
 msgstr "Message too long - maximum is %d characters, you sent %d"
 

-#: lib/command.php:378
+#: lib/command.php:367
+#, php-format
+msgid "Direct message to %s sent"
+msgstr "Direct message to %s sent"
+
+#: 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:422
-#, fuzzy
+#: lib/command.php:413

 msgid "Cannot repeat your own notice"
 msgid "Cannot repeat your own notice"

-msgstr "Can't turn on notification."
+msgstr "Cannot repeat your own notice."

 
 

-#: lib/command.php:427
-#, fuzzy
+#: lib/command.php:418

 msgid "Already repeated that notice"
 msgid "Already repeated that notice"

-msgstr "Delete this notice"
+msgstr "Already repeated that notice."

 
 

-#: lib/command.php:435
+#: lib/command.php:426

 #, fuzzy, php-format
 msgid "Notice from %s repeated"
 msgstr "Notice posted"
 
 #, fuzzy, php-format
 msgid "Notice from %s repeated"
 msgstr "Notice posted"
 

-#: lib/command.php:437
+#: lib/command.php:428

 #, fuzzy
 msgid "Error repeating notice."
 msgstr "Error saving notice."
 
 #, fuzzy
 msgid "Error repeating notice."
 msgstr "Error saving notice."
 

-#: lib/command.php:491
+#: lib/command.php:482

 #, php-format
 msgid "Notice too long - maximum is %d characters, you sent %d"
 msgstr "Notice too long - maximum is %d characters, you sent %d"
 
 #, php-format
 msgid "Notice too long - maximum is %d characters, you sent %d"
 msgstr "Notice too long - maximum is %d characters, you sent %d"
 

-#: lib/command.php:500
+#: lib/command.php:491

 #, php-format
 msgid "Reply to %s sent"
 msgstr "Reply to %s sent"
 
 #, php-format
 msgid "Reply to %s sent"
 msgstr "Reply to %s sent"
 

-#: lib/command.php:502
+#: lib/command.php:493

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

-#: lib/command.php:556
+#: 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:563
+#: 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:584
+#: 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:591
+#: 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:609 lib/command.php:632
+#: 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:612
+#: lib/command.php:603

 msgid "Notification off."
 msgstr "Notification off."
 
 msgid "Notification off."
 msgstr "Notification off."
 

-#: lib/command.php:614
+#: 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:635
+#: lib/command.php:626

 msgid "Notification on."
 msgstr "Notification on."
 
 msgid "Notification on."
 msgstr "Notification on."
 

-#: lib/command.php:637
+#: 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:650
+#: lib/command.php:641

 msgid "Login command is disabled"
 msgstr ""
 
 msgid "Login command is disabled"
 msgstr ""
 

-#: lib/command.php:664
-#, fuzzy, php-format
-msgid "Could not create login token for %s"
-msgstr "Could not create aliases"
-
-#: lib/command.php:669
+#: 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:685
+#: 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:687
+#: 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:"
 
 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:707
+#: 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:709
+#: 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."
 
 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:729
+#: 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:731
+#: 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."
 
 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:745
+#: lib/command.php:728

 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"


@@ -4605,19 +4659,19 @@ msgid ""
 "tracking - not yet implemented.\n"
 msgstr ""
 
 "tracking - not yet implemented.\n"
 msgstr ""
 

-#: lib/common.php:199
+#: 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:200
+#: 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:201
+#: 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:202
+#: lib/common.php:135

 msgid "Go to the installer."
 msgstr "Go to the installer."
 
 msgid "Go to the installer."
 msgstr "Go to the installer."
 


@@ -4721,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\""


@@ -4822,11 +4872,16 @@ msgstr ""
 msgid "kB"
 msgstr ""
 
 msgid "kB"
 msgstr ""
 

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


@@ -4894,21 +4949,9 @@ msgstr ""
 "----\n"
 "Change your email address or notification options at %8$s\n"
 
 "----\n"
 "Change your email address or notification options at %8$s\n"
 

-#: lib/mail.php:254
-#, php-format
-msgid "Location: %s\n"
-msgstr "Location: %s\n"
-
-#: lib/mail.php:256
-#, php-format
-msgid "Homepage: %s\n"
-msgstr "Homepage: %s\n"
-

 #: lib/mail.php:258
 #: lib/mail.php:258

-#, php-format
-msgid ""
-"Bio: %s\n"
-"\n"
+#, fuzzy, php-format
+msgid "Bio: %s"

 msgstr ""
 "Bio: %s\n"
 "\n"
 msgstr ""
 "Bio: %s\n"
 "\n"


@@ -5054,6 +5097,27 @@ msgstr ""
 msgid "from"
 msgstr "from"
 
 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 ""


@@ -5085,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


@@ -5093,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


@@ -5103,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


@@ -5136,7 +5201,23 @@ msgid "Attach a file"
 msgstr ""
 
 #: lib/noticeform.php:212
 msgstr ""
 
 #: lib/noticeform.php:212

-msgid "Share your location"
+#, 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
 msgstr ""
 
 #: lib/noticelist.php:428


@@ -5256,6 +5337,11 @@ msgstr "Your sent messages"
 msgid "Tags in %s's notices"
 msgstr "Tags in %s's notices"
 
 msgid "Tags in %s's notices"
 msgstr "Tags in %s's notices"
 

+#: lib/plugin.php:114
+#, fuzzy
+msgid "Unknown"
+msgstr "Unknown action"
+

 #: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82
 msgid "Subscriptions"
 msgstr "Subscriptions"
 #: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82
 msgid "Subscriptions"
 msgstr "Subscriptions"


@@ -5399,25 +5485,25 @@ msgstr ""
 msgid "User has blocked you."
 msgstr "User has blocked you."
 
 msgid "User has blocked you."
 msgstr "User has blocked you."
 

-#: lib/subs.php:60
+#: lib/subs.php:63

 msgid "Could not subscribe."
 msgstr "Could not subscribe."
 
 msgid "Could not subscribe."
 msgstr "Could not subscribe."
 

-#: lib/subs.php:79
+#: 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:128
+#: lib/subs.php:137

 #, fuzzy
 msgid "Not subscribed!"
 msgstr "Not subscribed!"
 
 #, fuzzy
 msgid "Not subscribed!"
 msgstr "Not subscribed!"
 

-#: lib/subs.php:133
+#: lib/subs.php:142

 #, fuzzy
 msgid "Couldn't delete self-subscription."
 msgstr "Couldn't delete subscription."
 
 #, fuzzy
 msgid "Couldn't delete self-subscription."
 msgstr "Couldn't delete subscription."
 

-#: lib/subs.php:146
+#: lib/subs.php:158

 msgid "Couldn't delete subscription."
 msgstr "Couldn't delete subscription."
 
 msgid "Couldn't delete subscription."
 msgstr "Couldn't delete subscription."
 


@@ -5431,10 +5517,6 @@ msgstr ""
 msgid "People Tagcloud as tagged"
 msgstr ""
 
 msgid "People Tagcloud as tagged"
 msgstr ""
 

-#: lib/subscriptionlist.php:126
-msgid "(none)"
-msgstr "(none)"
-

 #: lib/tagcloudsection.php:56
 msgid "None"
 msgstr "None"
 #: lib/tagcloudsection.php:56
 msgid "None"
 msgstr "None"


@@ -5495,47 +5577,47 @@ msgstr "Message"
 msgid "Moderate"
 msgstr ""
 
 msgid "Moderate"
 msgstr ""
 

-#: lib/util.php:837
+#: 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:839
+#: 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:841
+#: 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:843
+#: 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:845
+#: 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:847
+#: 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:849
+#: 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:851
+#: 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:853
+#: 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:855
+#: lib/util.php:895

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


@@ -5549,18 +5631,7 @@ msgstr "%s is not a valid colour!"
 msgid "%s is not a valid color! Use 3 or 6 hex chars."
 msgstr "%s is not a valid colour! Use 3 or 6 hex chars."
 
 msgid "%s is not a valid color! Use 3 or 6 hex chars."
 msgstr "%s is not a valid colour! Use 3 or 6 hex chars."
 

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