Merge branch 'groupdesign' into 0.8.x

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

diff --git a/locale/en_GB/LC_MESSAGES/laconica.po b/locale/en_GB/LC_MESSAGES/laconica.po
index 726a771b1fbbb94b21aaa704a2429a9cd09f6462..ec910d6e2b924297811de9cb5e073cc5e7cddca7 100644 (file)
--- a/locale/en_GB/LC_MESSAGES/laconica.po
+++ b/locale/en_GB/LC_MESSAGES/laconica.po
@@ -4,49 +4,113 @@
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #

-#, fuzzy

 msgid ""
 msgstr ""
 msgid ""
 msgstr ""

-"#-#-#-#-#  laconica.pot (laconica)  #-#-#-#-#\n"
-"Project-Id-Version: laconica\n"
-"Report-Msgid-Bugs-To: john@nextraweb.com\n"
-"POT-Creation-Date: 2008-07-14 21:07+1200\n"
-"PO-Revision-Date: 2008-08-05 01:44+0100\n"
-"Last-Translator: John Drinkwater <john@nextraweb.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"

 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2008-10-13 21:07+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-01-25 16:24+0000\n"
+"PO-Revision-Date: 2009-03-12 16:15+0000\n"
+"Last-Translator: Evan Prodromou <evan@controlyourself.ca>\n"

 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\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:64 actions/noticesearchrss.php:68
+#: actions/noticesearchrss.php:88

 #, php-format
 msgid " Search Stream for \"%s\""
 #, php-format
 msgid " Search Stream for \"%s\""

-msgstr "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 for the following private data: password, e-mail address, Instant "
+"Messenger address and 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/finishopenidlogin.php:82 ../actions/register.php:193
+#: ../actions/invite.php:170
+#, php-format

 msgid ""
 msgid ""

-" except this private data: password, email address, IM address, phone "
-"number."
+"%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 ""
 msgstr ""

-"except this private data: password, e-mail address, IM address, phone "
-"number."
+"%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"

 
 

-#: ../actions/subscribe.php:84
+#: ../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."
 
 #, 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."
 

-#: ../actions/subscribe.php:86 ../lib/mail.php:126
+#: ../lib/mail.php:126

 #, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
 #, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"


@@ -56,452 +120,871 @@ msgid ""
 "Faithfully yours,\n"
 "%4$s.\n"
 msgstr ""
 "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:45
+#: actions/shownotice.php:161

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

-msgstr "%1$s’s status on %2$s"
+msgstr "%1$s's status on %2$s"

 
 

-#: ../actions/publicrss.php:60
+#: ../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)"
+
+#: ../actions/publicrss.php:62 actions/publicrss.php:48
+#: actions/publicrss.php:90

 #, php-format
 msgid "%s Public Stream"
 msgstr "%s Public Stream"
 
 #, php-format
 msgid "%s Public Stream"
 msgstr "%s Public Stream"
 

-#: ../actions/all.php:47 ../actions/allrss.php:70 ../lib/stream.php:45
+#: ../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

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

-#: ../lib/util.php:233
+#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
+#: actions/twitapistatuses.php:33
+#, php-format
+msgid "%s public timeline"
+msgstr "%s public timeline"
+
+#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411
+#, php-format
+msgid "%s status"
+msgstr "%s status"
+
+#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
+#: actions/twitapistatuses.php:199
+#, php-format
+msgid "%s timeline"
+msgstr "%s timeline"
+
+#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
+#: actions/twitapistatuses.php:36
+#, 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.)"
+msgstr ""
+"(You should receive an e-mail message in a moment, containing instructions "
+"on how to confirm your e-mail address.)"
+
+#: ../lib/util.php:257 lib/util.php:273 lib/action.php:605

 #, php-format
 msgid ""
 #, php-format
 msgid ""

-"**%%site.name%%** is a microblogging service brought to you by "
-"[%%site.broughtby%%](%%site.broughtbyurl%%). "
+"**%%site.name%%** is a microblogging service brought to you by [%%site."
+"broughtby%%](%%site.broughtbyurl%%). "

 msgstr ""
 "**%%site.name%%** is a microblogging service brought to you by "
 msgstr ""
 "**%%site.name%%** is a microblogging service brought to you by "

-"[%%site.broughtby%%](%%site.broughtbyurl%%)"
+"[%%site.broughtby%%](%%site.broughtbyurl%%). "

 
 

-#: ../lib/util.php:235
+#: ../lib/util.php:259 lib/util.php:275 lib/action.php:607

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

-msgstr "**%%site.name%%** is a microblogging service."
+msgstr "**%%site.name%%** is a microblogging service. "

 
 

-#: ../lib/util.php:250
+#: ../lib/util.php:274 lib/util.php:290

 msgid ". Contributors should be attributed by full name or nickname."
 msgid ". Contributors should be attributed by full name or nickname."

-msgstr ". Contributors should be attributed by full name or nickname."
+msgstr ""

 
 #: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
 
 #: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43

-#: ../actions/register.php:176
+#: 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"
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"

-msgstr "1-64 lowercase letters or numbers, no punctuation or spaces"
+msgstr ""
+
+#: ../actions/register.php:152 actions/register.php:166
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+msgstr ""

 
 

-#: ../actions/password.php:42 ../actions/register.php:178
+#: ../actions/password.php:42 actions/profilesettings.php:181
+#: actions/passwordsettings.php:102

 msgid "6 or more characters"
 msgid "6 or more characters"

-msgstr "6 or more characters"
+msgstr ""

 
 

-#: ../actions/recoverpassword.php:165
+#: ../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!"
 
 msgid "6 or more characters, and don't forget it!"
 msgstr "6 or more characters, and don’t forget it!"
 

-#: ../actions/imsettings.php:188
+#: ../actions/register.php:154 actions/register.php:168
+#: actions/register.php:373
+msgid "6 or more characters. Required."
+msgstr ""
+
+#: ../actions/imsettings.php:197 actions/imsettings.php:205

 #, php-format
 msgid ""
 #, php-format
 msgid ""

-"A confirmation code was sent to the IM address you added. You must approve "
-"%s for sending messages to you."
+"A confirmation code was sent to the IM address you added. You must approve %"
+"s for sending messages to you."
+msgstr ""
+
+#: ../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."
+msgstr ""
+"A confirmation code was sent to the e-mail address you added. Check your in-"
+"box (and spam box!) for the code and instructions on how to use it."
+
+#: ../actions/smssettings.php:216 actions/smssettings.php:224
+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."
+msgstr ""
+"A confirmation code was sent to the phone number you added. Check your in-"
+"box (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/twitapilaconica.php:82
+#: actions/twitapilaconica.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 ""
+
+#: ../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/twitapilaconica.php:172
+#: actions/twitapinotifications.php:31 actions/twitapinotifications.php:37
+#: actions/twitapistatuses.php:562
+msgid "API method under construction."

 msgstr ""
 msgstr ""

-"A confirmation code was sent to the IM address you added. You must approve "
-"%s for sending messages to you."

 
 

-#: ../lib/util.php:296
+#: ../lib/util.php:324 lib/util.php:340 lib/action.php:568

 msgid "About"
 msgid "About"

-msgstr "About"
+msgstr ""

 
 

-#: ../actions/userauthorization.php:118
+#: ../actions/userauthorization.php:119 actions/userauthorization.php:126
+#: actions/userauthorization.php:143

 msgid "Accept"
 msgid "Accept"

-msgstr "Accept"
+msgstr ""

 
 

-#: ../actions/imsettings.php:64 ../actions/openidsettings.php:57
+#: ../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"
 msgid "Add"

-msgstr "Add"
+msgstr ""

 
 

-#: ../actions/openidsettings.php:43
+#: ../actions/openidsettings.php:43 actions/openidsettings.php:44
+#: actions/openidsettings.php:93

 msgid "Add OpenID"
 msgid "Add OpenID"

-msgstr "Add OpenID"
+msgstr ""
+
+#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
+#: lib/accountsettingsaction.php:117
+msgid "Add or remove OpenIDs"
+msgstr ""

 
 

-#: ../actions/imsettings.php:39
+#: ../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"
 msgid "Address"

-msgstr "Address"
+msgstr ""
+
+#: ../actions/invite.php:131 actions/invite.php:139 actions/invite.php:176
+msgid "Addresses of friends to invite (one per line)"
+msgstr ""

 
 

-#: ../actions/showstream.php:254
+#: ../actions/showstream.php:273 actions/showstream.php:288
+#: actions/showstream.php:422

 msgid "All subscriptions"
 msgid "All subscriptions"

-msgstr "All subscriptions"
+msgstr ""

 
 

-#: ../actions/publicrss.php:62
+#: ../actions/publicrss.php:64 actions/publicrss.php:50
+#: actions/publicrss.php:92

 #, php-format
 msgid "All updates for %s"
 #, php-format
 msgid "All updates for %s"

-msgstr "All updates for %s"
+msgstr ""

 
 

-#: ../actions/noticesearchrss.php:66
+#: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
+#: actions/noticesearchrss.php:90

 #, php-format
 msgid "All updates matching search term \"%s\""
 msgstr "All updates matching search term ‘%s’"
 
 #, php-format
 msgid "All updates matching search term \"%s\""
 msgstr "All updates matching search term ‘%s’"
 

-#: ../actions/finishopenidlogin.php:29 ../actions/login.php:27
-#: ../actions/openidlogin.php:29 ../actions/register.php:28
+#: ../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."
 msgid "Already logged in."

-msgstr "Already logged in."
+msgstr ""

 
 

-#: ../actions/subscribe.php:48
+#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49

 msgid "Already subscribed!."
 msgstr "Already subscribed!"
 
 msgid "Already subscribed!."
 msgstr "Already subscribed!"
 

-#: ../actions/userauthorization.php:76
+#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
+#: actions/deletenotice.php:113
+msgid "Are you sure you want to delete this notice?"
+msgstr ""
+
+#: ../actions/userauthorization.php:77 actions/userauthorization.php:83
+#: actions/userauthorization.php:81

 msgid "Authorize subscription"
 msgstr "Authorise subscription"
 
 msgid "Authorize subscription"
 msgstr "Authorise subscription"
 

-#: ../actions/login.php:100 ../actions/register.php:184
+#: ../actions/login.php:104 ../actions/register.php:178
+#: actions/register.php:192

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

+#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
+msgid ""
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+msgstr ""
+

 #: ../actions/avatar.php:32 ../lib/settingsaction.php:90
 #: ../actions/avatar.php:32 ../lib/settingsaction.php:90

-#: actions/profilesettings.php:34
+#: actions/profilesettings.php:34 actions/avatarsettings.php:65
+#: actions/showgroup.php:209 lib/accountsettingsaction.php:107

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

-#: ../actions/avatar.php:113
+#: ../actions/avatar.php:113 actions/profilesettings.php:350
+#: actions/avatarsettings.php:395

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

-msgstr "Avatar updated."
+msgstr ""

 
 

-#: ../actions/imsettings.php:55
+#: ../actions/imsettings.php:55 actions/imsettings.php:56

 #, 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 ""
 #, 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/emailsettings.php:54 actions/emailsettings.php:55
+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 in-box (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 ""

 
 #  erm, not sure what to do here, » is recognised as a quotation mark.
 
 #  erm, not sure what to do here, » is recognised as a quotation mark.

-#: ../lib/util.php:1136
+#: ../lib/util.php:1318 lib/util.php:1452

 msgid "Before »"
 msgstr "Before →"
 
 msgid "Before »"
 msgstr "Before →"
 

-#: ../actions/profilesettings.php:52 ../actions/profilesettings.php:49
-#: ../actions/register.php:170 actions/profilesettings.php:82
-#: actions/register.php:184
+#: ../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 ""
 
 msgid "Bio"
 msgstr ""
 

-#: ../actions/profilesettings.php:93 ../actions/updateprofile.php:102
+#: ../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)"
 
 msgid "Bio is too long (max 140 chars)."
 msgstr "Bio is too long (max 140 chars)"
 

-#: ../actions/updateprofile.php:118
+#: ../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/updateprofile.php:119 actions/updateprofile.php:120
+#: actions/updateprofile.php:123

 #, php-format
 msgid "Can't read avatar URL '%s'"
 msgstr "Can’t read avatar URL ‘%s’"
 
 #, php-format
 msgid "Can't read avatar URL '%s'"
 msgstr "Can’t read avatar URL ‘%s’"
 

-#: ../actions/password.php:85 ../actions/recoverpassword.php:261
+#: ../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."
 
 msgid "Can't save new password."
 msgstr "Can’t save new password."
 

-#: ../actions/imsettings.php:59
+#: ../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"
 msgid "Cancel"

-msgstr "Cancel"
+msgstr ""

 
 

-#: ../lib/openid.php:121
+#: ../lib/openid.php:121 lib/openid.php:121 lib/openid.php:130

 msgid "Cannot instantiate OpenID consumer object."
 msgid "Cannot instantiate OpenID consumer object."

-msgstr "Cannot instantiate OpenID consumer object."
+msgstr "Cannot create OpenID consumer object."

 
 

-#: ../actions/imsettings.php:154
+#: ../actions/imsettings.php:163 actions/imsettings.php:171
+#: actions/imsettings.php:286

 msgid "Cannot normalize that Jabber ID"
 msgstr "Cannot normalise Jabber ID"
 
 msgid "Cannot normalize that Jabber ID"
 msgstr "Cannot normalise Jabber ID"
 

-#: ../actions/password.php:45
+#: ../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/password.php:45 actions/profilesettings.php:184
+#: actions/passwordsettings.php:110

 msgid "Change"
 msgid "Change"

-msgstr "Change"
+msgstr ""

 
 

-#: ../actions/password.php:32
+#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
+#: lib/accountsettingsaction.php:114
+msgid "Change email handling"
+msgstr "Change e-mail handling"
+
+#: ../actions/password.php:32 actions/profilesettings.php:36
+#: actions/passwordsettings.php:58

 msgid "Change password"
 msgid "Change password"

-msgstr "Change password"
+msgstr ""

 
 

-#: ../actions/password.php:43 ../actions/recoverpassword.php:166
-#: ../actions/register.php:179
+#: ../lib/settingsaction.php:94 lib/accountsettingsaction.php:111
+msgid "Change your password"
+msgstr ""
+
+#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
+#: lib/accountsettingsaction.php:105
+msgid "Change your profile settings"
+msgstr ""
+
+#: ../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"
 msgid "Confirm"

-msgstr "Confirm"
+msgstr ""

 
 

-#: ../actions/confirmaddress.php:84
+#: ../actions/confirmaddress.php:90 actions/confirmaddress.php:90
+#: actions/confirmaddress.php:144

 msgid "Confirm Address"
 msgid "Confirm Address"

-msgstr "Confirm Address"
+msgstr ""

 
 

-#: ../actions/imsettings.php:213
+#: ../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."
 msgid "Confirmation cancelled."

-msgstr "Confirmation cancelled."
+msgstr ""
+
+#: ../actions/smssettings.php:63 actions/smssettings.php:63
+#: actions/smssettings.php:118
+msgid "Confirmation code"
+msgstr ""

 
 

-#: ../actions/confirmaddress.php:38
+#: ../actions/confirmaddress.php:38 actions/confirmaddress.php:38
+#: actions/confirmaddress.php:80

 msgid "Confirmation code not found."
 msgid "Confirmation code not found."

-msgstr "Confirmation code not found."
+msgstr ""
+
+#: ../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."
+msgstr ""

 
 

-#: ../actions/finishopenidlogin.php:91
+#: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
+#: actions/finishopenidlogin.php:119 lib/action.php:330

 msgid "Connect"
 msgid "Connect"

-msgstr "Connect"
+msgstr ""

 
 

-#: ../actions/finishopenidlogin.php:86
+#: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
+#: actions/finishopenidlogin.php:114

 msgid "Connect existing account"
 msgid "Connect existing account"

-msgstr "Connect existing account"
+msgstr ""

 
 

-#: ../lib/util.php:304 ../lib/util.php:332 lib/util.php:348
+#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576

 msgid "Contact"
 msgstr ""
 
 #  Thought form was incorrect
 msgid "Contact"
 msgstr ""
 
 #  Thought form was incorrect

-#: ../lib/openid.php:178
+#: ../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"
 
 #, php-format
 msgid "Could not create OpenID form: %s"
 msgstr "Could not create OpenID from: %s"
 

-#: ../lib/openid.php:160
+#: ../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 ""
+
+#: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
+#: actions/twitapifriendships.php:41
+msgid "Could not follow user: User not found."
+msgstr ""
+
+#: ../lib/openid.php:160 lib/openid.php:160 lib/openid.php:169

 #, php-format
 msgid "Could not redirect to server: %s"
 #, php-format
 msgid "Could not redirect to server: %s"

-msgstr "Could not redirect to server: %s"
+msgstr ""

 
 

-#: ../actions/updateprofile.php:161
+#: ../actions/updateprofile.php:162 actions/updateprofile.php:163
+#: actions/updateprofile.php:166

 msgid "Could not save avatar info"
 msgid "Could not save avatar info"

-msgstr "Could not save avatar info"
+msgstr ""

 
 

-#: ../actions/updateprofile.php:154
+#: ../actions/updateprofile.php:155 actions/updateprofile.php:156
+#: actions/updateprofile.php:159

 msgid "Could not save new profile info"
 msgid "Could not save new profile info"

-msgstr "Could not save new profile info"
+msgstr ""
+
+#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:72
+msgid "Could not subscribe other to you."
+msgstr ""

 
 

-#: ../actions/profilesettings.php:146
-msgid "Couldn't confirm email."
-msgstr "Couldn’t confirm e-mail."
+#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:57
+msgid "Could not subscribe."
+msgstr ""
+
+#: ../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/finishremotesubscribe.php:99
 
 #: ../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."
 
 msgid "Couldn't convert request tokens to access tokens."
 msgstr "Couldn’t convert request tokens to access tokens."
 

-#: ../actions/subscribe.php:59
-msgid "Couldn't create subscription."
-msgstr "Couldn’t create subscription."
-
-#: ../actions/confirmaddress.php:78 ../actions/imsettings.php:209
+#: ../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."
 
 msgid "Couldn't delete email confirmation."
 msgstr "Couldn’t delete e-mail confirmation."
 

-#: ../actions/unsubscribe.php:56
+#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134

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

-#: ../actions/remotesubscribe.php:125
+#: ../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/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."
 
 msgid "Couldn't get a request token."
 msgstr "Couldn’t get a request token."
 

-#: ../actions/imsettings.php:178
+#: ../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/finishremotesubscribe.php:180
 msgid "Couldn't insert confirmation code."
 msgstr "Couldn’t insert confirmation code."
 
 #: ../actions/finishremotesubscribe.php:180

+#: actions/finishremotesubscribe.php:182 actions/finishremotesubscribe.php:218

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

-#: ../actions/profilesettings.php:175
+#: ../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."
 
 msgid "Couldn't save profile."
 msgstr "Couldn’t save profile."
 

-#: ../actions/confirmaddress.php:70 ../actions/imsettings.php:129
-#: ../actions/imsettings.php:234 ../actions/profilesettings.php:123
+#: ../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 auto-subscribe."
+
+#: ../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/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."
 
 msgid "Couldn't update user."
 msgstr "Couldn’t update user."
 

-#: ../actions/finishopenidlogin.php:84
+#: ../actions/finishopenidlogin.php:84 actions/finishopenidlogin.php:90
+#: actions/finishopenidlogin.php:112

 msgid "Create"
 msgid "Create"

-msgstr "Create"
+msgstr ""

 
 

-#: ../actions/finishopenidlogin.php:70
+#: ../actions/finishopenidlogin.php:70 actions/finishopenidlogin.php:76
+#: actions/finishopenidlogin.php:98

 msgid "Create a new user with this nickname."
 msgid "Create a new user with this nickname."

-msgstr "Create a new user with this nickname."
+msgstr ""

 
 

-#: ../actions/finishopenidlogin.php:68
+#: ../actions/finishopenidlogin.php:68 actions/finishopenidlogin.php:74
+#: actions/finishopenidlogin.php:96

 msgid "Create new account"
 msgid "Create new account"

-msgstr "Create new account"
+msgstr ""

 
 

-#: ../actions/finishopenidlogin.php:191
+#: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
+#: actions/finishopenidlogin.php:231

 msgid "Creating new account for OpenID that already has a user."
 msgid "Creating new account for OpenID that already has a user."

-msgstr "Creating new account for OpenID that already has a user."
+msgstr ""

 
 

-#: ../actions/imsettings.php:45
+#: ../actions/imsettings.php:45 actions/imsettings.php:46
+#: actions/imsettings.php:100

 msgid "Current confirmed Jabber/GTalk address."
 msgid "Current confirmed Jabber/GTalk address."

-msgstr "Current confirmed Jabber/GTalk address."
+msgstr ""

 
 

-#: ../actions/showstream.php:337
+#: ../actions/smssettings.php:46 actions/smssettings.php:46
+#: actions/smssettings.php:100
+msgid "Current confirmed SMS-enabled phone number."
+msgstr ""
+
+#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
+#: actions/emailsettings.php:99
+msgid "Current confirmed email address."
+msgstr "Current confirmed e-mail address."
+
+#: ../actions/showstream.php:356 actions/showstream.php:367

 msgid "Currently"
 msgid "Currently"

-msgstr "Currently"
+msgstr ""

 
 

-#: ../lib/util.php:893
+#: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:91
+#, php-format
+msgid "DB error inserting hashtag: %s"
+msgstr ""
+
+#: ../lib/util.php:1061 lib/util.php:1110 classes/Notice.php:698

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

-msgstr "DB error inserting reply: %s"
+msgstr ""
+
+#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
+#: actions/deletenotice.php:79
+msgid "Delete notice"
+msgstr ""

 
 

-#: ../actions/profilesettings.php:54
+#: ../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"
 msgid "Describe yourself and your interests in 140 chars"

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

 
 

-#: ../actions/register.php:181 ../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: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"
 msgid "Email"

-msgstr ""
+msgstr "E-mail"
+
+#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
+#: actions/emailsettings.php:115
+msgid "Email Address"
+msgstr "E-mail Address"

 
 

-#: ../actions/profilesettings.php:46
-msgid "Email address"
-msgstr "E-mail address"
+#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
+#: actions/emailsettings.php:60
+msgid "Email Settings"
+msgstr "E-mail Settings"

 
 

-#: ../actions/profilesettings.php:102 ../actions/register.php:63
+#: ../actions/register.php:73 actions/register.php:80 actions/register.php:163

 msgid "Email address already exists."
 msgstr "E-mail address already exists."
 
 msgid "Email address already exists."
 msgstr "E-mail address already exists."
 

-#: ../lib/mail.php:82
+#: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173

 msgid "Email address confirmation"
 msgstr "E-mail address confirmation"
 
 msgid "Email address confirmation"
 msgstr "E-mail address confirmation"
 

-#: ../actions/recoverpassword.php:176
+#: ../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/invite.php:129 actions/invite.php:137 actions/invite.php:174
+msgid "Email addresses"
+msgstr "E-mail addresses"
+
+#: ../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."
 
 msgid "Enter a nickname or email address."
 msgstr "Enter a nickname or e-mail address."
 

-#: ../actions/userauthorization.php:136
+#: ../actions/smssettings.php:64 actions/smssettings.php:64
+#: actions/smssettings.php:119
+msgid "Enter the code you received on your phone."
+msgstr ""
+
+#: ../actions/userauthorization.php:137 actions/userauthorization.php:144
+#: actions/userauthorization.php:161

 msgid "Error authorizing token"
 msgstr "Error authorising token."
 
 msgid "Error authorizing token"
 msgstr "Error authorising token."
 

-#: ../actions/finishopenidlogin.php:282
+#: ../actions/finishopenidlogin.php:253 actions/finishopenidlogin.php:259
+#: actions/finishopenidlogin.php:297

 msgid "Error connecting user to OpenID."
 msgid "Error connecting user to OpenID."

-msgstr "Error connecting user to OpenID."
+msgstr ""

 
 

-#: ../actions/finishaddopenid.php:78
+#: ../actions/finishaddopenid.php:78 actions/finishaddopenid.php:78
+#: actions/finishaddopenid.php:126

 msgid "Error connecting user."
 msgid "Error connecting user."

-msgstr "Error connecting user."
+msgstr ""

 
 #: ../actions/finishremotesubscribe.php:151
 
 #: ../actions/finishremotesubscribe.php:151

+#: actions/finishremotesubscribe.php:153 actions/finishremotesubscribe.php:166

 msgid "Error inserting avatar"
 msgid "Error inserting avatar"

-msgstr "Error inserting avatar"
+msgstr "Error inserting avatar."

 
 #: ../actions/finishremotesubscribe.php:143
 
 #: ../actions/finishremotesubscribe.php:143

+#: actions/finishremotesubscribe.php:145 actions/finishremotesubscribe.php:158

 msgid "Error inserting new profile"
 msgid "Error inserting new profile"

-msgstr "Error inserting new profile"
-
-#: ../actions/postnotice.php:88
-msgid "Error inserting notice"
-msgstr "Error inserting notice"
+msgstr "Error inserting new profile."

 
 #: ../actions/finishremotesubscribe.php:167
 
 #: ../actions/finishremotesubscribe.php:167

+#: actions/finishremotesubscribe.php:169 actions/finishremotesubscribe.php:182

 msgid "Error inserting remote profile"
 msgid "Error inserting remote profile"

-msgstr "Error inserting remote profile"
+msgstr "Error inserting remote profile."

 
 

-#: ../actions/recoverpassword.php:201
+#: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246
+#: actions/recoverpassword.php:280

 msgid "Error saving address confirmation."
 msgid "Error saving address confirmation."

-msgstr "Error saving address confirmation."
+msgstr ""

 
 

-#: ../actions/userauthorization.php:139
+#: ../actions/userauthorization.php:140 actions/userauthorization.php:147
+#: actions/userauthorization.php:164

 msgid "Error saving remote profile"
 msgid "Error saving remote profile"

-msgstr "Error saving remote profile"
+msgstr "Error saving remote profile."

 
 

-#: ../actions/finishopenidlogin.php:222 ../lib/openid.php:226
+#: ../lib/openid.php:226 lib/openid.php:226 lib/openid.php:235

 msgid "Error saving the profile."
 msgid "Error saving the profile."

-msgstr "Error saving the profile."
+msgstr ""

 
 

-#: ../lib/openid.php:237
+#: ../lib/openid.php:237 lib/openid.php:237 lib/openid.php:246

 msgid "Error saving the user."
 msgid "Error saving the user."

-msgstr "Error saving the user."
+msgstr ""

 
 

-#: ../actions/password.php:80
+#: ../actions/password.php:80 actions/profilesettings.php:399
+#: actions/passwordsettings.php:164

 msgid "Error saving user; invalid."
 msgid "Error saving user; invalid."

-msgstr "Error saving user; invalid."
+msgstr "Error saving user - invalid."

 
 

-#: ../actions/login.php:43 ../actions/login.php:69
-#: ../actions/recoverpassword.php:268 ../actions/register.php:73
+#: ../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."
 msgid "Error setting user."

-msgstr "Error setting user."
+msgstr ""

 
 #  Added full stop
 
 #  Added full stop

-#: ../actions/finishaddopenid.php:83
+#: ../actions/finishaddopenid.php:83 actions/finishaddopenid.php:83
+#: actions/finishaddopenid.php:131

 msgid "Error updating profile"
 msgstr "Error updating profile."
 
 #  Added full stop
 #: ../actions/finishremotesubscribe.php:161
 msgid "Error updating profile"
 msgstr "Error updating profile."
 
 #  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."
 
 msgid "Error updating remote profile"
 msgstr "Error updating remote profile."
 

-#: ../actions/recoverpassword.php:79
+#: ../actions/recoverpassword.php:80 actions/recoverpassword.php:80
+#: actions/recoverpassword.php:86

 msgid "Error with confirmation code."
 msgid "Error with confirmation code."

-msgstr "Error with confirmation code."
+msgstr ""

 
 

-#: ../actions/finishopenidlogin.php:89
+#: ../actions/finishopenidlogin.php:89 actions/finishopenidlogin.php:95
+#: actions/finishopenidlogin.php:117

 msgid "Existing nickname"
 msgid "Existing nickname"

-msgstr "Existing nickname"
+msgstr ""

 
 

-#: ../lib/util.php:298
+#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570

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

-#: ../actions/avatar.php:115
+#: ../actions/avatar.php:115 actions/profilesettings.php:352
+#: actions/avatarsettings.php:397

 msgid "Failed updating avatar."
 msgstr "Failed to update avatar."
 
 msgid "Failed updating avatar."
 msgstr "Failed to update avatar."
 

-#: ../actions/all.php:61 ../actions/allrss.php:74
+#: ../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"
 #, php-format
 msgid "Feed for friends of %s"

-msgstr "Feed for friends of %s"
+msgstr ""

 
 

-#: ../actions/replies.php:61 ../actions/repliesrss.php:80
+#: ../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"
 #, php-format
 msgid "Feed for replies to %s"

-msgstr "Feed for replies to %s"
+msgstr ""
+
+#: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:61
+#, php-format
+msgid "Feed for tag %s"
+msgstr ""
+
+#: ../lib/searchaction.php:105 lib/searchaction.php:105
+#: lib/searchgroupnav.php:83
+msgid "Find content of notices"
+msgstr ""
+
+#: ../lib/searchaction.php:101 lib/searchaction.php:101
+#: lib/searchgroupnav.php:81
+msgid "Find people on this site"
+msgstr ""

 
 

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

 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
 msgstr ""
 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/profilesettings.php:44
+#: ../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"
 msgid "Full name"

-msgstr "Full name"
+msgstr ""

 
 

-#: ../actions/profilesettings.php:90 ../actions/updateprofile.php:92
+#: ../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)."
 msgid "Full name is too long (max 255 chars)."

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

 
 

-#: ../lib/util.php:279
+#: ../lib/util.php:322 lib/util.php:338 lib/action.php:344 lib/action.php:566

 msgid "Help"
 msgid "Help"

-msgstr "Help"
+msgstr ""

 
 

-#: ../lib/util.php:274
+#: ../lib/util.php:298 lib/util.php:314 lib/action.php:322
+#: lib/facebookaction.php:200

 msgid "Home"
 msgid "Home"

-msgstr "Home"
+msgstr ""

 
 

-#: ../actions/profilesettings.php:49
+#: ../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"
 msgid "Homepage"

-msgstr "Homepage"
+msgstr ""

 
 

-#: ../actions/profilesettings.php:87
+#: ../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."
 msgid "Homepage is not a valid URL."

-msgstr "Homepage is not a valid URL."
+msgstr ""
+
+#: ../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."
+
+#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
+#: lib/connectsettingsaction.php:104
+msgid "IM"
+msgstr "I.M."

 
 #  possibly use I.M.
 
 #  possibly use I.M.

-#: ../actions/imsettings.php:61
+#: ../actions/imsettings.php:60 actions/imsettings.php:61
+#: actions/imsettings.php:118

 msgid "IM Address"
 msgid "IM Address"

-msgstr "IM Address"
+msgstr "I.M. Address"

 
 #  requires full stops?
 
 #  requires full stops?

-#: ../actions/imsettings.php:33
+#: ../actions/imsettings.php:33 actions/imsettings.php:33
+#: actions/imsettings.php:59

 msgid "IM Settings"
 msgid "IM Settings"

-msgstr "IM Settings"
+msgstr "I.M. Settings"

 
 

-#: ../actions/finishopenidlogin.php:88
+#: ../actions/finishopenidlogin.php:88 actions/finishopenidlogin.php:94
+#: actions/finishopenidlogin.php:116

 msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your OpenID."
 msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your OpenID."


@@ -517,23 +1000,37 @@ msgstr ""
 "If you want to add an OpenID to your account, enter it in the box below and "
 "click ‘Add’."
 
 "If you want to add an OpenID to your account, enter it in the box below and "
 "click ‘Add’."
 

-#: ../actions/recoverpassword.php:122
+# double space here
+#: ../actions/recoverpassword.php:137

 msgid ""
 msgid ""

-"If you've forgotten or lost your password, you can get a new one sent  the "
+"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 ""
 "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."
+"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/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/emailsettings.php:283 actions/emailsettings.php:301
+#: actions/emailsettings.php:443
+msgid "Incoming email address removed."
+msgstr "Incoming e-mail address removed."

 
 

-#: ../actions/password.php:69
+#: ../actions/password.php:69 actions/profilesettings.php:388
+#: actions/passwordsettings.php:153

 msgid "Incorrect old password"
 msgid "Incorrect old password"

-msgstr "Incorrect old password"
+msgstr ""

 
 

-#: ../actions/login.php:63
+#: ../actions/login.php:67 actions/login.php:67 actions/facebookhome.php:131
+#: actions/login.php:132

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

-msgstr "Incorrect username or password."
+msgstr ""

 
 

-#: ../actions/recoverpassword.php:226
+#: ../actions/recoverpassword.php:265

 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."


@@ -542,518 +1039,895 @@ msgstr ""
 "address registered to your account."
 
 #  Avatar?
 "address registered to your account."
 
 #  Avatar?

-#: ../actions/updateprofile.php:113
+#: ../actions/updateprofile.php:114 actions/updateprofile.php:115
+#: actions/updateprofile.php:118

 #, php-format
 msgid "Invalid avatar URL '%s'"
 msgstr "Invalid avatar URL ‘%s’"
 
 #, php-format
 msgid "Invalid avatar URL '%s'"
 msgstr "Invalid avatar URL ‘%s’"
 

-#: ../actions/updateprofile.php:97
+#: ../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/updateprofile.php:98 actions/updateprofile.php:99
+#: actions/updateprofile.php:102

 #, php-format
 msgid "Invalid homepage '%s'"
 msgstr "Invalid homepage ‘%s’"
 
 #, php-format
 msgid "Invalid homepage '%s'"
 msgstr "Invalid homepage ‘%s’"
 

-#: ../actions/updateprofile.php:81
+#: ../actions/updateprofile.php:82 actions/updateprofile.php:83
+#: actions/updateprofile.php:86

 #, php-format
 msgid "Invalid license URL '%s'"
 msgstr "Invalid licence URL ‘%s’"
 
 #, php-format
 msgid "Invalid license URL '%s'"
 msgstr "Invalid licence URL ‘%s’"
 

-#: ../actions/postnotice.php:61
+#: ../actions/postnotice.php:61 actions/postnotice.php:62
+#: actions/postnotice.php:66

 msgid "Invalid notice content"
 msgid "Invalid notice content"

-msgstr "Invalid notice content"
+msgstr ""

 
 

-#: ../actions/postnotice.php:67
+#: ../actions/postnotice.php:67 actions/postnotice.php:68
+#: actions/postnotice.php:72

 msgid "Invalid notice uri"
 msgstr "Invalid notice URI"
 
 msgid "Invalid notice uri"
 msgstr "Invalid notice URI"
 

-#: ../actions/postnotice.php:72
+# URL case
+#: ../actions/postnotice.php:72 actions/postnotice.php:73
+#: actions/postnotice.php:77

 msgid "Invalid notice url"
 msgstr "Invalid notice URL"
 
 msgid "Invalid notice url"
 msgstr "Invalid notice URL"
 

-#: ../actions/updateprofile.php:86
+#: ../actions/updateprofile.php:87 actions/updateprofile.php:88
+#: actions/updateprofile.php:91

 #, php-format
 msgid "Invalid profile URL '%s'."
 msgstr "Invalid profile URL ‘%s’."
 
 #, php-format
 msgid "Invalid profile URL '%s'."
 msgstr "Invalid profile URL ‘%s’."
 

-#: ../actions/remotesubscribe.php:96
+#: ../actions/remotesubscribe.php:96 actions/remotesubscribe.php:105
+#: actions/remotesubscribe.php:135

 msgid "Invalid profile URL (bad format)"
 msgid "Invalid profile URL (bad format)"

-msgstr "Invalid profile URL (bad format)"
+msgstr ""

 
 #: ../actions/finishremotesubscribe.php:77
 
 #: ../actions/finishremotesubscribe.php:77

+#: actions/finishremotesubscribe.php:79 actions/finishremotesubscribe.php:80

 msgid "Invalid profile URL returned by server."
 msgid "Invalid profile URL returned by server."

-msgstr "Invalid profile URL returned by server."
+msgstr ""

 
 

-#: ../actions/avatarbynickname.php:37
+#: ../actions/avatarbynickname.php:37 actions/avatarbynickname.php:37
+#: actions/avatarbynickname.php:69

 msgid "Invalid size."
 msgid "Invalid size."

-msgstr "Invalid size."
+msgstr ""

 
 

-#: ../actions/finishopenidlogin.php:264 ../actions/register.php:68
-#: ../actions/register.php:84
+#: ../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."
 msgid "Invalid username or password."

-msgstr "Invalid username or password."
+msgstr ""
+
+#: ../actions/invite.php:79 actions/invite.php:86 actions/invite.php:102
+msgid "Invitation(s) sent"
+msgstr ""
+
+#: ../actions/invite.php:97 actions/invite.php:104 actions/invite.php:136
+msgid "Invitation(s) sent to the following people:"
+msgstr ""

 
 

-#: ../lib/util.php:237
+#: ../lib/util.php:306 lib/util.php:322 lib/facebookaction.php:207
+#: lib/subgroupnav.php:103
+msgid "Invite"
+msgstr ""
+
+#: ../actions/invite.php:123 actions/invite.php:130 actions/invite.php:104
+msgid "Invite new users"
+msgstr ""
+
+#: ../lib/util.php:261 lib/util.php:277 lib/action.php:609

 #, php-format
 msgid ""
 #, php-format
 msgid ""

-"It runs the [Laconica](http://laconi.ca/) microblogging software, version "
-"%s, available under the [GNU Affero General Public "
-"License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
+"It runs the [Laconica](http://laconi.ca/) microblogging software, version %"
+"s, available under the [GNU Affero General Public License](http://www.fsf."
+"org/licensing/licenses/agpl-3.0.html)."

 msgstr ""
 msgstr ""

-"It runs the [Laconica](http://laconi.ca/) microblogging software, version "
-"%s, available under the [GNU Affero General Public "
-"Licence](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
+"It runs the [Laconica](http://laconi.ca/) microblogging software, version %"
+"s, available under the [GNU Affero General Public Licence](http://www.fsf."
+"org/licensing/licenses/agpl-3.0.html)."

 
 

-#: ../actions/imsettings.php:164
+#: ../actions/imsettings.php:173 actions/imsettings.php:181
+#: actions/imsettings.php:296

 msgid "Jabber ID already belongs to another user."
 msgid "Jabber ID already belongs to another user."

-msgstr "Jabber ID already belongs to another user."
+msgstr ""

 
 

-#: ../actions/imsettings.php:63
+#: ../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 ""
 #, 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."
+"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/profilesettings.php:57 actions/profilesettings.php:90
+#: actions/profilesettings.php:128
+msgid "Language"
+msgstr ""
+
+#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
+#: actions/profilesettings.php:217
+msgid "Language is too long (max 50 chars)."
+msgstr ""

 
 

-#: ../actions/profilesettings.php:55
+#: ../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"
 msgid "Location"

-msgstr "Location"
+msgstr ""

 
 

-#: ../actions/profilesettings.php:96 ../actions/updateprofile.php:107
+#: ../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)."
 msgid "Location is too long (max 255 chars)."

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

 
 

-#: ../actions/login.php:93 ../actions/login.php:102
-#: ../actions/openidlogin.php:68 ../lib/util.php:286
+#: ../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 "Log-in"
 
 msgid "Login"
 msgstr "Log-in"
 

-#: ../actions/openidlogin.php:44
+#: ../actions/openidlogin.php:44 actions/openidlogin.php:52
+#: actions/openidlogin.php:62

 #, php-format
 msgid "Login with an [OpenID](%%doc.openid%%) account."
 msgstr "Log-in with an [OpenID](%%doc.openid%%) account."
 
 #, php-format
 msgid "Login with an [OpenID](%%doc.openid%%) account."
 msgstr "Log-in with an [OpenID](%%doc.openid%%) account."
 

-#: ../actions/login.php:122
+#: ../actions/login.php:126

 #, php-format
 msgid ""
 #, php-format
 msgid ""

-"Login with your username and password. Don't have a username yet? "
-"[Register](%%action.register%%) a new account, or try "
-"[OpenID](%%action.openidlogin%%). "
+"Login with your username and password. Don't have a username yet? [Register]"
+"(%%action.register%%) a new account, or try [OpenID](%%action.openidlogin%"
+"%). "

 msgstr ""
 msgstr ""

-"Log-in with your username and password. Don’t have a username yet? "
-"[Register](%%action.register%%) a new account, or try "
-"[OpenID](%%action.openidlogin%%)."
+"Log-in 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:284
+#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332

 msgid "Logout"
 msgstr "Log out"
 
 msgid "Logout"
 msgstr "Log out"
 

-#: ../actions/login.php:106
+#: ../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/login.php:110 actions/login.php:110 actions/login.php:245
+#: lib/facebookaction.php:320

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

-msgstr "Lost or forgotten password?"
+msgstr ""

 
 

-#: ../actions/showstream.php:281
+#: ../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/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/showstream.php:300 actions/showstream.php:315
+#: actions/showstream.php:480

 msgid "Member since"
 msgid "Member since"

-msgstr "Member since"
+msgstr ""

 
 

-#: ../actions/userrss.php:70
+#: ../actions/userrss.php:70 actions/userrss.php:67 actions/userrss.php:72

 #, php-format
 msgid "Microblog by %s"
 #, php-format
 msgid "Microblog by %s"

-msgstr "Microblog by %s"
+msgstr ""
+
+#: ../actions/smssettings.php:304
+#, 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 "
+"email but isn’t listed here, send e-mail to let us know at %s."

 
 

-#: ../actions/finishopenidlogin.php:79 ../actions/register.php:190
+#: ../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 "
 msgid "My text and files are available under "

-msgstr "My text and files are available under"
+msgstr ""
+
+#: ../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 ""

 
 

-#: ../actions/finishopenidlogin.php:71
+#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:286
+#, 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"
 msgid "New nickname"

-msgstr "New nickname"
+msgstr ""

 
 

-#: ../actions/newnotice.php:100
+#: ../actions/newnotice.php:87 actions/newnotice.php:96
+#: actions/newnotice.php:68

 msgid "New notice"
 msgid "New notice"

-msgstr "New notice"
+msgstr ""

 
 

-#: ../actions/password.php:41 ../actions/recoverpassword.php:164
+#: ../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"
 msgid "New password"

-msgstr "New password"
+msgstr ""

 
 

-#: ../actions/recoverpassword.php:275
+#: ../actions/recoverpassword.php:314

 msgid "New password successfully saved. You are now logged in."
 msgid "New password successfully saved. You are now logged in."

-msgstr "New password successfully saved. You are now logged in."
+msgstr ""

 
 

-#: ../actions/login.php:97 ../actions/profilesettings.php:41
-#: ../actions/register.php:175
+#: ../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"
 msgid "Nickname"

-msgstr "Nickname"
+msgstr ""

 
 

-#: ../actions/finishopenidlogin.php:175 ../actions/profilesettings.php:99
-#: ../actions/register.php:59
+#: ../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."
 msgid "Nickname already in use. Try another one."

-msgstr "Nickname already in use. Try another one."
+msgstr ""

 
 

-#: ../actions/finishopenidlogin.php:165 ../actions/profilesettings.php:80
-#: ../actions/register.php:57 ../actions/updateprofile.php:76
+#: ../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."
 msgid "Nickname must have only lowercase letters and numbers and no spaces."

-msgstr "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:170 actions/finishopenidlogin.php:176
+#: actions/finishopenidlogin.php:210

 msgid "Nickname not allowed."
 msgid "Nickname not allowed."

-msgstr "Nickname not allowed."
+msgstr ""

 
 

-#: ../actions/remotesubscribe.php:72
+#: ../actions/remotesubscribe.php:72 actions/remotesubscribe.php:81
+#: actions/remotesubscribe.php:106

 msgid "Nickname of the user you want to follow"
 msgid "Nickname of the user you want to follow"

-msgstr "Nickname of the user you want to follow"
+msgstr ""

 
 

-#: ../actions/recoverpassword.php:147
+#: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
+#: actions/recoverpassword.php:186

 msgid "Nickname or email"
 msgstr "Nickname or e-mail"
 
 msgid "Nickname or email"
 msgstr "Nickname or e-mail"
 

-#: ../actions/imsettings.php:147
+#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
+#: actions/block.php:147 actions/deletenotice.php:118
+msgid "No"
+msgstr ""
+
+#: ../actions/imsettings.php:156 actions/imsettings.php:164
+#: actions/imsettings.php:279

 msgid "No Jabber ID."
 msgid "No Jabber ID."

-msgstr "No Jabber ID."
+msgstr ""

 
 

-#: ../actions/userauthorization.php:128 ../actions/userauthorization.php:129
-#: actions/userauthorization.php:136
+#: ../actions/userauthorization.php:129 actions/userauthorization.php:136
+#: actions/userauthorization.php:153

 msgid "No authorization request!"
 msgid "No authorization request!"

+msgstr "No authorisation request!"
+
+#: ../actions/smssettings.php:181 actions/smssettings.php:189
+#: actions/smssettings.php:299
+msgid "No carrier selected."
+msgstr ""
+
+#: ../actions/smssettings.php:316 actions/smssettings.php:324
+#: actions/smssettings.php:486
+msgid "No code entered"

 msgstr ""
 
 msgstr ""
 

-#: ../actions/confirmaddress.php:33
+#: ../actions/confirmaddress.php:33 actions/confirmaddress.php:33
+#: actions/confirmaddress.php:75

 msgid "No confirmation code."
 msgid "No confirmation code."

-msgstr "No confirmation code."
+msgstr ""

 
 

-#: ../actions/newnotice.php:49
+#: ../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!"
 msgid "No content!"

-msgstr "No content!"
+msgstr ""

 
 

-#: ../actions/userbyid.php:27
+#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
+#: actions/emailsettings.php:304
+msgid "No email address."
+msgstr "No e-mail address."
+
+#: ../actions/userbyid.php:32 actions/userbyid.php:32 actions/userbyid.php:70

 msgid "No id."
 msgid "No id."

-msgstr "No id."
+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/finishremotesubscribe.php:65
 
 #: ../actions/finishremotesubscribe.php:65

+#: actions/finishremotesubscribe.php:67 actions/finishremotesubscribe.php:68

 msgid "No nickname provided by remote server."
 msgid "No nickname provided by remote server."

-msgstr "No nickname provided by remote server."
+msgstr ""

 
 

-#: ../actions/avatarbynickname.php:27
+#: ../actions/avatarbynickname.php:27 actions/avatarbynickname.php:27
+#: actions/avatarbynickname.php:59 actions/leavegroup.php:81

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

-msgstr "No nickname."
+msgstr ""

 
 

-#: ../actions/imsettings.php:197
+#: ../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."
 msgid "No pending confirmation to cancel."

-msgstr "No pending confirmation to cancel."
+msgstr ""
+
+#: ../actions/smssettings.php:176 actions/smssettings.php:184
+#: actions/smssettings.php:294
+msgid "No phone number."
+msgstr ""

 
 #: ../actions/finishremotesubscribe.php:72
 
 #: ../actions/finishremotesubscribe.php:72

+#: actions/finishremotesubscribe.php:74 actions/finishremotesubscribe.php:75

 msgid "No profile URL returned by server."
 msgid "No profile URL returned by server."

-msgstr "No profile URL returned by server."
+msgstr ""

 
 

-#: ../actions/recoverpassword.php:189
+#: ../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."
 
 msgid "No registered email address for that user."
 msgstr "No registered e-mail address for that user."
 

-#: ../actions/userauthorization.php:48
+#: ../actions/userauthorization.php:49 actions/userauthorization.php:55
+#: actions/userauthorization.php:57

 msgid "No request found!"
 msgid "No request found!"

-msgstr "No request found!"
+msgstr ""

 
 #: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64
 
 #: ../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"
 msgid "No results"

-msgstr "No results"
+msgstr ""

 
 

-#: ../actions/avatarbynickname.php:32
+#: ../actions/avatarbynickname.php:32 actions/avatarbynickname.php:32
+#: actions/avatarbynickname.php:64

 msgid "No size."
 msgid "No size."

-msgstr "No size."
+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 ""
+
+#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
+#: actions/twitapistatuses.php:418
+msgid "No status with that ID found."
+msgstr ""

 
 

-#: ../actions/openidsettings.php:135
+#: ../actions/openidsettings.php:135 actions/openidsettings.php:144
+#: actions/openidsettings.php:222

 msgid "No such OpenID."
 msgid "No such OpenID."

-msgstr "No such OpenID."
+msgstr ""

 
 

-#: ../actions/doc.php:29
+#: ../actions/doc.php:29 actions/doc.php:29 actions/doc.php:64

 msgid "No such document."
 msgid "No such document."

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

 
 

-#: ../actions/shownotice.php:32 ../actions/shownotice.php:65
+#: ../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."
 msgid "No such notice."

-msgstr "No such notice."
+msgstr ""

 
 

-#: ../actions/recoverpassword.php:56
+#: ../actions/recoverpassword.php:56 actions/recoverpassword.php:56
+#: actions/recoverpassword.php:62

 msgid "No such recovery code."
 msgid "No such recovery code."

-msgstr "No such recovery code."
+msgstr ""

 
 

-#: ../actions/postnotice.php:56
+#: ../actions/postnotice.php:56 actions/postnotice.php:57
+#: actions/postnotice.php:60

 msgid "No such subscription"
 msgid "No such subscription"

-msgstr "No such subscription"
+msgstr ""

 
 #: ../actions/all.php:34 ../actions/allrss.php:35
 
 #: ../actions/all.php:34 ../actions/allrss.php:35

-#: ../actions/avatarbynickname.php:43 ../actions/foaf.php:36
-#: ../actions/recoverpassword.php:185 ../actions/remotesubscribe.php:84
-#: ../actions/remotesubscribe.php:91 ../actions/repliesrss.php:35
-#: ../actions/showstream.php:95 ../actions/subscribe.php:43
-#: ../actions/unsubscribe.php:38 ../actions/userbyid.php:31
-#: ../actions/userrss.php:35 ../actions/xrds.php:31 ../lib/gallery.php:53
+#: ../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."
 msgid "No such user."

-msgstr "No such user."
+msgstr ""

 
 

-#: ../lib/gallery.php:76
+#: ../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."
+
+#: ../lib/gallery.php:80 lib/gallery.php:85

 msgid "Nobody to show!"
 msgid "Nobody to show!"

-msgstr "Nobody to show!"
+msgstr ""

 
 

-#: ../actions/recoverpassword.php:60
+#: ../actions/recoverpassword.php:60 actions/recoverpassword.php:60
+#: actions/recoverpassword.php:66

 msgid "Not a recovery code."
 msgid "Not a recovery code."

-msgstr "Not a recovery code."
+msgstr ""
+
+#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
+#: scripts/maildaemon.php:53
+msgid "Not a registered user."
+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 ""

 
 

-#: ../actions/imsettings.php:158
+#: ../actions/imsettings.php:167 actions/imsettings.php:175
+#: actions/imsettings.php:290

 msgid "Not a valid Jabber ID"
 msgid "Not a valid Jabber ID"

-msgstr "Not a valid Jabber ID"
+msgstr ""

 
 

-#: ../lib/openid.php:131
+#: ../lib/openid.php:131 lib/openid.php:131 lib/openid.php:140

 msgid "Not a valid OpenID."
 msgid "Not a valid OpenID."

-msgstr "Not a valid OpenID."
+msgstr ""
+
+# 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/profilesettings.php:75 ../actions/register.php:53
+#: ../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."
 
 msgid "Not a valid email address."
 msgstr "Not a valid e-mail address."
 

-#: ../actions/profilesettings.php:83 ../actions/register.php:61
+#: ../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."
 msgid "Not a valid nickname."

-msgstr "Not a valid nickname."
+msgstr ""

 
 

-#: ../actions/remotesubscribe.php:118
+#: ../actions/remotesubscribe.php:120 actions/remotesubscribe.php:129
+#: actions/remotesubscribe.php:159

 msgid "Not a valid profile URL (incorrect services)."
 msgid "Not a valid profile URL (incorrect services)."

-msgstr "Not a valid profile URL (incorrect services)."
+msgstr ""

 
 

-#: ../actions/remotesubscribe.php:111
+#: ../actions/remotesubscribe.php:113 actions/remotesubscribe.php:122
+#: actions/remotesubscribe.php:152

 msgid "Not a valid profile URL (no XRDS defined)."
 msgid "Not a valid profile URL (no XRDS defined)."

-msgstr "Not a valid profile URL (no XRDS defined)."
+msgstr ""

 
 

-#: ../actions/remotesubscribe.php:104
+#: ../actions/remotesubscribe.php:104 actions/remotesubscribe.php:113
+#: actions/remotesubscribe.php:143

 msgid "Not a valid profile URL (no YADIS document)."
 msgid "Not a valid profile URL (no YADIS document)."

-msgstr "Not a valid profile URL (no YADIS document)."
+msgstr ""

 
 

-#: ../actions/avatar.php:95
+#: ../actions/avatar.php:95 actions/profilesettings.php:332
+#: lib/imagefile.php:87

 msgid "Not an image or corrupt file."
 msgid "Not an image or corrupt file."

-msgstr "Not an image or corrupt file."
+msgstr ""

 
 #: ../actions/finishremotesubscribe.php:51
 
 #: ../actions/finishremotesubscribe.php:51

+#: actions/finishremotesubscribe.php:53 actions/finishremotesubscribe.php:54

 msgid "Not authorized."
 msgstr "Not authorised."
 
 #: ../actions/finishremotesubscribe.php:38
 msgid "Not authorized."
 msgstr "Not authorised."
 
 #: ../actions/finishremotesubscribe.php:38

+#: actions/finishremotesubscribe.php:38 actions/finishremotesubscribe.php:40

 msgid "Not expecting this response!"
 msgid "Not expecting this response!"

-msgstr "Not expecting this response!"
-
-#: ../actions/finishaddopenid.php:29 ../actions/logout.php:28
-#: ../actions/newnotice.php:29 ../actions/subscribe.php:27
-#: ../actions/unsubscribe.php:24 ../lib/settingsaction.php:27
-msgid "Not logged in."
-msgstr "Not logged in."
+msgstr ""

 
 

-#: ../actions/unsubscribe.php:43
+#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
+#: actions/twitapistatuses.php:309
+msgid "Not found"
+msgstr ""
+
+#: ../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 ""
+
+# removed full stop
+#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122

 msgid "Not subscribed!."
 msgstr "Not subscribed!"
 
 msgid "Not subscribed!."
 msgstr "Not subscribed!"
 

-#: ../actions/showstream.php:82
+#: ../actions/opensearch.php:35 actions/opensearch.php:35
+#: actions/opensearch.php:67
+msgid "Notice Search"
+msgstr ""
+
+#: ../actions/showstream.php:82 actions/showstream.php:82
+#: actions/showstream.php:180 actions/showstream.php:187
+#: actions/showstream.php:192

 #, php-format
 msgid "Notice feed for %s"
 #, php-format
 msgid "Notice feed for %s"

-msgstr "Notice feed for %s"
+msgstr ""

 
 

-#: ../actions/shownotice.php:39
+#: ../actions/shownotice.php:39 actions/shownotice.php:39
+#: actions/shownotice.php:94

 msgid "Notice has no profile"
 msgid "Notice has no profile"

-msgstr "Notice has no profile"
+msgstr ""

 
 

-#: ../actions/showstream.php:297
+#: ../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"
 msgid "Notices"

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

 
 

-#: ../actions/password.php:39
+#: ../actions/password.php:39 actions/profilesettings.php:178
+#: actions/passwordsettings.php:97

 msgid "Old password"
 msgid "Old password"

-msgstr "Old password"
+msgstr ""

 
 

-#: ../lib/util.php:288 ../lib/settingsaction.php:96 ../lib/util.php:314
-#: lib/settingsaction.php:90 lib/util.php:330
+#: ../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 ""
 
 msgid "OpenID"
 msgstr ""
 

-#: ../actions/finishopenidlogin.php:61
+#: ../actions/finishopenidlogin.php:61 actions/finishopenidlogin.php:66
+#: actions/finishopenidlogin.php:73

 msgid "OpenID Account Setup"
 msgid "OpenID Account Setup"

-msgstr "OpenID Account Setup"
+msgstr ""

 
 

-#: ../lib/openid.php:180
+#: ../lib/openid.php:180 lib/openid.php:180 lib/openid.php:266

 msgid "OpenID Auto-Submit"
 msgid "OpenID Auto-Submit"

-msgstr "OpenID Auto-Submit"
+msgstr ""

 
 #: ../actions/finishaddopenid.php:99 ../actions/finishopenidlogin.php:140
 
 #: ../actions/finishaddopenid.php:99 ../actions/finishopenidlogin.php:140

-#: ../actions/openidlogin.php:60
+#: ../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 Log-in"
 
 #: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49
 msgid "OpenID Login"
 msgstr "OpenID Log-in"
 
 #: ../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"
 msgid "OpenID URL"

-msgstr "OpenID URL"
+msgstr ""

 
 #: ../actions/finishaddopenid.php:42 ../actions/finishopenidlogin.php:103
 
 #: ../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."
 msgid "OpenID authentication cancelled."

-msgstr "OpenID authentication cancelled."
+msgstr ""

 
 #: ../actions/finishaddopenid.php:46 ../actions/finishopenidlogin.php:107
 
 #: ../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"
 #, php-format
 msgid "OpenID authentication failed: %s"

-msgstr "OpenID authentication failed: %s"
+msgstr ""

 
 

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

 #, php-format
 msgid "OpenID failure: %s"
 #, php-format
 msgid "OpenID failure: %s"

-msgstr "OpenID failure: %s"
+msgstr ""

 
 

-#: ../actions/openidsettings.php:144
+#: ../actions/openidsettings.php:144 actions/openidsettings.php:153
+#: actions/openidsettings.php:231

 msgid "OpenID removed."
 msgid "OpenID removed."

-msgstr "OpenID removed."
+msgstr ""

 
 

-#: ../actions/openidsettings.php:37
+#: ../actions/openidsettings.php:37 actions/openidsettings.php:37
+#: actions/openidsettings.php:59

 msgid "OpenID settings"
 msgid "OpenID settings"

-msgstr "OpenID settings"
+msgstr ""

 
 

-#: ../actions/avatar.php:84
+#: ../actions/invite.php:135 actions/invite.php:143 actions/invite.php:180
+msgid "Optionally add a personal message to the invitation."
+msgstr ""
+
+#: ../actions/avatar.php:84 actions/profilesettings.php:321
+#: lib/imagefile.php:75

 msgid "Partial upload."
 msgid "Partial upload."

-msgstr "Partial upload."
+msgstr ""

 
 

-#: ../actions/finishopenidlogin.php:90 ../actions/login.php:98
-#: ../actions/register.php:177
+#: ../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"
 msgid "Password"

-msgstr "Password"
+msgstr ""

 
 

-#: ../actions/recoverpassword.php:249
+#: ../actions/recoverpassword.php:288 actions/recoverpassword.php:301
+#: actions/recoverpassword.php:335

 msgid "Password and confirmation do not match."
 msgid "Password and confirmation do not match."

-msgstr "Password and confirmation do not match."
+msgstr ""

 
 

-#: ../actions/recoverpassword.php:245
+#: ../actions/recoverpassword.php:284 actions/recoverpassword.php:297
+#: actions/recoverpassword.php:331

 msgid "Password must be 6 chars or more."
 msgid "Password must be 6 chars or more."

-msgstr "Password must be 6 chars or more."
+msgstr ""

 
 

-#: ../actions/recoverpassword.php:222 ../actions/recoverpassword.php:224
+#: ../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"
 msgid "Password recovery requested"

-msgstr "Password recovery requested"
+msgstr ""

 
 

-#: ../actions/password.php:89 ../actions/recoverpassword.php:274
-#: ../actions/recoverpassword.php:313 actions/profilesettings.php:408
-#: actions/recoverpassword.php:326
+#: ../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 ""
 
 msgid "Password saved."
 msgstr ""
 

-#: ../actions/password.php:61 ../actions/register.php:65
+#: ../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."
 
 msgid "Passwords don't match."
 msgstr "Passwords don’t match."
 

-#: ../actions/peoplesearch.php:33
+#: ../lib/searchaction.php:100 lib/searchaction.php:100
+#: lib/searchgroupnav.php:80
+msgid "People"
+msgstr ""
+
+#: ../actions/opensearch.php:33 actions/opensearch.php:33
+#: actions/opensearch.php:64
+msgid "People Search"
+msgstr ""
+
+#: ../actions/peoplesearch.php:33 actions/peoplesearch.php:33
+#: actions/peoplesearch.php:58

 msgid "People search"
 msgid "People search"

-msgstr "People search"
+msgstr "People Search"

 
 

-#: ../lib/stream.php:44 ../lib/stream.php:50 lib/personal.php:50
+#: ../lib/stream.php:50 lib/personal.php:50 lib/personalgroupnav.php:98

 msgid "Personal"
 msgstr ""
 
 msgid "Personal"
 msgstr ""
 

-#: ../actions/userauthorization.php:77
+#: ../actions/invite.php:133 actions/invite.php:141 actions/invite.php:178
+msgid "Personal message"
+msgstr ""
+
+#: ../actions/smssettings.php:69 actions/smssettings.php:69
+msgid "Phone number, no punctuation or spaces, with area code"
+msgstr ""
+
+#: ../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 verify the details to make sure that you want to subscribe to this "
 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 verify the 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’."
+"user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
+"click ‘Cancel’."

 
 

-#: ../actions/imsettings.php:74
+#: ../actions/imsettings.php:73 actions/imsettings.php:74
+#: actions/imsettings.php:142

 msgid "Post a notice when my Jabber/GTalk status changes."
 msgid "Post a notice when my Jabber/GTalk status changes."

-msgstr "Post a notice when my Jabber/GTalk status changes."
+msgstr ""

 
 

-#: ../actions/imsettings.php:68
+#: ../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"
 msgid "Preferences"

-msgstr "Preferences"
+msgstr ""

 
 

-#: ../actions/imsettings.php:135
+#: ../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

 msgid "Preferences saved."
 msgid "Preferences saved."

-msgstr "Preferences saved."
+msgstr ""
+
+#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+#: actions/profilesettings.php:129
+msgid "Preferred language"
+msgstr ""

 
 

-#: ../lib/util.php:300
+#: ../lib/util.php:328 lib/util.php:344 lib/action.php:572

 msgid "Privacy"
 msgid "Privacy"

-msgstr "Privacy"
+msgstr ""

 
 

-#: ../actions/newnotice.php:61 ../actions/newnotice.php:69
+#: ../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."
 msgid "Problem saving notice."

-msgstr "Problem saving notice."
+msgstr ""

 
 

-#: ../lib/stream.php:54
+#: ../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"
 msgid "Profile"

-msgstr "Profile"
+msgstr ""

 
 

-#: ../actions/remotesubscribe.php:73
+#: ../actions/remotesubscribe.php:73 actions/remotesubscribe.php:82
+#: actions/remotesubscribe.php:109

 msgid "Profile URL"
 msgid "Profile URL"

-msgstr "Profile URL"
+msgstr ""

 
 

-#: ../actions/profilesettings.php:34
+#: ../actions/profilesettings.php:34 actions/profilesettings.php:32
+#: actions/profilesettings.php:58

 msgid "Profile settings"
 msgid "Profile settings"

-msgstr "Profile settings"
+msgstr ""

 
 

-#: ../actions/postnotice.php:51 ../actions/updateprofile.php:51
+#: ../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"
 msgid "Profile unknown"

-msgstr "Unknown profile"
-
-#: ../lib/util.php:276
-msgid "Public"

 msgstr ""
 
 msgstr ""
 

-#: ../actions/public.php:54
+#: ../actions/public.php:54 actions/public.php:54 actions/public.php:124

 msgid "Public Stream Feed"
 msgid "Public Stream Feed"

-msgstr "Public Stream Feed"
+msgstr ""

 
 

-#: ../actions/public.php:33
+#: ../actions/public.php:33 actions/public.php:33 actions/public.php:109
+#: lib/publicgroupnav.php:77

 msgid "Public timeline"
 msgid "Public timeline"

-msgstr "Public timeline"
+msgstr ""
+
+#: ../actions/imsettings.php:79 actions/imsettings.php:80
+#: actions/imsettings.php:153
+msgid "Publish a MicroID for my Jabber/GTalk address."
+msgstr ""
+
+#: ../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/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
+#: actions/tag.php:76
+msgid "Recent Tags"
+msgstr ""

 
 

-#: ../actions/recoverpassword.php:151
+#: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
+#: actions/recoverpassword.php:190

 msgid "Recover"
 msgid "Recover"

-msgstr "Recover"
+msgstr ""

 
 

-#: ../actions/recoverpassword.php:141
+#: ../actions/recoverpassword.php:156 actions/recoverpassword.php:161
+#: actions/recoverpassword.php:198

 msgid "Recover password"
 msgid "Recover password"

-msgstr "Recover password"
+msgstr ""

 
 

-#: ../actions/recoverpassword.php:67
+#: ../actions/recoverpassword.php:67 actions/recoverpassword.php:67
+#: actions/recoverpassword.php:73

 msgid "Recovery code for unknown user."
 msgid "Recovery code for unknown user."

-msgstr "Recovery code for unknown user."
+msgstr ""

 
 

-#: ../actions/register.php:171 ../actions/register.php:195 ../lib/util.php:287
+#: ../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"
 msgid "Register"

-msgstr "Register"
+msgstr ""
+
+#: ../actions/register.php:28 actions/register.php:28
+#: actions/finishopenidlogin.php:196 actions/register.php:90
+msgid "Registration not allowed."
+msgstr ""
+
+#: ../actions/register.php:200 actions/register.php:214
+#: actions/register.php:67
+msgid "Registration successful"
+msgstr ""

 
 

-#: ../actions/userauthorization.php:119 ../actions/userauthorization.php:120
-#: actions/userauthorization.php:127
+#: ../actions/userauthorization.php:120 actions/userauthorization.php:127
+#: actions/userauthorization.php:144

 msgid "Reject"
 msgstr ""
 
 msgid "Reject"
 msgstr ""
 

-#: ../actions/login.php:99 ../actions/register.php:183

 #: ../actions/login.php:103 ../actions/register.php:176 actions/login.php:103
 #: ../actions/login.php:103 ../actions/register.php:176 actions/login.php:103

-#: actions/register.php:190
+#: actions/register.php:190 actions/login.php:234 actions/openidlogin.php:107
+#: actions/register.php:414

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

-#: ../actions/updateprofile.php:69 ../actions/updateprofile.php:70
-#: actions/updateprofile.php:71
+#: ../actions/updateprofile.php:70 actions/updateprofile.php:71
+#: actions/updateprofile.php:74

 msgid "Remote profile with no matching profile"
 msgstr ""
 
 #: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
 msgid "Remote profile with no matching profile"
 msgstr ""
 
 #: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73

+#: actions/remotesubscribe.php:88

 msgid "Remote subscribe"
 msgstr ""
 
 msgid "Remote subscribe"
 msgstr ""
 

-#: ../actions/imsettings.php:48 ../actions/openidsettings.php:106

 #: ../actions/emailsettings.php:47 ../actions/emailsettings.php:75
 #: ../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/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/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 ""
 
 #: ../actions/openidsettings.php:68 actions/openidsettings.php:69
 msgid "Remove"
 msgstr ""
 
 #: ../actions/openidsettings.php:68 actions/openidsettings.php:69

+#: actions/openidsettings.php:123

 msgid "Remove OpenID"
 msgstr ""
 
 msgid "Remove OpenID"
 msgstr ""
 


@@ -1062,57 +1936,92 @@ msgid ""
 "Removing your only OpenID would make it impossible to log in! If you need to "
 "remove it, add another OpenID first."
 msgstr ""
 "Removing your only OpenID would make it impossible to log in! If you need to "
 "remove it, add another OpenID first."
 msgstr ""

+"Removing your only OpenID would make it impossible to log-in! If you need to "
+"remove it, add another OpenID first."

 
 

-#: ../lib/stream.php:49 ../lib/stream.php:55 lib/personal.php:55
+#: ../lib/stream.php:55 lib/personal.php:55 lib/personalgroupnav.php:103

 msgid "Replies"
 msgstr ""
 
 msgid "Replies"
 msgstr ""
 

-#: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:50
-#: ../lib/stream.php:56 actions/replies.php:47 actions/repliesrss.php:62
-#: lib/personal.php:56
+#: ../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

 #, php-format
 msgid "Replies to %s"
 msgstr ""
 
 #, php-format
 msgid "Replies to %s"
 msgstr ""
 

-#: ../actions/recoverpassword.php:168 ../actions/recoverpassword.php:183
-#: actions/recoverpassword.php:189
+#: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
+#: actions/recoverpassword.php:223

 msgid "Reset"
 msgstr ""
 
 msgid "Reset"
 msgstr ""
 

-#: ../actions/recoverpassword.php:158 ../actions/recoverpassword.php:173
-#: actions/recoverpassword.php:178
+#: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
+#: actions/recoverpassword.php:197

 msgid "Reset password"
 msgstr ""
 
 msgid "Reset password"
 msgstr ""
 

-#: ../actions/recoverpassword.php:167 ../actions/register.php:180
+#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
+#: actions/subscriptions.php:123 lib/connectsettingsaction.php:107
+msgid "SMS"
+msgstr ""
+
+#: ../actions/smssettings.php:67 actions/smssettings.php:67
+#: actions/smssettings.php:126
+msgid "SMS Phone number"
+msgstr ""
+
+#: ../actions/smssettings.php:33 actions/smssettings.php:33
+#: actions/smssettings.php:58
+msgid "SMS Settings"
+msgstr ""
+
+#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437
+msgid "SMS confirmation"
+msgstr ""
+

 #: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
 #: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188

+#: actions/recoverpassword.php:222

 msgid "Same as password above"
 msgstr ""
 
 msgid "Same as password above"
 msgstr ""
 

-#: ../actions/imsettings.php:76 ../actions/profilesettings.php:58
+#: ../actions/register.php:156 actions/register.php:170
+#: actions/register.php:377
+msgid "Same as password above. Required."
+msgstr ""
+

 #: ../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/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/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 ""
 
 msgid "Save"
 msgstr ""
 

-#: ../lib/searchaction.php:73 ../lib/util.php:277 ../lib/searchaction.php:84
-#: ../lib/util.php:300 lib/searchaction.php:84 lib/util.php:316
+#: ../lib/searchaction.php:84 ../lib/util.php:300 lib/searchaction.php:84
+#: lib/util.php:316 lib/action.php:325

 msgid "Search"
 msgstr ""
 
 #: ../actions/noticesearch.php:80 actions/noticesearch.php:85
 msgid "Search"
 msgstr ""
 
 #: ../actions/noticesearch.php:80 actions/noticesearch.php:85

+#: actions/noticesearch.php:127

 msgid "Search Stream Feed"
 msgstr ""
 
 #: ../actions/noticesearch.php:30 actions/noticesearch.php:30
 msgid "Search Stream Feed"
 msgstr ""
 
 #: ../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."
 msgstr ""
 #, 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/peoplesearch.php:28
 #, php-format
 
 #: ../actions/peoplesearch.php:28
 #, php-format


@@ -1120,151 +2029,264 @@ 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."
 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/smssettings.php:296 actions/smssettings.php:304
+#: actions/smssettings.php:457
+msgid "Select a carrier"
+msgstr ""

 
 

-#: ../lib/util.php:982 ../actions/invite.php:137 ../lib/util.php:1172
-#: actions/invite.php:145 lib/util.php:1306 lib/util.php:1731
+#: ../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 ""
 
 msgid "Send"
 msgstr ""
 

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

 msgid "Send me notices through Jabber/GTalk."
 msgstr ""
 
 msgid "Send me notices through Jabber/GTalk."
 msgstr ""
 

-#: ../lib/util.php:282 ../lib/util.php:304 lib/util.php:320
+#: ../actions/smssettings.php:97 actions/smssettings.php:97
+msgid ""
+"Send me notices through SMS; I understand I may incur exorbitant charges "
+"from my carrier."
+msgstr ""
+
+#: ../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 ""
 
 msgid "Settings"
 msgstr ""
 

-#: ../actions/profilesettings.php:183 ../actions/profilesettings.php:192
-#: actions/profilesettings.php:307
+#: ../actions/profilesettings.php:192 actions/profilesettings.php:307
+#: actions/profilesettings.php:319

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

+#: ../actions/tag.php:60 actions/tag.php:60
+msgid "Showing most popular tags from the last week"
+msgstr ""
+

 #: ../actions/finishaddopenid.php:66 actions/finishaddopenid.php:66
 #: ../actions/finishaddopenid.php:66 actions/finishaddopenid.php:66

+#: actions/finishaddopenid.php:114

 msgid "Someone else already has this OpenID."
 msgstr ""
 
 #: ../actions/finishopenidlogin.php:42 ../actions/openidsettings.php:126
 #: actions/finishopenidlogin.php:47 actions/openidsettings.php:135
 msgid "Someone else already has this OpenID."
 msgstr ""
 
 #: ../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 ""
 
 msgid "Something weird happened."
 msgstr ""
 

-#: ../lib/util.php:302 ../lib/util.php:330 lib/util.php:346
+#: ../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."
+
+#: ../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."
+
+#: ../lib/util.php:330 lib/util.php:346 lib/action.php:574

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

-#: ../actions/showstream.php:277 ../actions/showstream.php:296
-#: actions/showstream.php:311
+#: ../actions/showstream.php:296 actions/showstream.php:311
+#: actions/showstream.php:476

 msgid "Statistics"
 msgstr ""
 
 msgid "Statistics"
 msgstr ""
 

-#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:275
-#: ../actions/finishopenidlogin.php:246 actions/finishopenidlogin.php:188
-#: actions/finishopenidlogin.php:252
+#: ../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 ""
 
 msgid "Stored OpenID not found."
 msgstr ""
 

-#: ../actions/remotesubscribe.php:75 ../actions/showstream.php:172
-#: ../actions/showstream.php:181 ../actions/showstream.php:188
+#: ../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/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 ""
 
 msgid "Subscribe"
 msgstr ""
 

-#: ../actions/showstream.php:294 ../actions/subscribers.php:27
-#: ../actions/showstream.php:313 actions/showstream.php:328
-#: actions/subscribers.php:27
+#: ../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 ""
 
 msgid "Subscribers"
 msgstr ""
 

-#: ../actions/userauthorization.php:309 ../actions/userauthorization.php:310
-#: actions/userauthorization.php:322
+#: ../actions/userauthorization.php:310 actions/userauthorization.php:322
+#: actions/userauthorization.php:338

 msgid "Subscription authorized"
 msgid "Subscription authorized"

-msgstr ""
+msgstr "Subscription authorised"

 
 

-#: ../actions/userauthorization.php:319
+#: ../actions/userauthorization.php:320 actions/userauthorization.php:332
+#: actions/userauthorization.php:349

 msgid "Subscription rejected"
 msgid "Subscription rejected"

-msgstr "Subscription rejected"
+msgstr ""

 
 

-#: ../actions/showstream.php:212 ../actions/showstream.php:288
-#: ../actions/subscriptions.php:27
+#: ../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"
 msgid "Subscriptions"

-msgstr "Subscriptions"
+msgstr ""

 
 

-#: ../actions/avatar.php:87
+#: ../actions/avatar.php:87 actions/profilesettings.php:324
+#: lib/imagefile.php:78

 msgid "System error uploading file."
 msgid "System error uploading file."

-msgstr "System error uploading file."
+msgstr ""
+
+#: ../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 ""
+
+#: ../lib/searchaction.php:104 lib/searchaction.php:104
+msgid "Text"
+msgstr ""

 
 #: ../actions/noticesearch.php:34 actions/noticesearch.php:34
 
 #: ../actions/noticesearch.php:34 actions/noticesearch.php:34

+#: actions/noticesearch.php:67

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

-#: ../actions/openidsettings.php:140
+#: ../actions/openidsettings.php:140 actions/openidsettings.php:149
+#: actions/openidsettings.php:227

 msgid "That OpenID does not belong to you."
 msgid "That OpenID does not belong to you."

-msgstr "That OpenID does not belong to you."
+msgstr ""

 
 #: ../actions/confirmaddress.php:52 actions/confirmaddress.php:52
 
 #: ../actions/confirmaddress.php:52 actions/confirmaddress.php:52

+#: actions/confirmaddress.php:94

 msgid "That address has already been confirmed."
 msgstr ""
 
 #: ../actions/confirmaddress.php:43 actions/confirmaddress.php:43
 msgid "That address has already been confirmed."
 msgstr ""
 
 #: ../actions/confirmaddress.php:43 actions/confirmaddress.php:43

+#: actions/confirmaddress.php:85

 msgid "That confirmation code is not for you!"
 msgstr ""
 
 msgid "That confirmation code is not for you!"
 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/avatar.php:80 actions/profilesettings.php:317
 #: ../actions/avatar.php:80 actions/profilesettings.php:317

+#: lib/imagefile.php:71

 msgid "That file is too big."
 msgstr ""
 
 msgid "That file is too big."
 msgstr ""
 

-#: ../actions/imsettings.php:161 ../actions/imsettings.php:170
-#: actions/imsettings.php:178
+#: ../actions/imsettings.php:170 actions/imsettings.php:178
+#: actions/imsettings.php:293

 msgid "That is already your Jabber ID."
 msgstr ""
 
 msgid "That is already your Jabber ID."
 msgstr ""
 

-#: ../actions/imsettings.php:224 ../actions/imsettings.php:233
-#: actions/imsettings.php:241
+#: ../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/smssettings.php:188 actions/smssettings.php:196
+#: actions/smssettings.php:306
+msgid "That is already your phone number."
+msgstr ""
+
+#: ../actions/imsettings.php:233 actions/imsettings.php:241
+#: actions/imsettings.php:381

 msgid "That is not your Jabber ID."
 msgstr ""
 
 msgid "That is not your Jabber ID."
 msgstr ""
 

-#: ../actions/imsettings.php:201 ../actions/emailsettings.php:226
-#: ../actions/imsettings.php:210 actions/emailsettings.php:244
-#: actions/imsettings.php:218
+#: ../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/smssettings.php:257 actions/smssettings.php:265
+#: actions/smssettings.php:393
+msgid "That is not your phone number."
+msgstr ""
+
+#: ../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."
 msgid "That is the wrong IM address."

+msgstr "That is the wrong I.M. address."
+
+#: ../actions/smssettings.php:233 actions/smssettings.php:241
+#: actions/smssettings.php:362
+msgid "That is the wrong confirmation number."

 msgstr ""
 
 msgstr ""
 

-#: ../actions/newnotice.php:52 ../actions/newnotice.php:49
-#: ../actions/twitapistatuses.php:408 actions/newnotice.php:49
-#: actions/twitapistatuses.php:330
-msgid "That's too long. Max notice size is 140 chars."
+#: ../actions/smssettings.php:191 actions/smssettings.php:199
+#: actions/smssettings.php:309
+msgid "That phone number already belongs to another user."

 msgstr ""
 
 msgstr ""
 

-#: ../actions/confirmaddress.php:86 ../actions/confirmaddress.php:92
-#: actions/confirmaddress.php:92
+#: ../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/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/confirmaddress.php:92 actions/confirmaddress.php:92

 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."

-msgstr ""
+msgstr "The address ‘%s’ has been confirmed for your account."

 
 

-#: ../actions/imsettings.php:241 ../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: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 ""
 
 msgid "The address was removed."
 msgstr ""
 

-#: ../actions/userauthorization.php:311 ../actions/userauthorization.php:312
+#: ../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:"
 msgstr ""
 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 given. Check "
+"with the site’s instructions for details on how to authorise the "
+"subscription. Your subscription token is:"

 
 

-#: ../actions/userauthorization.php:321 ../actions/userauthorization.php:322
+#: ../actions/userauthorization.php:322

 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 ""
 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 given. Check "
+"with the site’s instructions for details on how to fully reject the "
+"subscription."

 
 

-#: ../actions/subscribers.php:35
+#: ../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."
 #, php-format
 msgid "These are the people who listen to %s's notices."
 msgstr "These are the people who listen to %s’s notices."


@@ -1282,7 +2304,12 @@ msgstr ""
 msgid "These are the people whose notices you listen to."
 msgstr ""
 
 msgid "These are the people whose notices you listen to."
 msgstr ""
 

-#: ../actions/recoverpassword.php:87 ../actions/recoverpassword.php:88
+#: ../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 ""
+
+#: ../actions/recoverpassword.php:88

 msgid "This confirmation code is too old. Please start again."
 msgstr ""
 
 msgid "This confirmation code is too old. Please start again."
 msgstr ""
 


@@ -1293,81 +2320,153 @@ msgid ""
 msgstr ""
 
 #: ../actions/finishopenidlogin.php:56 actions/finishopenidlogin.php:61
 msgstr ""
 
 #: ../actions/finishopenidlogin.php:56 actions/finishopenidlogin.php:61

+#: actions/finishopenidlogin.php:67

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

 
 

-#: ../lib/util.php:147 ../lib/util.php:164 lib/util.php:246
+#: ../lib/util.php:164 lib/util.php:246

 msgid "This page is not available in a media type you accept"
 msgstr ""
 
 msgid "This page is not available in a media type you accept"
 msgstr ""
 

+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+#: actions/profilesettings.php:138
+msgid "Timezone"
+msgstr ""
+
+#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
+#: actions/profilesettings.php:211
+msgid "Timezone not selected."
+msgstr ""
+
+# double space.

 #: ../actions/remotesubscribe.php:43
 #, php-format
 msgid ""
 #: ../actions/remotesubscribe.php:43
 #, php-format
 msgid ""

-"To subscribe, you can [login](%%action.login%%), or "
+"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 [log-in](%%action.login%%), or "

 "[register](%%action.register%%) a new  account. If you already have an "
 "[register](%%action.register%%) a new  account. If you already have an "

-"account  on a [compatible microblogging site](%%doc.openmublog%%),  enter "
-"your profile URL below."
+"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 ""
 
 msgstr ""
 

-#: ../actions/profilesettings.php:51 ../actions/profilesettings.php:48
-#: ../actions/register.php:169 actions/profilesettings.php:81
-#: actions/register.php:183
+#: ../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 ""
 
 #: ../actions/remotesubscribe.php:74 actions/remotesubscribe.php:83
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr ""
 
 #: ../actions/remotesubscribe.php:74 actions/remotesubscribe.php:83

+#: actions/remotesubscribe.php:110

 msgid "URL of your profile on another compatible microblogging service"
 msgstr ""
 
 msgid "URL of your profile on another compatible microblogging service"
 msgstr ""
 

-#: ../actions/imsettings.php:105 ../actions/recoverpassword.php:39

 #: ../actions/emailsettings.php:130 ../actions/imsettings.php:110
 #: ../actions/emailsettings.php:130 ../actions/imsettings.php:110

-#: ../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/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 ""
 
 msgid "Unexpected form submission."
 msgstr ""
 

-#: ../actions/recoverpassword.php:237 ../actions/recoverpassword.php:276
-#: actions/recoverpassword.php:289
+#: ../actions/recoverpassword.php:276 actions/recoverpassword.php:289
+#: actions/recoverpassword.php:323

 msgid "Unexpected password reset."
 msgstr ""
 
 msgid "Unexpected password reset."
 msgstr ""
 

+#: ../index.php:57 index.php:57 actions/recoverpassword.php:202
+msgid "Unknown action"
+msgstr ""
+

 #: ../actions/finishremotesubscribe.php:58
 #: ../actions/finishremotesubscribe.php:58

-#: actions/finishremotesubscribe.php:60
+#: actions/finishremotesubscribe.php:60 actions/finishremotesubscribe.php:61

 msgid "Unknown version of OMB protocol."
 msgstr ""
 
 msgid "Unknown version of OMB protocol."
 msgstr ""
 

-#: ../lib/util.php:245 ../lib/util.php:269 lib/util.php:285
+#: ../lib/util.php:269 lib/util.php:285

 msgid ""
 "Unless otherwise specified, contents of this site are copyright by the "
 "contributors and available under the "
 msgstr ""
 
 #: ../actions/confirmaddress.php:48 actions/confirmaddress.php:48
 msgid ""
 "Unless otherwise specified, contents of this site are copyright by the "
 "contributors and available under the "
 msgstr ""
 
 #: ../actions/confirmaddress.php:48 actions/confirmaddress.php:48

+#: actions/confirmaddress.php:90

 #, php-format
 msgid "Unrecognized address type %s"
 #, php-format
 msgid "Unrecognized address type %s"

-msgstr ""
+msgstr "Unrecognised address type %s"

 
 

-#: ../actions/showstream.php:193 ../actions/showstream.php:209
-#: actions/showstream.php:219
+#: ../actions/showstream.php:209 actions/showstream.php:219
+#: lib/unsubscribeform.php:137

 msgid "Unsubscribe"
 msgstr ""
 
 msgid "Unsubscribe"
 msgstr ""
 

-#: ../actions/postnotice.php:44 ../actions/updateprofile.php:44
-#: ../actions/updateprofile.php:45 actions/postnotice.php:45
-#: actions/updateprofile.php:46
+#: ../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 ""
 
 #: ../actions/avatar.php:105 actions/profilesettings.php:342
 msgid "Unsupported OMB version"
 msgstr ""
 
 #: ../actions/avatar.php:105 actions/profilesettings.php:342

+#: lib/imagefile.php:102

 msgid "Unsupported image file format."
 msgstr ""
 
 msgid "Unsupported image file format."
 msgstr ""
 

+#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
+#: lib/connectsettingsaction.php:108
+msgid "Updates by SMS"
+msgstr ""
+
+#: ../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/twitapistatuses.php:241 actions/twitapistatuses.php:158
+#: actions/twitapistatuses.php:129
+#, php-format
+msgid "Updates from %1$s and friends on %2$s!"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
+#: actions/twitapistatuses.php:202
+#, php-format
+msgid "Updates from %1$s on %2$s!"
+msgstr ""
+

 #: ../actions/avatar.php:68 actions/profilesettings.php:161
 #: ../actions/avatar.php:68 actions/profilesettings.php:161

+#: actions/avatarsettings.php:162 actions/grouplogo.php:232

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


@@ -1378,1498 +2477,2326 @@ msgid ""
 "site license, also. Use a picture that belongs to you and that you want to "
 "share."
 msgstr ""
 "site license, also. Use a picture that belongs to you and that you want to "
 "share."
 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."
+
+#: ../lib/settingsaction.php:91
+msgid "Upload a new profile image"
+msgstr ""
+
+#: ../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."
+msgstr ""

 
 

-#: ../actions/profilesettings.php:48 ../actions/register.php:182

 #: ../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 ""
 
 #: ../actions/finishremotesubscribe.php:86
 #: ../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 ""
 
 #: ../actions/finishremotesubscribe.php:86

-#: actions/finishremotesubscribe.php:88
+#: actions/finishremotesubscribe.php:88 actions/finishremotesubscribe.php:94

 msgid "User being listened to doesn't exist."
 msgid "User being listened to doesn't exist."

-msgstr ""
+msgstr "User being listened to doesn’t exist."

 
 #: ../actions/all.php:41 ../actions/avatarbynickname.php:48
 
 #: ../actions/all.php:41 ../actions/avatarbynickname.php:48

-#: ../actions/foaf.php:43 ../actions/replies.php:41
-#: ../actions/showstream.php:44 ../actions/foaf.php:47
-#: ../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/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 ""
 
 #: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
 msgid "User has no profile."
 msgstr ""
 
 #: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80

+#: actions/remotesubscribe.php:105

 msgid "User nickname"
 msgstr ""
 
 msgid "User nickname"
 msgstr ""
 

-#: ../lib/util.php:969 ../lib/util.php:1159 lib/util.php:1293
+#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
+msgid "User not found."
+msgstr ""
+
+#: ../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?"
+
+#: ../lib/util.php:1159 lib/util.php:1293 lib/noticeform.php:141

 #, php-format
 msgid "What's up, %s?"
 #, php-format
 msgid "What's up, %s?"

-msgstr ""
+msgstr "What’s up, %s?"

 
 

-#: ../actions/profilesettings.php:57 ../actions/profilesettings.php:54
-#: ../actions/register.php:175 actions/profilesettings.php:87
-#: actions/register.php:189
+#: ../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\""
 msgid "Where you are, like \"City, State (or Region), Country\""

-msgstr ""
+msgstr "Where you are, like ‘City, State (or Region), Country’"

 
 

-#: ../actions/updateprofile.php:127 ../actions/updateprofile.php:128
-#: actions/updateprofile.php:129
+#: ../actions/updateprofile.php:128 actions/updateprofile.php:129
+#: actions/updateprofile.php:132

 #, php-format
 msgid "Wrong image type for '%s'"
 #, php-format
 msgid "Wrong image type for '%s'"

-msgstr ""
+msgstr "Wrong image type for ‘%s’"

 
 

-#: ../actions/updateprofile.php:122 ../actions/updateprofile.php:123
-#: actions/updateprofile.php:124
+#: ../actions/updateprofile.php:123 actions/updateprofile.php:124
+#: actions/updateprofile.php:127

 #, php-format
 msgid "Wrong size image at '%s'"
 #, 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 ""
 
 #: ../actions/finishaddopenid.php:64 actions/finishaddopenid.php:64
 msgstr ""
 
 #: ../actions/finishaddopenid.php:64 actions/finishaddopenid.php:64

+#: actions/finishaddopenid.php:112

 msgid "You already have this OpenID!"
 msgstr ""
 
 msgid "You already have this OpenID!"
 msgstr ""
 

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

 #: ../actions/recoverpassword.php:31 actions/recoverpassword.php:31
 #: ../actions/recoverpassword.php:31 actions/recoverpassword.php:31

+#: actions/recoverpassword.php:36

 msgid "You are already logged in!"
 msgstr ""
 
 msgid "You are already logged in!"
 msgstr ""
 

+#: ../actions/invite.php:81 actions/invite.php:88 actions/invite.php:120
+msgid "You are already subscribed to these users:"
+msgstr ""
+
+#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
+#: actions/twitapifriendships.php:105
+msgid "You are not friends with the specified user."
+msgstr ""
+

 #: ../actions/password.php:27
 msgid "You can change your password here. Choose a good one!"
 msgstr ""
 
 #: ../actions/password.php:27
 msgid "You can change your password here. Choose a good one!"
 msgstr ""
 

-#: ../actions/register.php:164 ../actions/register.php:135
-#: actions/register.php:145
+#: ../actions/register.php:135 actions/register.php:145

 msgid "You can create a new account to start posting notices."
 msgstr ""
 
 msgid "You can create a new account to start posting notices."
 msgstr ""
 

+#: ../actions/smssettings.php:28 actions/smssettings.php:28
+#: actions/smssettings.php:69
+#, 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%%."
+

 #: ../actions/openidsettings.php:86
 msgid ""
 "You can remove an OpenID from your account by clicking the button marked "
 "\"Remove\"."
 msgstr ""
 #: ../actions/openidsettings.php:86
 msgid ""
 "You can remove an OpenID from your account by clicking the button marked "
 "\"Remove\"."
 msgstr ""

+"You can remove an OpenID from your account by clicking the button marked "
+"‘Remove’."

 
 #: ../actions/imsettings.php:28 actions/imsettings.php:28
 #, php-format
 msgid ""
 
 #: ../actions/imsettings.php:28 actions/imsettings.php:28
 #, php-format
 msgid ""

-"You can send and receive notices through Jabber/GTalk [instant "
-"messages](%%doc.im%%). Configure your address and settings below."
+"You can send and receive notices through Jabber/GTalk [instant messages](%%"
+"doc.im%%). Configure your address and settings below."

 msgstr ""
 
 #: ../actions/profilesettings.php:27
 msgid ""
 msgstr ""
 
 #: ../actions/profilesettings.php:27
 msgid ""

-"You can update your personal profile info here so people know more about "
-"you."
+"You can update your personal profile info here so people know more about you."

 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:31 ../actions/remotesubscribe.php:31
 #: actions/finishremotesubscribe.php:31 actions/remotesubscribe.php:31
 msgstr ""
 
 #: ../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 ""
 
 msgid "You can use the local subscription!"
 msgstr ""
 

-#: ../actions/finishopenidlogin.php:33 ../actions/register.php:51
-#: ../actions/register.php:61 actions/finishopenidlogin.php:38
-#: actions/register.php:68
+#: ../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."
 msgid "You can't register if you don't agree to the license."

-msgstr ""
+msgstr "You can’t register if you don’t agree to the licence."

 
 

-#: ../actions/updateprofile.php:62 ../actions/updateprofile.php:63
-#: actions/updateprofile.php:64
+#: ../actions/updateprofile.php:63 actions/updateprofile.php:64
+#: actions/updateprofile.php:67

 msgid "You did not send us that profile"
 msgstr ""
 
 msgid "You did not send us that profile"
 msgstr ""
 

-#: ../actions/recoverpassword.php:134 ../actions/recoverpassword.php:149
-msgid "You've been identified. Enter a  new password below. "
+#: ../lib/mail.php:147
+#, 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"
+
+#: ../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 ""
+
+#: ../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!"

 msgstr ""
 
 msgstr ""
 

+# 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/openidlogin.php:67 actions/openidlogin.php:76
 #: ../actions/openidlogin.php:67 actions/openidlogin.php:76

+#: actions/openidlogin.php:104

 msgid "Your OpenID URL"
 msgstr ""
 
 msgid "Your OpenID URL"
 msgstr ""
 

-#: ../actions/recoverpassword.php:149 ../actions/recoverpassword.php:164
+#: ../actions/recoverpassword.php:164

 msgid "Your nickname on this server, or your registered email address."
 msgid "Your nickname on this server, or your registered email address."

-msgstr ""
+msgstr "Your nickname on this server, or your registered e-mail address."

 
 

+# extra spaces.

 #: ../actions/openidsettings.php:28
 #, php-format
 msgid ""
 "[OpenID](%%doc.openid%%) lets you log into many sites  with the same user "
 "account.  Manage your associated OpenIDs from here."
 msgstr ""
 #: ../actions/openidsettings.php:28
 #, 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."

 
 

-#: ../lib/util.php:814 ../lib/util.php:943 lib/util.php:992
+#: ../lib/util.php:943 lib/util.php:992 lib/util.php:945

 msgid "a few seconds ago"
 msgstr ""
 
 msgid "a few seconds ago"
 msgstr ""
 

-#: ../lib/util.php:826 ../lib/util.php:955 lib/util.php:1004
+#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957

 #, php-format
 msgid "about %d days ago"
 msgstr ""
 
 #, php-format
 msgid "about %d days ago"
 msgstr ""
 

-#: ../lib/util.php:822 ../lib/util.php:951 lib/util.php:1000
+#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953

 #, php-format
 msgid "about %d hours ago"
 msgstr ""
 
 #, php-format
 msgid "about %d hours ago"
 msgstr ""
 

-#: ../lib/util.php:818 ../lib/util.php:947 lib/util.php:996
+#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949

 #, php-format
 msgid "about %d minutes ago"
 msgstr ""
 
 #, php-format
 msgid "about %d minutes ago"
 msgstr ""
 

-#: ../lib/util.php:830 ../lib/util.php:959 lib/util.php:1008
+#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961

 #, php-format
 msgid "about %d months ago"
 msgstr ""
 
 #, php-format
 msgid "about %d months ago"
 msgstr ""
 

-#: ../lib/util.php:824 ../lib/util.php:953 lib/util.php:1002
+#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955

 msgid "about a day ago"
 msgstr ""
 
 msgid "about a day ago"
 msgstr ""
 

-#: ../lib/util.php:816 ../lib/util.php:945 lib/util.php:994
+#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947

 msgid "about a minute ago"
 msgstr ""
 
 msgid "about a minute ago"
 msgstr ""
 

-#: ../lib/util.php:828 ../lib/util.php:957 lib/util.php:1006
+#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959

 msgid "about a month ago"
 msgstr ""
 
 msgid "about a month ago"
 msgstr ""
 

-#: ../lib/util.php:832 ../lib/util.php:961 lib/util.php:1010
+#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963

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

-#: ../lib/util.php:820 ../lib/util.php:949 lib/util.php:998
+#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951

 msgid "about an hour ago"
 msgstr ""
 
 msgid "about an hour ago"
 msgstr ""
 

-#: ../actions/noticesearch.php:126 ../actions/showstream.php:383
-#: ../lib/stream.php:101 ../actions/noticesearch.php:130
-#: ../actions/showstream.php:408 ../lib/stream.php:117
-#: actions/noticesearch.php:136 actions/showstream.php:426 lib/stream.php:84
-msgid "in reply to..."
+#: ../actions/showstream.php:423 ../lib/stream.php:132
+#: actions/showstream.php:441 lib/stream.php:99
+msgid "delete"

 msgstr ""
 
 msgstr ""
 

-#: ../actions/noticesearch.php:133 ../actions/showstream.php:390
-#: ../lib/stream.php:108 ../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: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 ""
 
 #: ../actions/password.php:44 actions/profilesettings.php:183
 msgid "reply"
 msgstr ""
 
 #: ../actions/password.php:44 actions/profilesettings.php:183

+#: actions/passwordsettings.php:106

 msgid "same as password above"
 msgstr ""
 
 msgid "same as password above"
 msgstr ""
 

+#: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
+#: actions/twitapistatuses.php:555
+msgid "unsupported file type"
+msgstr ""
+

 #  erm, not sure what to do here, « is recognised as a quotation mark.
 #  erm, not sure what to do here, « is recognised as a quotation mark.

-#: ../lib/util.php:1127
+#: ../lib/util.php:1309 lib/util.php:1443

 msgid "« After"
 msgstr "← After"
 
 msgid "« After"
 msgstr "← After"
 

-#: ../actions/showstream.php:400 ../lib/stream.php:109
-#: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
-msgid " from "
+#: 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 ""
 
 msgstr ""
 

-#: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
+#: actions/disfavor.php:55 actions/disfavor.php:81
+msgid "This notice is not a favorite!"
+msgstr "This notice is not a favourite!"
+
+#: actions/disfavor.php:63 actions/disfavor.php:87
+msgid "Could not delete favorite."
+msgstr "Could not delete favourite."
+
+#: actions/disfavor.php:72 lib/favorform.php:140
+msgid "Favor"
+msgstr "Favour"
+
+#: 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/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/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/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/favor.php:70
+msgid "Disfavor"
+msgstr "Disfavour"
+
+#: actions/favoritesrss.php:60 actions/showfavorites.php:47
+#: actions/favoritesrss.php:100 actions/showfavorites.php:77

 #, php-format
 #, php-format

-msgid "%1$s / Updates replying to %2$s"
-msgstr ""
+msgid "%s favorite notices"
+msgstr "%s favourite notices"

 
 

-#: ../actions/invite.php:168 actions/invite.php:176
+#: actions/favoritesrss.php:64 actions/favoritesrss.php:104

 #, php-format
 #, php-format

-msgid "%1$s has invited you to join them on %2$s"
-msgstr ""
+msgid "Feed of favorite notices of %s"
+msgstr "Feed of favourite notices of %s"

 
 

-#: ../actions/invite.php:170
+#: actions/inbox.php:28 actions/inbox.php:59
+#, php-format
+msgid "Inbox for %s - page %d"
+msgstr "In-box for %s - page %d"
+
+#: actions/inbox.php:30 actions/inbox.php:62
+#, php-format
+msgid "Inbox for %s"
+msgstr "In-box 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 in-box, which lists your incoming private messages."
+
+#: actions/invite.php:178 actions/invite.php:213

 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
 "\n"
 #, 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 ""
 
 msgstr ""
 

-#: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
-#, php-format
-msgid "%1$s updates that reply to updates from %2$s / %3$s."
-msgstr ""
+# 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 log-in in the future - "

 
 

-#: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
-#: actions/invite.php:99
-#, php-format
-msgid "%s (%s)"
+#: actions/login.php:122 actions/login.php:264
+msgid "For security reasons, please re-enter your "

 msgstr ""
 
 msgstr ""
 

-#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
-#, php-format
-msgid "%s public timeline"
-msgstr ""
+#: actions/login.php:126 actions/login.php:268
+msgid "Login with your username and password. "
+msgstr "Log-in with your username and password. "

 
 

-#: ../lib/mail.php:206 lib/mail.php:212
-#, php-format
-msgid "%s status"
-msgstr ""
+#: 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/twitapistatuses.php:338 actions/twitapistatuses.php:265
-#, php-format
-msgid "%s timeline"
+#: actions/newmessage.php:65 actions/newmessage.php:128
+msgid "No recipient specified."

 msgstr ""
 
 msgstr ""
 

-#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
-#, php-format
-msgid "%s updates from everyone!"
-msgstr ""
+#: actions/newmessage.php:68 actions/newmessage.php:113
+#: classes/Command.php:206 actions/newmessage.php:131
+#: actions/newmessage.php:168 classes/Command.php:237
+msgid "You can't send a message to this user."
+msgstr "You can’t send a message to this user."

 
 

-#: ../actions/register.php:213
+#: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
+#: classes/Command.php:209 actions/twitapidirect_messages.php:158
+#: classes/Command.php:240

 msgid ""
 msgid ""

-"(You should receive a message by email momentarily, with instructions on how "
-"to confirm your email address.)"
+"Don't send a message to yourself; just say it to yourself quietly instead."

 msgstr ""
 msgstr ""

+"Don’t send a message to yourself - just say it to yourself quietly instead."

 
 

-#: ../actions/register.php:152 actions/register.php:166
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+#: actions/newmessage.php:108 actions/microsummary.php:62
+#: actions/newmessage.php:163
+msgid "No such user"

 msgstr ""
 
 msgstr ""
 

-#: ../actions/register.php:154 actions/register.php:168
-msgid "6 or more characters. Required."
+#: actions/newmessage.php:117 actions/newmessage.php:67
+msgid "New message"

 msgstr ""
 
 msgstr ""
 

-#: ../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."
+#: actions/noticesearch.php:95 actions/noticesearch.php:146
+msgid "Notice without matching profile"

 msgstr ""
 
 msgstr ""
 

-#: ../actions/smssettings.php:216 actions/smssettings.php:224
-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."
-msgstr ""
+#: 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-in to many sites "

 
 

-#: ../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
-msgid "API method not found!"
+#: actions/openidsettings.php:46 actions/openidsettings.php:96
+msgid "If you want to add an OpenID to your account, "

 msgstr ""
 
 msgstr ""
 

-#: ../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
-msgid "API method under construction."
-msgstr ""
+#: 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! "

 
 

-#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
-msgid "Add or remove OpenIDs"
+#: actions/openidsettings.php:87 actions/openidsettings.php:143
+msgid "You can remove an OpenID from your account "

 msgstr ""
 
 msgstr ""
 

-#: ../actions/invite.php:131 actions/invite.php:139
-msgid "Addresses of friends to invite (one per line)"
+#: actions/outbox.php:28 actions/outbox.php:58
+#, php-format
+msgid "Outbox for %s - page %d"

 msgstr ""
 
 msgstr ""
 

-#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
-msgid "Are you sure you want to delete this notice?"
+#: actions/outbox.php:30 actions/outbox.php:61
+#, php-format
+msgid "Outbox for %s"

 msgstr ""
 
 msgstr ""
 

-#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
-msgid ""
-"Automatically subscribe to whoever subscribes to me (best for "
-"non-humans)"
+#: actions/outbox.php:53 actions/outbox.php:116
+msgid "This is your outbox, which lists private messages you have sent."

 msgstr ""
 
 msgstr ""
 

-#: ../actions/emailsettings.php:54 actions/emailsettings.php:55
+#: actions/peoplesearch.php:28 actions/peoplesearch.php:52
+#, php-format

 msgid ""
 msgid ""

-"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
-"a message with further instructions."
+"Search for people on %%site.name%% by their name, location, or interests. "

 msgstr ""
 
 msgstr ""
 

-#: ../actions/smssettings.php:58 actions/smssettings.php:58
-msgid "Awaiting confirmation on this phone number."
+#: actions/profilesettings.php:27 actions/profilesettings.php:69
+msgid "You can update your personal profile info here "

 msgstr ""
 
 msgstr ""
 

-#: ../lib/deleteaction.php:41 lib/deleteaction.php:41
-msgid "Can't delete this notice."
+#: 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 ""
 
 msgstr ""
 

-#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
-msgid "Cannot normalize that email address"
+#: actions/recoverpassword.php:91 actions/recoverpassword.php:97
+msgid "This confirmation code is too old. "

 msgstr ""
 
 msgstr ""
 

-#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
-msgid "Change email handling"
-msgstr ""
+#: actions/recoverpassword.php:141 actions/recoverpassword.php:152
+msgid "If you've forgotten or lost your"
+msgstr "If you’ve forgotten or lost your"

 
 

-#: ../lib/settingsaction.php:94
-msgid "Change your password"
-msgstr ""
+#: actions/recoverpassword.php:154 actions/recoverpassword.php:158
+msgid "You've been identified. Enter a "
+msgstr "You’ve been identified. Enter a "

 
 

-#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
-msgid "Change your profile settings"
+#: actions/recoverpassword.php:169 actions/recoverpassword.php:188
+msgid "Your nickname on this server, "

 msgstr ""
 
 msgstr ""
 

-#: ../actions/smssettings.php:63 actions/smssettings.php:63
-msgid "Confirmation code"
+#: actions/recoverpassword.php:271 actions/recoverpassword.php:304
+msgid "Instructions for recovering your password "

 msgstr ""
 
 msgstr ""
 

-#: ../actions/register.php:202
+#: actions/recoverpassword.php:327 actions/recoverpassword.php:361
+msgid "New password successfully saved. "
+msgstr ""
+
+#: actions/register.php:95 actions/register.php:180
+msgid "Password must be 6 or more characters."
+msgstr ""
+
+#: actions/register.php:216

 #, php-format
 msgid ""
 "Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
 #, php-format
 msgid ""
 "Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "

-"want to...\n"
+"want to..."
+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 in a moment, with "
+
+#: actions/remotesubscribe.php:51 actions/remotesubscribe.php:74
+#, php-format
+msgid "To subscribe, you can [login](%%action.login%%),"
+msgstr "To subscribe, you can [log-in](%%action.login%%),"
+
+#: actions/showfavorites.php:61 actions/showfavorites.php:145
+#, php-format
+msgid "Feed for favorites of %s"
+msgstr "Feed for favourites of %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/showmessage.php:33 actions/showmessage.php:81
+msgid "No such message."
+msgstr ""
+
+#: actions/showmessage.php:42
+msgid "Only the sender and recipient may read this message."
+msgstr ""
+
+#: actions/showmessage.php:61 actions/showmessage.php:108
+#, php-format
+msgid "Message to %1$s on %2$s"
+msgstr ""
+
+#: actions/showmessage.php:66 actions/showmessage.php:113
+#, php-format
+msgid "Message from %1$s on %2$s"
+msgstr ""
+
+#: actions/showstream.php:154
+msgid "Send a message"
+msgstr ""
+
+#: actions/smssettings.php:312 actions/smssettings.php:464
+#, php-format
+msgid "Mobile carrier for your phone. "
+msgstr ""
+
+#: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:68
+#, php-format
+msgid "Direct messages to %s"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:69
+#, php-format
+msgid "All the direct messages sent to %s"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:73
+msgid "Direct Messages You've Sent"
+msgstr "Direct Messages You’ve Sent"
+
+#: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:74
+#, php-format
+msgid "All the direct messages sent from %s"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:128
+#: actions/twitapidirect_messages.php:137
+msgid "No message text!"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:138
+#: actions/twitapidirect_messages.php:150
+msgid "Recipient user not found."
+msgstr ""
+
+#: 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/twitapifavorites.php:92 actions/twitapifavorites.php:66
+#, php-format
+msgid "%s / Favorites from %s"
+msgstr "%s / Favourites from %s"
+
+#: actions/twitapifavorites.php:95 actions/twitapifavorites.php:69
+#, php-format
+msgid "%s updates favorited by %s / %s."
+msgstr "%s updates favourited by %s / %s."
+
+#: actions/twitapifavorites.php:187 lib/mail.php:275
+#: actions/twitapifavorites.php:164 lib/mail.php:553
+#, php-format
+msgid "%s added your notice as a favorite"
+msgstr "%s added your notice as a favourite"
+
+#: actions/twitapifavorites.php:188 lib/mail.php:276
+#: actions/twitapifavorites.php:165
+#, php-format
+msgid ""
+"%1$s just added your notice from %2$s as one of their favorites.\n"

 "\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"
+msgstr ""
+"%1$s just added your notice from %2$s as one of their favourites.\n"

 "\n"
 "\n"

-"Thanks for signing up and we hope you enjoy using this service."
+
+#: actions/twittersettings.php:27
+msgid ""
+"Add your Twitter account to automatically send your notices to Twitter, "

 msgstr ""
 
 msgstr ""
 

-#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
-#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
+#: actions/twittersettings.php:41 actions/twittersettings.php:60
+msgid "Twitter settings"
+msgstr ""
+
+#: actions/twittersettings.php:48 actions/twittersettings.php:105
+msgid "Twitter Account"
+msgstr ""
+
+#: actions/twittersettings.php:56 actions/twittersettings.php:113
+msgid "Current verified Twitter account."
+msgstr ""
+
+#: actions/twittersettings.php:63
+msgid "Twitter Username"
+msgstr ""
+
+#: actions/twittersettings.php:65 actions/twittersettings.php:123
+msgid "No spaces, please."
+msgstr ""
+
+#: actions/twittersettings.php:67
+msgid "Twitter Password"
+msgstr ""
+
+#: actions/twittersettings.php:72 actions/twittersettings.php:139
+msgid "Automatically send my notices to Twitter."
+msgstr ""
+
+#: actions/twittersettings.php:75 actions/twittersettings.php:146
+msgid "Send local \"@\" replies to Twitter."
+msgstr "Send local ‘@’ replies to Twitter."
+
+#: actions/twittersettings.php:78 actions/twittersettings.php:153
+msgid "Subscribe to my Twitter friends here."
+msgstr ""
+
+#: actions/twittersettings.php:122
+msgid ""
+"Username must have only numbers, upper- and lowercase letters, and "
+"underscore (_). 15 chars max."
+msgstr ""
+
+#: actions/twittersettings.php:128 actions/twittersettings.php:334
+msgid "Could not verify your Twitter credentials!"
+msgstr ""
+
+#: actions/twittersettings.php:137

 #, php-format
 #, php-format

-msgid "Could not follow user: %s is already on your list."
+msgid "Unable to retrieve account information for \"%s\" from Twitter."
+msgstr "Unable to retrieve account information for ‘%s’ from Twitter."
+
+#: actions/twittersettings.php:151 actions/twittersettings.php:170
+#: actions/twittersettings.php:348 actions/twittersettings.php:368
+msgid "Unable to save your Twitter settings!"

 msgstr ""
 
 msgstr ""
 

-#: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
-msgid "Could not follow user: User not found."
+#: actions/twittersettings.php:174 actions/twittersettings.php:376
+msgid "Twitter settings saved."

 msgstr ""
 
 msgstr ""
 

-#: ../lib/subs.php:54 lib/subs.php:61
-msgid "Could not subscribe other to you."
+#: actions/twittersettings.php:192 actions/twittersettings.php:395
+msgid "That is not your Twitter account."

 msgstr ""
 
 msgstr ""
 

-#: ../lib/subs.php:46 lib/subs.php:46
-msgid "Could not subscribe."
+#: 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/twittersettings.php:212 actions/twittersettings.php:407
+msgid "Twitter account removed."

 msgstr ""
 
 msgstr ""
 

-#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
-msgid "Could not update user with confirmed email address."
+#: 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/twittersettings.php:245 actions/twittersettings.php:461
+msgid "Twitter preferences saved."

 msgstr ""
 
 msgstr ""
 

-#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
-msgid "Couldn't find any statuses."
+#: actions/userauthorization.php:84 actions/userauthorization.php:86
+msgid "Please check these details to make sure "

 msgstr ""
 
 msgstr ""
 

-#: ../actions/profilesettings.php:161 actions/profilesettings.php:276
-msgid "Couldn't update user for autosubscribe."
+#: 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/userauthorization.php:334 actions/userauthorization.php:351
+msgid "The subscription has been rejected, but no "

 msgstr ""
 
 msgstr ""
 

-#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
-#: actions/emailsettings.php:298 actions/emailsettings.php:312
-msgid "Couldn't update user record."
+#: classes/Channel.php:113 classes/Channel.php:132 classes/Channel.php:151
+msgid "Command results"

 msgstr ""
 
 msgstr ""
 

-#: ../actions/smssettings.php:46 actions/smssettings.php:46
-msgid "Current confirmed SMS-enabled phone number."
+#: classes/Channel.php:148 classes/Channel.php:204
+msgid "Command complete"

 msgstr ""
 
 msgstr ""
 

-#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
-msgid "Current confirmed email address."
+#: classes/Channel.php:158 classes/Channel.php:215
+msgid "Command failed"

 msgstr ""
 
 msgstr ""
 

-#: ../classes/Notice.php:72 classes/Notice.php:86
+#: classes/Command.php:39 classes/Command.php:44
+msgid "Sorry, this command is not yet implemented."
+msgstr ""
+
+#: classes/Command.php:96 classes/Command.php:113

 #, php-format
 #, php-format

-msgid "DB error inserting hashtag: %s"
+msgid "Subscriptions: %1$s\n"

 msgstr ""
 
 msgstr ""
 

-#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
-msgid "Delete notice"
+#: classes/Command.php:125 classes/Command.php:242 classes/Command.php:145
+#: classes/Command.php:276
+msgid "User has no last notice"

 msgstr ""
 
 msgstr ""
 

-#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
-msgid "Email Address"
+#: classes/Command.php:146 classes/Command.php:166
+msgid "Notice marked as fave."

 msgstr ""
 
 msgstr ""
 

-#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
-msgid "Email Settings"
+#: classes/Command.php:166 classes/Command.php:189
+#, php-format
+msgid "%1$s (%2$s)"

 msgstr ""
 
 msgstr ""
 

-#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
-msgid "Email address, like \"UserName@example.org\""
+#: classes/Command.php:169 classes/Command.php:192
+#, php-format
+msgid "Fullname: %s"
+msgstr "Full name: %s"
+
+#: classes/Command.php:172 classes/Command.php:195
+#, php-format
+msgid "Location: %s"

 msgstr ""
 
 msgstr ""
 

-#: ../actions/invite.php:129 actions/invite.php:137
-msgid "Email addresses"
+#: classes/Command.php:175 classes/Command.php:198
+#, php-format
+msgid "Homepage: %s"

 msgstr ""
 
 msgstr ""
 

-#: ../actions/smssettings.php:64 actions/smssettings.php:64
-msgid "Enter the code you received on your phone."
+#: classes/Command.php:178 classes/Command.php:201
+#, php-format
+msgid "About: %s"

 msgstr ""
 
 msgstr ""
 

-#: ../actions/tag.php:55 actions/tag.php:55
+#: classes/Command.php:200 classes/Command.php:228

 #, php-format
 #, php-format

-msgid "Feed for tag %s"
+msgid "Message too long - maximum is 140 characters, you sent %d"

 msgstr ""
 
 msgstr ""
 

-#: ../lib/searchaction.php:105 lib/searchaction.php:105
-msgid "Find content of notices"
+#: classes/Command.php:214 classes/Command.php:245
+#, php-format
+msgid "Direct message to %s sent"

 msgstr ""
 
 msgstr ""
 

-#: ../lib/searchaction.php:101 lib/searchaction.php:101
-msgid "Find people on this site"
+#: classes/Command.php:216 classes/Command.php:247
+msgid "Error sending direct message."

 msgstr ""
 
 msgstr ""
 

-#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
-msgid "I want to post notices by email."
+#: classes/Command.php:263 classes/Command.php:300
+msgid "Specify the name of the user to subscribe to"

 msgstr ""
 
 msgstr ""
 

-#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
-msgid "IM"
+#: classes/Command.php:270 classes/Command.php:307
+#, php-format
+msgid "Subscribed to %s"

 msgstr ""
 
 msgstr ""
 

-#: ../actions/recoverpassword.php:137
+#: classes/Command.php:288 classes/Command.php:328
+msgid "Specify the name of the user to unsubscribe from"
+msgstr ""
+
+#: classes/Command.php:295 classes/Command.php:335
+#, php-format
+msgid "Unsubscribed from %s"
+msgstr ""
+
+#: classes/Command.php:310 classes/Command.php:330 classes/Command.php:353
+#: classes/Command.php:376
+msgid "Command not yet implemented."
+msgstr ""
+
+#: classes/Command.php:313 classes/Command.php:356
+msgid "Notification off."
+msgstr ""
+
+#: classes/Command.php:315 classes/Command.php:358
+msgid "Can't turn off notification."
+msgstr "Can’t turn off notification."
+
+#: classes/Command.php:333 classes/Command.php:379
+msgid "Notification on."
+msgstr ""
+
+#: classes/Command.php:335 classes/Command.php:381
+msgid "Can't turn on notification."
+msgstr "Can’t turn on notification."
+
+#: classes/Command.php:344 classes/Command.php:392
+msgid "Commands:\n"
+msgstr ""
+
+#: classes/Message.php:53 classes/Message.php:56
+msgid "Could not insert message."
+msgstr ""
+
+#: classes/Message.php:63 classes/Message.php:66
+msgid "Could not update message with new URI."
+msgstr ""
+
+#: lib/gallery.php:46
+msgid "User without matching profile in system."
+msgstr ""
+
+#: lib/mail.php:147 lib/mail.php:289
+#, php-format

 msgid ""
 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."
+"You have a new posting address on %1$s.\n"
+"\n"

 msgstr ""
 
 msgstr ""
 

-#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
-#: actions/emailsettings.php:68 actions/smssettings.php:76
-msgid "Incoming email"
+#: lib/mail.php:249 lib/mail.php:508
+#, php-format
+msgid "New private message from %s"

 msgstr ""
 
 msgstr ""
 

-#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
-msgid "Incoming email address removed."
+#: lib/mail.php:253 lib/mail.php:512
+#, php-format
+msgid ""
+"%1$s (%2$s) sent you a private message:\n"
+"\n"
+msgstr ""
+
+#: lib/mailbox.php:43 lib/mailbox.php:89
+msgid "Only the user can read their own mailboxes."
+msgstr ""
+
+#: lib/openid.php:195 lib/openid.php:203
+msgid "This form should automatically submit itself. "
+msgstr ""
+
+#: lib/personal.php:65 lib/personalgroupnav.php:113
+msgid "Favorites"
+msgstr "Favourites"
+
+#: lib/personal.php:66 lib/personalgroupnav.php:114
+#, php-format
+msgid "%s's favorite notices"
+msgstr "%s’s favourite notices"
+
+#: lib/personal.php:66 lib/personalgroupnav.php:114
+msgid "User"
+msgstr ""
+
+#: lib/personal.php:75 lib/personalgroupnav.php:123
+msgid "Inbox"
+msgstr "In-box"
+
+#: lib/personal.php:76 lib/personalgroupnav.php:124
+msgid "Your incoming messages"
+msgstr ""
+
+#: lib/personal.php:80 lib/personalgroupnav.php:128
+msgid "Outbox"
+msgstr ""
+
+#: lib/personal.php:81 lib/personalgroupnav.php:129
+msgid "Your sent messages"
+msgstr ""
+
+#: lib/settingsaction.php:99 lib/connectsettingsaction.php:110
+msgid "Twitter"
+msgstr ""
+
+#: lib/settingsaction.php:100 lib/connectsettingsaction.php:111
+msgid "Twitter integration options"
+msgstr ""
+
+#: lib/util.php:1718 lib/messageform.php:139 lib/noticelist.php:422
+msgid "To"
+msgstr ""
+
+#: scripts/maildaemon.php:45 scripts/maildaemon.php:48
+msgid "Could not parse message."
+msgstr ""
+
+#: actions/all.php:63 actions/facebookhome.php:162
+#, php-format
+msgid "%s and friends, page %d"
+msgstr ""
+
+#: actions/avatarsettings.php:76
+msgid "You can upload your personal avatar."
+msgstr ""
+
+#  requires full stops?
+#: actions/avatarsettings.php:117 actions/avatarsettings.php:191
+#: actions/grouplogo.php:250
+msgid "Avatar settings"
+msgstr ""
+
+#: actions/avatarsettings.php:124 actions/avatarsettings.php:199
+#: actions/grouplogo.php:198 actions/grouplogo.php:258
+msgid "Original"
+msgstr ""
+
+#: actions/avatarsettings.php:139 actions/avatarsettings.php:211
+#: actions/grouplogo.php:209 actions/grouplogo.php:270
+msgid "Preview"
+msgstr ""
+
+#: actions/avatarsettings.php:225 actions/grouplogo.php:284
+msgid "Crop"
+msgstr ""
+
+#: 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 ""
+
+#: actions/avatarsettings.php:303 actions/grouplogo.php:360
+msgid "Pick a square area of the image to be your avatar"
+msgstr ""
+
+#: actions/avatarsettings.php:327 actions/grouplogo.php:384
+msgid "Lost our file data."
+msgstr ""
+
+#: actions/avatarsettings.php:334 actions/grouplogo.php:391
+#: classes/User_group.php:112
+msgid "Lost our file."
+msgstr ""
+
+#: 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 ""
+
+#: actions/block.php:69 actions/subedit.php:46 actions/unblock.php:70
+msgid "No profile specified."
+msgstr ""
+
+#: actions/block.php:74 actions/subedit.php:53 actions/tagother.php:46
+#: actions/unblock.php:75
+msgid "No profile with that ID."
+msgstr ""
+
+#: actions/block.php:111
+msgid "Block user"
+msgstr ""
+
+#: actions/block.php:129
+msgid "Are you sure you want to block this user? "
+msgstr ""
+
+#: actions/block.php:162
+msgid "You have already blocked this user."
+msgstr ""
+
+#: actions/block.php:167
+msgid "Failed to save block information."
+msgstr ""
+
+#: actions/confirmaddress.php:159
+#, php-format
+msgid "The address \"%s\" has been "
+msgstr "The address ‘%s’ has been "
+
+#: actions/deletenotice.php:73
+msgid "You are about to permanently delete a notice. "
+msgstr ""
+
+#: actions/disfavor.php:94
+msgid "Add to favorites"
+msgstr "Add to favourites"
+
+#: actions/editgroup.php:54
+#, php-format
+msgid "Edit %s group"
+msgstr ""
+
+#: 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 "In-boxes must be enabled for groups to work"
+
+#: actions/editgroup.php:71 actions/grouplogo.php:71 actions/newgroup.php:70
+msgid "You must be logged in to create a group."
+msgstr ""
+
+#: actions/editgroup.php:87 actions/grouplogo.php:87
+#: actions/groupmembers.php:76 actions/joingroup.php:81
+#: actions/showgroup.php:121
+msgid "No nickname"
+msgstr ""
+
+#: 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 ""
+
+#: actions/editgroup.php:106 actions/editgroup.php:165
+#: actions/grouplogo.php:107
+msgid "You must be an admin to edit the group"
+msgstr ""
+
+#: actions/editgroup.php:157
+msgid "Use this form to edit the group."
+msgstr ""
+
+#: actions/editgroup.php:179 actions/newgroup.php:130 actions/register.php:156
+msgid "Nickname must have only lowercase letters "
+msgstr ""
+
+#: actions/editgroup.php:198 actions/newgroup.php:149
+msgid "description is too long (max 140 chars)."
+msgstr ""
+
+#: actions/editgroup.php:218
+msgid "Could not update group."
+msgstr ""
+
+#: actions/editgroup.php:226
+msgid "Options saved."
+msgstr ""
+
+#: actions/emailsettings.php:107 actions/imsettings.php:108
+#, php-format
+msgid "Awaiting confirmation on this address. "
+msgstr ""
+
+#: 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 - "
+
+#: actions/emailsettings.php:157
+msgid "Send me email when someone "
+msgstr "Send me e-mail when someone "
+
+#: 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/emailsettings.php:321
+msgid "That email address already belongs "
+msgstr "That e-mail address already belongs "
+
+#: 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/facebookhome.php:110
+msgid "Server error - couldn't get user!"
+msgstr "Server error - couldn’t get user!"
+
+#: actions/facebookhome.php:196
+#, php-format
+msgid "If you would like the %s app to automatically update "
+msgstr ""
+
+#: actions/facebookhome.php:213 actions/facebooksettings.php:137
+#, php-format
+msgid "Allow %s to update my Facebook status"
+msgstr ""
+
+#: actions/facebookhome.php:218
+msgid "Skip"
+msgstr ""
+
+#: actions/facebookhome.php:235
+msgid "No notice content!"
+msgstr ""
+
+#: actions/facebookhome.php:295 lib/action.php:870 lib/facebookaction.php:399
+msgid "Pagination"
+msgstr ""
+
+#  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 ""
+
+#  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 ""
+
+#: actions/facebookinvite.php:70
+#, php-format
+msgid "Thanks for inviting your friends to use %s"
+msgstr ""
+
+#: actions/facebookinvite.php:72
+msgid "Invitations have been sent to the following users:"
+msgstr ""
+
+#: actions/facebookinvite.php:96
+#, php-format
+msgid "You have been invited to %s"
+msgstr ""
+
+#: actions/facebookinvite.php:105
+#, php-format
+msgid "Invite your friends to use %s"
+msgstr ""
+
+#: actions/facebookinvite.php:113
+#, php-format
+msgid "Friends already using %s:"

 msgstr ""
 
 msgstr ""
 

-#: ../actions/invite.php:55 actions/invite.php:62
+#: actions/facebookinvite.php:130

 #, php-format
 #, php-format

-msgid "Invalid email address: %s"
+msgid "Send invitations"

 msgstr ""
 
 msgstr ""
 

-#: ../actions/invite.php:79 actions/invite.php:86
-msgid "Invitation(s) sent"
+#: 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 ""
 
 msgstr ""
 

-#: ../actions/invite.php:97 actions/invite.php:104
-msgid "Invitation(s) sent to the following people:"
+#: actions/facebooksettings.php:67
+msgid "Sync preferences saved."

 msgstr ""
 
 msgstr ""
 

-#: ../lib/util.php:306 lib/util.php:322
-msgid "Invite"
+#: actions/facebooksettings.php:90
+msgid "Automatically update my Facebook status with my notices."

 msgstr ""
 
 msgstr ""
 

-#: ../actions/invite.php:123 actions/invite.php:130
-msgid "Invite new users"
+#: actions/facebooksettings.php:97
+msgid "Send \"@\" replies to Facebook."
+msgstr "Send ‘@’ replies to Facebook."
+
+#: actions/facebooksettings.php:106
+msgid "Prefix"

 msgstr ""
 
 msgstr ""
 

-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-msgid "Language"
+#: actions/facebooksettings.php:108
+msgid "A string to prefix notices with."

 msgstr ""
 
 msgstr ""
 

-#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
-msgid "Language is too long (max 50 chars)."
+#: actions/facebooksettings.php:124
+#, php-format
+msgid "If you would like %s to automatically update "

 msgstr ""
 
 msgstr ""
 

-#: ../actions/register.php:166 actions/register.php:180
-msgid "Longer name, preferably your \"real\" name"
+#: actions/facebooksettings.php:147
+msgid "Sync preferences"

 msgstr ""
 
 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."
+#: actions/favor.php:94 lib/disfavorform.php:140
+msgid "Disfavor favorite"
+msgstr "Disfavor favourite"
+
+#: actions/favorited.php:65 lib/popularnoticesection.php:76
+#: lib/publicgroupnav.php:91
+msgid "Popular notices"

 msgstr ""
 
 msgstr ""
 

-#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
+#: actions/favorited.php:67

 #, php-format
 #, php-format

-msgid "Manage how you get email from %%site.name%%."
+msgid "Popular notices, page %d"

 msgstr ""
 
 msgstr ""
 

-#: ../actions/smssettings.php:304
-#, 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."
+#: actions/favorited.php:79
+msgid "The most popular notices on the site right now."

 msgstr ""
 
 msgstr ""
 

-#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
-#: actions/emailsettings.php:83 actions/smssettings.php:91
-msgid "New"
+#: actions/featured.php:69 lib/featureduserssection.php:82
+#: lib/publicgroupnav.php:87
+msgid "Featured users"

 msgstr ""
 
 msgstr ""
 

-#: ../lib/mail.php:144 lib/mail.php:144
+#: actions/featured.php:71

 #, php-format
 #, php-format

-msgid "New email address for posting to %s"
+msgid "Featured users, page %d"

 msgstr ""
 
 msgstr ""
 

-#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
-msgid "New incoming email address added."
+#: actions/featured.php:99
+#, php-format
+msgid "A selection of some of the great users on %s"

 msgstr ""
 
 msgstr ""
 

-#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
-msgid "No"
+#: actions/finishremotesubscribe.php:188
+msgid "That user has blocked you from subscribing."

 msgstr ""
 
 msgstr ""
 

-#: ../actions/smssettings.php:181 actions/smssettings.php:189
-msgid "No carrier selected."
+#: actions/groupbyid.php:79
+msgid "No ID"

 msgstr ""
 
 msgstr ""
 

-#: ../actions/smssettings.php:316 actions/smssettings.php:324
-msgid "No code entered"
+#: actions/grouplogo.php:138 actions/grouplogo.php:191
+msgid "Group logo"

 msgstr ""
 
 msgstr ""
 

-#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
-msgid "No email address."
+#: actions/grouplogo.php:149
+msgid "You can upload a logo image for your group."

 msgstr ""
 
 msgstr ""
 

-#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
-msgid "No incoming email address."
+#: actions/grouplogo.php:448
+msgid "Logo updated."

 msgstr ""
 
 msgstr ""
 

-#: ../actions/smssettings.php:176 actions/smssettings.php:184
-msgid "No phone number."
+#: actions/grouplogo.php:450
+msgid "Failed updating logo."
+msgstr "Failed to update logo."
+
+#: actions/groupmembers.php:93 lib/groupnav.php:91
+#, php-format
+msgid "%s group members"

 msgstr ""
 
 msgstr ""
 

-#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
-#: actions/twitapistatuses.php:520
-msgid "No status found with that ID."
+#: actions/groupmembers.php:96
+#, php-format
+msgid "%s group members, page %d"

 msgstr ""
 
 msgstr ""
 

-#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
-msgid "No status with that ID found."
+#: actions/groupmembers.php:111
+msgid "A list of the users in this group."

 msgstr ""
 
 msgstr ""
 

-#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
-msgid "No user with that email address or username."
+#: actions/groups.php:62 actions/showstream.php:518 lib/publicgroupnav.php:79
+#: lib/subgroupnav.php:96
+msgid "Groups"

 msgstr ""
 
 msgstr ""
 

-#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
-msgid "Not a registered user."
+#: actions/groups.php:64
+#, php-format
+msgid "Groups, page %d"

 msgstr ""
 
 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
-msgid "Not a supported data format."
+#: actions/groups.php:90
+#, php-format
+msgid "%%%%site.name%%%% groups let you find and talk with "

 msgstr ""
 
 msgstr ""
 

-#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
-msgid "Not a valid email address"
+#: actions/groups.php:106 actions/usergroups.php:124 lib/groupeditform.php:123
+msgid "Create a new group"

 msgstr ""
 
 msgstr ""
 

-#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
-msgid "Not found"
+#: actions/groupsearch.php:57
+#, php-format
+msgid ""
+"Search for groups on %%site.name%% by their name, location, or description. "

 msgstr ""
 
 msgstr ""
 

-#: ../actions/opensearch.php:35 actions/opensearch.php:35
-msgid "Notice Search"
+#: actions/groupsearch.php:63
+msgid "Group search"

 msgstr ""
 
 msgstr ""
 

-#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
-#: actions/tag.php:81
-#, php-format
-msgid "Notices tagged with %s"
+#: actions/imsettings.php:70
+msgid "You can send and receive notices through "

 msgstr ""
 
 msgstr ""
 

-#: ../actions/invite.php:135 actions/invite.php:143
-msgid "Optionally add a personal message to the invitation."
+#: actions/imsettings.php:120
+#, php-format
+msgid "Jabber or GTalk address, "

 msgstr ""
 
 msgstr ""
 

-#: ../lib/searchaction.php:100 lib/searchaction.php:100
-msgid "People"
+#: actions/imsettings.php:147
+msgid "Send me replies through Jabber/GTalk "

 msgstr ""
 
 msgstr ""
 

-#: ../actions/opensearch.php:33 actions/opensearch.php:33
-msgid "People Search"
+#: actions/imsettings.php:321
+#, php-format
+msgid "A confirmation code was sent "

 msgstr ""
 
 msgstr ""
 

-#: ../actions/invite.php:133 actions/invite.php:141
-msgid "Personal message"
+#: actions/joingroup.php:65
+msgid "You must be logged in to join a group."

 msgstr ""
 
 msgstr ""
 

-#: ../actions/smssettings.php:69 actions/smssettings.php:69
-msgid "Phone number, no punctuation or spaces, with area code"
+#: actions/joingroup.php:95
+msgid "You are already a member of that group"

 msgstr ""
 
 msgstr ""
 

-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-msgid "Preferred language"
+#: actions/joingroup.php:128
+#, php-format
+msgid "Could not join user %s to group %s"

 msgstr ""
 
 msgstr ""
 

-#: ../actions/imsettings.php:79 actions/imsettings.php:80
-msgid "Publish a MicroID for my Jabber/GTalk address."
+#: actions/joingroup.php:135
+#, php-format
+msgid "%s joined group %s"

 msgstr ""
 
 msgstr ""
 

-#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
-msgid "Publish a MicroID for my email address."
+#: actions/leavegroup.php:60
+msgid "Inboxes must be enabled for groups to work."
+msgstr "In-boxes must be enabled for groups to work."
+
+#: actions/leavegroup.php:65
+msgid "You must be logged in to leave a group."

 msgstr ""
 
 msgstr ""
 

-#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
-#: actions/tag.php:76
-msgid "Recent Tags"
+#: actions/leavegroup.php:88
+msgid "No such group."

 msgstr ""
 
 msgstr ""
 

-#: ../actions/register.php:28 actions/register.php:28
-msgid "Registration not allowed."
+#: actions/leavegroup.php:95
+msgid "You are not a member of that group."

 msgstr ""
 
 msgstr ""
 

-#: ../actions/register.php:200 actions/register.php:214
-msgid "Registration successful"
+#: actions/leavegroup.php:100
+msgid "You may not leave a group while you are its administrator."

 msgstr ""
 
 msgstr ""
 

-#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
-msgid "SMS"
+#: actions/leavegroup.php:130
+msgid "Could not find membership record."

 msgstr ""
 
 msgstr ""
 

-#: ../actions/smssettings.php:67 actions/smssettings.php:67
-msgid "SMS Phone number"
+#  Thought form was incorrect
+#: actions/leavegroup.php:138
+#, php-format
+msgid "Could not remove user %s to group %s"

 msgstr ""
 
 msgstr ""
 

-#: ../actions/smssettings.php:33 actions/smssettings.php:33
-msgid "SMS Settings"
+#: actions/leavegroup.php:145
+#, php-format
+msgid "%s left group %s"

 msgstr ""
 
 msgstr ""
 

-#: ../lib/mail.php:219 lib/mail.php:225
-msgid "SMS confirmation"
+#: actions/login.php:225 lib/facebookaction.php:304
+msgid "Login to site"
+msgstr "Log-in to site"
+
+#: actions/microsummary.php:69
+msgid "No current status"

 msgstr ""
 
 msgstr ""
 

-#: ../actions/register.php:156 actions/register.php:170
-msgid "Same as password above. Required."
+#: actions/newgroup.php:53
+msgid "New group"

 msgstr ""
 
 msgstr ""
 

-#: ../actions/smssettings.php:296 actions/smssettings.php:304
-msgid "Select a carrier"
+#: actions/newgroup.php:115
+msgid "Use this form to create a new group."

 msgstr ""
 
 msgstr ""
 

-#: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
-#: actions/emailsettings.php:74 actions/smssettings.php:82
-msgid "Send email to this address to post new notices."
+#: actions/newgroup.php:177
+msgid "Could not create group."
+msgstr "Couldn’t create group."
+
+#: actions/newgroup.php:191
+msgid "Could not set group membership."
+msgstr "Couldn’t set group membership."
+
+#: actions/newmessage.php:119 actions/newnotice.php:132
+msgid "That's too long. "
+msgstr "That’s too long."
+
+#: actions/newmessage.php:134
+msgid "Don't send a message to yourself; "
+msgstr "Don’t send a message to yourself - "
+
+#: actions/newnotice.php:166
+msgid "Notice posted"

 msgstr ""
 
 msgstr ""
 

-#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
-msgid "Send me notices of new subscriptions through email."
+#: actions/newnotice.php:200 classes/Channel.php:163
+msgid "Ajax Error"

 msgstr ""
 
 msgstr ""
 

-#: ../actions/smssettings.php:97 actions/smssettings.php:97
+#: actions/nudge.php:85

 msgid ""
 msgid ""

-"Send me notices through SMS; I understand I may incur exorbitant charges "
-"from my carrier."
+"This user doesn't allow nudges or hasn't confirmed or set his email yet."

 msgstr ""
 msgstr ""

+"This user doesn’t allow nudges or hasn’t confirmed or set his e-mail yet."

 
 

-#: ../actions/imsettings.php:76 actions/imsettings.php:77
-msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
+#: actions/nudge.php:94
+msgid "Nudge sent"

 msgstr ""
 
 msgstr ""
 

-#: ../actions/tag.php:60 actions/tag.php:60
-msgid "Showing most popular tags from the last week"
+#: actions/nudge.php:97
+msgid "Nudge sent!"

 msgstr ""
 
 msgstr ""
 

-#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
-msgid "Sorry, no incoming email allowed."
+#: actions/openidlogin.php:97
+msgid "OpenID login"
+msgstr "OpenID log-in"
+
+#: actions/openidsettings.php:128
+msgid "Removing your only OpenID "

 msgstr ""
 
 msgstr ""
 

-#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
-msgid "Sorry, that is not your incoming email address."
+#  requires full stops?
+#: actions/othersettings.php:60
+msgid "Other Settings"

 msgstr ""
 
 msgstr ""
 

-#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
-#: lib/util.php:317
-msgid "Tags"
+#: actions/othersettings.php:71
+msgid "Manage various other options."

 msgstr ""
 
 msgstr ""
 

-#: ../lib/searchaction.php:104 lib/searchaction.php:104
-msgid "Text"
+#: actions/othersettings.php:93
+msgid "URL Auto-shortening"

 msgstr ""
 
 msgstr ""
 

-#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
-msgid "That email address already belongs to another user."
+#: actions/othersettings.php:112
+msgid "Service"

 msgstr ""
 
 msgstr ""
 

-#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
-msgid "That is already your email address."
+#: actions/othersettings.php:113
+msgid "Automatic shortening service to use."

 msgstr ""
 
 msgstr ""
 

-#: ../actions/smssettings.php:188 actions/smssettings.php:196
-msgid "That is already your phone number."
+#: actions/othersettings.php:144
+msgid "URL shortening service is too long (max 50 chars)."

 msgstr ""
 
 msgstr ""
 

-#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
-msgid "That is not your email address."
+#: actions/passwordsettings.php:69
+msgid "Change your password."

 msgstr ""
 
 msgstr ""
 

-#: ../actions/smssettings.php:257 actions/smssettings.php:265
-msgid "That is not your phone number."
+#: actions/passwordsettings.php:89
+msgid "Password change"

 msgstr ""
 
 msgstr ""
 

-#: ../actions/smssettings.php:233 actions/smssettings.php:241
-msgid "That is the wrong confirmation number."
+#: actions/peopletag.php:35
+#, php-format
+msgid "Not a valid people tag: %s"

 msgstr ""
 
 msgstr ""
 

-#: ../actions/smssettings.php:191 actions/smssettings.php:199
-msgid "That phone number already belongs to another user."
+#: actions/peopletag.php:47
+#, php-format
+msgid "Users self-tagged with %s - page %d"

 msgstr ""
 
 msgstr ""
 

-#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
-msgid "That's too long. Max notice size is 255 chars."
+#: 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/profilesettings.php:91
+msgid "Profile information"

 msgstr ""
 
 msgstr ""
 

-#: ../actions/invite.php:89 actions/invite.php:96
+#: actions/profilesettings.php:124

 msgid ""
 msgid ""

-"These people are already users and you were automatically subscribed to "
-"them:"
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"

 msgstr ""
 
 msgstr ""
 

-#: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
-#: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
-#: actions/twitapistatuses.php:511
-msgid "This method requires a POST or DELETE."
+#: actions/profilesettings.php:144
+msgid "Automatically subscribe to whoever "

 msgstr ""
 
 msgstr ""
 

-#: ../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
-msgid "This method requires a POST."
+#: actions/profilesettings.php:229 actions/tagother.php:176
+#, php-format
+msgid "Invalid tag: \"%s\""

 msgstr ""
 
 msgstr ""
 

-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-msgid "Timezone"
-msgstr ""
+#: actions/profilesettings.php:311
+msgid "Couldn't save tags."
+msgstr "Couldn’t save tags."

 
 

-#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
-msgid "Timezone not selected."
+#: actions/public.php:107
+#, php-format
+msgid "Public timeline, page %d"

 msgstr ""
 
 msgstr ""
 

-#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
-msgid "Two user ids or screen_names must be supplied."
+#: actions/public.php:173
+msgid "Could not retrieve public stream."

 msgstr ""
 
 msgstr ""
 

-#: ../index.php:57 index.php:57
-msgid "Unknown action"
+#: actions/public.php:220
+#, php-format
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service "

 msgstr ""
 
 msgstr ""
 

-#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
-msgid "Updates by SMS"
+#: actions/publictagcloud.php:57
+msgid "Public tag cloud"

 msgstr ""
 
 msgstr ""
 

-#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
-msgid "Updates by instant messenger (IM)"
+#: actions/publictagcloud.php:63
+#, php-format
+msgid "These are most popular recent tags on %s "

 msgstr ""
 
 msgstr ""
 

-#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
-#, php-format
-msgid "Updates from %1$s and friends on %2$s!"
+#: actions/publictagcloud.php:119
+msgid "Tag cloud"

 msgstr ""
 
 msgstr ""
 

-#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
-#, php-format
-msgid "Updates from %1$s on %2$s!"
+#: actions/register.php:139 actions/register.php:349
+msgid "Sorry, only invited people can register."

 msgstr ""
 
 msgstr ""
 

-#: ../lib/settingsaction.php:91
-msgid "Upload a new profile image"
+#: actions/register.php:149
+msgid "You can't register if you don't "
+msgstr "You can’t register if you don’t "
+
+#: actions/register.php:286
+msgid "With this form you can create "

 msgstr ""
 
 msgstr ""
 

-#: ../actions/invite.php:114 actions/invite.php:121
-msgid ""
-"Use this form to invite your friends and colleagues to use this "
-"service."
+#: actions/register.php:368
+msgid "1-64 lowercase letters or numbers, "

 msgstr ""
 
 msgstr ""
 

-#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
-msgid "User not found."
+#: actions/register.php:382 actions/register.php:386
+msgid "Used only for updates, announcements, "

 msgstr ""
 
 msgstr ""
 

-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-msgid "What timezone are you normally in?"
+#: actions/register.php:398
+msgid "URL of your homepage, blog, "

 msgstr ""
 
 msgstr ""
 

-#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
-#: actions/deletenotice.php:64 actions/deletenotice.php:79
-msgid "Yes"
+#: actions/register.php:404
+msgid "Describe yourself and your "

 msgstr ""
 
 msgstr ""
 

-#: ../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/register.php:410
+msgid "Where you are, like \"City, "
+msgstr "Where you are, like ‘City, "
+
+#: actions/register.php:432
+msgid " except this private data: password, "

 msgstr ""
 
 msgstr ""
 

-#: ../actions/invite.php:81 actions/invite.php:88
-msgid "You are already subscribed to these users:"
+#: actions/register.php:471
+#, php-format
+msgid "Congratulations, %s! And welcome to %%%%site.name%%%%. "

 msgstr ""
 
 msgstr ""
 

-#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
-msgid "You are not friends with the specified user."
+#: actions/register.php:495
+msgid "(You should receive a message by email "
+msgstr "(You should receive a message by e-mail "
+
+#: actions/remotesubscribe.php:166 actions/remotesubscribe.php:171
+msgid "That's a local profile! Login to subscribe."
+msgstr "That’s a local profile! Log-in to subscribe."
+
+#: actions/replies.php:118
+#, php-format
+msgid "Replies to %s, page %d"

 msgstr ""
 
 msgstr ""
 

-#: ../actions/smssettings.php:28 actions/smssettings.php:28
+#: actions/showfavorites.php:79

 #, php-format
 #, php-format

-msgid "You can receive SMS messages through email from %%site.name%%."
+msgid "%s favorite notices, page %d"
+msgstr "%s favourite notices, page %d"
+
+#: actions/showgroup.php:77 lib/groupnav.php:85
+#, php-format
+msgid "%s group"

 msgstr ""
 
 msgstr ""
 

-#: ../lib/mail.php:147
+#: actions/showgroup.php:79

 #, php-format
 #, 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"
+msgid "%s group, page %d"

 msgstr ""
 
 msgstr ""
 

-#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
-msgid "You may not delete another user's status."
+#: actions/showgroup.php:206
+msgid "Group profile"
+msgstr ""
+
+#: actions/showgroup.php:251 actions/showstream.php:278
+#: actions/tagother.php:119 lib/grouplist.php:134 lib/profilelist.php:133
+msgid "URL"
+msgstr ""
+
+#: actions/showgroup.php:262 actions/showstream.php:289
+#: actions/tagother.php:129 lib/grouplist.php:145 lib/profilelist.php:144
+msgid "Note"
+msgstr ""
+
+#: actions/showgroup.php:270
+msgid "Group actions"

 msgstr ""
 
 msgstr ""
 

-#: ../actions/invite.php:31 actions/invite.php:31
+#: actions/showgroup.php:323

 #, php-format
 #, php-format

-msgid "You must be logged in to invite other users to use %s"
+msgid "Notice feed for %s group"

 msgstr ""
 
 msgstr ""
 

-#: ../actions/invite.php:103 actions/invite.php:110
-msgid ""
-"You will be notified when your invitees accept the invitation and register "
-"on the site. Thanks for growing the community!"
+#: actions/showgroup.php:357 lib/groupnav.php:90
+msgid "Members"

 msgstr ""
 
 msgstr ""
 

-#: ../actions/showstream.php:423 ../lib/stream.php:132
-#: actions/showstream.php:441 lib/stream.php:99
-msgid "delete"
+#: 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 ""
 
 msgstr ""
 

-#: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
-msgid "unsupported file type"
+#: actions/showgroup.php:370
+msgid "All members"

 msgstr ""
 
 msgstr ""
 

-#: 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
-msgid "There was a problem with your session token. Try again, please."
+#: actions/showgroup.php:378
+#, php-format
+msgid ""
+"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service "

 msgstr ""
 
 msgstr ""
 

-#: actions/disfavor.php:55
-msgid "This notice is not a favorite!"
+#: actions/showmessage.php:98
+msgid "Only the sender and recipient "

 msgstr ""
 
 msgstr ""
 

-#: actions/disfavor.php:63
-msgid "Could not delete favorite."
+#: actions/showstream.php:73
+#, php-format
+msgid "%s, page %d"

 msgstr ""
 
 msgstr ""
 

-#: actions/disfavor.php:72
-msgid "Favor"
-msgstr ""
+#: actions/showstream.php:143
+msgid "'s profile"
+msgstr "’s profile"

 
 

-#: actions/emailsettings.php:92
-msgid "Send me email when someone adds my notice as a favorite."
+#: actions/showstream.php:236 actions/tagother.php:77
+msgid "User profile"

 msgstr ""
 
 msgstr ""
 

-#: actions/emailsettings.php:95
-msgid "Send me email when someone sends me a private message."
+#: actions/showstream.php:240 actions/tagother.php:81
+msgid "Photo"

 msgstr ""
 
 msgstr ""
 

-#: actions/favor.php:53 actions/twitapifavorites.php:142
-msgid "This notice is already a favorite!"
+#: actions/showstream.php:317
+msgid "User actions"

 msgstr ""
 
 msgstr ""
 

-#: actions/favor.php:60 actions/twitapifavorites.php:151
-#: classes/Command.php:132
-msgid "Could not create favorite."
+#: actions/showstream.php:342
+msgid "Send a direct message to this user"

 msgstr ""
 
 msgstr ""
 

-#: actions/favor.php:70
-msgid "Disfavor"
+#: actions/showstream.php:343
+msgid "Message"

 msgstr ""
 
 msgstr ""
 

-#: actions/favoritesrss.php:60 actions/showfavorites.php:47
-#, php-format
-msgid "%s favorite notices"
+#: actions/showstream.php:451
+msgid "All subscribers"

 msgstr ""
 
 msgstr ""
 

-#: actions/favoritesrss.php:64
-#, php-format
-msgid "Feed of favorite notices of %s"
+#: actions/showstream.php:533
+msgid "All groups"

 msgstr ""
 
 msgstr ""
 

-#: actions/inbox.php:28
+#: actions/showstream.php:542

 #, php-format
 #, php-format

-msgid "Inbox for %s - page %d"
+msgid ""
+"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service "

 msgstr ""
 
 msgstr ""
 

-#: actions/inbox.php:30
-#, php-format
-msgid "Inbox for %s"
+#: actions/smssettings.php:128
+msgid "Phone number, no punctuation or spaces, "

 msgstr ""
 
 msgstr ""
 

-#: actions/inbox.php:53
-msgid "This is your inbox, which lists your incoming private messages."
+#: actions/smssettings.php:162
+msgid "Send me notices through SMS; "

 msgstr ""
 
 msgstr ""
 

-#: actions/invite.php:178
-#, php-format
-msgid ""
-"%1$s has invited you to join them on %2$s (%3$s).\n"
-"\n"
+#: actions/smssettings.php:335
+msgid "A confirmation code was sent to the phone number you added. "

 msgstr ""
 
 msgstr ""
 

-#: actions/login.php:104
-msgid "Automatically login in the future; "
+#: actions/smssettings.php:453
+msgid "Mobile carrier"

 msgstr ""
 
 msgstr ""
 

-#: actions/login.php:122
-msgid "For security reasons, please re-enter your "
+#: actions/subedit.php:70
+msgid "You are not subscribed to that profile."

 msgstr ""
 
 msgstr ""
 

-#: actions/login.php:126
-msgid "Login with your username and password. "
-msgstr ""
+#: actions/subedit.php:83
+msgid "Could not save subscription."
+msgstr "Couldn’t save subscription."

 
 

-#: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
-msgid "That's too long. Max message size is 140 chars."
+#: actions/subscribe.php:55
+msgid "Not a local user."

 msgstr ""
 
 msgstr ""
 

-#: actions/newmessage.php:65
-msgid "No recipient specified."
+#: actions/subscribe.php:69
+msgid "Subscribed"

 msgstr ""
 
 msgstr ""
 

-#: actions/newmessage.php:68 actions/newmessage.php:113
-#: classes/Command.php:206
-msgid "You can't send a message to this user."
+#: actions/subscribers.php:50
+#, php-format
+msgid "%s subscribers"

 msgstr ""
 
 msgstr ""
 

-#: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
-#: classes/Command.php:209
-msgid ""
-"Don't send a message to yourself; just say it to yourself quietly "
-"instead."
+#: actions/subscribers.php:52
+#, php-format
+msgid "%s subscribers, page %d"

 msgstr ""
 
 msgstr ""
 

-#: actions/newmessage.php:108
-msgid "No such user"
+#: actions/subscribers.php:63
+msgid "These are the people who listen to "

 msgstr ""
 
 msgstr ""
 

-#: actions/newmessage.php:117
-msgid "New message"
+#: actions/subscribers.php:67
+#, php-format
+msgid "These are the people who "

 msgstr ""
 
 msgstr ""
 

-#: actions/noticesearch.php:95
-msgid "Notice without matching profile"
+#: actions/subscriptions.php:52
+#, php-format
+msgid "%s subscriptions"

 msgstr ""
 
 msgstr ""
 

-#: actions/openidsettings.php:28
+#: actions/subscriptions.php:54

 #, php-format
 #, php-format

-msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
+msgid "%s subscriptions, page %d"

 msgstr ""
 
 msgstr ""
 

-#: actions/openidsettings.php:46
-msgid "If you want to add an OpenID to your account, "
+#: actions/subscriptions.php:65
+msgid "These are the people whose notices "

 msgstr ""
 
 msgstr ""
 

-#: actions/openidsettings.php:74
-msgid "Removing your only OpenID would make it impossible to log in! "
+#: actions/subscriptions.php:69
+#, php-format
+msgid "These are the people whose "

 msgstr ""
 
 msgstr ""
 

-#: actions/openidsettings.php:87
-msgid "You can remove an OpenID from your account "
+#: actions/subscriptions.php:122
+msgid "Jabber"

 msgstr ""
 
 msgstr ""
 

-#: actions/outbox.php:28
+#: actions/tag.php:43

 #, php-format
 #, php-format

-msgid "Outbox for %s - page %d"
+msgid "Notices tagged with %s, page %d"

 msgstr ""
 
 msgstr ""
 

-#: actions/outbox.php:30
+#: actions/tag.php:66

 #, php-format
 #, php-format

-msgid "Outbox for %s"
+msgid "Messages tagged \"%s\", most recent first"
+msgstr "Messages tagged ‘%s’, most recent first"
+
+#: actions/tagother.php:33
+msgid "Not logged in"

 msgstr ""
 
 msgstr ""
 

-#: actions/outbox.php:53
-msgid "This is your outbox, which lists private messages you have sent."
+#: actions/tagother.php:39
+msgid "No id argument."

 msgstr ""
 
 msgstr ""
 

-#: actions/peoplesearch.php:28
+#: actions/tagother.php:65

 #, php-format
 #, php-format

-msgid ""
-"Search for people on %%site.name%% by their name, location, or interests. "
+msgid "Tag %s"

 msgstr ""
 
 msgstr ""
 

-#: actions/profilesettings.php:27
-msgid "You can update your personal profile info here "
+#: actions/tagother.php:141
+msgid "Tag user"

 msgstr ""
 
 msgstr ""
 

-#: actions/profilesettings.php:115 actions/remotesubscribe.php:320
-#: actions/userauthorization.php:159 actions/userrss.php:76
-msgid "User without matching profile"
+#: actions/tagother.php:149
+msgid ""
+"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
+"separated"

 msgstr ""
 
 msgstr ""
 

-#: actions/recoverpassword.php:91
-msgid "This confirmation code is too old. "
+#: actions/tagother.php:164
+msgid "There was a problem with your session token."

 msgstr ""
 
 msgstr ""
 

-#: actions/recoverpassword.php:141
-msgid "If you've forgotten or lost your"
+#: actions/tagother.php:191
+msgid ""
+"You can only tag people you are subscribed to or who are subscribed to you."

 msgstr ""
 
 msgstr ""
 

-#: actions/recoverpassword.php:154
-msgid "You've been identified. Enter a "
+#: actions/tagother.php:198
+msgid "Could not save tags."

 msgstr ""
 
 msgstr ""
 

-#: actions/recoverpassword.php:169
-msgid "Your nickname on this server, "
+#: actions/tagother.php:233
+msgid "Use this form to add tags to your subscribers or subscriptions."

 msgstr ""
 
 msgstr ""
 

-#: actions/recoverpassword.php:271
-msgid "Instructions for recovering your password "
+#: actions/tagrss.php:35
+msgid "No such tag."

 msgstr ""
 
 msgstr ""
 

-#: actions/recoverpassword.php:327
-msgid "New password successfully saved. "
+#: actions/tagrss.php:66
+#, php-format
+msgid "Microblog tagged with %s"

 msgstr ""
 
 msgstr ""
 

-#: actions/register.php:95
-msgid "Password must be 6 or more characters."
+#: actions/twitapiblocks.php:47
+msgid "Block user failed."

 msgstr ""
 
 msgstr ""
 

-#: actions/register.php:216
-#, php-format
-msgid ""
-"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
-"want to..."
+#: actions/twitapiblocks.php:69
+msgid "Unblock user failed."

 msgstr ""
 
 msgstr ""
 

-#: actions/register.php:227
-msgid "(You should receive a message by email momentarily, with "
+#: actions/twitapiusers.php:48
+msgid "Not found."

 msgstr ""
 
 msgstr ""
 

-#: actions/remotesubscribe.php:51
-#, php-format
-msgid "To subscribe, you can [login](%%action.login%%),"
+#: actions/twittersettings.php:71
+msgid "Add your Twitter account to automatically send "

 msgstr ""
 
 msgstr ""
 

-#: actions/showfavorites.php:61
-#, php-format
-msgid "Feed for favorites of %s"
+#: actions/twittersettings.php:119
+msgid "Twitter user name"

 msgstr ""
 
 msgstr ""
 

-#: actions/showfavorites.php:84 actions/twitapifavorites.php:85
-msgid "Could not retrieve favorite notices."
+#: actions/twittersettings.php:126
+msgid "Twitter password"

 msgstr ""
 
 msgstr ""
 

-#: actions/showmessage.php:33
-msgid "No such message."
+#: actions/twittersettings.php:228
+msgid "Twitter Friends"

 msgstr ""
 
 msgstr ""
 

-#: actions/showmessage.php:42
-msgid "Only the sender and recipient may read this message."
+#: actions/twittersettings.php:327
+msgid "Username must have only numbers, "

 msgstr ""
 
 msgstr ""
 

-#: actions/showmessage.php:61
+#: actions/twittersettings.php:341

 #, php-format
 #, php-format

-msgid "Message to %1$s on %2$s"
+msgid "Unable to retrieve account information "

 msgstr ""
 
 msgstr ""
 

-#: actions/showmessage.php:66
-#, php-format
-msgid "Message from %1$s on %2$s"
+#: actions/unblock.php:108
+msgid "Error removing the block."

 msgstr ""
 
 msgstr ""
 

-#: actions/showstream.php:154
-msgid "Send a message"
+#: actions/unsubscribe.php:50
+msgid "No profile id in request."

 msgstr ""
 
 msgstr ""
 

-#: actions/smssettings.php:312
-#, php-format
-msgid "Mobile carrier for your phone. "
+#: actions/unsubscribe.php:57
+msgid "No profile with that id."
+msgstr ""
+
+#: actions/unsubscribe.php:71
+msgid "Unsubscribed"

 msgstr ""
 
 msgstr ""
 

-#: actions/twitapidirect_messages.php:76
+#: actions/usergroups.php:63

 #, php-format
 #, php-format

-msgid "Direct messages to %s"
+msgid "%s groups"

 msgstr ""
 
 msgstr ""
 

-#: actions/twitapidirect_messages.php:77
+#: actions/usergroups.php:65

 #, php-format
 #, php-format

-msgid "All the direct messages sent to %s"
+msgid "%s groups, page %d"

 msgstr ""
 
 msgstr ""
 

-#: actions/twitapidirect_messages.php:81
-msgid "Direct Messages You've Sent"
+#: classes/Notice.php:104
+msgid "Problem saving notice. Unknown user."

 msgstr ""
 
 msgstr ""
 

-#: actions/twitapidirect_messages.php:82
-#, php-format
-msgid "All the direct messages sent from %s"
+#: classes/Notice.php:109
+msgid ""
+"Too many notices too fast; take a breather and post again in a few minutes."

 msgstr ""
 msgstr ""

+"Too many notices, too fast - take a breather and post again in a few "
+"minutes."

 
 

-#: actions/twitapidirect_messages.php:128
-msgid "No message text!"
+#: classes/Notice.php:116
+msgid "You are banned from posting notices on this site."

 msgstr ""
 
 msgstr ""
 

-#: actions/twitapidirect_messages.php:138
-msgid "Recipient user not found."
+#: lib/accountsettingsaction.php:108
+msgid "Upload an avatar"

 msgstr ""
 
 msgstr ""
 

-#: actions/twitapidirect_messages.php:141
-msgid "Can't send direct messages to users who aren't your friend."
+#: lib/accountsettingsaction.php:119
+msgid "Other"

 msgstr ""
 
 msgstr ""
 

-#: actions/twitapifavorites.php:92
-#, php-format
-msgid "%s / Favorites from %s"
+#: lib/accountsettingsaction.php:120
+msgid "Other options"

 msgstr ""
 
 msgstr ""
 

-#: actions/twitapifavorites.php:95
+#: lib/action.php:130

 #, php-format
 #, php-format

-msgid "%s updates favorited by %s / %s."
+msgid "%s - %s"

 msgstr ""
 
 msgstr ""
 

-#: actions/twitapifavorites.php:187 lib/mail.php:275
-#, php-format
-msgid "%s added your notice as a favorite"
+#: lib/action.php:145
+msgid "Untitled page"

 msgstr ""
 
 msgstr ""
 

-#: actions/twitapifavorites.php:188 lib/mail.php:276
-#, php-format
-msgid ""
-"%1$s just added your notice from %2$s as one of their favorites.\n"
-"\n"
+#: lib/action.php:316
+msgid "Primary site navigation"

 msgstr ""
 
 msgstr ""
 

-#: actions/twittersettings.php:27
-msgid ""
-"Add your Twitter account to automatically send your notices to Twitter, "
+#: lib/action.php:322
+msgid "Personal profile and friends timeline"

 msgstr ""
 
 msgstr ""
 

-#: actions/twittersettings.php:41
-msgid "Twitter settings"
+#: lib/action.php:325
+msgid "Search for people or text"

 msgstr ""
 
 msgstr ""
 

-#: actions/twittersettings.php:48
-msgid "Twitter Account"
+#: lib/action.php:328
+msgid "Account"

 msgstr ""
 
 msgstr ""
 

-#: actions/twittersettings.php:56
-msgid "Current verified Twitter account."
+#: lib/action.php:328
+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 I.M., SMS, Twitter"
+
+#: lib/action.php:332
+msgid "Logout from the site"
+msgstr "Log out from the site"
+
+#: lib/action.php:335
+msgid "Login to the site"
+msgstr "Log-in to the site"
+
+#: lib/action.php:338
+msgid "Create an account"

 msgstr ""
 
 msgstr ""
 

-#: actions/twittersettings.php:63
-msgid "Twitter Username"
+#: lib/action.php:341
+msgid "Login with OpenID"

 msgstr ""
 
 msgstr ""
 

-#: actions/twittersettings.php:65
-msgid "No spaces, please."
+#: lib/action.php:344
+msgid "Help me!"

 msgstr ""
 
 msgstr ""
 

-#: actions/twittersettings.php:67
-msgid "Twitter Password"
+#: lib/action.php:362
+msgid "Site notice"

 msgstr ""
 
 msgstr ""
 

-#: actions/twittersettings.php:72
-msgid "Automatically send my notices to Twitter."
+#: lib/action.php:417
+msgid "Local views"

 msgstr ""
 
 msgstr ""
 

-#: actions/twittersettings.php:75
-msgid "Send local \"@\" replies to Twitter."
+#: lib/action.php:472
+msgid "Page notice"

 msgstr ""
 
 msgstr ""
 

-#: actions/twittersettings.php:78
-msgid "Subscribe to my Twitter friends here."
+#: lib/action.php:562
+msgid "Secondary site navigation"

 msgstr ""
 
 msgstr ""
 

-#: actions/twittersettings.php:122
-msgid ""
-"Username must have only numbers, upper- and lowercase letters, and "
-"underscore (_). 15 chars max."
+#: lib/action.php:602 lib/action.php:623
+msgid "Laconica software license"
+msgstr "Laconica software licence"
+
+#: lib/action.php:630
+msgid "All "

 msgstr ""
 
 msgstr ""
 

-#: actions/twittersettings.php:128
-msgid "Could not verify your Twitter credentials!"
+#: lib/action.php:635
+msgid "license."
+msgstr "licence."
+
+#: lib/blockform.php:123 lib/blockform.php:153
+msgid "Block this user"

 msgstr ""
 
 msgstr ""
 

-#: actions/twittersettings.php:137
+#: lib/blockform.php:153
+msgid "Block"
+msgstr ""
+
+#: lib/disfavorform.php:114 lib/disfavorform.php:140
+msgid "Disfavor this notice"
+msgstr "Disfavour this notice"
+
+#: lib/facebookaction.php:268

 #, php-format
 #, php-format

-msgid "Unable to retrieve account information for \"%s\" from Twitter."
+msgid "To use the %s Facebook Application you need to login "
+msgstr "To use the %s Facebook Application you need to log-in "
+
+#: lib/facebookaction.php:271
+msgid " a new account."

 msgstr ""
 
 msgstr ""
 

-#: actions/twittersettings.php:151 actions/twittersettings.php:170
-msgid "Unable to save your Twitter settings!"
+#: lib/facebookaction.php:557 lib/mailbox.php:214 lib/noticelist.php:354
+msgid "Published"

 msgstr ""
 
 msgstr ""
 

-#: actions/twittersettings.php:174
-msgid "Twitter settings saved."
+#: lib/favorform.php:114 lib/favorform.php:140
+msgid "Favor this notice"
+msgstr "Favour this notice"
+
+#: lib/feedlist.php:64
+msgid "Export data"

 msgstr ""
 
 msgstr ""
 

-#: actions/twittersettings.php:192
-msgid "That is not your Twitter account."
+#: lib/galleryaction.php:121
+msgid "Filter tags"

 msgstr ""
 
 msgstr ""
 

-#: actions/twittersettings.php:200 actions/twittersettings.php:208
-msgid "Couldn't remove Twitter user."
+#: lib/galleryaction.php:131
+msgid "All"

 msgstr ""
 
 msgstr ""
 

-#: actions/twittersettings.php:212
-msgid "Twitter account removed."
+#: lib/galleryaction.php:137
+msgid "Tag"

 msgstr ""
 
 msgstr ""
 

-#: actions/twittersettings.php:225 actions/twittersettings.php:239
-msgid "Couldn't save Twitter preferences."
+#: lib/galleryaction.php:138
+msgid "Choose a tag to narrow list"

 msgstr ""
 
 msgstr ""
 

-#: actions/twittersettings.php:245
-msgid "Twitter preferences saved."
+#: lib/galleryaction.php:139
+msgid "Go"

 msgstr ""
 
 msgstr ""
 

-#: actions/userauthorization.php:84
-msgid "Please check these details to make sure "
+#: lib/groupeditform.php:148
+msgid "URL of the homepage or blog of the group or topic"

 msgstr ""
 
 msgstr ""
 

-#: actions/userauthorization.php:324
-msgid "The subscription has been authorized, but no "
+#: lib/groupeditform.php:151
+msgid "Description"

 msgstr ""
 
 msgstr ""
 

-#: actions/userauthorization.php:334
-msgid "The subscription has been rejected, but no "
+#: lib/groupeditform.php:153
+msgid "Describe the group or topic in 140 chars"

 msgstr ""
 
 msgstr ""
 

-#: classes/Channel.php:113
-msgid "Command results"
+#: lib/groupeditform.php:158
+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’"
+
+#: lib/groupnav.php:84 lib/searchgroupnav.php:84
+msgid "Group"

 msgstr ""
 
 msgstr ""
 

-#: classes/Channel.php:148
-msgid "Command complete"
+#: lib/groupnav.php:100
+msgid "Admin"

 msgstr ""
 
 msgstr ""
 

-#: classes/Channel.php:158
-msgid "Command failed"
+#: lib/groupnav.php:101
+#, php-format
+msgid "Edit %s group properties"

 msgstr ""
 
 msgstr ""
 

-#: classes/Command.php:39
-msgid "Sorry, this command is not yet implemented."
+#: lib/groupnav.php:106
+msgid "Logo"

 msgstr ""
 
 msgstr ""
 

-#: classes/Command.php:96
+#: lib/groupnav.php:107

 #, php-format
 #, php-format

-msgid "Subscriptions: %1$s\n"
+msgid "Add or edit %s logo"

 msgstr ""
 
 msgstr ""
 

-#: classes/Command.php:125 classes/Command.php:242
-msgid "User has no last notice"
+#: lib/groupsbymemberssection.php:71
+msgid "Groups with most members"

 msgstr ""
 
 msgstr ""
 

-#: classes/Command.php:146
-msgid "Notice marked as fave."
+#: lib/groupsbypostssection.php:71
+msgid "Groups with most posts"

 msgstr ""
 
 msgstr ""
 

-#: classes/Command.php:166
+#: lib/grouptagcloudsection.php:56

 #, php-format
 #, php-format

-msgid "%1$s (%2$s)"
+msgid "Tags in %s group's notices"

 msgstr ""
 
 msgstr ""
 

-#: classes/Command.php:169
-#, php-format
-msgid "Fullname: %s"
+#: lib/htmloutputter.php:104
+msgid "This page is not available in a "

 msgstr ""
 
 msgstr ""
 

-#: classes/Command.php:172
-#, php-format
-msgid "Location: %s"
+#: lib/joinform.php:114
+msgid "Join"
+msgstr ""
+
+#: lib/leaveform.php:114
+msgid "Leave"
+msgstr ""
+
+#: lib/logingroupnav.php:76
+msgid "Login with a username and password"
+msgstr "Log-in with a username and password"
+
+#: lib/logingroupnav.php:79
+msgid "Sign up for a new account"

 msgstr ""
 
 msgstr ""
 

-#: classes/Command.php:175
+#: lib/logingroupnav.php:82
+msgid "Login or register with OpenID"
+msgstr "Log-in or register with OpenID"
+
+#: lib/mail.php:175

 #, php-format
 #, php-format

-msgid "Homepage: %s"
+msgid ""
+"Hey, %s.\n"
+"\n"

 msgstr ""
 
 msgstr ""
 

-#: classes/Command.php:178
+#: lib/mail.php:236

 #, php-format
 #, php-format

-msgid "About: %s"
+msgid "%1$s is now listening to "

 msgstr ""
 
 msgstr ""
 

-#: classes/Command.php:200
+#: lib/mail.php:254

 #, php-format
 #, php-format

-msgid "Message too long - maximum is 140 characters, you sent %d"
+msgid "Location: %s\n"

 msgstr ""
 
 msgstr ""
 

-#: classes/Command.php:214
+#: lib/mail.php:256

 #, php-format
 #, php-format

-msgid "Direct message to %s sent"
+msgid "Homepage: %s\n"

 msgstr ""
 
 msgstr ""
 

-#: classes/Command.php:216
-msgid "Error sending direct message."
+#: lib/mail.php:258
+#, php-format
+msgid ""
+"Bio: %s\n"
+"\n"

 msgstr ""
 
 msgstr ""
 

-#: classes/Command.php:263
-msgid "Specify the name of the user to subscribe to"
+#: lib/mail.php:461
+#, php-format
+msgid "You've been nudged by %s"
+msgstr "You’ve been nudged by %s"
+
+#: lib/mail.php:465
+#, php-format
+msgid "%1$s (%2$s) is wondering what you are up to "

 msgstr ""
 
 msgstr ""
 

-#: classes/Command.php:270
+#: lib/mail.php:555

 #, php-format
 #, php-format

-msgid "Subscribed to %s"
+msgid "%1$s just added your notice from %2$s"

 msgstr ""
 
 msgstr ""
 

-#: classes/Command.php:288
-msgid "Specify the name of the user to unsubscribe from"
+#: lib/mailbox.php:229 lib/noticelist.php:380
+msgid "From"

 msgstr ""
 
 msgstr ""
 

-#: classes/Command.php:295
-#, php-format
-msgid "Unsubscribed from %s"
+#: lib/messageform.php:110
+msgid "Send a direct notice"

 msgstr ""
 
 msgstr ""
 

-#: classes/Command.php:310 classes/Command.php:330
-msgid "Command not yet implemented."
+#: lib/noticeform.php:125
+msgid "Send a notice"

 msgstr ""
 
 msgstr ""
 

-#: classes/Command.php:313
-msgid "Notification off."
+#: lib/noticeform.php:152
+msgid "Available characters"

 msgstr ""
 
 msgstr ""
 

-#: classes/Command.php:315
-msgid "Can't turn off notification."
+#: lib/noticelist.php:426
+msgid "in reply to"

 msgstr ""
 
 msgstr ""
 

-#: classes/Command.php:333
-msgid "Notification on."
+#: lib/noticelist.php:447 lib/noticelist.php:450
+msgid "Reply to this notice"

 msgstr ""
 
 msgstr ""
 

-#: classes/Command.php:335
-msgid "Can't turn on notification."
+#: lib/noticelist.php:451
+msgid "Reply"

 msgstr ""
 
 msgstr ""
 

-#: classes/Command.php:344
-msgid "Commands:\n"
+#: lib/noticelist.php:471 lib/noticelist.php:474
+msgid "Delete this notice"

 msgstr ""
 
 msgstr ""
 

-#: classes/Message.php:53
-msgid "Could not insert message."
+#: lib/noticelist.php:474
+msgid "Delete"

 msgstr ""
 
 msgstr ""
 

-#: classes/Message.php:63
-msgid "Could not update message with new URI."
+#: lib/nudgeform.php:116
+msgid "Nudge this user"

 msgstr ""
 
 msgstr ""
 

-#: lib/gallery.php:46
-msgid "User without matching profile in system."
+#: lib/nudgeform.php:128
+msgid "Nudge"

 msgstr ""
 
 msgstr ""
 

-#: lib/mail.php:147
-#, php-format
-msgid ""
-"You have a new posting address on %1$s.\n"
-"\n"
+#: lib/nudgeform.php:128
+msgid "Send a nudge to this user"

 msgstr ""
 
 msgstr ""
 

-#: lib/mail.php:249
+#: lib/personaltagcloudsection.php:56

 #, php-format
 #, php-format

-msgid "New private message from %s"
+msgid "Tags in %s's notices"
+msgstr "Tags in %s’s notices"
+
+#: lib/profilelist.php:182
+msgid "(none)"

 msgstr ""
 
 msgstr ""
 

-#: lib/mail.php:253
-#, php-format
-msgid ""
-"%1$s (%2$s) sent you a private message:\n"
-"\n"
+#: lib/publicgroupnav.php:76
+msgid "Public"

 msgstr ""
 
 msgstr ""
 

-#: lib/mailbox.php:43
-msgid "Only the user can read their own mailboxes."
+#: lib/publicgroupnav.php:80
+msgid "User groups"

 msgstr ""
 
 msgstr ""
 

-#: lib/openid.php:195
-msgid "This form should automatically submit itself. "
+#: lib/publicgroupnav.php:82 lib/publicgroupnav.php:83
+msgid "Recent tags"

 msgstr ""
 
 msgstr ""
 

-#: lib/personal.php:65
-msgid "Favorites"
+#: lib/publicgroupnav.php:86
+msgid "Featured"
+msgstr ""
+
+#: lib/publicgroupnav.php:90
+msgid "Popular"
+msgstr ""
+
+#: lib/searchgroupnav.php:82
+msgid "Notice"
+msgstr ""
+
+#: lib/searchgroupnav.php:85
+msgid "Find groups on this site"
+msgstr ""
+
+#: lib/section.php:89
+msgid "Untitled section"

 msgstr ""
 
 msgstr ""
 

-#: lib/personal.php:66
+#: lib/subgroupnav.php:81

 #, php-format
 #, php-format

-msgid "%s's favorite notices"
+msgid "People %s subscribes to"

 msgstr ""
 
 msgstr ""
 

-#: lib/personal.php:66
-msgid "User"
+#: lib/subgroupnav.php:89
+#, php-format
+msgid "People subscribed to %s"

 msgstr ""
 
 msgstr ""
 

-#: lib/personal.php:75
-msgid "Inbox"
+#: lib/subgroupnav.php:97
+#, php-format
+msgid "Groups %s is a member of"

 msgstr ""
 
 msgstr ""
 

-#: lib/personal.php:76
-msgid "Your incoming messages"
+#: lib/subgroupnav.php:104
+#, php-format
+msgid "Invite friends and colleagues to join you on %s"

 msgstr ""
 
 msgstr ""
 

-#: lib/personal.php:80
-msgid "Outbox"
+#: lib/subs.php:53
+msgid "User has blocked you."

 msgstr ""
 
 msgstr ""
 

-#: lib/personal.php:81
-msgid "Your sent messages"
+#: lib/subscribeform.php:115 lib/subscribeform.php:139
+msgid "Subscribe to this user"

 msgstr ""
 
 msgstr ""
 

-#: lib/settingsaction.php:99
-msgid "Twitter"
+#: lib/tagcloudsection.php:56
+msgid "None"

 msgstr ""
 
 msgstr ""
 

-#: lib/settingsaction.php:100
-msgid "Twitter integration options"
+#: lib/topposterssection.php:74
+msgid "Top posters"

 msgstr ""
 
 msgstr ""
 

-#: lib/util.php:1718
-msgid "To"
+#: lib/unblockform.php:120 lib/unblockform.php:150
+msgid "Unblock this user"

 msgstr ""
 
 msgstr ""
 

-#: scripts/maildaemon.php:45
-msgid "Could not parse message."
+#: lib/unblockform.php:150
+msgid "Unblock"

 msgstr ""
 msgstr ""

+
+#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
+msgid "Unsubscribe from this user"
+msgstr ""
+
+#, fuzzy
+#~ msgid "Delete my account"
+#~ msgstr "Create new account"
+
+#~ msgid "Couldn't confirm email."
+#~ msgstr "Couldn’t confirm e-mail."
+
+#~ msgid "Email address"
+#~ msgstr "E-mail address"
+
+#~ msgid "Error inserting notice"
+#~ msgstr "Error inserting notice"
+
+#~ 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."