Merge branch '0.9-release'

* 0.9-release: (874 commits) Removed call to NewDirectMessage() until IE return is fixed i.e., Don't show flag user button your own profile Fixed HXR response for flag user Using the right form class name Using common_redirect Left a form_data class of a <ul> in the user admin panel Added validation to fields in user admin panel Added a user admin panel Added mobile logos for default and identica themes Changed gif to png Changed this to action. THANKS zach! Doing content negotiation only once Add execute bit to pingqueuehandler Localisation updates for !StatusNet from !translatewiki.net Use the browser's geolocation API to set the location on the notice form Add geometa library, and include it. Add location form elements to the noticeform, and save their values on submission Use the $user object nickname, as login name doesnt have to == nickname anymore with plugins such as ldap/etc Revert "Re added NICKNAME_FMT constant to router.php." Moved most path and server settings to a new paths admin panel ... Conflicts: js/util.js locale/it_IT/LC_MESSAGES/statusnet.mo locale/mk_MK/LC_MESSAGES/statusnet.mo locale/mk_MK/LC_MESSAGES/statusnet.po locale/pt_BR/LC_MESSAGES/statusnet.mo locale/vi_VN/LC_MESSAGES/statusnet.mo plugins/InfiniteScroll/infinitescroll.js plugins/Realtime/realtimeupdate.js
author: Zach Copley <zach@status.net> 2009-11-19 20:12:46 -0800
committer: Zach Copley <zach@status.net> 2009-11-19 20:12:46 -0800
commit: 4b98edf75f4e255f8c61087bd1525d89653a521f (patch)
tree: b2a7eb6d77429eadb1beabe2d5e6ae1c1a2831d6 /locale/en_GB
parent: f92574dbcb1f2d7cd0aaf3c9362db46fa066e888 (diff)
parent: c213477081afefb1720c8ae729d1965e7a1dac63 (diff)
2 files changed, 4103 insertions, 3675 deletions
diff --git a/locale/en_GB/LC_MESSAGES/statusnet.mo b/locale/en_GB/LC_MESSAGES/statusnet.mo
index 11eacc9ac..694b1eb90 100644
--- a/locale/en_GB/LC_MESSAGES/statusnet.mo
+++ b/locale/en_GB/LC_MESSAGES/statusnet.mo
diff --git a/locale/en_GB/LC_MESSAGES/statusnet.po b/locale/en_GB/LC_MESSAGES/statusnet.po
index a105d2b86..628da61d8 100644
--- a/locale/en_GB/LC_MESSAGES/statusnet.po
+++ b/locale/en_GB/LC_MESSAGES/statusnet.po
@@ -1,4260 +1,3454 @@
-# #-#-#-#-#  statusnet.new.pot (PACKAGE VERSION)  #-#-#-#-#
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# Translation of StatusNet to British English
+#
+# Author@translatewiki.net: CiaranG
+# --
+# This file is distributed under the same license as the StatusNet package.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-25 16:24+0000\n"
-"PO-Revision-Date: 2009-05-21 01:42+0000\n"
-"Last-Translator: Bruce Cowan <l10n@bcowan.fastmail.co.uk>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
+"POT-Creation-Date: 2009-11-19 10:43+0000\n"
+"PO-Revision-Date: 2009-11-18 19:31:40+0000\n"
+"Language-Team: British English\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.1.0\n"
-
-#: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
-#: actions/noticesearchrss.php:88
-#, php-format
-msgid " Search Stream for \"%s\""
-msgstr " Search Stream for \"%s\""
-
-# Adjusted for grammar.
-#: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
-#: actions/finishopenidlogin.php:88 actions/register.php:205
-#: actions/finishopenidlogin.php:110
-msgid ""
-" except this private data: password, email address, IM address, phone number."
-msgstr ""
-" except this private data: password, e-mail address, IM address, phone "
-"number."
-
-#: ../actions/showstream.php:400 ../lib/stream.php:109
-#: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
-msgid " from "
-msgstr "from"
-
-#: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
-#: actions/twitapistatuses.php:347
-#, php-format
-msgid "%1$s / Updates replying to %2$s"
-msgstr "%1$s / Updates replying to %2$s"
-
-#: ../actions/invite.php:168 actions/invite.php:176 actions/invite.php:211
-#, php-format
-msgid "%1$s has invited you to join them on %2$s"
-msgstr "%1$s has invited you to join them on %2$s"
-
-#: ../actions/invite.php:170
-#, php-format
-msgid ""
-"%1$s has invited you to join them on %2$s (%3$s).\n"
-"\n"
-"%2$s is a micro-blogging service that lets you keep up-to-date with people "
-"you know and people who interest you.\n"
-"\n"
-"You can also share news about yourself, your thoughts, or your life online "
-"with people who know about you. It's also great for meeting new people who "
-"share your interests.\n"
-"\n"
-"%1$s said:\n"
-"\n"
-"%4$s\n"
-"\n"
-"You can see %1$s's profile page on %2$s here:\n"
-"\n"
-"%5$s\n"
-"\n"
-"If you'd like to try the service, click on the link below to accept the "
-"invitation.\n"
-"\n"
-"%6$s\n"
-"\n"
-"If not, you can ignore this message. Thanks for your patience and your "
-"time.\n"
-"\n"
-"Sincerely, %2$s\n"
-msgstr ""
-"%1$s has invited you to join them on %2$s (%3$s).\n"
-"\n"
-"%2$s is a micro-blogging service that lets you keep up-to-date with people "
-"you know and people who interest you.\n"
-"\n"
-"You can also share news about yourself, your thoughts, or your life online "
-"with people who know about you. It's also great for meeting new people who "
-"share your interests.\n"
-"\n"
-"%1$s said:\n"
-"\n"
-"%4$s\n"
-"\n"
-"You can see %1$s's profile page on %2$s here:\n"
-"\n"
-"%5$s\n"
-"\n"
-"If you'd like to try the service, click on the link below to accept the "
-"invitation.\n"
-"\n"
-"%6$s\n"
-"\n"
-"If not, you can ignore this message. Thanks for your patience and your time.\n"
-"\n"
-"Sincerely, %2$s\n"
-
-#: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 lib/mail.php:241
-#, php-format
-msgid "%1$s is now listening to your notices on %2$s."
-msgstr "%1$s is now listening to your notices on %2$s."
-
-#: ../lib/mail.php:126
-#, php-format
-msgid ""
-"%1$s is now listening to your notices on %2$s.\n"
-"\n"
-"\t%3$s\n"
-"\n"
-"Faithfully yours,\n"
-"%4$s.\n"
-msgstr ""
-"%1$s is now listening to your notices on %2$s.\n"
-"\n"
-"\t%3$s\n"
-"\n"
-"Faithfully yours,\n"
-"%4$s.\n"
-
-#: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
-#: actions/twitapistatuses.php:350
-#, php-format
-msgid "%1$s updates that reply to updates from %2$s / %3$s."
-msgstr "%1$s updates that reply to updates from %2$s / %3$s."
-
-#: ../actions/shownotice.php:45 actions/shownotice.php:45
-#: actions/shownotice.php:161
-#, php-format
-msgid "%1$s's status on %2$s"
-msgstr "%1$s's status on %2$s"
-
-#: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
-#: actions/invite.php:99 actions/invite.php:123 actions/invite.php:131
-#, php-format
-msgid "%s (%s)"
-msgstr "%s (%s)"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: MediaWiki 1.16alpha(r59207); Translate extension (2009-11-16)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: en-gb\n"
+"X-Message-Group: out-statusnet\n"
+
+#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
+#: actions/showfavorites.php:137 actions/tag.php:51
+msgid "No such page"
+msgstr "No such page"
+
+#: actions/all.php:74 actions/allrss.php:68
+#: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/apiaccountupdateprofilebackgroundimage.php:116
+#: actions/apiaccountupdateprofileimage.php:105
+#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97
+#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75
+#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112
+#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
+#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
+#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
+#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
+#: actions/avatarbynickname.php:75 actions/favoritesrss.php:74
+#: actions/foaf.php:40 actions/foaf.php:58 actions/microsummary.php:62
+#: actions/newmessage.php:116 actions/remotesubscribe.php:145
+#: actions/remotesubscribe.php:154 actions/replies.php:73
+#: actions/repliesrss.php:38 actions/showfavorites.php:105
+#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38
+#: actions/xrds.php:71 lib/command.php:163 lib/command.php:311
+#: lib/command.php:364 lib/command.php:411 lib/command.php:466
+#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
+#: lib/subs.php:34 lib/subs.php:116
+msgid "No such user."
+msgstr "No such user."
 
-#: ../actions/publicrss.php:62 actions/publicrss.php:48
-#: actions/publicrss.php:90
+#: actions/all.php:84
 #, php-format
-msgid "%s Public Stream"
-msgstr "%s Public Stream"
+msgid "%s and friends, page %d"
+msgstr "%s and friends, page %d"
 
-#: ../actions/all.php:47 ../actions/allrss.php:60
-#: ../actions/twitapistatuses.php:238 ../lib/stream.php:51 actions/all.php:47
-#: actions/allrss.php:60 actions/twitapistatuses.php:155 lib/personal.php:51
-#: actions/all.php:65 actions/allrss.php:103 actions/facebookhome.php:164
-#: actions/twitapistatuses.php:126 lib/personalgroupnav.php:99
+#: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
+#: actions/apitimelinefriends.php:114 lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s and friends"
 
-#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
-#: actions/twitapistatuses.php:33
+#: actions/all.php:99
 #, php-format
-msgid "%s public timeline"
-msgstr "%s public timeline"
+msgid "Feed for friends of %s (RSS 1.0)"
+msgstr "Feed for friends of %s (RSS 1.0)"
 
-#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411
+#: actions/all.php:107
 #, php-format
-msgid "%s status"
-msgstr "%s status"
+msgid "Feed for friends of %s (RSS 2.0)"
+msgstr "Feed for friends of %s (RSS 2.0)"
 
-#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
-#: actions/twitapistatuses.php:199
+#: actions/all.php:115
 #, php-format
-msgid "%s timeline"
-msgstr "%s timeline"
+msgid "Feed for friends of %s (Atom)"
+msgstr "Feed for friends of %s (Atom)"
 
-#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
-#: actions/twitapistatuses.php:36
+#: actions/all.php:127
 #, php-format
-msgid "%s updates from everyone!"
-msgstr "%s updates from everyone!"
-
-#: ../actions/register.php:213
 msgid ""
-"(You should receive a message by email momentarily, with instructions on how "
-"to confirm your email address.)"
+"This is the timeline for %s and friends but no one has posted anything yet."
 msgstr ""
-"(You should receive a message by e-mail momentarily, with instructions on "
-"how to confirm your e-mail address.)"
 
-#: ../lib/util.php:257 lib/util.php:273 lib/action.php:605
+#: actions/all.php:132
 #, php-format
 msgid ""
-"**%%site.name%%** is a microblogging service brought to you by [%%site."
-"broughtby%%](%%site.broughtbyurl%%). "
+"Try subscribing to more people, [join a group](%%action.groups%%) or post "
+"something yourself."
 msgstr ""
-"**%%site.name%%** is a microblogging service brought to you by "
-"[%%site.broughtby%%](%%site.broughtbyurl%%)."
-
-#: ../lib/util.php:259 lib/util.php:275 lib/action.php:607
-#, php-format
-msgid "**%%site.name%%** is a microblogging service. "
-msgstr "**%%site.name%%** is a microblogging service."
-
-#: ../lib/util.php:274 lib/util.php:290
-msgid ". Contributors should be attributed by full name or nickname."
-msgstr ". Contributors should be attributed by full name or nickname."
-
-#: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
-#: actions/finishopenidlogin.php:79 actions/profilesettings.php:76
-#: actions/finishopenidlogin.php:101 actions/profilesettings.php:100
-#: lib/groupeditform.php:139
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "1-64 lowercase letters or numbers, no punctuation or spaces"
-
-#: ../actions/register.php:152 actions/register.php:166
-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/password.php:42 actions/profilesettings.php:181
-#: actions/passwordsettings.php:102
-msgid "6 or more characters"
-msgstr "6 or more characters"
-
-#: ../actions/recoverpassword.php:180 actions/recoverpassword.php:186
-#: actions/recoverpassword.php:220
-msgid "6 or more characters, and don't forget it!"
-msgstr "6 or more characters, and don't forget it!"
-
-#: ../actions/register.php:154 actions/register.php:168
-#: actions/register.php:373
-msgid "6 or more characters. Required."
-msgstr "6 or more characters. Required."
-
-#: ../actions/imsettings.php:197 actions/imsettings.php:205
+#: actions/all.php:134
 #, php-format
 msgid ""
-"A confirmation code was sent to the IM address you added. You must approve %"
-"s for sending messages to you."
-msgstr ""
-"A confirmation code was sent to the IM address you added. You must approve "
-"%s for sending messages to you."
-
-#: ../actions/emailsettings.php:213 actions/emailsettings.php:231
-msgid ""
-"A confirmation code was sent to the email address you added. Check your "
-"inbox (and spam box!) for the code and instructions on how to use it."
+"You can try to [nudge %s](../%s) from his profile or [post something to his "
+"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)."
 msgstr ""
-"A confirmation code was sent to the e-mail address you added. Check your "
-"inbox (and spam box!) for the code and instructions on how to use it."
 
-#: ../actions/smssettings.php:216 actions/smssettings.php:224
+#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202
+#, php-format
 msgid ""
-"A confirmation code was sent to the phone number you added. Check your inbox "
-"(and spam box!) for the code and instructions on how to use it."
+"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
+"post a notice to his or her attention."
 msgstr ""
-"A confirmation code was sent to the phone number you added. Check your inbox "
-"(and spam box!) for the code and instructions on how to use it."
-
-#: ../actions/twitapiaccount.php:49 ../actions/twitapihelp.php:45
-#: ../actions/twitapistatuses.php:88 ../actions/twitapistatuses.php:259
-#: ../actions/twitapistatuses.php:370 ../actions/twitapistatuses.php:532
-#: ../actions/twitapiusers.php:122 actions/twitapiaccount.php:49
-#: actions/twitapidirect_messages.php:104 actions/twitapifavorites.php:111
-#: actions/twitapifavorites.php:120 actions/twitapifriendships.php:156
-#: actions/twitapihelp.php:46 actions/twitapistatuses.php:93
-#: actions/twitapistatuses.php:176 actions/twitapistatuses.php:288
-#: actions/twitapistatuses.php:298 actions/twitapistatuses.php:454
-#: actions/twitapistatuses.php:463 actions/twitapistatuses.php:504
-#: actions/twitapiusers.php:55 actions/twitapiaccount.php:37
-#: actions/twitapidirect_messages.php:111 actions/twitapifavorites.php:85
-#: actions/twitapifavorites.php:102 actions/twitapifriendships.php:121
-#: actions/twitapihelp.php:44 actions/twitapistatusnet.php:82
-#: actions/twitapistatusnet.php:151 actions/twitapistatuses.php:79
-#: actions/twitapistatuses.php:147 actions/twitapistatuses.php:228
-#: actions/twitapistatuses.php:239 actions/twitapistatuses.php:392
-#: actions/twitapistatuses.php:402 actions/twitapistatuses.php:429
-#: actions/twitapiusers.php:32
-msgid "API method not found!"
-msgstr "API method not found!"
-
-#: ../actions/twitapiaccount.php:57 ../actions/twitapiaccount.php:113
-#: ../actions/twitapiaccount.php:119 ../actions/twitapiblocks.php:28
-#: ../actions/twitapiblocks.php:34 ../actions/twitapidirect_messages.php:43
-#: ../actions/twitapidirect_messages.php:49
-#: ../actions/twitapidirect_messages.php:56
-#: ../actions/twitapidirect_messages.php:62 ../actions/twitapifavorites.php:41
-#: ../actions/twitapifavorites.php:47 ../actions/twitapifavorites.php:53
-#: ../actions/twitapihelp.php:52 ../actions/twitapinotifications.php:29
-#: ../actions/twitapinotifications.php:35 ../actions/twitapistatuses.php:768
-#: actions/twitapiaccount.php:56 actions/twitapiaccount.php:109
-#: actions/twitapiaccount.php:114 actions/twitapiblocks.php:28
-#: actions/twitapiblocks.php:33 actions/twitapidirect_messages.php:170
-#: actions/twitapifavorites.php:168 actions/twitapihelp.php:53
-#: actions/twitapinotifications.php:29 actions/twitapinotifications.php:34
-#: actions/twitapistatuses.php:690 actions/twitapiaccount.php:45
-#: actions/twitapiaccount.php:97 actions/twitapiaccount.php:103
-#: actions/twitapidirect_messages.php:184 actions/twitapifavorites.php:143
-#: actions/twitapihelp.php:52 actions/twitapistatusnet.php:172
-#: actions/twitapinotifications.php:31 actions/twitapinotifications.php:37
-#: actions/twitapistatuses.php:562
-msgid "API method under construction."
-msgstr "API method under construction."
-
-#: ../lib/util.php:324 lib/util.php:340 lib/action.php:568
-msgid "About"
-msgstr "About"
-
-#: ../actions/userauthorization.php:119 actions/userauthorization.php:126
-#: actions/userauthorization.php:143
-msgid "Accept"
-msgstr "Accept"
-
-#: ../actions/emailsettings.php:62 ../actions/imsettings.php:63
-#: ../actions/openidsettings.php:57 ../actions/smssettings.php:71
-#: actions/emailsettings.php:63 actions/imsettings.php:64
-#: actions/openidsettings.php:58 actions/smssettings.php:71
-#: actions/twittersettings.php:85 actions/emailsettings.php:120
-#: actions/imsettings.php:127 actions/openidsettings.php:111
-#: actions/smssettings.php:133 actions/twittersettings.php:163
-msgid "Add"
-msgstr "Add"
-
-#: ../actions/openidsettings.php:43 actions/openidsettings.php:44
-#: actions/openidsettings.php:93
-msgid "Add OpenID"
-msgstr "Add OpenID"
-
-#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
-#: lib/accountsettingsaction.php:117
-msgid "Add or remove OpenIDs"
-msgstr "Add or remove OpenIDs"
-
-#: ../actions/emailsettings.php:38 ../actions/imsettings.php:39
-#: ../actions/smssettings.php:39 actions/emailsettings.php:39
-#: actions/imsettings.php:40 actions/smssettings.php:39
-#: actions/emailsettings.php:94 actions/imsettings.php:94
-#: actions/smssettings.php:92
-msgid "Address"
-msgstr "Address"
-
-#: ../actions/invite.php:131 actions/invite.php:139 actions/invite.php:176
-msgid "Addresses of friends to invite (one per line)"
-msgstr "Addresses of friends to invite (one per line)"
-
-#: ../actions/showstream.php:273 actions/showstream.php:288
-#: actions/showstream.php:422
-msgid "All subscriptions"
-msgstr "All subscriptions"
 
-#: ../actions/publicrss.php:64 actions/publicrss.php:50
-#: actions/publicrss.php:92
-#, php-format
-msgid "All updates for %s"
-msgstr "All updates for %s"
+#: actions/all.php:165
+msgid "You and friends"
+msgstr "You and friends"
 
-#: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
-#: actions/noticesearchrss.php:90
+#: actions/allrss.php:119 actions/apitimelinefriends.php:121
 #, php-format
-msgid "All updates matching search term \"%s\""
-msgstr "All updates matching search term \"%s\""
-
-#: ../actions/finishopenidlogin.php:29 ../actions/login.php:31
-#: ../actions/openidlogin.php:29 ../actions/register.php:30
-#: actions/finishopenidlogin.php:29 actions/login.php:31
-#: actions/openidlogin.php:29 actions/register.php:30
-#: actions/finishopenidlogin.php:34 actions/login.php:77
-#: actions/openidlogin.php:30 actions/register.php:92
-msgid "Already logged in."
-msgstr "Already logged in."
-
-#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49
-msgid "Already subscribed!."
-msgstr "Already subscribed!"
-
-#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
-#: actions/deletenotice.php:113
-msgid "Are you sure you want to delete this notice?"
-msgstr "Are you sure you want to delete this notice?"
-
-#: ../actions/userauthorization.php:77 actions/userauthorization.php:83
-#: actions/userauthorization.php:81
-msgid "Authorize subscription"
-msgstr "Authorise subscription"
+msgid "Updates from %1$s and friends on %2$s!"
+msgstr "Updates from %1$s and friends on %2$s!"
 
-#: ../actions/login.php:104 ../actions/register.php:178
-#: actions/register.php:192
-msgid "Automatically login in the future; not for shared computers!"
-msgstr "Automatically login in the future; not for shared computers!"
+#: actions/apiaccountratelimitstatus.php:70
+#: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountupdateprofilebackgroundimage.php:94
+#: actions/apiaccountupdateprofilecolors.php:118
+#: actions/apiaccountupdateprofile.php:97
+msgid "API method not found."
+msgstr "API method not found."
+
+#: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdateprofilebackgroundimage.php:86
+#: actions/apiaccountupdateprofilecolors.php:110
+#: actions/apiaccountupdateprofileimage.php:84
+#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89
+#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117
+#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
+#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
+#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
+#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114
+msgid "This method requires a POST."
+msgstr "This method requires a POST."
 
-#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
+#: actions/apiaccountupdatedeliverydevice.php:105
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+"You must specify a parameter named 'device' with a value of one of: sms, im, "
+"none"
 msgstr ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)"
 
-#: ../actions/avatar.php:32 ../lib/settingsaction.php:90
-#: actions/profilesettings.php:34 actions/avatarsettings.php:65
-#: actions/showgroup.php:209 lib/accountsettingsaction.php:107
-msgid "Avatar"
-msgstr "Avatar"
-
-#: ../actions/avatar.php:113 actions/profilesettings.php:350
-#: actions/avatarsettings.php:395
-msgid "Avatar updated."
-msgstr "Avatar updated."
-
-# Buddy?
-#: ../actions/imsettings.php:55 actions/imsettings.php:56
-#, php-format
+#: actions/apiaccountupdatedeliverydevice.php:132
 #, fuzzy
-msgid ""
-"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
-"message with further instructions. (Did you add %s to your buddy list?)"
-msgstr ""
-"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
-"message with further instructions. (Did you add %s to your buddy list?)"
+msgid "Could not update user."
+msgstr "Couldn't update user."
 
-#: ../actions/emailsettings.php:54 actions/emailsettings.php:55
+#: actions/apiaccountupdateprofilebackgroundimage.php:108
+#: actions/apiaccountupdateprofileimage.php:97
+#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
+#: actions/designadminpanel.php:122 actions/newnotice.php:94
+#: lib/designsettings.php:283
+#, php-format
 msgid ""
-"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
-"a message with further instructions."
+"The server was unable to handle that much POST data (%s bytes) due to its "
+"current configuration."
 msgstr ""
-"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
-"a message with further instructions."
 
-#: ../actions/smssettings.php:58 actions/smssettings.php:58
-#: actions/smssettings.php:111
-msgid "Awaiting confirmation on this phone number."
-msgstr "Awaiting confirmation on this phone number."
+#: actions/apiaccountupdateprofilebackgroundimage.php:136
+#: actions/apiaccountupdateprofilebackgroundimage.php:146
+#: actions/apiaccountupdateprofilecolors.php:164
+#: actions/apiaccountupdateprofilecolors.php:174
+msgid "Unable to save your design settings."
+msgstr "Unable to save your design settings!"
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:187
+#: actions/apiaccountupdateprofilecolors.php:142
+msgid "Could not update your design."
+msgstr "Could not update your design."
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:194
+#: actions/apiaccountupdateprofilecolors.php:185
+#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108
+#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
+#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
+msgid "User has no profile."
+msgstr "User has no profile."
 
-#  erm, not sure what to do here, » is recognised as a quotation mark.
-#: ../lib/util.php:1318 lib/util.php:1452
-msgid "Before »"
-msgstr "Before »"
+#: actions/apiaccountupdateprofile.php:147
+#, fuzzy
+msgid "Could not save profile."
+msgstr "Couldn't save profile."
 
-#: ../actions/profilesettings.php:49 ../actions/register.php:170
-#: actions/profilesettings.php:82 actions/register.php:184
-#: actions/profilesettings.php:112 actions/register.php:402
-msgid "Bio"
-msgstr "Bio"
+#: actions/apiblockcreate.php:108
+msgid "Block user failed."
+msgstr "Block user failed."
 
-#: ../actions/profilesettings.php:101 ../actions/register.php:82
-#: ../actions/updateprofile.php:103 actions/profilesettings.php:216
-#: actions/register.php:89 actions/updateprofile.php:104
-#: actions/profilesettings.php:205 actions/register.php:174
-#: actions/updateprofile.php:107
-msgid "Bio is too long (max 140 chars)."
-msgstr "Bio is too long (max 140 chars)."
+#: actions/apiblockdestroy.php:107
+msgid "Unblock user failed."
+msgstr "Unblock user failed."
 
-#: ../lib/deleteaction.php:41 lib/deleteaction.php:41 lib/deleteaction.php:69
-msgid "Can't delete this notice."
-msgstr "Can't delete this notice."
+#: actions/apidirectmessagenew.php:126
+msgid "No message text!"
+msgstr "No message text!"
 
-#: ../actions/updateprofile.php:119 actions/updateprofile.php:120
-#: actions/updateprofile.php:123
+#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
 #, php-format
-msgid "Can't read avatar URL '%s'"
-msgstr "Can't read avatar URL '%s'"
+msgid "That's too long. Max message size is %d chars."
+msgstr "That's too long. Max message size is %d chars."
 
-#: ../actions/password.php:85 ../actions/recoverpassword.php:300
-#: actions/profilesettings.php:404 actions/recoverpassword.php:313
-#: actions/passwordsettings.php:169 actions/recoverpassword.php:347
-msgid "Can't save new password."
-msgstr "Can't save new password."
+#: actions/apidirectmessagenew.php:146
+msgid "Recipient user not found."
+msgstr "Recipient user not found."
 
-#: ../actions/emailsettings.php:57 ../actions/imsettings.php:58
-#: ../actions/smssettings.php:62 actions/emailsettings.php:58
-#: actions/imsettings.php:59 actions/smssettings.php:62
-#: actions/emailsettings.php:111 actions/imsettings.php:114
-#: actions/smssettings.php:114
-msgid "Cancel"
-msgstr "Cancel"
+#: actions/apidirectmessagenew.php:150
+msgid "Can't send direct messages to users who aren't your friend."
+msgstr "Can't send direct messages to users who aren't your friend."
 
-#: ../lib/openid.php:121 lib/openid.php:121 lib/openid.php:130
-msgid "Cannot instantiate OpenID consumer object."
-msgstr "Cannot create OpenID consumer object."
+#: actions/apidirectmessage.php:89
+#, php-format
+msgid "Direct messages from %s"
+msgstr "Direct messages from %s"
 
-#: ../actions/imsettings.php:163 actions/imsettings.php:171
-#: actions/imsettings.php:286
-msgid "Cannot normalize that Jabber ID"
-msgstr "Cannot normalise Jabber ID"
+#: actions/apidirectmessage.php:93
+#, php-format
+msgid "All the direct messages sent from %s"
+msgstr "All the direct messages sent from %s"
 
-#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
-#: actions/emailsettings.php:311
-msgid "Cannot normalize that email address"
-msgstr "Cannot normalise that e-mail address"
+#: actions/apidirectmessage.php:101
+#, php-format
+msgid "Direct messages to %s"
+msgstr "Direct messages to %s"
 
-#: ../actions/password.php:45 actions/profilesettings.php:184
-#: actions/passwordsettings.php:110
-msgid "Change"
-msgstr "Change"
+#: actions/apidirectmessage.php:105
+#, php-format
+msgid "All the direct messages sent to %s"
+msgstr "All the direct messages sent to %s"
 
-#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
-#: lib/accountsettingsaction.php:114
-msgid "Change email handling"
-msgstr "Change e-mail handling"
+#: 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/apigrouplistall.php:120 actions/apigrouplist.php:132
+#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
+#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
+#: actions/apitimelinegroup.php:147 actions/apitimelinementions.php:149
+#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
+msgid "API method not found!"
+msgstr "API method not found!"
 
-#: ../actions/password.php:32 actions/profilesettings.php:36
-#: actions/passwordsettings.php:58
-msgid "Change password"
-msgstr "Change password"
+#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
+#: actions/apistatusesdestroy.php:113
+msgid "No status found with that ID."
+msgstr "No status found with that ID."
 
-#: ../lib/settingsaction.php:94 lib/accountsettingsaction.php:111
-msgid "Change your password"
-msgstr "Change your password"
+#: actions/apifavoritecreate.php:119
+msgid "This status is already a favorite!"
+msgstr "This status is already a favourite!"
 
-#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
-#: lib/accountsettingsaction.php:105
-msgid "Change your profile settings"
-msgstr "Change your profile settings"
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176
+msgid "Could not create favorite."
+msgstr "Could not create favourite."
 
-#: ../actions/password.php:43 ../actions/recoverpassword.php:181
-#: ../actions/register.php:155 ../actions/smssettings.php:65
-#: actions/profilesettings.php:182 actions/recoverpassword.php:187
-#: actions/register.php:169 actions/smssettings.php:65
-#: actions/passwordsettings.php:105 actions/recoverpassword.php:221
-#: actions/register.php:376 actions/smssettings.php:122
-msgid "Confirm"
-msgstr "Confirm"
+#: actions/apifavoritedestroy.php:122
+msgid "That status is not a favorite!"
+msgstr "That status is not a favourite!"
 
-#: ../actions/confirmaddress.php:90 actions/confirmaddress.php:90
-#: actions/confirmaddress.php:144
-msgid "Confirm Address"
-msgstr "Confirm Address"
+#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87
+msgid "Could not delete favorite."
+msgstr "Could not delete favourite."
 
-#: ../actions/emailsettings.php:238 ../actions/imsettings.php:222
-#: ../actions/smssettings.php:245 actions/emailsettings.php:256
-#: actions/imsettings.php:230 actions/smssettings.php:253
-#: actions/emailsettings.php:379 actions/imsettings.php:361
-#: actions/smssettings.php:374
-msgid "Confirmation cancelled."
-msgstr "Confirmation cancelled."
+#: actions/apifriendshipscreate.php:109
+msgid "Could not follow user: User not found."
+msgstr "Could not follow user: User not found."
 
-#: ../actions/smssettings.php:63 actions/smssettings.php:63
-#: actions/smssettings.php:118
-msgid "Confirmation code"
-msgstr "Confirmation code"
+#: actions/apifriendshipscreate.php:118
+#, php-format
+msgid "Could not follow user: %s is already on your list."
+msgstr "Could not follow user: %s is already on your list."
 
-#: ../actions/confirmaddress.php:38 actions/confirmaddress.php:38
-#: actions/confirmaddress.php:80
-msgid "Confirmation code not found."
-msgstr "Confirmation code not found."
+#: actions/apifriendshipsdestroy.php:109
+msgid "Could not unfollow user: User not found."
+msgstr "Could not unfollow user: User not found."
 
-#: ../actions/register.php:202
-#, php-format
-msgid ""
-"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
-"want to...\n"
-"\n"
-"* Go to [your profile](%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 "
-"share your interests. \n"
-"* Update your [profile settings](%%%%action.profilesettings%%%%) to tell "
-"others more about you. \n"
-"* Read over the [online docs](%%%%doc.help%%%%) for features you may have "
-"missed. \n"
-"\n"
-"Thanks for signing up and we hope you enjoy using this service."
+#: actions/apifriendshipsdestroy.php:120
+msgid "You cannot unfollow yourself!"
 msgstr ""
-"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
-"want to...\n"
-"\n"
-"* Go to [your profile](%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 "
-"share your interests. \n"
-"* Update your [profile settings](%%%%action.profilesettings%%%%) to tell "
-"others more about you. \n"
-"* Read over the [online docs](%%%%doc.help%%%%) for features you may have "
-"missed. \n"
-"\n"
-"Thanks for signing up and we hope you enjoy using this service."
-
-#: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
-#: actions/finishopenidlogin.php:119 lib/action.php:330
-msgid "Connect"
-msgstr "Connect"
 
-#: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
-#: actions/finishopenidlogin.php:114
-msgid "Connect existing account"
-msgstr "Connect existing account"
+#: actions/apifriendshipsexists.php:94
+msgid "Two user ids or screen_names must be supplied."
+msgstr "Two user ids or screen_names must be supplied."
 
-#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576
-msgid "Contact"
-msgstr "Contact"
+#: actions/apifriendshipsshow.php:135
+#, fuzzy
+msgid "Could not determine source user."
+msgstr "Could not retrieve public stream."
 
-#  Thought form was incorrect
-#: ../lib/openid.php:178 lib/openid.php:178 lib/openid.php:187
-#, php-format
-msgid "Could not create OpenID form: %s"
-msgstr "Could not create OpenID from: %s"
+#: actions/apifriendshipsshow.php:143
+#, fuzzy
+msgid "Could not find target user."
+msgstr "Couldn't find any statuses."
 
-#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
-#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
-#: actions/twitapifriendships.php:48 actions/twitapifriendships.php:64
-#, php-format
-msgid "Could not follow user: %s is already on your list."
-msgstr "Could not follow user: %s is already on your list."
+#: actions/apigroupcreate.php:164 actions/editgroup.php:182
+#: actions/newgroup.php:126 actions/profilesettings.php:208
+#: actions/register.php:205
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr "Nickname must have only lowercase letters and numbers, and no spaces."
 
-#: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
-#: actions/twitapifriendships.php:41
-msgid "Could not follow user: User not found."
-msgstr "Could not follow user: User not found."
+#: actions/apigroupcreate.php:173 actions/editgroup.php:186
+#: actions/newgroup.php:130 actions/profilesettings.php:231
+#: actions/register.php:208
+msgid "Nickname already in use. Try another one."
+msgstr "Nickname already in use. Try another one."
 
-#: ../lib/openid.php:160 lib/openid.php:160 lib/openid.php:169
-#, php-format
-msgid "Could not redirect to server: %s"
-msgstr "Could not redirect to server: %s"
+#: actions/apigroupcreate.php:180 actions/editgroup.php:189
+#: actions/newgroup.php:133 actions/profilesettings.php:211
+#: actions/register.php:210
+msgid "Not a valid nickname."
+msgstr "Not a valid nickname."
 
-#: ../actions/updateprofile.php:162 actions/updateprofile.php:163
-#: actions/updateprofile.php:166
-msgid "Could not save avatar info"
-msgstr "Could not save avatar info"
+#: actions/apigroupcreate.php:196 actions/editgroup.php:195
+#: actions/newgroup.php:139 actions/profilesettings.php:215
+#: actions/register.php:217
+msgid "Homepage is not a valid URL."
+msgstr "Homepage is not a valid URL."
 
-#: ../actions/updateprofile.php:155 actions/updateprofile.php:156
-#: actions/updateprofile.php:159
-msgid "Could not save new profile info"
-msgstr "Could not save new profile info"
+#: actions/apigroupcreate.php:205 actions/editgroup.php:198
+#: actions/newgroup.php:142 actions/profilesettings.php:218
+#: actions/register.php:220
+msgid "Full name is too long (max 255 chars)."
+msgstr "Full name is too long (max 255 chars)."
 
-#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:72
-msgid "Could not subscribe other to you."
-msgstr "Could not subscribe other to you."
+#: actions/apigroupcreate.php:213
+#, fuzzy, php-format
+msgid "Description is too long (max %d chars)."
+msgstr "description is too long (max 140 chars)."
 
-#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:57
-msgid "Could not subscribe."
-msgstr "Could not subscribe."
+#: actions/apigroupcreate.php:224 actions/editgroup.php:204
+#: actions/newgroup.php:148 actions/profilesettings.php:225
+#: actions/register.php:227
+msgid "Location is too long (max 255 chars)."
+msgstr "Location is too long (max 255 chars)."
 
-#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
-#: actions/recoverpassword.php:111
-msgid "Could not update user with confirmed email address."
-msgstr "Couldn't update user with confirmed e-mail address."
+#: actions/apigroupcreate.php:243 actions/editgroup.php:215
+#: actions/newgroup.php:159
+#, php-format
+msgid "Too many aliases! Maximum %d."
+msgstr ""
 
-#: ../actions/finishremotesubscribe.php:99
-#: actions/finishremotesubscribe.php:101 actions/finishremotesubscribe.php:114
-msgid "Couldn't convert request tokens to access tokens."
-msgstr "Couldn't convert request tokens to access tokens."
+#: actions/apigroupcreate.php:264 actions/editgroup.php:224
+#: actions/newgroup.php:168
+#, fuzzy, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "Invalid tag: \"%s\""
 
-#: ../actions/confirmaddress.php:84 ../actions/emailsettings.php:234
-#: ../actions/imsettings.php:218 ../actions/smssettings.php:241
-#: actions/confirmaddress.php:84 actions/emailsettings.php:252
-#: actions/imsettings.php:226 actions/smssettings.php:249
-#: actions/confirmaddress.php:126 actions/emailsettings.php:375
-#: actions/imsettings.php:357 actions/smssettings.php:370
-msgid "Couldn't delete email confirmation."
-msgstr "Couldn't delete e-mail confirmation."
+#: actions/apigroupcreate.php:273 actions/editgroup.php:228
+#: actions/newgroup.php:172
+#, fuzzy, php-format
+msgid "Alias \"%s\" already in use. Try another one."
+msgstr "Nickname already in use. Try another one."
 
-#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134
-msgid "Couldn't delete subscription."
-msgstr "Couldn't delete subscription."
+#: actions/apigroupcreate.php:286 actions/editgroup.php:234
+#: actions/newgroup.php:178
+msgid "Alias can't be the same as nickname."
+msgstr ""
 
-#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
-#: actions/twitapistatuses.php:84
-msgid "Couldn't find any statuses."
-msgstr "Couldn't find any statuses."
+#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
+#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
+#: actions/apigroupshow.php:90 actions/apitimelinegroup.php:91
+#, fuzzy
+msgid "Group not found!"
+msgstr "API method not found!"
 
-#: ../actions/remotesubscribe.php:127 actions/remotesubscribe.php:136
-#: actions/remotesubscribe.php:178
-msgid "Couldn't get a request token."
-msgstr "Couldn't get a request token."
+#: actions/apigroupjoin.php:110
+msgid "You are already a member of that group."
+msgstr "You are already a member of that group."
 
-#: ../actions/emailsettings.php:205 ../actions/imsettings.php:187
-#: ../actions/smssettings.php:206 actions/emailsettings.php:223
-#: actions/imsettings.php:195 actions/smssettings.php:214
-#: actions/emailsettings.php:337 actions/imsettings.php:311
-#: actions/smssettings.php:325
-msgid "Couldn't insert confirmation code."
-msgstr "Couldn't insert confirmation code."
+#: actions/apigroupjoin.php:119 actions/joingroup.php:95 lib/command.php:221
+msgid "You have been blocked from that group by the admin."
+msgstr ""
 
-#: ../actions/finishremotesubscribe.php:180
-#: actions/finishremotesubscribe.php:182 actions/finishremotesubscribe.php:218
-msgid "Couldn't insert new subscription."
-msgstr "Couldn't insert new subscription."
+#: actions/apigroupjoin.php:138
+#, fuzzy, php-format
+msgid "Could not join user %s to group %s."
+msgstr "Could not join user %s to group %s"
 
-#: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
-#: actions/profilesettings.php:299 actions/twitapiaccount.php:94
-#: actions/profilesettings.php:302 actions/twitapiaccount.php:81
-msgid "Couldn't save profile."
-msgstr "Couldn't save profile."
+#: actions/apigroupleave.php:114
+#, fuzzy
+msgid "You are not a member of this group."
+msgstr "You are not a member of that group."
 
-#: ../actions/profilesettings.php:161 actions/profilesettings.php:276
-#: actions/profilesettings.php:279
-msgid "Couldn't update user for autosubscribe."
-msgstr "Couldn't update user for autosubscribe."
+#: actions/apigroupleave.php:124
+#, fuzzy, php-format
+msgid "Could not remove user %s to group %s."
+msgstr "Could not remove user %s to group %s"
 
-#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
-#: actions/emailsettings.php:298 actions/emailsettings.php:312
-#: actions/emailsettings.php:440 actions/emailsettings.php:462
-msgid "Couldn't update user record."
-msgstr "Couldn't update user record."
+#: actions/apigrouplistall.php:90 actions/usergroups.php:62
+#, php-format
+msgid "%s groups"
+msgstr "%s groups"
 
-#: ../actions/confirmaddress.php:72 ../actions/emailsettings.php:156
-#: ../actions/emailsettings.php:259 ../actions/imsettings.php:138
-#: ../actions/imsettings.php:243 ../actions/profilesettings.php:141
-#: ../actions/smssettings.php:157 ../actions/smssettings.php:269
-#: actions/confirmaddress.php:72 actions/emailsettings.php:174
-#: actions/emailsettings.php:277 actions/imsettings.php:146
-#: actions/imsettings.php:251 actions/profilesettings.php:256
-#: actions/smssettings.php:165 actions/smssettings.php:277
-#: actions/confirmaddress.php:114 actions/emailsettings.php:280
-#: actions/emailsettings.php:411 actions/imsettings.php:252
-#: actions/imsettings.php:395 actions/othersettings.php:162
-#: actions/profilesettings.php:259 actions/smssettings.php:266
-#: actions/smssettings.php:408
-msgid "Couldn't update user."
-msgstr "Couldn't update user."
+#: actions/apigrouplistall.php:94
+#, fuzzy, php-format
+msgid "groups on %s"
+msgstr "Group actions"
 
-#: ../actions/finishopenidlogin.php:84 actions/finishopenidlogin.php:90
-#: actions/finishopenidlogin.php:112
-msgid "Create"
-msgstr "Create"
+#: actions/apigrouplist.php:95
+#, fuzzy, php-format
+msgid "%s's groups"
+msgstr "%s groups"
 
-#: ../actions/finishopenidlogin.php:70 actions/finishopenidlogin.php:76
-#: actions/finishopenidlogin.php:98
-msgid "Create a new user with this nickname."
-msgstr "Create a new user with this nickname."
+#: actions/apigrouplist.php:103
+#, fuzzy, php-format
+msgid "Groups %s is a member of on %s."
+msgstr "Groups %s is a member of"
 
-#: ../actions/finishopenidlogin.php:68 actions/finishopenidlogin.php:74
-#: actions/finishopenidlogin.php:96
-msgid "Create new account"
-msgstr "Create new account"
+#: actions/apistatusesdestroy.php:107
+msgid "This method requires a POST or DELETE."
+msgstr "This method requires a POST or DELETE."
 
-#: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
-#: actions/finishopenidlogin.php:231
-msgid "Creating new account for OpenID that already has a user."
-msgstr "Creating new account for OpenID that already has a user."
+#: actions/apistatusesdestroy.php:130
+msgid "You may not delete another user's status."
+msgstr "You may not delete another user's status."
 
-#: ../actions/imsettings.php:45 actions/imsettings.php:46
-#: actions/imsettings.php:100
-msgid "Current confirmed Jabber/GTalk address."
-msgstr "Current confirmed Jabber/GTalk address."
+#: actions/apistatusesshow.php:138
+#, fuzzy
+msgid "Status deleted."
+msgstr "Avatar updated."
 
-#: ../actions/smssettings.php:46 actions/smssettings.php:46
-#: actions/smssettings.php:100
-msgid "Current confirmed SMS-enabled phone number."
-msgstr "Current confirmed SMS-enabled phone number."
+#: actions/apistatusesshow.php:144
+msgid "No status with that ID found."
+msgstr "No status with that ID found."
 
-#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
-#: actions/emailsettings.php:99
-msgid "Current confirmed email address."
-msgstr "Current confirmed e-mail address."
+#: actions/apistatusesupdate.php:157 actions/newnotice.php:155
+#: scripts/maildaemon.php:71
+#, php-format
+msgid "That's too long. Max notice size is %d chars."
+msgstr "That's too long. Max notice size is %d chars."
 
-#: ../actions/showstream.php:356 actions/showstream.php:367
-msgid "Currently"
-msgstr "Currently"
+#: actions/apistatusesupdate.php:198
+msgid "Not found"
+msgstr "Not found"
 
-#: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:91
+#: actions/apistatusesupdate.php:227 actions/newnotice.php:178
 #, php-format
-msgid "DB error inserting hashtag: %s"
-msgstr "DB error inserting hashtag: %s"
+msgid "Max notice size is %d chars, including attachment URL."
+msgstr ""
 
-#: ../lib/util.php:1061 lib/util.php:1110 classes/Notice.php:698
+#: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261
+#, fuzzy
+msgid "Unsupported format."
+msgstr "Unsupported image file format."
+
+#: actions/apitimelinefavorites.php:107
 #, php-format
-msgid "DB error inserting reply: %s"
-msgstr "DB error inserting reply: %s"
+msgid "%s / Favorites from %s"
+msgstr "%s / Favourites from %s"
 
-#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
-#: actions/deletenotice.php:79
-msgid "Delete notice"
-msgstr "Delete notice"
+#: actions/apitimelinefavorites.php:119
+#, php-format
+msgid "%s updates favorited by %s / %s."
+msgstr "%s updates favourited by %s / %s."
 
-#: ../actions/profilesettings.php:51 ../actions/register.php:172
-#: actions/profilesettings.php:84 actions/register.php:186
-#: actions/profilesettings.php:114
-msgid "Describe yourself and your interests in 140 chars"
-msgstr "Describe yourself and your interests in 140 chars"
+#: actions/apitimelinegroup.php:108 actions/apitimelineuser.php:117
+#: actions/grouprss.php:131 actions/userrss.php:90
+#, php-format
+msgid "%s timeline"
+msgstr "%s timeline"
 
-#: ../actions/register.php:158 ../actions/register.php:161
-#: ../lib/settingsaction.php:87 actions/register.php:172
-#: actions/register.php:175 lib/settingsaction.php:87 actions/register.php:381
-#: actions/register.php:385 lib/accountsettingsaction.php:113
-msgid "Email"
-msgstr "E-mail"
+#: actions/apitimelinegroup.php:116 actions/apitimelineuser.php:125
+#: actions/userrss.php:92
+#, php-format
+msgid "Updates from %1$s on %2$s!"
+msgstr "Updates from %1$s on %2$s!"
 
-#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
-#: actions/emailsettings.php:115
-msgid "Email Address"
-msgstr "E-mail Address"
+#: actions/apitimelinementions.php:116
+#, fuzzy, php-format
+msgid "%1$s / Updates mentioning %2$s"
+msgstr "%1$s / Updates replying to %2$s"
 
-#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
-#: actions/emailsettings.php:60
-msgid "Email Settings"
-msgstr "E-mail Settings"
+#: actions/apitimelinementions.php:126
+#, php-format
+msgid "%1$s updates that reply to updates from %2$s / %3$s."
+msgstr "%1$s updates that reply to updates from %2$s / %3$s."
 
-#: ../actions/register.php:73 actions/register.php:80 actions/register.php:163
-msgid "Email address already exists."
-msgstr "E-mail address already exists."
+#: actions/apitimelinepublic.php:106 actions/publicrss.php:103
+#, php-format
+msgid "%s public timeline"
+msgstr "%s public timeline"
 
-#: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173
-msgid "Email address confirmation"
-msgstr "E-mail address confirmation"
+#: actions/apitimelinepublic.php:110 actions/publicrss.php:105
+#, php-format
+msgid "%s updates from everyone!"
+msgstr "%s updates from everyone!"
 
-#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
-#: actions/emailsettings.php:117
-msgid "Email address, like \"UserName@example.org\""
-msgstr "E-mail address, like \"UserName@example.org\""
+#: actions/apitimelinetag.php:101 actions/tag.php:66
+#, php-format
+msgid "Notices tagged with %s"
+msgstr "Notices tagged with %s"
 
-#: ../actions/invite.php:129 actions/invite.php:137 actions/invite.php:174
-msgid "Email addresses"
-msgstr "E-mail addresses"
+#: actions/apitimelinetag.php:107 actions/tagrss.php:64
+#, fuzzy, php-format
+msgid "Updates tagged with %1$s on %2$s!"
+msgstr "Updates from %1$s on %2$s!"
 
-#: ../actions/recoverpassword.php:191 actions/recoverpassword.php:197
-#: actions/recoverpassword.php:231
-msgid "Enter a nickname or email address."
-msgstr "Enter a nickname or e-mail address."
+#: actions/apiusershow.php:96
+msgid "Not found."
+msgstr "Not found."
 
-#: ../actions/smssettings.php:64 actions/smssettings.php:64
-#: actions/smssettings.php:119
-msgid "Enter the code you received on your phone."
-msgstr "Enter the code you received on your phone."
+#: actions/attachment.php:73
+#, fuzzy
+msgid "No such attachment."
+msgstr "No such document."
 
-#: ../actions/userauthorization.php:137 actions/userauthorization.php:144
-#: actions/userauthorization.php:161
-msgid "Error authorizing token"
-msgstr "Error authorising token."
+#: actions/avatarbynickname.php:59 actions/leavegroup.php:76
+msgid "No nickname."
+msgstr "No nickname."
 
-#: ../actions/finishopenidlogin.php:253 actions/finishopenidlogin.php:259
-#: actions/finishopenidlogin.php:297
-msgid "Error connecting user to OpenID."
-msgstr "Error connecting user to OpenID."
+#: actions/avatarbynickname.php:64
+msgid "No size."
+msgstr "No size."
 
-#: ../actions/finishaddopenid.php:78 actions/finishaddopenid.php:78
-#: actions/finishaddopenid.php:126
-msgid "Error connecting user."
-msgstr "Error connecting user."
+#: actions/avatarbynickname.php:69
+msgid "Invalid size."
+msgstr "Invalid size."
 
-#: ../actions/finishremotesubscribe.php:151
-#: actions/finishremotesubscribe.php:153 actions/finishremotesubscribe.php:166
-msgid "Error inserting avatar"
-msgstr "Error inserting avatar."
+#: actions/avatarsettings.php:67 actions/showgroup.php:221
+#: lib/accountsettingsaction.php:112
+msgid "Avatar"
+msgstr "Avatar"
 
-#: ../actions/finishremotesubscribe.php:143
-#: actions/finishremotesubscribe.php:145 actions/finishremotesubscribe.php:158
-msgid "Error inserting new profile"
-msgstr "Error inserting new profile."
+#: actions/avatarsettings.php:78
+#, fuzzy, php-format
+msgid "You can upload your personal avatar. The maximum file size is %s."
+msgstr "You can upload your personal avatar."
 
-#: ../actions/finishremotesubscribe.php:167
-#: actions/finishremotesubscribe.php:169 actions/finishremotesubscribe.php:182
-msgid "Error inserting remote profile"
-msgstr "Error inserting remote profile."
+#: actions/avatarsettings.php:106 actions/avatarsettings.php:182
+#: actions/grouplogo.php:178 actions/remotesubscribe.php:191
+#: actions/userauthorization.php:72 actions/userrss.php:103
+msgid "User without matching profile"
+msgstr "User without matching profile"
 
-#: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246
-#: actions/recoverpassword.php:280
-msgid "Error saving address confirmation."
-msgstr "Error saving address confirmation."
+#: actions/avatarsettings.php:119 actions/avatarsettings.php:194
+#: actions/grouplogo.php:251
+msgid "Avatar settings"
+msgstr "Avatar settings"
 
-#: ../actions/userauthorization.php:140 actions/userauthorization.php:147
-#: actions/userauthorization.php:164
-msgid "Error saving remote profile"
-msgstr "Error saving remote profile."
+#: actions/avatarsettings.php:126 actions/avatarsettings.php:202
+#: actions/grouplogo.php:199 actions/grouplogo.php:259
+msgid "Original"
+msgstr "Original"
 
-#: ../lib/openid.php:226 lib/openid.php:226 lib/openid.php:235
-msgid "Error saving the profile."
-msgstr "Error saving the profile."
+#: actions/avatarsettings.php:141 actions/avatarsettings.php:214
+#: actions/grouplogo.php:210 actions/grouplogo.php:271
+msgid "Preview"
+msgstr "Preview"
 
-#: ../lib/openid.php:237 lib/openid.php:237 lib/openid.php:246
-msgid "Error saving the user."
-msgstr "Error saving the user."
+#: actions/avatarsettings.php:148 lib/deleteuserform.php:66
+#: lib/noticelist.php:522
+msgid "Delete"
+msgstr "Delete"
 
-#: ../actions/password.php:80 actions/profilesettings.php:399
-#: actions/passwordsettings.php:164
-msgid "Error saving user; invalid."
-msgstr "Error saving user; invalid."
+#: actions/avatarsettings.php:165 actions/grouplogo.php:233
+msgid "Upload"
+msgstr "Upload"
 
-#: ../actions/login.php:47 ../actions/login.php:73
-#: ../actions/recoverpassword.php:307 ../actions/register.php:98
-#: actions/login.php:47 actions/login.php:73 actions/recoverpassword.php:320
-#: actions/register.php:108 actions/login.php:112 actions/login.php:138
-#: actions/recoverpassword.php:354 actions/register.php:198
-msgid "Error setting user."
-msgstr "Error setting user."
+#: actions/avatarsettings.php:228 actions/grouplogo.php:286
+msgid "Crop"
+msgstr "Crop"
 
-#  Added full stop
-#: ../actions/finishaddopenid.php:83 actions/finishaddopenid.php:83
-#: actions/finishaddopenid.php:131
-msgid "Error updating profile"
-msgstr "Error updating profile."
+#: actions/avatarsettings.php:265 actions/disfavor.php:74
+#: actions/emailsettings.php:237 actions/favor.php:75
+#: actions/groupblock.php:66 actions/grouplogo.php:309
+#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/invite.php:56 actions/login.php:131 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:187 actions/recoverpassword.php:337
+#: actions/register.php:165 actions/remotesubscribe.php:77
+#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46
+#: actions/tagother.php:166 actions/unsubscribe.php:69
+#: actions/userauthorization.php:52 lib/designsettings.php:294
+msgid "There was a problem with your session token. Try again, please."
+msgstr "There was a problem with your session token. Try again, please."
 
-#  Added full stop
-#: ../actions/finishremotesubscribe.php:161
-#: actions/finishremotesubscribe.php:163 actions/finishremotesubscribe.php:176
-msgid "Error updating remote profile"
-msgstr "Error updating remote profile."
+#: actions/avatarsettings.php:277 actions/designadminpanel.php:103
+#: actions/emailsettings.php:255 actions/grouplogo.php:319
+#: actions/imsettings.php:220 actions/recoverpassword.php:44
+#: actions/smssettings.php:248 lib/designsettings.php:304
+msgid "Unexpected form submission."
+msgstr "Unexpected form submission."
 
-#: ../actions/recoverpassword.php:80 actions/recoverpassword.php:80
-#: actions/recoverpassword.php:86
-msgid "Error with confirmation code."
-msgstr "Error with confirmation code."
+#: actions/avatarsettings.php:322
+msgid "Pick a square area of the image to be your avatar"
+msgstr "Pick a square area of the image to be your avatar"
 
-#: ../actions/finishopenidlogin.php:89 actions/finishopenidlogin.php:95
-#: actions/finishopenidlogin.php:117
-msgid "Existing nickname"
-msgstr "Existing nickname"
+#: actions/avatarsettings.php:337 actions/grouplogo.php:377
+msgid "Lost our file data."
+msgstr "Lost our file data."
 
-#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570
-msgid "FAQ"
-msgstr "F.A.Q."
+#: actions/avatarsettings.php:360
+msgid "Avatar updated."
+msgstr "Avatar updated."
 
-#: ../actions/avatar.php:115 actions/profilesettings.php:352
-#: actions/avatarsettings.php:397
+#: actions/avatarsettings.php:363
 msgid "Failed updating avatar."
 msgstr "Failed updating avatar."
 
-#: ../actions/all.php:61 ../actions/allrss.php:64 actions/all.php:61
-#: actions/allrss.php:64 actions/all.php:75 actions/allrss.php:107
-#, php-format
-msgid "Feed for friends of %s"
-msgstr "Feed for friends of %s"
-
-#: ../actions/replies.php:65 ../actions/repliesrss.php:80
-#: actions/replies.php:65 actions/repliesrss.php:66 actions/replies.php:134
-#: actions/repliesrss.php:71
-#, php-format
-msgid "Feed for replies to %s"
-msgstr "Feed for replies to %s"
-
-#: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:61
-#, php-format
-msgid "Feed for tag %s"
-msgstr "Feed for tag %s"
-
-#: ../lib/searchaction.php:105 lib/searchaction.php:105
-#: lib/searchgroupnav.php:83
-msgid "Find content of notices"
-msgstr "Find content of notices"
-
-#: ../lib/searchaction.php:101 lib/searchaction.php:101
-#: lib/searchgroupnav.php:81
-msgid "Find people on this site"
-msgstr "Find people on this site"
-
-#: ../actions/login.php:122
-msgid ""
-"For security reasons, please re-enter your user name and password before "
-"changing your settings."
-msgstr ""
-"For security reasons, please re-enter your user name and password before "
-"changing your settings."
+#: actions/avatarsettings.php:387
+#, fuzzy
+msgid "Avatar deleted."
+msgstr "Avatar updated."
 
-#: ../actions/profilesettings.php:44 ../actions/register.php:164
-#: actions/profilesettings.php:77 actions/register.php:178
-#: actions/profilesettings.php:103 actions/register.php:391
-#: actions/showgroup.php:235 actions/showstream.php:262
-#: actions/tagother.php:105 lib/groupeditform.php:142
-msgid "Full name"
-msgstr "Full name"
+#: actions/blockedfromgroup.php:73 actions/editgroup.php:84
+#: actions/groupdesignsettings.php:84 actions/grouplogo.php:86
+#: actions/groupmembers.php:76 actions/grouprss.php:91
+#: actions/joingroup.php:76 actions/showgroup.php:121
+msgid "No nickname"
+msgstr "No nickname"
 
-#: ../actions/profilesettings.php:98 ../actions/register.php:79
-#: ../actions/updateprofile.php:93 actions/profilesettings.php:213
-#: actions/register.php:86 actions/updateprofile.php:94
-#: actions/editgroup.php:195 actions/newgroup.php:146
-#: actions/profilesettings.php:202 actions/register.php:171
-#: actions/updateprofile.php:97
-msgid "Full name is too long (max 255 chars)."
-msgstr "Full name is too long (max 255 chars)."
+#: actions/blockedfromgroup.php:80 actions/editgroup.php:96
+#: actions/groupbyid.php:83 actions/groupdesignsettings.php:97
+#: actions/grouplogo.php:99 actions/groupmembers.php:83
+#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137
+msgid "No such group"
+msgstr "No such group"
 
-#: ../lib/util.php:322 lib/util.php:338 lib/action.php:344 lib/action.php:566
-msgid "Help"
-msgstr "Help"
+#: actions/blockedfromgroup.php:90
+#, fuzzy, php-format
+msgid "%s blocked profiles"
+msgstr "User profile"
 
-#: ../lib/util.php:298 lib/util.php:314 lib/action.php:322
-#: lib/facebookaction.php:200
-msgid "Home"
-msgstr "Home"
+#: actions/blockedfromgroup.php:93
+#, fuzzy, php-format
+msgid "%s blocked profiles, page %d"
+msgstr "%s and friends, page %d"
 
-#: ../actions/profilesettings.php:46 ../actions/register.php:167
-#: actions/profilesettings.php:79 actions/register.php:181
-#: actions/profilesettings.php:107 actions/register.php:396
-#: lib/groupeditform.php:146
-msgid "Homepage"
-msgstr "Homepage"
+#: actions/blockedfromgroup.php:108
+#, fuzzy
+msgid "A list of the users blocked from joining this group."
+msgstr "A list of the users in this group."
 
-#: ../actions/profilesettings.php:95 ../actions/register.php:76
-#: actions/profilesettings.php:210 actions/register.php:83
-#: actions/editgroup.php:192 actions/newgroup.php:143
-#: actions/profilesettings.php:199 actions/register.php:168
-msgid "Homepage is not a valid URL."
-msgstr "Homepage is not a valid URL."
+#: actions/blockedfromgroup.php:281
+#, fuzzy
+msgid "Unblock user from group"
+msgstr "Unblock user failed."
 
-#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
-#: actions/emailsettings.php:173
-msgid "I want to post notices by email."
-msgstr "I want to post notices by e-mail."
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:69
+msgid "Unblock"
+msgstr "Unblock"
 
-#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
-#: lib/connectsettingsaction.php:104
-msgid "IM"
-msgstr "I.M."
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:80
+msgid "Unblock this user"
+msgstr "Unblock this user"
 
-#  possibly use I.M.
-#: ../actions/imsettings.php:60 actions/imsettings.php:61
-#: actions/imsettings.php:118
-msgid "IM Address"
-msgstr "I.M. Address"
+#: actions/block.php:69
+#, fuzzy
+msgid "You already blocked that user."
+msgstr "You have already blocked this user."
 
-#  requires full stops?
-#: ../actions/imsettings.php:33 actions/imsettings.php:33
-#: actions/imsettings.php:59
-msgid "IM Settings"
-msgstr "I.M. Settings"
+#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
+msgid "Block user"
+msgstr "Block user"
 
-#: ../actions/finishopenidlogin.php:88 actions/finishopenidlogin.php:94
-#: actions/finishopenidlogin.php:116
+#: actions/block.php:130
 msgid ""
-"If you already have an account, login with your username and password to "
-"connect it to your OpenID."
+"Are you sure you want to block this user? Afterwards, they will be "
+"unsubscribed from you, unable to subscribe to you in the future, and you "
+"will not be notified of any @-replies from them."
 msgstr ""
-"If you already have an account, login with your username and password to "
-"connect it to your OpenID."
 
-#: ../actions/openidsettings.php:45
-msgid ""
-"If you want to add an OpenID to your account, enter it in the box below and "
-"click \"Add\"."
-msgstr ""
-"If you want to add an OpenID to your account, enter it in the box below and "
-"click \"Add\"."
+#: actions/block.php:143 actions/deletenotice.php:145
+#: actions/deleteuser.php:147 actions/groupblock.php:178
+msgid "No"
+msgstr "No"
 
-# double space here
-#: ../actions/recoverpassword.php:137
-msgid ""
-"If you've forgotten or lost your password, you can get a new one sent to the "
-"email address you have stored  in your account."
-msgstr ""
-"If you've forgotten or lost your password, you can get a new one sent to the "
-"e-mail address you have stored  in your account."
+#: actions/block.php:143 actions/deleteuser.php:147
+#, fuzzy
+msgid "Do not block this user"
+msgstr "Unblock this user"
 
-#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
-#: actions/emailsettings.php:68 actions/smssettings.php:76
-#: actions/emailsettings.php:127 actions/smssettings.php:140
-msgid "Incoming email"
-msgstr "Incoming e-mail"
+#: actions/block.php:144 actions/deletenotice.php:146
+#: actions/deleteuser.php:148 actions/groupblock.php:179
+msgid "Yes"
+msgstr "Yes"
 
-#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
-#: actions/emailsettings.php:443
-msgid "Incoming email address removed."
-msgstr "Incoming e-mail address removed."
+#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
+msgid "Block this user"
+msgstr "Block this user"
 
-#: ../actions/password.php:69 actions/profilesettings.php:388
-#: actions/passwordsettings.php:153
-msgid "Incorrect old password"
-msgstr "Incorrect old password"
+#: actions/block.php:162
+msgid "Failed to save block information."
+msgstr "Failed to save block information."
 
-#: ../actions/login.php:67 actions/login.php:67 actions/facebookhome.php:131
-#: actions/login.php:132
-msgid "Incorrect username or password."
-msgstr "Incorrect username or password."
+#: actions/bookmarklet.php:50
+msgid "Post to "
+msgstr "Post to "
 
-#: ../actions/recoverpassword.php:265
-msgid ""
-"Instructions for recovering your password have been sent to the email "
-"address registered to your account."
-msgstr ""
-"Instructions for recovering your password have been sent to the e-mail "
-"address registered to your account."
+#: actions/confirmaddress.php:75
+msgid "No confirmation code."
+msgstr "No confirmation code."
 
-#  Avatar?
-#: ../actions/updateprofile.php:114 actions/updateprofile.php:115
-#: actions/updateprofile.php:118
-#, php-format
-msgid "Invalid avatar URL '%s'"
-msgstr "Invalid avatar URL '%s'"
+#: actions/confirmaddress.php:80
+msgid "Confirmation code not found."
+msgstr "Confirmation code not found."
 
-#: ../actions/invite.php:55 actions/invite.php:62 actions/invite.php:70
-#, php-format
-msgid "Invalid email address: %s"
-msgstr "Invalid e-mail address: %s"
+#: actions/confirmaddress.php:85
+msgid "That confirmation code is not for you!"
+msgstr "That confirmation code is not for you!"
 
-#: ../actions/updateprofile.php:98 actions/updateprofile.php:99
-#: actions/updateprofile.php:102
+#: actions/confirmaddress.php:90
 #, php-format
-msgid "Invalid homepage '%s'"
-msgstr "Invalid homepage '%s'"
+msgid "Unrecognized address type %s"
+msgstr "Unrecognised address type %s"
 
-#: ../actions/updateprofile.php:82 actions/updateprofile.php:83
-#: actions/updateprofile.php:86
-#, php-format
-msgid "Invalid license URL '%s'"
-msgstr "Invalid licence URL '%s'"
+#: actions/confirmaddress.php:94
+msgid "That address has already been confirmed."
+msgstr "That address has already been confirmed."
 
-#: ../actions/postnotice.php:61 actions/postnotice.php:62
-#: actions/postnotice.php:66
-msgid "Invalid notice content"
-msgstr "Invalid notice content"
+#: actions/confirmaddress.php:114 actions/emailsettings.php:295
+#: actions/emailsettings.php:426 actions/imsettings.php:258
+#: actions/imsettings.php:401 actions/othersettings.php:174
+#: actions/profilesettings.php:276 actions/smssettings.php:278
+#: actions/smssettings.php:420
+msgid "Couldn't update user."
+msgstr "Couldn't update user."
 
-#: ../actions/postnotice.php:67 actions/postnotice.php:68
-#: actions/postnotice.php:72
-msgid "Invalid notice uri"
-msgstr "Invalid notice URI"
+#: actions/confirmaddress.php:126 actions/emailsettings.php:390
+#: actions/imsettings.php:363 actions/smssettings.php:382
+msgid "Couldn't delete email confirmation."
+msgstr "Couldn't delete e-mail confirmation."
 
-# URL case
-#: ../actions/postnotice.php:72 actions/postnotice.php:73
-#: actions/postnotice.php:77
-msgid "Invalid notice url"
-msgstr "Invalid notice URL"
+#: actions/confirmaddress.php:144
+msgid "Confirm Address"
+msgstr "Confirm Address"
 
-#: ../actions/updateprofile.php:87 actions/updateprofile.php:88
-#: actions/updateprofile.php:91
+#: actions/confirmaddress.php:159
 #, php-format
-msgid "Invalid profile URL '%s'."
-msgstr "Invalid profile URL '%s'."
-
-#: ../actions/remotesubscribe.php:96 actions/remotesubscribe.php:105
-#: actions/remotesubscribe.php:135
-msgid "Invalid profile URL (bad format)"
-msgstr "Invalid profile URL (bad format)"
-
-#: ../actions/finishremotesubscribe.php:77
-#: actions/finishremotesubscribe.php:79 actions/finishremotesubscribe.php:80
-msgid "Invalid profile URL returned by server."
-msgstr "Invalid profile URL returned by server."
+msgid "The address \"%s\" has been confirmed for your account."
+msgstr "The address \"%s\" has been confirmed for your account."
 
-#: ../actions/avatarbynickname.php:37 actions/avatarbynickname.php:37
-#: actions/avatarbynickname.php:69
-msgid "Invalid size."
-msgstr "Invalid size."
+#: actions/conversation.php:99
+msgid "Conversation"
+msgstr "Conversation"
 
-#: ../actions/finishopenidlogin.php:235 ../actions/register.php:93
-#: ../actions/register.php:111 actions/finishopenidlogin.php:241
-#: actions/register.php:103 actions/register.php:121
-#: actions/finishopenidlogin.php:279 actions/register.php:193
-#: actions/register.php:211
-msgid "Invalid username or password."
-msgstr "Invalid username or password."
-
-#: ../actions/invite.php:79 actions/invite.php:86 actions/invite.php:102
-msgid "Invitation(s) sent"
-msgstr "Invitation(s) sent"
+#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
+#: lib/profileaction.php:206
+msgid "Notices"
+msgstr "Notices"
 
-#: ../actions/invite.php:97 actions/invite.php:104 actions/invite.php:136
-msgid "Invitation(s) sent to the following people:"
-msgstr "Invitation(s) sent to the following people:"
+#: actions/deletenotice.php:52 actions/shownotice.php:92
+msgid "No such notice."
+msgstr "No such notice."
 
-#: ../lib/util.php:306 lib/util.php:322 lib/facebookaction.php:207
-#: lib/subgroupnav.php:103
-msgid "Invite"
-msgstr "Invite"
+#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
+#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
+#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
+#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30
+#: actions/unsubscribe.php:52 lib/adminpanelaction.php:72
+#: lib/profileformaction.php:63 lib/settingsaction.php:72
+msgid "Not logged in."
+msgstr "Not logged in."
 
-#: ../actions/invite.php:123 actions/invite.php:130 actions/invite.php:104
-msgid "Invite new users"
-msgstr "Invite new users"
+#: actions/deletenotice.php:71
+msgid "Can't delete this notice."
+msgstr "Can't delete this notice."
 
-#: ../lib/util.php:261 lib/util.php:277 lib/action.php:609
-#, php-format
+#: actions/deletenotice.php:103
+#, fuzzy
 msgid ""
-"It runs the [StatusNet](http://status.net/) microblogging software, version %"
-"s, available under the [GNU Affero General Public License](http://www.fsf."
-"org/licensing/licenses/agpl-3.0.html)."
+"You are about to permanently delete a notice. Once this is done, it cannot "
+"be undone."
 msgstr ""
-"It runs the [StatusNet](http://status.net/) microblogging software, version %"
-"s, available under the [GNU Affero General Public Licence](http://www.fsf."
-"org/licensing/licenses/agpl-3.0.html)."
+"You are about to permanently delete a notice.  Once this is done, it cannot "
+"be undone."
 
-#: ../actions/imsettings.php:173 actions/imsettings.php:181
-#: actions/imsettings.php:296
-msgid "Jabber ID already belongs to another user."
-msgstr "Jabber ID already belongs to another user."
+#: actions/deletenotice.php:109 actions/deletenotice.php:141
+msgid "Delete notice"
+msgstr "Delete notice"
 
-#: ../actions/imsettings.php:62 actions/imsettings.php:63
-#, php-format
-msgid ""
-"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
-"add %s to your buddy list in your IM client or on GTalk."
-msgstr ""
-"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
-"add %s to your buddy list in your IM client or on GTalk."
+#: actions/deletenotice.php:144
+msgid "Are you sure you want to delete this notice?"
+msgstr "Are you sure you want to delete this notice?"
 
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:128
-msgid "Language"
-msgstr "Language"
+#: actions/deletenotice.php:145
+msgid "Do not delete this notice"
+msgstr "Do not delete this notice"
 
-#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
-#: actions/profilesettings.php:217
-msgid "Language is too long (max 50 chars)."
-msgstr "Language is too long (max 50 chars)."
+#: actions/deletenotice.php:146 lib/noticelist.php:522
+msgid "Delete this notice"
+msgstr "Delete this notice"
 
-#: ../actions/profilesettings.php:52 ../actions/register.php:173
-#: actions/profilesettings.php:85 actions/register.php:187
-#: actions/profilesettings.php:117 actions/register.php:408
-#: actions/showgroup.php:244 actions/showstream.php:271
-#: actions/tagother.php:113 lib/groupeditform.php:156 lib/grouplist.php:126
-#: lib/profilelist.php:125
-msgid "Location"
-msgstr "Location"
+#: actions/deletenotice.php:157
+#, fuzzy
+msgid "There was a problem with your session token.  Try again, please."
+msgstr "There was a problem with your session token. Try again, please."
 
-#: ../actions/profilesettings.php:104 ../actions/register.php:85
-#: ../actions/updateprofile.php:108 actions/profilesettings.php:219
-#: actions/register.php:92 actions/updateprofile.php:109
-#: actions/editgroup.php:201 actions/newgroup.php:152
-#: actions/profilesettings.php:208 actions/register.php:177
-#: actions/updateprofile.php:112
-msgid "Location is too long (max 255 chars)."
-msgstr "Location is too long (max 255 chars)."
+#: actions/deleteuser.php:67
+#, fuzzy
+msgid "You cannot delete users."
+msgstr "Couldn't update user."
 
-#: ../actions/login.php:97 ../actions/login.php:106
-#: ../actions/openidlogin.php:68 ../lib/util.php:310 actions/login.php:97
-#: actions/login.php:106 actions/openidlogin.php:77 lib/util.php:326
-#: actions/facebooklogin.php:93 actions/login.php:186 actions/login.php:239
-#: actions/openidlogin.php:112 lib/action.php:335 lib/facebookaction.php:288
-#: lib/facebookaction.php:315 lib/logingroupnav.php:75
-#, php-format
-msgid "Login"
-msgstr "Login"
+#: actions/deleteuser.php:74
+#, fuzzy
+msgid "You can only delete local users."
+msgstr "You may not delete another user's status."
 
-#: ../actions/openidlogin.php:44 actions/openidlogin.php:52
-#: actions/openidlogin.php:62
-#, php-format
-msgid "Login with an [OpenID](%%doc.openid%%) account."
-msgstr "Login with an [OpenID](%%doc.openid%%) account."
+#: actions/deleteuser.php:110 actions/deleteuser.php:133
+#, fuzzy
+msgid "Delete user"
+msgstr "Delete"
 
-#: ../actions/login.php:126
-#, php-format
+#: actions/deleteuser.php:135
 msgid ""
-"Login with your username and password. Don't have a username yet? [Register]"
-"(%%action.register%%) a new account, or try [OpenID](%%action.openidlogin%"
-"%). "
+"Are you sure you want to delete this user? This will clear all data about "
+"the user from the database, without a backup."
 msgstr ""
-"Login with your username and password. Don't have a username yet? "
-"[Register](%%action.register%%) a new account, or try "
-"[OpenID](%%action.openidlogin%%). "
 
-#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332
-msgid "Logout"
-msgstr "Logout"
+#: actions/deleteuser.php:148 lib/deleteuserform.php:77
+#, fuzzy
+msgid "Delete this user"
+msgstr "Delete this notice"
 
-#: ../actions/register.php:166 actions/register.php:180
-#: actions/register.php:393
-msgid "Longer name, preferably your \"real\" name"
-msgstr "Longer name, preferably your \"real\" name"
+#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124
+#: lib/adminpanelaction.php:302 lib/groupnav.php:119
+msgid "Design"
+msgstr ""
 
-#: ../actions/login.php:110 actions/login.php:110 actions/login.php:245
-#: lib/facebookaction.php:320
-msgid "Lost or forgotten password?"
-msgstr "Lost or forgotten password?"
+#: actions/designadminpanel.php:73
+msgid "Design settings for this StatusNet site."
+msgstr ""
 
-#: ../actions/emailsettings.php:80 ../actions/smssettings.php:89
-#: actions/emailsettings.php:81 actions/smssettings.php:89
-msgid "Make a new email address for posting to; cancels the old one."
-msgstr "Make a new e-mail address for posting to - cancels the old one."
+#: actions/designadminpanel.php:278
+#, fuzzy
+msgid "Invalid logo URL."
+msgstr "Invalid size."
 
-#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
-#: actions/emailsettings.php:71
-#, php-format
-msgid "Manage how you get email from %%site.name%%."
-msgstr "Manage how you get e-mail from %%site.name%%."
+#: actions/designadminpanel.php:282
+#, fuzzy, php-format
+msgid "Theme not available: %s"
+msgstr "This page is not available in a "
 
-#: ../actions/showstream.php:300 actions/showstream.php:315
-#: actions/showstream.php:480
-msgid "Member since"
-msgstr "Member since"
+#: actions/designadminpanel.php:288
+#, fuzzy, php-format
+msgid "Theme directory not readable: %s"
+msgstr "This page is not available in a "
 
-#: ../actions/userrss.php:70 actions/userrss.php:67 actions/userrss.php:72
+#: actions/designadminpanel.php:292
 #, php-format
-msgid "Microblog by %s"
-msgstr "Microblog by %s"
+msgid "Avatar directory not writable: %s"
+msgstr ""
 
-# Carrier?
-#: ../actions/smssettings.php:304
+#: actions/designadminpanel.php:296
 #, php-format
-#, fuzzy
-msgid ""
-"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
-"email but isn't listed here, send email to let us know at %s."
+msgid "Background directory not writable: %s"
 msgstr ""
-"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
-"e-mail but isn't listed here, send e-mail to let us know at %s."
-
-#: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
-#: actions/finishopenidlogin.php:85 actions/register.php:202
-#: actions/finishopenidlogin.php:107 actions/register.php:429
-msgid "My text and files are available under "
-msgstr "My text and files are available under "
-
-#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
-#: actions/emailsettings.php:83 actions/smssettings.php:91
-#: actions/emailsettings.php:142 actions/smssettings.php:152
-msgid "New"
-msgstr "New"
 
-#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:286
+#: actions/designadminpanel.php:312
 #, php-format
-msgid "New email address for posting to %s"
-msgstr "New e-mail address for posting to %s"
-
-#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
-#: actions/emailsettings.php:465
-msgid "New incoming email address added."
-msgstr "New incoming e-mail address added."
-
-#: ../actions/finishopenidlogin.php:71 actions/finishopenidlogin.php:77
-#: actions/finishopenidlogin.php:99
-msgid "New nickname"
-msgstr "New nickname"
-
-#: ../actions/newnotice.php:87 actions/newnotice.php:96
-#: actions/newnotice.php:68
-msgid "New notice"
-msgstr "New notice"
-
-#: ../actions/password.php:41 ../actions/recoverpassword.php:179
-#: actions/profilesettings.php:180 actions/recoverpassword.php:185
-#: actions/passwordsettings.php:101 actions/recoverpassword.php:219
-msgid "New password"
-msgstr "New password"
-
-#: ../actions/recoverpassword.php:314
-msgid "New password successfully saved. You are now logged in."
-msgstr "New password successfully saved. You are now logged in."
-
-#: ../actions/login.php:101 ../actions/profilesettings.php:41
-#: ../actions/register.php:151 actions/login.php:101
-#: actions/profilesettings.php:74 actions/register.php:165
-#: actions/login.php:228 actions/profilesettings.php:98
-#: actions/register.php:367 actions/showgroup.php:224
-#: actions/showstream.php:251 actions/tagother.php:95
-#: lib/facebookaction.php:308 lib/groupeditform.php:137
-msgid "Nickname"
-msgstr "Nickname"
-
-#: ../actions/finishopenidlogin.php:175 ../actions/profilesettings.php:110
-#: ../actions/register.php:69 actions/finishopenidlogin.php:181
-#: actions/profilesettings.php:225 actions/register.php:76
-#: actions/editgroup.php:183 actions/finishopenidlogin.php:215
-#: actions/newgroup.php:134 actions/profilesettings.php:214
-#: actions/register.php:159
-msgid "Nickname already in use. Try another one."
-msgstr "Nickname already in use. Try another one."
-
-#: ../actions/finishopenidlogin.php:165 ../actions/profilesettings.php:88
-#: ../actions/register.php:67 ../actions/updateprofile.php:77
-#: actions/finishopenidlogin.php:171 actions/profilesettings.php:203
-#: actions/register.php:74 actions/updateprofile.php:78
-#: actions/finishopenidlogin.php:205 actions/profilesettings.php:192
-#: actions/updateprofile.php:81
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr "Nickname must have only lowercase letters and numbers, and no spaces."
-
-#: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
-#: actions/finishopenidlogin.php:210
-msgid "Nickname not allowed."
-msgstr "Nickname not allowed."
-
-#: ../actions/remotesubscribe.php:72 actions/remotesubscribe.php:81
-#: actions/remotesubscribe.php:106
-msgid "Nickname of the user you want to follow"
-msgstr "Nickname of the user you want to follow"
-
-#: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
-#: actions/recoverpassword.php:186
-msgid "Nickname or email"
-msgstr "Nickname or e-mail"
-
-#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
-#: actions/block.php:147 actions/deletenotice.php:118
-msgid "No"
-msgstr "No"
-
-#: ../actions/imsettings.php:156 actions/imsettings.php:164
-#: actions/imsettings.php:279
-msgid "No Jabber ID."
-msgstr "No Jabber ID."
+msgid "Max length for %s %s is 255 characters."
+msgstr ""
 
-#: ../actions/userauthorization.php:129 actions/userauthorization.php:136
-#: actions/userauthorization.php:153
-msgid "No authorization request!"
-msgstr "No authorisation request!"
+#: actions/designadminpanel.php:412
+#, fuzzy
+msgid "Change logo"
+msgstr "Change colours"
 
-# Carrier?
-#: ../actions/smssettings.php:181 actions/smssettings.php:189
-#: actions/smssettings.php:299
+#: actions/designadminpanel.php:417
 #, fuzzy
-msgid "No carrier selected."
-msgstr "No carrier selected."
+msgid "Site logo"
+msgstr "Invite"
 
-#: ../actions/smssettings.php:316 actions/smssettings.php:324
-#: actions/smssettings.php:486
-msgid "No code entered"
-msgstr "No code entered"
+#: actions/designadminpanel.php:424
+#, fuzzy
+msgid "Change theme"
+msgstr "Change"
 
-#: ../actions/confirmaddress.php:33 actions/confirmaddress.php:33
-#: actions/confirmaddress.php:75
-msgid "No confirmation code."
-msgstr "No confirmation code."
+#: actions/designadminpanel.php:441
+#, fuzzy
+msgid "Site theme"
+msgstr "Site notice"
 
-#: ../actions/newnotice.php:44 actions/newmessage.php:53
-#: actions/newnotice.php:44 classes/Command.php:197 actions/newmessage.php:109
-#: actions/newnotice.php:126 classes/Command.php:223
-msgid "No content!"
-msgstr "No content!"
+#: actions/designadminpanel.php:442
+#, fuzzy
+msgid "Theme for the site."
+msgstr "Logout from the site"
 
-#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
-#: actions/emailsettings.php:304
-msgid "No email address."
-msgstr "No e-mail address."
+#: actions/designadminpanel.php:447
+msgid "Theme server"
+msgstr ""
 
-#: ../actions/userbyid.php:32 actions/userbyid.php:32 actions/userbyid.php:70
-msgid "No id."
-msgstr "No id."
+#: actions/designadminpanel.php:451
+msgid "Theme path"
+msgstr ""
 
-#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
-#: actions/emailsettings.php:430
-msgid "No incoming email address."
-msgstr "No incoming e-mail address."
+#: actions/designadminpanel.php:455
+msgid "Theme directory"
+msgstr ""
 
-#: ../actions/finishremotesubscribe.php:65
-#: actions/finishremotesubscribe.php:67 actions/finishremotesubscribe.php:68
-msgid "No nickname provided by remote server."
-msgstr "No nickname provided by remote server."
+#: actions/designadminpanel.php:462
+#, fuzzy
+msgid "Avatar Settings"
+msgstr "Avatar settings"
 
-#: ../actions/avatarbynickname.php:27 actions/avatarbynickname.php:27
-#: actions/avatarbynickname.php:59 actions/leavegroup.php:81
-msgid "No nickname."
-msgstr "No nickname."
+#: actions/designadminpanel.php:467
+#, fuzzy
+msgid "Avatar server"
+msgstr "Avatar settings"
 
-#: ../actions/emailsettings.php:222 ../actions/imsettings.php:206
-#: ../actions/smssettings.php:229 actions/emailsettings.php:240
-#: actions/imsettings.php:214 actions/smssettings.php:237
-#: actions/emailsettings.php:363 actions/imsettings.php:345
-#: actions/smssettings.php:358
-msgid "No pending confirmation to cancel."
-msgstr "No pending confirmation to cancel."
+#: actions/designadminpanel.php:471
+#, fuzzy
+msgid "Avatar path"
+msgstr "Avatar updated."
 
-#: ../actions/smssettings.php:176 actions/smssettings.php:184
-#: actions/smssettings.php:294
-msgid "No phone number."
-msgstr "No phone number."
+#: actions/designadminpanel.php:475
+#, fuzzy
+msgid "Avatar directory"
+msgstr "Avatar updated."
 
-#: ../actions/finishremotesubscribe.php:72
-#: actions/finishremotesubscribe.php:74 actions/finishremotesubscribe.php:75
-msgid "No profile URL returned by server."
-msgstr "No profile URL returned by server."
+#: actions/designadminpanel.php:486 lib/designsettings.php:101
+msgid "Change background image"
+msgstr ""
 
-#: ../actions/recoverpassword.php:226 actions/recoverpassword.php:232
-#: actions/recoverpassword.php:266
-msgid "No registered email address for that user."
-msgstr "No registered e-mail address for that user."
+#: actions/designadminpanel.php:491 actions/designadminpanel.php:578
+#: lib/designsettings.php:178
+msgid "Background"
+msgstr ""
 
-#: ../actions/userauthorization.php:49 actions/userauthorization.php:55
-#: actions/userauthorization.php:57
-msgid "No request found!"
-msgstr "No request found!"
+#: actions/designadminpanel.php:496
+#, fuzzy, php-format
+msgid ""
+"You can upload a background image for the site. The maximum file size is %1"
+"$s."
+msgstr "You can upload a logo image for your group."
 
-#: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64
-#: actions/noticesearch.php:69 actions/peoplesearch.php:69
-#: actions/groupsearch.php:81 actions/noticesearch.php:104
-#: actions/peoplesearch.php:85
-msgid "No results"
-msgstr "No results"
+#: actions/designadminpanel.php:526 lib/designsettings.php:139
+msgid "On"
+msgstr ""
 
-#: ../actions/avatarbynickname.php:32 actions/avatarbynickname.php:32
-#: actions/avatarbynickname.php:64
-msgid "No size."
-msgstr "No size."
+#: actions/designadminpanel.php:542 lib/designsettings.php:155
+msgid "Off"
+msgstr ""
 
-#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
-#: actions/twitapistatuses.php:520 actions/twitapifavorites.php:112
-#: actions/twitapistatuses.php:446
-msgid "No status found with that ID."
-msgstr "No status found with that ID."
+#: actions/designadminpanel.php:543 lib/designsettings.php:156
+msgid "Turn background image on or off."
+msgstr ""
 
-#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
-#: actions/twitapistatuses.php:418
-msgid "No status with that ID found."
-msgstr "No status with that ID found."
+#: actions/designadminpanel.php:548 lib/designsettings.php:161
+msgid "Tile background image"
+msgstr ""
 
-#: ../actions/openidsettings.php:135 actions/openidsettings.php:144
-#: actions/openidsettings.php:222
-msgid "No such OpenID."
-msgstr "No such OpenID."
+#: actions/designadminpanel.php:554
+msgid "Background server"
+msgstr ""
 
-#: ../actions/doc.php:29 actions/doc.php:29 actions/doc.php:64
-msgid "No such document."
-msgstr "No such document."
+#: actions/designadminpanel.php:558
+msgid "Background path"
+msgstr ""
 
-#: ../actions/shownotice.php:32 ../actions/shownotice.php:83
-#: ../lib/deleteaction.php:30 actions/shownotice.php:32
-#: actions/shownotice.php:83 lib/deleteaction.php:30 actions/shownotice.php:87
-#: lib/deleteaction.php:51
-msgid "No such notice."
-msgstr "No such notice."
+#: actions/designadminpanel.php:562
+msgid "Background directory"
+msgstr ""
 
-#: ../actions/recoverpassword.php:56 actions/recoverpassword.php:56
-#: actions/recoverpassword.php:62
-msgid "No such recovery code."
-msgstr "No such recovery code."
+#: actions/designadminpanel.php:569 lib/designsettings.php:170
+msgid "Change colours"
+msgstr "Change colours"
 
-#: ../actions/postnotice.php:56 actions/postnotice.php:57
-#: actions/postnotice.php:60
-msgid "No such subscription"
-msgstr "No such subscription"
-
-#: ../actions/all.php:34 ../actions/allrss.php:35
-#: ../actions/avatarbynickname.php:43 ../actions/foaf.php:40
-#: ../actions/remotesubscribe.php:84 ../actions/remotesubscribe.php:91
-#: ../actions/replies.php:57 ../actions/repliesrss.php:35
-#: ../actions/showstream.php:110 ../actions/userbyid.php:36
-#: ../actions/userrss.php:35 ../actions/xrds.php:35 ../lib/gallery.php:57
-#: ../lib/subs.php:33 ../lib/subs.php:82 actions/all.php:34
-#: actions/allrss.php:35 actions/avatarbynickname.php:43
-#: actions/favoritesrss.php:35 actions/foaf.php:40 actions/ical.php:31
-#: actions/remotesubscribe.php:93 actions/remotesubscribe.php:100
-#: actions/replies.php:57 actions/repliesrss.php:35
-#: actions/showfavorites.php:34 actions/showstream.php:110
-#: actions/userbyid.php:36 actions/userrss.php:35 actions/xrds.php:35
-#: classes/Command.php:120 classes/Command.php:162 classes/Command.php:203
-#: classes/Command.php:237 lib/gallery.php:62 lib/mailbox.php:36
-#: lib/subs.php:33 lib/subs.php:95 actions/all.php:53 actions/allrss.php:66
-#: actions/avatarbynickname.php:75 actions/favoritesrss.php:64
-#: actions/foaf.php:41 actions/remotesubscribe.php:123
-#: actions/remotesubscribe.php:130 actions/replies.php:73
-#: actions/repliesrss.php:38 actions/showfavorites.php:105
-#: actions/showstream.php:100 actions/userbyid.php:74
-#: actions/usergroups.php:92 actions/userrss.php:38 actions/xrds.php:73
-#: classes/Command.php:140 classes/Command.php:185 classes/Command.php:234
-#: classes/Command.php:271 lib/galleryaction.php:60 lib/mailbox.php:82
-#: lib/subs.php:34 lib/subs.php:109
-msgid "No such user."
-msgstr "No such user."
+#: actions/designadminpanel.php:591 lib/designsettings.php:191
+#, fuzzy
+msgid "Content"
+msgstr "Connect"
 
-#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
-#: actions/recoverpassword.php:251
-msgid "No user with that email address or username."
-msgstr "No user with that e-mail address or username."
+#: actions/designadminpanel.php:604 lib/designsettings.php:204
+#, fuzzy
+msgid "Sidebar"
+msgstr "Search"
 
-#: ../lib/gallery.php:80 lib/gallery.php:85
-msgid "Nobody to show!"
-msgstr "Nobody to show!"
+#: actions/designadminpanel.php:617 lib/designsettings.php:217
+msgid "Text"
+msgstr "Text"
 
-#: ../actions/recoverpassword.php:60 actions/recoverpassword.php:60
-#: actions/recoverpassword.php:66
-msgid "Not a recovery code."
-msgstr "Not a recovery code."
+#: actions/designadminpanel.php:630 lib/designsettings.php:230
+#, fuzzy
+msgid "Links"
+msgstr "Login"
 
-#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
-#: scripts/maildaemon.php:53
-msgid "Not a registered user."
-msgstr "Not a registered user."
+#: actions/designadminpanel.php:658 lib/designsettings.php:247
+msgid "Use defaults"
+msgstr ""
 
-#: ../lib/twitterapi.php:226 ../lib/twitterapi.php:247
-#: ../lib/twitterapi.php:332 lib/twitterapi.php:391 lib/twitterapi.php:418
-#: lib/twitterapi.php:502 lib/twitterapi.php:448 lib/twitterapi.php:476
-#: lib/twitterapi.php:566
-msgid "Not a supported data format."
-msgstr "Not a supported data format."
+#: actions/designadminpanel.php:659 lib/designsettings.php:248
+msgid "Restore default designs"
+msgstr ""
 
-#: ../actions/imsettings.php:167 actions/imsettings.php:175
-#: actions/imsettings.php:290
-msgid "Not a valid Jabber ID"
-msgstr "Not a valid Jabber ID"
+#: actions/designadminpanel.php:665 lib/designsettings.php:254
+msgid "Reset back to default"
+msgstr ""
 
-#: ../lib/openid.php:131 lib/openid.php:131 lib/openid.php:140
-msgid "Not a valid OpenID."
-msgstr "Not a valid OpenID."
+#: actions/designadminpanel.php:667 actions/emailsettings.php:195
+#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/profilesettings.php:167 actions/siteadminpanel.php:414
+#: actions/smssettings.php:181 actions/subscriptions.php:203
+#: actions/tagother.php:154 actions/useradminpanel.php:226
+#: lib/designsettings.php:256 lib/groupeditform.php:202
+msgid "Save"
+msgstr "Save"
 
-# Missing full stop, needs to merge with: actions/register.php:63 actions/register.php:70 actions/register.php:152
-#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
-#: actions/emailsettings.php:315
-msgid "Not a valid email address"
-msgstr "Not a valid e-mail address."
+#: actions/designadminpanel.php:668 lib/designsettings.php:257
+msgid "Save design"
+msgstr ""
 
-#: ../actions/register.php:63 actions/register.php:70 actions/register.php:152
-msgid "Not a valid email address."
-msgstr "Not a valid e-mail address."
+#: actions/disfavor.php:81
+msgid "This notice is not a favorite!"
+msgstr "This notice is not a favourite!"
 
-#: ../actions/profilesettings.php:91 ../actions/register.php:71
-#: actions/profilesettings.php:206 actions/register.php:78
-#: actions/editgroup.php:186 actions/newgroup.php:137
-#: actions/profilesettings.php:195 actions/register.php:161
-msgid "Not a valid nickname."
-msgstr "Not a valid nickname."
+#: actions/disfavor.php:94
+msgid "Add to favorites"
+msgstr "Add to favourites"
 
-#: ../actions/remotesubscribe.php:120 actions/remotesubscribe.php:129
-#: actions/remotesubscribe.php:159
-msgid "Not a valid profile URL (incorrect services)."
-msgstr "Not a valid profile URL (incorrect services)."
+#: actions/doc.php:69
+msgid "No such document."
+msgstr "No such document."
 
-#: ../actions/remotesubscribe.php:113 actions/remotesubscribe.php:122
-#: actions/remotesubscribe.php:152
-msgid "Not a valid profile URL (no XRDS defined)."
-msgstr "Not a valid profile URL (no XRDS defined)."
+#: actions/editgroup.php:56
+#, php-format
+msgid "Edit %s group"
+msgstr "Edit %s group"
 
-#: ../actions/remotesubscribe.php:104 actions/remotesubscribe.php:113
-#: actions/remotesubscribe.php:143
-msgid "Not a valid profile URL (no YADIS document)."
-msgstr "Not a valid profile URL (no YADIS document)."
+#: actions/editgroup.php:68 actions/grouplogo.php:70 actions/newgroup.php:65
+msgid "You must be logged in to create a group."
+msgstr "You must be logged in to create a group."
 
-#: ../actions/avatar.php:95 actions/profilesettings.php:332
-#: lib/imagefile.php:87
-msgid "Not an image or corrupt file."
-msgstr "Not an image or corrupt file."
+#: 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"
+msgstr "You must be an admin to edit the group"
 
-#: ../actions/finishremotesubscribe.php:51
-#: actions/finishremotesubscribe.php:53 actions/finishremotesubscribe.php:54
-msgid "Not authorized."
-msgstr "Not authorised."
+#: actions/editgroup.php:154
+msgid "Use this form to edit the group."
+msgstr "Use this form to edit the group."
 
-#: ../actions/finishremotesubscribe.php:38
-#: actions/finishremotesubscribe.php:38 actions/finishremotesubscribe.php:40
-msgid "Not expecting this response!"
-msgstr "Not expecting this response!"
+#: actions/editgroup.php:201 actions/newgroup.php:145
+#, fuzzy, php-format
+msgid "description is too long (max %d chars)."
+msgstr "description is too long (max 140 chars)."
 
-#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
-#: actions/twitapistatuses.php:309
-msgid "Not found"
-msgstr "Not found"
+#: actions/editgroup.php:253
+msgid "Could not update group."
+msgstr "Could not update group."
 
-#: ../actions/finishaddopenid.php:29 ../actions/logout.php:33
-#: ../actions/newnotice.php:29 ../actions/subscribe.php:28
-#: ../actions/unsubscribe.php:25 ../lib/deleteaction.php:38
-#: ../lib/settingsaction.php:27 actions/disfavor.php:29 actions/favor.php:30
-#: actions/finishaddopenid.php:29 actions/logout.php:33
-#: actions/newmessage.php:28 actions/newnotice.php:29 actions/subscribe.php:28
-#: actions/unsubscribe.php:25 lib/deleteaction.php:38
-#: lib/settingsaction.php:27 actions/block.php:59 actions/disfavor.php:61
-#: actions/favor.php:64 actions/finishaddopenid.php:67 actions/logout.php:71
-#: actions/newmessage.php:83 actions/newnotice.php:90 actions/nudge.php:63
-#: actions/subedit.php:31 actions/subscribe.php:30 actions/unblock.php:60
-#: actions/unsubscribe.php:27 lib/deleteaction.php:66
-#: lib/settingsaction.php:72
-msgid "Not logged in."
-msgstr "Not logged in."
+#: actions/editgroup.php:259 classes/User_group.php:390
+msgid "Could not create aliases."
+msgstr "Could not create aliases"
 
-# removed full stop
-#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122
-msgid "Not subscribed!."
-msgstr "Not subscribed!"
+#: actions/editgroup.php:269
+msgid "Options saved."
+msgstr "Options saved."
 
-#: ../actions/opensearch.php:35 actions/opensearch.php:35
-#: actions/opensearch.php:67
-msgid "Notice Search"
-msgstr "Notice Search"
+#: actions/emailsettings.php:60
+msgid "Email Settings"
+msgstr "E-mail Settings"
 
-#: ../actions/showstream.php:82 actions/showstream.php:82
-#: actions/showstream.php:180 actions/showstream.php:187
-#: actions/showstream.php:192
+#: actions/emailsettings.php:71
 #, php-format
-msgid "Notice feed for %s"
-msgstr "Notice feed for %s"
-
-#: ../actions/shownotice.php:39 actions/shownotice.php:39
-#: actions/shownotice.php:94
-msgid "Notice has no profile"
-msgstr "Notice has no profile"
+msgid "Manage how you get email from %%site.name%%."
+msgstr "Manage how you get e-mail from %%site.name%%."
 
-#: ../actions/showstream.php:316 actions/showstream.php:331
-#: actions/showstream.php:504 lib/facebookaction.php:477 lib/mailbox.php:116
-#: lib/noticelist.php:87
-msgid "Notices"
-msgstr "Notices"
+#: actions/emailsettings.php:100 actions/imsettings.php:100
+#: actions/smssettings.php:104
+msgid "Address"
+msgstr "Address"
 
-#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
-#: actions/tag.php:81 actions/tag.php:41
-#, php-format
-msgid "Notices tagged with %s"
-msgstr "Notices tagged with %s"
+#: actions/emailsettings.php:105
+msgid "Current confirmed email address."
+msgstr "Current confirmed e-mail address."
 
-#: ../actions/password.php:39 actions/profilesettings.php:178
-#: actions/passwordsettings.php:97
-msgid "Old password"
-msgstr "Old password"
+#: actions/emailsettings.php:107 actions/emailsettings.php:140
+#: actions/imsettings.php:108 actions/smssettings.php:115
+#: actions/smssettings.php:158
+msgid "Remove"
+msgstr "Remove"
 
-#: ../lib/settingsaction.php:96 ../lib/util.php:314 lib/settingsaction.php:90
-#: lib/util.php:330 lib/accountsettingsaction.php:116 lib/action.php:341
-#: lib/logingroupnav.php:81
-msgid "OpenID"
-msgstr "OpenID"
-
-#: ../actions/finishopenidlogin.php:61 actions/finishopenidlogin.php:66
-#: actions/finishopenidlogin.php:73
-msgid "OpenID Account Setup"
-msgstr "OpenID Account Setup"
-
-#: ../lib/openid.php:180 lib/openid.php:180 lib/openid.php:266
-msgid "OpenID Auto-Submit"
-msgstr "OpenID Auto-Submit"
-
-#: ../actions/finishaddopenid.php:99 ../actions/finishopenidlogin.php:140
-#: ../actions/openidlogin.php:60 actions/finishaddopenid.php:99
-#: actions/finishopenidlogin.php:146 actions/openidlogin.php:68
-#: actions/finishaddopenid.php:170 actions/openidlogin.php:80
-msgid "OpenID Login"
-msgstr "OpenID Login"
-
-#: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49
-#: actions/openidlogin.php:74 actions/openidsettings.php:50
-#: actions/openidlogin.php:102 actions/openidsettings.php:101
-msgid "OpenID URL"
-msgstr "OpenID URL"
-
-#: ../actions/finishaddopenid.php:42 ../actions/finishopenidlogin.php:103
-#: actions/finishaddopenid.php:42 actions/finishopenidlogin.php:109
-#: actions/finishaddopenid.php:88 actions/finishopenidlogin.php:130
-msgid "OpenID authentication cancelled."
-msgstr "OpenID authentication cancelled."
-
-#: ../actions/finishaddopenid.php:46 ../actions/finishopenidlogin.php:107
-#: actions/finishaddopenid.php:46 actions/finishopenidlogin.php:113
-#: actions/finishaddopenid.php:92 actions/finishopenidlogin.php:134
-#, php-format
-msgid "OpenID authentication failed: %s"
-msgstr "OpenID authentication failed: %s"
-
-#: ../lib/openid.php:133 lib/openid.php:133 lib/openid.php:142
-#, php-format
-msgid "OpenID failure: %s"
-msgstr "OpenID failure: %s"
-
-#: ../actions/openidsettings.php:144 actions/openidsettings.php:153
-#: actions/openidsettings.php:231
-msgid "OpenID removed."
-msgstr "OpenID removed."
-
-#: ../actions/openidsettings.php:37 actions/openidsettings.php:37
-#: actions/openidsettings.php:59
-msgid "OpenID settings"
-msgstr "OpenID settings"
-
-#: ../actions/invite.php:135 actions/invite.php:143 actions/invite.php:180
-msgid "Optionally add a personal message to the invitation."
-msgstr "Optionally add a personal message to the invitation."
+#: actions/emailsettings.php:113
+msgid ""
+"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
+"a message with further instructions."
+msgstr ""
+"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
+"a message with further instructions."
 
-#: ../actions/avatar.php:84 actions/profilesettings.php:321
-#: lib/imagefile.php:75
-msgid "Partial upload."
-msgstr "Partial upload."
+#: actions/emailsettings.php:117 actions/imsettings.php:120
+#: actions/smssettings.php:126
+msgid "Cancel"
+msgstr "Cancel"
 
-#: ../actions/finishopenidlogin.php:90 ../actions/login.php:102
-#: ../actions/register.php:153 ../lib/settingsaction.php:93
-#: actions/finishopenidlogin.php:96 actions/login.php:102
-#: actions/register.php:167 actions/finishopenidlogin.php:118
-#: actions/login.php:231 actions/register.php:372
-#: lib/accountsettingsaction.php:110 lib/facebookaction.php:311
-msgid "Password"
-msgstr "Password"
+#: actions/emailsettings.php:121
+msgid "Email Address"
+msgstr "E-mail Address"
 
-#: ../actions/recoverpassword.php:288 actions/recoverpassword.php:301
-#: actions/recoverpassword.php:335
-msgid "Password and confirmation do not match."
-msgstr "Password and confirmation do not match."
+#: actions/emailsettings.php:123
+msgid "Email address, like \"UserName@example.org\""
+msgstr "E-mail address, like \"UserName@example.org\""
 
-#: ../actions/recoverpassword.php:284 actions/recoverpassword.php:297
-#: actions/recoverpassword.php:331
-msgid "Password must be 6 chars or more."
-msgstr "Password must be 6 chars or more."
+#: actions/emailsettings.php:126 actions/imsettings.php:133
+#: actions/smssettings.php:145
+msgid "Add"
+msgstr "Add"
 
-#: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
-#: actions/recoverpassword.php:267 actions/recoverpassword.php:269
-#: actions/recoverpassword.php:199 actions/recoverpassword.php:301
-msgid "Password recovery requested"
-msgstr "Password recovery requested"
+#: actions/emailsettings.php:133 actions/smssettings.php:152
+msgid "Incoming email"
+msgstr "Incoming e-mail"
 
-#: ../actions/password.php:89 ../actions/recoverpassword.php:313
-#: actions/profilesettings.php:408 actions/recoverpassword.php:326
-#: actions/passwordsettings.php:173 actions/recoverpassword.php:200
-msgid "Password saved."
-msgstr "Password saved."
+#: actions/emailsettings.php:138 actions/smssettings.php:157
+msgid "Send email to this address to post new notices."
+msgstr "Send e-mail to this address to post new notices."
 
-#: ../actions/password.php:61 ../actions/register.php:88
-#: actions/profilesettings.php:380 actions/register.php:98
-#: actions/passwordsettings.php:145 actions/register.php:183
-msgid "Passwords don't match."
-msgstr "Passwords don't match."
+#: actions/emailsettings.php:145 actions/smssettings.php:162
+msgid "Make a new email address for posting to; cancels the old one."
+msgstr "Make a new e-mail address for posting to - cancels the old one."
 
-#: ../lib/searchaction.php:100 lib/searchaction.php:100
-#: lib/searchgroupnav.php:80
-msgid "People"
-msgstr "People"
+#: actions/emailsettings.php:148 actions/smssettings.php:164
+msgid "New"
+msgstr "New"
 
-#: ../actions/opensearch.php:33 actions/opensearch.php:33
-#: actions/opensearch.php:64
-msgid "People Search"
-msgstr "People Search"
+#: actions/emailsettings.php:153 actions/imsettings.php:139
+#: actions/smssettings.php:169
+msgid "Preferences"
+msgstr "Preferences"
 
-#: ../actions/peoplesearch.php:33 actions/peoplesearch.php:33
-#: actions/peoplesearch.php:58
-msgid "People search"
-msgstr "People Search"
+#: actions/emailsettings.php:158
+msgid "Send me notices of new subscriptions through email."
+msgstr "Send me notices of new subscriptions through e-mail."
 
-#: ../lib/stream.php:50 lib/personal.php:50 lib/personalgroupnav.php:98
-msgid "Personal"
-msgstr "Personal"
+#: actions/emailsettings.php:163
+msgid "Send me email when someone adds my notice as a favorite."
+msgstr "Send me e-mail when someone adds my notice as a favourite."
 
-#: ../actions/invite.php:133 actions/invite.php:141 actions/invite.php:178
-msgid "Personal message"
-msgstr "Personal message"
+#: actions/emailsettings.php:169
+msgid "Send me email when someone sends me a private message."
+msgstr "Send me e-mail when someone sends me a private message."
 
-#: ../actions/smssettings.php:69 actions/smssettings.php:69
-msgid "Phone number, no punctuation or spaces, with area code"
-msgstr "Phone number, no punctuation or spaces, with area code"
+#: actions/emailsettings.php:174
+msgid "Send me email when someone sends me an \"@-reply\"."
+msgstr "Send me e-mail when someone sends me an \"@-reply\"."
 
-#: ../actions/userauthorization.php:78
-msgid ""
-"Please check these details to make sure that you want to subscribe to this "
-"user's notices. If you didn't just ask to subscribe to someone's notices, "
-"click \"Cancel\"."
-msgstr ""
-"Please check these details to make sure that you want to subscribe to this "
-"user's notices. If you didn't just ask to subscribe to someone's notices, "
-"click \"Cancel\"."
+#: actions/emailsettings.php:179
+msgid "Allow friends to nudge me and send me an email."
+msgstr "Allow friends to nudge me and send me an e-mail."
 
-#: ../actions/imsettings.php:73 actions/imsettings.php:74
-#: actions/imsettings.php:142
-msgid "Post a notice when my Jabber/GTalk status changes."
-msgstr "Post a notice when my Jabber/GTalk status changes."
+#: actions/emailsettings.php:185
+msgid "I want to post notices by email."
+msgstr "I want to post notices by e-mail."
 
-#: ../actions/emailsettings.php:85 ../actions/imsettings.php:67
-#: ../actions/smssettings.php:94 actions/emailsettings.php:86
-#: actions/imsettings.php:68 actions/smssettings.php:94
-#: actions/twittersettings.php:70 actions/emailsettings.php:147
-#: actions/imsettings.php:133 actions/smssettings.php:157
-#: actions/twittersettings.php:134
-msgid "Preferences"
-msgstr "Preferences"
+#: actions/emailsettings.php:191
+msgid "Publish a MicroID for my email address."
+msgstr "Publish a MicroID for my e-mail address."
 
-#: ../actions/emailsettings.php:162 ../actions/imsettings.php:144
-#: ../actions/smssettings.php:163 actions/emailsettings.php:180
-#: actions/imsettings.php:152 actions/smssettings.php:171
-#: actions/emailsettings.php:286 actions/imsettings.php:258
-#: actions/othersettings.php:168 actions/smssettings.php:272
+#: actions/emailsettings.php:301 actions/imsettings.php:264
+#: actions/othersettings.php:180 actions/smssettings.php:284
 msgid "Preferences saved."
 msgstr "Preferences saved."
 
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:129
-msgid "Preferred language"
-msgstr "Preferred language"
-
-#: ../lib/util.php:328 lib/util.php:344 lib/action.php:572
-msgid "Privacy"
-msgstr "Privacy"
-
-#: ../classes/Notice.php:95 ../classes/Notice.php:106 classes/Notice.php:109
-#: classes/Notice.php:119 classes/Notice.php:145 classes/Notice.php:155
-msgid "Problem saving notice."
-msgstr "Problem saving notice."
-
-#: ../lib/settingsaction.php:84 ../lib/stream.php:60 lib/personal.php:60
-#: lib/settingsaction.php:84 lib/accountsettingsaction.php:104
-#: lib/personalgroupnav.php:108
-msgid "Profile"
-msgstr "Profile"
-
-#: ../actions/remotesubscribe.php:73 actions/remotesubscribe.php:82
-#: actions/remotesubscribe.php:109
-msgid "Profile URL"
-msgstr "Profile URL"
+#: actions/emailsettings.php:319
+msgid "No email address."
+msgstr "No e-mail address."
 
-#: ../actions/profilesettings.php:34 actions/profilesettings.php:32
-#: actions/profilesettings.php:58
-msgid "Profile settings"
-msgstr "Profile settings"
+#: actions/emailsettings.php:326
+msgid "Cannot normalize that email address"
+msgstr "Cannot normalise that e-mail address"
 
-#: ../actions/postnotice.php:51 ../actions/updateprofile.php:52
-#: actions/postnotice.php:52 actions/updateprofile.php:53
-#: actions/postnotice.php:55 actions/updateprofile.php:56
-msgid "Profile unknown"
-msgstr "Profile unknown"
+#: actions/emailsettings.php:330 actions/siteadminpanel.php:158
+msgid "Not a valid email address"
+msgstr "Not a valid e-mail address."
 
-#: ../actions/public.php:54 actions/public.php:54 actions/public.php:124
-msgid "Public Stream Feed"
-msgstr "Public Stream Feed"
+#: actions/emailsettings.php:333
+msgid "That is already your email address."
+msgstr "That is already your e-mail address."
 
-#: ../actions/public.php:33 actions/public.php:33 actions/public.php:109
-#: lib/publicgroupnav.php:77
-msgid "Public timeline"
-msgstr "Public timeline"
+#: actions/emailsettings.php:336
+msgid "That email address already belongs to another user."
+msgstr "That e-mail address already belongs to another user."
 
-#: ../actions/imsettings.php:79 actions/imsettings.php:80
-#: actions/imsettings.php:153
-msgid "Publish a MicroID for my Jabber/GTalk address."
-msgstr "Publish a MicroID for my Jabber/GTalk address."
+#: actions/emailsettings.php:352 actions/imsettings.php:317
+#: actions/smssettings.php:337
+msgid "Couldn't insert confirmation code."
+msgstr "Couldn't insert confirmation code."
 
-#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
-#: actions/emailsettings.php:178
-msgid "Publish a MicroID for my email address."
-msgstr "Publish a MicroID for my e-mail address."
+#: actions/emailsettings.php:358
+msgid ""
+"A confirmation code was sent to the email address you added. Check your "
+"inbox (and spam box!) for the code and instructions on how to use it."
+msgstr ""
+"A confirmation code was sent to the e-mail address you added. Check your "
+"inbox (and spam box!) for the code and instructions on how to use it."
 
-#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
-#: actions/tag.php:76
-msgid "Recent Tags"
-msgstr "Recent Tags"
+#: actions/emailsettings.php:378 actions/imsettings.php:351
+#: actions/smssettings.php:370
+msgid "No pending confirmation to cancel."
+msgstr "No pending confirmation to cancel."
 
-#: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
-#: actions/recoverpassword.php:190
-msgid "Recover"
-msgstr "Recover"
+#: actions/emailsettings.php:382 actions/imsettings.php:355
+msgid "That is the wrong IM address."
+msgstr "That is the wrong IM address."
 
-#: ../actions/recoverpassword.php:156 actions/recoverpassword.php:161
-#: actions/recoverpassword.php:198
-msgid "Recover password"
-msgstr "Recover password"
+#: actions/emailsettings.php:394 actions/imsettings.php:367
+#: actions/smssettings.php:386
+msgid "Confirmation cancelled."
+msgstr "Confirmation cancelled."
 
-#: ../actions/recoverpassword.php:67 actions/recoverpassword.php:67
-#: actions/recoverpassword.php:73
-msgid "Recovery code for unknown user."
-msgstr "Recovery code for unknown user."
+#: actions/emailsettings.php:412
+msgid "That is not your email address."
+msgstr "That is not your e-mail address."
 
-#: ../actions/register.php:142 ../actions/register.php:193 ../lib/util.php:312
-#: actions/register.php:152 actions/register.php:207 lib/util.php:328
-#: actions/register.php:69 actions/register.php:436 lib/action.php:338
-#: lib/facebookaction.php:277 lib/logingroupnav.php:78
-msgid "Register"
-msgstr "Register"
+#: actions/emailsettings.php:431 actions/imsettings.php:408
+#: actions/smssettings.php:425
+msgid "The address was removed."
+msgstr "The address was removed."
 
-#: ../actions/register.php:28 actions/register.php:28
-#: actions/finishopenidlogin.php:196 actions/register.php:90
-msgid "Registration not allowed."
-msgstr "Registration not allowed."
+#: actions/emailsettings.php:445 actions/smssettings.php:518
+msgid "No incoming email address."
+msgstr "No incoming e-mail address."
 
-#: ../actions/register.php:200 actions/register.php:214
-#: actions/register.php:67
-msgid "Registration successful"
-msgstr "Registration successful"
+#: actions/emailsettings.php:455 actions/emailsettings.php:477
+#: actions/smssettings.php:528 actions/smssettings.php:552
+msgid "Couldn't update user record."
+msgstr "Couldn't update user record."
 
-#: ../actions/userauthorization.php:120 actions/userauthorization.php:127
-#: actions/userauthorization.php:144
-msgid "Reject"
-msgstr "Reject"
+#: actions/emailsettings.php:458 actions/smssettings.php:531
+msgid "Incoming email address removed."
+msgstr "Incoming e-mail address removed."
 
-#: ../actions/login.php:103 ../actions/register.php:176 actions/login.php:103
-#: actions/register.php:190 actions/login.php:234 actions/openidlogin.php:107
-#: actions/register.php:414
-msgid "Remember me"
-msgstr "Remember me"
+#: actions/emailsettings.php:480 actions/smssettings.php:555
+msgid "New incoming email address added."
+msgstr "New incoming e-mail address added."
 
-#: ../actions/updateprofile.php:70 actions/updateprofile.php:71
-#: actions/updateprofile.php:74
-msgid "Remote profile with no matching profile"
-msgstr "Remote profile with no matching profile"
+#: actions/favorited.php:65 lib/popularnoticesection.php:87
+#: lib/publicgroupnav.php:93
+msgid "Popular notices"
+msgstr "Popular notices"
 
-#: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
-#: actions/remotesubscribe.php:88
-msgid "Remote subscribe"
-msgstr "Remote subscribe"
+#: actions/favorited.php:67
+#, php-format
+msgid "Popular notices, page %d"
+msgstr "Popular notices, page %d"
 
-#: ../actions/emailsettings.php:47 ../actions/emailsettings.php:75
-#: ../actions/imsettings.php:48 ../actions/openidsettings.php:106
-#: ../actions/smssettings.php:50 ../actions/smssettings.php:84
-#: actions/emailsettings.php:48 actions/emailsettings.php:76
-#: actions/imsettings.php:49 actions/openidsettings.php:108
-#: actions/smssettings.php:50 actions/smssettings.php:84
-#: actions/twittersettings.php:59 actions/emailsettings.php:101
-#: actions/emailsettings.php:134 actions/imsettings.php:102
-#: actions/openidsettings.php:166 actions/smssettings.php:103
-#: actions/smssettings.php:146 actions/twittersettings.php:115
-msgid "Remove"
-msgstr "Remove"
+#: actions/favorited.php:79
+msgid "The most popular notices on the site right now."
+msgstr "The most popular notices on the site right now."
 
-#: ../actions/openidsettings.php:68 actions/openidsettings.php:69
-#: actions/openidsettings.php:123
-msgid "Remove OpenID"
-msgstr "Remove OpenID"
+#: actions/favorited.php:150
+msgid "Favorite notices appear on this page but no one has favorited one yet."
+msgstr ""
+"Favourite notices appear on this page but no one has favourited one yet"
 
-#: ../actions/openidsettings.php:73
+#: actions/favorited.php:153
 msgid ""
-"Removing your only OpenID would make it impossible to log in! If you need to "
-"remove it, add another OpenID first."
+"Be the first to add a notice to your favorites by clicking the fave button "
+"next to any notice you like."
 msgstr ""
-"Removing your only OpenID would make it impossible to log in! If you need to "
-"remove it, add another OpenID first."
+"Be the first to add a notice to your favourites by clicking the fave button "
+"next to any notice you like."
 
-#: ../lib/stream.php:55 lib/personal.php:55 lib/personalgroupnav.php:103
-msgid "Replies"
-msgstr "Replies"
-
-#: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:56
-#: actions/replies.php:47 actions/repliesrss.php:62 lib/personal.php:56
-#: actions/replies.php:116 actions/repliesrss.php:67
-#: lib/personalgroupnav.php:104
+#: actions/favorited.php:156
 #, php-format
-msgid "Replies to %s"
-msgstr "Replies to %s"
-
-#: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
-#: actions/recoverpassword.php:223
-msgid "Reset"
-msgstr "Reset"
-
-#: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
-#: actions/recoverpassword.php:197
-msgid "Reset password"
-msgstr "Reset password"
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to add a "
+"notice to your favorites!"
+msgstr ""
+"Why not [register an account](%%action.register%%) and be the first to add a "
+"notice to your favourites!"
 
-#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
-#: actions/subscriptions.php:123 lib/connectsettingsaction.php:107
-msgid "SMS"
-msgstr "SMS"
+#: actions/favoritesrss.php:111 actions/showfavorites.php:77
+#: lib/personalgroupnav.php:115
+#, php-format
+msgid "%s's favorite notices"
+msgstr "%s's favourite notices"
 
-#: ../actions/smssettings.php:67 actions/smssettings.php:67
-#: actions/smssettings.php:126
-msgid "SMS Phone number"
-msgstr "SMS Phone number"
+#: actions/favoritesrss.php:115
+#, php-format
+msgid "Updates favored by %1$s on %2$s!"
+msgstr "Updates favoured by %1$s on %2$s!"
 
-#: ../actions/smssettings.php:33 actions/smssettings.php:33
-#: actions/smssettings.php:58
-msgid "SMS Settings"
-msgstr "SMS Settings"
+#: actions/favor.php:79
+msgid "This notice is already a favorite!"
+msgstr "This notice is already a favourite!"
 
-#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437
-msgid "SMS confirmation"
-msgstr "SMS confirmation"
+#: actions/favor.php:92 lib/disfavorform.php:140
+msgid "Disfavor favorite"
+msgstr "Disfavor favourite"
 
-#: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
-#: actions/recoverpassword.php:222
-msgid "Same as password above"
-msgstr "Same as password above"
+#: actions/featured.php:69 lib/featureduserssection.php:87
+#: lib/publicgroupnav.php:89
+msgid "Featured users"
+msgstr "Featured users"
 
-#: ../actions/register.php:156 actions/register.php:170
-#: actions/register.php:377
-msgid "Same as password above. Required."
-msgstr "Same as password above. Required."
+#: actions/featured.php:71
+#, php-format
+msgid "Featured users, page %d"
+msgstr "Featured users, page %d"
 
-#: ../actions/emailsettings.php:97 ../actions/imsettings.php:81
-#: ../actions/profilesettings.php:67 ../actions/smssettings.php:100
-#: actions/emailsettings.php:104 actions/imsettings.php:82
-#: actions/profilesettings.php:101 actions/smssettings.php:100
-#: actions/twittersettings.php:83 actions/emailsettings.php:182
-#: actions/facebooksettings.php:114 actions/imsettings.php:157
-#: actions/othersettings.php:117 actions/profilesettings.php:150
-#: actions/smssettings.php:169 actions/subscriptions.php:124
-#: actions/tagother.php:152 actions/twittersettings.php:161
-#: lib/groupeditform.php:171
-msgid "Save"
-msgstr "Save"
+#: actions/featured.php:99
+#, php-format
+msgid "A selection of some of the great users on %s"
+msgstr "A selection of some of the great users on %s"
 
-#: ../lib/searchaction.php:84 ../lib/util.php:300 lib/searchaction.php:84
-#: lib/util.php:316 lib/action.php:325
-msgid "Search"
-msgstr "Search"
+#: actions/file.php:34
+msgid "No notice id"
+msgstr "No notice id"
 
-#: ../actions/noticesearch.php:80 actions/noticesearch.php:85
-#: actions/noticesearch.php:127
-msgid "Search Stream Feed"
-msgstr "Search Stream Feed"
+#: actions/file.php:38
+msgid "No notice"
+msgstr "No notice."
 
-#: ../actions/noticesearch.php:30 actions/noticesearch.php:30
-#: actions/noticesearch.php:57
-#, php-format
-msgid ""
-"Search for notices on %%site.name%% by their contents. Separate search terms "
-"by spaces; they must be 3 characters or more."
+#: actions/file.php:42
+msgid "No attachments"
 msgstr ""
-"Search for notices on %%site.name%% by their contents. Separate search terms "
-"by spaces; they must be 3 characters or more."
 
-#: ../actions/peoplesearch.php:28
-#, php-format
-msgid ""
-"Search for people on %%site.name%% by their name, location, or interests. "
-"Separate the terms by spaces; they must be 3 characters or more."
+#: actions/file.php:51
+msgid "No uploaded attachments"
 msgstr ""
-"Search for people on %%site.name%% by their name, location, or interests. "
-"Separate the terms by spaces; they must be 3 characters or more."
 
-# Carrier?
-#: ../actions/smssettings.php:296 actions/smssettings.php:304
-#: actions/smssettings.php:457
-#, fuzzy
-msgid "Select a carrier"
-msgstr "Select a carrier"
+#: actions/finishremotesubscribe.php:69
+msgid "Not expecting this response!"
+msgstr "Not expecting this response!"
 
-#: ../actions/invite.php:137 ../lib/util.php:1172 actions/invite.php:145
-#: lib/util.php:1306 lib/util.php:1731 actions/invite.php:182
-#: lib/messageform.php:167 lib/noticeform.php:177
-msgid "Send"
-msgstr "Send"
+#: actions/finishremotesubscribe.php:80
+#, fuzzy
+msgid "User being listened to does not exist."
+msgstr "User being listened to doesn't exist."
 
-#: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
-#: actions/emailsettings.php:74 actions/smssettings.php:82
-#: actions/emailsettings.php:132 actions/smssettings.php:145
-msgid "Send email to this address to post new notices."
-msgstr "Send e-mail to this address to post new notices."
+#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
+msgid "You can use the local subscription!"
+msgstr "You can use the local subscription!"
 
-#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
-#: actions/emailsettings.php:152
-msgid "Send me notices of new subscriptions through email."
-msgstr "Send me notices of new subscriptions through e-mail."
+#: actions/finishremotesubscribe.php:96
+msgid "That user has blocked you from subscribing."
+msgstr "That user has blocked you from subscribing."
 
-#: ../actions/imsettings.php:70 actions/imsettings.php:71
-#: actions/imsettings.php:137
-msgid "Send me notices through Jabber/GTalk."
-msgstr "Send me notices through Jabber/GTalk."
+#: actions/finishremotesubscribe.php:106
+msgid "You are not authorized."
+msgstr "You are not authorised."
 
-# Carrier
-#: ../actions/smssettings.php:97 actions/smssettings.php:97
+#: actions/finishremotesubscribe.php:109
 #, fuzzy
-msgid ""
-"Send me notices through SMS; I understand I may incur exorbitant charges "
-"from my carrier."
-msgstr ""
-"Send me notices through SMS; I understand I may incur exorbitant charges "
-"from my carrier."
-
-#: ../actions/imsettings.php:76 actions/imsettings.php:77
-msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
-msgstr "Send me replies through Jabber/GTalk from people I'm not subscribed to."
-
-#: ../lib/util.php:304 lib/util.php:320 lib/facebookaction.php:215
-msgid "Settings"
-msgstr "Settings"
-
-#: ../actions/profilesettings.php:192 actions/profilesettings.php:307
-#: actions/profilesettings.php:319
-msgid "Settings saved."
-msgstr "Settings saved."
+msgid "Could not convert request token to access token."
+msgstr "Couldn't convert request tokens to access tokens."
 
-#: ../actions/tag.php:60 actions/tag.php:60
-msgid "Showing most popular tags from the last week"
-msgstr "Showing most popular tags from the last week"
+#: actions/finishremotesubscribe.php:114
+#, fuzzy
+msgid "Remote service uses unknown version of OMB protocol."
+msgstr "Unknown version of OMB protocol."
 
-#: ../actions/finishaddopenid.php:66 actions/finishaddopenid.php:66
-#: actions/finishaddopenid.php:114
-msgid "Someone else already has this OpenID."
-msgstr "Someone else already has this OpenID."
+#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
+msgid "Error updating remote profile"
+msgstr "Error updating remote profile."
 
-#: ../actions/finishopenidlogin.php:42 ../actions/openidsettings.php:126
-#: actions/finishopenidlogin.php:47 actions/openidsettings.php:135
-#: actions/finishopenidlogin.php:52 actions/openidsettings.php:202
-msgid "Something weird happened."
-msgstr "Something weird happened."
+#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86
+#: actions/groupunblock.php:86 actions/leavegroup.php:83
+#: actions/makeadmin.php:86 lib/command.php:212 lib/command.php:263
+msgid "No such group."
+msgstr "No such group."
 
-#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
-#: scripts/maildaemon.php:61
-msgid "Sorry, no incoming email allowed."
-msgstr "Sorry, no incoming e-mail allowed."
+#: actions/getfile.php:75
+#, fuzzy
+msgid "No such file."
+msgstr "No such notice."
 
-#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
-#: scripts/maildaemon.php:57
-msgid "Sorry, that is not your incoming email address."
-msgstr "Sorry, that is not your incoming e-mail address."
+#: actions/getfile.php:79
+#, fuzzy
+msgid "Cannot read file."
+msgstr "Lost our file."
 
-#: ../lib/util.php:330 lib/util.php:346 lib/action.php:574
-msgid "Source"
-msgstr "Source"
+#: actions/groupblock.php:71 actions/groupunblock.php:71
+#: actions/makeadmin.php:71 actions/subedit.php:46
+#: lib/profileformaction.php:70
+msgid "No profile specified."
+msgstr "No profile specified."
 
-#: ../actions/showstream.php:296 actions/showstream.php:311
-#: actions/showstream.php:476
-msgid "Statistics"
-msgstr "Statistics"
+#: actions/groupblock.php:76 actions/groupunblock.php:76
+#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
+#: lib/profileformaction.php:77
+msgid "No profile with that ID."
+msgstr "No profile with that ID."
 
-#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:246
-#: actions/finishopenidlogin.php:188 actions/finishopenidlogin.php:252
-#: actions/finishopenidlogin.php:222 actions/finishopenidlogin.php:290
-msgid "Stored OpenID not found."
-msgstr "Stored OpenID not found."
+#: actions/groupblock.php:81 actions/groupunblock.php:81
+#: actions/makeadmin.php:81
+#, fuzzy
+msgid "No group specified."
+msgstr "No profile specified."
 
-#: ../actions/remotesubscribe.php:75 ../actions/showstream.php:188
-#: ../actions/showstream.php:197 actions/remotesubscribe.php:84
-#: actions/showstream.php:197 actions/showstream.php:206
-#: actions/remotesubscribe.php:113 actions/showstream.php:376
-#: lib/subscribeform.php:139
-msgid "Subscribe"
-msgstr "Subscribe"
+#: actions/groupblock.php:91
+msgid "Only an admin can block group members."
+msgstr ""
 
-#: ../actions/showstream.php:313 ../actions/subscribers.php:27
-#: actions/showstream.php:328 actions/subscribers.php:27
-#: actions/showstream.php:436 actions/showstream.php:498
-#: lib/subgroupnav.php:88
-msgid "Subscribers"
-msgstr "Subscribers"
+#: actions/groupblock.php:95
+msgid "User is already blocked from group."
+msgstr "User is already blocked from group."
 
-#: ../actions/userauthorization.php:310 actions/userauthorization.php:322
-#: actions/userauthorization.php:338
-msgid "Subscription authorized"
-msgstr "Subscription authorised"
+#: actions/groupblock.php:100
+msgid "User is not a member of group."
+msgstr "User is not a member of group."
 
-#: ../actions/userauthorization.php:320 actions/userauthorization.php:332
-#: actions/userauthorization.php:349
-msgid "Subscription rejected"
-msgstr "Subscription rejected"
+#: actions/groupblock.php:136 actions/groupmembers.php:314
+#, fuzzy
+msgid "Block user from group"
+msgstr "Block user"
 
-#: ../actions/showstream.php:230 ../actions/showstream.php:307
-#: ../actions/subscriptions.php:27 actions/showstream.php:240
-#: actions/showstream.php:322 actions/subscriptions.php:27
-#: actions/showstream.php:407 actions/showstream.php:489
-#: lib/subgroupnav.php:80
-msgid "Subscriptions"
-msgstr "Subscriptions"
+#: actions/groupblock.php:162
+#, php-format
+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."
+msgstr ""
 
-#: ../actions/avatar.php:87 actions/profilesettings.php:324
-#: lib/imagefile.php:78
-msgid "System error uploading file."
-msgstr "System error uploading file."
+#: actions/groupblock.php:178
+msgid "Do not block this user from this group"
+msgstr "Do not block this user from this group"
 
-#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
-#: lib/util.php:317 actions/profilesettings.php:122 actions/showstream.php:297
-#: actions/tagother.php:147 actions/tagother.php:207 lib/profilelist.php:162
-#: lib/profilelist.php:164
-msgid "Tags"
-msgstr "Tags"
+#: actions/groupblock.php:179
+#, fuzzy
+msgid "Block this user from this group"
+msgstr "A list of the users in this group."
 
-#: ../lib/searchaction.php:104 lib/searchaction.php:104
-msgid "Text"
-msgstr "Text"
+#: actions/groupblock.php:196
+msgid "Database error blocking user from group."
+msgstr ""
 
-#: ../actions/noticesearch.php:34 actions/noticesearch.php:34
-#: actions/noticesearch.php:67
-msgid "Text search"
-msgstr "Text search"
+#: actions/groupbyid.php:74
+msgid "No ID"
+msgstr "No ID"
 
-#: ../actions/openidsettings.php:140 actions/openidsettings.php:149
-#: actions/openidsettings.php:227
-msgid "That OpenID does not belong to you."
-msgstr "That OpenID does not belong to you."
+#: actions/groupdesignsettings.php:68
+#, fuzzy
+msgid "You must be logged in to edit a group."
+msgstr "You must be logged in to create a group."
 
-#: ../actions/confirmaddress.php:52 actions/confirmaddress.php:52
-#: actions/confirmaddress.php:94
-msgid "That address has already been confirmed."
-msgstr "That address has already been confirmed."
+#: actions/groupdesignsettings.php:141
+#, fuzzy
+msgid "Group design"
+msgstr "Groups"
 
-#: ../actions/confirmaddress.php:43 actions/confirmaddress.php:43
-#: actions/confirmaddress.php:85
-msgid "That confirmation code is not for you!"
-msgstr "That confirmation code is not for you!"
+#: actions/groupdesignsettings.php:152
+msgid ""
+"Customize the way your group looks with a background image and a colour "
+"palette of your choice."
+msgstr ""
 
-#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
-msgid "That email address already belongs to another user."
-msgstr "That e-mail address already belongs to another user."
+#: actions/groupdesignsettings.php:262 actions/userdesignsettings.php:186
+#: lib/designsettings.php:434 lib/designsettings.php:464
+#, fuzzy
+msgid "Couldn't update your design."
+msgstr "Couldn't update user."
 
-#: ../actions/avatar.php:80 actions/profilesettings.php:317
-#: lib/imagefile.php:71
-msgid "That file is too big."
-msgstr "That file is too big."
+#: actions/groupdesignsettings.php:286 actions/groupdesignsettings.php:296
+#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
+#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
+#, fuzzy
+msgid "Unable to save your design settings!"
+msgstr "Unable to save your Twitter settings!"
 
-#: ../actions/imsettings.php:170 actions/imsettings.php:178
-#: actions/imsettings.php:293
-msgid "That is already your Jabber ID."
-msgstr "That is already your Jabber ID."
+#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:231
+#, fuzzy
+msgid "Design preferences saved."
+msgstr "Sync preferences saved."
 
-#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
-#: actions/emailsettings.php:318
-msgid "That is already your email address."
-msgstr "That is already your e-mail address."
+#: actions/grouplogo.php:139 actions/grouplogo.php:192
+msgid "Group logo"
+msgstr "Group logo"
 
-#: ../actions/smssettings.php:188 actions/smssettings.php:196
-#: actions/smssettings.php:306
-msgid "That is already your phone number."
-msgstr "That is already your phone number."
+#: actions/grouplogo.php:150
+#, fuzzy, php-format
+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."
 
-#: ../actions/imsettings.php:233 actions/imsettings.php:241
-#: actions/imsettings.php:381
-msgid "That is not your Jabber ID."
-msgstr "That is not your Jabber ID."
+#: actions/grouplogo.php:362
+#, fuzzy
+msgid "Pick a square area of the image to be the logo."
+msgstr "Pick a square area of the image to be your avatar"
 
-#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
-#: actions/emailsettings.php:397
-msgid "That is not your email address."
-msgstr "That is not your e-mail address."
+#: actions/grouplogo.php:396
+msgid "Logo updated."
+msgstr "Logo updated."
 
-#: ../actions/smssettings.php:257 actions/smssettings.php:265
-#: actions/smssettings.php:393
-msgid "That is not your phone number."
-msgstr "That is not your phone number."
+#: actions/grouplogo.php:398
+msgid "Failed updating logo."
+msgstr "Failed updating logo."
 
-#: ../actions/emailsettings.php:226 ../actions/imsettings.php:210
-#: actions/emailsettings.php:244 actions/imsettings.php:218
-#: actions/emailsettings.php:367 actions/imsettings.php:349
-msgid "That is the wrong IM address."
-msgstr "That is the wrong IM address."
+#: actions/groupmembers.php:93 lib/groupnav.php:92
+#, php-format
+msgid "%s group members"
+msgstr "%s group members"
 
-#: ../actions/smssettings.php:233 actions/smssettings.php:241
-#: actions/smssettings.php:362
-msgid "That is the wrong confirmation number."
-msgstr "That is the wrong confirmation number."
+#: actions/groupmembers.php:96
+#, php-format
+msgid "%s group members, page %d"
+msgstr "%s group members, page %d"
 
-#: ../actions/smssettings.php:191 actions/smssettings.php:199
-#: actions/smssettings.php:309
-msgid "That phone number already belongs to another user."
-msgstr "That phone number already belongs to another user."
+#: actions/groupmembers.php:111
+msgid "A list of the users in this group."
+msgstr "A list of the users in this group."
 
-#: ../actions/newnotice.php:49 ../actions/twitapistatuses.php:408
-#: actions/newnotice.php:49 actions/twitapistatuses.php:330
-#: actions/facebookhome.php:243 actions/twitapistatuses.php:276
-msgid "That's too long. Max notice size is 140 chars."
-msgstr "That's too long. Max notice size is 140 chars."
+#: actions/groupmembers.php:175 lib/action.php:439 lib/groupnav.php:107
+msgid "Admin"
+msgstr "Admin"
 
-#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
-#: actions/twitapiaccount.php:62
-msgid "That's too long. Max notice size is 255 chars."
-msgstr "That's too long. Max notice size is 255 chars."
+#: actions/groupmembers.php:346 lib/blockform.php:69
+msgid "Block"
+msgstr "Block"
 
-#: ../actions/confirmaddress.php:92 actions/confirmaddress.php:92
-#, php-format
-msgid "The address \"%s\" has been confirmed for your account."
-msgstr "The address \"%s\" has been confirmed for your account."
+#: actions/groupmembers.php:441
+#, fuzzy
+msgid "Make user an admin of the group"
+msgstr "You must be an admin to edit the group"
 
-#: ../actions/emailsettings.php:264 ../actions/imsettings.php:250
-#: ../actions/smssettings.php:274 actions/emailsettings.php:282
-#: actions/imsettings.php:258 actions/smssettings.php:282
-#: actions/emailsettings.php:416 actions/imsettings.php:402
-#: actions/smssettings.php:413
-msgid "The address was removed."
-msgstr "The address was removed."
+#: actions/groupmembers.php:473
+#, fuzzy
+msgid "Make Admin"
+msgstr "Admin"
 
-#: ../actions/userauthorization.php:312
-msgid ""
-"The subscription has been authorized, but no callback URL was passed. Check "
-"with the site's instructions for details on how to authorize the "
-"subscription. Your subscription token is:"
+#: actions/groupmembers.php:473
+msgid "Make this user an admin"
 msgstr ""
-"The subscription has been authorised, but no callback URL was passed. Check "
-"with the site's instructions for details on how to authorise the "
-"subscription. Your subscription token is:"
 
-#: ../actions/userauthorization.php:322
+#: actions/grouprss.php:133
+#, fuzzy, php-format
+msgid "Updates from members of %1$s on %2$s!"
+msgstr "Updates from %1$s on %2$s!"
+
+#: actions/groupsearch.php:52
+#, fuzzy, php-format
 msgid ""
-"The subscription has been rejected, but no callback URL was passed. Check "
-"with the site's instructions for details on how to fully reject the "
-"subscription."
+"Search for groups on %%site.name%% by their name, location, or description. "
+"Separate the terms by spaces; they must be 3 characters or more."
 msgstr ""
-"The subscription has been rejected, but no callback URL was passed. Check "
-"with the site's instructions for details on how to fully reject the "
-"subscription."
+"Search for people on %%site.name%% by their name, location, or interests. "
+"Separate the terms by spaces; they must be 3 characters or more."
 
-#: ../actions/subscribers.php:35 actions/subscribers.php:35
-#, php-format
-msgid "These are the people who listen to %s's notices."
-msgstr "These are the people who listen to %s's notices."
+#: actions/groupsearch.php:58
+msgid "Group search"
+msgstr "Group search"
 
-#: ../actions/subscribers.php:33 actions/subscribers.php:33
-msgid "These are the people who listen to your notices."
-msgstr "These are the people who listen to your notices."
+#: actions/groupsearch.php:79 actions/noticesearch.php:117
+#: actions/peoplesearch.php:83
+#, fuzzy
+msgid "No results."
+msgstr "No results"
 
-#: ../actions/subscriptions.php:35 actions/subscriptions.php:35
+#: actions/groupsearch.php:82
 #, php-format
-msgid "These are the people whose notices %s listens to."
-msgstr "These are the people whose notices %s listens to."
-
-#: ../actions/subscriptions.php:33 actions/subscriptions.php:33
-msgid "These are the people whose notices you listen to."
-msgstr "These are the people whose notices you listen to."
-
-#: ../actions/invite.php:89 actions/invite.php:96 actions/invite.php:128
-msgid ""
-"These people are already users and you were automatically subscribed to them:"
-msgstr ""
-"These people are already users and you were automatically subscribed to "
-"them:"
-
-#: ../actions/recoverpassword.php:88
-msgid "This confirmation code is too old. Please start again."
-msgstr "This confirmation code is too old. Please start again."
-
-#: ../lib/openid.php:195
 msgid ""
-"This form should automatically submit itself. If not, click the submit "
-"button to go to your OpenID provider."
+"If you can't find the group you're looking for, you can [create it](%%action."
+"newgroup%%) yourself."
 msgstr ""
-"This form should automatically submit itself. If not, click the submit "
-"button to go to your OpenID provider."
 
-#: ../actions/finishopenidlogin.php:56 actions/finishopenidlogin.php:61
-#: actions/finishopenidlogin.php:67
+#: actions/groupsearch.php:85
 #, php-format
 msgid ""
-"This is the first time you've logged into %s so we must connect your OpenID "
-"to a local account. You can either create a new account, or connect with "
-"your existing account, if you have one."
-msgstr ""
-"This is the first time you've logged into %s so we must connect your OpenID "
-"to a local account. You can either create a new account, or connect with "
-"your existing account, if you have one."
-
-#: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
-#: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
-#: actions/twitapistatuses.php:511 actions/twitapifavorites.php:97
-#: actions/twitapifriendships.php:85 actions/twitapistatuses.php:436
-msgid "This method requires a POST or DELETE."
-msgstr "This method requires a POST or DELETE."
-
-#: ../actions/twitapiaccount.php:65 ../actions/twitapifriendships.php:44
-#: ../actions/twitapistatuses.php:381 actions/twitapiaccount.php:63
-#: actions/twitapidirect_messages.php:114 actions/twitapifriendships.php:44
-#: actions/twitapistatuses.php:303 actions/twitapiaccount.php:53
-#: actions/twitapidirect_messages.php:122 actions/twitapifriendships.php:32
-#: actions/twitapistatuses.php:244
-msgid "This method requires a POST."
-msgstr "This method requires a POST."
-
-#: ../lib/util.php:164 lib/util.php:246
-msgid "This page is not available in a media type you accept"
-msgstr "This page is not available in a media type you accept"
+"Why not [register an account](%%action.register%%) and [create the group](%%"
+"action.newgroup%%) yourself!"
+msgstr ""
 
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-#: actions/profilesettings.php:138
-msgid "Timezone"
-msgstr "Timezone"
+#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
+#: lib/subgroupnav.php:98
+msgid "Groups"
+msgstr "Groups"
 
-#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
-#: actions/profilesettings.php:211
-msgid "Timezone not selected."
-msgstr "Timezone not selected."
+#: actions/groups.php:64
+#, php-format
+msgid "Groups, page %d"
+msgstr "Groups, page %d"
 
-# double space.
-#: ../actions/remotesubscribe.php:43
+#: actions/groups.php:90
 #, php-format
 msgid ""
-"To subscribe, you can [login](%%action.login%%), or [register](%%action."
-"register%%) a new  account. If you already have an account  on a [compatible "
-"microblogging site](%%doc.openmublog%%),  enter your profile URL below."
+"%%%%site.name%%%% groups let you find and talk with people of similar "
+"interests. After you join a group you can send messages to all other members "
+"using the syntax \"!groupname\". Don't see a group you like? Try [searching "
+"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
+"%%%%)"
 msgstr ""
-"To subscribe, you can [login](%%action.login%%), or "
-"[register](%%action.register%%) a new  account. If you already have an "
-"account  on a [compatible microblogging site](%%doc.openmublog%%),  enter "
-"your profile URL below."
-
-#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
-#: actions/twitapifriendships.php:132
-msgid "Two user ids or screen_names must be supplied."
-msgstr "Two user ids or screen_names must be supplied."
 
-#: ../actions/profilesettings.php:48 ../actions/register.php:169
-#: actions/profilesettings.php:81 actions/register.php:183
-#: actions/profilesettings.php:109
-msgid "URL of your homepage, blog, or profile on another site"
-msgstr "URL of your homepage, blog, or profile on another site"
-
-#: ../actions/remotesubscribe.php:74 actions/remotesubscribe.php:83
-#: actions/remotesubscribe.php:110
-msgid "URL of your profile on another compatible microblogging service"
-msgstr "URL of your profile on another compatible microblogging service"
+#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
+msgid "Create a new group"
+msgstr "Create a new group"
 
-#: ../actions/emailsettings.php:130 ../actions/imsettings.php:110
-#: ../actions/recoverpassword.php:39 ../actions/smssettings.php:135
-#: actions/emailsettings.php:144 actions/imsettings.php:118
-#: actions/recoverpassword.php:39 actions/smssettings.php:143
-#: actions/twittersettings.php:108 actions/avatarsettings.php:258
-#: actions/emailsettings.php:242 actions/grouplogo.php:317
-#: actions/imsettings.php:214 actions/recoverpassword.php:44
-#: actions/smssettings.php:236 actions/twittersettings.php:302
-msgid "Unexpected form submission."
-msgstr "Unexpected form submission."
+#: actions/groupunblock.php:91
+msgid "Only an admin can unblock group members."
+msgstr ""
 
-#: ../actions/recoverpassword.php:276 actions/recoverpassword.php:289
-#: actions/recoverpassword.php:323
-msgid "Unexpected password reset."
-msgstr "Unexpected password reset."
+#: actions/groupunblock.php:95
+#, fuzzy
+msgid "User is not blocked from group."
+msgstr "User has blocked you."
 
-#: ../index.php:57 index.php:57 actions/recoverpassword.php:202
-msgid "Unknown action"
-msgstr "Unknown action"
+#: actions/groupunblock.php:128 actions/unblock.php:77
+msgid "Error removing the block."
+msgstr "Error removing the block."
 
-#: ../actions/finishremotesubscribe.php:58
-#: actions/finishremotesubscribe.php:60 actions/finishremotesubscribe.php:61
-msgid "Unknown version of OMB protocol."
-msgstr "Unknown version of OMB protocol."
+#: actions/imsettings.php:59
+msgid "IM Settings"
+msgstr "I.M. Settings"
 
-#: ../lib/util.php:269 lib/util.php:285
+#: actions/imsettings.php:70
+#, php-format
 msgid ""
-"Unless otherwise specified, contents of this site are copyright by the "
-"contributors and available under the "
+"You can send and receive notices through Jabber/GTalk [instant messages](%%"
+"doc.im%%). Configure your address and settings below."
 msgstr ""
-"Unless otherwise specified, contents of this site are copyright by the "
-"contributors and available under the "
-
-#: ../actions/confirmaddress.php:48 actions/confirmaddress.php:48
-#: actions/confirmaddress.php:90
-#, php-format
-msgid "Unrecognized address type %s"
-msgstr "Unrecognised address type %s"
-
-#: ../actions/showstream.php:209 actions/showstream.php:219
-#: lib/unsubscribeform.php:137
-msgid "Unsubscribe"
-msgstr "Unsubscribe"
-
-#: ../actions/postnotice.php:44 ../actions/updateprofile.php:45
-#: actions/postnotice.php:45 actions/updateprofile.php:46
-#: actions/postnotice.php:48 actions/updateprofile.php:49
-msgid "Unsupported OMB version"
-msgstr "Unsupported OMB version"
+"You can send and receive notices through Jabber/GTalk [instant messages](%%"
+"doc.im%%). Configure your address and settings below."
 
-#: ../actions/avatar.php:105 actions/profilesettings.php:342
-#: lib/imagefile.php:102
-msgid "Unsupported image file format."
-msgstr "Unsupported image file format."
+#: actions/imsettings.php:89
+#, fuzzy
+msgid "IM is not available."
+msgstr "This page is not available in a "
 
-#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
-#: lib/connectsettingsaction.php:108
-msgid "Updates by SMS"
-msgstr "Updates by SMS"
+#: actions/imsettings.php:106
+msgid "Current confirmed Jabber/GTalk address."
+msgstr "Current confirmed Jabber/GTalk address."
 
-#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
-#: lib/connectsettingsaction.php:105
-msgid "Updates by instant messenger (IM)"
-msgstr "Updates by instant messenger (I.M.)"
+#: actions/imsettings.php:114
+#, fuzzy, php-format
+msgid ""
+"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
+"message with further instructions. (Did you add %s to your buddy list?)"
+msgstr ""
+"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
+"message with further instructions. (Did you add %s to your buddy list?)"
 
-#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
-#: actions/twitapistatuses.php:129
-#, php-format
-msgid "Updates from %1$s and friends on %2$s!"
-msgstr "Updates from %1$s and friends on %2$s!"
+#: actions/imsettings.php:124
+msgid "IM Address"
+msgstr "I.M. Address"
 
-#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
-#: actions/twitapistatuses.php:202
+#: actions/imsettings.php:126
 #, php-format
-msgid "Updates from %1$s on %2$s!"
-msgstr "Updates from %1$s on %2$s!"
-
-#: ../actions/avatar.php:68 actions/profilesettings.php:161
-#: actions/avatarsettings.php:162 actions/grouplogo.php:232
-msgid "Upload"
-msgstr "Upload"
-
-#: ../actions/avatar.php:27
 msgid ""
-"Upload a new \"avatar\" (user image) here. You can't edit the picture after "
-"you upload it, so make sure it's more or less square. It must be under the "
-"site license, also. Use a picture that belongs to you and that you want to "
-"share."
+"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
+"add %s to your buddy list in your IM client or on GTalk."
 msgstr ""
-"Upload a new \"avatar\" (user image) here. You can't edit the picture after "
-"you upload it, so make sure it's more or less square. It must be under the "
-"site licence, also. Use a picture that belongs to you and that you want to "
-"share."
+"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
+"add %s to your buddy list in your IM client or on GTalk."
+
+#: actions/imsettings.php:143
+msgid "Send me notices through Jabber/GTalk."
+msgstr "Send me notices through Jabber/GTalk."
 
-#: ../lib/settingsaction.php:91
-msgid "Upload a new profile image"
-msgstr "Upload a new profile image"
+#: actions/imsettings.php:148
+msgid "Post a notice when my Jabber/GTalk status changes."
+msgstr "Post a notice when my Jabber/GTalk status changes."
 
-#: ../actions/invite.php:114 actions/invite.php:121 actions/invite.php:154
-msgid ""
-"Use this form to invite your friends and colleagues to use this service."
+#: actions/imsettings.php:153
+msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
-"Use this form to invite your friends and colleagues to use this service."
+"Send me replies through Jabber/GTalk from people I'm not subscribed to."
 
-#: ../actions/register.php:159 ../actions/register.php:162
-#: actions/register.php:173 actions/register.php:176
-msgid "Used only for updates, announcements, and password recovery"
-msgstr "Used only for updates, announcements, and password recovery"
+#: actions/imsettings.php:159
+msgid "Publish a MicroID for my Jabber/GTalk address."
+msgstr "Publish a MicroID for my Jabber/GTalk address."
 
-#: ../actions/finishremotesubscribe.php:86
-#: actions/finishremotesubscribe.php:88 actions/finishremotesubscribe.php:94
-msgid "User being listened to doesn't exist."
-msgstr "User being listened to doesn't exist."
+#: actions/imsettings.php:285
+msgid "No Jabber ID."
+msgstr "No Jabber ID."
 
-#: ../actions/all.php:41 ../actions/avatarbynickname.php:48
-#: ../actions/foaf.php:47 ../actions/replies.php:41
-#: ../actions/showstream.php:44 ../actions/twitapiaccount.php:82
-#: ../actions/twitapistatuses.php:319 ../actions/twitapistatuses.php:685
-#: ../actions/twitapiusers.php:82 actions/all.php:41
-#: actions/avatarbynickname.php:48 actions/foaf.php:47 actions/replies.php:41
-#: actions/showfavorites.php:41 actions/showstream.php:44
-#: actions/twitapiaccount.php:80 actions/twitapifavorites.php:68
-#: actions/twitapistatuses.php:235 actions/twitapistatuses.php:609
-#: actions/twitapiusers.php:87 lib/mailbox.php:50
-#: actions/avatarbynickname.php:80 actions/foaf.php:48 actions/replies.php:80
-#: actions/showstream.php:107 actions/twitapiaccount.php:70
-#: actions/twitapifavorites.php:42 actions/twitapistatuses.php:167
-#: actions/twitapistatuses.php:503 actions/twitapiusers.php:55
-#: actions/usergroups.php:99 lib/galleryaction.php:67 lib/twitterapi.php:626
-msgid "User has no profile."
-msgstr "User has no profile."
+#: actions/imsettings.php:292
+msgid "Cannot normalize that Jabber ID"
+msgstr "Cannot normalise Jabber ID"
 
-#: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
-#: actions/remotesubscribe.php:105
-msgid "User nickname"
-msgstr "User nickname"
+#: actions/imsettings.php:296
+msgid "Not a valid Jabber ID"
+msgstr "Not a valid Jabber ID"
 
-#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
-msgid "User not found."
-msgstr "User not found."
+#: actions/imsettings.php:299
+msgid "That is already your Jabber ID."
+msgstr "That is already your Jabber ID."
 
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-#: actions/profilesettings.php:139
-msgid "What timezone are you normally in?"
-msgstr "In which timezone are you?"
+#: actions/imsettings.php:302
+msgid "Jabber ID already belongs to another user."
+msgstr "Jabber ID already belongs to another user."
 
-#: ../lib/util.php:1159 lib/util.php:1293 lib/noticeform.php:141
+#: actions/imsettings.php:327
 #, php-format
-msgid "What's up, %s?"
-msgstr "What's up, %s?"
+msgid ""
+"A confirmation code was sent to the IM address you added. You must approve %"
+"s for sending messages to you."
+msgstr ""
+"A confirmation code was sent to the IM address you added. You must approve %"
+"s for sending messages to you."
 
-#: ../actions/profilesettings.php:54 ../actions/register.php:175
-#: actions/profilesettings.php:87 actions/register.php:189
-#: actions/profilesettings.php:119
-msgid "Where you are, like \"City, State (or Region), Country\""
-msgstr "Where you are, like \"City, State (or Region), Country\""
+#: actions/imsettings.php:387
+msgid "That is not your Jabber ID."
+msgstr "That is not your Jabber ID."
 
-#: ../actions/updateprofile.php:128 actions/updateprofile.php:129
-#: actions/updateprofile.php:132
+#: actions/inbox.php:59
 #, php-format
-msgid "Wrong image type for '%s'"
-msgstr "Wrong image type for '%s'"
+msgid "Inbox for %s - page %d"
+msgstr "Inbox for %s - page %d"
 
-#: ../actions/updateprofile.php:123 actions/updateprofile.php:124
-#: actions/updateprofile.php:127
+#: actions/inbox.php:62
 #, php-format
-msgid "Wrong size image at '%s'"
-msgstr "Wrong size image at '%s'"
-
-#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
-#: actions/deletenotice.php:64 actions/deletenotice.php:79
-#: actions/block.php:148 actions/deletenotice.php:122
-#: actions/deletenotice.php:141
-msgid "Yes"
-msgstr "Yes"
+msgid "Inbox for %s"
+msgstr "Inbox for %s"
 
-#: ../actions/finishaddopenid.php:64 actions/finishaddopenid.php:64
-#: actions/finishaddopenid.php:112
-msgid "You already have this OpenID!"
-msgstr "You already have this OpenID!"
+#: actions/inbox.php:115
+msgid "This is your inbox, which lists your incoming private messages."
+msgstr "This is your inbox, which lists your incoming private messages."
 
-#: ../actions/deletenotice.php:37 actions/deletenotice.php:37
-msgid ""
-"You are about to permanently delete a notice.  Once this is done, it cannot "
-"be undone."
+#: actions/invite.php:39
+msgid "Invites have been disabled."
 msgstr ""
-"You are about to permanently delete a notice.  Once this is done, it cannot "
-"be undone."
 
-#: ../actions/recoverpassword.php:31 actions/recoverpassword.php:31
-#: actions/recoverpassword.php:36
-msgid "You are already logged in!"
-msgstr "You are already logged in!"
+#: actions/invite.php:41
+#, php-format
+msgid "You must be logged in to invite other users to use %s"
+msgstr "You must be logged in to invite other users to use %s"
 
-#: ../actions/invite.php:81 actions/invite.php:88 actions/invite.php:120
-msgid "You are already subscribed to these users:"
-msgstr "You are already subscribed to these users:"
+#: actions/invite.php:72
+#, php-format
+msgid "Invalid email address: %s"
+msgstr "Invalid e-mail address: %s"
 
-#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
-#: actions/twitapifriendships.php:105
-msgid "You are not friends with the specified user."
-msgstr "You are not friends with the specified user."
+#: actions/invite.php:110
+msgid "Invitation(s) sent"
+msgstr "Invitation(s) sent"
 
-#: ../actions/password.php:27
-msgid "You can change your password here. Choose a good one!"
-msgstr "You can change your password here. Choose a good one!"
+#: actions/invite.php:112
+msgid "Invite new users"
+msgstr "Invite new users"
 
-#: ../actions/register.php:135 actions/register.php:145
-msgid "You can create a new account to start posting notices."
-msgstr "You can create a new account to start posting notices."
+#: actions/invite.php:128
+msgid "You are already subscribed to these users:"
+msgstr "You are already subscribed to these users:"
 
-#: ../actions/smssettings.php:28 actions/smssettings.php:28
-#: actions/smssettings.php:69
+#: actions/invite.php:131 actions/invite.php:139
 #, php-format
-msgid "You can receive SMS messages through email from %%site.name%%."
-msgstr "You can receive SMS messages through e-mail from %%site.name%%."
+msgid "%s (%s)"
+msgstr "%s (%s)"
 
-#: ../actions/openidsettings.php:86
+#: actions/invite.php:136
 msgid ""
-"You can remove an OpenID from your account by clicking the button marked "
-"\"Remove\"."
+"These people are already users and you were automatically subscribed to them:"
 msgstr ""
-"You can remove an OpenID from your account by clicking the button marked "
-"\"Remove\"."
+"These people are already users and you were automatically subscribed to them:"
 
-#: ../actions/imsettings.php:28 actions/imsettings.php:28
-#, php-format
+#: actions/invite.php:144
+msgid "Invitation(s) sent to the following people:"
+msgstr "Invitation(s) sent to the following people:"
+
+#: actions/invite.php:150
 msgid ""
-"You can send and receive notices through Jabber/GTalk [instant messages](%%"
-"doc.im%%). Configure your address and settings below."
+"You will be notified when your invitees accept the invitation and register "
+"on the site. Thanks for growing the community!"
 msgstr ""
-"You can send and receive notices through Jabber/GTalk [instant "
-"messages](%%doc.im%%). Configure your address and settings below."
+"You will be notified when your invitees accept the invitation and register "
+"on the site. Thanks for growing the community!"
 
-#: ../actions/profilesettings.php:27
+#: actions/invite.php:162
 msgid ""
-"You can update your personal profile info here so people know more about you."
+"Use this form to invite your friends and colleagues to use this service."
 msgstr ""
-"You can update your personal profile info here so people know more about "
-"you."
+"Use this form to invite your friends and colleagues to use this service."
 
-#: ../actions/finishremotesubscribe.php:31 ../actions/remotesubscribe.php:31
-#: actions/finishremotesubscribe.php:31 actions/remotesubscribe.php:31
-#: actions/finishremotesubscribe.php:33 actions/finishremotesubscribe.php:85
-#: actions/finishremotesubscribe.php:101 actions/remotesubscribe.php:35
-msgid "You can use the local subscription!"
-msgstr "You can use the local subscription!"
+#: actions/invite.php:187
+msgid "Email addresses"
+msgstr "E-mail addresses"
 
-#: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
-#: actions/finishopenidlogin.php:38 actions/register.php:68
-#: actions/finishopenidlogin.php:43
-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/invite.php:189
+msgid "Addresses of friends to invite (one per line)"
+msgstr "Addresses of friends to invite (one per line)"
+
+#: actions/invite.php:192
+msgid "Personal message"
+msgstr "Personal message"
 
-#: ../actions/updateprofile.php:63 actions/updateprofile.php:64
-#: actions/updateprofile.php:67
-msgid "You did not send us that profile"
-msgstr "You did not send us that profile"
+#: actions/invite.php:194
+msgid "Optionally add a personal message to the invitation."
+msgstr "Optionally add a personal message to the invitation."
+
+#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:208
+msgid "Send"
+msgstr "Send"
 
-#: ../lib/mail.php:147
+#: actions/invite.php:226
+#, php-format
+msgid "%1$s has invited you to join them on %2$s"
+msgstr "%1$s has invited you to join them on %2$s"
+
+#: actions/invite.php:228
 #, php-format
 msgid ""
-"You have a new posting address on %1$s.\n"
+"%1$s has invited you to join them on %2$s (%3$s).\n"
 "\n"
-"Send email to %2$s to post new messages.\n"
+"%2$s is a micro-blogging service that lets you keep up-to-date with people "
+"you know and people who interest you.\n"
 "\n"
-"More email instructions at %3$s.\n"
+"You can also share news about yourself, your thoughts, or your life online "
+"with people who know about you. It's also great for meeting new people who "
+"share your interests.\n"
 "\n"
-"Faithfully yours,\n"
-"%4$s"
-msgstr ""
-"You have a new posting address on %1$s.\n"
+"%1$s said:\n"
 "\n"
-"Send e-mail to %2$s to post new messages.\n"
+"%4$s\n"
 "\n"
-"More e-mail instructions at %3$s.\n"
+"You can see %1$s's profile page on %2$s here:\n"
 "\n"
-"Faithfully yours,\n"
-"%4$s"
-
-#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
-#: actions/twitapistatuses.php:463
-msgid "You may not delete another user's status."
-msgstr "You may not delete another user's status."
-
-#: ../actions/invite.php:31 actions/invite.php:31 actions/invite.php:39
-#, php-format
-msgid "You must be logged in to invite other users to use %s"
-msgstr "You must be logged in to invite other users to use %s"
-
-#: ../actions/invite.php:103 actions/invite.php:110 actions/invite.php:142
-msgid ""
-"You will be notified when your invitees accept the invitation and register "
-"on the site. Thanks for growing the community!"
+"%5$s\n"
+"\n"
+"If you'd like to try the service, click on the link below to accept the "
+"invitation.\n"
+"\n"
+"%6$s\n"
+"\n"
+"If not, you can ignore this message. Thanks for your patience and your "
+"time.\n"
+"\n"
+"Sincerely, %2$s\n"
 msgstr ""
-"You will be notified when your invitees accept the invitation and register "
-"on the site. Thanks for growing the community!"
+"%1$s has invited you to join them on %2$s (%3$s).\n"
+"\n"
+"%2$s is a micro-blogging service that lets you keep up-to-date with people "
+"you know and people who interest you.\n"
+"\n"
+"You can also share news about yourself, your thoughts, or your life online "
+"with people who know about you. It's also great for meeting new people who "
+"share your interests.\n"
+"\n"
+"%1$s said:\n"
+"\n"
+"%4$s\n"
+"\n"
+"You can see %1$s's profile page on %2$s here:\n"
+"\n"
+"%5$s\n"
+"\n"
+"If you'd like to try the service, click on the link below to accept the "
+"invitation.\n"
+"\n"
+"%6$s\n"
+"\n"
+"If not, you can ignore this message. Thanks for your patience and your "
+"time.\n"
+"\n"
+"Sincerely, %2$s\n"
 
-# extra spaces.
-#: ../actions/recoverpassword.php:149
-msgid "You've been identified. Enter a  new password below. "
-msgstr "You've been identified. Enter a  new password below. "
+#: actions/joingroup.php:60
+msgid "You must be logged in to join a group."
+msgstr "You must be logged in to join a group."
 
-#: ../actions/openidlogin.php:67 actions/openidlogin.php:76
-#: actions/openidlogin.php:104
-msgid "Your OpenID URL"
-msgstr "Your OpenID URL"
+#: 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/recoverpassword.php:164
-msgid "Your nickname on this server, or your registered email address."
-msgstr "Your nickname on this server, or your registered e-mail address."
+#: 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"
 
-# extra spaces.
-#: ../actions/openidsettings.php:28
+#: actions/joingroup.php:135 lib/command.php:239
 #, php-format
-msgid ""
-"[OpenID](%%doc.openid%%) lets you log into many sites  with the same user "
-"account.  Manage your associated OpenIDs from here."
-msgstr ""
-"[OpenID](%%doc.openid%%) lets you log into many sites with the same user "
-"account. Manage your associated OpenIDs from here."
+msgid "%s joined group %s"
+msgstr "%s joined group %s"
 
-#: ../lib/util.php:943 lib/util.php:992 lib/util.php:945
-msgid "a few seconds ago"
-msgstr "a few seconds ago"
+#: actions/leavegroup.php:60
+msgid "You must be logged in to leave a group."
+msgstr "You must be logged in to leave a group."
 
-#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957
-#, php-format
-msgid "about %d days ago"
-msgstr "about %d days ago"
+#: actions/leavegroup.php:90 lib/command.php:268
+msgid "You are not a member of that group."
+msgstr "You are not a member of that group."
 
-#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953
-#, php-format
-msgid "about %d hours ago"
-msgstr "about %d hours ago"
+#: actions/leavegroup.php:119 lib/command.php:278
+msgid "Could not find membership record."
+msgstr "Could not find membership record."
 
-#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949
+#: actions/leavegroup.php:127 lib/command.php:284
 #, php-format
-msgid "about %d minutes ago"
-msgstr "about %d minutes ago"
+msgid "Could not remove user %s to group %s"
+msgstr "Could not remove user %s to group %s"
 
-#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961
+#: actions/leavegroup.php:134 lib/command.php:289
 #, php-format
-msgid "about %d months ago"
-msgstr "about %d months ago"
-
-#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955
-msgid "about a day ago"
-msgstr "about a day ago"
-
-#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947
-msgid "about a minute ago"
-msgstr "about a minute ago"
-
-#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959
-msgid "about a month ago"
-msgstr "about a month ago"
+msgid "%s left group %s"
+msgstr "%s left group %s"
 
-#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963
-msgid "about a year ago"
-msgstr "about a year ago"
+#: actions/login.php:79 actions/register.php:137
+msgid "Already logged in."
+msgstr "Already logged in."
 
-#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951
-msgid "about an hour ago"
-msgstr "about an hour ago"
+#: actions/login.php:110 actions/login.php:120
+#, fuzzy
+msgid "Invalid or expired token."
+msgstr "Invalid notice content"
 
-#: ../actions/showstream.php:423 ../lib/stream.php:132
-#: actions/showstream.php:441 lib/stream.php:99
-msgid "delete"
-msgstr "delete"
-
-#: ../actions/noticesearch.php:130 ../actions/showstream.php:408
-#: ../lib/stream.php:117 actions/noticesearch.php:136
-#: actions/showstream.php:426 lib/stream.php:84 actions/noticesearch.php:187
-msgid "in reply to..."
-msgstr "in reply to…"
-
-#: ../actions/noticesearch.php:137 ../actions/showstream.php:415
-#: ../lib/stream.php:124 actions/noticesearch.php:143
-#: actions/showstream.php:433 lib/stream.php:91 actions/noticesearch.php:194
-msgid "reply"
-msgstr "reply"
-
-#: ../actions/password.php:44 actions/profilesettings.php:183
-#: actions/passwordsettings.php:106
-msgid "same as password above"
-msgstr "same as password above"
+#: actions/login.php:143
+msgid "Incorrect username or password."
+msgstr "Incorrect username or password."
 
-#: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
-#: actions/twitapistatuses.php:555
-msgid "unsupported file type"
-msgstr "unsupported file type"
-
-#  erm, not sure what to do here, « is recognised as a quotation mark.
-#: ../lib/util.php:1309 lib/util.php:1443
-msgid "« After"
-msgstr "← After"
-
-#: actions/deletenotice.php:74 actions/disfavor.php:43
-#: actions/emailsettings.php:127 actions/favor.php:45
-#: actions/finishopenidlogin.php:33 actions/imsettings.php:105
-#: actions/invite.php:46 actions/newmessage.php:45 actions/openidlogin.php:36
-#: actions/openidsettings.php:123 actions/profilesettings.php:47
-#: actions/recoverpassword.php:282 actions/register.php:42
-#: actions/remotesubscribe.php:40 actions/smssettings.php:124
-#: actions/subscribe.php:44 actions/twittersettings.php:97
-#: actions/unsubscribe.php:41 actions/userauthorization.php:35
-#: actions/block.php:64 actions/disfavor.php:74 actions/favor.php:77
-#: actions/finishopenidlogin.php:38 actions/invite.php:54 actions/nudge.php:80
-#: actions/openidlogin.php:37 actions/recoverpassword.php:316
-#: actions/subscribe.php:46 actions/unblock.php:65 actions/unsubscribe.php:43
-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/login.php:149
+#, fuzzy
+msgid "Error setting user. You are probably not authorized."
+msgstr "You are not authorised."
 
-#: actions/disfavor.php:55 actions/disfavor.php:81
-msgid "This notice is not a favorite!"
-msgstr "This notice is not a favourite!"
+#: actions/login.php:204 actions/login.php:257 lib/action.php:457
+#: lib/logingroupnav.php:79
+msgid "Login"
+msgstr "Login"
 
-#: actions/disfavor.php:63 actions/disfavor.php:87
-msgid "Could not delete favorite."
-msgstr "Could not delete favourite."
+#: actions/login.php:243
+msgid "Login to site"
+msgstr "Login to site"
 
-#: actions/disfavor.php:72 lib/favorform.php:140
-msgid "Favor"
-msgstr "Favour"
+#: actions/login.php:246 actions/profilesettings.php:106
+#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
+#: lib/groupeditform.php:152 lib/userprofile.php:131
+msgid "Nickname"
+msgstr "Nickname"
 
-#: actions/emailsettings.php:92
-msgid "Send me email when someone adds my notice as a favorite."
-msgstr "Send me e-mail when someone adds my notice as a favourite."
+#: actions/login.php:249 actions/register.php:428
+#: lib/accountsettingsaction.php:116
+msgid "Password"
+msgstr "Password"
 
-#: actions/emailsettings.php:95 actions/emailsettings.php:163
-msgid "Send me email when someone sends me a private message."
-msgstr "Send me e-mail when someone sends me a private message."
+#: actions/login.php:252 actions/register.php:477
+msgid "Remember me"
+msgstr "Remember me"
 
-#: actions/favor.php:53 actions/twitapifavorites.php:142 actions/favor.php:81
-#: actions/twitapifavorites.php:118
-msgid "This notice is already a favorite!"
-msgstr "This notice is already a favourite!"
+#: actions/login.php:253 actions/register.php:479
+msgid "Automatically login in the future; not for shared computers!"
+msgstr "Automatically login in the future; not for shared computers!"
 
-#: actions/favor.php:60 actions/twitapifavorites.php:151
-#: classes/Command.php:132 actions/favor.php:86
-#: actions/twitapifavorites.php:125 classes/Command.php:152
-msgid "Could not create favorite."
-msgstr "Could not create favourite."
+#: actions/login.php:263
+msgid "Lost or forgotten password?"
+msgstr "Lost or forgotten password?"
 
-#: actions/favor.php:70
-msgid "Disfavor"
-msgstr "Disfavour"
+#: actions/login.php:282
+msgid ""
+"For security reasons, please re-enter your user name and password before "
+"changing your settings."
+msgstr ""
+"For security reasons, please re-enter your user name and password before "
+"changing your settings."
 
-#: actions/favoritesrss.php:60 actions/showfavorites.php:47
-#: actions/favoritesrss.php:100 actions/showfavorites.php:77
+#: actions/login.php:286
 #, php-format
-msgid "%s favorite notices"
-msgstr "%s's favorite notices"
+msgid ""
+"Login with your username and password. Don't have a username yet? [Register]"
+"(%%action.register%%) a new account."
+msgstr ""
+"Login with your username and password. Don't have a username yet? [Register]"
+"(%%action.register%%) a new account."
 
-#: actions/favoritesrss.php:64 actions/favoritesrss.php:104
-#, php-format
-msgid "Feed of favorite notices of %s"
-msgstr "Feed of favourite notices of %s"
+#: actions/makeadmin.php:91
+msgid "Only an admin can make another user an admin."
+msgstr ""
 
-#: actions/inbox.php:28 actions/inbox.php:59
+#: actions/makeadmin.php:95
 #, php-format
-msgid "Inbox for %s - page %d"
-msgstr "Inbox for %s - page %d"
+msgid "%s is already an admin for group \"%s\"."
+msgstr ""
 
-#: actions/inbox.php:30 actions/inbox.php:62
+#: actions/makeadmin.php:132
 #, php-format
-msgid "Inbox for %s"
-msgstr "Inbox for %s"
-
-#: actions/inbox.php:53 actions/inbox.php:115
-msgid "This is your inbox, which lists your incoming private messages."
-msgstr "This is your inbox, which lists your incoming private messages."
+msgid "Can't get membership record for %s in group %s"
+msgstr ""
 
-#: actions/invite.php:178 actions/invite.php:213
+#: actions/makeadmin.php:145
 #, php-format
-msgid ""
-"%1$s has invited you to join them on %2$s (%3$s).\n"
-"\n"
+msgid "Can't make %s an admin for group %s"
 msgstr ""
-"%1$s has invited you to join them on %2$s (%3$s).\n"
-"\n"
-
-# extra space?
-#: actions/login.php:104 actions/login.php:235 actions/openidlogin.php:108
-#: actions/register.php:416
-msgid "Automatically login in the future; "
-msgstr "Automatically login in the future; "
 
-#: actions/login.php:122 actions/login.php:264
-msgid "For security reasons, please re-enter your "
-msgstr "For security reasons, please re-enter your "
+#: actions/microsummary.php:69
+msgid "No current status"
+msgstr "No current status"
 
-#: actions/login.php:126 actions/login.php:268
-msgid "Login with your username and password. "
-msgstr "Login with your username and password. "
+#: actions/newgroup.php:53
+msgid "New group"
+msgstr "New group"
 
-#: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
-#: actions/twitapidirect_messages.php:141
-msgid "That's too long. Max message size is 140 chars."
-msgstr "That's too long. Max message size is 140 chars."
+#: actions/newgroup.php:110
+msgid "Use this form to create a new group."
+msgstr "Use this form to create a new group."
 
-#: actions/newmessage.php:65 actions/newmessage.php:128
-msgid "No recipient specified."
-msgstr "No recipient specified."
+#: actions/newmessage.php:71 actions/newmessage.php:231
+msgid "New message"
+msgstr "New message"
 
-#: actions/newmessage.php:68 actions/newmessage.php:113
-#: classes/Command.php:206 actions/newmessage.php:131
-#: actions/newmessage.php:168 classes/Command.php:237
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:367
 msgid "You can't send a message to this user."
 msgstr "You can't send a message to this user."
 
-#: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
-#: classes/Command.php:209 actions/twitapidirect_messages.php:158
-#: classes/Command.php:240
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351
+#: lib/command.php:424
+msgid "No content!"
+msgstr "No content!"
+
+#: actions/newmessage.php:158
+msgid "No recipient specified."
+msgstr "No recipient specified."
+
+#: actions/newmessage.php:164 lib/command.php:370
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 
-#: actions/newmessage.php:108 actions/microsummary.php:62
-#: actions/newmessage.php:163
-msgid "No such user"
-msgstr "No such user"
+#: actions/newmessage.php:181
+#, fuzzy
+msgid "Message sent"
+msgstr "Message"
 
-#: actions/newmessage.php:117 actions/newmessage.php:67
-msgid "New message"
-msgstr "New message"
+#: actions/newmessage.php:185 lib/command.php:375
+#, php-format
+msgid "Direct message to %s sent"
+msgstr "Direct message to %s sent"
 
-#: actions/noticesearch.php:95 actions/noticesearch.php:146
-msgid "Notice without matching profile"
-msgstr "Notice without matching profile"
+#: actions/newmessage.php:210 actions/newnotice.php:233 lib/channel.php:170
+msgid "Ajax Error"
+msgstr "Ajax Error"
 
-#: actions/openidsettings.php:28 actions/openidsettings.php:70
-#, php-format
-msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
-msgstr "[OpenID](%%doc.openid%%) lets you log into many sites "
+#: actions/newnotice.php:69
+msgid "New notice"
+msgstr "New notice"
 
-#: actions/openidsettings.php:46 actions/openidsettings.php:96
-msgid "If you want to add an OpenID to your account, "
-msgstr "If you want to add an OpenID to your account, "
+#: actions/newnotice.php:199
+msgid "Notice posted"
+msgstr "Notice posted"
 
-#: actions/openidsettings.php:74
-msgid "Removing your only OpenID would make it impossible to log in! "
-msgstr "Removing your only OpenID would make it impossible to log in! "
+#: actions/noticesearch.php:68
+#, php-format
+msgid ""
+"Search for notices on %%site.name%% by their contents. Separate search terms "
+"by spaces; they must be 3 characters or more."
+msgstr ""
+"Search for notices on %%site.name%% by their contents. Separate search terms "
+"by spaces; they must be 3 characters or more."
 
-#: actions/openidsettings.php:87 actions/openidsettings.php:143
-msgid "You can remove an OpenID from your account "
-msgstr "You can remove an OpenID from your account "
+#: actions/noticesearch.php:78
+msgid "Text search"
+msgstr "Text search"
 
-#: actions/outbox.php:28 actions/outbox.php:58
+#: actions/noticesearch.php:91
+#, fuzzy, php-format
+msgid "Search results for \"%s\" on %s"
+msgstr " Search Stream for \"%s\""
+
+#: actions/noticesearch.php:121
 #, php-format
-msgid "Outbox for %s - page %d"
-msgstr "Outbox for %s - page %d"
+msgid ""
+"Be the first to [post on this topic](%%%%action.newnotice%%%%?"
+"status_textarea=%s)!"
+msgstr ""
 
-#: actions/outbox.php:30 actions/outbox.php:61
+#: actions/noticesearch.php:124
 #, php-format
-msgid "Outbox for %s"
-msgstr "Outbox for %s"
+msgid ""
+"Why not [register an account](%%%%action.register%%%%) and be the first to "
+"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
+msgstr ""
 
-#: actions/outbox.php:53 actions/outbox.php:116
-msgid "This is your outbox, which lists private messages you have sent."
-msgstr "This is your outbox, which lists private messages you have sent."
+#: actions/noticesearchrss.php:89
+#, fuzzy, php-format
+msgid "Updates with \"%s\""
+msgstr "Updates from %1$s on %2$s!"
 
-#: actions/peoplesearch.php:28 actions/peoplesearch.php:52
-#, php-format
+#: actions/noticesearchrss.php:91
+#, fuzzy, php-format
+msgid "Updates matching search term \"%1$s\" on %2$s!"
+msgstr "All updates matching search term \"%s\""
+
+#: actions/nudge.php:85
 msgid ""
-"Search for people on %%site.name%% by their name, location, or interests. "
+"This user doesn't allow nudges or hasn't confirmed or set his email yet."
 msgstr ""
-"Search for people on %%site.name%% by their name, location, or interests. "
+"This user doesn't allow nudges or hasn't confirmed or set his e-mail yet."
 
-#: actions/profilesettings.php:27 actions/profilesettings.php:69
-msgid "You can update your personal profile info here "
-msgstr "You can update your personal profile info here "
+#: actions/nudge.php:94
+msgid "Nudge sent"
+msgstr "Nudge sent"
 
-#: actions/profilesettings.php:115 actions/remotesubscribe.php:320
-#: actions/userauthorization.php:159 actions/userrss.php:76
-#: actions/avatarsettings.php:104 actions/avatarsettings.php:179
-#: actions/grouplogo.php:177 actions/remotesubscribe.php:367
-#: actions/userauthorization.php:176 actions/userrss.php:82
-msgid "User without matching profile"
-msgstr "User without matching profile"
+#: actions/nudge.php:97
+msgid "Nudge sent!"
+msgstr "Nudge sent!"
 
-#: actions/recoverpassword.php:91 actions/recoverpassword.php:97
-msgid "This confirmation code is too old. "
-msgstr "This confirmation code is too old. "
+#: actions/oembed.php:79 actions/shownotice.php:100
+msgid "Notice has no profile"
+msgstr "Notice has no profile"
 
-#: actions/recoverpassword.php:141 actions/recoverpassword.php:152
-msgid "If you've forgotten or lost your"
-msgstr "If you've forgotten or lost your"
+#: actions/oembed.php:86 actions/shownotice.php:180
+#, php-format
+msgid "%1$s's status on %2$s"
+msgstr "%1$s's status on %2$s"
 
-#: actions/recoverpassword.php:154 actions/recoverpassword.php:158
-msgid "You've been identified. Enter a "
-msgstr "You've been identified. Enter a "
+#: actions/oembed.php:157
+#, fuzzy
+msgid "content type "
+msgstr "Connect"
 
-#: actions/recoverpassword.php:169 actions/recoverpassword.php:188
-msgid "Your nickname on this server, "
-msgstr "Your nickname on this server, "
+#: actions/oembed.php:160
+msgid "Only "
+msgstr ""
 
-#: actions/recoverpassword.php:271 actions/recoverpassword.php:304
-msgid "Instructions for recovering your password "
-msgstr "Instructions for recovering your password "
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999
+#: lib/api.php:1027 lib/api.php:1137
+msgid "Not a supported data format."
+msgstr "Not a supported data format."
 
-#: actions/recoverpassword.php:327 actions/recoverpassword.php:361
-msgid "New password successfully saved. "
-msgstr "New password successfully saved. "
+#: actions/opensearch.php:64
+msgid "People Search"
+msgstr "People Search"
 
-#: actions/register.php:95 actions/register.php:180
-msgid "Password must be 6 or more characters."
-msgstr "Password must be 6 or more characters."
+#: actions/opensearch.php:67
+msgid "Notice Search"
+msgstr "Notice Search"
 
-#: actions/register.php:216
-#, php-format
-msgid ""
-"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
-"want to..."
+#: actions/othersettings.php:60
+msgid "Other Settings"
+msgstr "Other Settings"
+
+#: actions/othersettings.php:71
+msgid "Manage various other options."
+msgstr "Manage various other options."
+
+#: actions/othersettings.php:108
+msgid " (free service)"
 msgstr ""
-"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
-"want to…"
 
-#: actions/register.php:227
-msgid "(You should receive a message by email momentarily, with "
-msgstr "(You should receive a message by e-mail momentarily, with "
+#: actions/othersettings.php:116
+msgid "Shorten URLs with"
+msgstr ""
+
+#: actions/othersettings.php:117
+msgid "Automatic shortening service to use."
+msgstr "Automatic shortening service to use."
 
-#: actions/remotesubscribe.php:51 actions/remotesubscribe.php:74
+#: actions/othersettings.php:122
+#, fuzzy
+msgid "View profile designs"
+msgstr "Profile settings"
+
+#: actions/othersettings.php:123
+msgid "Show or hide profile designs."
+msgstr ""
+
+#: actions/othersettings.php:153
+msgid "URL shortening service is too long (max 50 chars)."
+msgstr "URL shortening service is too long (max 50 chars)."
+
+#: actions/outbox.php:58
 #, php-format
-msgid "To subscribe, you can [login](%%action.login%%),"
-msgstr "To subscribe, you can [login](%%action.login%%),"
+msgid "Outbox for %s - page %d"
+msgstr "Outbox for %s - page %d"
 
-#: actions/showfavorites.php:61 actions/showfavorites.php:145
+#: actions/outbox.php:61
 #, php-format
-msgid "Feed for favorites of %s"
-msgstr "Feed for favourites of %s"
+msgid "Outbox for %s"
+msgstr "Outbox for %s"
 
-#: actions/showfavorites.php:84 actions/twitapifavorites.php:85
-#: actions/showfavorites.php:202 actions/twitapifavorites.php:59
-msgid "Could not retrieve favorite notices."
-msgstr "Could not retrieve favourite notices."
+#: actions/outbox.php:116
+msgid "This is your outbox, which lists private messages you have sent."
+msgstr "This is your outbox, which lists private messages you have sent."
 
-#: actions/showmessage.php:33 actions/showmessage.php:81
-msgid "No such message."
-msgstr "No such message."
+#: actions/passwordsettings.php:58
+msgid "Change password"
+msgstr "Change password"
 
-#: actions/showmessage.php:42
-msgid "Only the sender and recipient may read this message."
-msgstr "Only the sender and recipient may read this message."
+#: actions/passwordsettings.php:69
+msgid "Change your password."
+msgstr "Change your password."
 
-#: actions/showmessage.php:61 actions/showmessage.php:108
-#, php-format
-msgid "Message to %1$s on %2$s"
-msgstr "Message to %1$s on %2$s"
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+msgid "Password change"
+msgstr "Password change"
 
-#: actions/showmessage.php:66 actions/showmessage.php:113
-#, php-format
-msgid "Message from %1$s on %2$s"
-msgstr "Message from %1$s on %2$s"
+#: actions/passwordsettings.php:104
+msgid "Old password"
+msgstr "Old password"
 
-#: actions/showstream.php:154
-msgid "Send a message"
-msgstr "Send a message"
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+msgid "New password"
+msgstr "New password"
 
-# Carrier?
-#: actions/smssettings.php:312 actions/smssettings.php:464
-#, php-format
-#, fuzzy
-msgid "Mobile carrier for your phone. "
-msgstr "Mobile carrier for your phone. "
+#: actions/passwordsettings.php:109
+msgid "6 or more characters"
+msgstr "6 or more characters"
 
-#: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:68
-#, php-format
-msgid "Direct messages to %s"
-msgstr "Direct messages to %s"
+#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
+#: actions/register.php:432 actions/smssettings.php:134
+msgid "Confirm"
+msgstr "Confirm"
 
-#: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:69
-#, php-format
-msgid "All the direct messages sent to %s"
-msgstr "All the direct messages sent to %s"
+#: actions/passwordsettings.php:113
+msgid "same as password above"
+msgstr "same as password above"
 
-#: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:73
-msgid "Direct Messages You've Sent"
-msgstr "Direct Messages You've Sent"
+#: actions/passwordsettings.php:117
+msgid "Change"
+msgstr "Change"
 
-#: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:74
-#, php-format
-msgid "All the direct messages sent from %s"
-msgstr "All the direct messages sent from %s"
+#: actions/passwordsettings.php:154 actions/register.php:230
+msgid "Password must be 6 or more characters."
+msgstr "Password must be 6 or more characters."
 
-#: actions/twitapidirect_messages.php:128
-#: actions/twitapidirect_messages.php:137
-msgid "No message text!"
-msgstr "No message text!"
+#: actions/passwordsettings.php:157 actions/register.php:233
+msgid "Passwords don't match."
+msgstr "Passwords don't match."
 
-#: actions/twitapidirect_messages.php:138
-#: actions/twitapidirect_messages.php:150
-msgid "Recipient user not found."
-msgstr "Recipient user not found."
+#: actions/passwordsettings.php:165
+msgid "Incorrect old password"
+msgstr "Incorrect old password"
 
-#: actions/twitapidirect_messages.php:141
-#: actions/twitapidirect_messages.php:153
-msgid "Can't send direct messages to users who aren't your friend."
-msgstr "Can't send direct messages to users who aren't your friend."
+#: actions/passwordsettings.php:181
+msgid "Error saving user; invalid."
+msgstr "Error saving user; invalid."
+
+#: actions/passwordsettings.php:186 actions/recoverpassword.php:368
+msgid "Can't save new password."
+msgstr "Can't save new password."
 
-#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:66
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+msgid "Password saved."
+msgstr "Password saved."
+
+#: actions/peoplesearch.php:52
 #, php-format
-msgid "%s / Favorites from %s"
-msgstr "%s / Favourites from %s"
+msgid ""
+"Search for people on %%site.name%% by their name, location, or interests. "
+"Separate the terms by spaces; they must be 3 characters or more."
+msgstr ""
+"Search for people on %%site.name%% by their name, location, or interests. "
+"Separate the terms by spaces; they must be 3 characters or more."
+
+#: actions/peoplesearch.php:58
+msgid "People search"
+msgstr "People Search"
 
-#: actions/twitapifavorites.php:95 actions/twitapifavorites.php:69
+#: actions/peopletag.php:70
 #, php-format
-msgid "%s updates favorited by %s / %s."
-msgstr "%s updates favourited by %s / %s."
+msgid "Not a valid people tag: %s"
+msgstr "Not a valid people tag: %s"
 
-#: actions/twitapifavorites.php:187 lib/mail.php:275
-#: actions/twitapifavorites.php:164 lib/mail.php:553
+#: actions/peopletag.php:144
 #, php-format
-msgid "%s added your notice as a favorite"
-msgstr "%s added your notice as a favourite"
+msgid "Users self-tagged with %s - page %d"
+msgstr "Users self-tagged with %s - page %d"
 
-#: actions/twitapifavorites.php:188 lib/mail.php:276
-#: actions/twitapifavorites.php:165
+#: actions/postnotice.php:84
+msgid "Invalid notice content"
+msgstr "Invalid notice content"
+
+#: actions/postnotice.php:90
 #, php-format
-msgid ""
-"%1$s just added your notice from %2$s as one of their favorites.\n"
-"\n"
+msgid "Notice license ‘%s’ is not compatible with site license ‘%s’."
 msgstr ""
-"%1$s just added your notice from %2$s as one of their favourites.\n"
-"\n"
 
-#: actions/twittersettings.php:27
+#: actions/profilesettings.php:60
+msgid "Profile settings"
+msgstr "Profile settings"
+
+#: actions/profilesettings.php:71
 msgid ""
-"Add your Twitter account to automatically send your notices to Twitter, "
+"You can update your personal profile info here so people know more about you."
 msgstr ""
-"Add your Twitter account to automatically send your notices to Twitter, "
+"You can update your personal profile info here so people know more about you."
 
-#: actions/twittersettings.php:41 actions/twittersettings.php:60
-msgid "Twitter settings"
-msgstr "Twitter settings"
+#: actions/profilesettings.php:99
+msgid "Profile information"
+msgstr "Profile information"
 
-#: actions/twittersettings.php:48 actions/twittersettings.php:105
-msgid "Twitter Account"
-msgstr "Twitter Account"
+#: actions/profilesettings.php:108 lib/groupeditform.php:154
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+msgstr "1-64 lowercase letters or numbers, no punctuation or spaces"
 
-#: actions/twittersettings.php:56 actions/twittersettings.php:113
-msgid "Current verified Twitter account."
-msgstr "Current verified Twitter account."
+#: actions/profilesettings.php:111 actions/register.php:447
+#: 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
+#: lib/groupeditform.php:161
+msgid "Homepage"
+msgstr "Homepage"
+
+#: actions/profilesettings.php:117 actions/register.php:454
+msgid "URL of your homepage, blog, or profile on another site"
+msgstr "URL of your homepage, blog, or profile on another site"
 
-#: actions/twittersettings.php:63
-msgid "Twitter Username"
-msgstr "Twitter Username"
+#: actions/profilesettings.php:122 actions/register.php:460
+#, fuzzy, php-format
+msgid "Describe yourself and your interests in %d chars"
+msgstr "Describe yourself and your interests in 140 chars"
 
-#: actions/twittersettings.php:65 actions/twittersettings.php:123
-msgid "No spaces, please."
-msgstr "No spaces, please."
+#: actions/profilesettings.php:125 actions/register.php:463
+#, fuzzy
+msgid "Describe yourself and your interests"
+msgstr "Describe yourself and your "
 
-#: actions/twittersettings.php:67
-msgid "Twitter Password"
-msgstr "Twitter Password"
+#: actions/profilesettings.php:127 actions/register.php:465
+msgid "Bio"
+msgstr "Bio"
 
-#: actions/twittersettings.php:72 actions/twittersettings.php:139
-msgid "Automatically send my notices to Twitter."
-msgstr "Automatically send my notices to Twitter."
+#: actions/profilesettings.php:132 actions/register.php:470
+#: 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/twittersettings.php:75 actions/twittersettings.php:146
-msgid "Send local \"@\" replies to Twitter."
-msgstr "Send local \"@\" replies to Twitter."
+#: actions/profilesettings.php:134 actions/register.php:472
+msgid "Where you are, like \"City, State (or Region), Country\""
+msgstr "Where you are, like \"City, State (or Region), Country\""
 
-#: actions/twittersettings.php:78 actions/twittersettings.php:153
-msgid "Subscribe to my Twitter friends here."
-msgstr "Subscribe to my Twitter friends here."
+#: actions/profilesettings.php:138 actions/tagother.php:149
+#: actions/tagother.php:209 lib/subscriptionlist.php:106
+#: lib/subscriptionlist.php:108 lib/userprofile.php:209
+msgid "Tags"
+msgstr "Tags"
 
-#: actions/twittersettings.php:122
+#: actions/profilesettings.php:140
 msgid ""
-"Username must have only numbers, upper- and lowercase letters, and "
-"underscore (_). 15 chars max."
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
-"Username must have only numbers, upper- and lowercase letters, and "
-"underscore (_). 15 chars max."
-
-#: actions/twittersettings.php:128 actions/twittersettings.php:334
-msgid "Could not verify your Twitter credentials!"
-msgstr "Could not verify your Twitter credentials!"
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 
-#: actions/twittersettings.php:137
-#, php-format
-msgid "Unable to retrieve account information for \"%s\" from Twitter."
-msgstr "Unable to retrieve account information for \"%s\" from Twitter."
+#: actions/profilesettings.php:144 actions/siteadminpanel.php:309
+msgid "Language"
+msgstr "Language"
 
-#: actions/twittersettings.php:151 actions/twittersettings.php:170
-#: actions/twittersettings.php:348 actions/twittersettings.php:368
-msgid "Unable to save your Twitter settings!"
-msgstr "Unable to save your Twitter settings!"
+#: actions/profilesettings.php:145
+msgid "Preferred language"
+msgstr "Preferred language"
 
-#: actions/twittersettings.php:174 actions/twittersettings.php:376
-msgid "Twitter settings saved."
-msgstr "Twitter settings saved."
+#: actions/profilesettings.php:154
+msgid "Timezone"
+msgstr "Timezone"
 
-#: actions/twittersettings.php:192 actions/twittersettings.php:395
-msgid "That is not your Twitter account."
-msgstr "That is not your Twitter account."
+#: actions/profilesettings.php:155
+msgid "What timezone are you normally in?"
+msgstr "In which timezone are you?"
 
-#: actions/twittersettings.php:200 actions/twittersettings.php:208
-#: actions/twittersettings.php:403
-msgid "Couldn't remove Twitter user."
-msgstr "Couldn't remove Twitter user."
+#: actions/profilesettings.php:160
+msgid ""
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+msgstr ""
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
 
-#: actions/twittersettings.php:212 actions/twittersettings.php:407
-msgid "Twitter account removed."
-msgstr "Twitter account removed."
+#: actions/profilesettings.php:221 actions/register.php:223
+#, fuzzy, php-format
+msgid "Bio is too long (max %d chars)."
+msgstr "Bio is too long (max 140 chars)."
 
-#: actions/twittersettings.php:225 actions/twittersettings.php:239
-#: actions/twittersettings.php:428 actions/twittersettings.php:439
-#: actions/twittersettings.php:453
-msgid "Couldn't save Twitter preferences."
-msgstr "Couldn't save Twitter preferences."
+#: actions/profilesettings.php:228 actions/siteadminpanel.php:165
+msgid "Timezone not selected."
+msgstr "Timezone not selected."
 
-#: actions/twittersettings.php:245 actions/twittersettings.php:461
-msgid "Twitter preferences saved."
-msgstr "Twitter preferences saved."
+#: actions/profilesettings.php:234
+msgid "Language is too long (max 50 chars)."
+msgstr "Language is too long (max 50 chars)."
 
-#: actions/userauthorization.php:84 actions/userauthorization.php:86
-msgid "Please check these details to make sure "
-msgstr "Please check these details to make sure "
+#: actions/profilesettings.php:246 actions/tagother.php:178
+#, php-format
+msgid "Invalid tag: \"%s\""
+msgstr "Invalid tag: \"%s\""
 
-#: actions/userauthorization.php:324 actions/userauthorization.php:340
-msgid "The subscription has been authorized, but no "
-msgstr "The subscription has been authorised, but no "
+#: actions/profilesettings.php:295
+msgid "Couldn't update user for autosubscribe."
+msgstr "Couldn't update user for autosubscribe."
 
-#: actions/userauthorization.php:334 actions/userauthorization.php:351
-msgid "The subscription has been rejected, but no "
-msgstr "The subscription has been rejected, but no "
+#: actions/profilesettings.php:328
+msgid "Couldn't save profile."
+msgstr "Couldn't save profile."
 
-#: classes/Channel.php:113 classes/Channel.php:132 classes/Channel.php:151
-msgid "Command results"
-msgstr "Command results"
+#: actions/profilesettings.php:336
+msgid "Couldn't save tags."
+msgstr "Couldn't save tags."
 
-#: classes/Channel.php:148 classes/Channel.php:204
-msgid "Command complete"
-msgstr "Command complete"
+#: actions/profilesettings.php:344 lib/adminpanelaction.php:126
+msgid "Settings saved."
+msgstr "Settings saved."
 
-#: classes/Channel.php:158 classes/Channel.php:215
-msgid "Command failed"
-msgstr "Command failed"
+#: actions/public.php:83
+#, php-format
+msgid "Beyond the page limit (%s)"
+msgstr ""
 
-#: classes/Command.php:39 classes/Command.php:44
-msgid "Sorry, this command is not yet implemented."
-msgstr "Sorry, this command is not yet implemented."
+#: actions/public.php:92
+msgid "Could not retrieve public stream."
+msgstr "Could not retrieve public stream."
 
-#: classes/Command.php:96 classes/Command.php:113
+#: actions/public.php:129
 #, php-format
-msgid "Subscriptions: %1$s\n"
-msgstr "Subscriptions: %1$s\n"
+msgid "Public timeline, page %d"
+msgstr "Public timeline, page %d"
 
-#: classes/Command.php:125 classes/Command.php:242 classes/Command.php:145
-#: classes/Command.php:276
-msgid "User has no last notice"
-msgstr "User has no last notice"
+#: actions/public.php:131 lib/publicgroupnav.php:79
+msgid "Public timeline"
+msgstr "Public timeline"
 
-#: classes/Command.php:146 classes/Command.php:166
-msgid "Notice marked as fave."
-msgstr "Notice marked as fave."
+#: actions/public.php:151
+#, fuzzy
+msgid "Public Stream Feed (RSS 1.0)"
+msgstr "Public Stream Feed"
 
-#: classes/Command.php:166 classes/Command.php:189
-#, php-format
-msgid "%1$s (%2$s)"
-msgstr "%1$s (%2$s)"
+#: actions/public.php:155
+#, fuzzy
+msgid "Public Stream Feed (RSS 2.0)"
+msgstr "Public Stream Feed"
 
-#: classes/Command.php:169 classes/Command.php:192
-#, php-format
-msgid "Fullname: %s"
-msgstr "Fullname: %s"
+#: actions/public.php:159
+#, fuzzy
+msgid "Public Stream Feed (Atom)"
+msgstr "Public Stream Feed"
 
-#: classes/Command.php:172 classes/Command.php:195
+#: actions/public.php:179
 #, php-format
-msgid "Location: %s"
-msgstr "Location: %s"
+msgid ""
+"This is the public timeline for %%site.name%% but no one has posted anything "
+"yet."
+msgstr ""
 
-#: classes/Command.php:175 classes/Command.php:198
-#, php-format
-msgid "Homepage: %s"
-msgstr "Homepage: %s"
+#: actions/public.php:182
+msgid "Be the first to post!"
+msgstr ""
 
-#: classes/Command.php:178 classes/Command.php:201
+#: actions/public.php:186
 #, php-format
-msgid "About: %s"
-msgstr "About: %s"
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post!"
+msgstr ""
 
-#: classes/Command.php:200 classes/Command.php:228
+#: actions/public.php:233
 #, php-format
-msgid "Message too long - maximum is 140 characters, you sent %d"
-msgstr "Message too long - maximum is 140 characters, you sent %d"
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service based on the Free Software [StatusNet](http://status.net/) "
+"tool. [Join now](%%action.register%%) to share notices about yourself with "
+"friends, family, and colleagues! ([Read more](%%doc.help%%))"
+msgstr ""
 
-#: classes/Command.php:214 classes/Command.php:245
-#, php-format
-msgid "Direct message to %s sent"
-msgstr "Direct message to %s sent"
+#: actions/public.php:238
+#, fuzzy, php-format
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service based on the Free Software [StatusNet](http://status.net/) "
+"tool."
+msgstr ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service "
 
-#: classes/Command.php:216 classes/Command.php:247
-msgid "Error sending direct message."
-msgstr "Error sending direct message."
+#: actions/publictagcloud.php:57
+msgid "Public tag cloud"
+msgstr "Public tag cloud"
 
-#: classes/Command.php:263 classes/Command.php:300
-msgid "Specify the name of the user to subscribe to"
-msgstr "Specify the name of the user to subscribe to"
+#: actions/publictagcloud.php:63
+#, php-format
+msgid "These are most popular recent tags on %s "
+msgstr "These are most popular recent tags on %s "
 
-#: classes/Command.php:270 classes/Command.php:307
+#: actions/publictagcloud.php:69
 #, php-format
-msgid "Subscribed to %s"
-msgstr "Subscribed to %s"
+msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet."
+msgstr ""
 
-#: classes/Command.php:288 classes/Command.php:328
-msgid "Specify the name of the user to unsubscribe from"
-msgstr "Specify the name of the user to unsubscribe from"
+#: actions/publictagcloud.php:72
+msgid "Be the first to post one!"
+msgstr ""
 
-#: classes/Command.php:295 classes/Command.php:335
+#: actions/publictagcloud.php:75
 #, php-format
-msgid "Unsubscribed from %s"
-msgstr "Unsubscribed from %s"
-
-#: classes/Command.php:310 classes/Command.php:330 classes/Command.php:353
-#: classes/Command.php:376
-msgid "Command not yet implemented."
-msgstr "Command not yet implemented."
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post "
+"one!"
+msgstr ""
 
-#: classes/Command.php:313 classes/Command.php:356
-msgid "Notification off."
-msgstr "Notification off."
+#: actions/publictagcloud.php:135
+msgid "Tag cloud"
+msgstr "Tag cloud"
 
-#: classes/Command.php:315 classes/Command.php:358
-msgid "Can't turn off notification."
-msgstr "Can't turn off notification."
+#: actions/recoverpassword.php:36
+msgid "You are already logged in!"
+msgstr "You are already logged in!"
 
-#: classes/Command.php:333 classes/Command.php:379
-msgid "Notification on."
-msgstr "Notification on."
+#: actions/recoverpassword.php:62
+msgid "No such recovery code."
+msgstr "No such recovery code."
 
-#: classes/Command.php:335 classes/Command.php:381
-msgid "Can't turn on notification."
-msgstr "Can't turn on notification."
+#: actions/recoverpassword.php:66
+msgid "Not a recovery code."
+msgstr "Not a recovery code."
 
-#: classes/Command.php:344 classes/Command.php:392
-msgid "Commands:\n"
-msgstr "Commands:\n"
+#: actions/recoverpassword.php:73
+msgid "Recovery code for unknown user."
+msgstr "Recovery code for unknown user."
 
-#: classes/Message.php:53 classes/Message.php:56
-msgid "Could not insert message."
-msgstr "Could not insert message."
+#: actions/recoverpassword.php:86
+msgid "Error with confirmation code."
+msgstr "Error with confirmation code."
 
-#: classes/Message.php:63 classes/Message.php:66
-msgid "Could not update message with new URI."
-msgstr "Could not update message with new URI."
+#: actions/recoverpassword.php:97
+msgid "This confirmation code is too old. Please start again."
+msgstr "This confirmation code is too old. Please start again."
 
-#: lib/gallery.php:46
-msgid "User without matching profile in system."
-msgstr "User without matching profile in system."
+#: actions/recoverpassword.php:111
+msgid "Could not update user with confirmed email address."
+msgstr "Couldn't update user with confirmed e-mail address."
 
-#: lib/mail.php:147 lib/mail.php:289
-#, php-format
+#: actions/recoverpassword.php:152
 msgid ""
-"You have a new posting address on %1$s.\n"
-"\n"
+"If you have forgotten or lost your password, you can get a new one sent to "
+"the email address you have stored in your account."
 msgstr ""
-"You have a new posting address on %1$s.\n"
-"\n"
-
-#: lib/mail.php:249 lib/mail.php:508
-#, php-format
-msgid "New private message from %s"
-msgstr "New private message from %s"
 
-#: lib/mail.php:253 lib/mail.php:512
-#, php-format
-msgid ""
-"%1$s (%2$s) sent you a private message:\n"
-"\n"
+#: actions/recoverpassword.php:158
+msgid "You have been identified. Enter a new password below. "
 msgstr ""
-"%1$s (%2$s) sent you a private message:\n"
-"\n"
 
-#: lib/mailbox.php:43 lib/mailbox.php:89
-msgid "Only the user can read their own mailboxes."
-msgstr "Only the user can read their own mailboxes."
-
-#: lib/openid.php:195 lib/openid.php:203
-msgid "This form should automatically submit itself. "
-msgstr "This form should automatically submit itself. "
+#: actions/recoverpassword.php:188
+msgid "Password recovery"
+msgstr ""
 
-#: lib/personal.php:65 lib/personalgroupnav.php:113
-msgid "Favorites"
-msgstr "Favourites"
+#: actions/recoverpassword.php:191
+msgid "Nickname or email address"
+msgstr ""
 
-#: lib/personal.php:66 lib/personalgroupnav.php:114
-#, php-format
-msgid "%s's favorite notices"
-msgstr "%s's favourite notices"
+#: actions/recoverpassword.php:193
+msgid "Your nickname on this server, or your registered email address."
+msgstr "Your nickname on this server, or your registered e-mail address."
 
-#: lib/personal.php:66 lib/personalgroupnav.php:114
-msgid "User"
-msgstr "User"
+#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+msgid "Recover"
+msgstr "Recover"
 
-#: lib/personal.php:75 lib/personalgroupnav.php:123
-msgid "Inbox"
-msgstr "Inbox"
+#: actions/recoverpassword.php:208
+msgid "Reset password"
+msgstr "Reset password"
 
-#: lib/personal.php:76 lib/personalgroupnav.php:124
-msgid "Your incoming messages"
-msgstr "Your incoming messages"
+#: actions/recoverpassword.php:209
+msgid "Recover password"
+msgstr "Recover password"
 
-#: lib/personal.php:80 lib/personalgroupnav.php:128
-msgid "Outbox"
-msgstr "Outbox"
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:322
+msgid "Password recovery requested"
+msgstr "Password recovery requested"
 
-#: lib/personal.php:81 lib/personalgroupnav.php:129
-msgid "Your sent messages"
-msgstr "Your sent messages"
+#: actions/recoverpassword.php:213
+msgid "Unknown action"
+msgstr "Unknown action"
 
-#: lib/settingsaction.php:99 lib/connectsettingsaction.php:110
-msgid "Twitter"
-msgstr "Twitter"
+#: actions/recoverpassword.php:236
+msgid "6 or more characters, and don't forget it!"
+msgstr "6 or more characters, and don't forget it!"
 
-#: lib/settingsaction.php:100 lib/connectsettingsaction.php:111
-msgid "Twitter integration options"
-msgstr "Twitter integration options"
+#: actions/recoverpassword.php:240
+msgid "Same as password above"
+msgstr "Same as password above"
 
-#: lib/util.php:1718 lib/messageform.php:139 lib/noticelist.php:422
-msgid "To"
-msgstr "To"
+#: actions/recoverpassword.php:243
+msgid "Reset"
+msgstr "Reset"
 
-#: scripts/maildaemon.php:45 scripts/maildaemon.php:48
-msgid "Could not parse message."
-msgstr "Could not parse message."
+#: actions/recoverpassword.php:252
+msgid "Enter a nickname or email address."
+msgstr "Enter a nickname or e-mail address."
 
-#: actions/all.php:63 actions/facebookhome.php:162
-#, php-format
-msgid "%s and friends, page %d"
-msgstr "%s and friends, page %d"
+#: actions/recoverpassword.php:272
+msgid "No user with that email address or username."
+msgstr "No user with that e-mail address or username."
 
-#: actions/avatarsettings.php:76
-msgid "You can upload your personal avatar."
-msgstr "You can upload your personal avatar."
+#: actions/recoverpassword.php:287
+msgid "No registered email address for that user."
+msgstr "No registered e-mail address for that user."
 
-#  requires full stops?
-#: actions/avatarsettings.php:117 actions/avatarsettings.php:191
-#: actions/grouplogo.php:250
-msgid "Avatar settings"
-msgstr "Avatar settings"
+#: actions/recoverpassword.php:301
+msgid "Error saving address confirmation."
+msgstr "Error saving address confirmation."
 
-#: actions/avatarsettings.php:124 actions/avatarsettings.php:199
-#: actions/grouplogo.php:198 actions/grouplogo.php:258
-msgid "Original"
-msgstr "Original"
+#: actions/recoverpassword.php:325
+msgid ""
+"Instructions for recovering your password have been sent to the email "
+"address registered to your account."
+msgstr ""
+"Instructions for recovering your password have been sent to the e-mail "
+"address registered to your account."
 
-#: actions/avatarsettings.php:139 actions/avatarsettings.php:211
-#: actions/grouplogo.php:209 actions/grouplogo.php:270
-msgid "Preview"
-msgstr "Preview"
+#: actions/recoverpassword.php:344
+msgid "Unexpected password reset."
+msgstr "Unexpected password reset."
 
-#: actions/avatarsettings.php:225 actions/grouplogo.php:284
-msgid "Crop"
-msgstr "Crop"
+#: actions/recoverpassword.php:352
+msgid "Password must be 6 chars or more."
+msgstr "Password must be 6 chars or more."
 
-#: actions/avatarsettings.php:248 actions/deletenotice.php:133
-#: actions/emailsettings.php:224 actions/grouplogo.php:307
-#: actions/imsettings.php:200 actions/login.php:102 actions/newmessage.php:100
-#: actions/newnotice.php:96 actions/openidsettings.php:188
-#: actions/othersettings.php:136 actions/passwordsettings.php:131
-#: actions/profilesettings.php:172 actions/register.php:113
-#: actions/remotesubscribe.php:53 actions/smssettings.php:216
-#: actions/subedit.php:38 actions/twittersettings.php:290
-#: actions/userauthorization.php:39
-msgid "There was a problem with your session token. "
-msgstr "There was a problem with your session token. "
-
-#: actions/avatarsettings.php:303 actions/grouplogo.php:360
-msgid "Pick a square area of the image to be your avatar"
-msgstr "Pick a square area of the image to be your avatar"
+#: actions/recoverpassword.php:356
+msgid "Password and confirmation do not match."
+msgstr "Password and confirmation do not match."
 
-#: actions/avatarsettings.php:327 actions/grouplogo.php:384
-msgid "Lost our file data."
-msgstr "Lost our file data."
+#: actions/recoverpassword.php:375 actions/register.php:248
+msgid "Error setting user."
+msgstr "Error setting user."
 
-#: actions/avatarsettings.php:334 actions/grouplogo.php:391
-#: classes/User_group.php:112
-msgid "Lost our file."
-msgstr "Lost our file."
+#: actions/recoverpassword.php:382
+msgid "New password successfully saved. You are now logged in."
+msgstr "New password successfully saved. You are now logged in."
 
-#: actions/avatarsettings.php:349 actions/avatarsettings.php:383
-#: actions/grouplogo.php:406 actions/grouplogo.php:440
-#: classes/User_group.php:129 classes/User_group.php:161
-msgid "Unknown file type"
-msgstr "Unknown file type"
+#: actions/register.php:85 actions/register.php:189 actions/register.php:404
+msgid "Sorry, only invited people can register."
+msgstr "Sorry, only invited people can register."
 
-#: actions/block.php:69 actions/subedit.php:46 actions/unblock.php:70
-msgid "No profile specified."
-msgstr "No profile specified."
+#: actions/register.php:92
+#, fuzzy
+msgid "Sorry, invalid invitation code."
+msgstr "Error with confirmation code."
 
-#: actions/block.php:74 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unblock.php:75
-msgid "No profile with that ID."
-msgstr "No profile with that ID."
+#: actions/register.php:112
+msgid "Registration successful"
+msgstr "Registration successful"
 
-#: actions/block.php:111
-msgid "Block user"
-msgstr "Block user"
+#: actions/register.php:114 actions/register.php:502 lib/action.php:454
+#: lib/logingroupnav.php:85
+msgid "Register"
+msgstr "Register"
 
-#: actions/block.php:129
-msgid "Are you sure you want to block this user? "
-msgstr "Are you sure you want to block this user? "
+#: actions/register.php:135
+msgid "Registration not allowed."
+msgstr "Registration not allowed."
 
-#: actions/block.php:162
-msgid "You have already blocked this user."
-msgstr "You have already blocked this user."
+#: actions/register.php:198
+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/block.php:167
-msgid "Failed to save block information."
-msgstr "Failed to save block information."
+#: actions/register.php:201
+msgid "Not a valid email address."
+msgstr "Not a valid e-mail address."
 
-#: actions/confirmaddress.php:159
-#, php-format
-msgid "The address \"%s\" has been "
-msgstr "The address \"%s\" has been "
+#: actions/register.php:212
+msgid "Email address already exists."
+msgstr "E-mail address already exists."
 
-#: actions/deletenotice.php:73
-msgid "You are about to permanently delete a notice. "
-msgstr "You are about to permanently delete a notice. "
+#: actions/register.php:243 actions/register.php:264
+msgid "Invalid username or password."
+msgstr "Invalid username or password."
 
-#: actions/disfavor.php:94
-msgid "Add to favorites"
-msgstr "Add to favourites"
+#: actions/register.php:342
+msgid ""
+"With this form you can create  a new account. You can then post notices and "
+"link up to friends and colleagues. "
+msgstr ""
 
-#: actions/editgroup.php:54
-#, php-format
-msgid "Edit %s group"
-msgstr "Edit %s group"
+#: actions/register.php:424
+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/editgroup.php:66 actions/groupbyid.php:72 actions/grouplogo.php:66
-#: actions/joingroup.php:60 actions/newgroup.php:65 actions/showgroup.php:100
-msgid "Inboxes must be enabled for groups to work"
-msgstr "Inboxes must be enabled for groups to work"
+#: actions/register.php:429
+msgid "6 or more characters. Required."
+msgstr "6 or more characters. Required."
 
-#: actions/editgroup.php:71 actions/grouplogo.php:71 actions/newgroup.php:70
-msgid "You must be logged in to create a group."
-msgstr "You must be logged in to create a group."
+#: actions/register.php:433
+msgid "Same as password above. Required."
+msgstr "Same as password above. Required."
 
-#: actions/editgroup.php:87 actions/grouplogo.php:87
-#: actions/groupmembers.php:76 actions/joingroup.php:81
-#: actions/showgroup.php:121
-msgid "No nickname"
-msgstr "No nickname"
+#: actions/register.php:437 actions/register.php:441
+#: actions/siteadminpanel.php:287 lib/accountsettingsaction.php:120
+msgid "Email"
+msgstr "E-mail"
 
-#: actions/editgroup.php:99 actions/groupbyid.php:88 actions/grouplogo.php:100
-#: actions/groupmembers.php:83 actions/joingroup.php:88
-#: actions/showgroup.php:128
-msgid "No such group"
-msgstr "No such group"
+#: actions/register.php:438 actions/register.php:442
+msgid "Used only for updates, announcements, and password recovery"
+msgstr "Used only for updates, announcements, and password recovery"
 
-#: actions/editgroup.php:106 actions/editgroup.php:165
-#: actions/grouplogo.php:107
-msgid "You must be an admin to edit the group"
-msgstr "You must be an admin to edit the group"
+#: actions/register.php:449
+msgid "Longer name, preferably your \"real\" name"
+msgstr "Longer name, preferably your \"real\" name"
 
-#: actions/editgroup.php:157
-msgid "Use this form to edit the group."
-msgstr "Use this form to edit the group."
+#: actions/register.php:493
+msgid "My text and files are available under "
+msgstr "My text and files are available under "
 
-#: actions/editgroup.php:179 actions/newgroup.php:130 actions/register.php:156
-msgid "Nickname must have only lowercase letters "
-msgstr "Nickname must have only lowercase letters "
+#: actions/register.php:495
+msgid "Creative Commons Attribution 3.0"
+msgstr ""
 
-#: actions/editgroup.php:198 actions/newgroup.php:149
-msgid "description is too long (max 140 chars)."
-msgstr "description is too long (max 140 chars)."
+#: actions/register.php:496
+#, fuzzy
+msgid ""
+" except this private data: password, email address, IM address, and phone "
+"number."
+msgstr ""
+" except this private data: password, e-mail address, IM address, phone "
+"number."
 
-#: actions/editgroup.php:218
-msgid "Could not update group."
-msgstr "Could not update group."
+#: actions/register.php:537
+#, php-format
+msgid ""
+"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
+"want to...\n"
+"\n"
+"* Go to [your profile](%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 "
+"share your interests. \n"
+"* Update your [profile settings](%%%%action.profilesettings%%%%) to tell "
+"others more about you. \n"
+"* Read over the [online docs](%%%%doc.help%%%%) for features you may have "
+"missed. \n"
+"\n"
+"Thanks for signing up and we hope you enjoy using this service."
+msgstr ""
+"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
+"want to...\n"
+"\n"
+"* Go to [your profile](%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 "
+"share your interests. \n"
+"* Update your [profile settings](%%%%action.profilesettings%%%%) to tell "
+"others more about you. \n"
+"* Read over the [online docs](%%%%doc.help%%%%) for features you may have "
+"missed. \n"
+"\n"
+"Thanks for signing up and we hope you enjoy using this service."
 
-#: actions/editgroup.php:226
-msgid "Options saved."
-msgstr "Options saved."
+#: actions/register.php:561
+msgid ""
+"(You should receive a message by email momentarily, with instructions on how "
+"to confirm your email address.)"
+msgstr ""
+"(You should receive a message by e-mail momentarily, with instructions on "
+"how to confirm your e-mail address.)"
 
-#: actions/emailsettings.php:107 actions/imsettings.php:108
+#: actions/remotesubscribe.php:98
 #, php-format
-msgid "Awaiting confirmation on this address. "
-msgstr "Awaiting confirmation on this address. "
-
-#: actions/emailsettings.php:139 actions/smssettings.php:150
-msgid "Make a new email address for posting to; "
-msgstr "Make a new e-mail address for posting to; "
+msgid ""
+"To subscribe, you can [login](%%action.login%%), or [register](%%action."
+"register%%) a new  account. If you already have an account  on a [compatible "
+"microblogging site](%%doc.openmublog%%),  enter your profile URL below."
+msgstr ""
+"To subscribe, you can [login](%%action.login%%), or [register](%%action."
+"register%%) a new  account. If you already have an account  on a [compatible "
+"microblogging site](%%doc.openmublog%%),  enter your profile URL below."
 
-#: actions/emailsettings.php:157
-msgid "Send me email when someone "
-msgstr "Send me e-mail when someone "
+#: actions/remotesubscribe.php:112
+msgid "Remote subscribe"
+msgstr "Remote subscribe"
 
-#: actions/emailsettings.php:168
-msgid "Allow friends to nudge me and send me an email."
-msgstr "Allow friends to nudge me and send me an e-mail."
+#: actions/remotesubscribe.php:124
+#, fuzzy
+msgid "Subscribe to a remote user"
+msgstr "Subscribe to this user"
 
-#: actions/emailsettings.php:321
-msgid "That email address already belongs "
-msgstr "That e-mail address already belongs "
+#: actions/remotesubscribe.php:129
+msgid "User nickname"
+msgstr "User nickname"
 
-#: actions/emailsettings.php:343
-msgid "A confirmation code was sent to the email address you added. "
-msgstr "A confirmation code was sent to the e-mail address you added. "
+#: actions/remotesubscribe.php:130
+msgid "Nickname of the user you want to follow"
+msgstr "Nickname of the user you want to follow"
 
-#: actions/facebookhome.php:110
-msgid "Server error - couldn't get user!"
-msgstr "Server error - couldn't get user!"
+#: actions/remotesubscribe.php:133
+msgid "Profile URL"
+msgstr "Profile URL"
 
-#: actions/facebookhome.php:196
-#, php-format
-msgid "If you would like the %s app to automatically update "
-msgstr "If you would like the %s app to automatically update "
+#: actions/remotesubscribe.php:134
+msgid "URL of your profile on another compatible microblogging service"
+msgstr "URL of your profile on another compatible microblogging service"
 
-#: actions/facebookhome.php:213 actions/facebooksettings.php:137
-#, php-format
-msgid "Allow %s to update my Facebook status"
-msgstr "Allow %s to update my Facebook status"
+#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
+#: lib/userprofile.php:356
+msgid "Subscribe"
+msgstr "Subscribe"
 
-#: actions/facebookhome.php:218
-msgid "Skip"
-msgstr "Skip"
+#: actions/remotesubscribe.php:159
+msgid "Invalid profile URL (bad format)"
+msgstr "Invalid profile URL (bad format)"
 
-#: actions/facebookhome.php:235
-msgid "No notice content!"
-msgstr "No notice content!"
+#: actions/remotesubscribe.php:168
+#, fuzzy
+msgid ""
+"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
+msgstr "Not a valid profile URL (no YADIS document)."
 
-#: actions/facebookhome.php:295 lib/action.php:870 lib/facebookaction.php:399
-msgid "Pagination"
-msgstr "Pagination"
+#: actions/remotesubscribe.php:176
+#, fuzzy
+msgid "That’s a local profile! Login to subscribe."
+msgstr "That's a local profile! Login to subscribe."
 
-#  erm, not sure what to do here, « is recognised as a quotation mark.
-#: actions/facebookhome.php:304 lib/action.php:879 lib/facebookaction.php:408
-msgid "After"
-msgstr "After"
+#: actions/remotesubscribe.php:183
+#, fuzzy
+msgid "Couldn’t get a request token."
+msgstr "Couldn't get a request token."
 
-#  erm, not sure what to do here, » is recognised as a quotation mark.
-#: actions/facebookhome.php:312 lib/action.php:887 lib/facebookaction.php:416
-msgid "Before"
-msgstr "Before"
+#: actions/replies.php:125 actions/repliesrss.php:68
+#: lib/personalgroupnav.php:105
+#, php-format
+msgid "Replies to %s"
+msgstr "Replies to %s"
 
-#: actions/facebookinvite.php:70
+#: actions/replies.php:127
 #, php-format
-msgid "Thanks for inviting your friends to use %s"
-msgstr "Thanks for inviting your friends to use %s"
+msgid "Replies to %s, page %d"
+msgstr "Replies to %s, page %d"
+
+#: actions/replies.php:144
+#, fuzzy, php-format
+msgid "Replies feed for %s (RSS 1.0)"
+msgstr "Notice feed for %s"
 
-#: actions/facebookinvite.php:72
-msgid "Invitations have been sent to the following users:"
-msgstr "Invitations have been sent to the following users:"
+#: actions/replies.php:151
+#, fuzzy, php-format
+msgid "Replies feed for %s (RSS 2.0)"
+msgstr "Notice feed for %s"
 
-#: actions/facebookinvite.php:96
+#: actions/replies.php:158
 #, php-format
-msgid "You have been invited to %s"
-msgstr "You have been invited to %s"
+msgid "Replies feed for %s (Atom)"
+msgstr "Notice feed for %s"
 
-#: actions/facebookinvite.php:105
+#: actions/replies.php:198
 #, php-format
-msgid "Invite your friends to use %s"
-msgstr "Invite your friends to use %s"
+msgid ""
+"This is the timeline showing replies to %s but %s hasn't received a notice "
+"to his attention yet."
+msgstr ""
 
-#: actions/facebookinvite.php:113
+#: actions/replies.php:203
 #, php-format
-msgid "Friends already using %s:"
-msgstr "Friends already using %s:"
+msgid ""
+"You can engage other users in a conversation, subscribe to more people or "
+"[join groups](%%action.groups%%)."
+msgstr ""
 
-#: actions/facebookinvite.php:130
+#: actions/replies.php:205
 #, php-format
-msgid "Send invitations"
-msgstr "Send invitations"
-
-#: actions/facebookremove.php:56
-msgid "Couldn't remove Facebook user."
-msgstr "Couldn't remove Facebook user."
-
-#: actions/facebooksettings.php:65
-msgid "There was a problem saving your sync preferences!"
-msgstr "There was a problem saving your sync preferences!"
+msgid ""
+"You can try to [nudge %s](../%s) or [post something to his or her attention]"
+"(%%%%action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
 
-#: actions/facebooksettings.php:67
-msgid "Sync preferences saved."
-msgstr "Sync preferences saved."
+#: actions/repliesrss.php:72
+#, fuzzy, php-format
+msgid "Replies to %1$s on %2$s!"
+msgstr "Message to %1$s on %2$s"
 
-#: actions/facebooksettings.php:90
-msgid "Automatically update my Facebook status with my notices."
-msgstr "Automatically update my Facebook status with my notices."
+#: actions/sandbox.php:65 actions/unsandbox.php:65
+#, fuzzy
+msgid "You cannot sandbox users on this site."
+msgstr "You can't send a message to this user."
 
-#: actions/facebooksettings.php:97
-msgid "Send \"@\" replies to Facebook."
-msgstr "Send \"@\" replies to Facebook."
+#: actions/sandbox.php:72
+#, fuzzy
+msgid "User is already sandboxed."
+msgstr "User is already blocked from group."
 
-#: actions/facebooksettings.php:106
-msgid "Prefix"
-msgstr "Prefix"
+#: actions/showfavorites.php:79
+#, fuzzy, php-format
+msgid "%s's favorite notices, page %d"
+msgstr "%s favourite notices, page %d"
 
-#: actions/facebooksettings.php:108
-msgid "A string to prefix notices with."
-msgstr "A string to prefix notices with."
+#: actions/showfavorites.php:132
+msgid "Could not retrieve favorite notices."
+msgstr "Could not retrieve favourite notices."
 
-#: actions/facebooksettings.php:124
+#: actions/showfavorites.php:170
 #, php-format
-msgid "If you would like %s to automatically update "
-msgstr "If you would like %s to automatically update "
+msgid "Feed for favorites of %s (RSS 1.0)"
+msgstr "Feed for friends of %s"
 
-#: actions/facebooksettings.php:147
-msgid "Sync preferences"
-msgstr "Sync preferences"
+#: actions/showfavorites.php:177
+#, php-format
+msgid "Feed for favorites of %s (RSS 2.0)"
+msgstr "Feed for friends of %s"
 
-#: actions/favor.php:94 lib/disfavorform.php:140
-msgid "Disfavor favorite"
-msgstr "Disfavor favourite"
+#: actions/showfavorites.php:184
+#, php-format
+msgid "Feed for favorites of %s (Atom)"
+msgstr "Feed for friends of %s"
 
-#: actions/favorited.php:65 lib/popularnoticesection.php:76
-#: lib/publicgroupnav.php:91
-msgid "Popular notices"
-msgstr "Popular notices"
+#: actions/showfavorites.php:205
+msgid ""
+"You haven't chosen any favorite notices yet. Click the fave button on "
+"notices you like to bookmark them for later or shed a spotlight on them."
+msgstr ""
 
-#: actions/favorited.php:67
+#: actions/showfavorites.php:207
 #, php-format
-msgid "Popular notices, page %d"
-msgstr "Popular notices, page %d"
+msgid ""
+"%s hasn't added any notices to his favorites yet. Post something interesting "
+"they would add to their favorites :)"
+msgstr ""
 
-#: actions/favorited.php:79
-msgid "The most popular notices on the site right now."
-msgstr "The most popular notices on the site right now."
+#: actions/showfavorites.php:211
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Why not [register an "
+"account](%%%%action.register%%%%) and then post something interesting they "
+"would add to their favorites :)"
+msgstr ""
 
-#: actions/featured.php:69 lib/featureduserssection.php:82
-#: lib/publicgroupnav.php:87
-msgid "Featured users"
-msgstr "Featured users"
+#: actions/showfavorites.php:242
+msgid "This is a way to share what you like."
+msgstr ""
 
-#: actions/featured.php:71
+#: actions/showgroup.php:82 lib/groupnav.php:86
 #, php-format
-msgid "Featured users, page %d"
-msgstr "Featured users, page %d"
+msgid "%s group"
+msgstr "%s group"
 
-#: actions/featured.php:99
+#: actions/showgroup.php:84
 #, php-format
-msgid "A selection of some of the great users on %s"
-msgstr "A selection of some of the great users on %s"
+msgid "%s group, page %d"
+msgstr "%s group, page %d"
 
-#: actions/finishremotesubscribe.php:188
-msgid "That user has blocked you from subscribing."
-msgstr "That user has blocked you from subscribing."
+#: actions/showgroup.php:218
+msgid "Group profile"
+msgstr "Group profile"
 
-#: actions/groupbyid.php:79
-msgid "No ID"
-msgstr "No ID"
+#: actions/showgroup.php:263 actions/tagother.php:118
+#: actions/userauthorization.php:167 lib/userprofile.php:177
+msgid "URL"
+msgstr "URL"
 
-#: actions/grouplogo.php:138 actions/grouplogo.php:191
-msgid "Group logo"
-msgstr "Group logo"
+#: actions/showgroup.php:274 actions/tagother.php:128
+#: actions/userauthorization.php:179 lib/userprofile.php:194
+msgid "Note"
+msgstr "Note"
 
-#: actions/grouplogo.php:149
-msgid "You can upload a logo image for your group."
-msgstr "You can upload a logo image for your group."
+#: actions/showgroup.php:284 lib/groupeditform.php:184
+msgid "Aliases"
+msgstr ""
 
-#: actions/grouplogo.php:448
-msgid "Logo updated."
-msgstr "Logo updated."
+#: actions/showgroup.php:293
+msgid "Group actions"
+msgstr "Group actions"
 
-#: actions/grouplogo.php:450
-msgid "Failed updating logo."
-msgstr "Failed updating logo."
+#: actions/showgroup.php:328
+#, fuzzy, php-format
+msgid "Notice feed for %s group (RSS 1.0)"
+msgstr "Notice feed for %s group"
 
-#: actions/groupmembers.php:93 lib/groupnav.php:91
-#, php-format
-msgid "%s group members"
-msgstr "%s group members"
+#: actions/showgroup.php:334
+#, fuzzy, php-format
+msgid "Notice feed for %s group (RSS 2.0)"
+msgstr "Notice feed for %s group"
 
-#: actions/groupmembers.php:96
+#: actions/showgroup.php:340
+#, fuzzy, php-format
+msgid "Notice feed for %s group (Atom)"
+msgstr "Notice feed for %s group"
+
+#: actions/showgroup.php:345
 #, php-format
-msgid "%s group members, page %d"
-msgstr "%s group members, page %d"
+msgid "FOAF for %s group"
+msgstr "Outbox for %s"
 
-#: actions/groupmembers.php:111
-msgid "A list of the users in this group."
-msgstr "A list of the users in this group."
+#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91
+msgid "Members"
+msgstr "Members"
 
-#: actions/groups.php:62 actions/showstream.php:518 lib/publicgroupnav.php:79
-#: lib/subgroupnav.php:96
-msgid "Groups"
-msgstr "Groups"
+#: actions/showgroup.php:386 lib/profileaction.php:117
+#: lib/profileaction.php:148 lib/profileaction.php:226 lib/section.php:95
+#: lib/tagcloudsection.php:71
+msgid "(None)"
+msgstr "(None)"
 
-#: actions/groups.php:64
-#, php-format
-msgid "Groups, page %d"
-msgstr "Groups, page %d"
+#: actions/showgroup.php:392
+msgid "All members"
+msgstr "All members"
 
-#: actions/groups.php:90
-#, php-format
-msgid "%%%%site.name%%%% groups let you find and talk with "
-msgstr "%%%%site.name%%%% groups let you find and talk with "
+#: actions/showgroup.php:429 lib/profileaction.php:173
+msgid "Statistics"
+msgstr "Statistics"
 
-#: actions/groups.php:106 actions/usergroups.php:124 lib/groupeditform.php:123
-msgid "Create a new group"
-msgstr "Create a new group"
+#: actions/showgroup.php:432
+#, fuzzy
+msgid "Created"
+msgstr "Create"
 
-#: actions/groupsearch.php:57
+#: actions/showgroup.php:448
 #, php-format
 msgid ""
-"Search for groups on %%site.name%% by their name, location, or description. "
+"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. Its members share short messages about "
+"their life and interests. [Join now](%%%%action.register%%%%) to become part "
+"of this group and many more! ([Read more](%%%%doc.help%%%%))"
 msgstr ""
-"Search for groups on %%site.name%% by their name, location, or description. "
 
-#: actions/groupsearch.php:63
-msgid "Group search"
-msgstr "Group search"
+#: actions/showgroup.php:454
+#, fuzzy, php-format
+msgid ""
+"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. Its members share short messages about "
+"their life and interests. "
+msgstr ""
+"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service "
 
-#: actions/imsettings.php:70
-msgid "You can send and receive notices through "
-msgstr "You can send and receive notices through "
+#: actions/showgroup.php:482
+#, fuzzy
+msgid "Admins"
+msgstr "Admin"
 
-#: actions/imsettings.php:120
-#, php-format
-msgid "Jabber or GTalk address, "
-msgstr "Jabber or GTalk address, "
+#: actions/showmessage.php:81
+msgid "No such message."
+msgstr "No such message."
 
-#: actions/imsettings.php:147
-msgid "Send me replies through Jabber/GTalk "
-msgstr "Send me replies through Jabber/GTalk "
+#: actions/showmessage.php:98
+msgid "Only the sender and recipient may read this message."
+msgstr "Only the sender and recipient may read this message."
 
-#: actions/imsettings.php:321
+#: actions/showmessage.php:108
 #, php-format
-msgid "A confirmation code was sent "
-msgstr "A confirmation code was sent "
+msgid "Message to %1$s on %2$s"
+msgstr "Message to %1$s on %2$s"
 
-#: actions/joingroup.php:65
-msgid "You must be logged in to join a group."
-msgstr "You must be logged in to join a group."
+#: actions/showmessage.php:113
+#, php-format
+msgid "Message from %1$s on %2$s"
+msgstr "Message from %1$s on %2$s"
 
-#: actions/joingroup.php:95
-msgid "You are already a member of that group"
-msgstr "You are already a member of that group"
+#: actions/shownotice.php:90
+#, fuzzy
+msgid "Notice deleted."
+msgstr "Notice posted"
 
-#: actions/joingroup.php:128
-#, php-format
-msgid "Could not join user %s to group %s"
-msgstr "Could not join user %s to group %s"
+#: actions/showstream.php:73
+#, fuzzy, php-format
+msgid " tagged %s"
+msgstr "Notices tagged with %s"
 
-#: actions/joingroup.php:135
+#: actions/showstream.php:79
 #, php-format
-msgid "%s joined group %s"
-msgstr "%s joined group %s"
+msgid "%s, page %d"
+msgstr "%s, page %d"
 
-#: actions/leavegroup.php:60
-msgid "Inboxes must be enabled for groups to work."
-msgstr "Inboxes must be enabled for groups to work."
+#: actions/showstream.php:122
+#, fuzzy, php-format
+msgid "Notice feed for %s tagged %s (RSS 1.0)"
+msgstr "Notice feed for %s group"
 
-#: actions/leavegroup.php:65
-msgid "You must be logged in to leave a group."
-msgstr "You must be logged in to leave a group."
+#: actions/showstream.php:129
+#, fuzzy, php-format
+msgid "Notice feed for %s (RSS 1.0)"
+msgstr "Notice feed for %s"
 
-#: actions/leavegroup.php:88
-msgid "No such group."
-msgstr "No such group."
+#: actions/showstream.php:136
+#, fuzzy, php-format
+msgid "Notice feed for %s (RSS 2.0)"
+msgstr "Notice feed for %s"
 
-#: actions/leavegroup.php:95
-msgid "You are not a member of that group."
-msgstr "You are not a member of that group."
+#: actions/showstream.php:143
+#, fuzzy, php-format
+msgid "Notice feed for %s (Atom)"
+msgstr "Notice feed for %s"
 
-#: actions/leavegroup.php:100
-msgid "You may not leave a group while you are its administrator."
-msgstr "You may not leave a group while you are its administrator."
+#: actions/showstream.php:148
+#, fuzzy, php-format
+msgid "FOAF for %s"
+msgstr "Outbox for %s"
 
-#: actions/leavegroup.php:130
-msgid "Could not find membership record."
-msgstr "Could not find membership record."
+#: actions/showstream.php:191
+#, php-format
+msgid "This is the timeline for %s but %s hasn't posted anything yet."
+msgstr ""
+
+#: actions/showstream.php:196
+msgid ""
+"Seen anything interesting recently? You haven't posted any notices yet, now "
+"would be a good time to start :)"
+msgstr ""
 
-#  Thought form was incorrect
-#: actions/leavegroup.php:138
+#: actions/showstream.php:198
 #, php-format
-msgid "Could not remove user %s to group %s"
-msgstr "Could not remove user %s to group %s"
+msgid ""
+"You can try to nudge %s or [post something to his or her attention](%%%%"
+"action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
 
-#: actions/leavegroup.php:145
+#: actions/showstream.php:234
 #, php-format
-msgid "%s left group %s"
-msgstr "%s left group %s"
+msgid ""
+"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. [Join now](%%%%action.register%%%%) to "
+"follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
+msgstr ""
 
-#: actions/login.php:225 lib/facebookaction.php:304
-msgid "Login to site"
-msgstr "Login to site"
+#: actions/showstream.php:239
+#, fuzzy, php-format
+msgid ""
+"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. "
+msgstr ""
+"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service "
 
-#: actions/microsummary.php:69
-msgid "No current status"
-msgstr "No current status"
+#: actions/silence.php:65 actions/unsilence.php:65
+#, fuzzy
+msgid "You cannot silence users on this site."
+msgstr "You can't send a message to this user."
 
-#: actions/newgroup.php:53
-msgid "New group"
-msgstr "New group"
+#: actions/silence.php:72
+#, fuzzy
+msgid "User is already silenced."
+msgstr "User is already blocked from group."
 
-#: actions/newgroup.php:115
-msgid "Use this form to create a new group."
-msgstr "Use this form to create a new group."
+#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:299
+#, fuzzy
+msgid "Site"
+msgstr "Invite"
 
-#: actions/newgroup.php:177
-msgid "Could not create group."
-msgstr "Could not create group."
+#: actions/siteadminpanel.php:69
+msgid "Basic settings for this StatusNet site."
+msgstr ""
 
-#: actions/newgroup.php:191
-msgid "Could not set group membership."
-msgstr "Could not set group membership."
+#: actions/siteadminpanel.php:147
+msgid "Site name must have non-zero length."
+msgstr ""
 
-#: actions/newmessage.php:119 actions/newnotice.php:132
-msgid "That's too long. "
-msgstr "That's too long. "
+#: actions/siteadminpanel.php:155
+#, fuzzy
+msgid "You must have a valid contact email address"
+msgstr "Not a valid e-mail address."
 
-#: actions/newmessage.php:134
-msgid "Don't send a message to yourself; "
-msgstr "Don't send a message to yourself; "
+#: actions/siteadminpanel.php:173
+#, php-format
+msgid "Unknown language \"%s\""
+msgstr ""
 
-#: actions/newnotice.php:166
-msgid "Notice posted"
-msgstr "Notice posted"
+#: actions/siteadminpanel.php:180
+msgid "Invalid snapshot report URL."
+msgstr ""
 
-#: actions/newnotice.php:200 classes/Channel.php:163
-msgid "Ajax Error"
-msgstr "Ajax Error"
+#: actions/siteadminpanel.php:186
+msgid "Invalid snapshot run value."
+msgstr ""
 
-#: actions/nudge.php:85
-msgid ""
-"This user doesn't allow nudges or hasn't confirmed or set his email yet."
+#: actions/siteadminpanel.php:192
+msgid "Snapshot frequency must be a number."
 msgstr ""
-"This user doesn't allow nudges or hasn't confirmed or set his e-mail yet."
 
-#: actions/nudge.php:94
-msgid "Nudge sent"
-msgstr "Nudge sent"
+#: actions/siteadminpanel.php:199
+msgid "You must set an SSL sever when enabling SSL."
+msgstr ""
 
-#: actions/nudge.php:97
-msgid "Nudge sent!"
-msgstr "Nudge sent!"
+#: actions/siteadminpanel.php:204
+msgid "Invalid SSL server. Max length is 255 characters."
+msgstr ""
 
-#: actions/openidlogin.php:97
-msgid "OpenID login"
-msgstr "OpenID login"
+#: actions/siteadminpanel.php:210
+msgid "Minimum text limit is 140c."
+msgstr ""
 
-#: actions/openidsettings.php:128
-msgid "Removing your only OpenID "
-msgstr "Removing your only OpenID "
+#: actions/siteadminpanel.php:216
+msgid "Dupe limit must 1 or more seconds."
+msgstr ""
 
-#  requires full stops?
-#: actions/othersettings.php:60
-msgid "Other Settings"
-msgstr "Other Settings"
+#: actions/siteadminpanel.php:224
+#, php-format
+msgid "Locales directory not readable: %s"
+msgstr ""
 
-#: actions/othersettings.php:71
-msgid "Manage various other options."
-msgstr "Manage various other options."
+#: actions/siteadminpanel.php:275
+#, fuzzy
+msgid "Site name"
+msgstr "Site notice"
 
-#: actions/othersettings.php:93
-msgid "URL Auto-shortening"
-msgstr "URL Auto-shortening"
+#: actions/siteadminpanel.php:276
+msgid "The name of your site, like \"Yourcompany Microblog\""
+msgstr ""
 
-#: actions/othersettings.php:112
-msgid "Service"
-msgstr "Service"
+#: actions/siteadminpanel.php:279
+msgid "Brought by"
+msgstr ""
 
-#: actions/othersettings.php:113
-msgid "Automatic shortening service to use."
-msgstr "Automatic shortening service to use."
+#: actions/siteadminpanel.php:280
+msgid "Text used for credits link in footer of each page"
+msgstr ""
 
-#: actions/othersettings.php:144
-msgid "URL shortening service is too long (max 50 chars)."
-msgstr "URL shortening service is too long (max 50 chars)."
+#: actions/siteadminpanel.php:283
+msgid "Brought by URL"
+msgstr ""
 
-#: actions/passwordsettings.php:69
-msgid "Change your password."
-msgstr "Change your password."
+#: actions/siteadminpanel.php:284
+msgid "URL used for credits link in footer of each page"
+msgstr ""
 
-#: actions/passwordsettings.php:89
-msgid "Password change"
-msgstr "Password change"
+#: actions/siteadminpanel.php:288
+#, fuzzy
+msgid "contact email address for your site"
+msgstr "New e-mail address for posting to %s"
 
-#: actions/peopletag.php:35
-#, php-format
-msgid "Not a valid people tag: %s"
-msgstr "Not a valid people tag: %s"
+#: actions/siteadminpanel.php:302
+msgid "Default timezone"
+msgstr ""
 
-#: actions/peopletag.php:47
-#, php-format
-msgid "Users self-tagged with %s - page %d"
-msgstr "Users self-tagged with %s - page %d"
+#: actions/siteadminpanel.php:303
+msgid "Default timezone for the site; usually UTC."
+msgstr ""
 
-#: actions/peopletag.php:91
-#, php-format
-msgid "These are users who have tagged themselves \"%s\" "
-msgstr "These are users who have tagged themselves \"%s\" "
+#: actions/siteadminpanel.php:310
+#, fuzzy
+msgid "Default site language"
+msgstr "Preferred language"
 
-#: actions/profilesettings.php:91
-msgid "Profile information"
-msgstr "Profile information"
+#: actions/siteadminpanel.php:316
+msgid "Path to locales"
+msgstr ""
 
-#: actions/profilesettings.php:124
-msgid ""
-"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
+#: actions/siteadminpanel.php:316
+msgid "Directory path to locales"
 msgstr ""
-"Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
-"separated"
 
-#: actions/profilesettings.php:144
-msgid "Automatically subscribe to whoever "
-msgstr "Automatically subscribe to whoever "
+#: actions/siteadminpanel.php:320
+#, fuzzy
+msgid "Server"
+msgstr "Recover"
 
-#: actions/profilesettings.php:229 actions/tagother.php:176
-#, php-format
-msgid "Invalid tag: \"%s\""
-msgstr "Invalid tag: \"%s\""
+#: actions/siteadminpanel.php:320
+msgid "Site's server hostname."
+msgstr ""
 
-#: actions/profilesettings.php:311
-msgid "Couldn't save tags."
-msgstr "Couldn't save tags."
+#: actions/siteadminpanel.php:324
+msgid "Path"
+msgstr ""
 
-#: actions/public.php:107
-#, php-format
-msgid "Public timeline, page %d"
-msgstr "Public timeline, page %d"
+#: actions/siteadminpanel.php:324
+#, fuzzy
+msgid "Site path"
+msgstr "Site notice"
 
-#: actions/public.php:173
-msgid "Could not retrieve public stream."
-msgstr "Could not retrieve public stream."
+#: actions/siteadminpanel.php:328
+msgid "Fancy URLs"
+msgstr ""
 
-#: actions/public.php:220
-#, php-format
-msgid ""
-"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
-"blogging) service "
+#: actions/siteadminpanel.php:330
+msgid "Use fancy (more readable and memorable) URLs?"
 msgstr ""
-"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki"
-"/Micro-blogging) service "
 
-#: actions/publictagcloud.php:57
-msgid "Public tag cloud"
-msgstr "Public tag cloud"
+#: actions/siteadminpanel.php:334
+#, fuzzy
+msgid "Private"
+msgstr "Privacy"
 
-#: actions/publictagcloud.php:63
-#, php-format
-msgid "These are most popular recent tags on %s "
-msgstr "These are most popular recent tags on %s "
+#: actions/siteadminpanel.php:336
+msgid "Prohibit anonymous users (not logged in) from viewing site?"
+msgstr ""
 
-#: actions/publictagcloud.php:119
-msgid "Tag cloud"
-msgstr "Tag cloud"
+#: actions/siteadminpanel.php:340
+#, fuzzy
+msgid "Invite only"
+msgstr "Invite"
 
-#: actions/register.php:139 actions/register.php:349
-msgid "Sorry, only invited people can register."
-msgstr "Sorry, only invited people can register."
+#: actions/siteadminpanel.php:342
+msgid "Make registration invitation only."
+msgstr ""
 
-#: actions/register.php:149
-msgid "You can't register if you don't "
-msgstr "You can't register if you don't "
+#: actions/siteadminpanel.php:346 actions/useradminpanel.php:171
+#, fuzzy
+msgid "Closed"
+msgstr "Block"
 
-#: actions/register.php:286
-msgid "With this form you can create "
-msgstr "With this form you can create "
+#: actions/siteadminpanel.php:348
+msgid "Disable new registrations."
+msgstr ""
 
-#: actions/register.php:368
-msgid "1-64 lowercase letters or numbers, "
-msgstr "1-64 lowercase letters or numbers, "
+#: actions/siteadminpanel.php:353
+msgid "Randomly during Web hit"
+msgstr ""
 
-#: actions/register.php:382 actions/register.php:386
-msgid "Used only for updates, announcements, "
-msgstr "Used only for updates, announcements, "
+#: actions/siteadminpanel.php:354
+msgid "In a scheduled job"
+msgstr ""
 
-#: actions/register.php:398
-msgid "URL of your homepage, blog, "
-msgstr "URL of your homepage, blog, "
+#: actions/siteadminpanel.php:355 actions/siteadminpanel.php:380
+#, fuzzy
+msgid "Never"
+msgstr "Recover"
 
-#: actions/register.php:404
-msgid "Describe yourself and your "
-msgstr "Describe yourself and your "
+#: actions/siteadminpanel.php:357
+msgid "Data snapshots"
+msgstr ""
 
-#: actions/register.php:410
-msgid "Where you are, like \"City, "
-msgstr "Where you are, like \"City, "
+#: actions/siteadminpanel.php:358
+msgid "When to send statistical data to status.net servers"
+msgstr ""
 
-#: actions/register.php:432
-msgid " except this private data: password, "
-msgstr " except this private data: password, "
+#: actions/siteadminpanel.php:364
+msgid "Frequency"
+msgstr ""
 
-#: actions/register.php:471
-#, php-format
-msgid "Congratulations, %s! And welcome to %%%%site.name%%%%. "
-msgstr "Congratulations, %s! And welcome to %%%%site.name%%%%. "
+#: actions/siteadminpanel.php:365
+msgid "Snapshots will be sent once every N Web hits"
+msgstr ""
 
-#: actions/register.php:495
-msgid "(You should receive a message by email "
-msgstr "(You should receive a message by e-mail "
+#: actions/siteadminpanel.php:372
+msgid "Report URL"
+msgstr ""
 
-#: actions/remotesubscribe.php:166 actions/remotesubscribe.php:171
-msgid "That's a local profile! Login to subscribe."
-msgstr "That's a local profile! Login to subscribe."
+#: actions/siteadminpanel.php:373
+msgid "Snapshots will be sent to this URL"
+msgstr ""
 
-#: actions/replies.php:118
-#, php-format
-msgid "Replies to %s, page %d"
-msgstr "Replies to %s, page %d"
+#: actions/siteadminpanel.php:381
+#, fuzzy
+msgid "Sometimes"
+msgstr "Notices"
 
-#: actions/showfavorites.php:79
-#, php-format
-msgid "%s favorite notices, page %d"
-msgstr "%s favourite notices, page %d"
+#: actions/siteadminpanel.php:382
+msgid "Always"
+msgstr ""
 
-#: actions/showgroup.php:77 lib/groupnav.php:85
-#, php-format
-msgid "%s group"
-msgstr "%s group"
+#: actions/siteadminpanel.php:384
+msgid "Use SSL"
+msgstr ""
 
-#: actions/showgroup.php:79
-#, php-format
-msgid "%s group, page %d"
-msgstr "%s group, page %d"
+#: actions/siteadminpanel.php:385
+msgid "When to use SSL"
+msgstr ""
 
-#: actions/showgroup.php:206
-msgid "Group profile"
-msgstr "Group profile"
+#: actions/siteadminpanel.php:391
+msgid "SSL Server"
+msgstr ""
 
-#: actions/showgroup.php:251 actions/showstream.php:278
-#: actions/tagother.php:119 lib/grouplist.php:134 lib/profilelist.php:133
-msgid "URL"
-msgstr "URL"
+#: actions/siteadminpanel.php:392
+msgid "Server to direct SSL requests to"
+msgstr ""
 
-#: actions/showgroup.php:262 actions/showstream.php:289
-#: actions/tagother.php:129 lib/grouplist.php:145 lib/profilelist.php:144
-msgid "Note"
-msgstr "Note"
+#: actions/siteadminpanel.php:396
+msgid "Text limit"
+msgstr ""
 
-#: actions/showgroup.php:270
-msgid "Group actions"
-msgstr "Group actions"
+#: actions/siteadminpanel.php:396
+msgid "Maximum number of characters for notices."
+msgstr ""
 
-#: actions/showgroup.php:323
-#, php-format
-msgid "Notice feed for %s group"
-msgstr "Notice feed for %s group"
+#: actions/siteadminpanel.php:400
+msgid "Dupe limit"
+msgstr ""
 
-#: actions/showgroup.php:357 lib/groupnav.php:90
-msgid "Members"
-msgstr "Members"
+#: actions/siteadminpanel.php:400
+msgid "How long users must wait (in seconds) to post the same thing again."
+msgstr ""
 
-#: actions/showgroup.php:363 actions/showstream.php:413
-#: actions/showstream.php:442 actions/showstream.php:524 lib/section.php:95
-#: lib/tagcloudsection.php:71
-msgid "(None)"
-msgstr "(None)"
+#: actions/siteadminpanel.php:414 actions/useradminpanel.php:226
+#, fuzzy
+msgid "Save site settings"
+msgstr "Avatar settings"
 
-#: actions/showgroup.php:370
-msgid "All members"
-msgstr "All members"
+#: actions/smssettings.php:58
+msgid "SMS Settings"
+msgstr "SMS Settings"
 
-#: actions/showgroup.php:378
+#: actions/smssettings.php:69
 #, php-format
-msgid ""
-"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
-"wikipedia.org/wiki/Micro-blogging) service "
-msgstr ""
-"**%s** is a user group on %%%%site.name%%%%, a [micro-"
-"blogging](http://en.wikipedia.org/wiki/Micro-blogging) service "
+msgid "You can receive SMS messages through email from %%site.name%%."
+msgstr "You can receive SMS messages through e-mail from %%site.name%%."
 
-#: actions/showmessage.php:98
-msgid "Only the sender and recipient "
-msgstr "Only the sender and recipient "
+#: actions/smssettings.php:91
+#, fuzzy
+msgid "SMS is not available."
+msgstr "This page is not available in a "
 
-#: actions/showstream.php:73
-#, php-format
-msgid "%s, page %d"
-msgstr "%s, page %d"
+#: actions/smssettings.php:112
+msgid "Current confirmed SMS-enabled phone number."
+msgstr "Current confirmed SMS-enabled phone number."
 
-#: actions/showstream.php:143
-msgid "'s profile"
-msgstr "'s profile"
+#: actions/smssettings.php:123
+msgid "Awaiting confirmation on this phone number."
+msgstr "Awaiting confirmation on this phone number."
 
-#: actions/showstream.php:236 actions/tagother.php:77
-msgid "User profile"
-msgstr "User profile"
+#: actions/smssettings.php:130
+msgid "Confirmation code"
+msgstr "Confirmation code"
 
-#: actions/showstream.php:240 actions/tagother.php:81
-msgid "Photo"
-msgstr "Photo"
+#: actions/smssettings.php:131
+msgid "Enter the code you received on your phone."
+msgstr "Enter the code you received on your phone."
 
-#: actions/showstream.php:317
-msgid "User actions"
-msgstr "User actions"
+#: actions/smssettings.php:138
+msgid "SMS Phone number"
+msgstr "SMS Phone number"
 
-#: actions/showstream.php:342
-msgid "Send a direct message to this user"
-msgstr "Send a direct message to this user"
+#: actions/smssettings.php:140
+msgid "Phone number, no punctuation or spaces, with area code"
+msgstr "Phone number, no punctuation or spaces, with area code"
 
-#: actions/showstream.php:343
-msgid "Message"
-msgstr "Message"
+#: actions/smssettings.php:174
+#, fuzzy
+msgid ""
+"Send me notices through SMS; I understand I may incur exorbitant charges "
+"from my carrier."
+msgstr ""
+"Send me notices through SMS; I understand I may incur exorbitant charges "
+"from my carrier."
 
-#: actions/showstream.php:451
-msgid "All subscribers"
-msgstr "All subscribers"
+#: actions/smssettings.php:306
+msgid "No phone number."
+msgstr "No phone number."
 
-#: actions/showstream.php:533
-msgid "All groups"
-msgstr "All groups"
+#: actions/smssettings.php:311
+#, fuzzy
+msgid "No carrier selected."
+msgstr "No carrier selected."
 
-#: actions/showstream.php:542
-#, php-format
+#: actions/smssettings.php:318
+msgid "That is already your phone number."
+msgstr "That is already your phone number."
+
+#: actions/smssettings.php:321
+msgid "That phone number already belongs to another user."
+msgstr "That phone number already belongs to another user."
+
+#: actions/smssettings.php:347
+#, fuzzy
 msgid ""
-"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
-"wikipedia.org/wiki/Micro-blogging) service "
+"A confirmation code was sent to the phone number you added. Check your phone "
+"for the code and instructions on how to use it."
 msgstr ""
-"**%s** has an account on %%%%site.name%%%%, a [micro-"
-"blogging](http://en.wikipedia.org/wiki/Micro-blogging) service "
-
-#: actions/smssettings.php:128
-msgid "Phone number, no punctuation or spaces, "
-msgstr "Phone number, no punctuation or spaces, "
+"A confirmation code was sent to the phone number you added. Check your inbox "
+"(and spam box!) for the code and instructions on how to use it."
 
-#: actions/smssettings.php:162
-msgid "Send me notices through SMS; "
-msgstr "Send me notices through SMS; "
+#: actions/smssettings.php:374
+msgid "That is the wrong confirmation number."
+msgstr "That is the wrong confirmation number."
 
-#: actions/smssettings.php:335
-msgid "A confirmation code was sent to the phone number you added. "
-msgstr "A confirmation code was sent to the phone number you added. "
+#: actions/smssettings.php:405
+msgid "That is not your phone number."
+msgstr "That is not your phone number."
 
-# Carrier?
-#: actions/smssettings.php:453
+#: actions/smssettings.php:465
 #, fuzzy
 msgid "Mobile carrier"
 msgstr "Mobile carrier"
 
+#: actions/smssettings.php:469
+#, fuzzy
+msgid "Select a carrier"
+msgstr "Select a carrier"
+
+#: actions/smssettings.php:476
+#, fuzzy, php-format
+msgid ""
+"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
+"email but isn't listed here, send email to let us know at %s."
+msgstr ""
+"Mobile carrier for your phone. If you know a carrier that accepts SMS over e-"
+"mail but isn't listed here, send e-mail to let us know at %s."
+
+#: actions/smssettings.php:498
+msgid "No code entered"
+msgstr "No code entered"
+
 #: actions/subedit.php:70
 msgid "You are not subscribed to that profile."
 msgstr "You are not subscribed to that profile."
@@ -4282,13 +3476,31 @@ msgid "%s subscribers, page %d"
 msgstr "%s subscribers, page %d"
 
 #: actions/subscribers.php:63
-msgid "These are the people who listen to "
-msgstr "These are the people who listen to "
+msgid "These are the people who listen to your notices."
+msgstr "These are the people who listen to your notices."
 
 #: actions/subscribers.php:67
 #, php-format
-msgid "These are the people who "
-msgstr "These are the people who "
+msgid "These are the people who listen to %s's notices."
+msgstr "These are the people who listen to %s's notices."
+
+#: actions/subscribers.php:108
+msgid ""
+"You have no subscribers. Try subscribing to people you know and they might "
+"return the favor"
+msgstr ""
+
+#: actions/subscribers.php:110
+#, php-format
+msgid "%s has no subscribers. Want to be the first?"
+msgstr ""
+
+#: actions/subscribers.php:114
+#, php-format
+msgid ""
+"%s has no subscribers. Why not [register an account](%%%%action.register%%%"
+"%) and be the first?"
+msgstr ""
 
 #: actions/subscriptions.php:52
 #, php-format
@@ -4301,27 +3513,36 @@ msgid "%s subscriptions, page %d"
 msgstr "%s subscriptions, page %d"
 
 #: actions/subscriptions.php:65
-msgid "These are the people whose notices "
-msgstr "These are the people whose notices "
+msgid "These are the people whose notices you listen to."
+msgstr "These are the people whose notices you listen to."
 
 #: actions/subscriptions.php:69
 #, php-format
-msgid "These are the people whose "
-msgstr "These are the people whose "
+msgid "These are the people whose notices %s listens to."
+msgstr "These are the people whose notices %s listens to."
 
-#: actions/subscriptions.php:122
+#: actions/subscriptions.php:121
+#, php-format
+msgid ""
+"You're not listening to anyone's notices right now, try subscribing to "
+"people you know. Try [people search](%%action.peoplesearch%%), look for "
+"members in groups you're interested in and in our [featured users](%%action."
+"featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can "
+"automatically subscribe to people you already follow there."
+msgstr ""
+
+#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#, fuzzy, php-format
+msgid "%s is not listening to anyone."
+msgstr "%1$s is now listening to "
+
+#: actions/subscriptions.php:194
 msgid "Jabber"
 msgstr "Jabber"
 
-#: actions/tag.php:43
-#, php-format
-msgid "Notices tagged with %s, page %d"
-msgstr "Notices tagged with %s, page %d"
-
-#: actions/tag.php:66
-#, php-format
-msgid "Messages tagged \"%s\", most recent first"
-msgstr "Messages tagged \"%s\", most recent first"
+#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
+msgid "SMS"
+msgstr "SMS"
 
 #: actions/tagother.php:33
 msgid "Not logged in"
@@ -4336,11 +3557,19 @@ msgstr "No id argument."
 msgid "Tag %s"
 msgstr "Tag %s"
 
+#: actions/tagother.php:77 lib/userprofile.php:75
+msgid "User profile"
+msgstr "User profile"
+
+#: actions/tagother.php:81 lib/userprofile.php:102
+msgid "Photo"
+msgstr "Photo"
+
 #: actions/tagother.php:141
 msgid "Tag user"
 msgstr "Tag user"
 
-#: actions/tagother.php:149
+#: actions/tagother.php:151
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
@@ -4348,236 +3577,907 @@ msgstr ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
 
-#: actions/tagother.php:164
-msgid "There was a problem with your session token."
-msgstr "There was a problem with your session token."
-
-#: actions/tagother.php:191
+#: actions/tagother.php:193
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 
-#: actions/tagother.php:198
+#: actions/tagother.php:200
 msgid "Could not save tags."
 msgstr "Could not save tags."
 
-#: actions/tagother.php:233
+#: actions/tagother.php:236
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr "Use this form to add tags to your subscribers or subscriptions."
 
-#: actions/tagrss.php:35
-msgid "No such tag."
-msgstr "No such tag."
-
-#: actions/tagrss.php:66
+#: actions/tag.php:68
 #, php-format
-msgid "Microblog tagged with %s"
-msgstr "Microblog tagged with %s"
-
-#: actions/twitapiblocks.php:47
-msgid "Block user failed."
-msgstr "Block user failed."
-
-#: actions/twitapiblocks.php:69
-msgid "Unblock user failed."
-msgstr "Unblock user failed."
+msgid "Notices tagged with %s, page %d"
+msgstr "Notices tagged with %s, page %d"
 
-#: actions/twitapiusers.php:48
-msgid "Not found."
-msgstr "Not found."
+#: actions/tag.php:86
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 1.0)"
+msgstr "Notice feed for %s"
 
-#: actions/twittersettings.php:71
-msgid "Add your Twitter account to automatically send "
-msgstr "Add your Twitter account to automatically send "
+#: actions/tag.php:92
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 2.0)"
+msgstr "Notice feed for %s"
 
-#: actions/twittersettings.php:119
-msgid "Twitter user name"
-msgstr "Twitter user name"
+#: actions/tag.php:98
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (Atom)"
+msgstr "Notice feed for %s"
 
-#: actions/twittersettings.php:126
-msgid "Twitter password"
-msgstr "Twitter password"
+#: actions/tagrss.php:35
+msgid "No such tag."
+msgstr "No such tag."
 
-#: actions/twittersettings.php:228
-msgid "Twitter Friends"
-msgstr "Twitter Friends"
+#: actions/twitapitrends.php:87
+msgid "API method under construction."
+msgstr "API method under construction."
 
-#: actions/twittersettings.php:327
-msgid "Username must have only numbers, "
-msgstr "Username must have only numbers, "
+#: actions/unblock.php:59
+#, fuzzy
+msgid "You haven't blocked that user."
+msgstr "You have already blocked this user."
 
-#: actions/twittersettings.php:341
-#, php-format
-msgid "Unable to retrieve account information "
-msgstr "Unable to retrieve account information "
+#: actions/unsandbox.php:72
+#, fuzzy
+msgid "User is not sandboxed."
+msgstr "User has blocked you."
 
-#: actions/unblock.php:108
-msgid "Error removing the block."
-msgstr "Error removing the block."
+#: actions/unsilence.php:72
+#, fuzzy
+msgid "User is not silenced."
+msgstr "User has no profile."
 
-#: actions/unsubscribe.php:50
+#: actions/unsubscribe.php:77
 msgid "No profile id in request."
 msgstr "No profile id in request."
 
-#: actions/unsubscribe.php:57
+#: actions/unsubscribe.php:84
 msgid "No profile with that id."
 msgstr "No profile with that id."
 
-#: actions/unsubscribe.php:71
+#: actions/unsubscribe.php:98
 msgid "Unsubscribed"
 msgstr "Unsubscribed"
 
-#: actions/usergroups.php:63
+#: actions/updateprofile.php:62 actions/userauthorization.php:330
 #, php-format
-msgid "%s groups"
-msgstr "%s groups"
+msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
+msgstr ""
+
+#: actions/useradminpanel.php:58 lib/personalgroupnav.php:115
+msgid "User"
+msgstr "User"
+
+#: actions/useradminpanel.php:69
+msgid "User settings for this StatusNet site."
+msgstr ""
+
+#: actions/useradminpanel.php:173
+msgid "Is registration on this site prohibited?"
+msgstr ""
+
+#: actions/useradminpanel.php:178
+#, fuzzy
+msgid "Invite-only"
+msgstr "Invite"
+
+#: actions/useradminpanel.php:180
+msgid "Is registration on this site only open to invited users?"
+msgstr ""
+
+#: actions/userauthorization.php:105
+msgid "Authorize subscription"
+msgstr "Authorise subscription"
+
+#: actions/userauthorization.php:110
+#, fuzzy
+msgid ""
+"Please check these details to make sure that you want to subscribe to this "
+"user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
+"click “Reject”."
+msgstr ""
+"Please check these details to make sure that you want to subscribe to this "
+"user's notices. If you didn't just ask to subscribe to someone's notices, "
+"click \"Cancel\"."
+
+#: actions/userauthorization.php:188
+#, fuzzy
+msgid "License"
+msgstr "licence."
 
-#: actions/usergroups.php:65
+#: actions/userauthorization.php:209
+msgid "Accept"
+msgstr "Accept"
+
+#: actions/userauthorization.php:210 lib/subscribeform.php:115
+#: lib/subscribeform.php:139
+msgid "Subscribe to this user"
+msgstr "Subscribe to this user"
+
+#: actions/userauthorization.php:211
+msgid "Reject"
+msgstr "Reject"
+
+#: actions/userauthorization.php:212
+#, fuzzy
+msgid "Reject this subscription"
+msgstr "%s subscriptions"
+
+#: actions/userauthorization.php:225
+msgid "No authorization request!"
+msgstr "No authorisation request!"
+
+#: actions/userauthorization.php:247
+msgid "Subscription authorized"
+msgstr "Subscription authorised"
+
+#: actions/userauthorization.php:249
+#, fuzzy
+msgid ""
+"The subscription has been authorized, but no callback URL was passed. Check "
+"with the site’s instructions for details on how to authorize the "
+"subscription. Your subscription token is:"
+msgstr ""
+"The subscription has been authorised, but no callback URL was passed. Check "
+"with the site's instructions for details on how to authorise the "
+"subscription. Your subscription token is:"
+
+#: actions/userauthorization.php:259
+msgid "Subscription rejected"
+msgstr "Subscription rejected"
+
+#: actions/userauthorization.php:261
+#, fuzzy
+msgid ""
+"The subscription has been rejected, but no callback URL was passed. Check "
+"with the site’s instructions for details on how to fully reject the "
+"subscription."
+msgstr ""
+"The subscription has been rejected, but no callback URL was passed. Check "
+"with the site's instructions for details on how to fully reject the "
+"subscription."
+
+#: actions/userauthorization.php:296
+#, php-format
+msgid "Listener URI ‘%s’ not found here"
+msgstr ""
+
+#: actions/userauthorization.php:301
+#, php-format
+msgid "Listenee URI ‘%s’ is too long."
+msgstr ""
+
+#: actions/userauthorization.php:307
+#, php-format
+msgid "Listenee URI ‘%s’ is a local user."
+msgstr ""
+
+#: actions/userauthorization.php:322
+#, php-format
+msgid "Profile URL ‘%s’ is for a local user."
+msgstr ""
+
+#: actions/userauthorization.php:338
+#, php-format
+msgid "Avatar URL ‘%s’ is not valid."
+msgstr ""
+
+#: actions/userauthorization.php:343
+#, fuzzy, php-format
+msgid "Can’t read avatar URL ‘%s’."
+msgstr "Can't read avatar URL '%s'"
+
+#: actions/userauthorization.php:348
+#, fuzzy, php-format
+msgid "Wrong image type for avatar URL ‘%s’."
+msgstr "Wrong image type for '%s'"
+
+#: actions/userbyid.php:70
+msgid "No id."
+msgstr "No id."
+
+#: actions/userdesignsettings.php:76 lib/designsettings.php:65
+#, fuzzy
+msgid "Profile design"
+msgstr "Profile settings"
+
+#: actions/userdesignsettings.php:87 lib/designsettings.php:76
+msgid ""
+"Customize the way your profile looks with a background image and a colour "
+"palette of your choice."
+msgstr ""
+
+#: actions/userdesignsettings.php:282
+msgid "Enjoy your hotdog!"
+msgstr ""
+
+#: actions/usergroups.php:64
 #, php-format
 msgid "%s groups, page %d"
 msgstr "%s groups, page %d"
 
-#: classes/Notice.php:104
+#: actions/usergroups.php:130
+#, fuzzy
+msgid "Search for more groups"
+msgstr "Search for people or text"
+
+#: actions/usergroups.php:153
+#, fuzzy, php-format
+msgid "%s is not a member of any group."
+msgstr "You are not a member of that group."
+
+#: actions/usergroups.php:158
+#, php-format
+msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
+msgstr ""
+
+#: classes/File.php:137
+#, 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
+#, php-format
+msgid "A file this large would exceed your user quota of %d bytes."
+msgstr ""
+
+#: classes/File.php:154
+#, php-format
+msgid "A file this large would exceed your monthly quota of %d bytes."
+msgstr ""
+
+#: classes/Message.php:45
+#, fuzzy
+msgid "You are banned from sending direct messages."
+msgstr "Error sending direct message."
+
+#: classes/Message.php:61
+msgid "Could not insert message."
+msgstr "Could not insert message."
+
+#: classes/Message.php:71
+msgid "Could not update message with new URI."
+msgstr "Could not update message with new URI."
+
+#: classes/Notice.php:164
+#, php-format
+msgid "DB error inserting hashtag: %s"
+msgstr "DB error inserting hashtag: %s"
+
+#: classes/Notice.php:179
+#, fuzzy
+msgid "Problem saving notice. Too long."
+msgstr "Problem saving notice."
+
+#: classes/Notice.php:183
 msgid "Problem saving notice. Unknown user."
 msgstr "Problem saving notice. Unknown user."
 
-#: classes/Notice.php:109
+#: classes/Notice.php:188
 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:116
+#: classes/Notice.php:194
+#, fuzzy
+msgid ""
+"Too many duplicate messages too quickly; 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:200
 msgid "You are banned from posting notices on this site."
 msgstr "You are banned from posting notices on this site."
 
+#: classes/Notice.php:265 classes/Notice.php:290
+msgid "Problem saving notice."
+msgstr "Problem saving notice."
+
+#: classes/Notice.php:1117
+#, php-format
+msgid "DB error inserting reply: %s"
+msgstr "DB error inserting reply: %s"
+
+#: classes/User_group.php:380
+msgid "Could not create group."
+msgstr "Could not create group."
+
+#: classes/User_group.php:409
+msgid "Could not set group membership."
+msgstr "Could not set group membership."
+
+#: classes/User.php:347
+#, fuzzy, php-format
+msgid "Welcome to %1$s, @%2$s!"
+msgstr "Message to %1$s on %2$s"
+
+#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109
+msgid "Profile"
+msgstr "Profile"
+
 #: lib/accountsettingsaction.php:108
+msgid "Change your profile settings"
+msgstr "Change your profile settings"
+
+#: lib/accountsettingsaction.php:112
 msgid "Upload an avatar"
 msgstr "Upload an avatar"
 
-#: lib/accountsettingsaction.php:119
+#: lib/accountsettingsaction.php:116
+msgid "Change your password"
+msgstr "Change your password"
+
+#: lib/accountsettingsaction.php:120
+msgid "Change email handling"
+msgstr "Change e-mail handling"
+
+#: lib/accountsettingsaction.php:124
+#, fuzzy
+msgid "Design your profile"
+msgstr "User profile"
+
+#: lib/accountsettingsaction.php:128
 msgid "Other"
 msgstr "Other"
 
-#: lib/accountsettingsaction.php:120
+#: lib/accountsettingsaction.php:128
 msgid "Other options"
 msgstr "Other options"
 
-#: lib/action.php:130
+#: lib/action.php:144
 #, php-format
 msgid "%s - %s"
 msgstr "%s - %s"
 
-#: lib/action.php:145
+#: lib/action.php:159
 msgid "Untitled page"
 msgstr "Untitled page"
 
-#: lib/action.php:316
+#: lib/action.php:424
 msgid "Primary site navigation"
 msgstr "Primary site navigation"
 
-#: lib/action.php:322
+#: lib/action.php:430
+msgid "Home"
+msgstr "Home"
+
+#: lib/action.php:430
 msgid "Personal profile and friends timeline"
 msgstr "Personal profile and friends timeline"
 
-#: lib/action.php:325
-msgid "Search for people or text"
-msgstr "Search for people or text"
-
-#: lib/action.php:328
+#: lib/action.php:432
 msgid "Account"
 msgstr "Account"
 
-#: lib/action.php:328
+#: lib/action.php:432
 msgid "Change your email, avatar, password, profile"
 msgstr "Change your e-mail, avatar, password, profile"
 
-#: lib/action.php:330
-msgid "Connect to IM, SMS, Twitter"
-msgstr "Connect to IM, SMS, Twitter"
+#: lib/action.php:435
+msgid "Connect"
+msgstr "Connect"
+
+#: lib/action.php:435
+#, fuzzy
+msgid "Connect to services"
+msgstr "Could not redirect to server: %s"
+
+#: lib/action.php:439
+#, fuzzy
+msgid "Change site configuration"
+msgstr "Primary site navigation"
+
+#: lib/action.php:443 lib/subgroupnav.php:105
+msgid "Invite"
+msgstr "Invite"
+
+#: lib/action.php:444 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"
+
+#: lib/action.php:449
+msgid "Logout"
+msgstr "Logout"
 
-#: lib/action.php:332
+#: lib/action.php:449
 msgid "Logout from the site"
 msgstr "Logout from the site"
 
-#: lib/action.php:335
-msgid "Login to the site"
-msgstr "Login to the site"
-
-#: lib/action.php:338
+#: lib/action.php:454
 msgid "Create an account"
 msgstr "Create an account"
 
-#: lib/action.php:341
-msgid "Login with OpenID"
-msgstr "Login with OpenID"
+#: lib/action.php:457
+msgid "Login to the site"
+msgstr "Login to the site"
 
-#: lib/action.php:344
+#: lib/action.php:460 lib/action.php:723
+msgid "Help"
+msgstr "Help"
+
+#: lib/action.php:460
 msgid "Help me!"
 msgstr "Help me!"
 
-#: lib/action.php:362
+#: lib/action.php:463
+msgid "Search"
+msgstr "Search"
+
+#: lib/action.php:463
+msgid "Search for people or text"
+msgstr "Search for people or text"
+
+#: lib/action.php:484
 msgid "Site notice"
 msgstr "Site notice"
 
-#: lib/action.php:417
+#: lib/action.php:550
 msgid "Local views"
 msgstr "Local views"
 
-#: lib/action.php:472
+#: lib/action.php:616
 msgid "Page notice"
 msgstr "Page notice"
 
-#: lib/action.php:562
+#: lib/action.php:718
 msgid "Secondary site navigation"
 msgstr "Secondary site navigation"
 
-#: lib/action.php:602 lib/action.php:623
+#: lib/action.php:725
+msgid "About"
+msgstr "About"
+
+#: lib/action.php:727
+msgid "FAQ"
+msgstr "F.A.Q."
+
+#: lib/action.php:731
+msgid "TOS"
+msgstr ""
+
+#: lib/action.php:734
+msgid "Privacy"
+msgstr "Privacy"
+
+#: lib/action.php:736
+msgid "Source"
+msgstr "Source"
+
+#: lib/action.php:738
+msgid "Contact"
+msgstr "Contact"
+
+#: lib/action.php:740
+#, fuzzy
+msgid "Badge"
+msgstr "Nudge"
+
+#: lib/action.php:768
 msgid "StatusNet software license"
 msgstr "StatusNet software licence"
 
-#: lib/action.php:630
+#: lib/action.php:771
+#, php-format
+msgid ""
+"**%%site.name%%** is a microblogging service brought to you by [%%site."
+"broughtby%%](%%site.broughtbyurl%%). "
+msgstr ""
+"**%%site.name%%** is a microblogging service brought to you by [%%site."
+"broughtby%%](%%site.broughtbyurl%%)."
+
+#: lib/action.php:773
+#, php-format
+msgid "**%%site.name%%** is a microblogging service. "
+msgstr "**%%site.name%%** is a microblogging service."
+
+#: lib/action.php:775
+#, php-format
+msgid ""
+"It runs the [StatusNet](http://status.net/) microblogging software, version %"
+"s, available under the [GNU Affero General Public License](http://www.fsf."
+"org/licensing/licenses/agpl-3.0.html)."
+msgstr ""
+"It runs the [StatusNet](http://status.net/) microblogging software, version %"
+"s, available under the [GNU Affero General Public Licence](http://www.fsf."
+"org/licensing/licenses/agpl-3.0.html)."
+
+#: lib/action.php:789
+#, fuzzy
+msgid "Site content license"
+msgstr "StatusNet software licence"
+
+#: lib/action.php:798
 msgid "All "
 msgstr "All "
 
-#: lib/action.php:635
+#: lib/action.php:803
 msgid "license."
 msgstr "licence."
 
-#: lib/blockform.php:123 lib/blockform.php:153
-msgid "Block this user"
-msgstr "Block this user"
+#: lib/action.php:1067
+msgid "Pagination"
+msgstr "Pagination"
 
-#: lib/blockform.php:153
-msgid "Block"
-msgstr "Block"
+#: lib/action.php:1076
+msgid "After"
+msgstr "After"
 
-#: lib/disfavorform.php:114 lib/disfavorform.php:140
-msgid "Disfavor this notice"
-msgstr "Disfavour this notice"
+#: lib/action.php:1084
+msgid "Before"
+msgstr "Before"
+
+#: lib/action.php:1132
+msgid "There was a problem with your session token."
+msgstr "There was a problem with your session token."
 
-#: lib/facebookaction.php:268
+#: lib/adminpanelaction.php:96
+#, fuzzy
+msgid "You cannot make changes to this site."
+msgstr "You can't send a message to this user."
+
+#: lib/adminpanelaction.php:195
+#, fuzzy
+msgid "showForm() not implemented."
+msgstr "Command not yet implemented."
+
+#: lib/adminpanelaction.php:224
+#, fuzzy
+msgid "saveSettings() not implemented."
+msgstr "Command not yet implemented."
+
+#: lib/adminpanelaction.php:247
+#, fuzzy
+msgid "Unable to delete design setting."
+msgstr "Unable to save your design settings!"
+
+#: lib/adminpanelaction.php:300
+#, fuzzy
+msgid "Basic site configuration"
+msgstr "E-mail address confirmation"
+
+#: lib/adminpanelaction.php:303
+#, fuzzy
+msgid "Design configuration"
+msgstr "SMS confirmation"
+
+#: lib/attachmentlist.php:87
+msgid "Attachments"
+msgstr ""
+
+#: lib/attachmentlist.php:265
+msgid "Author"
+msgstr ""
+
+#: lib/attachmentlist.php:278
+#, fuzzy
+msgid "Provider"
+msgstr "Profile"
+
+#: lib/attachmentnoticesection.php:67
+msgid "Notices where this attachment appears"
+msgstr ""
+
+#: lib/attachmenttagcloudsection.php:48
+msgid "Tags for this attachment"
+msgstr ""
+
+#: lib/channel.php:138 lib/channel.php:158
+msgid "Command results"
+msgstr "Command results"
+
+#: lib/channel.php:210
+msgid "Command complete"
+msgstr "Command complete"
+
+#: lib/channel.php:221
+msgid "Command failed"
+msgstr "Command failed"
+
+#: lib/command.php:44
+msgid "Sorry, this command is not yet implemented."
+msgstr "Sorry, this command is not yet implemented."
+
+#: lib/command.php:88
+#, fuzzy, php-format
+msgid "Could not find a user with nickname %s"
+msgstr "Couldn't update user with confirmed e-mail address."
+
+#: lib/command.php:92
+msgid "It does not make a lot of sense to nudge yourself!"
+msgstr ""
+
+#: lib/command.php:99
+#, fuzzy, php-format
+msgid "Nudge sent to %s"
+msgstr "Nudge sent"
+
+#: lib/command.php:126
+#, php-format
+msgid ""
+"Subscriptions: %1$s\n"
+"Subscribers: %2$s\n"
+"Notices: %3$s"
+msgstr ""
+
+#: lib/command.php:152 lib/command.php:400
+msgid "Notice with that id does not exist"
+msgstr ""
+
+#: lib/command.php:168 lib/command.php:416 lib/command.php:471
+msgid "User has no last notice"
+msgstr "User has no last notice"
+
+#: lib/command.php:190
+msgid "Notice marked as fave."
+msgstr "Notice marked as fave."
+
+#: lib/command.php:315
+#, php-format
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
+
+#: lib/command.php:318
+#, php-format
+msgid "Fullname: %s"
+msgstr "Fullname: %s"
+
+#: lib/command.php:321
+#, php-format
+msgid "Location: %s"
+msgstr "Location: %s"
+
+#: lib/command.php:324
+#, php-format
+msgid "Homepage: %s"
+msgstr "Homepage: %s"
+
+#: lib/command.php:327
+#, php-format
+msgid "About: %s"
+msgstr "About: %s"
+
+#: lib/command.php:358 scripts/xmppdaemon.php:321
+#, fuzzy, php-format
+msgid "Message too long - maximum is %d characters, you sent %d"
+msgstr "Message too long - maximum is 140 characters, you sent %d"
+
+#: lib/command.php:377
+msgid "Error sending direct message."
+msgstr "Error sending direct message."
+
+#: lib/command.php:431
+#, fuzzy, php-format
+msgid "Notice too long - maximum is %d characters, you sent %d"
+msgstr "Message too long - maximum is 140 characters, you sent %d"
+
+#: lib/command.php:439
+#, fuzzy, php-format
+msgid "Reply to %s sent"
+msgstr "Reply to this notice"
+
+#: lib/command.php:441
+#, fuzzy
+msgid "Error saving notice."
+msgstr "Problem saving notice."
+
+#: lib/command.php:495
+msgid "Specify the name of the user to subscribe to"
+msgstr "Specify the name of the user to subscribe to"
+
+#: lib/command.php:502
 #, php-format
-msgid "To use the %s Facebook Application you need to login "
-msgstr "To use the %s Facebook Application you need to login "
+msgid "Subscribed to %s"
+msgstr "Subscribed to %s"
+
+#: lib/command.php:523
+msgid "Specify the name of the user to unsubscribe from"
+msgstr "Specify the name of the user to unsubscribe from"
+
+#: lib/command.php:530
+#, php-format
+msgid "Unsubscribed from %s"
+msgstr "Unsubscribed from %s"
+
+#: lib/command.php:548 lib/command.php:571
+msgid "Command not yet implemented."
+msgstr "Command not yet implemented."
 
-#: lib/facebookaction.php:271
-msgid " a new account."
-msgstr " a new account."
+#: lib/command.php:551
+msgid "Notification off."
+msgstr "Notification off."
+
+#: lib/command.php:553
+msgid "Can't turn off notification."
+msgstr "Can't turn off notification."
+
+#: lib/command.php:574
+msgid "Notification on."
+msgstr "Notification on."
 
-#: lib/facebookaction.php:557 lib/mailbox.php:214 lib/noticelist.php:354
-msgid "Published"
-msgstr "Published"
+#: lib/command.php:576
+msgid "Can't turn on notification."
+msgstr "Can't turn on notification."
+
+#: lib/command.php:597
+#, fuzzy, php-format
+msgid "Could not create login token for %s"
+msgstr "Could not create OpenID from: %s"
+
+#: lib/command.php:602
+#, php-format
+msgid "This link is useable only once, and is good for only 2 minutes: %s"
+msgstr ""
+
+#: lib/command.php:618
+#, fuzzy
+msgid "You are not subscribed to anyone."
+msgstr "You are not subscribed to that profile."
+
+#: lib/command.php:620
+#, fuzzy
+msgid "You are subscribed to this person:"
+msgid_plural "You are subscribed to these people:"
+msgstr[0] "You are not subscribed to that profile."
+msgstr[1] "You are not subscribed to that profile."
+
+#: lib/command.php:640
+#, fuzzy
+msgid "No one is subscribed to you."
+msgstr "Could not subscribe other to you."
+
+#: lib/command.php:642
+#, fuzzy
+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:662
+#, fuzzy
+msgid "You are not a member of any groups."
+msgstr "You are not a member of that group."
+
+#: lib/command.php:664
+#, fuzzy
+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:678
+msgid ""
+"Commands:\n"
+"on - turn on notifications\n"
+"off - turn off notifications\n"
+"help - show this help\n"
+"follow <nickname> - subscribe to user\n"
+"groups - lists the groups you have joined\n"
+"subscriptions - list the people you follow\n"
+"subscribers - list the people that follow you\n"
+"leave <nickname> - unsubscribe from user\n"
+"d <nickname> <text> - direct message to user\n"
+"get <nickname> - get last notice from user\n"
+"whois <nickname> - get profile info on user\n"
+"fav <nickname> - add user's last notice as a 'fave'\n"
+"fav #<notice_id> - add notice with the given id as a 'fave'\n"
+"reply #<notice_id> - reply to notice with a given id\n"
+"reply <nickname> - reply to the last notice from user\n"
+"join <group> - join group\n"
+"login - Get a link to login to the web interface\n"
+"drop <group> - leave group\n"
+"stats - get your stats\n"
+"stop - same as 'off'\n"
+"quit - same as 'off'\n"
+"sub <nickname> - same as 'follow'\n"
+"unsub <nickname> - same as 'leave'\n"
+"last <nickname> - same as 'get'\n"
+"on <nickname> - not yet implemented.\n"
+"off <nickname> - not yet implemented.\n"
+"nudge <nickname> - remind a user to update.\n"
+"invite <phone number> - not yet implemented.\n"
+"track <word> - not yet implemented.\n"
+"untrack <word> - not yet implemented.\n"
+"track off - not yet implemented.\n"
+"untrack all - not yet implemented.\n"
+"tracks - not yet implemented.\n"
+"tracking - not yet implemented.\n"
+msgstr ""
+
+#: lib/common.php:199
+msgid "No configuration file found. "
+msgstr "No configuration file found"
+
+#: lib/common.php:200
+msgid "I looked for configuration files in the following places: "
+msgstr ""
+
+#: lib/common.php:201
+msgid "You may wish to run the installer to fix this."
+msgstr ""
+
+#: lib/common.php:202
+#, fuzzy
+msgid "Go to the installer."
+msgstr "Login to the site"
+
+#: lib/connectsettingsaction.php:110
+msgid "IM"
+msgstr "I.M."
+
+#: lib/connectsettingsaction.php:111
+msgid "Updates by instant messenger (IM)"
+msgstr "Updates by instant messenger (I.M.)"
+
+#: lib/connectsettingsaction.php:116
+msgid "Updates by SMS"
+msgstr "Updates by SMS"
+
+#: lib/dberroraction.php:60
+msgid "Database error"
+msgstr ""
+
+#: lib/designsettings.php:105
+#, fuzzy
+msgid "Upload file"
+msgstr "Upload"
+
+#: lib/designsettings.php:109
+msgid ""
+"You can upload your personal background image. The maximum file size is 2Mb."
+msgstr ""
+
+#: lib/designsettings.php:372
+msgid "Bad default color settings: "
+msgstr "Bad default colour settings: "
+
+#: lib/designsettings.php:468
+msgid "Design defaults restored."
+msgstr ""
+
+#: lib/disfavorform.php:114 lib/disfavorform.php:140
+msgid "Disfavor this notice"
+msgstr "Disfavour this notice"
 
 #: lib/favorform.php:114 lib/favorform.php:140
 msgid "Favor this notice"
 msgstr "Favour this notice"
 
+#: lib/favorform.php:140
+msgid "Favor"
+msgstr "Favour"
+
 #: lib/feedlist.php:64
 msgid "Export data"
 msgstr "Export data"
 
+#: lib/feed.php:85
+msgid "RSS 1.0"
+msgstr ""
+
+#: lib/feed.php:87
+msgid "RSS 2.0"
+msgstr ""
+
+#: lib/feed.php:89
+msgid "Atom"
+msgstr ""
+
+#: lib/feed.php:91
+msgid "FOAF"
+msgstr ""
+
 #: lib/galleryaction.php:121
 msgid "Filter tags"
 msgstr "Filter tags"
@@ -4586,57 +4486,83 @@ msgstr "Filter tags"
 msgid "All"
 msgstr "All"
 
-#: lib/galleryaction.php:137
+#: lib/galleryaction.php:139
+msgid "Select tag to filter"
+msgstr "Select tag to filter"
+
+#: lib/galleryaction.php:140
 msgid "Tag"
 msgstr "Tag"
 
-#: lib/galleryaction.php:138
+#: lib/galleryaction.php:141
 msgid "Choose a tag to narrow list"
 msgstr "Choose a tag to narrow list"
 
-#: lib/galleryaction.php:139
+#: lib/galleryaction.php:143
 msgid "Go"
 msgstr "Go"
 
-#: lib/groupeditform.php:148
+#: lib/groupeditform.php:163
 msgid "URL of the homepage or blog of the group or topic"
 msgstr "URL of the homepage or blog of the group or topic"
 
-#: lib/groupeditform.php:151
+#: lib/groupeditform.php:168
+msgid "Describe the group or topic"
+msgstr "Describe the group or topic"
+
+#: lib/groupeditform.php:170
+#, php-format
+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:153
-msgid "Describe the group or topic in 140 chars"
-msgstr "Describe the group or topic in 140 chars"
-
-#: lib/groupeditform.php:158
+#: lib/groupeditform.php:179
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\""
-msgstr "Location for the group, if any, like \"City, State (or Region), Country\""
+msgstr ""
+"Location for the group, if any, like \"City, State (or Region), Country\""
 
-#: lib/groupnav.php:84 lib/searchgroupnav.php:84
+#: lib/groupeditform.php:187
+#, php-format
+msgid "Extra nicknames for the group, comma- or space- separated, max %d"
+msgstr ""
+
+#: lib/groupnav.php:85 lib/searchgroupnav.php:84
 msgid "Group"
 msgstr "Group"
 
-#: lib/groupnav.php:100
-msgid "Admin"
-msgstr "Admin"
-
 #: lib/groupnav.php:101
+#, fuzzy
+msgid "Blocked"
+msgstr "Block"
+
+#: lib/groupnav.php:102
+#, fuzzy, php-format
+msgid "%s blocked users"
+msgstr "Block user"
+
+#: lib/groupnav.php:108
 #, php-format
 msgid "Edit %s group properties"
 msgstr "Edit %s group properties"
 
-#: lib/groupnav.php:106
+#: lib/groupnav.php:113
 msgid "Logo"
 msgstr "Logo"
 
-#: lib/groupnav.php:107
+#: lib/groupnav.php:114
 #, php-format
 msgid "Add or edit %s logo"
 msgstr "Add or edit %s logo"
 
+#: lib/groupnav.php:120
+#, fuzzy, php-format
+msgid "Add or edit %s design"
+msgstr "Add or edit %s logo"
+
 #: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
 msgstr "Groups with most members"
@@ -4651,8 +4577,42 @@ msgid "Tags in %s group's notices"
 msgstr "Tags in %s group's notices"
 
 #: lib/htmloutputter.php:104
-msgid "This page is not available in a "
-msgstr "This page is not available in a "
+msgid "This page is not available in a media type you accept"
+msgstr "This page is not available in a media type you accept"
+
+#: lib/imagefile.php:75
+#, php-format
+msgid "That file is too big. The maximum file size is %s."
+msgstr "That file is too big. The maximum file size is %s."
+
+#: lib/imagefile.php:80
+msgid "Partial upload."
+msgstr "Partial upload."
+
+#: lib/imagefile.php:88 lib/mediafile.php:170
+msgid "System error uploading file."
+msgstr "System error uploading file."
+
+#: lib/imagefile.php:96
+msgid "Not an image or corrupt file."
+msgstr "Not an image or corrupt file."
+
+#: lib/imagefile.php:105
+msgid "Unsupported image file format."
+msgstr "Unsupported image file format."
+
+#: lib/imagefile.php:118
+msgid "Lost our file."
+msgstr "Lost our file."
+
+#: lib/imagefile.php:150 lib/imagefile.php:197
+msgid "Unknown file type"
+msgstr "Unknown file type"
+
+#: lib/jabber.php:192
+#, php-format
+msgid "[%s]"
+msgstr ""
 
 #: lib/joinform.php:114
 msgid "Join"
@@ -4662,31 +4622,75 @@ msgstr "Join"
 msgid "Leave"
 msgstr "Leave"
 
-#: lib/logingroupnav.php:76
+#: lib/logingroupnav.php:80
 msgid "Login with a username and password"
 msgstr "Login with a username and password"
 
-#: lib/logingroupnav.php:79
+#: lib/logingroupnav.php:86
 msgid "Sign up for a new account"
 msgstr "Sign up for a new account"
 
-#: lib/logingroupnav.php:82
-msgid "Login or register with OpenID"
-msgstr "Login or register with OpenID"
+#: lib/mailbox.php:89
+msgid "Only the user can read their own mailboxes."
+msgstr "Only the user can read their own mailboxes."
+
+#: lib/mailbox.php:139
+msgid ""
+"You have no private messages. You can send private message to engage other "
+"users in conversation. People can send you messages for your eyes only."
+msgstr ""
+
+#: lib/mailbox.php:227 lib/noticelist.php:424
+#, fuzzy
+msgid "from"
+msgstr "from"
+
+#: lib/mail.php:172
+msgid "Email address confirmation"
+msgstr "E-mail address confirmation"
 
-#: lib/mail.php:175
+#: lib/mail.php:174
 #, php-format
 msgid ""
 "Hey, %s.\n"
 "\n"
-msgstr ""
-"Hey, %s.\n"
+"Someone just entered this email address on %s.\n"
 "\n"
+"If it was you, and you want to confirm your entry, use the URL below:\n"
+"\n"
+"\t%s\n"
+"\n"
+"If not, just ignore this message.\n"
+"\n"
+"Thanks for your time, \n"
+"%s\n"
+msgstr ""
 
 #: lib/mail.php:236
 #, php-format
-msgid "%1$s is now listening to "
-msgstr "%1$s is now listening to "
+msgid "%1$s is now listening to your notices on %2$s."
+msgstr "%1$s is now listening to your notices on %2$s."
+
+#: lib/mail.php:241
+#, fuzzy, php-format
+msgid ""
+"%1$s is now listening to your notices on %2$s.\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"%4$s%5$s%6$s\n"
+"Faithfully yours,\n"
+"%7$s.\n"
+"\n"
+"----\n"
+"Change your email address or notification options at %8$s\n"
+msgstr ""
+"%1$s is now listening to your notices on %2$s.\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"Faithfully yours,\n"
+"%4$s.\n"
 
 #: lib/mail.php:254
 #, php-format
@@ -4707,57 +4711,225 @@ msgstr ""
 "Bio: %s\n"
 "\n"
 
-#: lib/mail.php:461
+#: lib/mail.php:286
+#, php-format
+msgid "New email address for posting to %s"
+msgstr "New e-mail address for posting to %s"
+
+#: lib/mail.php:289
+#, php-format
+msgid ""
+"You have a new posting address on %1$s.\n"
+"\n"
+"Send email to %2$s to post new messages.\n"
+"\n"
+"More email instructions at %3$s.\n"
+"\n"
+"Faithfully yours,\n"
+"%4$s"
+msgstr ""
+"You have a new posting address on %1$s.\n"
+"\n"
+"Send e-mail to %2$s to post new messages.\n"
+"\n"
+"More e-mail instructions at %3$s.\n"
+"\n"
+"Faithfully yours,\n"
+"%4$s"
+
+#: lib/mail.php:413
+#, php-format
+msgid "%s status"
+msgstr "%s status"
+
+#: lib/mail.php:439
+msgid "SMS confirmation"
+msgstr "SMS confirmation"
+
+#: lib/mail.php:463
 #, php-format
 msgid "You've been nudged by %s"
 msgstr "You've been nudged by %s"
 
-#: lib/mail.php:465
+#: lib/mail.php:467
+#, php-format
+msgid ""
+"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
+"to post some news.\n"
+"\n"
+"So let's hear from you :)\n"
+"\n"
+"%3$s\n"
+"\n"
+"Don't reply to this email; it won't get to them.\n"
+"\n"
+"With kind regards,\n"
+"%4$s\n"
+msgstr ""
+
+#: lib/mail.php:510
+#, php-format
+msgid "New private message from %s"
+msgstr "New private message from %s"
+
+#: lib/mail.php:514
+#, php-format
+msgid ""
+"%1$s (%2$s) sent you a private message:\n"
+"\n"
+"------------------------------------------------------\n"
+"%3$s\n"
+"------------------------------------------------------\n"
+"\n"
+"You can reply to their message here:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Don't reply to this email; it won't get to them.\n"
+"\n"
+"With kind regards,\n"
+"%5$s\n"
+msgstr ""
+
+#: lib/mail.php:559
+#, fuzzy, php-format
+msgid "%s (@%s) added your notice as a favorite"
+msgstr "%s added your notice as a favourite"
+
+#: lib/mail.php:561
+#, php-format
+msgid ""
+"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
+"\n"
+"The URL of your notice is:\n"
+"\n"
+"%3$s\n"
+"\n"
+"The text of your notice is:\n"
+"\n"
+"%4$s\n"
+"\n"
+"You can see the list of %1$s's favorites here:\n"
+"\n"
+"%5$s\n"
+"\n"
+"Faithfully yours,\n"
+"%6$s\n"
+msgstr ""
+
+#: lib/mail.php:620
 #, php-format
-msgid "%1$s (%2$s) is wondering what you are up to "
-msgstr "%1$s (%2$s) is wondering what you are up to "
+msgid "%s (@%s) sent a notice to your attention"
+msgstr ""
 
-#: lib/mail.php:555
+#: lib/mail.php:622
 #, php-format
-msgid "%1$s just added your notice from %2$s"
-msgstr "%1$s just added your notice from %2$s"
+msgid ""
+"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
+"\n"
+"The notice is here:\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"It reads:\n"
+"\n"
+"\t%4$s\n"
+"\n"
+msgstr ""
+
+#: 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:142
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
+msgstr ""
 
-#: lib/mailbox.php:229 lib/noticelist.php:380
-msgid "From"
-msgstr "From"
+#: lib/mediafile.php:147
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form."
+msgstr ""
+
+#: lib/mediafile.php:152
+msgid "The uploaded file was only partially uploaded."
+msgstr ""
+
+#: lib/mediafile.php:159
+msgid "Missing a temporary folder."
+msgstr ""
+
+#: lib/mediafile.php:162
+msgid "Failed to write file to disk."
+msgstr ""
 
-#: lib/messageform.php:110
+#: lib/mediafile.php:165
+msgid "File upload stopped by extension."
+msgstr ""
+
+#: lib/mediafile.php:179 lib/mediafile.php:216
+msgid "File exceeds user's quota!"
+msgstr ""
+
+#: lib/mediafile.php:196 lib/mediafile.php:233
+msgid "File could not be moved to destination directory."
+msgstr ""
+
+#: lib/mediafile.php:201 lib/mediafile.php:237
+msgid "Could not determine file's mime-type!"
+msgstr "Could not retrieve public stream."
+
+#: lib/mediafile.php:270
+#, php-format
+msgid " Try using another %s format."
+msgstr ""
+
+#: lib/mediafile.php:275
+#, php-format
+msgid "%s is not a supported filetype on this server."
+msgstr ""
+
+#: lib/messageform.php:120
 msgid "Send a direct notice"
 msgstr "Send a direct notice"
 
-#: lib/noticeform.php:125
-msgid "Send a notice"
-msgstr "Send a notice"
+#: lib/messageform.php:146
+msgid "To"
+msgstr "To"
 
-#: lib/noticeform.php:152
+#: lib/messageform.php:162 lib/noticeform.php:173
 msgid "Available characters"
 msgstr "Available characters"
 
-#: lib/noticelist.php:426
-msgid "in reply to"
-msgstr "in reply to"
+#: lib/noticeform.php:145
+msgid "Send a notice"
+msgstr "Send a notice"
 
-#: lib/noticelist.php:447 lib/noticelist.php:450
+#: lib/noticeform.php:158
+#, php-format
+msgid "What's up, %s?"
+msgstr "What's up, %s?"
+
+#: lib/noticeform.php:180
+msgid "Attach"
+msgstr ""
+
+#: lib/noticeform.php:184
+msgid "Attach a file"
+msgstr ""
+
+#: lib/noticelist.php:478
+msgid "in context"
+msgstr "in context"
+
+#: lib/noticelist.php:498
 msgid "Reply to this notice"
 msgstr "Reply to this notice"
 
-#: lib/noticelist.php:451
+#: lib/noticelist.php:499
 msgid "Reply"
 msgstr "Reply"
 
-#: lib/noticelist.php:471 lib/noticelist.php:474
-msgid "Delete this notice"
-msgstr "Delete this notice"
-
-#: lib/noticelist.php:474
-msgid "Delete"
-msgstr "Delete"
-
 #: lib/nudgeform.php:116
 msgid "Nudge this user"
 msgstr "Nudge this user"
@@ -4770,39 +4942,159 @@ msgstr "Nudge"
 msgid "Send a nudge to this user"
 msgstr "Send a nudge to this user"
 
+#: lib/oauthstore.php:283
+msgid "Error inserting new profile"
+msgstr "Error inserting new profile."
+
+#: lib/oauthstore.php:291
+msgid "Error inserting avatar"
+msgstr "Error inserting avatar."
+
+#: lib/oauthstore.php:311
+msgid "Error inserting remote profile"
+msgstr "Error inserting remote profile."
+
+#: lib/oauthstore.php:345
+#, fuzzy
+msgid "Duplicate notice"
+msgstr "Delete notice"
+
+#: lib/oauthstore.php:466 lib/subs.php:48
+#, fuzzy
+msgid "You have been banned from subscribing."
+msgstr "That user has blocked you from subscribing."
+
+#: lib/oauthstore.php:491
+msgid "Couldn't insert new subscription."
+msgstr "Couldn't insert new subscription."
+
+#: lib/personalgroupnav.php:99
+msgid "Personal"
+msgstr "Personal"
+
+#: lib/personalgroupnav.php:104
+msgid "Replies"
+msgstr "Replies"
+
+#: lib/personalgroupnav.php:114
+msgid "Favorites"
+msgstr "Favourites"
+
+#: lib/personalgroupnav.php:124
+msgid "Inbox"
+msgstr "Inbox"
+
+#: lib/personalgroupnav.php:125
+msgid "Your incoming messages"
+msgstr "Your incoming messages"
+
+#: lib/personalgroupnav.php:129
+msgid "Outbox"
+msgstr "Outbox"
+
+#: lib/personalgroupnav.php:130
+msgid "Your sent messages"
+msgstr "Your sent messages"
+
 #: lib/personaltagcloudsection.php:56
 #, php-format
 msgid "Tags in %s's notices"
 msgstr "Tags in %s's notices"
 
-#: lib/profilelist.php:182
-msgid "(none)"
-msgstr "(none)"
+#: lib/profileaction.php:109 lib/profileaction.php:191 lib/subgroupnav.php:82
+msgid "Subscriptions"
+msgstr "Subscriptions"
+
+#: lib/profileaction.php:126
+msgid "All subscriptions"
+msgstr "All subscriptions"
+
+#: lib/profileaction.php:140 lib/profileaction.php:200 lib/subgroupnav.php:90
+msgid "Subscribers"
+msgstr "Subscribers"
+
+#: lib/profileaction.php:157
+msgid "All subscribers"
+msgstr "All subscribers"
+
+#: lib/profileaction.php:177
+#, fuzzy
+msgid "User ID"
+msgstr "User"
+
+#: lib/profileaction.php:182
+msgid "Member since"
+msgstr "Member since"
 
-#: lib/publicgroupnav.php:76
+#: lib/profileaction.php:235
+msgid "All groups"
+msgstr "All groups"
+
+#: lib/profileformaction.php:123
+#, fuzzy
+msgid "No return-to arguments"
+msgstr "No id argument."
+
+#: lib/profileformaction.php:137
+msgid "unimplemented method"
+msgstr ""
+
+#: lib/publicgroupnav.php:78
 msgid "Public"
 msgstr "Public"
 
-#: lib/publicgroupnav.php:80
+#: lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr "User groups"
 
-#: lib/publicgroupnav.php:82 lib/publicgroupnav.php:83
+#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
 msgid "Recent tags"
 msgstr "Recent tags"
 
-#: lib/publicgroupnav.php:86
+#: lib/publicgroupnav.php:88
 msgid "Featured"
 msgstr "Featured"
 
-#: lib/publicgroupnav.php:90
+#: lib/publicgroupnav.php:92
 msgid "Popular"
 msgstr "Popular"
 
+#: lib/sandboxform.php:67
+#, fuzzy
+msgid "Sandbox"
+msgstr "Inbox"
+
+#: lib/sandboxform.php:78
+#, fuzzy
+msgid "Sandbox this user"
+msgstr "Unblock this user"
+
+#: lib/searchaction.php:120
+#, fuzzy
+msgid "Search site"
+msgstr "Search"
+
+#: lib/searchaction.php:162
+#, fuzzy
+msgid "Search help"
+msgstr "Search"
+
+#: lib/searchgroupnav.php:80
+msgid "People"
+msgstr "People"
+
+#: lib/searchgroupnav.php:81
+msgid "Find people on this site"
+msgstr "Find people on this site"
+
 #: lib/searchgroupnav.php:82
 msgid "Notice"
 msgstr "Notice"
 
+#: lib/searchgroupnav.php:83
+msgid "Find content of notices"
+msgstr "Find content of notices"
+
 #: lib/searchgroupnav.php:85
 msgid "Find groups on this site"
 msgstr "Find groups on this site"
@@ -4811,33 +5103,73 @@ msgstr "Find groups on this site"
 msgid "Untitled section"
 msgstr "Untitled section"
 
-#: lib/subgroupnav.php:81
+#: lib/section.php:106
+msgid "More..."
+msgstr ""
+
+#: lib/silenceform.php:67
+#, fuzzy
+msgid "Silence"
+msgstr "Site notice"
+
+#: lib/silenceform.php:78
+#, fuzzy
+msgid "Silence this user"
+msgstr "Block this user"
+
+#: lib/subgroupnav.php:83
 #, php-format
 msgid "People %s subscribes to"
 msgstr "People %s subscribes to"
 
-#: lib/subgroupnav.php:89
+#: lib/subgroupnav.php:91
 #, php-format
 msgid "People subscribed to %s"
 msgstr "People subscribed to %s"
 
-#: lib/subgroupnav.php:97
+#: lib/subgroupnav.php:99
 #, php-format
 msgid "Groups %s is a member of"
 msgstr "Groups %s is a member of"
 
-#: lib/subgroupnav.php:104
-#, php-format
-msgid "Invite friends and colleagues to join you on %s"
-msgstr "Invite friends and colleagues to join you on %s"
+#: lib/subscriberspeopleselftagcloudsection.php:48
+#: lib/subscriptionspeopleselftagcloudsection.php:48
+msgid "People Tagcloud as self-tagged"
+msgstr ""
+
+#: lib/subscriberspeopletagcloudsection.php:48
+#: lib/subscriptionspeopletagcloudsection.php:48
+msgid "People Tagcloud as tagged"
+msgstr ""
+
+#: lib/subscriptionlist.php:126
+msgid "(none)"
+msgstr "(none)"
 
-#: lib/subs.php:53
+#: lib/subs.php:52
+msgid "Already subscribed!"
+msgstr ""
+
+#: lib/subs.php:56
 msgid "User has blocked you."
 msgstr "User has blocked you."
 
-#: lib/subscribeform.php:115 lib/subscribeform.php:139
-msgid "Subscribe to this user"
-msgstr "Subscribe to this user"
+#: lib/subs.php:60
+msgid "Could not subscribe."
+msgstr "Could not subscribe."
+
+#: lib/subs.php:79
+msgid "Could not subscribe other to you."
+msgstr "Could not subscribe other to you."
+
+#: lib/subs.php:128
+#, fuzzy
+msgid "Not subscribed!"
+msgstr "Not subscribed!"
+
+#: lib/subs.php:140
+msgid "Couldn't delete subscription."
+msgstr "Couldn't delete subscription."
 
 #: lib/tagcloudsection.php:56
 msgid "None"
@@ -4847,34 +5179,130 @@ msgstr "None"
 msgid "Top posters"
 msgstr "Top posters"
 
-#: lib/unblockform.php:120 lib/unblockform.php:150
-msgid "Unblock this user"
+#: lib/unsandboxform.php:69
+msgid "Unsandbox"
+msgstr ""
+
+#: lib/unsandboxform.php:80
+#, fuzzy
+msgid "Unsandbox this user"
 msgstr "Unblock this user"
 
-#: lib/unblockform.php:150
-msgid "Unblock"
-msgstr "Unblock"
+#: lib/unsilenceform.php:67
+msgid "Unsilence"
+msgstr ""
+
+#: lib/unsilenceform.php:78
+#, fuzzy
+msgid "Unsilence this user"
+msgstr "Unblock this user"
 
 #: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
 msgid "Unsubscribe from this user"
 msgstr "Unsubscribe from this user"
 
-#, fuzzy
-#~ msgid "Delete my account"
-#~ msgstr "Create new account"
+#: lib/unsubscribeform.php:137
+msgid "Unsubscribe"
+msgstr "Unsubscribe"
 
-#~ msgid "Couldn't confirm email."
-#~ msgstr "Couldn’t confirm e-mail."
+#: lib/userprofile.php:116
+msgid "Edit Avatar"
+msgstr "Edit Avatar"
 
-#~ msgid "Email address"
-#~ msgstr "E-mail address"
+#: lib/userprofile.php:236
+msgid "User actions"
+msgstr "User actions"
+
+#: lib/userprofile.php:248
+msgid "Edit profile settings"
+msgstr "Edit profile settings"
 
-#~ msgid "Error inserting notice"
-#~ msgstr "Error inserting notice"
+#: lib/userprofile.php:249
+msgid "Edit"
+msgstr ""
 
-#~ msgid ""
-#~ "If you've forgotten or lost your password, you can get a new one sent  "
-#~ "the email address you have stored  in your account."
-#~ msgstr ""
-#~ "If you’ve forgotten or lost your password, you can get a new one sent to "
-#~ "the e-mail address you have stored in your account."
+#: lib/userprofile.php:272
+msgid "Send a direct message to this user"
+msgstr "Send a direct message to this user"
+
+#: lib/userprofile.php:273
+msgid "Message"
+msgstr "Message"
+
+#: lib/util.php:826
+msgid "a few seconds ago"
+msgstr "a few seconds ago"
+
+#: lib/util.php:828
+msgid "about a minute ago"
+msgstr "about a minute ago"
+
+#: lib/util.php:830
+#, php-format
+msgid "about %d minutes ago"
+msgstr "about %d minutes ago"
+
+#: lib/util.php:832
+msgid "about an hour ago"
+msgstr "about an hour ago"
+
+#: lib/util.php:834
+#, php-format
+msgid "about %d hours ago"
+msgstr "about %d hours ago"
+
+#: lib/util.php:836
+msgid "about a day ago"
+msgstr "about a day ago"
+
+#: lib/util.php:838
+#, php-format
+msgid "about %d days ago"
+msgstr "about %d days ago"
+
+#: lib/util.php:840
+msgid "about a month ago"
+msgstr "about a month ago"
+
+#: lib/util.php:842
+#, php-format
+msgid "about %d months ago"
+msgstr "about %d months ago"
+
+#: lib/util.php:844
+msgid "about a year ago"
+msgstr "about a year ago"
+
+#: lib/webcolor.php:82
+#, php-format
+msgid "%s is not a valid color!"
+msgstr "%s is not a valid colour!"
+
+#: lib/webcolor.php:123
+#, php-format
+msgid "%s is not a valid color! Use 3 or 6 hex chars."
+msgstr ""
+
+#: scripts/maildaemon.php:48
+msgid "Could not parse message."
+msgstr "Could not parse message."
+
+#: scripts/maildaemon.php:53
+msgid "Not a registered user."
+msgstr "Not a registered user."
+
+#: scripts/maildaemon.php:57
+msgid "Sorry, that is not your incoming email address."
+msgstr "Sorry, that is not your incoming e-mail address."
+
+#: scripts/maildaemon.php:61
+msgid "Sorry, no incoming email allowed."
+msgstr "Sorry, no incoming e-mail allowed."
+
+#, fuzzy
+#~ msgid "Unlock this user"
+#~ msgstr "Unblock this user"
+
+#, fuzzy
+#~ msgid "These people are subscribed to you: "
+#~ msgstr "People subscribed to %s"
author	Zach Copley <zach@status.net>	2009-11-19 20:12:46 -0800
committer	Zach Copley <zach@status.net>	2009-11-19 20:12:46 -0800
commit	4b98edf75f4e255f8c61087bd1525d89653a521f (patch)
tree	b2a7eb6d77429eadb1beabe2d5e6ae1c1a2831d6 /locale/en_GB
parent	f92574dbcb1f2d7cd0aaf3c9362db46fa066e888 (diff)
parent	c213477081afefb1720c8ae729d1965e7a1dac63 (diff)